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