1#!/usr/bin/perl -w
2use strict;
4sub run_cmd_pipe {
6 if ($^O eq 'MSWin32') {
7 my @invalid = grep {m/[":*]/} @_;
8 die "$^O does not support: @invalid\n" if @invalid;
9 my @args = map { m/ /o ? "\"$_\"": $_ } @_;
10 return qx{@args};
11 } else {
12 my $fh = undef;
13 open($fh, '-|', @_) or die;
14 return <$fh>;
15 }
16}
17my ($GIT_DIR) = run_cmd_pipe(qw(git rev-parse --git-dir));
19if (!defined $GIT_DIR) {
21 exit(1); # rev-parse would have already said "not a git repo"
22}
23chomp($GIT_DIR);
24sub refresh {
26 my $fh;
27 open $fh, 'git update-index --refresh |'
28 or die;
29 while (<$fh>) {
30 ;# ignore 'needs update'
31 }
32 close $fh;
33}
34sub list_untracked {
36 map {
37 chomp $_;
38 $_;
39 }
40 run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @_);
41}
42my $status_fmt = '%12s %12s %s';
44my $status_head = sprintf($status_fmt, 'staged', 'unstaged', 'path');
45# Returns list of hashes, contents of each of which are:
47# PRINT: print message
48# VALUE: pathname
49# BINARY: is a binary path
50# INDEX: is index different from HEAD?
51# FILE: is file different from index?
52# INDEX_ADDDEL: is it add/delete between HEAD and index?
53# FILE_ADDDEL: is it add/delete between index and file?
54sub list_modified {
56 my ($only) = @_;
57 my (%data, @return);
58 my ($add, $del, $adddel, $file);
59 for (run_cmd_pipe(qw(git diff-index --cached
61 --numstat --summary HEAD))) {
62 if (($add, $del, $file) =
63 /^([-\d]+) ([-\d]+) (.*)/) {
64 my ($change, $bin);
65 if ($add eq '-' && $del eq '-') {
66 $change = 'binary';
67 $bin = 1;
68 }
69 else {
70 $change = "+$add/-$del";
71 }
72 $data{$file} = {
73 INDEX => $change,
74 BINARY => $bin,
75 FILE => 'nothing',
76 }
77 }
78 elsif (($adddel, $file) =
79 /^ (create|delete) mode [0-7]+ (.*)$/) {
80 $data{$file}{INDEX_ADDDEL} = $adddel;
81 }
82 }
83 for (run_cmd_pipe(qw(git diff-files --numstat --summary))) {
85 if (($add, $del, $file) =
86 /^([-\d]+) ([-\d]+) (.*)/) {
87 if (!exists $data{$file}) {
88 $data{$file} = +{
89 INDEX => 'unchanged',
90 BINARY => 0,
91 };
92 }
93 my ($change, $bin);
94 if ($add eq '-' && $del eq '-') {
95 $change = 'binary';
96 $bin = 1;
97 }
98 else {
99 $change = "+$add/-$del";
100 }
101 $data{$file}{FILE} = $change;
102 if ($bin) {
103 $data{$file}{BINARY} = 1;
104 }
105 }
106 elsif (($adddel, $file) =
107 /^ (create|delete) mode [0-7]+ (.*)$/) {
108 $data{$file}{FILE_ADDDEL} = $adddel;
109 }
110 }
111 for (sort keys %data) {
113 my $it = $data{$_};
114 if ($only) {
116 if ($only eq 'index-only') {
117 next if ($it->{INDEX} eq 'unchanged');
118 }
119 if ($only eq 'file-only') {
120 next if ($it->{FILE} eq 'nothing');
121 }
122 }
123 push @return, +{
124 VALUE => $_,
125 PRINT => (sprintf $status_fmt,
126 $it->{INDEX}, $it->{FILE}, $_),
127 %$it,
128 };
129 }
130 return @return;
131}
132sub find_unique {
134 my ($string, @stuff) = @_;
135 my $found = undef;
136 for (my $i = 0; $i < @stuff; $i++) {
137 my $it = $stuff[$i];
138 my $hit = undef;
139 if (ref $it) {
140 if ((ref $it) eq 'ARRAY') {
141 $it = $it->[0];
142 }
143 else {
144 $it = $it->{VALUE};
145 }
146 }
147 eval {
148 if ($it =~ /^$string/) {
149 $hit = 1;
150 };
151 };
152 if (defined $hit && defined $found) {
153 return undef;
154 }
155 if ($hit) {
156 $found = $i + 1;
157 }
158 }
159 return $found;
160}
161sub list_and_choose {
163 my ($opts, @stuff) = @_;
164 my (@chosen, @return);
165 my $i;
166 TOPLOOP:
168 while (1) {
169 my $last_lf = 0;
170 if ($opts->{HEADER}) {
172 if (!$opts->{LIST_FLAT}) {
173 print " ";
174 }
175 print "$opts->{HEADER}\n";
176 }
177 for ($i = 0; $i < @stuff; $i++) {
178 my $chosen = $chosen[$i] ? '*' : ' ';
179 my $print = $stuff[$i];
180 if (ref $print) {
181 if ((ref $print) eq 'ARRAY') {
182 $print = $print->[0];
183 }
184 else {
185 $print = $print->{PRINT};
186 }
187 }
188 printf("%s%2d: %s", $chosen, $i+1, $print);
189 if (($opts->{LIST_FLAT}) &&
190 (($i + 1) % ($opts->{LIST_FLAT}))) {
191 print "\t";
192 $last_lf = 0;
193 }
194 else {
195 print "\n";
196 $last_lf = 1;
197 }
198 }
199 if (!$last_lf) {
200 print "\n";
201 }
202 return if ($opts->{LIST_ONLY});
204 print $opts->{PROMPT};
206 if ($opts->{SINGLETON}) {
207 print "> ";
208 }
209 else {
210 print ">> ";
211 }
212 my $line = <STDIN>;
213 if (!$line) {
214 print "\n";
215 $opts->{ON_EOF}->() if $opts->{ON_EOF};
216 last;
217 }
218 chomp $line;
219 last if $line eq '';
220 for my $choice (split(/[\s,]+/, $line)) {
221 my $choose = 1;
222 my ($bottom, $top);
223 # Input that begins with '-'; unchoose
225 if ($choice =~ s/^-//) {
226 $choose = 0;
227 }
228 # A range can be specified like 5-7
229 if ($choice =~ /^(\d+)-(\d+)$/) {
230 ($bottom, $top) = ($1, $2);
231 }
232 elsif ($choice =~ /^\d+$/) {
233 $bottom = $top = $choice;
234 }
235 elsif ($choice eq '*') {
236 $bottom = 1;
237 $top = 1 + @stuff;
238 }
239 else {
240 $bottom = $top = find_unique($choice, @stuff);
241 if (!defined $bottom) {
242 print "Huh ($choice)?\n";
243 next TOPLOOP;
244 }
245 }
246 if ($opts->{SINGLETON} && $bottom != $top) {
247 print "Huh ($choice)?\n";
248 next TOPLOOP;
249 }
250 for ($i = $bottom-1; $i <= $top-1; $i++) {
251 next if (@stuff <= $i || $i < 0);
252 $chosen[$i] = $choose;
253 }
254 }
255 last if ($opts->{IMMEDIATE});
256 }
257 for ($i = 0; $i < @stuff; $i++) {
258 if ($chosen[$i]) {
259 push @return, $stuff[$i];
260 }
261 }
262 return @return;
263}
264sub status_cmd {
266 list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
267 list_modified());
268 print "\n";
269}
270sub say_n_paths {
272 my $did = shift @_;
273 my $cnt = scalar @_;
274 print "$did ";
275 if (1 < $cnt) {
276 print "$cnt paths\n";
277 }
278 else {
279 print "one path\n";
280 }
281}
282sub update_cmd {
284 my @mods = list_modified('file-only');
285 return if (!@mods);
286 my @update = list_and_choose({ PROMPT => 'Update',
288 HEADER => $status_head, },
289 @mods);
290 if (@update) {
291 system(qw(git update-index --add --remove --),
292 map { $_->{VALUE} } @update);
293 say_n_paths('updated', @update);
294 }
295 print "\n";
296}
297sub revert_cmd {
299 my @update = list_and_choose({ PROMPT => 'Revert',
300 HEADER => $status_head, },
301 list_modified());
302 if (@update) {
303 my @lines = run_cmd_pipe(qw(git ls-tree HEAD --),
304 map { $_->{VALUE} } @update);
305 my $fh;
306 open $fh, '| git update-index --index-info'
307 or die;
308 for (@lines) {
309 print $fh $_;
310 }
311 close($fh);
312 for (@update) {
313 if ($_->{INDEX_ADDDEL} &&
314 $_->{INDEX_ADDDEL} eq 'create') {
315 system(qw(git update-index --force-remove --),
316 $_->{VALUE});
317 print "note: $_->{VALUE} is untracked now.\n";
318 }
319 }
320 refresh();
321 say_n_paths('reverted', @update);
322 }
323 print "\n";
324}
325sub add_untracked_cmd {
327 my @add = list_and_choose({ PROMPT => 'Add untracked' },
328 list_untracked());
329 if (@add) {
330 system(qw(git update-index --add --), @add);
331 say_n_paths('added', @add);
332 }
333 print "\n";
334}
335sub parse_diff {
337 my ($path) = @_;
338 my @diff = run_cmd_pipe(qw(git diff-files -p --), $path);
339 my (@hunk) = { TEXT => [] };
340 for (@diff) {
342 if (/^@@ /) {
343 push @hunk, { TEXT => [] };
344 }
345 push @{$hunk[-1]{TEXT}}, $_;
346 }
347 return @hunk;
348}
349sub hunk_splittable {
351 my ($text) = @_;
352 my @s = split_hunk($text);
354 return (1 < @s);
355}
356sub parse_hunk_header {
358 my ($line) = @_;
359 my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
360 $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
361 $o_cnt = 1 unless defined $o_cnt;
362 $n_cnt = 1 unless defined $n_cnt;
363 return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
364}
365sub split_hunk {
367 my ($text) = @_;
368 my @split = ();
369 # If there are context lines in the middle of a hunk,
371 # it can be split, but we would need to take care of
372 # overlaps later.
373 my ($o_ofs, undef, $n_ofs) = parse_hunk_header($text->[0]);
375 my $hunk_start = 1;
376 OUTER:
378 while (1) {
379 my $next_hunk_start = undef;
380 my $i = $hunk_start - 1;
381 my $this = +{
382 TEXT => [],
383 OLD => $o_ofs,
384 NEW => $n_ofs,
385 OCNT => 0,
386 NCNT => 0,
387 ADDDEL => 0,
388 POSTCTX => 0,
389 };
390 while (++$i < @$text) {
392 my $line = $text->[$i];
393 if ($line =~ /^ /) {
394 if ($this->{ADDDEL} &&
395 !defined $next_hunk_start) {
396 # We have seen leading context and
397 # adds/dels and then here is another
398 # context, which is trailing for this
399 # split hunk and leading for the next
400 # one.
401 $next_hunk_start = $i;
402 }
403 push @{$this->{TEXT}}, $line;
404 $this->{OCNT}++;
405 $this->{NCNT}++;
406 if (defined $next_hunk_start) {
407 $this->{POSTCTX}++;
408 }
409 next;
410 }
411 # add/del
413 if (defined $next_hunk_start) {
414 # We are done with the current hunk and
415 # this is the first real change for the
416 # next split one.
417 $hunk_start = $next_hunk_start;
418 $o_ofs = $this->{OLD} + $this->{OCNT};
419 $n_ofs = $this->{NEW} + $this->{NCNT};
420 $o_ofs -= $this->{POSTCTX};
421 $n_ofs -= $this->{POSTCTX};
422 push @split, $this;
423 redo OUTER;
424 }
425 push @{$this->{TEXT}}, $line;
426 $this->{ADDDEL}++;
427 if ($line =~ /^-/) {
428 $this->{OCNT}++;
429 }
430 else {
431 $this->{NCNT}++;
432 }
433 }
434 push @split, $this;
436 last;
437 }
438 for my $hunk (@split) {
440 $o_ofs = $hunk->{OLD};
441 $n_ofs = $hunk->{NEW};
442 my $o_cnt = $hunk->{OCNT};
443 my $n_cnt = $hunk->{NCNT};
444 my $head = ("@@ -$o_ofs" .
446 (($o_cnt != 1) ? ",$o_cnt" : '') .
447 " +$n_ofs" .
448 (($n_cnt != 1) ? ",$n_cnt" : '') .
449 " @@\n");
450 unshift @{$hunk->{TEXT}}, $head;
451 }
452 return map { $_->{TEXT} } @split;
453}
454sub find_last_o_ctx {
456 my ($it) = @_;
457 my $text = $it->{TEXT};
458 my ($o_ofs, $o_cnt) = parse_hunk_header($text->[0]);
459 my $i = @{$text};
460 my $last_o_ctx = $o_ofs + $o_cnt;
461 while (0 < --$i) {
462 my $line = $text->[$i];
463 if ($line =~ /^ /) {
464 $last_o_ctx--;
465 next;
466 }
467 last;
468 }
469 return $last_o_ctx;
470}
471sub merge_hunk {
473 my ($prev, $this) = @_;
474 my ($o0_ofs, $o0_cnt, $n0_ofs, $n0_cnt) =
475 parse_hunk_header($prev->{TEXT}[0]);
476 my ($o1_ofs, $o1_cnt, $n1_ofs, $n1_cnt) =
477 parse_hunk_header($this->{TEXT}[0]);
478 my (@line, $i, $ofs, $o_cnt, $n_cnt);
480 $ofs = $o0_ofs;
481 $o_cnt = $n_cnt = 0;
482 for ($i = 1; $i < @{$prev->{TEXT}}; $i++) {
483 my $line = $prev->{TEXT}[$i];
484 if ($line =~ /^\+/) {
485 $n_cnt++;
486 push @line, $line;
487 next;
488 }
489 last if ($o1_ofs <= $ofs);
491 $o_cnt++;
493 $ofs++;
494 if ($line =~ /^ /) {
495 $n_cnt++;
496 }
497 push @line, $line;
498 }
499 for ($i = 1; $i < @{$this->{TEXT}}; $i++) {
501 my $line = $this->{TEXT}[$i];
502 if ($line =~ /^\+/) {
503 $n_cnt++;
504 push @line, $line;
505 next;
506 }
507 $ofs++;
508 $o_cnt++;
509 if ($line =~ /^ /) {
510 $n_cnt++;
511 }
512 push @line, $line;
513 }
514 my $head = ("@@ -$o0_ofs" .
515 (($o_cnt != 1) ? ",$o_cnt" : '') .
516 " +$n0_ofs" .
517 (($n_cnt != 1) ? ",$n_cnt" : '') .
518 " @@\n");
519 @{$prev->{TEXT}} = ($head, @line);
520}
521sub coalesce_overlapping_hunks {
523 my (@in) = @_;
524 my @out = ();
525 my ($last_o_ctx);
527 for (grep { $_->{USE} } @in) {
529 my $text = $_->{TEXT};
530 my ($o_ofs) = parse_hunk_header($text->[0]);
531 if (defined $last_o_ctx &&
532 $o_ofs <= $last_o_ctx) {
533 merge_hunk($out[-1], $_);
534 }
535 else {
536 push @out, $_;
537 }
538 $last_o_ctx = find_last_o_ctx($out[-1]);
539 }
540 return @out;
541}
542sub help_patch_cmd {
544 print <<\EOF ;
545y - stage this hunk
546n - do not stage this hunk
547a - stage this and all the remaining hunks
548d - do not stage this hunk nor any of the remaining hunks
549j - leave this hunk undecided, see next undecided hunk
550J - leave this hunk undecided, see next hunk
551k - leave this hunk undecided, see previous undecided hunk
552K - leave this hunk undecided, see previous hunk
553s - split the current hunk into smaller hunks
554EOF
555}
556sub patch_update_cmd {
558 my @mods = list_modified('file-only');
559 @mods = grep { !($_->{BINARY}) } @mods;
560 return if (!@mods);
561 my ($it) = list_and_choose({ PROMPT => 'Patch update',
563 SINGLETON => 1,
564 IMMEDIATE => 1,
565 HEADER => $status_head, },
566 @mods);
567 return if (!$it);
568 my ($ix, $num);
570 my $path = $it->{VALUE};
571 my ($head, @hunk) = parse_diff($path);
572 for (@{$head->{TEXT}}) {
573 print;
574 }
575 $num = scalar @hunk;
576 $ix = 0;
577 while (1) {
579 my ($prev, $next, $other, $undecided, $i);
580 $other = '';
581 if ($num <= $ix) {
583 $ix = 0;
584 }
585 for ($i = 0; $i < $ix; $i++) {
586 if (!defined $hunk[$i]{USE}) {
587 $prev = 1;
588 $other .= '/k';
589 last;
590 }
591 }
592 if ($ix) {
593 $other .= '/K';
594 }
595 for ($i = $ix + 1; $i < $num; $i++) {
596 if (!defined $hunk[$i]{USE}) {
597 $next = 1;
598 $other .= '/j';
599 last;
600 }
601 }
602 if ($ix < $num - 1) {
603 $other .= '/J';
604 }
605 for ($i = 0; $i < $num; $i++) {
606 if (!defined $hunk[$i]{USE}) {
607 $undecided = 1;
608 last;
609 }
610 }
611 last if (!$undecided);
612 if (hunk_splittable($hunk[$ix]{TEXT})) {
614 $other .= '/s';
615 }
616 for (@{$hunk[$ix]{TEXT}}) {
617 print;
618 }
619 print "Stage this hunk [y/n/a/d$other/?]? ";
620 my $line = <STDIN>;
621 if ($line) {
622 if ($line =~ /^y/i) {
623 $hunk[$ix]{USE} = 1;
624 }
625 elsif ($line =~ /^n/i) {
626 $hunk[$ix]{USE} = 0;
627 }
628 elsif ($line =~ /^a/i) {
629 while ($ix < $num) {
630 if (!defined $hunk[$ix]{USE}) {
631 $hunk[$ix]{USE} = 1;
632 }
633 $ix++;
634 }
635 next;
636 }
637 elsif ($line =~ /^d/i) {
638 while ($ix < $num) {
639 if (!defined $hunk[$ix]{USE}) {
640 $hunk[$ix]{USE} = 0;
641 }
642 $ix++;
643 }
644 next;
645 }
646 elsif ($other =~ /K/ && $line =~ /^K/) {
647 $ix--;
648 next;
649 }
650 elsif ($other =~ /J/ && $line =~ /^J/) {
651 $ix++;
652 next;
653 }
654 elsif ($other =~ /k/ && $line =~ /^k/) {
655 while (1) {
656 $ix--;
657 last if (!$ix ||
658 !defined $hunk[$ix]{USE});
659 }
660 next;
661 }
662 elsif ($other =~ /j/ && $line =~ /^j/) {
663 while (1) {
664 $ix++;
665 last if ($ix >= $num ||
666 !defined $hunk[$ix]{USE});
667 }
668 next;
669 }
670 elsif ($other =~ /s/ && $line =~ /^s/) {
671 my @split = split_hunk($hunk[$ix]{TEXT});
672 if (1 < @split) {
673 print "Split into ",
674 scalar(@split), " hunks.\n";
675 }
676 splice(@hunk, $ix, 1,
677 map { +{ TEXT => $_, USE => undef } }
678 @split);
679 $num = scalar @hunk;
680 next;
681 }
682 else {
683 help_patch_cmd($other);
684 next;
685 }
686 # soft increment
687 while (1) {
688 $ix++;
689 last if ($ix >= $num ||
690 !defined $hunk[$ix]{USE});
691 }
692 }
693 }
694 @hunk = coalesce_overlapping_hunks(@hunk);
696 my $n_lofs = 0;
698 my @result = ();
699 for (@hunk) {
700 my $text = $_->{TEXT};
701 my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
702 parse_hunk_header($text->[0]);
703 if (!$_->{USE}) {
705 # We would have added ($n_cnt - $o_cnt) lines
706 # to the postimage if we were to use this hunk,
707 # but we didn't. So the line number that the next
708 # hunk starts at would be shifted by that much.
709 $n_lofs -= ($n_cnt - $o_cnt);
710 next;
711 }
712 else {
713 if ($n_lofs) {
714 $n_ofs += $n_lofs;
715 $text->[0] = ("@@ -$o_ofs" .
716 (($o_cnt != 1)
717 ? ",$o_cnt" : '') .
718 " +$n_ofs" .
719 (($n_cnt != 1)
720 ? ",$n_cnt" : '') .
721 " @@\n");
722 }
723 for (@$text) {
724 push @result, $_;
725 }
726 }
727 }
728 if (@result) {
730 my $fh;
731 open $fh, '| git apply --cached';
733 for (@{$head->{TEXT}}, @result) {
734 print $fh $_;
735 }
736 if (!close $fh) {
737 for (@{$head->{TEXT}}, @result) {
738 print STDERR $_;
739 }
740 }
741 refresh();
742 }
743 print "\n";
745}
746sub diff_cmd {
748 my @mods = list_modified('index-only');
749 @mods = grep { !($_->{BINARY}) } @mods;
750 return if (!@mods);
751 my (@them) = list_and_choose({ PROMPT => 'Review diff',
752 IMMEDIATE => 1,
753 HEADER => $status_head, },
754 @mods);
755 return if (!@them);
756 system(qw(git diff-index -p --cached HEAD --),
757 map { $_->{VALUE} } @them);
758}
759sub quit_cmd {
761 print "Bye.\n";
762 exit(0);
763}
764sub help_cmd {
766 print <<\EOF ;
767status - show paths with changes
768update - add working tree state to the staged set of changes
769revert - revert staged set of changes back to the HEAD version
770patch - pick hunks and update selectively
771diff - view diff between HEAD and index
772add untracked - add contents of untracked files to the staged set of changes
773EOF
774}
775sub main_loop {
777 my @cmd = ([ 'status', \&status_cmd, ],
778 [ 'update', \&update_cmd, ],
779 [ 'revert', \&revert_cmd, ],
780 [ 'add untracked', \&add_untracked_cmd, ],
781 [ 'patch', \&patch_update_cmd, ],
782 [ 'diff', \&diff_cmd, ],
783 [ 'quit', \&quit_cmd, ],
784 [ 'help', \&help_cmd, ],
785 );
786 while (1) {
787 my ($it) = list_and_choose({ PROMPT => 'What now',
788 SINGLETON => 1,
789 LIST_FLAT => 4,
790 HEADER => '*** Commands ***',
791 ON_EOF => \&quit_cmd,
792 IMMEDIATE => 1 }, @cmd);
793 if ($it) {
794 eval {
795 $it->[1]->();
796 };
797 if ($@) {
798 print "$@";
799 }
800 }
801 }
802}
803refresh();
805status_cmd();
806main_loop();