1#!/usr/bin/perl -w
2use strict;
4use Git;
5my $repo = Git->repository();
7my $menu_use_color = $repo->get_colorbool('color.interactive');
9my ($prompt_color, $header_color, $help_color) =
10 $menu_use_color ? (
11 $repo->get_color('color.interactive.prompt', 'bold blue'),
12 $repo->get_color('color.interactive.header', 'bold'),
13 $repo->get_color('color.interactive.help', 'red bold'),
14 ) : ();
15my $diff_use_color = $repo->get_colorbool('color.diff');
17my ($fraginfo_color) =
18 $diff_use_color ? (
19 $repo->get_color('color.diff.frag', 'cyan'),
20 ) : ();
21my ($diff_plain_color) =
22 $diff_use_color ? (
23 $repo->get_color('color.diff.plain', ''),
24 ) : ();
25my ($diff_old_color) =
26 $diff_use_color ? (
27 $repo->get_color('color.diff.old', 'red'),
28 ) : ();
29my ($diff_new_color) =
30 $diff_use_color ? (
31 $repo->get_color('color.diff.new', 'green'),
32 ) : ();
33my $normal_color = $repo->get_color("", "reset");
35sub colored {
37 my $color = shift;
38 my $string = join("", @_);
39 if (defined $color) {
41 # Put a color code at the beginning of each line, a reset at the end
42 # color after newlines that are not at the end of the string
43 $string =~ s/(\n+)(.)/$1$color$2/g;
44 # reset before newlines
45 $string =~ s/(\n+)/$normal_color$1/g;
46 # codes at beginning and end (if necessary):
47 $string =~ s/^/$color/;
48 $string =~ s/$/$normal_color/ unless $string =~ /\n$/;
49 }
50 return $string;
51}
52# command line options
54my $patch_mode;
55sub run_cmd_pipe {
57 if ($^O eq 'MSWin32' || $^O eq 'msys') {
58 my @invalid = grep {m/[":*]/} @_;
59 die "$^O does not support: @invalid\n" if @invalid;
60 my @args = map { m/ /o ? "\"$_\"": $_ } @_;
61 return qx{@args};
62 } else {
63 my $fh = undef;
64 open($fh, '-|', @_) or die;
65 return <$fh>;
66 }
67}
68my ($GIT_DIR) = run_cmd_pipe(qw(git rev-parse --git-dir));
70if (!defined $GIT_DIR) {
72 exit(1); # rev-parse would have already said "not a git repo"
73}
74chomp($GIT_DIR);
75sub refresh {
77 my $fh;
78 open $fh, 'git update-index --refresh |'
79 or die;
80 while (<$fh>) {
81 ;# ignore 'needs update'
82 }
83 close $fh;
84}
85sub list_untracked {
87 map {
88 chomp $_;
89 $_;
90 }
91 run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @ARGV);
92}
93my $status_fmt = '%12s %12s %s';
95my $status_head = sprintf($status_fmt, 'staged', 'unstaged', 'path');
96{
98 my $initial;
99 sub is_initial_commit {
100 $initial = system('git rev-parse HEAD -- >/dev/null 2>&1') != 0
101 unless defined $initial;
102 return $initial;
103 }
104}
105sub get_empty_tree {
107 return '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
108}
109# Returns list of hashes, contents of each of which are:
111# VALUE: pathname
112# BINARY: is a binary path
113# INDEX: is index different from HEAD?
114# FILE: is file different from index?
115# INDEX_ADDDEL: is it add/delete between HEAD and index?
116# FILE_ADDDEL: is it add/delete between index and file?
117sub list_modified {
119 my ($only) = @_;
120 my (%data, @return);
121 my ($add, $del, $adddel, $file);
122 my @tracked = ();
123 if (@ARGV) {
125 @tracked = map {
126 chomp $_; $_;
127 } run_cmd_pipe(qw(git ls-files --exclude-standard --), @ARGV);
128 return if (!@tracked);
129 }
130 my $reference = is_initial_commit() ? get_empty_tree() : 'HEAD';
132 for (run_cmd_pipe(qw(git diff-index --cached
133 --numstat --summary), $reference,
134 '--', @tracked)) {
135 if (($add, $del, $file) =
136 /^([-\d]+) ([-\d]+) (.*)/) {
137 my ($change, $bin);
138 if ($add eq '-' && $del eq '-') {
139 $change = 'binary';
140 $bin = 1;
141 }
142 else {
143 $change = "+$add/-$del";
144 }
145 $data{$file} = {
146 INDEX => $change,
147 BINARY => $bin,
148 FILE => 'nothing',
149 }
150 }
151 elsif (($adddel, $file) =
152 /^ (create|delete) mode [0-7]+ (.*)$/) {
153 $data{$file}{INDEX_ADDDEL} = $adddel;
154 }
155 }
156 for (run_cmd_pipe(qw(git diff-files --numstat --summary --), @tracked)) {
158 if (($add, $del, $file) =
159 /^([-\d]+) ([-\d]+) (.*)/) {
160 if (!exists $data{$file}) {
161 $data{$file} = +{
162 INDEX => 'unchanged',
163 BINARY => 0,
164 };
165 }
166 my ($change, $bin);
167 if ($add eq '-' && $del eq '-') {
168 $change = 'binary';
169 $bin = 1;
170 }
171 else {
172 $change = "+$add/-$del";
173 }
174 $data{$file}{FILE} = $change;
175 if ($bin) {
176 $data{$file}{BINARY} = 1;
177 }
178 }
179 elsif (($adddel, $file) =
180 /^ (create|delete) mode [0-7]+ (.*)$/) {
181 $data{$file}{FILE_ADDDEL} = $adddel;
182 }
183 }
184 for (sort keys %data) {
186 my $it = $data{$_};
187 if ($only) {
189 if ($only eq 'index-only') {
190 next if ($it->{INDEX} eq 'unchanged');
191 }
192 if ($only eq 'file-only') {
193 next if ($it->{FILE} eq 'nothing');
194 }
195 }
196 push @return, +{
197 VALUE => $_,
198 %$it,
199 };
200 }
201 return @return;
202}
203sub find_unique {
205 my ($string, @stuff) = @_;
206 my $found = undef;
207 for (my $i = 0; $i < @stuff; $i++) {
208 my $it = $stuff[$i];
209 my $hit = undef;
210 if (ref $it) {
211 if ((ref $it) eq 'ARRAY') {
212 $it = $it->[0];
213 }
214 else {
215 $it = $it->{VALUE};
216 }
217 }
218 eval {
219 if ($it =~ /^$string/) {
220 $hit = 1;
221 };
222 };
223 if (defined $hit && defined $found) {
224 return undef;
225 }
226 if ($hit) {
227 $found = $i + 1;
228 }
229 }
230 return $found;
231}
232# inserts string into trie and updates count for each character
234sub update_trie {
235 my ($trie, $string) = @_;
236 foreach (split //, $string) {
237 $trie = $trie->{$_} ||= {COUNT => 0};
238 $trie->{COUNT}++;
239 }
240}
241# returns an array of tuples (prefix, remainder)
243sub find_unique_prefixes {
244 my @stuff = @_;
245 my @return = ();
246 # any single prefix exceeding the soft limit is omitted
248 # if any prefix exceeds the hard limit all are omitted
249 # 0 indicates no limit
250 my $soft_limit = 0;
251 my $hard_limit = 3;
252 # build a trie modelling all possible options
254 my %trie;
255 foreach my $print (@stuff) {
256 if ((ref $print) eq 'ARRAY') {
257 $print = $print->[0];
258 }
259 elsif ((ref $print) eq 'HASH') {
260 $print = $print->{VALUE};
261 }
262 update_trie(\%trie, $print);
263 push @return, $print;
264 }
265 # use the trie to find the unique prefixes
267 for (my $i = 0; $i < @return; $i++) {
268 my $ret = $return[$i];
269 my @letters = split //, $ret;
270 my %search = %trie;
271 my ($prefix, $remainder);
272 my $j;
273 for ($j = 0; $j < @letters; $j++) {
274 my $letter = $letters[$j];
275 if ($search{$letter}{COUNT} == 1) {
276 $prefix = substr $ret, 0, $j + 1;
277 $remainder = substr $ret, $j + 1;
278 last;
279 }
280 else {
281 my $prefix = substr $ret, 0, $j;
282 return ()
283 if ($hard_limit && $j + 1 > $hard_limit);
284 }
285 %search = %{$search{$letter}};
286 }
287 if ($soft_limit && $j + 1 > $soft_limit) {
288 $prefix = undef;
289 $remainder = $ret;
290 }
291 $return[$i] = [$prefix, $remainder];
292 }
293 return @return;
294}
295# filters out prefixes which have special meaning to list_and_choose()
297sub is_valid_prefix {
298 my $prefix = shift;
299 return (defined $prefix) &&
300 !($prefix =~ /[\s,]/) && # separators
301 !($prefix =~ /^-/) && # deselection
302 !($prefix =~ /^\d+/) && # selection
303 ($prefix ne '*') && # "all" wildcard
304 ($prefix ne '?'); # prompt help
305}
306# given a prefix/remainder tuple return a string with the prefix highlighted
308# for now use square brackets; later might use ANSI colors (underline, bold)
309sub highlight_prefix {
310 my $prefix = shift;
311 my $remainder = shift;
312 if (!defined $prefix) {
314 return $remainder;
315 }
316 if (!is_valid_prefix($prefix)) {
318 return "$prefix$remainder";
319 }
320 if (!$menu_use_color) {
322 return "[$prefix]$remainder";
323 }
324 return "$prompt_color$prefix$normal_color$remainder";
326}
327sub list_and_choose {
329 my ($opts, @stuff) = @_;
330 my (@chosen, @return);
331 my $i;
332 my @prefixes = find_unique_prefixes(@stuff) unless $opts->{LIST_ONLY};
333 TOPLOOP:
335 while (1) {
336 my $last_lf = 0;
337 if ($opts->{HEADER}) {
339 if (!$opts->{LIST_FLAT}) {
340 print " ";
341 }
342 print colored $header_color, "$opts->{HEADER}\n";
343 }
344 for ($i = 0; $i < @stuff; $i++) {
345 my $chosen = $chosen[$i] ? '*' : ' ';
346 my $print = $stuff[$i];
347 my $ref = ref $print;
348 my $highlighted = highlight_prefix(@{$prefixes[$i]})
349 if @prefixes;
350 if ($ref eq 'ARRAY') {
351 $print = $highlighted || $print->[0];
352 }
353 elsif ($ref eq 'HASH') {
354 my $value = $highlighted || $print->{VALUE};
355 $print = sprintf($status_fmt,
356 $print->{INDEX},
357 $print->{FILE},
358 $value);
359 }
360 else {
361 $print = $highlighted || $print;
362 }
363 printf("%s%2d: %s", $chosen, $i+1, $print);
364 if (($opts->{LIST_FLAT}) &&
365 (($i + 1) % ($opts->{LIST_FLAT}))) {
366 print "\t";
367 $last_lf = 0;
368 }
369 else {
370 print "\n";
371 $last_lf = 1;
372 }
373 }
374 if (!$last_lf) {
375 print "\n";
376 }
377 return if ($opts->{LIST_ONLY});
379 print colored $prompt_color, $opts->{PROMPT};
381 if ($opts->{SINGLETON}) {
382 print "> ";
383 }
384 else {
385 print ">> ";
386 }
387 my $line = <STDIN>;
388 if (!$line) {
389 print "\n";
390 $opts->{ON_EOF}->() if $opts->{ON_EOF};
391 last;
392 }
393 chomp $line;
394 last if $line eq '';
395 if ($line eq '?') {
396 $opts->{SINGLETON} ?
397 singleton_prompt_help_cmd() :
398 prompt_help_cmd();
399 next TOPLOOP;
400 }
401 for my $choice (split(/[\s,]+/, $line)) {
402 my $choose = 1;
403 my ($bottom, $top);
404 # Input that begins with '-'; unchoose
406 if ($choice =~ s/^-//) {
407 $choose = 0;
408 }
409 # A range can be specified like 5-7 or 5-.
410 if ($choice =~ /^(\d+)-(\d*)$/) {
411 ($bottom, $top) = ($1, length($2) ? $2 : 1 + @stuff);
412 }
413 elsif ($choice =~ /^\d+$/) {
414 $bottom = $top = $choice;
415 }
416 elsif ($choice eq '*') {
417 $bottom = 1;
418 $top = 1 + @stuff;
419 }
420 else {
421 $bottom = $top = find_unique($choice, @stuff);
422 if (!defined $bottom) {
423 print "Huh ($choice)?\n";
424 next TOPLOOP;
425 }
426 }
427 if ($opts->{SINGLETON} && $bottom != $top) {
428 print "Huh ($choice)?\n";
429 next TOPLOOP;
430 }
431 for ($i = $bottom-1; $i <= $top-1; $i++) {
432 next if (@stuff <= $i || $i < 0);
433 $chosen[$i] = $choose;
434 }
435 }
436 last if ($opts->{IMMEDIATE} || $line eq '*');
437 }
438 for ($i = 0; $i < @stuff; $i++) {
439 if ($chosen[$i]) {
440 push @return, $stuff[$i];
441 }
442 }
443 return @return;
444}
445sub singleton_prompt_help_cmd {
447 print colored $help_color, <<\EOF ;
448Prompt help:
4491 - select a numbered item
450foo - select item based on unique prefix
451 - (empty) select nothing
452EOF
453}
454sub prompt_help_cmd {
456 print colored $help_color, <<\EOF ;
457Prompt help:
4581 - select a single item
4593-5 - select a range of items
4602-3,6-9 - select multiple ranges
461foo - select item based on unique prefix
462-... - unselect specified items
463* - choose all items
464 - (empty) finish selecting
465EOF
466}
467sub status_cmd {
469 list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
470 list_modified());
471 print "\n";
472}
473sub say_n_paths {
475 my $did = shift @_;
476 my $cnt = scalar @_;
477 print "$did ";
478 if (1 < $cnt) {
479 print "$cnt paths\n";
480 }
481 else {
482 print "one path\n";
483 }
484}
485sub update_cmd {
487 my @mods = list_modified('file-only');
488 return if (!@mods);
489 my @update = list_and_choose({ PROMPT => 'Update',
491 HEADER => $status_head, },
492 @mods);
493 if (@update) {
494 system(qw(git update-index --add --remove --),
495 map { $_->{VALUE} } @update);
496 say_n_paths('updated', @update);
497 }
498 print "\n";
499}
500sub revert_cmd {
502 my @update = list_and_choose({ PROMPT => 'Revert',
503 HEADER => $status_head, },
504 list_modified());
505 if (@update) {
506 if (is_initial_commit()) {
507 system(qw(git rm --cached),
508 map { $_->{VALUE} } @update);
509 }
510 else {
511 my @lines = run_cmd_pipe(qw(git ls-tree HEAD --),
512 map { $_->{VALUE} } @update);
513 my $fh;
514 open $fh, '| git update-index --index-info'
515 or die;
516 for (@lines) {
517 print $fh $_;
518 }
519 close($fh);
520 for (@update) {
521 if ($_->{INDEX_ADDDEL} &&
522 $_->{INDEX_ADDDEL} eq 'create') {
523 system(qw(git update-index --force-remove --),
524 $_->{VALUE});
525 print "note: $_->{VALUE} is untracked now.\n";
526 }
527 }
528 }
529 refresh();
530 say_n_paths('reverted', @update);
531 }
532 print "\n";
533}
534sub add_untracked_cmd {
536 my @add = list_and_choose({ PROMPT => 'Add untracked' },
537 list_untracked());
538 if (@add) {
539 system(qw(git update-index --add --), @add);
540 say_n_paths('added', @add);
541 }
542 print "\n";
543}
544sub parse_diff {
546 my ($path) = @_;
547 my @diff = run_cmd_pipe(qw(git diff-files -p --), $path);
548 my @colored = ();
549 if ($diff_use_color) {
550 @colored = run_cmd_pipe(qw(git diff-files -p --color --), $path);
551 }
552 my (@hunk) = { TEXT => [], DISPLAY => [] };
553 for (my $i = 0; $i < @diff; $i++) {
555 if ($diff[$i] =~ /^@@ /) {
556 push @hunk, { TEXT => [], DISPLAY => [] };
557 }
558 push @{$hunk[-1]{TEXT}}, $diff[$i];
559 push @{$hunk[-1]{DISPLAY}},
560 ($diff_use_color ? $colored[$i] : $diff[$i]);
561 }
562 return @hunk;
563}
564sub parse_diff_header {
566 my $src = shift;
567 my $head = { TEXT => [], DISPLAY => [] };
569 my $mode = { TEXT => [], DISPLAY => [] };
570 for (my $i = 0; $i < @{$src->{TEXT}}; $i++) {
572 my $dest = $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ?
573 $mode : $head;
574 push @{$dest->{TEXT}}, $src->{TEXT}->[$i];
575 push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i];
576 }
577 return ($head, $mode);
578}
579sub hunk_splittable {
581 my ($text) = @_;
582 my @s = split_hunk($text);
584 return (1 < @s);
585}
586sub parse_hunk_header {
588 my ($line) = @_;
589 my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
590 $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
591 $o_cnt = 1 unless defined $o_cnt;
592 $n_cnt = 1 unless defined $n_cnt;
593 return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
594}
595sub split_hunk {
597 my ($text, $display) = @_;
598 my @split = ();
599 if (!defined $display) {
600 $display = $text;
601 }
602 # If there are context lines in the middle of a hunk,
603 # it can be split, but we would need to take care of
604 # overlaps later.
605 my ($o_ofs, undef, $n_ofs) = parse_hunk_header($text->[0]);
607 my $hunk_start = 1;
608 OUTER:
610 while (1) {
611 my $next_hunk_start = undef;
612 my $i = $hunk_start - 1;
613 my $this = +{
614 TEXT => [],
615 DISPLAY => [],
616 OLD => $o_ofs,
617 NEW => $n_ofs,
618 OCNT => 0,
619 NCNT => 0,
620 ADDDEL => 0,
621 POSTCTX => 0,
622 USE => undef,
623 };
624 while (++$i < @$text) {
626 my $line = $text->[$i];
627 my $display = $display->[$i];
628 if ($line =~ /^ /) {
629 if ($this->{ADDDEL} &&
630 !defined $next_hunk_start) {
631 # We have seen leading context and
632 # adds/dels and then here is another
633 # context, which is trailing for this
634 # split hunk and leading for the next
635 # one.
636 $next_hunk_start = $i;
637 }
638 push @{$this->{TEXT}}, $line;
639 push @{$this->{DISPLAY}}, $display;
640 $this->{OCNT}++;
641 $this->{NCNT}++;
642 if (defined $next_hunk_start) {
643 $this->{POSTCTX}++;
644 }
645 next;
646 }
647 # add/del
649 if (defined $next_hunk_start) {
650 # We are done with the current hunk and
651 # this is the first real change for the
652 # next split one.
653 $hunk_start = $next_hunk_start;
654 $o_ofs = $this->{OLD} + $this->{OCNT};
655 $n_ofs = $this->{NEW} + $this->{NCNT};
656 $o_ofs -= $this->{POSTCTX};
657 $n_ofs -= $this->{POSTCTX};
658 push @split, $this;
659 redo OUTER;
660 }
661 push @{$this->{TEXT}}, $line;
662 push @{$this->{DISPLAY}}, $display;
663 $this->{ADDDEL}++;
664 if ($line =~ /^-/) {
665 $this->{OCNT}++;
666 }
667 else {
668 $this->{NCNT}++;
669 }
670 }
671 push @split, $this;
673 last;
674 }
675 for my $hunk (@split) {
677 $o_ofs = $hunk->{OLD};
678 $n_ofs = $hunk->{NEW};
679 my $o_cnt = $hunk->{OCNT};
680 my $n_cnt = $hunk->{NCNT};
681 my $head = ("@@ -$o_ofs" .
683 (($o_cnt != 1) ? ",$o_cnt" : '') .
684 " +$n_ofs" .
685 (($n_cnt != 1) ? ",$n_cnt" : '') .
686 " @@\n");
687 my $display_head = $head;
688 unshift @{$hunk->{TEXT}}, $head;
689 if ($diff_use_color) {
690 $display_head = colored($fraginfo_color, $head);
691 }
692 unshift @{$hunk->{DISPLAY}}, $display_head;
693 }
694 return @split;
695}
696sub color_diff {
699 return map {
700 colored((/^@/ ? $fraginfo_color :
701 /^\+/ ? $diff_new_color :
702 /^-/ ? $diff_old_color :
703 $diff_plain_color),
704 $_);
705 } @_;
706}
707sub edit_hunk_manually {
709 my ($oldtext) = @_;
710 my $hunkfile = $repo->repo_path . "/addp-hunk-edit.diff";
712 my $fh;
713 open $fh, '>', $hunkfile
714 or die "failed to open hunk edit file for writing: " . $!;
715 print $fh "# Manual hunk edit mode -- see bottom for a quick guide\n";
716 print $fh @$oldtext;
717 print $fh <<EOF;
718# ---
719# To remove '-' lines, make them ' ' lines (context).
720# To remove '+' lines, delete them.
721# Lines starting with # will be removed.
722#
723# If the patch applies cleanly, the edited hunk will immediately be
724# marked for staging. If it does not apply cleanly, you will be given
725# an opportunity to edit again. If all lines of the hunk are removed,
726# then the edit is aborted and the hunk is left unchanged.
727EOF
728 close $fh;
729 my $editor = $ENV{GIT_EDITOR} || $repo->config("core.editor")
731 || $ENV{VISUAL} || $ENV{EDITOR} || "vi";
732 system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
733 open $fh, '<', $hunkfile
735 or die "failed to open hunk edit file for reading: " . $!;
736 my @newtext = grep { !/^#/ } <$fh>;
737 close $fh;
738 unlink $hunkfile;
739 # Abort if nothing remains
741 if (!grep { /\S/ } @newtext) {
742 return undef;
743 }
744 # Reinsert the first hunk header if the user accidentally deleted it
746 if ($newtext[0] !~ /^@/) {
747 unshift @newtext, $oldtext->[0];
748 }
749 return \@newtext;
750}
751sub diff_applies {
753 my $fh;
754 open $fh, '| git apply --recount --cached --check';
755 for my $h (@_) {
756 print $fh @{$h->{TEXT}};
757 }
758 return close $fh;
759}
760sub prompt_yesno {
762 my ($prompt) = @_;
763 while (1) {
764 print colored $prompt_color, $prompt;
765 my $line = <STDIN>;
766 return 0 if $line =~ /^n/i;
767 return 1 if $line =~ /^y/i;
768 }
769}
770sub edit_hunk_loop {
772 my ($head, $hunk, $ix) = @_;
773 my $text = $hunk->[$ix]->{TEXT};
774 while (1) {
776 $text = edit_hunk_manually($text);
777 if (!defined $text) {
778 return undef;
779 }
780 my $newhunk = { TEXT => $text, USE => 1 };
781 if (diff_applies($head,
782 @{$hunk}[0..$ix-1],
783 $newhunk,
784 @{$hunk}[$ix+1..$#{$hunk}])) {
785 $newhunk->{DISPLAY} = [color_diff(@{$text})];
786 return $newhunk;
787 }
788 else {
789 prompt_yesno(
790 'Your edited hunk does not apply. Edit again '
791 . '(saying "no" discards!) [y/n]? '
792 ) or return undef;
793 }
794 }
795}
796sub help_patch_cmd {
798 print colored $help_color, <<\EOF ;
799y - stage this hunk
800n - do not stage this hunk
801a - stage this and all the remaining hunks in the file
802d - do not stage this hunk nor any of the remaining hunks in the file
803g - select a hunk to go to
804/ - search for a hunk matching the given regex
805j - leave this hunk undecided, see next undecided hunk
806J - leave this hunk undecided, see next hunk
807k - leave this hunk undecided, see previous undecided hunk
808K - leave this hunk undecided, see previous hunk
809s - split the current hunk into smaller hunks
810e - manually edit the current hunk
811? - print help
812EOF
813}
814sub patch_update_cmd {
816 my @all_mods = list_modified('file-only');
817 my @mods = grep { !($_->{BINARY}) } @all_mods;
818 my @them;
819 if (!@mods) {
821 if (@all_mods) {
822 print STDERR "Only binary files changed.\n";
823 } else {
824 print STDERR "No changes.\n";
825 }
826 return 0;
827 }
828 if ($patch_mode) {
829 @them = @mods;
830 }
831 else {
832 @them = list_and_choose({ PROMPT => 'Patch update',
833 HEADER => $status_head, },
834 @mods);
835 }
836 for (@them) {
837 patch_update_file($_->{VALUE});
838 }
839}
840# Generate a one line summary of a hunk.
842sub summarize_hunk {
843 my $rhunk = shift;
844 my $summary = $rhunk->{TEXT}[0];
845 # Keep the line numbers, discard extra context.
847 $summary =~ s/@@(.*?)@@.*/$1 /s;
848 $summary .= " " x (20 - length $summary);
849 # Add some user context.
851 for my $line (@{$rhunk->{TEXT}}) {
852 if ($line =~ m/^[+-].*\w/) {
853 $summary .= $line;
854 last;
855 }
856 }
857 chomp $summary;
859 return substr($summary, 0, 80) . "\n";
860}
861# Print a one-line summary of each hunk in the array ref in
864# the first argument, starting wih the index in the 2nd.
865sub display_hunks {
866 my ($hunks, $i) = @_;
867 my $ctr = 0;
868 $i ||= 0;
869 for (; $i < @$hunks && $ctr < 20; $i++, $ctr++) {
870 my $status = " ";
871 if (defined $hunks->[$i]{USE}) {
872 $status = $hunks->[$i]{USE} ? "+" : "-";
873 }
874 printf "%s%2d: %s",
875 $status,
876 $i + 1,
877 summarize_hunk($hunks->[$i]);
878 }
879 return $i;
880}
881sub patch_update_file {
883 my ($ix, $num);
884 my $path = shift;
885 my ($head, @hunk) = parse_diff($path);
886 ($head, my $mode) = parse_diff_header($head);
887 for (@{$head->{DISPLAY}}) {
888 print;
889 }
890 if (@{$mode->{TEXT}}) {
892 while (1) {
893 print @{$mode->{DISPLAY}};
894 print colored $prompt_color,
895 "Stage mode change [y/n/a/d/?]? ";
896 my $line = <STDIN>;
897 if ($line =~ /^y/i) {
898 $mode->{USE} = 1;
899 last;
900 }
901 elsif ($line =~ /^n/i) {
902 $mode->{USE} = 0;
903 last;
904 }
905 elsif ($line =~ /^a/i) {
906 $_->{USE} = 1 foreach ($mode, @hunk);
907 last;
908 }
909 elsif ($line =~ /^d/i) {
910 $_->{USE} = 0 foreach ($mode, @hunk);
911 last;
912 }
913 else {
914 help_patch_cmd('');
915 next;
916 }
917 }
918 }
919 $num = scalar @hunk;
921 $ix = 0;
922 while (1) {
924 my ($prev, $next, $other, $undecided, $i);
925 $other = '';
926 if ($num <= $ix) {
928 $ix = 0;
929 }
930 for ($i = 0; $i < $ix; $i++) {
931 if (!defined $hunk[$i]{USE}) {
932 $prev = 1;
933 $other .= ',k';
934 last;
935 }
936 }
937 if ($ix) {
938 $other .= ',K';
939 }
940 for ($i = $ix + 1; $i < $num; $i++) {
941 if (!defined $hunk[$i]{USE}) {
942 $next = 1;
943 $other .= ',j';
944 last;
945 }
946 }
947 if ($ix < $num - 1) {
948 $other .= ',J';
949 }
950 if ($num > 1) {
951 $other .= ',g';
952 }
953 for ($i = 0; $i < $num; $i++) {
954 if (!defined $hunk[$i]{USE}) {
955 $undecided = 1;
956 last;
957 }
958 }
959 last if (!$undecided);
960 if (hunk_splittable($hunk[$ix]{TEXT})) {
962 $other .= ',s';
963 }
964 $other .= ',e';
965 for (@{$hunk[$ix]{DISPLAY}}) {
966 print;
967 }
968 print colored $prompt_color, "Stage this hunk [y,n,a,d,/$other,?]? ";
969 my $line = <STDIN>;
970 if ($line) {
971 if ($line =~ /^y/i) {
972 $hunk[$ix]{USE} = 1;
973 }
974 elsif ($line =~ /^n/i) {
975 $hunk[$ix]{USE} = 0;
976 }
977 elsif ($line =~ /^a/i) {
978 while ($ix < $num) {
979 if (!defined $hunk[$ix]{USE}) {
980 $hunk[$ix]{USE} = 1;
981 }
982 $ix++;
983 }
984 next;
985 }
986 elsif ($other =~ /g/ && $line =~ /^g(.*)/) {
987 my $response = $1;
988 my $no = $ix > 10 ? $ix - 10 : 0;
989 while ($response eq '') {
990 my $extra = "";
991 $no = display_hunks(\@hunk, $no);
992 if ($no < $num) {
993 $extra = " (<ret> to see more)";
994 }
995 print "go to which hunk$extra? ";
996 $response = <STDIN>;
997 if (!defined $response) {
998 $response = '';
999 }
1000 chomp $response;
1001 }
1002 if ($response !~ /^\s*\d+\s*$/) {
1003 print STDERR "Invalid number: '$response'\n";
1004 } elsif (0 < $response && $response <= $num) {
1005 $ix = $response - 1;
1006 } else {
1007 print STDERR "Sorry, only $num hunks available.\n";
1008 }
1009 next;
1010 }
1011 elsif ($line =~ /^d/i) {
1012 while ($ix < $num) {
1013 if (!defined $hunk[$ix]{USE}) {
1014 $hunk[$ix]{USE} = 0;
1015 }
1016 $ix++;
1017 }
1018 next;
1019 }
1020 elsif ($line =~ m|^/(.*)|) {
1021 my $search_string;
1022 eval {
1023 $search_string = qr{$1}m;
1024 };
1025 if ($@) {
1026 my ($err,$exp) = ($@, $1);
1027 $err =~ s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//;
1028 print STDERR "Malformed search regexp $exp: $err\n";
1029 next;
1030 }
1031 my $iy = $ix;
1032 while (1) {
1033 my $text = join ("", @{$hunk[$iy]{TEXT}});
1034 last if ($text =~ $search_string);
1035 $iy++;
1036 $iy = 0 if ($iy >= $num);
1037 if ($ix == $iy) {
1038 print STDERR "No hunk matches the given pattern\n";
1039 last;
1040 }
1041 }
1042 $ix = $iy;
1043 next;
1044 }
1045 elsif ($line =~ /^K/) {
1046 if ($other =~ /K/) {
1047 $ix--;
1048 }
1049 else {
1050 print STDERR "No previous hunk\n";
1051 }
1052 next;
1053 }
1054 elsif ($line =~ /^J/) {
1055 if ($other =~ /J/) {
1056 $ix++;
1057 }
1058 else {
1059 print STDERR "No next hunk\n";
1060 }
1061 next;
1062 }
1063 elsif ($line =~ /^k/) {
1064 if ($other =~ /k/) {
1065 while (1) {
1066 $ix--;
1067 last if (!$ix ||
1068 !defined $hunk[$ix]{USE});
1069 }
1070 }
1071 else {
1072 print STDERR "No previous hunk\n";
1073 }
1074 next;
1075 }
1076 elsif ($line =~ /^j/) {
1077 if ($other !~ /j/) {
1078 print STDERR "No next hunk\n";
1079 next;
1080 }
1081 }
1082 elsif ($other =~ /s/ && $line =~ /^s/) {
1083 my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});
1084 if (1 < @split) {
1085 print colored $header_color, "Split into ",
1086 scalar(@split), " hunks.\n";
1087 }
1088 splice (@hunk, $ix, 1, @split);
1089 $num = scalar @hunk;
1090 next;
1091 }
1092 elsif ($line =~ /^e/) {
1093 my $newhunk = edit_hunk_loop($head, \@hunk, $ix);
1094 if (defined $newhunk) {
1095 splice @hunk, $ix, 1, $newhunk;
1096 }
1097 }
1098 else {
1099 help_patch_cmd($other);
1100 next;
1101 }
1102 # soft increment
1103 while (1) {
1104 $ix++;
1105 last if ($ix >= $num ||
1106 !defined $hunk[$ix]{USE});
1107 }
1108 }
1109 }
1110 my $n_lofs = 0;
1112 my @result = ();
1113 if ($mode->{USE}) {
1114 push @result, @{$mode->{TEXT}};
1115 }
1116 for (@hunk) {
1117 if ($_->{USE}) {
1118 push @result, @{$_->{TEXT}};
1119 }
1120 }
1121 if (@result) {
1123 my $fh;
1124 open $fh, '| git apply --cached --recount';
1126 for (@{$head->{TEXT}}, @result) {
1127 print $fh $_;
1128 }
1129 if (!close $fh) {
1130 for (@{$head->{TEXT}}, @result) {
1131 print STDERR $_;
1132 }
1133 }
1134 refresh();
1135 }
1136 print "\n";
1138}
1139sub diff_cmd {
1141 my @mods = list_modified('index-only');
1142 @mods = grep { !($_->{BINARY}) } @mods;
1143 return if (!@mods);
1144 my (@them) = list_and_choose({ PROMPT => 'Review diff',
1145 IMMEDIATE => 1,
1146 HEADER => $status_head, },
1147 @mods);
1148 return if (!@them);
1149 my $reference = is_initial_commit() ? get_empty_tree() : 'HEAD';
1150 system(qw(git diff -p --cached), $reference, '--',
1151 map { $_->{VALUE} } @them);
1152}
1153sub quit_cmd {
1155 print "Bye.\n";
1156 exit(0);
1157}
1158sub help_cmd {
1160 print colored $help_color, <<\EOF ;
1161status - show paths with changes
1162update - add working tree state to the staged set of changes
1163revert - revert staged set of changes back to the HEAD version
1164patch - pick hunks and update selectively
1165diff - view diff between HEAD and index
1166add untracked - add contents of untracked files to the staged set of changes
1167EOF
1168}
1169sub process_args {
1171 return unless @ARGV;
1172 my $arg = shift @ARGV;
1173 if ($arg eq "--patch") {
1174 $patch_mode = 1;
1175 $arg = shift @ARGV or die "missing --";
1176 die "invalid argument $arg, expecting --"
1177 unless $arg eq "--";
1178 }
1179 elsif ($arg ne "--") {
1180 die "invalid argument $arg, expecting --";
1181 }
1182}
1183sub main_loop {
1185 my @cmd = ([ 'status', \&status_cmd, ],
1186 [ 'update', \&update_cmd, ],
1187 [ 'revert', \&revert_cmd, ],
1188 [ 'add untracked', \&add_untracked_cmd, ],
1189 [ 'patch', \&patch_update_cmd, ],
1190 [ 'diff', \&diff_cmd, ],
1191 [ 'quit', \&quit_cmd, ],
1192 [ 'help', \&help_cmd, ],
1193 );
1194 while (1) {
1195 my ($it) = list_and_choose({ PROMPT => 'What now',
1196 SINGLETON => 1,
1197 LIST_FLAT => 4,
1198 HEADER => '*** Commands ***',
1199 ON_EOF => \&quit_cmd,
1200 IMMEDIATE => 1 }, @cmd);
1201 if ($it) {
1202 eval {
1203 $it->[1]->();
1204 };
1205 if ($@) {
1206 print "$@";
1207 }
1208 }
1209 }
1210}
1211process_args();
1213refresh();
1214if ($patch_mode) {
1215 patch_update_cmd();
1216}
1217else {
1218 status_cmd();
1219 main_loop();
1220}