9 binmode(STDOUT
, ":raw");
11 my $repo = Git
->repository();
13 my $menu_use_color = $repo->get_colorbool('color.interactive');
14 my ($prompt_color, $header_color, $help_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'),
21 if ($menu_use_color) {
22 my $help_color_spec = ($repo->config('color.interactive.help') or
24 $error_color = $repo->get_color('color.interactive.error',
28 my $diff_use_color = $repo->get_colorbool('color.diff');
29 my ($fraginfo_color) =
31 $repo->get_color('color.diff.frag', 'cyan'),
33 my ($diff_plain_color) =
35 $repo->get_color('color.diff.plain', ''),
37 my ($diff_old_color) =
39 $repo->get_color('color.diff.old', 'red'),
41 my ($diff_new_color) =
43 $repo->get_color('color.diff.new', 'green'),
46 my $normal_color = $repo->get_color("", "reset");
48 my $diff_algorithm = $repo->config('diff.algorithm');
49 my $diff_compaction_heuristic = $repo->config_bool('diff.compactionheuristic');
50 my $diff_filter = $repo->config('interactive.difffilter');
58 if ($repo->config_bool("interactive.singlekey")) {
60 require Term
::ReadKey
;
61 Term
::ReadKey
->import;
65 print STDERR
"missing Term::ReadKey, disabling interactive.singlekey\n";
69 my $termcap = Term
::Cap
->Tgetent;
70 foreach (values %$termcap) {
71 $term_escapes{$_} = 1 if /^\e/;
79 my $string = join("", @_);
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$/;
94 # command line options
96 my $patch_mode_revision;
99 sub apply_patch_for_checkout_commit
;
100 sub apply_patch_for_stash
;
104 DIFF
=> 'diff-files -p',
105 APPLY
=> sub { apply_patch
'apply --cached', @_; },
106 APPLY_CHECK
=> 'apply --cached',
109 PARTICIPLE
=> 'staging',
110 FILTER
=> 'file-only',
114 DIFF
=> 'diff-index -p HEAD',
115 APPLY
=> sub { apply_patch
'apply --cached', @_; },
116 APPLY_CHECK
=> 'apply --cached',
119 PARTICIPLE
=> 'stashing',
124 DIFF
=> 'diff-index -p --cached',
125 APPLY
=> sub { apply_patch
'apply -R --cached', @_; },
126 APPLY_CHECK
=> 'apply -R --cached',
129 PARTICIPLE
=> 'unstaging',
130 FILTER
=> 'index-only',
134 DIFF
=> 'diff-index -R -p --cached',
135 APPLY
=> sub { apply_patch
'apply --cached', @_; },
136 APPLY_CHECK
=> 'apply --cached',
138 TARGET
=> ' to index',
139 PARTICIPLE
=> 'applying',
140 FILTER
=> 'index-only',
143 'checkout_index' => {
144 DIFF
=> 'diff-files -p',
145 APPLY
=> sub { apply_patch
'apply -R', @_; },
146 APPLY_CHECK
=> 'apply -R',
148 TARGET
=> ' from worktree',
149 PARTICIPLE
=> 'discarding',
150 FILTER
=> 'file-only',
154 DIFF
=> 'diff-index -p',
155 APPLY
=> sub { apply_patch_for_checkout_commit
'-R', @_ },
156 APPLY_CHECK
=> 'apply -R',
158 TARGET
=> ' from index and worktree',
159 PARTICIPLE
=> 'discarding',
163 'checkout_nothead' => {
164 DIFF
=> 'diff-index -R -p',
165 APPLY
=> sub { apply_patch_for_checkout_commit
'', @_ },
166 APPLY_CHECK
=> 'apply',
168 TARGET
=> ' to index and worktree',
169 PARTICIPLE
=> 'applying',
175 my %patch_mode_flavour = %{$patch_modes{stage
}};
178 if ($^O
eq 'MSWin32') {
179 my @invalid = grep {m/[":*]/} @_;
180 die "$^O does not support: @invalid\n" if @invalid;
181 my @args = map { m/ /o ?
"\"$_\"": $_ } @_;
185 open($fh, '-|', @_) or die;
190 my ($GIT_DIR) = run_cmd_pipe
(qw(git rev-parse --git-dir));
192 if (!defined $GIT_DIR) {
193 exit(1); # rev-parse would have already said "not a git repo"
210 my ($retval, $remainder);
211 if (!/^\042(.*)\042$/) {
214 ($_, $retval) = ($1, "");
215 while (/^([^\\]*)\\(.*)$/) {
219 if (/^([0-3][0-7][0-7])(.*)$/) {
220 $retval .= chr(oct($1));
224 if (/^([\\\042btnvfr])(.*)$/) {
225 $retval .= $cquote_map{$1};
229 # This is malformed -- just return it as-is for now.
240 open $fh, 'git update-index --refresh |'
243 ;# ignore 'needs update'
253 run_cmd_pipe
(qw(git ls-files --others --exclude-standard --), @ARGV);
256 # TRANSLATORS: you can adjust this to align "git add -i" status menu
257 my $status_fmt = __
('%12s %12s %s');
258 my $status_head = sprintf($status_fmt, __
('staged'), __
('unstaged'), __
('path'));
262 sub is_initial_commit
{
263 $initial = system('git rev-parse HEAD -- >/dev/null 2>&1') != 0
264 unless defined $initial;
270 return '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
273 sub get_diff_reference
{
275 if (defined $ref and $ref ne 'HEAD') {
277 } elsif (is_initial_commit
()) {
278 return get_empty_tree
();
284 # Returns list of hashes, contents of each of which are:
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?
291 # UNMERGED: is the path unmerged
296 my ($add, $del, $adddel, $file);
303 } run_cmd_pipe
(qw(git ls-files --), @ARGV);
304 return if (!@tracked);
307 my $reference = get_diff_reference
($patch_mode_revision);
308 for (run_cmd_pipe
(qw(git diff-index --cached
309 --numstat --summary), $reference,
311 if (($add, $del, $file) =
312 /^([-\d]+) ([-\d]+) (.*)/) {
314 $file = unquote_path
($file);
315 if ($add eq '-' && $del eq '-') {
320 $change = "+$add/-$del";
328 elsif (($adddel, $file) =
329 /^ (create|delete) mode [0-7]+ (.*)$/) {
330 $file = unquote_path
($file);
331 $data{$file}{INDEX_ADDDEL
} = $adddel;
335 for (run_cmd_pipe
(qw(git diff-files --numstat --summary --raw --), @tracked)) {
336 if (($add, $del, $file) =
337 /^([-\d]+) ([-\d]+) (.*)/) {
338 $file = unquote_path
($file);
340 if ($add eq '-' && $del eq '-') {
345 $change = "+$add/-$del";
347 $data{$file}{FILE
} = $change;
349 $data{$file}{BINARY
} = 1;
352 elsif (($adddel, $file) =
353 /^ (create|delete) mode [0-7]+ (.*)$/) {
354 $file = unquote_path
($file);
355 $data{$file}{FILE_ADDDEL
} = $adddel;
357 elsif (/^:[0-7]+ [0-7]+ [0-9a-f]+ [0-9a-f]+ (.) (.*)$/) {
358 $file = unquote_path
($2);
359 if (!exists $data{$file}) {
361 INDEX
=> 'unchanged',
366 $data{$file}{UNMERGED
} = 1;
371 for (sort keys %data) {
375 if ($only eq 'index-only') {
376 next if ($it->{INDEX
} eq 'unchanged');
378 if ($only eq 'file-only') {
379 next if ($it->{FILE
} eq 'nothing');
391 my ($string, @stuff) = @_;
393 for (my $i = 0; $i < @stuff; $i++) {
397 if ((ref $it) eq 'ARRAY') {
405 if ($it =~ /^$string/) {
409 if (defined $hit && defined $found) {
419 # inserts string into trie and updates count for each character
421 my ($trie, $string) = @_;
422 foreach (split //, $string) {
423 $trie = $trie->{$_} ||= {COUNT
=> 0};
428 # returns an array of tuples (prefix, remainder)
429 sub find_unique_prefixes
{
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
439 # build a trie modelling all possible options
441 foreach my $print (@stuff) {
442 if ((ref $print) eq 'ARRAY') {
443 $print = $print->[0];
445 elsif ((ref $print) eq 'HASH') {
446 $print = $print->{VALUE
};
448 update_trie
(\
%trie, $print);
449 push @return, $print;
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;
457 my ($prefix, $remainder);
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;
467 my $prefix = substr $ret, 0, $j;
469 if ($hard_limit && $j + 1 > $hard_limit);
471 %search = %{$search{$letter}};
473 if (ord($letters[0]) > 127 ||
474 ($soft_limit && $j + 1 > $soft_limit)) {
478 $return[$i] = [$prefix, $remainder];
483 # filters out prefixes which have special meaning to list_and_choose()
484 sub is_valid_prefix
{
486 return (defined $prefix) &&
487 !($prefix =~ /[\s,]/) && # separators
488 !($prefix =~ /^-/) && # deselection
489 !($prefix =~ /^\d+/) && # selection
490 ($prefix ne '*') && # "all" wildcard
491 ($prefix ne '?'); # prompt help
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)
496 sub highlight_prefix
{
498 my $remainder = shift;
500 if (!defined $prefix) {
504 if (!is_valid_prefix
($prefix)) {
505 return "$prefix$remainder";
508 if (!$menu_use_color) {
509 return "[$prefix]$remainder";
512 return "$prompt_color$prefix$normal_color$remainder";
516 print STDERR colored
$error_color, @_;
519 sub list_and_choose
{
520 my ($opts, @stuff) = @_;
521 my (@chosen, @return);
526 my @prefixes = find_unique_prefixes
(@stuff) unless $opts->{LIST_ONLY
};
532 if ($opts->{HEADER
}) {
533 if (!$opts->{LIST_FLAT
}) {
536 print colored
$header_color, "$opts->{HEADER}\n";
538 for ($i = 0; $i < @stuff; $i++) {
539 my $chosen = $chosen[$i] ?
'*' : ' ';
540 my $print = $stuff[$i];
541 my $ref = ref $print;
542 my $highlighted = highlight_prefix
(@
{$prefixes[$i]})
544 if ($ref eq 'ARRAY') {
545 $print = $highlighted || $print->[0];
547 elsif ($ref eq 'HASH') {
548 my $value = $highlighted || $print->{VALUE
};
549 $print = sprintf($status_fmt,
555 $print = $highlighted || $print;
557 printf("%s%2d: %s", $chosen, $i+1, $print);
558 if (($opts->{LIST_FLAT
}) &&
559 (($i + 1) % ($opts->{LIST_FLAT
}))) {
572 return if ($opts->{LIST_ONLY
});
574 print colored
$prompt_color, $opts->{PROMPT
};
575 if ($opts->{SINGLETON
}) {
584 $opts->{ON_EOF
}->() if $opts->{ON_EOF
};
591 singleton_prompt_help_cmd
() :
595 for my $choice (split(/[\s,]+/, $line)) {
599 # Input that begins with '-'; unchoose
600 if ($choice =~ s/^-//) {
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);
607 elsif ($choice =~ /^\d+$/) {
608 $bottom = $top = $choice;
610 elsif ($choice eq '*') {
615 $bottom = $top = find_unique
($choice, @stuff);
616 if (!defined $bottom) {
617 error_msg
sprintf(__
("Huh (%s)?\n"), $choice);
621 if ($opts->{SINGLETON
} && $bottom != $top) {
622 error_msg
sprintf(__
("Huh (%s)?\n"), $choice);
625 for ($i = $bottom-1; $i <= $top-1; $i++) {
626 next if (@stuff <= $i || $i < 0);
627 $chosen[$i] = $choose;
630 last if ($opts->{IMMEDIATE
} || $line eq '*');
632 for ($i = 0; $i < @stuff; $i++) {
634 push @return, $stuff[$i];
640 sub singleton_prompt_help_cmd
{
641 print colored
$help_color, __
<<'EOF' ;
643 1 - select a numbered item
644 foo - select item based on unique prefix
645 - (empty) select nothing
649 sub prompt_help_cmd
{
650 print colored
$help_color, __
<<'EOF' ;
652 1 - select a single item
653 3-5 - select a range of items
654 2-3,6-9 - select multiple ranges
655 foo - select item based on unique prefix
656 -... - unselect specified items
658 - (empty) finish selecting
663 list_and_choose
({ LIST_ONLY
=> 1, HEADER
=> $status_head },
673 print "$cnt paths\n";
681 my @mods = list_modified
('file-only');
684 my @update = list_and_choose
({ PROMPT
=> __
('Update'),
685 HEADER
=> $status_head, },
688 system(qw(git update-index --add --remove --),
689 map { $_->{VALUE
} } @update);
690 say_n_paths
('updated', @update);
696 my @update = list_and_choose
({ PROMPT
=> __
('Revert'),
697 HEADER
=> $status_head, },
700 if (is_initial_commit
()) {
701 system(qw(git rm --cached),
702 map { $_->{VALUE
} } @update);
705 my @lines = run_cmd_pipe
(qw(git ls-tree HEAD --),
706 map { $_->{VALUE
} } @update);
708 open $fh, '| git update-index --index-info'
715 if ($_->{INDEX_ADDDEL
} &&
716 $_->{INDEX_ADDDEL
} eq 'create') {
717 system(qw(git update-index --force-remove --),
719 printf(__
("note: %s is untracked now.\n"), $_->{VALUE
});
724 say_n_paths
('reverted', @update);
729 sub add_untracked_cmd
{
730 my @add = list_and_choose
({ PROMPT
=> __
('Add untracked') },
733 system(qw(git update-index --add --), @add);
734 say_n_paths
('added', @add);
736 print __
("No untracked files.\n");
744 open $fh, '| git ' . $cmd . " --recount --allow-overlap";
751 my @diff_cmd = split(" ", $patch_mode_flavour{DIFF
});
752 if (defined $diff_algorithm) {
753 splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
755 if ($diff_compaction_heuristic) {
756 splice @diff_cmd, 1, 0, "--compaction-heuristic";
758 if (defined $patch_mode_revision) {
759 push @diff_cmd, get_diff_reference
($patch_mode_revision);
761 my @diff = run_cmd_pipe
("git", @diff_cmd, "--", $path);
763 if ($diff_use_color) {
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");
771 @colored = run_cmd_pipe
(@display_cmd);
773 my (@hunk) = { TEXT
=> [], DISPLAY
=> [], TYPE
=> 'header' };
775 for (my $i = 0; $i < @diff; $i++) {
776 if ($diff[$i] =~ /^@@ /) {
777 push @hunk, { TEXT
=> [], DISPLAY
=> [],
780 push @
{$hunk[-1]{TEXT
}}, $diff[$i];
781 push @
{$hunk[-1]{DISPLAY
}},
782 (@colored ?
$colored[$i] : $diff[$i]);
787 sub parse_diff_header
{
790 my $head = { TEXT
=> [], DISPLAY
=> [], TYPE
=> 'header' };
791 my $mode = { TEXT
=> [], DISPLAY
=> [], TYPE
=> 'mode' };
792 my $deletion = { TEXT
=> [], DISPLAY
=> [], TYPE
=> 'deletion' };
794 for (my $i = 0; $i < @
{$src->{TEXT
}}; $i++) {
796 $src->{TEXT
}->[$i] =~ /^(old|new) mode (\d+)$/ ?
$mode :
797 $src->{TEXT
}->[$i] =~ /^deleted file/ ?
$deletion :
799 push @
{$dest->{TEXT
}}, $src->{TEXT
}->[$i];
800 push @
{$dest->{DISPLAY
}}, $src->{DISPLAY
}->[$i];
802 return ($head, $mode, $deletion);
805 sub hunk_splittable
{
808 my @s = split_hunk
($text);
812 sub parse_hunk_header
{
814 my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
815 $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
816 $o_cnt = 1 unless defined $o_cnt;
817 $n_cnt = 1 unless defined $n_cnt;
818 return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
822 my ($text, $display) = @_;
824 if (!defined $display) {
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
831 my ($o_ofs, undef, $n_ofs) = parse_hunk_header
($text->[0]);
836 my $next_hunk_start = undef;
837 my $i = $hunk_start - 1;
851 while (++$i < @
$text) {
852 my $line = $text->[$i];
853 my $display = $display->[$i];
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
862 $next_hunk_start = $i;
864 push @
{$this->{TEXT
}}, $line;
865 push @
{$this->{DISPLAY
}}, $display;
868 if (defined $next_hunk_start) {
875 if (defined $next_hunk_start) {
876 # We are done with the current hunk and
877 # this is the first real change for the
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
};
887 push @
{$this->{TEXT
}}, $line;
888 push @
{$this->{DISPLAY
}}, $display;
902 for my $hunk (@split) {
903 $o_ofs = $hunk->{OLD
};
904 $n_ofs = $hunk->{NEW
};
905 my $o_cnt = $hunk->{OCNT
};
906 my $n_cnt = $hunk->{NCNT
};
908 my $head = ("@@ -$o_ofs" .
909 (($o_cnt != 1) ?
",$o_cnt" : '') .
911 (($n_cnt != 1) ?
",$n_cnt" : '') .
913 my $display_head = $head;
914 unshift @
{$hunk->{TEXT
}}, $head;
915 if ($diff_use_color) {
916 $display_head = colored
($fraginfo_color, $head);
918 unshift @
{$hunk->{DISPLAY
}}, $display_head;
923 sub find_last_o_ctx
{
925 my $text = $it->{TEXT
};
926 my ($o_ofs, $o_cnt) = parse_hunk_header
($text->[0]);
928 my $last_o_ctx = $o_ofs + $o_cnt;
930 my $line = $text->[$i];
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]);
947 my (@line, $i, $ofs, $o_cnt, $n_cnt);
950 for ($i = 1; $i < @
{$prev->{TEXT
}}; $i++) {
951 my $line = $prev->{TEXT
}[$i];
952 if ($line =~ /^\+/) {
958 last if ($o1_ofs <= $ofs);
968 for ($i = 1; $i < @
{$this->{TEXT
}}; $i++) {
969 my $line = $this->{TEXT
}[$i];
970 if ($line =~ /^\+/) {
982 my $head = ("@@ -$o0_ofs" .
983 (($o_cnt != 1) ?
",$o_cnt" : '') .
985 (($n_cnt != 1) ?
",$n_cnt" : '') .
987 @
{$prev->{TEXT
}} = ($head, @line);
990 sub coalesce_overlapping_hunks
{
994 my ($last_o_ctx, $last_was_dirty);
996 for (grep { $_->{USE
} } @in) {
997 if ($_->{TYPE
} ne 'hunk') {
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 &&
1007 merge_hunk
($out[-1], $_);
1012 $last_o_ctx = find_last_o_ctx
($out[-1]);
1013 $last_was_dirty = $_->{DIRTY
};
1018 sub reassemble_patch
{
1022 # Include everything in the header except the beginning of the diff.
1023 push @patch, (grep { !/^[-+]{3}/ } @
$head);
1025 # Then include any headers from the hunk lines, which must
1026 # come before any actual hunk.
1027 while (@_ && $_[0] !~ /^@/) {
1031 # Then begin the diff.
1032 push @patch, grep { /^[-+]{3}/ } @
$head;
1034 # And then the actual hunks.
1042 colored
((/^@/ ?
$fraginfo_color :
1043 /^\+/ ?
$diff_new_color :
1044 /^-/ ?
$diff_old_color :
1050 sub edit_hunk_manually
{
1053 my $hunkfile = $repo->repo_path . "/addp-hunk-edit.diff";
1055 open $fh, '>', $hunkfile
1056 or die sprintf(__
("failed to open hunk edit file for writing: %s"), $!);
1057 print $fh "# Manual hunk edit mode -- see bottom for a quick guide\n";
1058 print $fh @
$oldtext;
1059 my $participle = $patch_mode_flavour{PARTICIPLE
};
1060 my $is_reverse = $patch_mode_flavour{IS_REVERSE
};
1061 my ($remove_plus, $remove_minus) = $is_reverse ?
('-', '+') : ('+', '-');
1064 # To remove '$remove_minus' lines, make them ' ' lines (context).
1065 # To remove '$remove_plus' lines, delete them.
1066 # Lines starting with # will be removed.
1068 # If the patch applies cleanly, the edited hunk will immediately be
1069 # marked for $participle. If it does not apply cleanly, you will be given
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.
1075 chomp(my $editor = run_cmd_pipe
(qw(git var GIT_EDITOR)));
1076 system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
1082 open $fh, '<', $hunkfile
1083 or die sprintf(__
("failed to open hunk edit file for reading: %s"), $!);
1084 my @newtext = grep { !/^#/ } <$fh>;
1088 # Abort if nothing remains
1089 if (!grep { /\S/ } @newtext) {
1093 # Reinsert the first hunk header if the user accidentally deleted it
1094 if ($newtext[0] !~ /^@/) {
1095 unshift @newtext, $oldtext->[0];
1101 return run_git_apply
($patch_mode_flavour{APPLY_CHECK
} . ' --check',
1102 map { @
{$_->{TEXT
}} } @_);
1105 sub _restore_terminal_and_die
{
1111 sub prompt_single_character
{
1113 local $SIG{TERM
} = \
&_restore_terminal_and_die
;
1114 local $SIG{INT
} = \
&_restore_terminal_and_die
;
1116 my $key = ReadKey
0;
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);
1126 print "$key" if defined $key;
1137 print colored
$prompt_color, $prompt;
1138 my $line = prompt_single_character
;
1139 return 0 if $line =~ /^n/i;
1140 return 1 if $line =~ /^y/i;
1144 sub edit_hunk_loop
{
1145 my ($head, $hunk, $ix) = @_;
1146 my $text = $hunk->[$ix]->{TEXT
};
1149 $text = edit_hunk_manually
($text);
1150 if (!defined $text) {
1155 TYPE
=> $hunk->[$ix]->{TYPE
},
1159 if (diff_applies
($head,
1162 @
{$hunk}[$ix+1..$#{$hunk}])) {
1163 $newhunk->{DISPLAY
} = [color_diff
(@
{$text})];
1168 # TRANSLATORS: do not translate [y/n]
1169 # The program will only accept that input
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]? ')
1181 sub help_patch_cmd
{
1182 my $verb = lc $patch_mode_flavour{VERB
};
1183 my $target = $patch_mode_flavour{TARGET
};
1184 print colored
$help_color, <<EOF ;
1185 y - $verb this hunk$target
1186 n - do not $verb this hunk$target
1187 q - quit; do not $verb this hunk or any of the remaining ones
1188 a - $verb this hunk and all later hunks in the file
1189 d - do not $verb this hunk or any of the later hunks in the file
1190 g - select a hunk to go to
1191 / - search for a hunk matching the given regex
1192 j - leave this hunk undecided, see next undecided hunk
1193 J - leave this hunk undecided, see next hunk
1194 k - leave this hunk undecided, see previous undecided hunk
1195 K - leave this hunk undecided, see previous hunk
1196 s - split the current hunk into smaller hunks
1197 e - manually edit the current hunk
1204 my $ret = run_git_apply
$cmd, @_;
1211 sub apply_patch_for_checkout_commit
{
1212 my $reverse = shift;
1213 my $applies_index = run_git_apply
'apply '.$reverse.' --cached --check', @_;
1214 my $applies_worktree = run_git_apply
'apply '.$reverse.' --check', @_;
1216 if ($applies_worktree && $applies_index) {
1217 run_git_apply
'apply '.$reverse.' --cached', @_;
1218 run_git_apply
'apply '.$reverse, @_;
1220 } elsif (!$applies_index) {
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? ")) {
1223 return run_git_apply
'apply '.$reverse, @_;
1225 print colored
$error_color, __
("Nothing was applied.\n");
1234 sub patch_update_cmd
{
1235 my @all_mods = list_modified
($patch_mode_flavour{FILTER
});
1236 error_msg
sprintf(__
("ignoring unmerged: %s\n"), $_->{VALUE
})
1237 for grep { $_->{UNMERGED
} } @all_mods;
1238 @all_mods = grep { !$_->{UNMERGED
} } @all_mods;
1240 my @mods = grep { !($_->{BINARY
}) } @all_mods;
1245 print STDERR __
("Only binary files changed.\n");
1247 print STDERR __
("No changes.\n");
1255 @them = list_and_choose
({ PROMPT
=> __
('Patch update'),
1256 HEADER
=> $status_head, },
1260 return 0 if patch_update_file
($_->{VALUE
});
1264 # Generate a one line summary of a hunk.
1265 sub summarize_hunk
{
1267 my $summary = $rhunk->{TEXT
}[0];
1269 # Keep the line numbers, discard extra context.
1270 $summary =~ s/@@(.*?)@@.*/$1 /s;
1271 $summary .= " " x
(20 - length $summary);
1273 # Add some user context.
1274 for my $line (@
{$rhunk->{TEXT
}}) {
1275 if ($line =~ m/^[+-].*\w/) {
1282 return substr($summary, 0, 80) . "\n";
1286 # Print a one-line summary of each hunk in the array ref in
1287 # the first argument, starting with the index in the 2nd.
1289 my ($hunks, $i) = @_;
1292 for (; $i < @
$hunks && $ctr < 20; $i++, $ctr++) {
1294 if (defined $hunks->[$i]{USE
}) {
1295 $status = $hunks->[$i]{USE
} ?
"+" : "-";
1300 summarize_hunk
($hunks->[$i]);
1305 sub patch_update_file
{
1309 my ($head, @hunk) = parse_diff
($path);
1310 ($head, my $mode, my $deletion) = parse_diff_header
($head);
1311 for (@
{$head->{DISPLAY
}}) {
1315 if (@
{$mode->{TEXT
}}) {
1316 unshift @hunk, $mode;
1318 if (@
{$deletion->{TEXT
}}) {
1319 foreach my $hunk (@hunk) {
1320 push @
{$deletion->{TEXT
}}, @
{$hunk->{TEXT
}};
1321 push @
{$deletion->{DISPLAY
}}, @
{$hunk->{DISPLAY
}};
1323 @hunk = ($deletion);
1326 $num = scalar @hunk;
1330 my ($prev, $next, $other, $undecided, $i);
1336 for ($i = 0; $i < $ix; $i++) {
1337 if (!defined $hunk[$i]{USE
}) {
1346 for ($i = $ix + 1; $i < $num; $i++) {
1347 if (!defined $hunk[$i]{USE
}) {
1353 if ($ix < $num - 1) {
1359 for ($i = 0; $i < $num; $i++) {
1360 if (!defined $hunk[$i]{USE
}) {
1365 last if (!$undecided);
1367 if ($hunk[$ix]{TYPE
} eq 'hunk' &&
1368 hunk_splittable
($hunk[$ix]{TEXT
})) {
1371 if ($hunk[$ix]{TYPE
} eq 'hunk') {
1374 for (@
{$hunk[$ix]{DISPLAY
}}) {
1377 print colored
$prompt_color, $patch_mode_flavour{VERB
},
1378 ($hunk[$ix]{TYPE
} eq 'mode' ?
' mode change' :
1379 $hunk[$ix]{TYPE
} eq 'deletion' ?
' deletion' :
1381 $patch_mode_flavour{TARGET
},
1382 " [y,n,q,a,d,/$other,?]? ";
1383 my $line = prompt_single_character
;
1384 last unless defined $line;
1386 if ($line =~ /^y/i) {
1387 $hunk[$ix]{USE
} = 1;
1389 elsif ($line =~ /^n/i) {
1390 $hunk[$ix]{USE
} = 0;
1392 elsif ($line =~ /^a/i) {
1393 while ($ix < $num) {
1394 if (!defined $hunk[$ix]{USE
}) {
1395 $hunk[$ix]{USE
} = 1;
1401 elsif ($other =~ /g/ && $line =~ /^g(.*)/) {
1403 my $no = $ix > 10 ?
$ix - 10 : 0;
1404 while ($response eq '') {
1405 $no = display_hunks
(\
@hunk, $no);
1407 print __
("go to which hunk (<ret> to see more)? ");
1409 print __
("go to which hunk? ");
1411 $response = <STDIN
>;
1412 if (!defined $response) {
1417 if ($response !~ /^\s*\d+\s*$/) {
1418 error_msg
sprintf(__
("Invalid number: '%s'\n"),
1420 } elsif (0 < $response && $response <= $num) {
1421 $ix = $response - 1;
1423 error_msg
"Sorry, only $num hunks available.\n";
1427 elsif ($line =~ /^d/i) {
1428 while ($ix < $num) {
1429 if (!defined $hunk[$ix]{USE
}) {
1430 $hunk[$ix]{USE
} = 0;
1436 elsif ($line =~ /^q/i) {
1437 for ($i = 0; $i < $num; $i++) {
1438 if (!defined $hunk[$i]{USE
}) {
1445 elsif ($line =~ m
|^/(.*)|) {
1448 print colored
$prompt_color, __
("search for regex? ");
1450 if (defined $regex) {
1456 $search_string = qr{$regex}m;
1459 my ($err,$exp) = ($@
, $1);
1460 $err =~ s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//;
1461 error_msg
sprintf(__
("Malformed search regexp %s: %s\n"), $exp, $err);
1466 my $text = join ("", @
{$hunk[$iy]{TEXT
}});
1467 last if ($text =~ $search_string);
1469 $iy = 0 if ($iy >= $num);
1471 error_msg __
("No hunk matches the given pattern\n");
1478 elsif ($line =~ /^K/) {
1479 if ($other =~ /K/) {
1483 error_msg __
("No previous hunk\n");
1487 elsif ($line =~ /^J/) {
1488 if ($other =~ /J/) {
1492 error_msg __
("No next hunk\n");
1496 elsif ($line =~ /^k/) {
1497 if ($other =~ /k/) {
1501 !defined $hunk[$ix]{USE
});
1505 error_msg __
("No previous hunk\n");
1509 elsif ($line =~ /^j/) {
1510 if ($other !~ /j/) {
1511 error_msg __
("No next hunk\n");
1515 elsif ($other =~ /s/ && $line =~ /^s/) {
1516 my @split = split_hunk
($hunk[$ix]{TEXT
}, $hunk[$ix]{DISPLAY
});
1518 print colored
$header_color, "Split into ",
1519 scalar(@split), " hunks.\n";
1521 splice (@hunk, $ix, 1, @split);
1522 $num = scalar @hunk;
1525 elsif ($other =~ /e/ && $line =~ /^e/) {
1526 my $newhunk = edit_hunk_loop
($head, \
@hunk, $ix);
1527 if (defined $newhunk) {
1528 splice @hunk, $ix, 1, $newhunk;
1532 help_patch_cmd
($other);
1538 last if ($ix >= $num ||
1539 !defined $hunk[$ix]{USE
});
1544 @hunk = coalesce_overlapping_hunks
(@hunk);
1550 push @result, @
{$_->{TEXT
}};
1555 my @patch = reassemble_patch
($head->{TEXT
}, @result);
1556 my $apply_routine = $patch_mode_flavour{APPLY
};
1557 &$apply_routine(@patch);
1566 my @mods = list_modified
('index-only');
1567 @mods = grep { !($_->{BINARY
}) } @mods;
1569 my (@them) = list_and_choose
({ PROMPT
=> __
('Review diff'),
1571 HEADER
=> $status_head, },
1574 my $reference = (is_initial_commit
()) ? get_empty_tree
() : 'HEAD';
1575 system(qw(git diff -p --cached), $reference, '--',
1576 map { $_->{VALUE
} } @them);
1585 # TRANSLATORS: please do not translate the command names
1586 # 'status', 'update', 'revert', etc.
1587 print colored
$help_color, __
<<'EOF' ;
1588 status - show paths with changes
1589 update - add working tree state to the staged set of changes
1590 revert - revert staged set of changes back to the HEAD version
1591 patch - pick hunks and update selectively
1592 diff - view diff between HEAD and index
1593 add untracked - add contents of untracked files to the staged set of changes
1598 return unless @ARGV;
1599 my $arg = shift @ARGV;
1600 if ($arg =~ /--patch(?:=(.*))?/) {
1602 if ($1 eq 'reset') {
1603 $patch_mode = 'reset_head';
1604 $patch_mode_revision = 'HEAD';
1605 $arg = shift @ARGV or die __
("missing --");
1607 $patch_mode_revision = $arg;
1608 $patch_mode = ($arg eq 'HEAD' ?
1609 'reset_head' : 'reset_nothead');
1610 $arg = shift @ARGV or die __
("missing --");
1612 } elsif ($1 eq 'checkout') {
1613 $arg = shift @ARGV or die __
("missing --");
1615 $patch_mode = 'checkout_index';
1617 $patch_mode_revision = $arg;
1618 $patch_mode = ($arg eq 'HEAD' ?
1619 'checkout_head' : 'checkout_nothead');
1620 $arg = shift @ARGV or die __
("missing --");
1622 } elsif ($1 eq 'stage' or $1 eq 'stash') {
1624 $arg = shift @ARGV or die __
("missing --");
1626 die sprintf(__
("unknown --patch mode: %s"), $1);
1629 $patch_mode = 'stage';
1630 $arg = shift @ARGV or die __
("missing --");
1632 die sprintf(__
("invalid argument %s, expecting --"),
1633 $arg) unless $arg eq "--";
1634 %patch_mode_flavour = %{$patch_modes{$patch_mode}};
1636 elsif ($arg ne "--") {
1637 die sprintf(__
("invalid argument %s, expecting --"), $arg);
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
, ],
1652 my ($it) = list_and_choose
({ PROMPT
=> __
('What now'),
1655 HEADER
=> __
('*** Commands ***'),
1656 ON_EOF
=> \
&quit_cmd
,
1657 IMMEDIATE
=> 1 }, @cmd);