Merge branch 'maint'
[git/git.git] / git-add--interactive.perl
CommitLineData
5cde71d6
JH
1#!/usr/bin/perl -w
2
3use strict;
b4c61ed6
JH
4use Git;
5
8851f480
JH
6binmode(STDOUT, ":raw");
7
b4c61ed6
JH
8my $repo = Git->repository();
9
f87e310d
JK
10my $menu_use_color = $repo->get_colorbool('color.interactive');
11my ($prompt_color, $header_color, $help_color) =
12 $menu_use_color ? (
13 $repo->get_color('color.interactive.prompt', 'bold blue'),
14 $repo->get_color('color.interactive.header', 'bold'),
15 $repo->get_color('color.interactive.help', 'red bold'),
16 ) : ();
a3019736
TR
17my $error_color = ();
18if ($menu_use_color) {
9aad6cba
SB
19 my $help_color_spec = ($repo->config('color.interactive.help') or
20 'red bold');
a3019736
TR
21 $error_color = $repo->get_color('color.interactive.error',
22 $help_color_spec);
23}
b4c61ed6 24
f87e310d
JK
25my $diff_use_color = $repo->get_colorbool('color.diff');
26my ($fraginfo_color) =
27 $diff_use_color ? (
28 $repo->get_color('color.diff.frag', 'cyan'),
29 ) : ();
ac083c47
TR
30my ($diff_plain_color) =
31 $diff_use_color ? (
32 $repo->get_color('color.diff.plain', ''),
33 ) : ();
34my ($diff_old_color) =
35 $diff_use_color ? (
36 $repo->get_color('color.diff.old', 'red'),
37 ) : ();
38my ($diff_new_color) =
39 $diff_use_color ? (
40 $repo->get_color('color.diff.new', 'green'),
41 ) : ();
b4c61ed6 42
f87e310d 43my $normal_color = $repo->get_color("", "reset");
b4c61ed6 44
ca6ac7f1 45my $use_readkey = 0;
748aa689
TR
46sub ReadMode;
47sub ReadKey;
ca6ac7f1
TR
48if ($repo->config_bool("interactive.singlekey")) {
49 eval {
748aa689
TR
50 require Term::ReadKey;
51 Term::ReadKey->import;
ca6ac7f1
TR
52 $use_readkey = 1;
53 };
54}
55
b4c61ed6
JH
56sub colored {
57 my $color = shift;
58 my $string = join("", @_);
59
f87e310d 60 if (defined $color) {
b4c61ed6
JH
61 # Put a color code at the beginning of each line, a reset at the end
62 # color after newlines that are not at the end of the string
63 $string =~ s/(\n+)(.)/$1$color$2/g;
64 # reset before newlines
65 $string =~ s/(\n+)/$normal_color$1/g;
66 # codes at beginning and end (if necessary):
67 $string =~ s/^/$color/;
68 $string =~ s/$/$normal_color/ unless $string =~ /\n$/;
69 }
70 return $string;
71}
5cde71d6 72
b63e9950
WC
73# command line options
74my $patch_mode;
75
5cde71d6 76sub run_cmd_pipe {
fdfd2008 77 if ($^O eq 'MSWin32' || $^O eq 'msys') {
21e9757e
AR
78 my @invalid = grep {m/[":*]/} @_;
79 die "$^O does not support: @invalid\n" if @invalid;
80 my @args = map { m/ /o ? "\"$_\"": $_ } @_;
81 return qx{@args};
82 } else {
83 my $fh = undef;
84 open($fh, '-|', @_) or die;
85 return <$fh>;
86 }
5cde71d6
JH
87}
88
89my ($GIT_DIR) = run_cmd_pipe(qw(git rev-parse --git-dir));
90
91if (!defined $GIT_DIR) {
92 exit(1); # rev-parse would have already said "not a git repo"
93}
94chomp($GIT_DIR);
95
8851f480
JH
96my %cquote_map = (
97 "b" => chr(8),
98 "t" => chr(9),
99 "n" => chr(10),
100 "v" => chr(11),
101 "f" => chr(12),
102 "r" => chr(13),
103 "\\" => "\\",
104 "\042" => "\042",
105);
106
107sub unquote_path {
108 local ($_) = @_;
109 my ($retval, $remainder);
110 if (!/^\042(.*)\042$/) {
111 return $_;
112 }
113 ($_, $retval) = ($1, "");
114 while (/^([^\\]*)\\(.*)$/) {
115 $remainder = $2;
116 $retval .= $1;
117 for ($remainder) {
118 if (/^([0-3][0-7][0-7])(.*)$/) {
119 $retval .= chr(oct($1));
120 $_ = $2;
121 last;
122 }
123 if (/^([\\\042btnvfr])(.*)$/) {
124 $retval .= $cquote_map{$1};
125 $_ = $2;
126 last;
127 }
128 # This is malformed -- just return it as-is for now.
129 return $_[0];
130 }
131 $_ = $remainder;
132 }
133 $retval .= $_;
134 return $retval;
135}
136
5cde71d6
JH
137sub refresh {
138 my $fh;
21e9757e 139 open $fh, 'git update-index --refresh |'
5cde71d6
JH
140 or die;
141 while (<$fh>) {
142 ;# ignore 'needs update'
143 }
144 close $fh;
145}
146
147sub list_untracked {
148 map {
149 chomp $_;
8851f480 150 unquote_path($_);
5cde71d6 151 }
4c841684 152 run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @ARGV);
5cde71d6
JH
153}
154
155my $status_fmt = '%12s %12s %s';
156my $status_head = sprintf($status_fmt, 'staged', 'unstaged', 'path');
157
18bc7616
JK
158{
159 my $initial;
160 sub is_initial_commit {
161 $initial = system('git rev-parse HEAD -- >/dev/null 2>&1') != 0
162 unless defined $initial;
163 return $initial;
164 }
165}
166
167sub get_empty_tree {
168 return '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
169}
170
5cde71d6 171# Returns list of hashes, contents of each of which are:
5cde71d6
JH
172# VALUE: pathname
173# BINARY: is a binary path
174# INDEX: is index different from HEAD?
175# FILE: is file different from index?
176# INDEX_ADDDEL: is it add/delete between HEAD and index?
177# FILE_ADDDEL: is it add/delete between index and file?
178
179sub list_modified {
180 my ($only) = @_;
181 my (%data, @return);
182 my ($add, $del, $adddel, $file);
4c841684
WC
183 my @tracked = ();
184
185 if (@ARGV) {
186 @tracked = map {
8851f480
JH
187 chomp $_;
188 unquote_path($_);
4c841684
WC
189 } run_cmd_pipe(qw(git ls-files --exclude-standard --), @ARGV);
190 return if (!@tracked);
191 }
5cde71d6 192
18bc7616 193 my $reference = is_initial_commit() ? get_empty_tree() : 'HEAD';
5cde71d6 194 for (run_cmd_pipe(qw(git diff-index --cached
18bc7616
JK
195 --numstat --summary), $reference,
196 '--', @tracked)) {
5cde71d6
JH
197 if (($add, $del, $file) =
198 /^([-\d]+) ([-\d]+) (.*)/) {
199 my ($change, $bin);
8851f480 200 $file = unquote_path($file);
5cde71d6
JH
201 if ($add eq '-' && $del eq '-') {
202 $change = 'binary';
203 $bin = 1;
204 }
205 else {
206 $change = "+$add/-$del";
207 }
208 $data{$file} = {
209 INDEX => $change,
210 BINARY => $bin,
211 FILE => 'nothing',
212 }
213 }
214 elsif (($adddel, $file) =
215 /^ (create|delete) mode [0-7]+ (.*)$/) {
8851f480 216 $file = unquote_path($file);
5cde71d6
JH
217 $data{$file}{INDEX_ADDDEL} = $adddel;
218 }
219 }
220
4c841684 221 for (run_cmd_pipe(qw(git diff-files --numstat --summary --), @tracked)) {
5cde71d6
JH
222 if (($add, $del, $file) =
223 /^([-\d]+) ([-\d]+) (.*)/) {
8851f480 224 $file = unquote_path($file);
5cde71d6
JH
225 if (!exists $data{$file}) {
226 $data{$file} = +{
227 INDEX => 'unchanged',
228 BINARY => 0,
229 };
230 }
231 my ($change, $bin);
232 if ($add eq '-' && $del eq '-') {
233 $change = 'binary';
234 $bin = 1;
235 }
236 else {
237 $change = "+$add/-$del";
238 }
239 $data{$file}{FILE} = $change;
240 if ($bin) {
241 $data{$file}{BINARY} = 1;
242 }
243 }
244 elsif (($adddel, $file) =
245 /^ (create|delete) mode [0-7]+ (.*)$/) {
8851f480 246 $file = unquote_path($file);
5cde71d6
JH
247 $data{$file}{FILE_ADDDEL} = $adddel;
248 }
249 }
250
251 for (sort keys %data) {
252 my $it = $data{$_};
253
254 if ($only) {
255 if ($only eq 'index-only') {
256 next if ($it->{INDEX} eq 'unchanged');
257 }
258 if ($only eq 'file-only') {
259 next if ($it->{FILE} eq 'nothing');
260 }
261 }
262 push @return, +{
263 VALUE => $_,
5cde71d6
JH
264 %$it,
265 };
266 }
267 return @return;
268}
269
270sub find_unique {
271 my ($string, @stuff) = @_;
272 my $found = undef;
273 for (my $i = 0; $i < @stuff; $i++) {
274 my $it = $stuff[$i];
275 my $hit = undef;
276 if (ref $it) {
277 if ((ref $it) eq 'ARRAY') {
278 $it = $it->[0];
279 }
280 else {
281 $it = $it->{VALUE};
282 }
283 }
284 eval {
285 if ($it =~ /^$string/) {
286 $hit = 1;
287 };
288 };
289 if (defined $hit && defined $found) {
290 return undef;
291 }
292 if ($hit) {
293 $found = $i + 1;
294 }
295 }
296 return $found;
297}
298
14cb5038
WC
299# inserts string into trie and updates count for each character
300sub update_trie {
301 my ($trie, $string) = @_;
302 foreach (split //, $string) {
303 $trie = $trie->{$_} ||= {COUNT => 0};
304 $trie->{COUNT}++;
305 }
306}
307
308# returns an array of tuples (prefix, remainder)
309sub find_unique_prefixes {
310 my @stuff = @_;
311 my @return = ();
312
313 # any single prefix exceeding the soft limit is omitted
314 # if any prefix exceeds the hard limit all are omitted
315 # 0 indicates no limit
316 my $soft_limit = 0;
317 my $hard_limit = 3;
318
319 # build a trie modelling all possible options
320 my %trie;
321 foreach my $print (@stuff) {
322 if ((ref $print) eq 'ARRAY') {
323 $print = $print->[0];
324 }
63320989 325 elsif ((ref $print) eq 'HASH') {
14cb5038
WC
326 $print = $print->{VALUE};
327 }
328 update_trie(\%trie, $print);
329 push @return, $print;
330 }
331
332 # use the trie to find the unique prefixes
333 for (my $i = 0; $i < @return; $i++) {
334 my $ret = $return[$i];
335 my @letters = split //, $ret;
336 my %search = %trie;
337 my ($prefix, $remainder);
338 my $j;
339 for ($j = 0; $j < @letters; $j++) {
340 my $letter = $letters[$j];
341 if ($search{$letter}{COUNT} == 1) {
342 $prefix = substr $ret, 0, $j + 1;
343 $remainder = substr $ret, $j + 1;
344 last;
345 }
346 else {
347 my $prefix = substr $ret, 0, $j;
348 return ()
349 if ($hard_limit && $j + 1 > $hard_limit);
350 }
351 %search = %{$search{$letter}};
352 }
8851f480
JH
353 if (ord($letters[0]) > 127 ||
354 ($soft_limit && $j + 1 > $soft_limit)) {
14cb5038
WC
355 $prefix = undef;
356 $remainder = $ret;
357 }
358 $return[$i] = [$prefix, $remainder];
359 }
360 return @return;
361}
362
63320989
WC
363# filters out prefixes which have special meaning to list_and_choose()
364sub is_valid_prefix {
365 my $prefix = shift;
366 return (defined $prefix) &&
367 !($prefix =~ /[\s,]/) && # separators
368 !($prefix =~ /^-/) && # deselection
369 !($prefix =~ /^\d+/) && # selection
7e018be2
WC
370 ($prefix ne '*') && # "all" wildcard
371 ($prefix ne '?'); # prompt help
63320989
WC
372}
373
14cb5038
WC
374# given a prefix/remainder tuple return a string with the prefix highlighted
375# for now use square brackets; later might use ANSI colors (underline, bold)
376sub highlight_prefix {
377 my $prefix = shift;
378 my $remainder = shift;
b4c61ed6
JH
379
380 if (!defined $prefix) {
381 return $remainder;
382 }
383
384 if (!is_valid_prefix($prefix)) {
385 return "$prefix$remainder";
386 }
387
f87e310d 388 if (!$menu_use_color) {
b4c61ed6
JH
389 return "[$prefix]$remainder";
390 }
391
392 return "$prompt_color$prefix$normal_color$remainder";
14cb5038
WC
393}
394
a3019736
TR
395sub error_msg {
396 print STDERR colored $error_color, @_;
397}
398
5cde71d6
JH
399sub list_and_choose {
400 my ($opts, @stuff) = @_;
401 my (@chosen, @return);
402 my $i;
14cb5038 403 my @prefixes = find_unique_prefixes(@stuff) unless $opts->{LIST_ONLY};
5cde71d6
JH
404
405 TOPLOOP:
406 while (1) {
407 my $last_lf = 0;
408
409 if ($opts->{HEADER}) {
410 if (!$opts->{LIST_FLAT}) {
411 print " ";
412 }
b4c61ed6 413 print colored $header_color, "$opts->{HEADER}\n";
5cde71d6
JH
414 }
415 for ($i = 0; $i < @stuff; $i++) {
416 my $chosen = $chosen[$i] ? '*' : ' ';
417 my $print = $stuff[$i];
63320989
WC
418 my $ref = ref $print;
419 my $highlighted = highlight_prefix(@{$prefixes[$i]})
420 if @prefixes;
421 if ($ref eq 'ARRAY') {
422 $print = $highlighted || $print->[0];
423 }
424 elsif ($ref eq 'HASH') {
425 my $value = $highlighted || $print->{VALUE};
426 $print = sprintf($status_fmt,
427 $print->{INDEX},
428 $print->{FILE},
429 $value);
430 }
431 else {
432 $print = $highlighted || $print;
5cde71d6
JH
433 }
434 printf("%s%2d: %s", $chosen, $i+1, $print);
435 if (($opts->{LIST_FLAT}) &&
436 (($i + 1) % ($opts->{LIST_FLAT}))) {
437 print "\t";
438 $last_lf = 0;
439 }
440 else {
441 print "\n";
442 $last_lf = 1;
443 }
444 }
445 if (!$last_lf) {
446 print "\n";
447 }
448
449 return if ($opts->{LIST_ONLY});
450
b4c61ed6 451 print colored $prompt_color, $opts->{PROMPT};
5cde71d6
JH
452 if ($opts->{SINGLETON}) {
453 print "> ";
454 }
455 else {
456 print ">> ";
457 }
458 my $line = <STDIN>;
c95c0248
JLH
459 if (!$line) {
460 print "\n";
461 $opts->{ON_EOF}->() if $opts->{ON_EOF};
462 last;
463 }
5cde71d6 464 chomp $line;
6a6eb3d0 465 last if $line eq '';
7e018be2
WC
466 if ($line eq '?') {
467 $opts->{SINGLETON} ?
468 singleton_prompt_help_cmd() :
469 prompt_help_cmd();
470 next TOPLOOP;
471 }
5cde71d6
JH
472 for my $choice (split(/[\s,]+/, $line)) {
473 my $choose = 1;
474 my ($bottom, $top);
475
476 # Input that begins with '-'; unchoose
477 if ($choice =~ s/^-//) {
478 $choose = 0;
479 }
1e5aaa6d
CM
480 # A range can be specified like 5-7 or 5-.
481 if ($choice =~ /^(\d+)-(\d*)$/) {
482 ($bottom, $top) = ($1, length($2) ? $2 : 1 + @stuff);
5cde71d6
JH
483 }
484 elsif ($choice =~ /^\d+$/) {
485 $bottom = $top = $choice;
486 }
487 elsif ($choice eq '*') {
488 $bottom = 1;
489 $top = 1 + @stuff;
490 }
491 else {
492 $bottom = $top = find_unique($choice, @stuff);
493 if (!defined $bottom) {
a3019736 494 error_msg "Huh ($choice)?\n";
5cde71d6
JH
495 next TOPLOOP;
496 }
497 }
498 if ($opts->{SINGLETON} && $bottom != $top) {
a3019736 499 error_msg "Huh ($choice)?\n";
5cde71d6
JH
500 next TOPLOOP;
501 }
502 for ($i = $bottom-1; $i <= $top-1; $i++) {
6a6eb3d0 503 next if (@stuff <= $i || $i < 0);
5cde71d6 504 $chosen[$i] = $choose;
5cde71d6
JH
505 }
506 }
12db334e 507 last if ($opts->{IMMEDIATE} || $line eq '*');
5cde71d6
JH
508 }
509 for ($i = 0; $i < @stuff; $i++) {
510 if ($chosen[$i]) {
511 push @return, $stuff[$i];
512 }
513 }
514 return @return;
515}
516
7e018be2 517sub singleton_prompt_help_cmd {
b4c61ed6 518 print colored $help_color, <<\EOF ;
7e018be2
WC
519Prompt help:
5201 - select a numbered item
521foo - select item based on unique prefix
522 - (empty) select nothing
523EOF
524}
525
526sub prompt_help_cmd {
b4c61ed6 527 print colored $help_color, <<\EOF ;
7e018be2
WC
528Prompt help:
5291 - select a single item
5303-5 - select a range of items
5312-3,6-9 - select multiple ranges
532foo - select item based on unique prefix
533-... - unselect specified items
534* - choose all items
535 - (empty) finish selecting
536EOF
537}
538
5cde71d6
JH
539sub status_cmd {
540 list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
541 list_modified());
542 print "\n";
543}
544
545sub say_n_paths {
546 my $did = shift @_;
547 my $cnt = scalar @_;
548 print "$did ";
549 if (1 < $cnt) {
550 print "$cnt paths\n";
551 }
552 else {
553 print "one path\n";
554 }
555}
556
557sub update_cmd {
558 my @mods = list_modified('file-only');
559 return if (!@mods);
560
561 my @update = list_and_choose({ PROMPT => 'Update',
562 HEADER => $status_head, },
563 @mods);
564 if (@update) {
a4f7112f 565 system(qw(git update-index --add --remove --),
5cde71d6
JH
566 map { $_->{VALUE} } @update);
567 say_n_paths('updated', @update);
568 }
569 print "\n";
570}
571
572sub revert_cmd {
573 my @update = list_and_choose({ PROMPT => 'Revert',
574 HEADER => $status_head, },
575 list_modified());
576 if (@update) {
18bc7616
JK
577 if (is_initial_commit()) {
578 system(qw(git rm --cached),
579 map { $_->{VALUE} } @update);
5cde71d6 580 }
18bc7616
JK
581 else {
582 my @lines = run_cmd_pipe(qw(git ls-tree HEAD --),
583 map { $_->{VALUE} } @update);
584 my $fh;
585 open $fh, '| git update-index --index-info'
586 or die;
587 for (@lines) {
588 print $fh $_;
589 }
590 close($fh);
591 for (@update) {
592 if ($_->{INDEX_ADDDEL} &&
593 $_->{INDEX_ADDDEL} eq 'create') {
594 system(qw(git update-index --force-remove --),
595 $_->{VALUE});
596 print "note: $_->{VALUE} is untracked now.\n";
597 }
5cde71d6
JH
598 }
599 }
600 refresh();
601 say_n_paths('reverted', @update);
602 }
603 print "\n";
604}
605
606sub add_untracked_cmd {
607 my @add = list_and_choose({ PROMPT => 'Add untracked' },
608 list_untracked());
609 if (@add) {
610 system(qw(git update-index --add --), @add);
611 say_n_paths('added', @add);
612 }
613 print "\n";
614}
615
616sub parse_diff {
617 my ($path) = @_;
618 my @diff = run_cmd_pipe(qw(git diff-files -p --), $path);
4af756f3
WC
619 my @colored = ();
620 if ($diff_use_color) {
621 @colored = run_cmd_pipe(qw(git diff-files -p --color --), $path);
5cde71d6 622 }
0392513f 623 my (@hunk) = { TEXT => [], DISPLAY => [], TYPE => 'header' };
b4c61ed6 624
4af756f3
WC
625 for (my $i = 0; $i < @diff; $i++) {
626 if ($diff[$i] =~ /^@@ /) {
0392513f
JK
627 push @hunk, { TEXT => [], DISPLAY => [],
628 TYPE => 'hunk' };
b4c61ed6 629 }
4af756f3
WC
630 push @{$hunk[-1]{TEXT}}, $diff[$i];
631 push @{$hunk[-1]{DISPLAY}},
632 ($diff_use_color ? $colored[$i] : $diff[$i]);
b4c61ed6 633 }
4af756f3 634 return @hunk;
b4c61ed6
JH
635}
636
b717a627
JK
637sub parse_diff_header {
638 my $src = shift;
639
0392513f
JK
640 my $head = { TEXT => [], DISPLAY => [], TYPE => 'header' };
641 my $mode = { TEXT => [], DISPLAY => [], TYPE => 'mode' };
b717a627
JK
642
643 for (my $i = 0; $i < @{$src->{TEXT}}; $i++) {
644 my $dest = $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ?
645 $mode : $head;
646 push @{$dest->{TEXT}}, $src->{TEXT}->[$i];
647 push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i];
648 }
649 return ($head, $mode);
650}
651
835b2aeb
JH
652sub hunk_splittable {
653 my ($text) = @_;
654
655 my @s = split_hunk($text);
656 return (1 < @s);
657}
658
659sub parse_hunk_header {
660 my ($line) = @_;
661 my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
7288ed8e
JLH
662 $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
663 $o_cnt = 1 unless defined $o_cnt;
664 $n_cnt = 1 unless defined $n_cnt;
835b2aeb
JH
665 return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
666}
667
668sub split_hunk {
4af756f3 669 my ($text, $display) = @_;
835b2aeb 670 my @split = ();
4af756f3
WC
671 if (!defined $display) {
672 $display = $text;
673 }
835b2aeb
JH
674 # If there are context lines in the middle of a hunk,
675 # it can be split, but we would need to take care of
676 # overlaps later.
677
7b40a455 678 my ($o_ofs, undef, $n_ofs) = parse_hunk_header($text->[0]);
835b2aeb 679 my $hunk_start = 1;
835b2aeb
JH
680
681 OUTER:
682 while (1) {
683 my $next_hunk_start = undef;
684 my $i = $hunk_start - 1;
685 my $this = +{
686 TEXT => [],
4af756f3 687 DISPLAY => [],
0392513f 688 TYPE => 'hunk',
835b2aeb
JH
689 OLD => $o_ofs,
690 NEW => $n_ofs,
691 OCNT => 0,
692 NCNT => 0,
693 ADDDEL => 0,
694 POSTCTX => 0,
4af756f3 695 USE => undef,
835b2aeb
JH
696 };
697
698 while (++$i < @$text) {
699 my $line = $text->[$i];
4af756f3 700 my $display = $display->[$i];
835b2aeb
JH
701 if ($line =~ /^ /) {
702 if ($this->{ADDDEL} &&
703 !defined $next_hunk_start) {
704 # We have seen leading context and
705 # adds/dels and then here is another
706 # context, which is trailing for this
707 # split hunk and leading for the next
708 # one.
709 $next_hunk_start = $i;
710 }
711 push @{$this->{TEXT}}, $line;
4af756f3 712 push @{$this->{DISPLAY}}, $display;
835b2aeb
JH
713 $this->{OCNT}++;
714 $this->{NCNT}++;
715 if (defined $next_hunk_start) {
716 $this->{POSTCTX}++;
717 }
718 next;
719 }
720
721 # add/del
722 if (defined $next_hunk_start) {
723 # We are done with the current hunk and
724 # this is the first real change for the
725 # next split one.
726 $hunk_start = $next_hunk_start;
727 $o_ofs = $this->{OLD} + $this->{OCNT};
728 $n_ofs = $this->{NEW} + $this->{NCNT};
729 $o_ofs -= $this->{POSTCTX};
730 $n_ofs -= $this->{POSTCTX};
731 push @split, $this;
732 redo OUTER;
733 }
734 push @{$this->{TEXT}}, $line;
4af756f3 735 push @{$this->{DISPLAY}}, $display;
835b2aeb
JH
736 $this->{ADDDEL}++;
737 if ($line =~ /^-/) {
738 $this->{OCNT}++;
739 }
740 else {
741 $this->{NCNT}++;
742 }
743 }
744
745 push @split, $this;
746 last;
747 }
748
749 for my $hunk (@split) {
750 $o_ofs = $hunk->{OLD};
751 $n_ofs = $hunk->{NEW};
7b40a455
JLH
752 my $o_cnt = $hunk->{OCNT};
753 my $n_cnt = $hunk->{NCNT};
835b2aeb
JH
754
755 my $head = ("@@ -$o_ofs" .
756 (($o_cnt != 1) ? ",$o_cnt" : '') .
757 " +$n_ofs" .
758 (($n_cnt != 1) ? ",$n_cnt" : '') .
759 " @@\n");
4af756f3 760 my $display_head = $head;
835b2aeb 761 unshift @{$hunk->{TEXT}}, $head;
4af756f3
WC
762 if ($diff_use_color) {
763 $display_head = colored($fraginfo_color, $head);
764 }
765 unshift @{$hunk->{DISPLAY}}, $display_head;
835b2aeb 766 }
4af756f3 767 return @split;
835b2aeb
JH
768}
769
7a26e653
JH
770sub find_last_o_ctx {
771 my ($it) = @_;
772 my $text = $it->{TEXT};
773 my ($o_ofs, $o_cnt) = parse_hunk_header($text->[0]);
774 my $i = @{$text};
775 my $last_o_ctx = $o_ofs + $o_cnt;
776 while (0 < --$i) {
777 my $line = $text->[$i];
778 if ($line =~ /^ /) {
779 $last_o_ctx--;
780 next;
781 }
782 last;
783 }
784 return $last_o_ctx;
785}
786
787sub merge_hunk {
788 my ($prev, $this) = @_;
789 my ($o0_ofs, $o0_cnt, $n0_ofs, $n0_cnt) =
790 parse_hunk_header($prev->{TEXT}[0]);
791 my ($o1_ofs, $o1_cnt, $n1_ofs, $n1_cnt) =
792 parse_hunk_header($this->{TEXT}[0]);
793
794 my (@line, $i, $ofs, $o_cnt, $n_cnt);
795 $ofs = $o0_ofs;
796 $o_cnt = $n_cnt = 0;
797 for ($i = 1; $i < @{$prev->{TEXT}}; $i++) {
798 my $line = $prev->{TEXT}[$i];
799 if ($line =~ /^\+/) {
800 $n_cnt++;
801 push @line, $line;
802 next;
803 }
804
805 last if ($o1_ofs <= $ofs);
806
807 $o_cnt++;
808 $ofs++;
809 if ($line =~ /^ /) {
810 $n_cnt++;
811 }
812 push @line, $line;
813 }
814
815 for ($i = 1; $i < @{$this->{TEXT}}; $i++) {
816 my $line = $this->{TEXT}[$i];
817 if ($line =~ /^\+/) {
818 $n_cnt++;
819 push @line, $line;
820 next;
821 }
822 $ofs++;
823 $o_cnt++;
824 if ($line =~ /^ /) {
825 $n_cnt++;
826 }
827 push @line, $line;
828 }
829 my $head = ("@@ -$o0_ofs" .
830 (($o_cnt != 1) ? ",$o_cnt" : '') .
831 " +$n0_ofs" .
832 (($n_cnt != 1) ? ",$n_cnt" : '') .
833 " @@\n");
834 @{$prev->{TEXT}} = ($head, @line);
835}
836
837sub coalesce_overlapping_hunks {
838 my (@in) = @_;
839 my @out = ();
840
841 my ($last_o_ctx, $last_was_dirty);
842
843 for (grep { $_->{USE} } @in) {
844 my $text = $_->{TEXT};
845 my ($o_ofs) = parse_hunk_header($text->[0]);
846 if (defined $last_o_ctx &&
847 $o_ofs <= $last_o_ctx &&
848 !$_->{DIRTY} &&
849 !$last_was_dirty) {
850 merge_hunk($out[-1], $_);
851 }
852 else {
853 push @out, $_;
854 }
855 $last_o_ctx = find_last_o_ctx($out[-1]);
856 $last_was_dirty = $_->{DIRTY};
857 }
858 return @out;
859}
835b2aeb 860
ac083c47
TR
861sub color_diff {
862 return map {
863 colored((/^@/ ? $fraginfo_color :
864 /^\+/ ? $diff_new_color :
865 /^-/ ? $diff_old_color :
866 $diff_plain_color),
867 $_);
868 } @_;
869}
870
871sub edit_hunk_manually {
872 my ($oldtext) = @_;
873
874 my $hunkfile = $repo->repo_path . "/addp-hunk-edit.diff";
875 my $fh;
876 open $fh, '>', $hunkfile
877 or die "failed to open hunk edit file for writing: " . $!;
878 print $fh "# Manual hunk edit mode -- see bottom for a quick guide\n";
879 print $fh @$oldtext;
880 print $fh <<EOF;
881# ---
882# To remove '-' lines, make them ' ' lines (context).
883# To remove '+' lines, delete them.
884# Lines starting with # will be removed.
885#
886# If the patch applies cleanly, the edited hunk will immediately be
887# marked for staging. If it does not apply cleanly, you will be given
888# an opportunity to edit again. If all lines of the hunk are removed,
889# then the edit is aborted and the hunk is left unchanged.
890EOF
891 close $fh;
892
893 my $editor = $ENV{GIT_EDITOR} || $repo->config("core.editor")
894 || $ENV{VISUAL} || $ENV{EDITOR} || "vi";
895 system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
896
1d398a03
DM
897 if ($? != 0) {
898 return undef;
899 }
900
ac083c47
TR
901 open $fh, '<', $hunkfile
902 or die "failed to open hunk edit file for reading: " . $!;
903 my @newtext = grep { !/^#/ } <$fh>;
904 close $fh;
905 unlink $hunkfile;
906
907 # Abort if nothing remains
908 if (!grep { /\S/ } @newtext) {
909 return undef;
910 }
911
912 # Reinsert the first hunk header if the user accidentally deleted it
913 if ($newtext[0] !~ /^@/) {
914 unshift @newtext, $oldtext->[0];
915 }
916 return \@newtext;
917}
918
919sub diff_applies {
920 my $fh;
921 open $fh, '| git apply --recount --cached --check';
922 for my $h (@_) {
923 print $fh @{$h->{TEXT}};
924 }
925 return close $fh;
926}
927
ca6ac7f1
TR
928sub _restore_terminal_and_die {
929 ReadMode 'restore';
930 print "\n";
931 exit 1;
932}
933
934sub prompt_single_character {
935 if ($use_readkey) {
936 local $SIG{TERM} = \&_restore_terminal_and_die;
937 local $SIG{INT} = \&_restore_terminal_and_die;
938 ReadMode 'cbreak';
939 my $key = ReadKey 0;
940 ReadMode 'restore';
941 print "$key" if defined $key;
942 print "\n";
943 return $key;
944 } else {
945 return <STDIN>;
946 }
947}
948
ac083c47
TR
949sub prompt_yesno {
950 my ($prompt) = @_;
951 while (1) {
952 print colored $prompt_color, $prompt;
ca6ac7f1 953 my $line = prompt_single_character;
ac083c47
TR
954 return 0 if $line =~ /^n/i;
955 return 1 if $line =~ /^y/i;
956 }
957}
958
959sub edit_hunk_loop {
960 my ($head, $hunk, $ix) = @_;
961 my $text = $hunk->[$ix]->{TEXT};
962
963 while (1) {
964 $text = edit_hunk_manually($text);
965 if (!defined $text) {
966 return undef;
967 }
0392513f
JK
968 my $newhunk = {
969 TEXT => $text,
970 TYPE => $hunk->[$ix]->{TYPE},
7a26e653
JH
971 USE => 1,
972 DIRTY => 1,
0392513f 973 };
ac083c47
TR
974 if (diff_applies($head,
975 @{$hunk}[0..$ix-1],
976 $newhunk,
977 @{$hunk}[$ix+1..$#{$hunk}])) {
978 $newhunk->{DISPLAY} = [color_diff(@{$text})];
979 return $newhunk;
980 }
981 else {
982 prompt_yesno(
983 'Your edited hunk does not apply. Edit again '
984 . '(saying "no" discards!) [y/n]? '
985 ) or return undef;
986 }
987 }
988}
989
5cde71d6 990sub help_patch_cmd {
b4c61ed6 991 print colored $help_color, <<\EOF ;
5cde71d6
JH
992y - stage this hunk
993n - do not stage this hunk
9a7a1e03 994q - quit, do not stage this hunk nor any of the remaining ones
b63e9950
WC
995a - stage this and all the remaining hunks in the file
996d - do not stage this hunk nor any of the remaining hunks in the file
070434d0 997g - select a hunk to go to
dd971cc9 998/ - search for a hunk matching the given regex
5cde71d6
JH
999j - leave this hunk undecided, see next undecided hunk
1000J - leave this hunk undecided, see next hunk
1001k - leave this hunk undecided, see previous undecided hunk
1002K - leave this hunk undecided, see previous hunk
835b2aeb 1003s - split the current hunk into smaller hunks
ac083c47 1004e - manually edit the current hunk
280e50c7 1005? - print help
5cde71d6
JH
1006EOF
1007}
1008
1009sub patch_update_cmd {
9fe7a643
TR
1010 my @all_mods = list_modified('file-only');
1011 my @mods = grep { !($_->{BINARY}) } @all_mods;
b63e9950 1012 my @them;
5cde71d6 1013
b63e9950 1014 if (!@mods) {
9fe7a643
TR
1015 if (@all_mods) {
1016 print STDERR "Only binary files changed.\n";
1017 } else {
1018 print STDERR "No changes.\n";
1019 }
b63e9950
WC
1020 return 0;
1021 }
1022 if ($patch_mode) {
1023 @them = @mods;
1024 }
1025 else {
1026 @them = list_and_choose({ PROMPT => 'Patch update',
1027 HEADER => $status_head, },
1028 @mods);
1029 }
12db334e 1030 for (@them) {
9a7a1e03 1031 return 0 if patch_update_file($_->{VALUE});
12db334e 1032 }
a7d9da6c 1033}
5cde71d6 1034
3f6aff68
WP
1035# Generate a one line summary of a hunk.
1036sub summarize_hunk {
1037 my $rhunk = shift;
1038 my $summary = $rhunk->{TEXT}[0];
1039
1040 # Keep the line numbers, discard extra context.
1041 $summary =~ s/@@(.*?)@@.*/$1 /s;
1042 $summary .= " " x (20 - length $summary);
1043
1044 # Add some user context.
1045 for my $line (@{$rhunk->{TEXT}}) {
1046 if ($line =~ m/^[+-].*\w/) {
1047 $summary .= $line;
1048 last;
1049 }
1050 }
1051
1052 chomp $summary;
1053 return substr($summary, 0, 80) . "\n";
1054}
1055
1056
1057# Print a one-line summary of each hunk in the array ref in
1058# the first argument, starting wih the index in the 2nd.
1059sub display_hunks {
1060 my ($hunks, $i) = @_;
1061 my $ctr = 0;
1062 $i ||= 0;
1063 for (; $i < @$hunks && $ctr < 20; $i++, $ctr++) {
1064 my $status = " ";
1065 if (defined $hunks->[$i]{USE}) {
1066 $status = $hunks->[$i]{USE} ? "+" : "-";
1067 }
1068 printf "%s%2d: %s",
1069 $status,
1070 $i + 1,
1071 summarize_hunk($hunks->[$i]);
1072 }
1073 return $i;
1074}
1075
a7d9da6c 1076sub patch_update_file {
9a7a1e03 1077 my $quit = 0;
5cde71d6 1078 my ($ix, $num);
a7d9da6c 1079 my $path = shift;
5cde71d6 1080 my ($head, @hunk) = parse_diff($path);
b717a627 1081 ($head, my $mode) = parse_diff_header($head);
4af756f3
WC
1082 for (@{$head->{DISPLAY}}) {
1083 print;
1084 }
ca724686
JK
1085
1086 if (@{$mode->{TEXT}}) {
0392513f 1087 unshift @hunk, $mode;
ca724686
JK
1088 }
1089
5cde71d6
JH
1090 $num = scalar @hunk;
1091 $ix = 0;
1092
1093 while (1) {
835b2aeb 1094 my ($prev, $next, $other, $undecided, $i);
5cde71d6
JH
1095 $other = '';
1096
1097 if ($num <= $ix) {
1098 $ix = 0;
1099 }
835b2aeb 1100 for ($i = 0; $i < $ix; $i++) {
5cde71d6
JH
1101 if (!defined $hunk[$i]{USE}) {
1102 $prev = 1;
57886bc7 1103 $other .= ',k';
5cde71d6
JH
1104 last;
1105 }
1106 }
1107 if ($ix) {
57886bc7 1108 $other .= ',K';
5cde71d6 1109 }
835b2aeb 1110 for ($i = $ix + 1; $i < $num; $i++) {
5cde71d6
JH
1111 if (!defined $hunk[$i]{USE}) {
1112 $next = 1;
57886bc7 1113 $other .= ',j';
5cde71d6
JH
1114 last;
1115 }
1116 }
1117 if ($ix < $num - 1) {
57886bc7 1118 $other .= ',J';
5cde71d6 1119 }
070434d0 1120 if ($num > 1) {
4404b2e3 1121 $other .= ',g';
070434d0 1122 }
835b2aeb 1123 for ($i = 0; $i < $num; $i++) {
5cde71d6
JH
1124 if (!defined $hunk[$i]{USE}) {
1125 $undecided = 1;
1126 last;
1127 }
1128 }
1129 last if (!$undecided);
1130
0392513f
JK
1131 if ($hunk[$ix]{TYPE} eq 'hunk' &&
1132 hunk_splittable($hunk[$ix]{TEXT})) {
57886bc7 1133 $other .= ',s';
835b2aeb 1134 }
0392513f
JK
1135 if ($hunk[$ix]{TYPE} eq 'hunk') {
1136 $other .= ',e';
1137 }
4af756f3
WC
1138 for (@{$hunk[$ix]{DISPLAY}}) {
1139 print;
1140 }
0392513f
JK
1141 print colored $prompt_color, 'Stage ',
1142 ($hunk[$ix]{TYPE} eq 'mode' ? 'mode change' : 'this hunk'),
a2fc8d65 1143 " [y,n,q,a,d,/$other,?]? ";
ca6ac7f1 1144 my $line = prompt_single_character;
5cde71d6
JH
1145 if ($line) {
1146 if ($line =~ /^y/i) {
1147 $hunk[$ix]{USE} = 1;
1148 }
1149 elsif ($line =~ /^n/i) {
1150 $hunk[$ix]{USE} = 0;
1151 }
1152 elsif ($line =~ /^a/i) {
1153 while ($ix < $num) {
1154 if (!defined $hunk[$ix]{USE}) {
1155 $hunk[$ix]{USE} = 1;
1156 }
1157 $ix++;
1158 }
1159 next;
1160 }
070434d0
WP
1161 elsif ($other =~ /g/ && $line =~ /^g(.*)/) {
1162 my $response = $1;
1163 my $no = $ix > 10 ? $ix - 10 : 0;
1164 while ($response eq '') {
1165 my $extra = "";
1166 $no = display_hunks(\@hunk, $no);
1167 if ($no < $num) {
1168 $extra = " (<ret> to see more)";
1169 }
1170 print "go to which hunk$extra? ";
1171 $response = <STDIN>;
68c02d7c
TR
1172 if (!defined $response) {
1173 $response = '';
1174 }
070434d0
WP
1175 chomp $response;
1176 }
1177 if ($response !~ /^\s*\d+\s*$/) {
a3019736 1178 error_msg "Invalid number: '$response'\n";
070434d0
WP
1179 } elsif (0 < $response && $response <= $num) {
1180 $ix = $response - 1;
1181 } else {
a3019736 1182 error_msg "Sorry, only $num hunks available.\n";
070434d0
WP
1183 }
1184 next;
1185 }
5cde71d6
JH
1186 elsif ($line =~ /^d/i) {
1187 while ($ix < $num) {
1188 if (!defined $hunk[$ix]{USE}) {
1189 $hunk[$ix]{USE} = 0;
1190 }
1191 $ix++;
1192 }
1193 next;
1194 }
9a7a1e03
MM
1195 elsif ($line =~ /^q/i) {
1196 while ($ix < $num) {
1197 if (!defined $hunk[$ix]{USE}) {
1198 $hunk[$ix]{USE} = 0;
1199 }
1200 $ix++;
1201 }
1202 $quit = 1;
1203 next;
1204 }
dd971cc9 1205 elsif ($line =~ m|^/(.*)|) {
ca6ac7f1
TR
1206 my $regex = $1;
1207 if ($1 eq "") {
1208 print colored $prompt_color, "search for regex? ";
1209 $regex = <STDIN>;
1210 if (defined $regex) {
1211 chomp $regex;
1212 }
1213 }
dd971cc9
WP
1214 my $search_string;
1215 eval {
ca6ac7f1 1216 $search_string = qr{$regex}m;
dd971cc9
WP
1217 };
1218 if ($@) {
1219 my ($err,$exp) = ($@, $1);
1220 $err =~ s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//;
a3019736 1221 error_msg "Malformed search regexp $exp: $err\n";
dd971cc9
WP
1222 next;
1223 }
1224 my $iy = $ix;
1225 while (1) {
1226 my $text = join ("", @{$hunk[$iy]{TEXT}});
1227 last if ($text =~ $search_string);
1228 $iy++;
1229 $iy = 0 if ($iy >= $num);
1230 if ($ix == $iy) {
a3019736 1231 error_msg "No hunk matches the given pattern\n";
dd971cc9
WP
1232 last;
1233 }
1234 }
1235 $ix = $iy;
1236 next;
1237 }
ace30ba8
WP
1238 elsif ($line =~ /^K/) {
1239 if ($other =~ /K/) {
1240 $ix--;
1241 }
1242 else {
a3019736 1243 error_msg "No previous hunk\n";
ace30ba8 1244 }
5cde71d6
JH
1245 next;
1246 }
ace30ba8
WP
1247 elsif ($line =~ /^J/) {
1248 if ($other =~ /J/) {
1249 $ix++;
1250 }
1251 else {
a3019736 1252 error_msg "No next hunk\n";
ace30ba8 1253 }
5cde71d6
JH
1254 next;
1255 }
ace30ba8
WP
1256 elsif ($line =~ /^k/) {
1257 if ($other =~ /k/) {
1258 while (1) {
1259 $ix--;
1260 last if (!$ix ||
1261 !defined $hunk[$ix]{USE});
1262 }
1263 }
1264 else {
a3019736 1265 error_msg "No previous hunk\n";
5cde71d6
JH
1266 }
1267 next;
1268 }
ace30ba8
WP
1269 elsif ($line =~ /^j/) {
1270 if ($other !~ /j/) {
a3019736 1271 error_msg "No next hunk\n";
ace30ba8 1272 next;
5cde71d6 1273 }
5cde71d6 1274 }
835b2aeb 1275 elsif ($other =~ /s/ && $line =~ /^s/) {
4af756f3 1276 my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});
835b2aeb 1277 if (1 < @split) {
b4c61ed6 1278 print colored $header_color, "Split into ",
835b2aeb
JH
1279 scalar(@split), " hunks.\n";
1280 }
4af756f3 1281 splice (@hunk, $ix, 1, @split);
835b2aeb
JH
1282 $num = scalar @hunk;
1283 next;
1284 }
0392513f 1285 elsif ($other =~ /e/ && $line =~ /^e/) {
ac083c47
TR
1286 my $newhunk = edit_hunk_loop($head, \@hunk, $ix);
1287 if (defined $newhunk) {
1288 splice @hunk, $ix, 1, $newhunk;
1289 }
1290 }
5cde71d6
JH
1291 else {
1292 help_patch_cmd($other);
1293 next;
1294 }
1295 # soft increment
1296 while (1) {
1297 $ix++;
1298 last if ($ix >= $num ||
1299 !defined $hunk[$ix]{USE});
1300 }
1301 }
1302 }
1303
7a26e653
JH
1304 @hunk = coalesce_overlapping_hunks(@hunk);
1305
7b40a455 1306 my $n_lofs = 0;
5cde71d6
JH
1307 my @result = ();
1308 for (@hunk) {
8cbd4310
TR
1309 if ($_->{USE}) {
1310 push @result, @{$_->{TEXT}};
5cde71d6
JH
1311 }
1312 }
1313
1314 if (@result) {
1315 my $fh;
1316
8cbd4310 1317 open $fh, '| git apply --cached --recount';
5cde71d6
JH
1318 for (@{$head->{TEXT}}, @result) {
1319 print $fh $_;
1320 }
835b2aeb
JH
1321 if (!close $fh) {
1322 for (@{$head->{TEXT}}, @result) {
1323 print STDERR $_;
1324 }
1325 }
5cde71d6
JH
1326 refresh();
1327 }
1328
1329 print "\n";
9a7a1e03 1330 return $quit;
5cde71d6
JH
1331}
1332
1333sub diff_cmd {
1334 my @mods = list_modified('index-only');
1335 @mods = grep { !($_->{BINARY}) } @mods;
1336 return if (!@mods);
1337 my (@them) = list_and_choose({ PROMPT => 'Review diff',
1338 IMMEDIATE => 1,
1339 HEADER => $status_head, },
1340 @mods);
1341 return if (!@them);
18bc7616
JK
1342 my $reference = is_initial_commit() ? get_empty_tree() : 'HEAD';
1343 system(qw(git diff -p --cached), $reference, '--',
1344 map { $_->{VALUE} } @them);
5cde71d6
JH
1345}
1346
1347sub quit_cmd {
1348 print "Bye.\n";
1349 exit(0);
1350}
1351
1352sub help_cmd {
b4c61ed6 1353 print colored $help_color, <<\EOF ;
5cde71d6
JH
1354status - show paths with changes
1355update - add working tree state to the staged set of changes
1356revert - revert staged set of changes back to the HEAD version
1357patch - pick hunks and update selectively
1358diff - view diff between HEAD and index
1359add untracked - add contents of untracked files to the staged set of changes
1360EOF
1361}
1362
b63e9950
WC
1363sub process_args {
1364 return unless @ARGV;
1365 my $arg = shift @ARGV;
1366 if ($arg eq "--patch") {
1367 $patch_mode = 1;
1368 $arg = shift @ARGV or die "missing --";
1369 die "invalid argument $arg, expecting --"
1370 unless $arg eq "--";
1371 }
1372 elsif ($arg ne "--") {
1373 die "invalid argument $arg, expecting --";
1374 }
1375}
1376
5cde71d6
JH
1377sub main_loop {
1378 my @cmd = ([ 'status', \&status_cmd, ],
1379 [ 'update', \&update_cmd, ],
1380 [ 'revert', \&revert_cmd, ],
1381 [ 'add untracked', \&add_untracked_cmd, ],
1382 [ 'patch', \&patch_update_cmd, ],
1383 [ 'diff', \&diff_cmd, ],
1384 [ 'quit', \&quit_cmd, ],
1385 [ 'help', \&help_cmd, ],
1386 );
1387 while (1) {
1388 my ($it) = list_and_choose({ PROMPT => 'What now',
1389 SINGLETON => 1,
1390 LIST_FLAT => 4,
1391 HEADER => '*** Commands ***',
c95c0248 1392 ON_EOF => \&quit_cmd,
5cde71d6
JH
1393 IMMEDIATE => 1 }, @cmd);
1394 if ($it) {
1395 eval {
1396 $it->[1]->();
1397 };
1398 if ($@) {
1399 print "$@";
1400 }
1401 }
1402 }
1403}
1404
b63e9950 1405process_args();
5cde71d6 1406refresh();
b63e9950
WC
1407if ($patch_mode) {
1408 patch_update_cmd();
1409}
1410else {
1411 status_cmd();
1412 main_loop();
1413}