i18n: add--interactive: i18n of help_patch_cmd
[git/git.git] / git-add--interactive.perl
CommitLineData
3328aced 1#!/usr/bin/perl
5cde71d6 2
d48b2841 3use 5.008;
5cde71d6 4use strict;
3328aced 5use warnings;
b4c61ed6 6use Git;
258e7790 7use Git::I18N;
b4c61ed6 8
8851f480
JH
9binmode(STDOUT, ":raw");
10
b4c61ed6
JH
11my $repo = Git->repository();
12
f87e310d
JK
13my $menu_use_color = $repo->get_colorbool('color.interactive');
14my ($prompt_color, $header_color, $help_color) =
15 $menu_use_color ? (
16 $repo->get_color('color.interactive.prompt', 'bold blue'),
17 $repo->get_color('color.interactive.header', 'bold'),
18 $repo->get_color('color.interactive.help', 'red bold'),
19 ) : ();
a3019736
TR
20my $error_color = ();
21if ($menu_use_color) {
9aad6cba
SB
22 my $help_color_spec = ($repo->config('color.interactive.help') or
23 'red bold');
a3019736
TR
24 $error_color = $repo->get_color('color.interactive.error',
25 $help_color_spec);
26}
b4c61ed6 27
f87e310d
JK
28my $diff_use_color = $repo->get_colorbool('color.diff');
29my ($fraginfo_color) =
30 $diff_use_color ? (
31 $repo->get_color('color.diff.frag', 'cyan'),
32 ) : ();
ac083c47
TR
33my ($diff_plain_color) =
34 $diff_use_color ? (
35 $repo->get_color('color.diff.plain', ''),
36 ) : ();
37my ($diff_old_color) =
38 $diff_use_color ? (
39 $repo->get_color('color.diff.old', 'red'),
40 ) : ();
41my ($diff_new_color) =
42 $diff_use_color ? (
43 $repo->get_color('color.diff.new', 'green'),
44 ) : ();
b4c61ed6 45
f87e310d 46my $normal_color = $repo->get_color("", "reset");
b4c61ed6 47
2cc0f53b 48my $diff_algorithm = $repo->config('diff.algorithm');
46e3d17f 49my $diff_compaction_heuristic = $repo->config_bool('diff.compactionheuristic');
01143847 50my $diff_filter = $repo->config('interactive.difffilter');
2cc0f53b 51
ca6ac7f1 52my $use_readkey = 0;
b5cc0032
TR
53my $use_termcap = 0;
54my %term_escapes;
55
748aa689
TR
56sub ReadMode;
57sub ReadKey;
ca6ac7f1
TR
58if ($repo->config_bool("interactive.singlekey")) {
59 eval {
748aa689
TR
60 require Term::ReadKey;
61 Term::ReadKey->import;
ca6ac7f1
TR
62 $use_readkey = 1;
63 };
b294097b
SR
64 if (!$use_readkey) {
65 print STDERR "missing Term::ReadKey, disabling interactive.singlekey\n";
66 }
b5cc0032
TR
67 eval {
68 require Term::Cap;
69 my $termcap = Term::Cap->Tgetent;
70 foreach (values %$termcap) {
71 $term_escapes{$_} = 1 if /^\e/;
72 }
73 $use_termcap = 1;
74 };
ca6ac7f1
TR
75}
76
b4c61ed6
JH
77sub colored {
78 my $color = shift;
79 my $string = join("", @_);
80
f87e310d 81 if (defined $color) {
b4c61ed6
JH
82 # Put a color code at the beginning of each line, a reset at the end
83 # color after newlines that are not at the end of the string
84 $string =~ s/(\n+)(.)/$1$color$2/g;
85 # reset before newlines
86 $string =~ s/(\n+)/$normal_color$1/g;
87 # codes at beginning and end (if necessary):
88 $string =~ s/^/$color/;
89 $string =~ s/$/$normal_color/ unless $string =~ /\n$/;
90 }
91 return $string;
92}
5cde71d6 93
b63e9950 94# command line options
0539d5e6 95my $cmd;
b63e9950 96my $patch_mode;
d002ef4d 97my $patch_mode_revision;
b63e9950 98
8f0bef6d 99sub apply_patch;
4f353658 100sub apply_patch_for_checkout_commit;
dda1f2a5 101sub apply_patch_for_stash;
8f0bef6d
TR
102
103my %patch_modes = (
104 'stage' => {
105 DIFF => 'diff-files -p',
106 APPLY => sub { apply_patch 'apply --cached', @_; },
107 APPLY_CHECK => 'apply --cached',
108 VERB => 'Stage',
109 TARGET => '',
110 PARTICIPLE => 'staging',
111 FILTER => 'file-only',
7b8c7051 112 IS_REVERSE => 0,
8f0bef6d 113 },
dda1f2a5
TR
114 'stash' => {
115 DIFF => 'diff-index -p HEAD',
116 APPLY => sub { apply_patch 'apply --cached', @_; },
117 APPLY_CHECK => 'apply --cached',
118 VERB => 'Stash',
119 TARGET => '',
120 PARTICIPLE => 'stashing',
121 FILTER => undef,
7b8c7051 122 IS_REVERSE => 0,
dda1f2a5 123 },
d002ef4d
TR
124 'reset_head' => {
125 DIFF => 'diff-index -p --cached',
126 APPLY => sub { apply_patch 'apply -R --cached', @_; },
127 APPLY_CHECK => 'apply -R --cached',
128 VERB => 'Unstage',
129 TARGET => '',
130 PARTICIPLE => 'unstaging',
131 FILTER => 'index-only',
7b8c7051 132 IS_REVERSE => 1,
d002ef4d
TR
133 },
134 'reset_nothead' => {
135 DIFF => 'diff-index -R -p --cached',
136 APPLY => sub { apply_patch 'apply --cached', @_; },
137 APPLY_CHECK => 'apply --cached',
138 VERB => 'Apply',
139 TARGET => ' to index',
140 PARTICIPLE => 'applying',
141 FILTER => 'index-only',
7b8c7051 142 IS_REVERSE => 0,
d002ef4d 143 },
4f353658
TR
144 'checkout_index' => {
145 DIFF => 'diff-files -p',
146 APPLY => sub { apply_patch 'apply -R', @_; },
147 APPLY_CHECK => 'apply -R',
148 VERB => 'Discard',
149 TARGET => ' from worktree',
150 PARTICIPLE => 'discarding',
151 FILTER => 'file-only',
7b8c7051 152 IS_REVERSE => 1,
4f353658
TR
153 },
154 'checkout_head' => {
155 DIFF => 'diff-index -p',
156 APPLY => sub { apply_patch_for_checkout_commit '-R', @_ },
157 APPLY_CHECK => 'apply -R',
158 VERB => 'Discard',
159 TARGET => ' from index and worktree',
160 PARTICIPLE => 'discarding',
161 FILTER => undef,
7b8c7051 162 IS_REVERSE => 1,
4f353658
TR
163 },
164 'checkout_nothead' => {
165 DIFF => 'diff-index -R -p',
166 APPLY => sub { apply_patch_for_checkout_commit '', @_ },
167 APPLY_CHECK => 'apply',
168 VERB => 'Apply',
169 TARGET => ' to index and worktree',
170 PARTICIPLE => 'applying',
171 FILTER => undef,
7b8c7051 172 IS_REVERSE => 0,
4f353658 173 },
8f0bef6d
TR
174);
175
0539d5e6
VA
176$patch_mode = 'stage';
177my %patch_mode_flavour = %{$patch_modes{$patch_mode}};
b63e9950 178
5cde71d6 179sub run_cmd_pipe {
df17e77c 180 if ($^O eq 'MSWin32') {
21e9757e
AR
181 my @invalid = grep {m/[":*]/} @_;
182 die "$^O does not support: @invalid\n" if @invalid;
183 my @args = map { m/ /o ? "\"$_\"": $_ } @_;
184 return qx{@args};
185 } else {
186 my $fh = undef;
187 open($fh, '-|', @_) or die;
188 return <$fh>;
189 }
5cde71d6
JH
190}
191
192my ($GIT_DIR) = run_cmd_pipe(qw(git rev-parse --git-dir));
193
194if (!defined $GIT_DIR) {
195 exit(1); # rev-parse would have already said "not a git repo"
196}
197chomp($GIT_DIR);
198
8851f480
JH
199my %cquote_map = (
200 "b" => chr(8),
201 "t" => chr(9),
202 "n" => chr(10),
203 "v" => chr(11),
204 "f" => chr(12),
205 "r" => chr(13),
206 "\\" => "\\",
207 "\042" => "\042",
208);
209
210sub unquote_path {
211 local ($_) = @_;
212 my ($retval, $remainder);
213 if (!/^\042(.*)\042$/) {
214 return $_;
215 }
216 ($_, $retval) = ($1, "");
217 while (/^([^\\]*)\\(.*)$/) {
218 $remainder = $2;
219 $retval .= $1;
220 for ($remainder) {
221 if (/^([0-3][0-7][0-7])(.*)$/) {
222 $retval .= chr(oct($1));
223 $_ = $2;
224 last;
225 }
226 if (/^([\\\042btnvfr])(.*)$/) {
227 $retval .= $cquote_map{$1};
228 $_ = $2;
229 last;
230 }
231 # This is malformed -- just return it as-is for now.
232 return $_[0];
233 }
234 $_ = $remainder;
235 }
236 $retval .= $_;
237 return $retval;
238}
239
5cde71d6
JH
240sub refresh {
241 my $fh;
21e9757e 242 open $fh, 'git update-index --refresh |'
5cde71d6
JH
243 or die;
244 while (<$fh>) {
245 ;# ignore 'needs update'
246 }
247 close $fh;
248}
249
250sub list_untracked {
251 map {
252 chomp $_;
8851f480 253 unquote_path($_);
5cde71d6 254 }
4c841684 255 run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @ARGV);
5cde71d6
JH
256}
257
258e7790
VA
258# TRANSLATORS: you can adjust this to align "git add -i" status menu
259my $status_fmt = __('%12s %12s %s');
260my $status_head = sprintf($status_fmt, __('staged'), __('unstaged'), __('path'));
5cde71d6 261
18bc7616
JK
262{
263 my $initial;
264 sub is_initial_commit {
265 $initial = system('git rev-parse HEAD -- >/dev/null 2>&1') != 0
266 unless defined $initial;
267 return $initial;
268 }
269}
270
271sub get_empty_tree {
272 return '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
273}
274
954312a3
JK
275sub get_diff_reference {
276 my $ref = shift;
277 if (defined $ref and $ref ne 'HEAD') {
278 return $ref;
279 } elsif (is_initial_commit()) {
280 return get_empty_tree();
281 } else {
282 return 'HEAD';
283 }
284}
285
5cde71d6 286# Returns list of hashes, contents of each of which are:
5cde71d6
JH
287# VALUE: pathname
288# BINARY: is a binary path
289# INDEX: is index different from HEAD?
290# FILE: is file different from index?
291# INDEX_ADDDEL: is it add/delete between HEAD and index?
292# FILE_ADDDEL: is it add/delete between index and file?
4066bd67 293# UNMERGED: is the path unmerged
5cde71d6
JH
294
295sub list_modified {
296 my ($only) = @_;
297 my (%data, @return);
298 my ($add, $del, $adddel, $file);
4c841684
WC
299 my @tracked = ();
300
301 if (@ARGV) {
302 @tracked = map {
8851f480
JH
303 chomp $_;
304 unquote_path($_);
b145b211 305 } run_cmd_pipe(qw(git ls-files --), @ARGV);
4c841684
WC
306 return if (!@tracked);
307 }
5cde71d6 308
954312a3 309 my $reference = get_diff_reference($patch_mode_revision);
5cde71d6 310 for (run_cmd_pipe(qw(git diff-index --cached
18bc7616
JK
311 --numstat --summary), $reference,
312 '--', @tracked)) {
5cde71d6
JH
313 if (($add, $del, $file) =
314 /^([-\d]+) ([-\d]+) (.*)/) {
315 my ($change, $bin);
8851f480 316 $file = unquote_path($file);
5cde71d6
JH
317 if ($add eq '-' && $del eq '-') {
318 $change = 'binary';
319 $bin = 1;
320 }
321 else {
322 $change = "+$add/-$del";
323 }
324 $data{$file} = {
325 INDEX => $change,
326 BINARY => $bin,
327 FILE => 'nothing',
328 }
329 }
330 elsif (($adddel, $file) =
331 /^ (create|delete) mode [0-7]+ (.*)$/) {
8851f480 332 $file = unquote_path($file);
5cde71d6
JH
333 $data{$file}{INDEX_ADDDEL} = $adddel;
334 }
335 }
336
4066bd67 337 for (run_cmd_pipe(qw(git diff-files --numstat --summary --raw --), @tracked)) {
5cde71d6
JH
338 if (($add, $del, $file) =
339 /^([-\d]+) ([-\d]+) (.*)/) {
8851f480 340 $file = unquote_path($file);
5cde71d6
JH
341 my ($change, $bin);
342 if ($add eq '-' && $del eq '-') {
343 $change = 'binary';
344 $bin = 1;
345 }
346 else {
347 $change = "+$add/-$del";
348 }
349 $data{$file}{FILE} = $change;
350 if ($bin) {
351 $data{$file}{BINARY} = 1;
352 }
353 }
354 elsif (($adddel, $file) =
355 /^ (create|delete) mode [0-7]+ (.*)$/) {
8851f480 356 $file = unquote_path($file);
5cde71d6
JH
357 $data{$file}{FILE_ADDDEL} = $adddel;
358 }
4066bd67
JK
359 elsif (/^:[0-7]+ [0-7]+ [0-9a-f]+ [0-9a-f]+ (.) (.*)$/) {
360 $file = unquote_path($2);
361 if (!exists $data{$file}) {
362 $data{$file} = +{
363 INDEX => 'unchanged',
364 BINARY => 0,
365 };
366 }
367 if ($1 eq 'U') {
368 $data{$file}{UNMERGED} = 1;
369 }
370 }
5cde71d6
JH
371 }
372
373 for (sort keys %data) {
374 my $it = $data{$_};
375
376 if ($only) {
377 if ($only eq 'index-only') {
378 next if ($it->{INDEX} eq 'unchanged');
379 }
380 if ($only eq 'file-only') {
381 next if ($it->{FILE} eq 'nothing');
382 }
383 }
384 push @return, +{
385 VALUE => $_,
5cde71d6
JH
386 %$it,
387 };
388 }
389 return @return;
390}
391
392sub find_unique {
393 my ($string, @stuff) = @_;
394 my $found = undef;
395 for (my $i = 0; $i < @stuff; $i++) {
396 my $it = $stuff[$i];
397 my $hit = undef;
398 if (ref $it) {
399 if ((ref $it) eq 'ARRAY') {
400 $it = $it->[0];
401 }
402 else {
403 $it = $it->{VALUE};
404 }
405 }
406 eval {
407 if ($it =~ /^$string/) {
408 $hit = 1;
409 };
410 };
411 if (defined $hit && defined $found) {
412 return undef;
413 }
414 if ($hit) {
415 $found = $i + 1;
416 }
417 }
418 return $found;
419}
420
14cb5038
WC
421# inserts string into trie and updates count for each character
422sub update_trie {
423 my ($trie, $string) = @_;
424 foreach (split //, $string) {
425 $trie = $trie->{$_} ||= {COUNT => 0};
426 $trie->{COUNT}++;
427 }
428}
429
430# returns an array of tuples (prefix, remainder)
431sub find_unique_prefixes {
432 my @stuff = @_;
433 my @return = ();
434
435 # any single prefix exceeding the soft limit is omitted
436 # if any prefix exceeds the hard limit all are omitted
437 # 0 indicates no limit
438 my $soft_limit = 0;
439 my $hard_limit = 3;
440
441 # build a trie modelling all possible options
442 my %trie;
443 foreach my $print (@stuff) {
444 if ((ref $print) eq 'ARRAY') {
445 $print = $print->[0];
446 }
63320989 447 elsif ((ref $print) eq 'HASH') {
14cb5038
WC
448 $print = $print->{VALUE};
449 }
450 update_trie(\%trie, $print);
451 push @return, $print;
452 }
453
454 # use the trie to find the unique prefixes
455 for (my $i = 0; $i < @return; $i++) {
456 my $ret = $return[$i];
457 my @letters = split //, $ret;
458 my %search = %trie;
459 my ($prefix, $remainder);
460 my $j;
461 for ($j = 0; $j < @letters; $j++) {
462 my $letter = $letters[$j];
463 if ($search{$letter}{COUNT} == 1) {
464 $prefix = substr $ret, 0, $j + 1;
465 $remainder = substr $ret, $j + 1;
466 last;
467 }
468 else {
469 my $prefix = substr $ret, 0, $j;
470 return ()
471 if ($hard_limit && $j + 1 > $hard_limit);
472 }
473 %search = %{$search{$letter}};
474 }
8851f480
JH
475 if (ord($letters[0]) > 127 ||
476 ($soft_limit && $j + 1 > $soft_limit)) {
14cb5038
WC
477 $prefix = undef;
478 $remainder = $ret;
479 }
480 $return[$i] = [$prefix, $remainder];
481 }
482 return @return;
483}
484
63320989
WC
485# filters out prefixes which have special meaning to list_and_choose()
486sub is_valid_prefix {
487 my $prefix = shift;
488 return (defined $prefix) &&
489 !($prefix =~ /[\s,]/) && # separators
490 !($prefix =~ /^-/) && # deselection
491 !($prefix =~ /^\d+/) && # selection
7e018be2
WC
492 ($prefix ne '*') && # "all" wildcard
493 ($prefix ne '?'); # prompt help
63320989
WC
494}
495
14cb5038
WC
496# given a prefix/remainder tuple return a string with the prefix highlighted
497# for now use square brackets; later might use ANSI colors (underline, bold)
498sub highlight_prefix {
499 my $prefix = shift;
500 my $remainder = shift;
b4c61ed6
JH
501
502 if (!defined $prefix) {
503 return $remainder;
504 }
505
506 if (!is_valid_prefix($prefix)) {
507 return "$prefix$remainder";
508 }
509
f87e310d 510 if (!$menu_use_color) {
b4c61ed6
JH
511 return "[$prefix]$remainder";
512 }
513
514 return "$prompt_color$prefix$normal_color$remainder";
14cb5038
WC
515}
516
a3019736
TR
517sub error_msg {
518 print STDERR colored $error_color, @_;
519}
520
5cde71d6
JH
521sub list_and_choose {
522 my ($opts, @stuff) = @_;
523 my (@chosen, @return);
a9c4641d
AK
524 if (!@stuff) {
525 return @return;
526 }
5cde71d6 527 my $i;
14cb5038 528 my @prefixes = find_unique_prefixes(@stuff) unless $opts->{LIST_ONLY};
5cde71d6
JH
529
530 TOPLOOP:
531 while (1) {
532 my $last_lf = 0;
533
534 if ($opts->{HEADER}) {
535 if (!$opts->{LIST_FLAT}) {
536 print " ";
537 }
b4c61ed6 538 print colored $header_color, "$opts->{HEADER}\n";
5cde71d6
JH
539 }
540 for ($i = 0; $i < @stuff; $i++) {
541 my $chosen = $chosen[$i] ? '*' : ' ';
542 my $print = $stuff[$i];
63320989
WC
543 my $ref = ref $print;
544 my $highlighted = highlight_prefix(@{$prefixes[$i]})
545 if @prefixes;
546 if ($ref eq 'ARRAY') {
547 $print = $highlighted || $print->[0];
548 }
549 elsif ($ref eq 'HASH') {
550 my $value = $highlighted || $print->{VALUE};
551 $print = sprintf($status_fmt,
552 $print->{INDEX},
553 $print->{FILE},
554 $value);
555 }
556 else {
557 $print = $highlighted || $print;
5cde71d6
JH
558 }
559 printf("%s%2d: %s", $chosen, $i+1, $print);
560 if (($opts->{LIST_FLAT}) &&
561 (($i + 1) % ($opts->{LIST_FLAT}))) {
562 print "\t";
563 $last_lf = 0;
564 }
565 else {
566 print "\n";
567 $last_lf = 1;
568 }
569 }
570 if (!$last_lf) {
571 print "\n";
572 }
573
574 return if ($opts->{LIST_ONLY});
575
b4c61ed6 576 print colored $prompt_color, $opts->{PROMPT};
5cde71d6
JH
577 if ($opts->{SINGLETON}) {
578 print "> ";
579 }
580 else {
581 print ">> ";
582 }
583 my $line = <STDIN>;
c95c0248
JLH
584 if (!$line) {
585 print "\n";
586 $opts->{ON_EOF}->() if $opts->{ON_EOF};
587 last;
588 }
5cde71d6 589 chomp $line;
6a6eb3d0 590 last if $line eq '';
7e018be2
WC
591 if ($line eq '?') {
592 $opts->{SINGLETON} ?
593 singleton_prompt_help_cmd() :
594 prompt_help_cmd();
595 next TOPLOOP;
596 }
5cde71d6
JH
597 for my $choice (split(/[\s,]+/, $line)) {
598 my $choose = 1;
599 my ($bottom, $top);
600
601 # Input that begins with '-'; unchoose
602 if ($choice =~ s/^-//) {
603 $choose = 0;
604 }
1e5aaa6d
CM
605 # A range can be specified like 5-7 or 5-.
606 if ($choice =~ /^(\d+)-(\d*)$/) {
607 ($bottom, $top) = ($1, length($2) ? $2 : 1 + @stuff);
5cde71d6
JH
608 }
609 elsif ($choice =~ /^\d+$/) {
610 $bottom = $top = $choice;
611 }
612 elsif ($choice eq '*') {
613 $bottom = 1;
614 $top = 1 + @stuff;
615 }
616 else {
617 $bottom = $top = find_unique($choice, @stuff);
618 if (!defined $bottom) {
13c58c17 619 error_msg sprintf(__("Huh (%s)?\n"), $choice);
5cde71d6
JH
620 next TOPLOOP;
621 }
622 }
623 if ($opts->{SINGLETON} && $bottom != $top) {
13c58c17 624 error_msg sprintf(__("Huh (%s)?\n"), $choice);
5cde71d6
JH
625 next TOPLOOP;
626 }
627 for ($i = $bottom-1; $i <= $top-1; $i++) {
6a6eb3d0 628 next if (@stuff <= $i || $i < 0);
5cde71d6 629 $chosen[$i] = $choose;
5cde71d6
JH
630 }
631 }
12db334e 632 last if ($opts->{IMMEDIATE} || $line eq '*');
5cde71d6
JH
633 }
634 for ($i = 0; $i < @stuff; $i++) {
635 if ($chosen[$i]) {
636 push @return, $stuff[$i];
637 }
638 }
639 return @return;
640}
641
7e018be2 642sub singleton_prompt_help_cmd {
5fa83264 643 print colored $help_color, __ <<'EOF' ;
7e018be2
WC
644Prompt help:
6451 - select a numbered item
646foo - select item based on unique prefix
647 - (empty) select nothing
648EOF
649}
650
651sub prompt_help_cmd {
5fa83264 652 print colored $help_color, __ <<'EOF' ;
7e018be2
WC
653Prompt help:
6541 - select a single item
6553-5 - select a range of items
6562-3,6-9 - select multiple ranges
657foo - select item based on unique prefix
658-... - unselect specified items
659* - choose all items
660 - (empty) finish selecting
661EOF
662}
663
5cde71d6
JH
664sub status_cmd {
665 list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
666 list_modified());
667 print "\n";
668}
669
670sub say_n_paths {
671 my $did = shift @_;
672 my $cnt = scalar @_;
c4a85c3b
VA
673 if ($did eq 'added') {
674 printf(__n("added %d path\n", "added %d paths\n",
675 $cnt), $cnt);
676 } elsif ($did eq 'updated') {
677 printf(__n("updated %d path\n", "updated %d paths\n",
678 $cnt), $cnt);
679 } elsif ($did eq 'reverted') {
680 printf(__n("reverted %d path\n", "reverted %d paths\n",
681 $cnt), $cnt);
682 } else {
683 printf(__n("touched %d path\n", "touched %d paths\n",
684 $cnt), $cnt);
5cde71d6
JH
685 }
686}
687
688sub update_cmd {
689 my @mods = list_modified('file-only');
690 return if (!@mods);
691
258e7790 692 my @update = list_and_choose({ PROMPT => __('Update'),
5cde71d6
JH
693 HEADER => $status_head, },
694 @mods);
695 if (@update) {
a4f7112f 696 system(qw(git update-index --add --remove --),
5cde71d6
JH
697 map { $_->{VALUE} } @update);
698 say_n_paths('updated', @update);
699 }
700 print "\n";
701}
702
703sub revert_cmd {
258e7790 704 my @update = list_and_choose({ PROMPT => __('Revert'),
5cde71d6
JH
705 HEADER => $status_head, },
706 list_modified());
707 if (@update) {
18bc7616
JK
708 if (is_initial_commit()) {
709 system(qw(git rm --cached),
710 map { $_->{VALUE} } @update);
5cde71d6 711 }
18bc7616
JK
712 else {
713 my @lines = run_cmd_pipe(qw(git ls-tree HEAD --),
714 map { $_->{VALUE} } @update);
715 my $fh;
716 open $fh, '| git update-index --index-info'
717 or die;
718 for (@lines) {
719 print $fh $_;
720 }
721 close($fh);
722 for (@update) {
723 if ($_->{INDEX_ADDDEL} &&
724 $_->{INDEX_ADDDEL} eq 'create') {
725 system(qw(git update-index --force-remove --),
726 $_->{VALUE});
13c58c17 727 printf(__("note: %s is untracked now.\n"), $_->{VALUE});
18bc7616 728 }
5cde71d6
JH
729 }
730 }
731 refresh();
732 say_n_paths('reverted', @update);
733 }
734 print "\n";
735}
736
737sub add_untracked_cmd {
258e7790 738 my @add = list_and_choose({ PROMPT => __('Add untracked') },
5cde71d6
JH
739 list_untracked());
740 if (@add) {
741 system(qw(git update-index --add --), @add);
742 say_n_paths('added', @add);
a9c4641d 743 } else {
258e7790 744 print __("No untracked files.\n");
5cde71d6
JH
745 }
746 print "\n";
747}
748
8f0bef6d
TR
749sub run_git_apply {
750 my $cmd = shift;
751 my $fh;
933e44d3 752 open $fh, '| git ' . $cmd . " --recount --allow-overlap";
8f0bef6d
TR
753 print $fh @_;
754 return close $fh;
755}
756
5cde71d6
JH
757sub parse_diff {
758 my ($path) = @_;
8f0bef6d 759 my @diff_cmd = split(" ", $patch_mode_flavour{DIFF});
2cc0f53b 760 if (defined $diff_algorithm) {
e5c29097 761 splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
2cc0f53b 762 }
46e3d17f
JK
763 if ($diff_compaction_heuristic) {
764 splice @diff_cmd, 1, 0, "--compaction-heuristic";
765 }
d002ef4d 766 if (defined $patch_mode_revision) {
954312a3 767 push @diff_cmd, get_diff_reference($patch_mode_revision);
d002ef4d 768 }
8f0bef6d 769 my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path);
4af756f3
WC
770 my @colored = ();
771 if ($diff_use_color) {
01143847
JK
772 my @display_cmd = ("git", @diff_cmd, qw(--color --), $path);
773 if (defined $diff_filter) {
774 # quotemeta is overkill, but sufficient for shell-quoting
775 my $diff = join(' ', map { quotemeta } @display_cmd);
776 @display_cmd = ("$diff | $diff_filter");
777 }
778
779 @colored = run_cmd_pipe(@display_cmd);
5cde71d6 780 }
0392513f 781 my (@hunk) = { TEXT => [], DISPLAY => [], TYPE => 'header' };
b4c61ed6 782
4af756f3
WC
783 for (my $i = 0; $i < @diff; $i++) {
784 if ($diff[$i] =~ /^@@ /) {
0392513f
JK
785 push @hunk, { TEXT => [], DISPLAY => [],
786 TYPE => 'hunk' };
b4c61ed6 787 }
4af756f3
WC
788 push @{$hunk[-1]{TEXT}}, $diff[$i];
789 push @{$hunk[-1]{DISPLAY}},
01143847 790 (@colored ? $colored[$i] : $diff[$i]);
b4c61ed6 791 }
4af756f3 792 return @hunk;
b4c61ed6
JH
793}
794
b717a627
JK
795sub parse_diff_header {
796 my $src = shift;
797
0392513f
JK
798 my $head = { TEXT => [], DISPLAY => [], TYPE => 'header' };
799 my $mode = { TEXT => [], DISPLAY => [], TYPE => 'mode' };
24ab81ae 800 my $deletion = { TEXT => [], DISPLAY => [], TYPE => 'deletion' };
b717a627
JK
801
802 for (my $i = 0; $i < @{$src->{TEXT}}; $i++) {
24ab81ae
JK
803 my $dest =
804 $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ? $mode :
805 $src->{TEXT}->[$i] =~ /^deleted file/ ? $deletion :
806 $head;
b717a627
JK
807 push @{$dest->{TEXT}}, $src->{TEXT}->[$i];
808 push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i];
809 }
24ab81ae 810 return ($head, $mode, $deletion);
b717a627
JK
811}
812
835b2aeb
JH
813sub hunk_splittable {
814 my ($text) = @_;
815
816 my @s = split_hunk($text);
817 return (1 < @s);
818}
819
820sub parse_hunk_header {
821 my ($line) = @_;
822 my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
7288ed8e
JLH
823 $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
824 $o_cnt = 1 unless defined $o_cnt;
825 $n_cnt = 1 unless defined $n_cnt;
835b2aeb
JH
826 return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
827}
828
829sub split_hunk {
4af756f3 830 my ($text, $display) = @_;
835b2aeb 831 my @split = ();
4af756f3
WC
832 if (!defined $display) {
833 $display = $text;
834 }
835b2aeb
JH
835 # If there are context lines in the middle of a hunk,
836 # it can be split, but we would need to take care of
837 # overlaps later.
838
7b40a455 839 my ($o_ofs, undef, $n_ofs) = parse_hunk_header($text->[0]);
835b2aeb 840 my $hunk_start = 1;
835b2aeb
JH
841
842 OUTER:
843 while (1) {
844 my $next_hunk_start = undef;
845 my $i = $hunk_start - 1;
846 my $this = +{
847 TEXT => [],
4af756f3 848 DISPLAY => [],
0392513f 849 TYPE => 'hunk',
835b2aeb
JH
850 OLD => $o_ofs,
851 NEW => $n_ofs,
852 OCNT => 0,
853 NCNT => 0,
854 ADDDEL => 0,
855 POSTCTX => 0,
4af756f3 856 USE => undef,
835b2aeb
JH
857 };
858
859 while (++$i < @$text) {
860 my $line = $text->[$i];
4af756f3 861 my $display = $display->[$i];
835b2aeb
JH
862 if ($line =~ /^ /) {
863 if ($this->{ADDDEL} &&
864 !defined $next_hunk_start) {
865 # We have seen leading context and
866 # adds/dels and then here is another
867 # context, which is trailing for this
868 # split hunk and leading for the next
869 # one.
870 $next_hunk_start = $i;
871 }
872 push @{$this->{TEXT}}, $line;
4af756f3 873 push @{$this->{DISPLAY}}, $display;
835b2aeb
JH
874 $this->{OCNT}++;
875 $this->{NCNT}++;
876 if (defined $next_hunk_start) {
877 $this->{POSTCTX}++;
878 }
879 next;
880 }
881
882 # add/del
883 if (defined $next_hunk_start) {
884 # We are done with the current hunk and
885 # this is the first real change for the
886 # next split one.
887 $hunk_start = $next_hunk_start;
888 $o_ofs = $this->{OLD} + $this->{OCNT};
889 $n_ofs = $this->{NEW} + $this->{NCNT};
890 $o_ofs -= $this->{POSTCTX};
891 $n_ofs -= $this->{POSTCTX};
892 push @split, $this;
893 redo OUTER;
894 }
895 push @{$this->{TEXT}}, $line;
4af756f3 896 push @{$this->{DISPLAY}}, $display;
835b2aeb
JH
897 $this->{ADDDEL}++;
898 if ($line =~ /^-/) {
899 $this->{OCNT}++;
900 }
901 else {
902 $this->{NCNT}++;
903 }
904 }
905
906 push @split, $this;
907 last;
908 }
909
910 for my $hunk (@split) {
911 $o_ofs = $hunk->{OLD};
912 $n_ofs = $hunk->{NEW};
7b40a455
JLH
913 my $o_cnt = $hunk->{OCNT};
914 my $n_cnt = $hunk->{NCNT};
835b2aeb
JH
915
916 my $head = ("@@ -$o_ofs" .
917 (($o_cnt != 1) ? ",$o_cnt" : '') .
918 " +$n_ofs" .
919 (($n_cnt != 1) ? ",$n_cnt" : '') .
920 " @@\n");
4af756f3 921 my $display_head = $head;
835b2aeb 922 unshift @{$hunk->{TEXT}}, $head;
4af756f3
WC
923 if ($diff_use_color) {
924 $display_head = colored($fraginfo_color, $head);
925 }
926 unshift @{$hunk->{DISPLAY}}, $display_head;
835b2aeb 927 }
4af756f3 928 return @split;
835b2aeb
JH
929}
930
7a26e653
JH
931sub find_last_o_ctx {
932 my ($it) = @_;
933 my $text = $it->{TEXT};
934 my ($o_ofs, $o_cnt) = parse_hunk_header($text->[0]);
935 my $i = @{$text};
936 my $last_o_ctx = $o_ofs + $o_cnt;
937 while (0 < --$i) {
938 my $line = $text->[$i];
939 if ($line =~ /^ /) {
940 $last_o_ctx--;
941 next;
942 }
943 last;
944 }
945 return $last_o_ctx;
946}
947
948sub merge_hunk {
949 my ($prev, $this) = @_;
950 my ($o0_ofs, $o0_cnt, $n0_ofs, $n0_cnt) =
951 parse_hunk_header($prev->{TEXT}[0]);
952 my ($o1_ofs, $o1_cnt, $n1_ofs, $n1_cnt) =
953 parse_hunk_header($this->{TEXT}[0]);
954
955 my (@line, $i, $ofs, $o_cnt, $n_cnt);
956 $ofs = $o0_ofs;
957 $o_cnt = $n_cnt = 0;
958 for ($i = 1; $i < @{$prev->{TEXT}}; $i++) {
959 my $line = $prev->{TEXT}[$i];
960 if ($line =~ /^\+/) {
961 $n_cnt++;
962 push @line, $line;
963 next;
964 }
965
966 last if ($o1_ofs <= $ofs);
967
968 $o_cnt++;
969 $ofs++;
970 if ($line =~ /^ /) {
971 $n_cnt++;
972 }
973 push @line, $line;
974 }
975
976 for ($i = 1; $i < @{$this->{TEXT}}; $i++) {
977 my $line = $this->{TEXT}[$i];
978 if ($line =~ /^\+/) {
979 $n_cnt++;
980 push @line, $line;
981 next;
982 }
983 $ofs++;
984 $o_cnt++;
985 if ($line =~ /^ /) {
986 $n_cnt++;
987 }
988 push @line, $line;
989 }
990 my $head = ("@@ -$o0_ofs" .
991 (($o_cnt != 1) ? ",$o_cnt" : '') .
992 " +$n0_ofs" .
993 (($n_cnt != 1) ? ",$n_cnt" : '') .
994 " @@\n");
995 @{$prev->{TEXT}} = ($head, @line);
996}
997
998sub coalesce_overlapping_hunks {
999 my (@in) = @_;
1000 my @out = ();
1001
1002 my ($last_o_ctx, $last_was_dirty);
1003
1004 for (grep { $_->{USE} } @in) {
3d792161
TR
1005 if ($_->{TYPE} ne 'hunk') {
1006 push @out, $_;
1007 next;
1008 }
7a26e653
JH
1009 my $text = $_->{TEXT};
1010 my ($o_ofs) = parse_hunk_header($text->[0]);
1011 if (defined $last_o_ctx &&
1012 $o_ofs <= $last_o_ctx &&
1013 !$_->{DIRTY} &&
1014 !$last_was_dirty) {
1015 merge_hunk($out[-1], $_);
1016 }
1017 else {
1018 push @out, $_;
1019 }
1020 $last_o_ctx = find_last_o_ctx($out[-1]);
1021 $last_was_dirty = $_->{DIRTY};
1022 }
1023 return @out;
1024}
835b2aeb 1025
e1327ed5
JK
1026sub reassemble_patch {
1027 my $head = shift;
1028 my @patch;
1029
1030 # Include everything in the header except the beginning of the diff.
1031 push @patch, (grep { !/^[-+]{3}/ } @$head);
1032
1033 # Then include any headers from the hunk lines, which must
1034 # come before any actual hunk.
1035 while (@_ && $_[0] !~ /^@/) {
1036 push @patch, shift;
1037 }
1038
1039 # Then begin the diff.
1040 push @patch, grep { /^[-+]{3}/ } @$head;
1041
1042 # And then the actual hunks.
1043 push @patch, @_;
1044
1045 return @patch;
1046}
1047
ac083c47
TR
1048sub color_diff {
1049 return map {
1050 colored((/^@/ ? $fraginfo_color :
1051 /^\+/ ? $diff_new_color :
1052 /^-/ ? $diff_old_color :
1053 $diff_plain_color),
1054 $_);
1055 } @_;
1056}
1057
1058sub edit_hunk_manually {
1059 my ($oldtext) = @_;
1060
1061 my $hunkfile = $repo->repo_path . "/addp-hunk-edit.diff";
1062 my $fh;
1063 open $fh, '>', $hunkfile
13c58c17 1064 or die sprintf(__("failed to open hunk edit file for writing: %s"), $!);
ac083c47
TR
1065 print $fh "# Manual hunk edit mode -- see bottom for a quick guide\n";
1066 print $fh @$oldtext;
8f0bef6d 1067 my $participle = $patch_mode_flavour{PARTICIPLE};
7b8c7051
JDL
1068 my $is_reverse = $patch_mode_flavour{IS_REVERSE};
1069 my ($remove_plus, $remove_minus) = $is_reverse ? ('-', '+') : ('+', '-');
ac083c47
TR
1070 print $fh <<EOF;
1071# ---
7b8c7051
JDL
1072# To remove '$remove_minus' lines, make them ' ' lines (context).
1073# To remove '$remove_plus' lines, delete them.
ac083c47
TR
1074# Lines starting with # will be removed.
1075#
1076# If the patch applies cleanly, the edited hunk will immediately be
8f0bef6d 1077# marked for $participle. If it does not apply cleanly, you will be given
ac083c47
TR
1078# an opportunity to edit again. If all lines of the hunk are removed,
1079# then the edit is aborted and the hunk is left unchanged.
1080EOF
1081 close $fh;
1082
b4479f07 1083 chomp(my $editor = run_cmd_pipe(qw(git var GIT_EDITOR)));
ac083c47
TR
1084 system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
1085
1d398a03
DM
1086 if ($? != 0) {
1087 return undef;
1088 }
1089
ac083c47 1090 open $fh, '<', $hunkfile
13c58c17 1091 or die sprintf(__("failed to open hunk edit file for reading: %s"), $!);
ac083c47
TR
1092 my @newtext = grep { !/^#/ } <$fh>;
1093 close $fh;
1094 unlink $hunkfile;
1095
1096 # Abort if nothing remains
1097 if (!grep { /\S/ } @newtext) {
1098 return undef;
1099 }
1100
1101 # Reinsert the first hunk header if the user accidentally deleted it
1102 if ($newtext[0] !~ /^@/) {
1103 unshift @newtext, $oldtext->[0];
1104 }
1105 return \@newtext;
1106}
1107
1108sub diff_applies {
9dce8323 1109 return run_git_apply($patch_mode_flavour{APPLY_CHECK} . ' --check',
8f0bef6d 1110 map { @{$_->{TEXT}} } @_);
ac083c47
TR
1111}
1112
ca6ac7f1
TR
1113sub _restore_terminal_and_die {
1114 ReadMode 'restore';
1115 print "\n";
1116 exit 1;
1117}
1118
1119sub prompt_single_character {
1120 if ($use_readkey) {
1121 local $SIG{TERM} = \&_restore_terminal_and_die;
1122 local $SIG{INT} = \&_restore_terminal_and_die;
1123 ReadMode 'cbreak';
1124 my $key = ReadKey 0;
1125 ReadMode 'restore';
b5cc0032
TR
1126 if ($use_termcap and $key eq "\e") {
1127 while (!defined $term_escapes{$key}) {
1128 my $next = ReadKey 0.5;
1129 last if (!defined $next);
1130 $key .= $next;
1131 }
1132 $key =~ s/\e/^[/;
1133 }
ca6ac7f1
TR
1134 print "$key" if defined $key;
1135 print "\n";
1136 return $key;
1137 } else {
1138 return <STDIN>;
1139 }
1140}
1141
ac083c47
TR
1142sub prompt_yesno {
1143 my ($prompt) = @_;
1144 while (1) {
1145 print colored $prompt_color, $prompt;
ca6ac7f1 1146 my $line = prompt_single_character;
ac083c47
TR
1147 return 0 if $line =~ /^n/i;
1148 return 1 if $line =~ /^y/i;
1149 }
1150}
1151
1152sub edit_hunk_loop {
1153 my ($head, $hunk, $ix) = @_;
1154 my $text = $hunk->[$ix]->{TEXT};
1155
1156 while (1) {
1157 $text = edit_hunk_manually($text);
1158 if (!defined $text) {
1159 return undef;
1160 }
0392513f
JK
1161 my $newhunk = {
1162 TEXT => $text,
1163 TYPE => $hunk->[$ix]->{TYPE},
7a26e653
JH
1164 USE => 1,
1165 DIRTY => 1,
0392513f 1166 };
ac083c47
TR
1167 if (diff_applies($head,
1168 @{$hunk}[0..$ix-1],
1169 $newhunk,
1170 @{$hunk}[$ix+1..$#{$hunk}])) {
1171 $newhunk->{DISPLAY} = [color_diff(@{$text})];
1172 return $newhunk;
1173 }
1174 else {
1175 prompt_yesno(
258e7790
VA
1176 # TRANSLATORS: do not translate [y/n]
1177 # The program will only accept that input
1178 # at this point.
1179 # Consider translating (saying "no" discards!) as
1180 # (saying "n" for "no" discards!) if the translation
1181 # of the word "no" does not start with n.
1182 __('Your edited hunk does not apply. Edit again '
1183 . '(saying "no" discards!) [y/n]? ')
ac083c47
TR
1184 ) or return undef;
1185 }
1186 }
1187}
1188
186b52c5
VA
1189my %help_patch_modes = (
1190 stage => N__(
1191"y - stage this hunk
1192n - do not stage this hunk
1193q - quit; do not stage this hunk or any of the remaining ones
1194a - stage this hunk and all later hunks in the file
1195d - do not stage this hunk or any of the later hunks in the file"),
1196 stash => N__(
1197"y - stash this hunk
1198n - do not stash this hunk
1199q - quit; do not stash this hunk or any of the remaining ones
1200a - stash this hunk and all later hunks in the file
1201d - do not stash this hunk or any of the later hunks in the file"),
1202 reset_head => N__(
1203"y - unstage this hunk
1204n - do not unstage this hunk
1205q - quit; do not unstage this hunk or any of the remaining ones
1206a - unstage this hunk and all later hunks in the file
1207d - do not unstage this hunk or any of the later hunks in the file"),
1208 reset_nothead => N__(
1209"y - apply this hunk to index
1210n - do not apply this hunk to index
1211q - quit; do not apply this hunk or any of the remaining ones
1212a - apply this hunk and all later hunks in the file
1213d - do not apply this hunk or any of the later hunks in the file"),
1214 checkout_index => N__(
1215"y - discard this hunk from worktree
1216n - do not discard this hunk from worktree
1217q - quit; do not discard this hunk or any of the remaining ones
1218a - discard this hunk and all later hunks in the file
1219d - do not discard this hunk or any of the later hunks in the file"),
1220 checkout_head => N__(
1221"y - discard this hunk from index and worktree
1222n - do not discard this hunk from index and worktree
1223q - quit; do not discard this hunk or any of the remaining ones
1224a - discard this hunk and all later hunks in the file
1225d - do not discard this hunk or any of the later hunks in the file"),
1226 checkout_nothead => N__(
1227"y - apply this hunk to index and worktree
1228n - do not apply this hunk to index and worktree
1229q - quit; do not apply this hunk or any of the remaining ones
1230a - apply this hunk and all later hunks in the file
1231d - do not apply this hunk or any of the later hunks in the file"),
1232);
1233
5cde71d6 1234sub help_patch_cmd {
186b52c5 1235 print colored $help_color, __($help_patch_modes{$patch_mode}), "\n", __ <<EOF ;
070434d0 1236g - select a hunk to go to
dd971cc9 1237/ - search for a hunk matching the given regex
5cde71d6
JH
1238j - leave this hunk undecided, see next undecided hunk
1239J - leave this hunk undecided, see next hunk
1240k - leave this hunk undecided, see previous undecided hunk
1241K - leave this hunk undecided, see previous hunk
835b2aeb 1242s - split the current hunk into smaller hunks
ac083c47 1243e - manually edit the current hunk
280e50c7 1244? - print help
5cde71d6
JH
1245EOF
1246}
1247
8f0bef6d
TR
1248sub apply_patch {
1249 my $cmd = shift;
9dce8323 1250 my $ret = run_git_apply $cmd, @_;
8f0bef6d
TR
1251 if (!$ret) {
1252 print STDERR @_;
1253 }
1254 return $ret;
1255}
1256
4f353658
TR
1257sub apply_patch_for_checkout_commit {
1258 my $reverse = shift;
9dce8323
JH
1259 my $applies_index = run_git_apply 'apply '.$reverse.' --cached --check', @_;
1260 my $applies_worktree = run_git_apply 'apply '.$reverse.' --check', @_;
4f353658
TR
1261
1262 if ($applies_worktree && $applies_index) {
9dce8323
JH
1263 run_git_apply 'apply '.$reverse.' --cached', @_;
1264 run_git_apply 'apply '.$reverse, @_;
4f353658
TR
1265 return 1;
1266 } elsif (!$applies_index) {
258e7790
VA
1267 print colored $error_color, __("The selected hunks do not apply to the index!\n");
1268 if (prompt_yesno __("Apply them to the worktree anyway? ")) {
9dce8323 1269 return run_git_apply 'apply '.$reverse, @_;
4f353658 1270 } else {
258e7790 1271 print colored $error_color, __("Nothing was applied.\n");
4f353658
TR
1272 return 0;
1273 }
1274 } else {
1275 print STDERR @_;
1276 return 0;
1277 }
1278}
1279
5cde71d6 1280sub patch_update_cmd {
8f0bef6d 1281 my @all_mods = list_modified($patch_mode_flavour{FILTER});
13c58c17 1282 error_msg sprintf(__("ignoring unmerged: %s\n"), $_->{VALUE})
4066bd67
JK
1283 for grep { $_->{UNMERGED} } @all_mods;
1284 @all_mods = grep { !$_->{UNMERGED} } @all_mods;
1285
9fe7a643 1286 my @mods = grep { !($_->{BINARY}) } @all_mods;
b63e9950 1287 my @them;
5cde71d6 1288
b63e9950 1289 if (!@mods) {
9fe7a643 1290 if (@all_mods) {
258e7790 1291 print STDERR __("Only binary files changed.\n");
9fe7a643 1292 } else {
258e7790 1293 print STDERR __("No changes.\n");
9fe7a643 1294 }
b63e9950
WC
1295 return 0;
1296 }
1297 if ($patch_mode) {
1298 @them = @mods;
1299 }
1300 else {
258e7790 1301 @them = list_and_choose({ PROMPT => __('Patch update'),
b63e9950
WC
1302 HEADER => $status_head, },
1303 @mods);
1304 }
12db334e 1305 for (@them) {
9a7a1e03 1306 return 0 if patch_update_file($_->{VALUE});
12db334e 1307 }
a7d9da6c 1308}
5cde71d6 1309
3f6aff68
WP
1310# Generate a one line summary of a hunk.
1311sub summarize_hunk {
1312 my $rhunk = shift;
1313 my $summary = $rhunk->{TEXT}[0];
1314
1315 # Keep the line numbers, discard extra context.
1316 $summary =~ s/@@(.*?)@@.*/$1 /s;
1317 $summary .= " " x (20 - length $summary);
1318
1319 # Add some user context.
1320 for my $line (@{$rhunk->{TEXT}}) {
1321 if ($line =~ m/^[+-].*\w/) {
1322 $summary .= $line;
1323 last;
1324 }
1325 }
1326
1327 chomp $summary;
1328 return substr($summary, 0, 80) . "\n";
1329}
1330
1331
1332# Print a one-line summary of each hunk in the array ref in
41ccfdd9 1333# the first argument, starting with the index in the 2nd.
3f6aff68
WP
1334sub display_hunks {
1335 my ($hunks, $i) = @_;
1336 my $ctr = 0;
1337 $i ||= 0;
1338 for (; $i < @$hunks && $ctr < 20; $i++, $ctr++) {
1339 my $status = " ";
1340 if (defined $hunks->[$i]{USE}) {
1341 $status = $hunks->[$i]{USE} ? "+" : "-";
1342 }
1343 printf "%s%2d: %s",
1344 $status,
1345 $i + 1,
1346 summarize_hunk($hunks->[$i]);
1347 }
1348 return $i;
1349}
1350
0539d5e6
VA
1351my %patch_update_prompt_modes = (
1352 stage => {
1353 mode => N__("Stage mode change [y,n,q,a,d,/%s,?]? "),
1354 deletion => N__("Stage deletion [y,n,q,a,d,/%s,?]? "),
1355 hunk => N__("Stage this hunk [y,n,q,a,d,/%s,?]? "),
1356 },
1357 stash => {
1358 mode => N__("Stash mode change [y,n,q,a,d,/%s,?]? "),
1359 deletion => N__("Stash deletion [y,n,q,a,d,/%s,?]? "),
1360 hunk => N__("Stash this hunk [y,n,q,a,d,/%s,?]? "),
1361 },
1362 reset_head => {
1363 mode => N__("Unstage mode change [y,n,q,a,d,/%s,?]? "),
1364 deletion => N__("Unstage deletion [y,n,q,a,d,/%s,?]? "),
1365 hunk => N__("Unstage this hunk [y,n,q,a,d,/%s,?]? "),
1366 },
1367 reset_nothead => {
1368 mode => N__("Apply mode change to index [y,n,q,a,d,/%s,?]? "),
1369 deletion => N__("Apply deletion to index [y,n,q,a,d,/%s,?]? "),
1370 hunk => N__("Apply this hunk to index [y,n,q,a,d,/%s,?]? "),
1371 },
1372 checkout_index => {
1373 mode => N__("Discard mode change from worktree [y,n,q,a,d,/%s,?]? "),
1374 deletion => N__("Discard deletion from worktree [y,n,q,a,d,/%s,?]? "),
1375 hunk => N__("Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "),
1376 },
1377 checkout_head => {
1378 mode => N__("Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "),
1379 deletion => N__("Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "),
1380 hunk => N__("Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "),
1381 },
1382 checkout_nothead => {
1383 mode => N__("Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "),
1384 deletion => N__("Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "),
1385 hunk => N__("Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "),
1386 },
1387);
1388
a7d9da6c 1389sub patch_update_file {
9a7a1e03 1390 my $quit = 0;
5cde71d6 1391 my ($ix, $num);
a7d9da6c 1392 my $path = shift;
5cde71d6 1393 my ($head, @hunk) = parse_diff($path);
24ab81ae 1394 ($head, my $mode, my $deletion) = parse_diff_header($head);
4af756f3
WC
1395 for (@{$head->{DISPLAY}}) {
1396 print;
1397 }
ca724686
JK
1398
1399 if (@{$mode->{TEXT}}) {
0392513f 1400 unshift @hunk, $mode;
ca724686 1401 }
8947fdd5
JK
1402 if (@{$deletion->{TEXT}}) {
1403 foreach my $hunk (@hunk) {
1404 push @{$deletion->{TEXT}}, @{$hunk->{TEXT}};
1405 push @{$deletion->{DISPLAY}}, @{$hunk->{DISPLAY}};
1406 }
24ab81ae
JK
1407 @hunk = ($deletion);
1408 }
ca724686 1409
5cde71d6
JH
1410 $num = scalar @hunk;
1411 $ix = 0;
1412
1413 while (1) {
835b2aeb 1414 my ($prev, $next, $other, $undecided, $i);
5cde71d6
JH
1415 $other = '';
1416
1417 if ($num <= $ix) {
1418 $ix = 0;
1419 }
835b2aeb 1420 for ($i = 0; $i < $ix; $i++) {
5cde71d6
JH
1421 if (!defined $hunk[$i]{USE}) {
1422 $prev = 1;
57886bc7 1423 $other .= ',k';
5cde71d6
JH
1424 last;
1425 }
1426 }
1427 if ($ix) {
57886bc7 1428 $other .= ',K';
5cde71d6 1429 }
835b2aeb 1430 for ($i = $ix + 1; $i < $num; $i++) {
5cde71d6
JH
1431 if (!defined $hunk[$i]{USE}) {
1432 $next = 1;
57886bc7 1433 $other .= ',j';
5cde71d6
JH
1434 last;
1435 }
1436 }
1437 if ($ix < $num - 1) {
57886bc7 1438 $other .= ',J';
5cde71d6 1439 }
070434d0 1440 if ($num > 1) {
4404b2e3 1441 $other .= ',g';
070434d0 1442 }
835b2aeb 1443 for ($i = 0; $i < $num; $i++) {
5cde71d6
JH
1444 if (!defined $hunk[$i]{USE}) {
1445 $undecided = 1;
1446 last;
1447 }
1448 }
1449 last if (!$undecided);
1450
0392513f
JK
1451 if ($hunk[$ix]{TYPE} eq 'hunk' &&
1452 hunk_splittable($hunk[$ix]{TEXT})) {
57886bc7 1453 $other .= ',s';
835b2aeb 1454 }
0392513f
JK
1455 if ($hunk[$ix]{TYPE} eq 'hunk') {
1456 $other .= ',e';
1457 }
4af756f3
WC
1458 for (@{$hunk[$ix]{DISPLAY}}) {
1459 print;
1460 }
0539d5e6
VA
1461 print colored $prompt_color,
1462 sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other);
1463
ca6ac7f1 1464 my $line = prompt_single_character;
a8bec7ab 1465 last unless defined $line;
5cde71d6
JH
1466 if ($line) {
1467 if ($line =~ /^y/i) {
1468 $hunk[$ix]{USE} = 1;
1469 }
1470 elsif ($line =~ /^n/i) {
1471 $hunk[$ix]{USE} = 0;
1472 }
1473 elsif ($line =~ /^a/i) {
1474 while ($ix < $num) {
1475 if (!defined $hunk[$ix]{USE}) {
1476 $hunk[$ix]{USE} = 1;
1477 }
1478 $ix++;
1479 }
1480 next;
1481 }
070434d0
WP
1482 elsif ($other =~ /g/ && $line =~ /^g(.*)/) {
1483 my $response = $1;
1484 my $no = $ix > 10 ? $ix - 10 : 0;
1485 while ($response eq '') {
070434d0
WP
1486 $no = display_hunks(\@hunk, $no);
1487 if ($no < $num) {
258e7790
VA
1488 print __("go to which hunk (<ret> to see more)? ");
1489 } else {
1490 print __("go to which hunk? ");
070434d0 1491 }
070434d0 1492 $response = <STDIN>;
68c02d7c
TR
1493 if (!defined $response) {
1494 $response = '';
1495 }
070434d0
WP
1496 chomp $response;
1497 }
1498 if ($response !~ /^\s*\d+\s*$/) {
13c58c17
VA
1499 error_msg sprintf(__("Invalid number: '%s'\n"),
1500 $response);
070434d0
WP
1501 } elsif (0 < $response && $response <= $num) {
1502 $ix = $response - 1;
1503 } else {
c4a85c3b
VA
1504 error_msg sprintf(__n("Sorry, only %d hunk available.\n",
1505 "Sorry, only %d hunks available.\n", $num), $num);
070434d0
WP
1506 }
1507 next;
1508 }
5cde71d6
JH
1509 elsif ($line =~ /^d/i) {
1510 while ($ix < $num) {
1511 if (!defined $hunk[$ix]{USE}) {
1512 $hunk[$ix]{USE} = 0;
1513 }
1514 $ix++;
1515 }
1516 next;
1517 }
9a7a1e03 1518 elsif ($line =~ /^q/i) {
f5ea3f2b
JH
1519 for ($i = 0; $i < $num; $i++) {
1520 if (!defined $hunk[$i]{USE}) {
1521 $hunk[$i]{USE} = 0;
9a7a1e03 1522 }
9a7a1e03
MM
1523 }
1524 $quit = 1;
f5ea3f2b 1525 last;
9a7a1e03 1526 }
dd971cc9 1527 elsif ($line =~ m|^/(.*)|) {
ca6ac7f1
TR
1528 my $regex = $1;
1529 if ($1 eq "") {
258e7790 1530 print colored $prompt_color, __("search for regex? ");
ca6ac7f1
TR
1531 $regex = <STDIN>;
1532 if (defined $regex) {
1533 chomp $regex;
1534 }
1535 }
dd971cc9
WP
1536 my $search_string;
1537 eval {
ca6ac7f1 1538 $search_string = qr{$regex}m;
dd971cc9
WP
1539 };
1540 if ($@) {
1541 my ($err,$exp) = ($@, $1);
1542 $err =~ s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//;
13c58c17 1543 error_msg sprintf(__("Malformed search regexp %s: %s\n"), $exp, $err);
dd971cc9
WP
1544 next;
1545 }
1546 my $iy = $ix;
1547 while (1) {
1548 my $text = join ("", @{$hunk[$iy]{TEXT}});
1549 last if ($text =~ $search_string);
1550 $iy++;
1551 $iy = 0 if ($iy >= $num);
1552 if ($ix == $iy) {
258e7790 1553 error_msg __("No hunk matches the given pattern\n");
dd971cc9
WP
1554 last;
1555 }
1556 }
1557 $ix = $iy;
1558 next;
1559 }
ace30ba8
WP
1560 elsif ($line =~ /^K/) {
1561 if ($other =~ /K/) {
1562 $ix--;
1563 }
1564 else {
258e7790 1565 error_msg __("No previous hunk\n");
ace30ba8 1566 }
5cde71d6
JH
1567 next;
1568 }
ace30ba8
WP
1569 elsif ($line =~ /^J/) {
1570 if ($other =~ /J/) {
1571 $ix++;
1572 }
1573 else {
258e7790 1574 error_msg __("No next hunk\n");
ace30ba8 1575 }
5cde71d6
JH
1576 next;
1577 }
ace30ba8
WP
1578 elsif ($line =~ /^k/) {
1579 if ($other =~ /k/) {
1580 while (1) {
1581 $ix--;
1582 last if (!$ix ||
1583 !defined $hunk[$ix]{USE});
1584 }
1585 }
1586 else {
258e7790 1587 error_msg __("No previous hunk\n");
5cde71d6
JH
1588 }
1589 next;
1590 }
ace30ba8
WP
1591 elsif ($line =~ /^j/) {
1592 if ($other !~ /j/) {
258e7790 1593 error_msg __("No next hunk\n");
ace30ba8 1594 next;
5cde71d6 1595 }
5cde71d6 1596 }
835b2aeb 1597 elsif ($other =~ /s/ && $line =~ /^s/) {
4af756f3 1598 my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});
835b2aeb 1599 if (1 < @split) {
c4a85c3b
VA
1600 print colored $header_color, sprintf(
1601 __n("Split into %d hunk.\n",
1602 "Split into %d hunks.\n",
1603 scalar(@split)), scalar(@split));
835b2aeb 1604 }
4af756f3 1605 splice (@hunk, $ix, 1, @split);
835b2aeb
JH
1606 $num = scalar @hunk;
1607 next;
1608 }
0392513f 1609 elsif ($other =~ /e/ && $line =~ /^e/) {
ac083c47
TR
1610 my $newhunk = edit_hunk_loop($head, \@hunk, $ix);
1611 if (defined $newhunk) {
1612 splice @hunk, $ix, 1, $newhunk;
1613 }
1614 }
5cde71d6
JH
1615 else {
1616 help_patch_cmd($other);
1617 next;
1618 }
1619 # soft increment
1620 while (1) {
1621 $ix++;
1622 last if ($ix >= $num ||
1623 !defined $hunk[$ix]{USE});
1624 }
1625 }
1626 }
1627
7a26e653
JH
1628 @hunk = coalesce_overlapping_hunks(@hunk);
1629
7b40a455 1630 my $n_lofs = 0;
5cde71d6
JH
1631 my @result = ();
1632 for (@hunk) {
8cbd4310
TR
1633 if ($_->{USE}) {
1634 push @result, @{$_->{TEXT}};
5cde71d6
JH
1635 }
1636 }
1637
1638 if (@result) {
e1327ed5 1639 my @patch = reassemble_patch($head->{TEXT}, @result);
8f0bef6d
TR
1640 my $apply_routine = $patch_mode_flavour{APPLY};
1641 &$apply_routine(@patch);
5cde71d6
JH
1642 refresh();
1643 }
1644
1645 print "\n";
9a7a1e03 1646 return $quit;
5cde71d6
JH
1647}
1648
1649sub diff_cmd {
1650 my @mods = list_modified('index-only');
1651 @mods = grep { !($_->{BINARY}) } @mods;
1652 return if (!@mods);
258e7790 1653 my (@them) = list_and_choose({ PROMPT => __('Review diff'),
5cde71d6
JH
1654 IMMEDIATE => 1,
1655 HEADER => $status_head, },
1656 @mods);
1657 return if (!@them);
258e7790 1658 my $reference = (is_initial_commit()) ? get_empty_tree() : 'HEAD';
18bc7616
JK
1659 system(qw(git diff -p --cached), $reference, '--',
1660 map { $_->{VALUE} } @them);
5cde71d6
JH
1661}
1662
1663sub quit_cmd {
258e7790 1664 print __("Bye.\n");
5cde71d6
JH
1665 exit(0);
1666}
1667
1668sub help_cmd {
5fa83264
VA
1669# TRANSLATORS: please do not translate the command names
1670# 'status', 'update', 'revert', etc.
1671 print colored $help_color, __ <<'EOF' ;
5cde71d6
JH
1672status - show paths with changes
1673update - add working tree state to the staged set of changes
1674revert - revert staged set of changes back to the HEAD version
1675patch - pick hunks and update selectively
1676diff - view diff between HEAD and index
1677add untracked - add contents of untracked files to the staged set of changes
1678EOF
1679}
1680
b63e9950
WC
1681sub process_args {
1682 return unless @ARGV;
1683 my $arg = shift @ARGV;
d002ef4d
TR
1684 if ($arg =~ /--patch(?:=(.*))?/) {
1685 if (defined $1) {
1686 if ($1 eq 'reset') {
1687 $patch_mode = 'reset_head';
1688 $patch_mode_revision = 'HEAD';
258e7790 1689 $arg = shift @ARGV or die __("missing --");
d002ef4d
TR
1690 if ($arg ne '--') {
1691 $patch_mode_revision = $arg;
1692 $patch_mode = ($arg eq 'HEAD' ?
1693 'reset_head' : 'reset_nothead');
258e7790 1694 $arg = shift @ARGV or die __("missing --");
d002ef4d 1695 }
4f353658 1696 } elsif ($1 eq 'checkout') {
258e7790 1697 $arg = shift @ARGV or die __("missing --");
4f353658
TR
1698 if ($arg eq '--') {
1699 $patch_mode = 'checkout_index';
1700 } else {
1701 $patch_mode_revision = $arg;
1702 $patch_mode = ($arg eq 'HEAD' ?
1703 'checkout_head' : 'checkout_nothead');
258e7790 1704 $arg = shift @ARGV or die __("missing --");
4f353658 1705 }
dda1f2a5
TR
1706 } elsif ($1 eq 'stage' or $1 eq 'stash') {
1707 $patch_mode = $1;
258e7790 1708 $arg = shift @ARGV or die __("missing --");
d002ef4d 1709 } else {
13c58c17 1710 die sprintf(__("unknown --patch mode: %s"), $1);
d002ef4d
TR
1711 }
1712 } else {
1713 $patch_mode = 'stage';
258e7790 1714 $arg = shift @ARGV or die __("missing --");
d002ef4d 1715 }
13c58c17
VA
1716 die sprintf(__("invalid argument %s, expecting --"),
1717 $arg) unless $arg eq "--";
d002ef4d 1718 %patch_mode_flavour = %{$patch_modes{$patch_mode}};
0539d5e6 1719 $cmd = 1;
b63e9950
WC
1720 }
1721 elsif ($arg ne "--") {
13c58c17 1722 die sprintf(__("invalid argument %s, expecting --"), $arg);
b63e9950
WC
1723 }
1724}
1725
5cde71d6
JH
1726sub main_loop {
1727 my @cmd = ([ 'status', \&status_cmd, ],
1728 [ 'update', \&update_cmd, ],
1729 [ 'revert', \&revert_cmd, ],
1730 [ 'add untracked', \&add_untracked_cmd, ],
1731 [ 'patch', \&patch_update_cmd, ],
1732 [ 'diff', \&diff_cmd, ],
1733 [ 'quit', \&quit_cmd, ],
1734 [ 'help', \&help_cmd, ],
1735 );
1736 while (1) {
258e7790 1737 my ($it) = list_and_choose({ PROMPT => __('What now'),
5cde71d6
JH
1738 SINGLETON => 1,
1739 LIST_FLAT => 4,
258e7790 1740 HEADER => __('*** Commands ***'),
c95c0248 1741 ON_EOF => \&quit_cmd,
5cde71d6
JH
1742 IMMEDIATE => 1 }, @cmd);
1743 if ($it) {
1744 eval {
1745 $it->[1]->();
1746 };
1747 if ($@) {
1748 print "$@";
1749 }
1750 }
1751 }
1752}
1753
b63e9950 1754process_args();
5cde71d6 1755refresh();
0539d5e6 1756if ($cmd) {
b63e9950
WC
1757 patch_update_cmd();
1758}
1759else {
1760 status_cmd();
1761 main_loop();
1762}