merge-recursive: do not return NULL only to cause segfault
[git/dscho.git] / git-add--interactive.perl
blobcd43c3491260cb2aa51f0d19fd18ab66e4ad8217
1 #!/usr/bin/perl -w
3 use strict;
4 use Git;
6 binmode(STDOUT, ":raw");
8 my $repo = Git->repository();
10 my $menu_use_color = $repo->get_colorbool('color.interactive');
11 my ($prompt_color, $header_color, $help_color) =
12 $menu_use_color ? (
13 $repo->get_color('color.interactive.prompt', 'bold blue'),
14 $repo->get_color('color.interactive.header', 'bold'),
15 $repo->get_color('color.interactive.help', 'red bold'),
16 ) : ();
17 my $error_color = ();
18 if ($menu_use_color) {
19 my $help_color_spec = ($repo->config('color.interactive.help') or
20 'red bold');
21 $error_color = $repo->get_color('color.interactive.error',
22 $help_color_spec);
25 my $diff_use_color = $repo->get_colorbool('color.diff');
26 my ($fraginfo_color) =
27 $diff_use_color ? (
28 $repo->get_color('color.diff.frag', 'cyan'),
29 ) : ();
30 my ($diff_plain_color) =
31 $diff_use_color ? (
32 $repo->get_color('color.diff.plain', ''),
33 ) : ();
34 my ($diff_old_color) =
35 $diff_use_color ? (
36 $repo->get_color('color.diff.old', 'red'),
37 ) : ();
38 my ($diff_new_color) =
39 $diff_use_color ? (
40 $repo->get_color('color.diff.new', 'green'),
41 ) : ();
43 my $normal_color = $repo->get_color("", "reset");
45 my $use_readkey = 0;
46 sub ReadMode;
47 sub ReadKey;
48 if ($repo->config_bool("interactive.singlekey")) {
49 eval {
50 require Term::ReadKey;
51 Term::ReadKey->import;
52 $use_readkey = 1;
56 sub colored {
57 my $color = shift;
58 my $string = join("", @_);
60 if (defined $color) {
61 # Put a color code at the beginning of each line, a reset at the end
62 # color after newlines that are not at the end of the string
63 $string =~ s/(\n+)(.)/$1$color$2/g;
64 # reset before newlines
65 $string =~ s/(\n+)/$normal_color$1/g;
66 # codes at beginning and end (if necessary):
67 $string =~ s/^/$color/;
68 $string =~ s/$/$normal_color/ unless $string =~ /\n$/;
70 return $string;
73 # command line options
74 my $patch_mode;
75 my $patch_mode_revision;
77 sub apply_patch;
78 sub apply_patch_for_checkout_commit;
79 sub apply_patch_for_stash;
81 my %patch_modes = (
82 'stage' => {
83 DIFF => 'diff-files -p',
84 APPLY => sub { apply_patch 'apply --cached', @_; },
85 APPLY_CHECK => 'apply --cached',
86 VERB => 'Stage',
87 TARGET => '',
88 PARTICIPLE => 'staging',
89 FILTER => 'file-only',
91 'stash' => {
92 DIFF => 'diff-index -p HEAD',
93 APPLY => sub { apply_patch 'apply --cached', @_; },
94 APPLY_CHECK => 'apply --cached',
95 VERB => 'Stash',
96 TARGET => '',
97 PARTICIPLE => 'stashing',
98 FILTER => undef,
100 'reset_head' => {
101 DIFF => 'diff-index -p --cached',
102 APPLY => sub { apply_patch 'apply -R --cached', @_; },
103 APPLY_CHECK => 'apply -R --cached',
104 VERB => 'Unstage',
105 TARGET => '',
106 PARTICIPLE => 'unstaging',
107 FILTER => 'index-only',
109 'reset_nothead' => {
110 DIFF => 'diff-index -R -p --cached',
111 APPLY => sub { apply_patch 'apply --cached', @_; },
112 APPLY_CHECK => 'apply --cached',
113 VERB => 'Apply',
114 TARGET => ' to index',
115 PARTICIPLE => 'applying',
116 FILTER => 'index-only',
118 'checkout_index' => {
119 DIFF => 'diff-files -p',
120 APPLY => sub { apply_patch 'apply -R', @_; },
121 APPLY_CHECK => 'apply -R',
122 VERB => 'Discard',
123 TARGET => ' from worktree',
124 PARTICIPLE => 'discarding',
125 FILTER => 'file-only',
127 'checkout_head' => {
128 DIFF => 'diff-index -p',
129 APPLY => sub { apply_patch_for_checkout_commit '-R', @_ },
130 APPLY_CHECK => 'apply -R',
131 VERB => 'Discard',
132 TARGET => ' from index and worktree',
133 PARTICIPLE => 'discarding',
134 FILTER => undef,
136 'checkout_nothead' => {
137 DIFF => 'diff-index -R -p',
138 APPLY => sub { apply_patch_for_checkout_commit '', @_ },
139 APPLY_CHECK => 'apply',
140 VERB => 'Apply',
141 TARGET => ' to index and worktree',
142 PARTICIPLE => 'applying',
143 FILTER => undef,
147 my %patch_mode_flavour = %{$patch_modes{stage}};
149 sub run_cmd_pipe {
150 if ($^O eq 'MSWin32' || $^O eq 'msys') {
151 my @invalid = grep {m/[":*]/} @_;
152 die "$^O does not support: @invalid\n" if @invalid;
153 my @args = map { m/ /o ? "\"$_\"": $_ } @_;
154 return qx{@args};
155 } else {
156 my $fh = undef;
157 open($fh, '-|', @_) or die;
158 return <$fh>;
162 my ($GIT_DIR) = run_cmd_pipe(qw(git rev-parse --git-dir));
164 if (!defined $GIT_DIR) {
165 exit(1); # rev-parse would have already said "not a git repo"
167 chomp($GIT_DIR);
169 my %cquote_map = (
170 "b" => chr(8),
171 "t" => chr(9),
172 "n" => chr(10),
173 "v" => chr(11),
174 "f" => chr(12),
175 "r" => chr(13),
176 "\\" => "\\",
177 "\042" => "\042",
180 sub unquote_path {
181 local ($_) = @_;
182 my ($retval, $remainder);
183 if (!/^\042(.*)\042$/) {
184 return $_;
186 ($_, $retval) = ($1, "");
187 while (/^([^\\]*)\\(.*)$/) {
188 $remainder = $2;
189 $retval .= $1;
190 for ($remainder) {
191 if (/^([0-3][0-7][0-7])(.*)$/) {
192 $retval .= chr(oct($1));
193 $_ = $2;
194 last;
196 if (/^([\\\042btnvfr])(.*)$/) {
197 $retval .= $cquote_map{$1};
198 $_ = $2;
199 last;
201 # This is malformed -- just return it as-is for now.
202 return $_[0];
204 $_ = $remainder;
206 $retval .= $_;
207 return $retval;
210 sub refresh {
211 my $fh;
212 open $fh, 'git update-index --refresh |'
213 or die;
214 while (<$fh>) {
215 ;# ignore 'needs update'
217 close $fh;
220 sub list_untracked {
221 map {
222 chomp $_;
223 unquote_path($_);
225 run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @ARGV);
228 my $status_fmt = '%12s %12s %s';
229 my $status_head = sprintf($status_fmt, 'staged', 'unstaged', 'path');
232 my $initial;
233 sub is_initial_commit {
234 $initial = system('git rev-parse HEAD -- >/dev/null 2>&1') != 0
235 unless defined $initial;
236 return $initial;
240 sub get_empty_tree {
241 return '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
244 # Returns list of hashes, contents of each of which are:
245 # VALUE: pathname
246 # BINARY: is a binary path
247 # INDEX: is index different from HEAD?
248 # FILE: is file different from index?
249 # INDEX_ADDDEL: is it add/delete between HEAD and index?
250 # FILE_ADDDEL: is it add/delete between index and file?
252 sub list_modified {
253 my ($only) = @_;
254 my (%data, @return);
255 my ($add, $del, $adddel, $file);
256 my @tracked = ();
258 if (@ARGV) {
259 @tracked = map {
260 chomp $_;
261 unquote_path($_);
262 } run_cmd_pipe(qw(git ls-files --), @ARGV);
263 return if (!@tracked);
266 my $reference;
267 if (defined $patch_mode_revision and $patch_mode_revision ne 'HEAD') {
268 $reference = $patch_mode_revision;
269 } elsif (is_initial_commit()) {
270 $reference = get_empty_tree();
271 } else {
272 $reference = 'HEAD';
274 for (run_cmd_pipe(qw(git diff-index --cached
275 --numstat --summary), $reference,
276 '--', @tracked)) {
277 if (($add, $del, $file) =
278 /^([-\d]+) ([-\d]+) (.*)/) {
279 my ($change, $bin);
280 $file = unquote_path($file);
281 if ($add eq '-' && $del eq '-') {
282 $change = 'binary';
283 $bin = 1;
285 else {
286 $change = "+$add/-$del";
288 $data{$file} = {
289 INDEX => $change,
290 BINARY => $bin,
291 FILE => 'nothing',
294 elsif (($adddel, $file) =
295 /^ (create|delete) mode [0-7]+ (.*)$/) {
296 $file = unquote_path($file);
297 $data{$file}{INDEX_ADDDEL} = $adddel;
301 for (run_cmd_pipe(qw(git diff-files --numstat --summary --), @tracked)) {
302 if (($add, $del, $file) =
303 /^([-\d]+) ([-\d]+) (.*)/) {
304 $file = unquote_path($file);
305 if (!exists $data{$file}) {
306 $data{$file} = +{
307 INDEX => 'unchanged',
308 BINARY => 0,
311 my ($change, $bin);
312 if ($add eq '-' && $del eq '-') {
313 $change = 'binary';
314 $bin = 1;
316 else {
317 $change = "+$add/-$del";
319 $data{$file}{FILE} = $change;
320 if ($bin) {
321 $data{$file}{BINARY} = 1;
324 elsif (($adddel, $file) =
325 /^ (create|delete) mode [0-7]+ (.*)$/) {
326 $file = unquote_path($file);
327 $data{$file}{FILE_ADDDEL} = $adddel;
331 for (sort keys %data) {
332 my $it = $data{$_};
334 if ($only) {
335 if ($only eq 'index-only') {
336 next if ($it->{INDEX} eq 'unchanged');
338 if ($only eq 'file-only') {
339 next if ($it->{FILE} eq 'nothing');
342 push @return, +{
343 VALUE => $_,
344 %$it,
347 return @return;
350 sub find_unique {
351 my ($string, @stuff) = @_;
352 my $found = undef;
353 for (my $i = 0; $i < @stuff; $i++) {
354 my $it = $stuff[$i];
355 my $hit = undef;
356 if (ref $it) {
357 if ((ref $it) eq 'ARRAY') {
358 $it = $it->[0];
360 else {
361 $it = $it->{VALUE};
364 eval {
365 if ($it =~ /^$string/) {
366 $hit = 1;
369 if (defined $hit && defined $found) {
370 return undef;
372 if ($hit) {
373 $found = $i + 1;
376 return $found;
379 # inserts string into trie and updates count for each character
380 sub update_trie {
381 my ($trie, $string) = @_;
382 foreach (split //, $string) {
383 $trie = $trie->{$_} ||= {COUNT => 0};
384 $trie->{COUNT}++;
388 # returns an array of tuples (prefix, remainder)
389 sub find_unique_prefixes {
390 my @stuff = @_;
391 my @return = ();
393 # any single prefix exceeding the soft limit is omitted
394 # if any prefix exceeds the hard limit all are omitted
395 # 0 indicates no limit
396 my $soft_limit = 0;
397 my $hard_limit = 3;
399 # build a trie modelling all possible options
400 my %trie;
401 foreach my $print (@stuff) {
402 if ((ref $print) eq 'ARRAY') {
403 $print = $print->[0];
405 elsif ((ref $print) eq 'HASH') {
406 $print = $print->{VALUE};
408 update_trie(\%trie, $print);
409 push @return, $print;
412 # use the trie to find the unique prefixes
413 for (my $i = 0; $i < @return; $i++) {
414 my $ret = $return[$i];
415 my @letters = split //, $ret;
416 my %search = %trie;
417 my ($prefix, $remainder);
418 my $j;
419 for ($j = 0; $j < @letters; $j++) {
420 my $letter = $letters[$j];
421 if ($search{$letter}{COUNT} == 1) {
422 $prefix = substr $ret, 0, $j + 1;
423 $remainder = substr $ret, $j + 1;
424 last;
426 else {
427 my $prefix = substr $ret, 0, $j;
428 return ()
429 if ($hard_limit && $j + 1 > $hard_limit);
431 %search = %{$search{$letter}};
433 if (ord($letters[0]) > 127 ||
434 ($soft_limit && $j + 1 > $soft_limit)) {
435 $prefix = undef;
436 $remainder = $ret;
438 $return[$i] = [$prefix, $remainder];
440 return @return;
443 # filters out prefixes which have special meaning to list_and_choose()
444 sub is_valid_prefix {
445 my $prefix = shift;
446 return (defined $prefix) &&
447 !($prefix =~ /[\s,]/) && # separators
448 !($prefix =~ /^-/) && # deselection
449 !($prefix =~ /^\d+/) && # selection
450 ($prefix ne '*') && # "all" wildcard
451 ($prefix ne '?'); # prompt help
454 # given a prefix/remainder tuple return a string with the prefix highlighted
455 # for now use square brackets; later might use ANSI colors (underline, bold)
456 sub highlight_prefix {
457 my $prefix = shift;
458 my $remainder = shift;
460 if (!defined $prefix) {
461 return $remainder;
464 if (!is_valid_prefix($prefix)) {
465 return "$prefix$remainder";
468 if (!$menu_use_color) {
469 return "[$prefix]$remainder";
472 return "$prompt_color$prefix$normal_color$remainder";
475 sub error_msg {
476 print STDERR colored $error_color, @_;
479 sub list_and_choose {
480 my ($opts, @stuff) = @_;
481 my (@chosen, @return);
482 my $i;
483 my @prefixes = find_unique_prefixes(@stuff) unless $opts->{LIST_ONLY};
485 TOPLOOP:
486 while (1) {
487 my $last_lf = 0;
489 if ($opts->{HEADER}) {
490 if (!$opts->{LIST_FLAT}) {
491 print " ";
493 print colored $header_color, "$opts->{HEADER}\n";
495 for ($i = 0; $i < @stuff; $i++) {
496 my $chosen = $chosen[$i] ? '*' : ' ';
497 my $print = $stuff[$i];
498 my $ref = ref $print;
499 my $highlighted = highlight_prefix(@{$prefixes[$i]})
500 if @prefixes;
501 if ($ref eq 'ARRAY') {
502 $print = $highlighted || $print->[0];
504 elsif ($ref eq 'HASH') {
505 my $value = $highlighted || $print->{VALUE};
506 $print = sprintf($status_fmt,
507 $print->{INDEX},
508 $print->{FILE},
509 $value);
511 else {
512 $print = $highlighted || $print;
514 printf("%s%2d: %s", $chosen, $i+1, $print);
515 if (($opts->{LIST_FLAT}) &&
516 (($i + 1) % ($opts->{LIST_FLAT}))) {
517 print "\t";
518 $last_lf = 0;
520 else {
521 print "\n";
522 $last_lf = 1;
525 if (!$last_lf) {
526 print "\n";
529 return if ($opts->{LIST_ONLY});
531 print colored $prompt_color, $opts->{PROMPT};
532 if ($opts->{SINGLETON}) {
533 print "> ";
535 else {
536 print ">> ";
538 my $line = <STDIN>;
539 if (!$line) {
540 print "\n";
541 $opts->{ON_EOF}->() if $opts->{ON_EOF};
542 last;
544 chomp $line;
545 last if $line eq '';
546 if ($line eq '?') {
547 $opts->{SINGLETON} ?
548 singleton_prompt_help_cmd() :
549 prompt_help_cmd();
550 next TOPLOOP;
552 for my $choice (split(/[\s,]+/, $line)) {
553 my $choose = 1;
554 my ($bottom, $top);
556 # Input that begins with '-'; unchoose
557 if ($choice =~ s/^-//) {
558 $choose = 0;
560 # A range can be specified like 5-7 or 5-.
561 if ($choice =~ /^(\d+)-(\d*)$/) {
562 ($bottom, $top) = ($1, length($2) ? $2 : 1 + @stuff);
564 elsif ($choice =~ /^\d+$/) {
565 $bottom = $top = $choice;
567 elsif ($choice eq '*') {
568 $bottom = 1;
569 $top = 1 + @stuff;
571 else {
572 $bottom = $top = find_unique($choice, @stuff);
573 if (!defined $bottom) {
574 error_msg "Huh ($choice)?\n";
575 next TOPLOOP;
578 if ($opts->{SINGLETON} && $bottom != $top) {
579 error_msg "Huh ($choice)?\n";
580 next TOPLOOP;
582 for ($i = $bottom-1; $i <= $top-1; $i++) {
583 next if (@stuff <= $i || $i < 0);
584 $chosen[$i] = $choose;
587 last if ($opts->{IMMEDIATE} || $line eq '*');
589 for ($i = 0; $i < @stuff; $i++) {
590 if ($chosen[$i]) {
591 push @return, $stuff[$i];
594 return @return;
597 sub singleton_prompt_help_cmd {
598 print colored $help_color, <<\EOF ;
599 Prompt help:
600 1 - select a numbered item
601 foo - select item based on unique prefix
602 - (empty) select nothing
606 sub prompt_help_cmd {
607 print colored $help_color, <<\EOF ;
608 Prompt help:
609 1 - select a single item
610 3-5 - select a range of items
611 2-3,6-9 - select multiple ranges
612 foo - select item based on unique prefix
613 -... - unselect specified items
614 * - choose all items
615 - (empty) finish selecting
619 sub status_cmd {
620 list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
621 list_modified());
622 print "\n";
625 sub say_n_paths {
626 my $did = shift @_;
627 my $cnt = scalar @_;
628 print "$did ";
629 if (1 < $cnt) {
630 print "$cnt paths\n";
632 else {
633 print "one path\n";
637 sub update_cmd {
638 my @mods = list_modified('file-only');
639 return if (!@mods);
641 my @update = list_and_choose({ PROMPT => 'Update',
642 HEADER => $status_head, },
643 @mods);
644 if (@update) {
645 system(qw(git update-index --add --remove --),
646 map { $_->{VALUE} } @update);
647 say_n_paths('updated', @update);
649 print "\n";
652 sub revert_cmd {
653 my @update = list_and_choose({ PROMPT => 'Revert',
654 HEADER => $status_head, },
655 list_modified());
656 if (@update) {
657 if (is_initial_commit()) {
658 system(qw(git rm --cached),
659 map { $_->{VALUE} } @update);
661 else {
662 my @lines = run_cmd_pipe(qw(git ls-tree HEAD --),
663 map { $_->{VALUE} } @update);
664 my $fh;
665 open $fh, '| git update-index --index-info'
666 or die;
667 for (@lines) {
668 print $fh $_;
670 close($fh);
671 for (@update) {
672 if ($_->{INDEX_ADDDEL} &&
673 $_->{INDEX_ADDDEL} eq 'create') {
674 system(qw(git update-index --force-remove --),
675 $_->{VALUE});
676 print "note: $_->{VALUE} is untracked now.\n";
680 refresh();
681 say_n_paths('reverted', @update);
683 print "\n";
686 sub add_untracked_cmd {
687 my @add = list_and_choose({ PROMPT => 'Add untracked' },
688 list_untracked());
689 if (@add) {
690 system(qw(git update-index --add --), @add);
691 say_n_paths('added', @add);
693 print "\n";
696 sub run_git_apply {
697 my $cmd = shift;
698 my $fh;
699 open $fh, '| git ' . $cmd;
700 print $fh @_;
701 return close $fh;
704 sub parse_diff {
705 my ($path) = @_;
706 my @diff_cmd = split(" ", $patch_mode_flavour{DIFF});
707 if (defined $patch_mode_revision) {
708 push @diff_cmd, $patch_mode_revision;
710 my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path);
711 my @colored = ();
712 if ($diff_use_color) {
713 @colored = run_cmd_pipe("git", @diff_cmd, qw(--color --), $path);
715 my (@hunk) = { TEXT => [], DISPLAY => [], TYPE => 'header' };
717 for (my $i = 0; $i < @diff; $i++) {
718 if ($diff[$i] =~ /^@@ /) {
719 push @hunk, { TEXT => [], DISPLAY => [],
720 TYPE => 'hunk' };
722 push @{$hunk[-1]{TEXT}}, $diff[$i];
723 push @{$hunk[-1]{DISPLAY}},
724 ($diff_use_color ? $colored[$i] : $diff[$i]);
726 return @hunk;
729 sub parse_diff_header {
730 my $src = shift;
732 my $head = { TEXT => [], DISPLAY => [], TYPE => 'header' };
733 my $mode = { TEXT => [], DISPLAY => [], TYPE => 'mode' };
734 my $deletion = { TEXT => [], DISPLAY => [], TYPE => 'deletion' };
736 for (my $i = 0; $i < @{$src->{TEXT}}; $i++) {
737 my $dest =
738 $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ? $mode :
739 $src->{TEXT}->[$i] =~ /^deleted file/ ? $deletion :
740 $head;
741 push @{$dest->{TEXT}}, $src->{TEXT}->[$i];
742 push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i];
744 return ($head, $mode, $deletion);
747 sub hunk_splittable {
748 my ($text) = @_;
750 my @s = split_hunk($text);
751 return (1 < @s);
754 sub parse_hunk_header {
755 my ($line) = @_;
756 my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
757 $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
758 $o_cnt = 1 unless defined $o_cnt;
759 $n_cnt = 1 unless defined $n_cnt;
760 return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
763 sub split_hunk {
764 my ($text, $display) = @_;
765 my @split = ();
766 if (!defined $display) {
767 $display = $text;
769 # If there are context lines in the middle of a hunk,
770 # it can be split, but we would need to take care of
771 # overlaps later.
773 my ($o_ofs, undef, $n_ofs) = parse_hunk_header($text->[0]);
774 my $hunk_start = 1;
776 OUTER:
777 while (1) {
778 my $next_hunk_start = undef;
779 my $i = $hunk_start - 1;
780 my $this = +{
781 TEXT => [],
782 DISPLAY => [],
783 TYPE => 'hunk',
784 OLD => $o_ofs,
785 NEW => $n_ofs,
786 OCNT => 0,
787 NCNT => 0,
788 ADDDEL => 0,
789 POSTCTX => 0,
790 USE => undef,
793 while (++$i < @$text) {
794 my $line = $text->[$i];
795 my $display = $display->[$i];
796 if ($line =~ /^ /) {
797 if ($this->{ADDDEL} &&
798 !defined $next_hunk_start) {
799 # We have seen leading context and
800 # adds/dels and then here is another
801 # context, which is trailing for this
802 # split hunk and leading for the next
803 # one.
804 $next_hunk_start = $i;
806 push @{$this->{TEXT}}, $line;
807 push @{$this->{DISPLAY}}, $display;
808 $this->{OCNT}++;
809 $this->{NCNT}++;
810 if (defined $next_hunk_start) {
811 $this->{POSTCTX}++;
813 next;
816 # add/del
817 if (defined $next_hunk_start) {
818 # We are done with the current hunk and
819 # this is the first real change for the
820 # next split one.
821 $hunk_start = $next_hunk_start;
822 $o_ofs = $this->{OLD} + $this->{OCNT};
823 $n_ofs = $this->{NEW} + $this->{NCNT};
824 $o_ofs -= $this->{POSTCTX};
825 $n_ofs -= $this->{POSTCTX};
826 push @split, $this;
827 redo OUTER;
829 push @{$this->{TEXT}}, $line;
830 push @{$this->{DISPLAY}}, $display;
831 $this->{ADDDEL}++;
832 if ($line =~ /^-/) {
833 $this->{OCNT}++;
835 else {
836 $this->{NCNT}++;
840 push @split, $this;
841 last;
844 for my $hunk (@split) {
845 $o_ofs = $hunk->{OLD};
846 $n_ofs = $hunk->{NEW};
847 my $o_cnt = $hunk->{OCNT};
848 my $n_cnt = $hunk->{NCNT};
850 my $head = ("@@ -$o_ofs" .
851 (($o_cnt != 1) ? ",$o_cnt" : '') .
852 " +$n_ofs" .
853 (($n_cnt != 1) ? ",$n_cnt" : '') .
854 " @@\n");
855 my $display_head = $head;
856 unshift @{$hunk->{TEXT}}, $head;
857 if ($diff_use_color) {
858 $display_head = colored($fraginfo_color, $head);
860 unshift @{$hunk->{DISPLAY}}, $display_head;
862 return @split;
865 sub find_last_o_ctx {
866 my ($it) = @_;
867 my $text = $it->{TEXT};
868 my ($o_ofs, $o_cnt) = parse_hunk_header($text->[0]);
869 my $i = @{$text};
870 my $last_o_ctx = $o_ofs + $o_cnt;
871 while (0 < --$i) {
872 my $line = $text->[$i];
873 if ($line =~ /^ /) {
874 $last_o_ctx--;
875 next;
877 last;
879 return $last_o_ctx;
882 sub merge_hunk {
883 my ($prev, $this) = @_;
884 my ($o0_ofs, $o0_cnt, $n0_ofs, $n0_cnt) =
885 parse_hunk_header($prev->{TEXT}[0]);
886 my ($o1_ofs, $o1_cnt, $n1_ofs, $n1_cnt) =
887 parse_hunk_header($this->{TEXT}[0]);
889 my (@line, $i, $ofs, $o_cnt, $n_cnt);
890 $ofs = $o0_ofs;
891 $o_cnt = $n_cnt = 0;
892 for ($i = 1; $i < @{$prev->{TEXT}}; $i++) {
893 my $line = $prev->{TEXT}[$i];
894 if ($line =~ /^\+/) {
895 $n_cnt++;
896 push @line, $line;
897 next;
900 last if ($o1_ofs <= $ofs);
902 $o_cnt++;
903 $ofs++;
904 if ($line =~ /^ /) {
905 $n_cnt++;
907 push @line, $line;
910 for ($i = 1; $i < @{$this->{TEXT}}; $i++) {
911 my $line = $this->{TEXT}[$i];
912 if ($line =~ /^\+/) {
913 $n_cnt++;
914 push @line, $line;
915 next;
917 $ofs++;
918 $o_cnt++;
919 if ($line =~ /^ /) {
920 $n_cnt++;
922 push @line, $line;
924 my $head = ("@@ -$o0_ofs" .
925 (($o_cnt != 1) ? ",$o_cnt" : '') .
926 " +$n0_ofs" .
927 (($n_cnt != 1) ? ",$n_cnt" : '') .
928 " @@\n");
929 @{$prev->{TEXT}} = ($head, @line);
932 sub coalesce_overlapping_hunks {
933 my (@in) = @_;
934 my @out = ();
936 my ($last_o_ctx, $last_was_dirty);
938 for (grep { $_->{USE} } @in) {
939 if ($_->{TYPE} ne 'hunk') {
940 push @out, $_;
941 next;
943 my $text = $_->{TEXT};
944 my ($o_ofs) = parse_hunk_header($text->[0]);
945 if (defined $last_o_ctx &&
946 $o_ofs <= $last_o_ctx &&
947 !$_->{DIRTY} &&
948 !$last_was_dirty) {
949 merge_hunk($out[-1], $_);
951 else {
952 push @out, $_;
954 $last_o_ctx = find_last_o_ctx($out[-1]);
955 $last_was_dirty = $_->{DIRTY};
957 return @out;
960 sub color_diff {
961 return map {
962 colored((/^@/ ? $fraginfo_color :
963 /^\+/ ? $diff_new_color :
964 /^-/ ? $diff_old_color :
965 $diff_plain_color),
966 $_);
967 } @_;
970 sub edit_hunk_manually {
971 my ($oldtext) = @_;
973 my $hunkfile = $repo->repo_path . "/addp-hunk-edit.diff";
974 my $fh;
975 open $fh, '>', $hunkfile
976 or die "failed to open hunk edit file for writing: " . $!;
977 print $fh "# Manual hunk edit mode -- see bottom for a quick guide\n";
978 print $fh @$oldtext;
979 my $participle = $patch_mode_flavour{PARTICIPLE};
980 print $fh <<EOF;
981 # ---
982 # To remove '-' lines, make them ' ' lines (context).
983 # To remove '+' lines, delete them.
984 # Lines starting with # will be removed.
986 # If the patch applies cleanly, the edited hunk will immediately be
987 # marked for $participle. If it does not apply cleanly, you will be given
988 # an opportunity to edit again. If all lines of the hunk are removed,
989 # then the edit is aborted and the hunk is left unchanged.
991 close $fh;
993 chomp(my $editor = run_cmd_pipe(qw(git var GIT_EDITOR)));
994 system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
996 if ($? != 0) {
997 return undef;
1000 open $fh, '<', $hunkfile
1001 or die "failed to open hunk edit file for reading: " . $!;
1002 my @newtext = grep { !/^#/ } <$fh>;
1003 close $fh;
1004 unlink $hunkfile;
1006 # Abort if nothing remains
1007 if (!grep { /\S/ } @newtext) {
1008 return undef;
1011 # Reinsert the first hunk header if the user accidentally deleted it
1012 if ($newtext[0] !~ /^@/) {
1013 unshift @newtext, $oldtext->[0];
1015 return \@newtext;
1018 sub diff_applies {
1019 my $fh;
1020 return run_git_apply($patch_mode_flavour{APPLY_CHECK} . ' --recount --check',
1021 map { @{$_->{TEXT}} } @_);
1024 sub _restore_terminal_and_die {
1025 ReadMode 'restore';
1026 print "\n";
1027 exit 1;
1030 sub prompt_single_character {
1031 if ($use_readkey) {
1032 local $SIG{TERM} = \&_restore_terminal_and_die;
1033 local $SIG{INT} = \&_restore_terminal_and_die;
1034 ReadMode 'cbreak';
1035 my $key = ReadKey 0;
1036 ReadMode 'restore';
1037 print "$key" if defined $key;
1038 print "\n";
1039 return $key;
1040 } else {
1041 return <STDIN>;
1045 sub prompt_yesno {
1046 my ($prompt) = @_;
1047 while (1) {
1048 print colored $prompt_color, $prompt;
1049 my $line = prompt_single_character;
1050 return 0 if $line =~ /^n/i;
1051 return 1 if $line =~ /^y/i;
1055 sub edit_hunk_loop {
1056 my ($head, $hunk, $ix) = @_;
1057 my $text = $hunk->[$ix]->{TEXT};
1059 while (1) {
1060 $text = edit_hunk_manually($text);
1061 if (!defined $text) {
1062 return undef;
1064 my $newhunk = {
1065 TEXT => $text,
1066 TYPE => $hunk->[$ix]->{TYPE},
1067 USE => 1,
1068 DIRTY => 1,
1070 if (diff_applies($head,
1071 @{$hunk}[0..$ix-1],
1072 $newhunk,
1073 @{$hunk}[$ix+1..$#{$hunk}])) {
1074 $newhunk->{DISPLAY} = [color_diff(@{$text})];
1075 return $newhunk;
1077 else {
1078 prompt_yesno(
1079 'Your edited hunk does not apply. Edit again '
1080 . '(saying "no" discards!) [y/n]? '
1081 ) or return undef;
1086 sub help_patch_cmd {
1087 my $verb = lc $patch_mode_flavour{VERB};
1088 my $target = $patch_mode_flavour{TARGET};
1089 print colored $help_color, <<EOF ;
1090 y - $verb this hunk$target
1091 n - do not $verb this hunk$target
1092 q - quit, do not $verb this hunk nor any of the remaining ones
1093 a - $verb this and all the remaining hunks in the file
1094 d - do not $verb this hunk nor any of the remaining hunks in the file
1095 g - select a hunk to go to
1096 / - search for a hunk matching the given regex
1097 j - leave this hunk undecided, see next undecided hunk
1098 J - leave this hunk undecided, see next hunk
1099 k - leave this hunk undecided, see previous undecided hunk
1100 K - leave this hunk undecided, see previous hunk
1101 s - split the current hunk into smaller hunks
1102 e - manually edit the current hunk
1103 ? - print help
1107 sub apply_patch {
1108 my $cmd = shift;
1109 my $ret = run_git_apply $cmd . ' --recount', @_;
1110 if (!$ret) {
1111 print STDERR @_;
1113 return $ret;
1116 sub apply_patch_for_checkout_commit {
1117 my $reverse = shift;
1118 my $applies_index = run_git_apply 'apply '.$reverse.' --cached --recount --check', @_;
1119 my $applies_worktree = run_git_apply 'apply '.$reverse.' --recount --check', @_;
1121 if ($applies_worktree && $applies_index) {
1122 run_git_apply 'apply '.$reverse.' --cached --recount', @_;
1123 run_git_apply 'apply '.$reverse.' --recount', @_;
1124 return 1;
1125 } elsif (!$applies_index) {
1126 print colored $error_color, "The selected hunks do not apply to the index!\n";
1127 if (prompt_yesno "Apply them to the worktree anyway? ") {
1128 return run_git_apply 'apply '.$reverse.' --recount', @_;
1129 } else {
1130 print colored $error_color, "Nothing was applied.\n";
1131 return 0;
1133 } else {
1134 print STDERR @_;
1135 return 0;
1139 sub patch_update_cmd {
1140 my @all_mods = list_modified($patch_mode_flavour{FILTER});
1141 my @mods = grep { !($_->{BINARY}) } @all_mods;
1142 my @them;
1144 if (!@mods) {
1145 if (@all_mods) {
1146 print STDERR "Only binary files changed.\n";
1147 } else {
1148 print STDERR "No changes.\n";
1150 return 0;
1152 if ($patch_mode) {
1153 @them = @mods;
1155 else {
1156 @them = list_and_choose({ PROMPT => 'Patch update',
1157 HEADER => $status_head, },
1158 @mods);
1160 for (@them) {
1161 return 0 if patch_update_file($_->{VALUE});
1165 # Generate a one line summary of a hunk.
1166 sub summarize_hunk {
1167 my $rhunk = shift;
1168 my $summary = $rhunk->{TEXT}[0];
1170 # Keep the line numbers, discard extra context.
1171 $summary =~ s/@@(.*?)@@.*/$1 /s;
1172 $summary .= " " x (20 - length $summary);
1174 # Add some user context.
1175 for my $line (@{$rhunk->{TEXT}}) {
1176 if ($line =~ m/^[+-].*\w/) {
1177 $summary .= $line;
1178 last;
1182 chomp $summary;
1183 return substr($summary, 0, 80) . "\n";
1187 # Print a one-line summary of each hunk in the array ref in
1188 # the first argument, starting wih the index in the 2nd.
1189 sub display_hunks {
1190 my ($hunks, $i) = @_;
1191 my $ctr = 0;
1192 $i ||= 0;
1193 for (; $i < @$hunks && $ctr < 20; $i++, $ctr++) {
1194 my $status = " ";
1195 if (defined $hunks->[$i]{USE}) {
1196 $status = $hunks->[$i]{USE} ? "+" : "-";
1198 printf "%s%2d: %s",
1199 $status,
1200 $i + 1,
1201 summarize_hunk($hunks->[$i]);
1203 return $i;
1206 sub patch_update_file {
1207 my $quit = 0;
1208 my ($ix, $num);
1209 my $path = shift;
1210 my ($head, @hunk) = parse_diff($path);
1211 ($head, my $mode, my $deletion) = parse_diff_header($head);
1212 for (@{$head->{DISPLAY}}) {
1213 print;
1216 if (@{$mode->{TEXT}}) {
1217 unshift @hunk, $mode;
1219 if (@{$deletion->{TEXT}}) {
1220 foreach my $hunk (@hunk) {
1221 push @{$deletion->{TEXT}}, @{$hunk->{TEXT}};
1222 push @{$deletion->{DISPLAY}}, @{$hunk->{DISPLAY}};
1224 @hunk = ($deletion);
1227 $num = scalar @hunk;
1228 $ix = 0;
1230 while (1) {
1231 my ($prev, $next, $other, $undecided, $i);
1232 $other = '';
1234 if ($num <= $ix) {
1235 $ix = 0;
1237 for ($i = 0; $i < $ix; $i++) {
1238 if (!defined $hunk[$i]{USE}) {
1239 $prev = 1;
1240 $other .= ',k';
1241 last;
1244 if ($ix) {
1245 $other .= ',K';
1247 for ($i = $ix + 1; $i < $num; $i++) {
1248 if (!defined $hunk[$i]{USE}) {
1249 $next = 1;
1250 $other .= ',j';
1251 last;
1254 if ($ix < $num - 1) {
1255 $other .= ',J';
1257 if ($num > 1) {
1258 $other .= ',g';
1260 for ($i = 0; $i < $num; $i++) {
1261 if (!defined $hunk[$i]{USE}) {
1262 $undecided = 1;
1263 last;
1266 last if (!$undecided);
1268 if ($hunk[$ix]{TYPE} eq 'hunk' &&
1269 hunk_splittable($hunk[$ix]{TEXT})) {
1270 $other .= ',s';
1272 if ($hunk[$ix]{TYPE} eq 'hunk') {
1273 $other .= ',e';
1275 for (@{$hunk[$ix]{DISPLAY}}) {
1276 print;
1278 print colored $prompt_color, $patch_mode_flavour{VERB},
1279 ($hunk[$ix]{TYPE} eq 'mode' ? ' mode change' :
1280 $hunk[$ix]{TYPE} eq 'deletion' ? ' deletion' :
1281 ' this hunk'),
1282 $patch_mode_flavour{TARGET},
1283 " [y,n,q,a,d,/$other,?]? ";
1284 my $line = prompt_single_character;
1285 if ($line) {
1286 if ($line =~ /^y/i) {
1287 $hunk[$ix]{USE} = 1;
1289 elsif ($line =~ /^n/i) {
1290 $hunk[$ix]{USE} = 0;
1292 elsif ($line =~ /^a/i) {
1293 while ($ix < $num) {
1294 if (!defined $hunk[$ix]{USE}) {
1295 $hunk[$ix]{USE} = 1;
1297 $ix++;
1299 next;
1301 elsif ($other =~ /g/ && $line =~ /^g(.*)/) {
1302 my $response = $1;
1303 my $no = $ix > 10 ? $ix - 10 : 0;
1304 while ($response eq '') {
1305 my $extra = "";
1306 $no = display_hunks(\@hunk, $no);
1307 if ($no < $num) {
1308 $extra = " (<ret> to see more)";
1310 print "go to which hunk$extra? ";
1311 $response = <STDIN>;
1312 if (!defined $response) {
1313 $response = '';
1315 chomp $response;
1317 if ($response !~ /^\s*\d+\s*$/) {
1318 error_msg "Invalid number: '$response'\n";
1319 } elsif (0 < $response && $response <= $num) {
1320 $ix = $response - 1;
1321 } else {
1322 error_msg "Sorry, only $num hunks available.\n";
1324 next;
1326 elsif ($line =~ /^d/i) {
1327 while ($ix < $num) {
1328 if (!defined $hunk[$ix]{USE}) {
1329 $hunk[$ix]{USE} = 0;
1331 $ix++;
1333 next;
1335 elsif ($line =~ /^q/i) {
1336 while ($ix < $num) {
1337 if (!defined $hunk[$ix]{USE}) {
1338 $hunk[$ix]{USE} = 0;
1340 $ix++;
1342 $quit = 1;
1343 next;
1345 elsif ($line =~ m|^/(.*)|) {
1346 my $regex = $1;
1347 if ($1 eq "") {
1348 print colored $prompt_color, "search for regex? ";
1349 $regex = <STDIN>;
1350 if (defined $regex) {
1351 chomp $regex;
1354 my $search_string;
1355 eval {
1356 $search_string = qr{$regex}m;
1358 if ($@) {
1359 my ($err,$exp) = ($@, $1);
1360 $err =~ s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//;
1361 error_msg "Malformed search regexp $exp: $err\n";
1362 next;
1364 my $iy = $ix;
1365 while (1) {
1366 my $text = join ("", @{$hunk[$iy]{TEXT}});
1367 last if ($text =~ $search_string);
1368 $iy++;
1369 $iy = 0 if ($iy >= $num);
1370 if ($ix == $iy) {
1371 error_msg "No hunk matches the given pattern\n";
1372 last;
1375 $ix = $iy;
1376 next;
1378 elsif ($line =~ /^K/) {
1379 if ($other =~ /K/) {
1380 $ix--;
1382 else {
1383 error_msg "No previous hunk\n";
1385 next;
1387 elsif ($line =~ /^J/) {
1388 if ($other =~ /J/) {
1389 $ix++;
1391 else {
1392 error_msg "No next hunk\n";
1394 next;
1396 elsif ($line =~ /^k/) {
1397 if ($other =~ /k/) {
1398 while (1) {
1399 $ix--;
1400 last if (!$ix ||
1401 !defined $hunk[$ix]{USE});
1404 else {
1405 error_msg "No previous hunk\n";
1407 next;
1409 elsif ($line =~ /^j/) {
1410 if ($other !~ /j/) {
1411 error_msg "No next hunk\n";
1412 next;
1415 elsif ($other =~ /s/ && $line =~ /^s/) {
1416 my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});
1417 if (1 < @split) {
1418 print colored $header_color, "Split into ",
1419 scalar(@split), " hunks.\n";
1421 splice (@hunk, $ix, 1, @split);
1422 $num = scalar @hunk;
1423 next;
1425 elsif ($other =~ /e/ && $line =~ /^e/) {
1426 my $newhunk = edit_hunk_loop($head, \@hunk, $ix);
1427 if (defined $newhunk) {
1428 splice @hunk, $ix, 1, $newhunk;
1431 else {
1432 help_patch_cmd($other);
1433 next;
1435 # soft increment
1436 while (1) {
1437 $ix++;
1438 last if ($ix >= $num ||
1439 !defined $hunk[$ix]{USE});
1444 @hunk = coalesce_overlapping_hunks(@hunk);
1446 my $n_lofs = 0;
1447 my @result = ();
1448 for (@hunk) {
1449 if ($_->{USE}) {
1450 push @result, @{$_->{TEXT}};
1454 if (@result) {
1455 my $fh;
1456 my @patch = (@{$head->{TEXT}}, @result);
1457 my $apply_routine = $patch_mode_flavour{APPLY};
1458 &$apply_routine(@patch);
1459 refresh();
1462 print "\n";
1463 return $quit;
1466 sub diff_cmd {
1467 my @mods = list_modified('index-only');
1468 @mods = grep { !($_->{BINARY}) } @mods;
1469 return if (!@mods);
1470 my (@them) = list_and_choose({ PROMPT => 'Review diff',
1471 IMMEDIATE => 1,
1472 HEADER => $status_head, },
1473 @mods);
1474 return if (!@them);
1475 my $reference = is_initial_commit() ? get_empty_tree() : 'HEAD';
1476 system(qw(git diff -p --cached), $reference, '--',
1477 map { $_->{VALUE} } @them);
1480 sub quit_cmd {
1481 print "Bye.\n";
1482 exit(0);
1485 sub help_cmd {
1486 print colored $help_color, <<\EOF ;
1487 status - show paths with changes
1488 update - add working tree state to the staged set of changes
1489 revert - revert staged set of changes back to the HEAD version
1490 patch - pick hunks and update selectively
1491 diff - view diff between HEAD and index
1492 add untracked - add contents of untracked files to the staged set of changes
1496 sub process_args {
1497 return unless @ARGV;
1498 my $arg = shift @ARGV;
1499 if ($arg =~ /--patch(?:=(.*))?/) {
1500 if (defined $1) {
1501 if ($1 eq 'reset') {
1502 $patch_mode = 'reset_head';
1503 $patch_mode_revision = 'HEAD';
1504 $arg = shift @ARGV or die "missing --";
1505 if ($arg ne '--') {
1506 $patch_mode_revision = $arg;
1507 $patch_mode = ($arg eq 'HEAD' ?
1508 'reset_head' : 'reset_nothead');
1509 $arg = shift @ARGV or die "missing --";
1511 } elsif ($1 eq 'checkout') {
1512 $arg = shift @ARGV or die "missing --";
1513 if ($arg eq '--') {
1514 $patch_mode = 'checkout_index';
1515 } else {
1516 $patch_mode_revision = $arg;
1517 $patch_mode = ($arg eq 'HEAD' ?
1518 'checkout_head' : 'checkout_nothead');
1519 $arg = shift @ARGV or die "missing --";
1521 } elsif ($1 eq 'stage' or $1 eq 'stash') {
1522 $patch_mode = $1;
1523 $arg = shift @ARGV or die "missing --";
1524 } else {
1525 die "unknown --patch mode: $1";
1527 } else {
1528 $patch_mode = 'stage';
1529 $arg = shift @ARGV or die "missing --";
1531 die "invalid argument $arg, expecting --"
1532 unless $arg eq "--";
1533 %patch_mode_flavour = %{$patch_modes{$patch_mode}};
1535 elsif ($arg ne "--") {
1536 die "invalid argument $arg, expecting --";
1540 sub main_loop {
1541 my @cmd = ([ 'status', \&status_cmd, ],
1542 [ 'update', \&update_cmd, ],
1543 [ 'revert', \&revert_cmd, ],
1544 [ 'add untracked', \&add_untracked_cmd, ],
1545 [ 'patch', \&patch_update_cmd, ],
1546 [ 'diff', \&diff_cmd, ],
1547 [ 'quit', \&quit_cmd, ],
1548 [ 'help', \&help_cmd, ],
1550 while (1) {
1551 my ($it) = list_and_choose({ PROMPT => 'What now',
1552 SINGLETON => 1,
1553 LIST_FLAT => 4,
1554 HEADER => '*** Commands ***',
1555 ON_EOF => \&quit_cmd,
1556 IMMEDIATE => 1 }, @cmd);
1557 if ($it) {
1558 eval {
1559 $it->[1]->();
1561 if ($@) {
1562 print "$@";
1568 process_args();
1569 refresh();
1570 if ($patch_mode) {
1571 patch_update_cmd();
1573 else {
1574 status_cmd();
1575 main_loop();