6 use Git
qw(unquote_path);
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_filter = $repo->config('interactive.difffilter');
57 if ($repo->config_bool("interactive.singlekey")) {
59 require Term
::ReadKey
;
60 Term
::ReadKey
->import;
64 print STDERR
"missing Term::ReadKey, disabling interactive.singlekey\n";
68 my $termcap = Term
::Cap
->Tgetent;
69 foreach (values %$termcap) {
70 $term_escapes{$_} = 1 if /^\e/;
78 my $string = join("", @_);
81 # Put a color code at the beginning of each line, a reset at the end
82 # color after newlines that are not at the end of the string
83 $string =~ s/(\n+)(.)/$1$color$2/g;
84 # reset before newlines
85 $string =~ s/(\n+)/$normal_color$1/g;
86 # codes at beginning and end (if necessary):
87 $string =~ s/^/$color/;
88 $string =~ s/$/$normal_color/ unless $string =~ /\n$/;
93 # 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',
107 FILTER
=> 'file-only',
111 DIFF
=> 'diff-index -p HEAD',
112 APPLY
=> sub { apply_patch
'apply --cached', @_; },
113 APPLY_CHECK
=> 'apply --cached',
118 DIFF
=> 'diff-index -p --cached',
119 APPLY
=> sub { apply_patch
'apply -R --cached', @_; },
120 APPLY_CHECK
=> 'apply -R --cached',
121 FILTER
=> 'index-only',
125 DIFF
=> 'diff-index -R -p --cached',
126 APPLY
=> sub { apply_patch
'apply --cached', @_; },
127 APPLY_CHECK
=> 'apply --cached',
128 FILTER
=> 'index-only',
131 'checkout_index' => {
132 DIFF
=> 'diff-files -p',
133 APPLY
=> sub { apply_patch
'apply -R', @_; },
134 APPLY_CHECK
=> 'apply -R',
135 FILTER
=> 'file-only',
139 DIFF
=> 'diff-index -p',
140 APPLY
=> sub { apply_patch_for_checkout_commit
'-R', @_ },
141 APPLY_CHECK
=> 'apply -R',
145 'checkout_nothead' => {
146 DIFF
=> 'diff-index -R -p',
147 APPLY
=> sub { apply_patch_for_checkout_commit
'', @_ },
148 APPLY_CHECK
=> 'apply',
154 $patch_mode = 'stage';
155 my %patch_mode_flavour = %{$patch_modes{$patch_mode}};
158 if ($^O
eq 'MSWin32') {
159 my @invalid = grep {m/[":*]/} @_;
160 die "$^O does not support: @invalid\n" if @invalid;
161 my @args = map { m/ /o ?
"\"$_\"": $_ } @_;
165 open($fh, '-|', @_) or die;
170 my ($GIT_DIR) = run_cmd_pipe
(qw(git rev-parse --git-dir));
172 if (!defined $GIT_DIR) {
173 exit(1); # rev-parse would have already said "not a git repo"
179 open $fh, 'git update-index --refresh |'
182 ;# ignore 'needs update'
192 run_cmd_pipe
(qw(git ls-files --others --exclude-standard --), @ARGV);
195 # TRANSLATORS: you can adjust this to align "git add -i" status menu
196 my $status_fmt = __
('%12s %12s %s');
197 my $status_head = sprintf($status_fmt, __
('staged'), __
('unstaged'), __
('path'));
201 sub is_initial_commit
{
202 $initial = system('git rev-parse HEAD -- >/dev/null 2>&1') != 0
203 unless defined $initial;
209 return '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
212 sub get_diff_reference
{
214 if (defined $ref and $ref ne 'HEAD') {
216 } elsif (is_initial_commit
()) {
217 return get_empty_tree
();
223 # Returns list of hashes, contents of each of which are:
225 # BINARY: is a binary path
226 # INDEX: is index different from HEAD?
227 # FILE: is file different from index?
228 # INDEX_ADDDEL: is it add/delete between HEAD and index?
229 # FILE_ADDDEL: is it add/delete between index and file?
230 # UNMERGED: is the path unmerged
235 my ($add, $del, $adddel, $file);
237 my $reference = get_diff_reference
($patch_mode_revision);
238 for (run_cmd_pipe
(qw(git diff-index --cached
239 --numstat --summary), $reference,
241 if (($add, $del, $file) =
242 /^([-\d]+) ([-\d]+) (.*)/) {
244 $file = unquote_path
($file);
245 if ($add eq '-' && $del eq '-') {
246 $change = __
('binary');
250 $change = "+$add/-$del";
255 FILE
=> __
('nothing'),
258 elsif (($adddel, $file) =
259 /^ (create|delete) mode [0-7]+ (.*)$/) {
260 $file = unquote_path
($file);
261 $data{$file}{INDEX_ADDDEL
} = $adddel;
265 for (run_cmd_pipe
(qw(git diff-files --ignore-submodules=dirty --numstat --summary --raw --), @ARGV)) {
266 if (($add, $del, $file) =
267 /^([-\d]+) ([-\d]+) (.*)/) {
268 $file = unquote_path
($file);
270 if ($add eq '-' && $del eq '-') {
271 $change = __
('binary');
275 $change = "+$add/-$del";
277 $data{$file}{FILE
} = $change;
279 $data{$file}{BINARY
} = 1;
282 elsif (($adddel, $file) =
283 /^ (create|delete) mode [0-7]+ (.*)$/) {
284 $file = unquote_path
($file);
285 $data{$file}{FILE_ADDDEL
} = $adddel;
287 elsif (/^:[0-7]+ [0-7]+ [0-9a-f]+ [0-9a-f]+ (.) (.*)$/) {
288 $file = unquote_path
($2);
289 if (!exists $data{$file}) {
291 INDEX
=> __
('unchanged'),
296 $data{$file}{UNMERGED
} = 1;
301 for (sort keys %data) {
305 if ($only eq 'index-only') {
306 next if ($it->{INDEX
} eq __
('unchanged'));
308 if ($only eq 'file-only') {
309 next if ($it->{FILE
} eq __
('nothing'));
321 my ($string, @stuff) = @_;
323 for (my $i = 0; $i < @stuff; $i++) {
327 if ((ref $it) eq 'ARRAY') {
335 if ($it =~ /^$string/) {
339 if (defined $hit && defined $found) {
349 # inserts string into trie and updates count for each character
351 my ($trie, $string) = @_;
352 foreach (split //, $string) {
353 $trie = $trie->{$_} ||= {COUNT
=> 0};
358 # returns an array of tuples (prefix, remainder)
359 sub find_unique_prefixes
{
363 # any single prefix exceeding the soft limit is omitted
364 # if any prefix exceeds the hard limit all are omitted
365 # 0 indicates no limit
369 # build a trie modelling all possible options
371 foreach my $print (@stuff) {
372 if ((ref $print) eq 'ARRAY') {
373 $print = $print->[0];
375 elsif ((ref $print) eq 'HASH') {
376 $print = $print->{VALUE
};
378 update_trie
(\
%trie, $print);
379 push @return, $print;
382 # use the trie to find the unique prefixes
383 for (my $i = 0; $i < @return; $i++) {
384 my $ret = $return[$i];
385 my @letters = split //, $ret;
387 my ($prefix, $remainder);
389 for ($j = 0; $j < @letters; $j++) {
390 my $letter = $letters[$j];
391 if ($search{$letter}{COUNT
} == 1) {
392 $prefix = substr $ret, 0, $j + 1;
393 $remainder = substr $ret, $j + 1;
397 my $prefix = substr $ret, 0, $j;
399 if ($hard_limit && $j + 1 > $hard_limit);
401 %search = %{$search{$letter}};
403 if (ord($letters[0]) > 127 ||
404 ($soft_limit && $j + 1 > $soft_limit)) {
408 $return[$i] = [$prefix, $remainder];
413 # filters out prefixes which have special meaning to list_and_choose()
414 sub is_valid_prefix
{
416 return (defined $prefix) &&
417 !($prefix =~ /[\s,]/) && # separators
418 !($prefix =~ /^-/) && # deselection
419 !($prefix =~ /^\d+/) && # selection
420 ($prefix ne '*') && # "all" wildcard
421 ($prefix ne '?'); # prompt help
424 # given a prefix/remainder tuple return a string with the prefix highlighted
425 # for now use square brackets; later might use ANSI colors (underline, bold)
426 sub highlight_prefix
{
428 my $remainder = shift;
430 if (!defined $prefix) {
434 if (!is_valid_prefix
($prefix)) {
435 return "$prefix$remainder";
438 if (!$menu_use_color) {
439 return "[$prefix]$remainder";
442 return "$prompt_color$prefix$normal_color$remainder";
446 print STDERR colored
$error_color, @_;
449 sub list_and_choose
{
450 my ($opts, @stuff) = @_;
451 my (@chosen, @return);
456 my @prefixes = find_unique_prefixes
(@stuff) unless $opts->{LIST_ONLY
};
462 if ($opts->{HEADER
}) {
463 if (!$opts->{LIST_FLAT
}) {
466 print colored
$header_color, "$opts->{HEADER}\n";
468 for ($i = 0; $i < @stuff; $i++) {
469 my $chosen = $chosen[$i] ?
'*' : ' ';
470 my $print = $stuff[$i];
471 my $ref = ref $print;
472 my $highlighted = highlight_prefix
(@
{$prefixes[$i]})
474 if ($ref eq 'ARRAY') {
475 $print = $highlighted || $print->[0];
477 elsif ($ref eq 'HASH') {
478 my $value = $highlighted || $print->{VALUE
};
479 $print = sprintf($status_fmt,
485 $print = $highlighted || $print;
487 printf("%s%2d: %s", $chosen, $i+1, $print);
488 if (($opts->{LIST_FLAT
}) &&
489 (($i + 1) % ($opts->{LIST_FLAT
}))) {
502 return if ($opts->{LIST_ONLY
});
504 print colored
$prompt_color, $opts->{PROMPT
};
505 if ($opts->{SINGLETON
}) {
514 $opts->{ON_EOF
}->() if $opts->{ON_EOF
};
521 singleton_prompt_help_cmd
() :
525 for my $choice (split(/[\s,]+/, $line)) {
529 # Input that begins with '-'; unchoose
530 if ($choice =~ s/^-//) {
533 # A range can be specified like 5-7 or 5-.
534 if ($choice =~ /^(\d+)-(\d*)$/) {
535 ($bottom, $top) = ($1, length($2) ?
$2 : 1 + @stuff);
537 elsif ($choice =~ /^\d+$/) {
538 $bottom = $top = $choice;
540 elsif ($choice eq '*') {
545 $bottom = $top = find_unique
($choice, @stuff);
546 if (!defined $bottom) {
547 error_msg
sprintf(__
("Huh (%s)?\n"), $choice);
551 if ($opts->{SINGLETON
} && $bottom != $top) {
552 error_msg
sprintf(__
("Huh (%s)?\n"), $choice);
555 for ($i = $bottom-1; $i <= $top-1; $i++) {
556 next if (@stuff <= $i || $i < 0);
557 $chosen[$i] = $choose;
560 last if ($opts->{IMMEDIATE
} || $line eq '*');
562 for ($i = 0; $i < @stuff; $i++) {
564 push @return, $stuff[$i];
570 sub singleton_prompt_help_cmd
{
571 print colored
$help_color, __
<<'EOF' ;
573 1 - select a numbered item
574 foo - select item based on unique prefix
575 - (empty) select nothing
579 sub prompt_help_cmd
{
580 print colored
$help_color, __
<<'EOF' ;
582 1 - select a single item
583 3-5 - select a range of items
584 2-3,6-9 - select multiple ranges
585 foo - select item based on unique prefix
586 -... - unselect specified items
588 - (empty) finish selecting
593 list_and_choose
({ LIST_ONLY
=> 1, HEADER
=> $status_head },
601 if ($did eq 'added') {
602 printf(__n
("added %d path\n", "added %d paths\n",
604 } elsif ($did eq 'updated') {
605 printf(__n
("updated %d path\n", "updated %d paths\n",
607 } elsif ($did eq 'reverted') {
608 printf(__n
("reverted %d path\n", "reverted %d paths\n",
611 printf(__n
("touched %d path\n", "touched %d paths\n",
617 my @mods = list_modified
('file-only');
620 my @update = list_and_choose
({ PROMPT
=> __
('Update'),
621 HEADER
=> $status_head, },
624 system(qw(git update-index --add --remove --),
625 map { $_->{VALUE
} } @update);
626 say_n_paths
('updated', @update);
632 my @update = list_and_choose
({ PROMPT
=> __
('Revert'),
633 HEADER
=> $status_head, },
636 if (is_initial_commit
()) {
637 system(qw(git rm --cached),
638 map { $_->{VALUE
} } @update);
641 my @lines = run_cmd_pipe
(qw(git ls-tree HEAD --),
642 map { $_->{VALUE
} } @update);
644 open $fh, '| git update-index --index-info'
651 if ($_->{INDEX_ADDDEL
} &&
652 $_->{INDEX_ADDDEL
} eq 'create') {
653 system(qw(git update-index --force-remove --),
655 printf(__
("note: %s is untracked now.\n"), $_->{VALUE
});
660 say_n_paths
('reverted', @update);
665 sub add_untracked_cmd
{
666 my @add = list_and_choose
({ PROMPT
=> __
('Add untracked') },
669 system(qw(git update-index --add --), @add);
670 say_n_paths
('added', @add);
672 print __
("No untracked files.\n");
680 open $fh, '| git ' . $cmd . " --recount --allow-overlap";
687 my @diff_cmd = split(" ", $patch_mode_flavour{DIFF
});
688 if (defined $diff_algorithm) {
689 splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
691 if (defined $patch_mode_revision) {
692 push @diff_cmd, get_diff_reference
($patch_mode_revision);
694 my @diff = run_cmd_pipe
("git", @diff_cmd, "--", $path);
696 if ($diff_use_color) {
697 my @display_cmd = ("git", @diff_cmd, qw(--color --), $path);
698 if (defined $diff_filter) {
699 # quotemeta is overkill, but sufficient for shell-quoting
700 my $diff = join(' ', map { quotemeta } @display_cmd);
701 @display_cmd = ("$diff | $diff_filter");
704 @colored = run_cmd_pipe
(@display_cmd);
706 my (@hunk) = { TEXT
=> [], DISPLAY
=> [], TYPE
=> 'header' };
708 for (my $i = 0; $i < @diff; $i++) {
709 if ($diff[$i] =~ /^@@ /) {
710 push @hunk, { TEXT
=> [], DISPLAY
=> [],
713 push @
{$hunk[-1]{TEXT
}}, $diff[$i];
714 push @
{$hunk[-1]{DISPLAY
}},
715 (@colored ?
$colored[$i] : $diff[$i]);
720 sub parse_diff_header
{
723 my $head = { TEXT
=> [], DISPLAY
=> [], TYPE
=> 'header' };
724 my $mode = { TEXT
=> [], DISPLAY
=> [], TYPE
=> 'mode' };
725 my $deletion = { TEXT
=> [], DISPLAY
=> [], TYPE
=> 'deletion' };
727 for (my $i = 0; $i < @
{$src->{TEXT
}}; $i++) {
729 $src->{TEXT
}->[$i] =~ /^(old|new) mode (\d+)$/ ?
$mode :
730 $src->{TEXT
}->[$i] =~ /^deleted file/ ?
$deletion :
732 push @
{$dest->{TEXT
}}, $src->{TEXT
}->[$i];
733 push @
{$dest->{DISPLAY
}}, $src->{DISPLAY
}->[$i];
735 return ($head, $mode, $deletion);
738 sub hunk_splittable
{
741 my @s = split_hunk
($text);
745 sub parse_hunk_header
{
747 my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
748 $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
749 $o_cnt = 1 unless defined $o_cnt;
750 $n_cnt = 1 unless defined $n_cnt;
751 return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
755 my ($text, $display) = @_;
757 if (!defined $display) {
760 # If there are context lines in the middle of a hunk,
761 # it can be split, but we would need to take care of
764 my ($o_ofs, undef, $n_ofs) = parse_hunk_header
($text->[0]);
769 my $next_hunk_start = undef;
770 my $i = $hunk_start - 1;
784 while (++$i < @
$text) {
785 my $line = $text->[$i];
786 my $display = $display->[$i];
788 if ($this->{ADDDEL
} &&
789 !defined $next_hunk_start) {
790 # We have seen leading context and
791 # adds/dels and then here is another
792 # context, which is trailing for this
793 # split hunk and leading for the next
795 $next_hunk_start = $i;
797 push @
{$this->{TEXT
}}, $line;
798 push @
{$this->{DISPLAY
}}, $display;
801 if (defined $next_hunk_start) {
808 if (defined $next_hunk_start) {
809 # We are done with the current hunk and
810 # this is the first real change for the
812 $hunk_start = $next_hunk_start;
813 $o_ofs = $this->{OLD
} + $this->{OCNT
};
814 $n_ofs = $this->{NEW
} + $this->{NCNT
};
815 $o_ofs -= $this->{POSTCTX
};
816 $n_ofs -= $this->{POSTCTX
};
820 push @
{$this->{TEXT
}}, $line;
821 push @
{$this->{DISPLAY
}}, $display;
835 for my $hunk (@split) {
836 $o_ofs = $hunk->{OLD
};
837 $n_ofs = $hunk->{NEW
};
838 my $o_cnt = $hunk->{OCNT
};
839 my $n_cnt = $hunk->{NCNT
};
841 my $head = ("@@ -$o_ofs" .
842 (($o_cnt != 1) ?
",$o_cnt" : '') .
844 (($n_cnt != 1) ?
",$n_cnt" : '') .
846 my $display_head = $head;
847 unshift @
{$hunk->{TEXT
}}, $head;
848 if ($diff_use_color) {
849 $display_head = colored
($fraginfo_color, $head);
851 unshift @
{$hunk->{DISPLAY
}}, $display_head;
856 sub find_last_o_ctx
{
858 my $text = $it->{TEXT
};
859 my ($o_ofs, $o_cnt) = parse_hunk_header
($text->[0]);
861 my $last_o_ctx = $o_ofs + $o_cnt;
863 my $line = $text->[$i];
874 my ($prev, $this) = @_;
875 my ($o0_ofs, $o0_cnt, $n0_ofs, $n0_cnt) =
876 parse_hunk_header
($prev->{TEXT
}[0]);
877 my ($o1_ofs, $o1_cnt, $n1_ofs, $n1_cnt) =
878 parse_hunk_header
($this->{TEXT
}[0]);
880 my (@line, $i, $ofs, $o_cnt, $n_cnt);
883 for ($i = 1; $i < @
{$prev->{TEXT
}}; $i++) {
884 my $line = $prev->{TEXT
}[$i];
885 if ($line =~ /^\+/) {
891 last if ($o1_ofs <= $ofs);
901 for ($i = 1; $i < @
{$this->{TEXT
}}; $i++) {
902 my $line = $this->{TEXT
}[$i];
903 if ($line =~ /^\+/) {
915 my $head = ("@@ -$o0_ofs" .
916 (($o_cnt != 1) ?
",$o_cnt" : '') .
918 (($n_cnt != 1) ?
",$n_cnt" : '') .
920 @
{$prev->{TEXT
}} = ($head, @line);
923 sub coalesce_overlapping_hunks
{
927 my ($last_o_ctx, $last_was_dirty);
929 for (grep { $_->{USE
} } @in) {
930 if ($_->{TYPE
} ne 'hunk') {
934 my $text = $_->{TEXT
};
935 my ($o_ofs) = parse_hunk_header
($text->[0]);
936 if (defined $last_o_ctx &&
937 $o_ofs <= $last_o_ctx &&
940 merge_hunk
($out[-1], $_);
945 $last_o_ctx = find_last_o_ctx
($out[-1]);
946 $last_was_dirty = $_->{DIRTY
};
951 sub reassemble_patch
{
955 # Include everything in the header except the beginning of the diff.
956 push @patch, (grep { !/^[-+]{3}/ } @
$head);
958 # Then include any headers from the hunk lines, which must
959 # come before any actual hunk.
960 while (@_ && $_[0] !~ /^@/) {
964 # Then begin the diff.
965 push @patch, grep { /^[-+]{3}/ } @
$head;
967 # And then the actual hunks.
975 colored
((/^@/ ?
$fraginfo_color :
976 /^\+/ ?
$diff_new_color :
977 /^-/ ?
$diff_old_color :
983 my %edit_hunk_manually_modes = (
985 "If the patch applies cleanly, the edited hunk will immediately be
986 marked for staging."),
988 "If the patch applies cleanly, the edited hunk will immediately be
989 marked for stashing."),
991 "If the patch applies cleanly, the edited hunk will immediately be
992 marked for unstaging."),
993 reset_nothead
=> N__
(
994 "If the patch applies cleanly, the edited hunk will immediately be
995 marked for applying."),
996 checkout_index
=> N__
(
997 "If the patch applies cleanly, the edited hunk will immediately be
998 marked for discarding."),
999 checkout_head
=> N__
(
1000 "If the patch applies cleanly, the edited hunk will immediately be
1001 marked for discarding."),
1002 checkout_nothead
=> N__
(
1003 "If the patch applies cleanly, the edited hunk will immediately be
1004 marked for applying."),
1007 sub edit_hunk_manually
{
1010 my $hunkfile = $repo->repo_path . "/addp-hunk-edit.diff";
1012 open $fh, '>', $hunkfile
1013 or die sprintf(__
("failed to open hunk edit file for writing: %s"), $!);
1014 print $fh Git
::comment_lines __
("Manual hunk edit mode -- see bottom for a quick guide.\n");
1015 print $fh @
$oldtext;
1016 my $is_reverse = $patch_mode_flavour{IS_REVERSE
};
1017 my ($remove_plus, $remove_minus) = $is_reverse ?
('-', '+') : ('+', '-');
1018 my $comment_line_char = Git
::get_comment_line_char
;
1019 print $fh Git
::comment_lines
sprintf(__
<<EOF, $remove_minus, $remove_plus, $comment_line_char),
1021 To remove '%s' lines, make them ' ' lines (context).
1022 To remove '%s' lines, delete them.
1023 Lines starting with %s will be removed.
1025 __
($edit_hunk_manually_modes{$patch_mode}),
1026 # TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
1028 If it does not apply cleanly, you will be given an opportunity to
1029 edit again. If all lines of the hunk are removed, then the edit is
1030 aborted and the hunk is left unchanged.
1034 chomp(my $editor = run_cmd_pipe(qw(git var GIT_EDITOR)));
1035 system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
1041 open $fh, '<', $hunkfile
1042 or die sprintf(__
("failed to open hunk edit file for reading: %s"), $!);
1043 my @newtext = grep { !/^\Q$comment_line_char\E/ } <$fh>;
1047 # Abort if nothing remains
1048 if (!grep { /\S/ } @newtext) {
1052 # Reinsert the first hunk header if the user accidentally deleted it
1053 if ($newtext[0] !~ /^@/) {
1054 unshift @newtext, $oldtext->[0];
1060 return run_git_apply
($patch_mode_flavour{APPLY_CHECK
} . ' --check',
1061 map { @
{$_->{TEXT
}} } @_);
1064 sub _restore_terminal_and_die
{
1070 sub prompt_single_character
{
1072 local $SIG{TERM
} = \
&_restore_terminal_and_die
;
1073 local $SIG{INT
} = \
&_restore_terminal_and_die
;
1075 my $key = ReadKey
0;
1077 if ($use_termcap and $key eq "\e") {
1078 while (!defined $term_escapes{$key}) {
1079 my $next = ReadKey
0.5;
1080 last if (!defined $next);
1085 print "$key" if defined $key;
1096 print colored
$prompt_color, $prompt;
1097 my $line = prompt_single_character
;
1098 return undef unless defined $line;
1099 return 0 if $line =~ /^n/i;
1100 return 1 if $line =~ /^y/i;
1104 sub edit_hunk_loop
{
1105 my ($head, $hunk, $ix) = @_;
1106 my $text = $hunk->[$ix]->{TEXT
};
1109 $text = edit_hunk_manually
($text);
1110 if (!defined $text) {
1115 TYPE
=> $hunk->[$ix]->{TYPE
},
1119 if (diff_applies
($head,
1122 @
{$hunk}[$ix+1..$#{$hunk}])) {
1123 $newhunk->{DISPLAY
} = [color_diff
(@
{$text})];
1128 # TRANSLATORS: do not translate [y/n]
1129 # The program will only accept that input
1131 # Consider translating (saying "no" discards!) as
1132 # (saying "n" for "no" discards!) if the translation
1133 # of the word "no" does not start with n.
1134 __
('Your edited hunk does not apply. Edit again '
1135 . '(saying "no" discards!) [y/n]? ')
1141 my %help_patch_modes = (
1143 "y - stage this hunk
1144 n - do not stage this hunk
1145 q - quit; do not stage this hunk or any of the remaining ones
1146 a - stage this hunk and all later hunks in the file
1147 d - do not stage this hunk or any of the later hunks in the file"),
1149 "y - stash this hunk
1150 n - do not stash this hunk
1151 q - quit; do not stash this hunk or any of the remaining ones
1152 a - stash this hunk and all later hunks in the file
1153 d - do not stash this hunk or any of the later hunks in the file"),
1155 "y - unstage this hunk
1156 n - do not unstage this hunk
1157 q - quit; do not unstage this hunk or any of the remaining ones
1158 a - unstage this hunk and all later hunks in the file
1159 d - do not unstage this hunk or any of the later hunks in the file"),
1160 reset_nothead
=> N__
(
1161 "y - apply this hunk to index
1162 n - do not apply this hunk to index
1163 q - quit; do not apply this hunk or any of the remaining ones
1164 a - apply this hunk and all later hunks in the file
1165 d - do not apply this hunk or any of the later hunks in the file"),
1166 checkout_index
=> N__
(
1167 "y - discard this hunk from worktree
1168 n - do not discard this hunk from worktree
1169 q - quit; do not discard this hunk or any of the remaining ones
1170 a - discard this hunk and all later hunks in the file
1171 d - do not discard this hunk or any of the later hunks in the file"),
1172 checkout_head
=> N__
(
1173 "y - discard this hunk from index and worktree
1174 n - do not discard this hunk from index and worktree
1175 q - quit; do not discard this hunk or any of the remaining ones
1176 a - discard this hunk and all later hunks in the file
1177 d - do not discard this hunk or any of the later hunks in the file"),
1178 checkout_nothead
=> N__
(
1179 "y - apply this hunk to index and worktree
1180 n - do not apply this hunk to index and worktree
1181 q - quit; do not apply this hunk or any of the remaining ones
1182 a - apply this hunk and all later hunks in the file
1183 d - do not apply this hunk or any of the later hunks in the file"),
1186 sub help_patch_cmd
{
1188 my $other = $_[0] . ",?";
1189 print colored
$help_color, __
($help_patch_modes{$patch_mode}), "\n",
1190 map { "$_\n" } grep {
1191 my $c = quotemeta(substr($_, 0, 1));
1193 } split "\n", __
<<EOF ;
1194 g - select a hunk to go to
1195 / - search for a hunk matching the given regex
1196 j - leave this hunk undecided, see next undecided hunk
1197 J - leave this hunk undecided, see next hunk
1198 k - leave this hunk undecided, see previous undecided hunk
1199 K - leave this hunk undecided, see previous hunk
1200 s - split the current hunk into smaller hunks
1201 e - manually edit the current hunk
1208 my $ret = run_git_apply
$cmd, @_;
1215 sub apply_patch_for_checkout_commit
{
1216 my $reverse = shift;
1217 my $applies_index = run_git_apply
'apply '.$reverse.' --cached --check', @_;
1218 my $applies_worktree = run_git_apply
'apply '.$reverse.' --check', @_;
1220 if ($applies_worktree && $applies_index) {
1221 run_git_apply
'apply '.$reverse.' --cached', @_;
1222 run_git_apply
'apply '.$reverse, @_;
1224 } elsif (!$applies_index) {
1225 print colored
$error_color, __
("The selected hunks do not apply to the index!\n");
1226 if (prompt_yesno __
("Apply them to the worktree anyway? ")) {
1227 return run_git_apply
'apply '.$reverse, @_;
1229 print colored
$error_color, __
("Nothing was applied.\n");
1238 sub patch_update_cmd
{
1239 my @all_mods = list_modified
($patch_mode_flavour{FILTER
});
1240 error_msg
sprintf(__
("ignoring unmerged: %s\n"), $_->{VALUE
})
1241 for grep { $_->{UNMERGED
} } @all_mods;
1242 @all_mods = grep { !$_->{UNMERGED
} } @all_mods;
1244 my @mods = grep { !($_->{BINARY
}) } @all_mods;
1249 print STDERR __
("Only binary files changed.\n");
1251 print STDERR __
("No changes.\n");
1255 if ($patch_mode_only) {
1259 @them = list_and_choose
({ PROMPT
=> __
('Patch update'),
1260 HEADER
=> $status_head, },
1264 return 0 if patch_update_file
($_->{VALUE
});
1268 # Generate a one line summary of a hunk.
1269 sub summarize_hunk
{
1271 my $summary = $rhunk->{TEXT
}[0];
1273 # Keep the line numbers, discard extra context.
1274 $summary =~ s/@@(.*?)@@.*/$1 /s;
1275 $summary .= " " x
(20 - length $summary);
1277 # Add some user context.
1278 for my $line (@
{$rhunk->{TEXT
}}) {
1279 if ($line =~ m/^[+-].*\w/) {
1286 return substr($summary, 0, 80) . "\n";
1290 # Print a one-line summary of each hunk in the array ref in
1291 # the first argument, starting with the index in the 2nd.
1293 my ($hunks, $i) = @_;
1296 for (; $i < @
$hunks && $ctr < 20; $i++, $ctr++) {
1298 if (defined $hunks->[$i]{USE
}) {
1299 $status = $hunks->[$i]{USE
} ?
"+" : "-";
1304 summarize_hunk
($hunks->[$i]);
1309 my %patch_update_prompt_modes = (
1311 mode
=> N__
("Stage mode change [y,n,q,a,d%s,?]? "),
1312 deletion
=> N__
("Stage deletion [y,n,q,a,d%s,?]? "),
1313 hunk
=> N__
("Stage this hunk [y,n,q,a,d%s,?]? "),
1316 mode
=> N__
("Stash mode change [y,n,q,a,d%s,?]? "),
1317 deletion
=> N__
("Stash deletion [y,n,q,a,d%s,?]? "),
1318 hunk
=> N__
("Stash this hunk [y,n,q,a,d%s,?]? "),
1321 mode
=> N__
("Unstage mode change [y,n,q,a,d%s,?]? "),
1322 deletion
=> N__
("Unstage deletion [y,n,q,a,d%s,?]? "),
1323 hunk
=> N__
("Unstage this hunk [y,n,q,a,d%s,?]? "),
1326 mode
=> N__
("Apply mode change to index [y,n,q,a,d%s,?]? "),
1327 deletion
=> N__
("Apply deletion to index [y,n,q,a,d%s,?]? "),
1328 hunk
=> N__
("Apply this hunk to index [y,n,q,a,d%s,?]? "),
1331 mode
=> N__
("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
1332 deletion
=> N__
("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
1333 hunk
=> N__
("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
1336 mode
=> N__
("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
1337 deletion
=> N__
("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
1338 hunk
=> N__
("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
1340 checkout_nothead
=> {
1341 mode
=> N__
("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
1342 deletion
=> N__
("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
1343 hunk
=> N__
("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
1347 sub patch_update_file
{
1351 my ($head, @hunk) = parse_diff
($path);
1352 ($head, my $mode, my $deletion) = parse_diff_header
($head);
1353 for (@
{$head->{DISPLAY
}}) {
1357 if (@
{$mode->{TEXT
}}) {
1358 unshift @hunk, $mode;
1360 if (@
{$deletion->{TEXT
}}) {
1361 foreach my $hunk (@hunk) {
1362 push @
{$deletion->{TEXT
}}, @
{$hunk->{TEXT
}};
1363 push @
{$deletion->{DISPLAY
}}, @
{$hunk->{DISPLAY
}};
1365 @hunk = ($deletion);
1368 $num = scalar @hunk;
1372 my ($prev, $next, $other, $undecided, $i);
1378 for ($i = 0; $i < $ix; $i++) {
1379 if (!defined $hunk[$i]{USE
}) {
1388 for ($i = $ix + 1; $i < $num; $i++) {
1389 if (!defined $hunk[$i]{USE
}) {
1395 if ($ix < $num - 1) {
1401 for ($i = 0; $i < $num; $i++) {
1402 if (!defined $hunk[$i]{USE
}) {
1407 last if (!$undecided);
1409 if ($hunk[$ix]{TYPE
} eq 'hunk' &&
1410 hunk_splittable
($hunk[$ix]{TEXT
})) {
1413 if ($hunk[$ix]{TYPE
} eq 'hunk') {
1416 for (@
{$hunk[$ix]{DISPLAY
}}) {
1419 print colored
$prompt_color,
1420 sprintf(__
($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE
}}), $other);
1422 my $line = prompt_single_character
;
1423 last unless defined $line;
1425 if ($line =~ /^y/i) {
1426 $hunk[$ix]{USE
} = 1;
1428 elsif ($line =~ /^n/i) {
1429 $hunk[$ix]{USE
} = 0;
1431 elsif ($line =~ /^a/i) {
1432 while ($ix < $num) {
1433 if (!defined $hunk[$ix]{USE
}) {
1434 $hunk[$ix]{USE
} = 1;
1440 elsif ($line =~ /^g(.*)/) {
1442 unless ($other =~ /g/) {
1443 error_msg __
("No other hunks to goto\n");
1446 my $no = $ix > 10 ?
$ix - 10 : 0;
1447 while ($response eq '') {
1448 $no = display_hunks
(\
@hunk, $no);
1450 print __
("go to which hunk (<ret> to see more)? ");
1452 print __
("go to which hunk? ");
1454 $response = <STDIN
>;
1455 if (!defined $response) {
1460 if ($response !~ /^\s*\d+\s*$/) {
1461 error_msg
sprintf(__
("Invalid number: '%s'\n"),
1463 } elsif (0 < $response && $response <= $num) {
1464 $ix = $response - 1;
1466 error_msg
sprintf(__n
("Sorry, only %d hunk available.\n",
1467 "Sorry, only %d hunks available.\n", $num), $num);
1471 elsif ($line =~ /^d/i) {
1472 while ($ix < $num) {
1473 if (!defined $hunk[$ix]{USE
}) {
1474 $hunk[$ix]{USE
} = 0;
1480 elsif ($line =~ /^q/i) {
1481 for ($i = 0; $i < $num; $i++) {
1482 if (!defined $hunk[$i]{USE
}) {
1489 elsif ($line =~ m
|^/(.*)|) {
1491 unless ($other =~ m
|/|) {
1492 error_msg __
("No other hunks to search\n");
1496 print colored
$prompt_color, __
("search for regex? ");
1498 if (defined $regex) {
1504 $search_string = qr{$regex}m;
1507 my ($err,$exp) = ($@
, $1);
1508 $err =~ s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//;
1509 error_msg
sprintf(__
("Malformed search regexp %s: %s\n"), $exp, $err);
1514 my $text = join ("", @
{$hunk[$iy]{TEXT
}});
1515 last if ($text =~ $search_string);
1517 $iy = 0 if ($iy >= $num);
1519 error_msg __
("No hunk matches the given pattern\n");
1526 elsif ($line =~ /^K/) {
1527 if ($other =~ /K/) {
1531 error_msg __
("No previous hunk\n");
1535 elsif ($line =~ /^J/) {
1536 if ($other =~ /J/) {
1540 error_msg __
("No next hunk\n");
1544 elsif ($line =~ /^k/) {
1545 if ($other =~ /k/) {
1549 !defined $hunk[$ix]{USE
});
1553 error_msg __
("No previous hunk\n");
1557 elsif ($line =~ /^j/) {
1558 if ($other !~ /j/) {
1559 error_msg __
("No next hunk\n");
1563 elsif ($line =~ /^s/) {
1564 unless ($other =~ /s/) {
1565 error_msg __
("Sorry, cannot split this hunk\n");
1568 my @split = split_hunk
($hunk[$ix]{TEXT
}, $hunk[$ix]{DISPLAY
});
1570 print colored
$header_color, sprintf(
1571 __n
("Split into %d hunk.\n",
1572 "Split into %d hunks.\n",
1573 scalar(@split)), scalar(@split));
1575 splice (@hunk, $ix, 1, @split);
1576 $num = scalar @hunk;
1579 elsif ($line =~ /^e/) {
1580 unless ($other =~ /e/) {
1581 error_msg __
("Sorry, cannot edit this hunk\n");
1584 my $newhunk = edit_hunk_loop
($head, \
@hunk, $ix);
1585 if (defined $newhunk) {
1586 splice @hunk, $ix, 1, $newhunk;
1590 help_patch_cmd
($other);
1596 last if ($ix >= $num ||
1597 !defined $hunk[$ix]{USE
});
1602 @hunk = coalesce_overlapping_hunks
(@hunk);
1608 push @result, @
{$_->{TEXT
}};
1613 my @patch = reassemble_patch
($head->{TEXT
}, @result);
1614 my $apply_routine = $patch_mode_flavour{APPLY
};
1615 &$apply_routine(@patch);
1624 my @mods = list_modified
('index-only');
1625 @mods = grep { !($_->{BINARY
}) } @mods;
1627 my (@them) = list_and_choose
({ PROMPT
=> __
('Review diff'),
1629 HEADER
=> $status_head, },
1632 my $reference = (is_initial_commit
()) ? get_empty_tree
() : 'HEAD';
1633 system(qw(git diff -p --cached), $reference, '--',
1634 map { $_->{VALUE
} } @them);
1643 # TRANSLATORS: please do not translate the command names
1644 # 'status', 'update', 'revert', etc.
1645 print colored
$help_color, __
<<'EOF' ;
1646 status - show paths with changes
1647 update - add working tree state to the staged set of changes
1648 revert - revert staged set of changes back to the HEAD version
1649 patch - pick hunks and update selectively
1650 diff - view diff between HEAD and index
1651 add untracked - add contents of untracked files to the staged set of changes
1656 return unless @ARGV;
1657 my $arg = shift @ARGV;
1658 if ($arg =~ /--patch(?:=(.*))?/) {
1660 if ($1 eq 'reset') {
1661 $patch_mode = 'reset_head';
1662 $patch_mode_revision = 'HEAD';
1663 $arg = shift @ARGV or die __
("missing --");
1665 $patch_mode_revision = $arg;
1666 $patch_mode = ($arg eq 'HEAD' ?
1667 'reset_head' : 'reset_nothead');
1668 $arg = shift @ARGV or die __
("missing --");
1670 } elsif ($1 eq 'checkout') {
1671 $arg = shift @ARGV or die __
("missing --");
1673 $patch_mode = 'checkout_index';
1675 $patch_mode_revision = $arg;
1676 $patch_mode = ($arg eq 'HEAD' ?
1677 'checkout_head' : 'checkout_nothead');
1678 $arg = shift @ARGV or die __
("missing --");
1680 } elsif ($1 eq 'stage' or $1 eq 'stash') {
1682 $arg = shift @ARGV or die __
("missing --");
1684 die sprintf(__
("unknown --patch mode: %s"), $1);
1687 $patch_mode = 'stage';
1688 $arg = shift @ARGV or die __
("missing --");
1690 die sprintf(__
("invalid argument %s, expecting --"),
1691 $arg) unless $arg eq "--";
1692 %patch_mode_flavour = %{$patch_modes{$patch_mode}};
1693 $patch_mode_only = 1;
1695 elsif ($arg ne "--") {
1696 die sprintf(__
("invalid argument %s, expecting --"), $arg);
1701 my @cmd = ([ 'status', \
&status_cmd
, ],
1702 [ 'update', \
&update_cmd
, ],
1703 [ 'revert', \
&revert_cmd
, ],
1704 [ 'add untracked', \
&add_untracked_cmd
, ],
1705 [ 'patch', \
&patch_update_cmd
, ],
1706 [ 'diff', \
&diff_cmd
, ],
1707 [ 'quit', \
&quit_cmd
, ],
1708 [ 'help', \
&help_cmd
, ],
1711 my ($it) = list_and_choose
({ PROMPT
=> __
('What now'),
1714 HEADER
=> __
('*** Commands ***'),
1715 ON_EOF
=> \
&quit_cmd
,
1716 IMMEDIATE
=> 1 }, @cmd);
1730 if ($patch_mode_only) {