[git/git.git] / git-add--interactive.perl

#!/usr/bin/perl -w

use strict;

# command line options
my $patch_mode;

sub run_cmd_pipe {
	if ($^O eq 'MSWin32') {
		my @invalid = grep {m/[":*]/} @_;
		die "$^O does not support: @invalid\n" if @invalid;
		my @args = map { m/ /o ? "\"$_\"": $_ } @_;
		return qx{@args};
	} else {
		my $fh = undef;
		open($fh, '-|', @_) or die;
		return <$fh>;
	}
}

my ($GIT_DIR) = run_cmd_pipe(qw(git rev-parse --git-dir));

if (!defined $GIT_DIR) {
	exit(1); # rev-parse would have already said "not a git repo"
}
chomp($GIT_DIR);

sub refresh {
	my $fh;
	open $fh, 'git update-index --refresh |'
	    or die;
	while (<$fh>) {
		;# ignore 'needs update'
	}
	close $fh;
}

sub list_untracked {
	map {
		chomp $_;
		$_;
	}
	run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @ARGV);
}

my $status_fmt = '%12s %12s %s';
my $status_head = sprintf($status_fmt, 'staged', 'unstaged', 'path');

# Returns list of hashes, contents of each of which are:
# PRINT:	print message
# VALUE:	pathname
# BINARY:	is a binary path
# INDEX:	is index different from HEAD?
# FILE:		is file different from index?
# INDEX_ADDDEL:	is it add/delete between HEAD and index?
# FILE_ADDDEL:	is it add/delete between index and file?

sub list_modified {
	my ($only) = @_;
	my (%data, @return);
	my ($add, $del, $adddel, $file);
	my @tracked = ();

	if (@ARGV) {
		@tracked = map {
			chomp $_; $_;
		} run_cmd_pipe(qw(git ls-files --exclude-standard --), @ARGV);
		return if (!@tracked);
	}

	for (run_cmd_pipe(qw(git diff-index --cached
			     --numstat --summary HEAD --), @tracked)) {
		if (($add, $del, $file) =
		    /^([-\d]+)	([-\d]+)	(.*)/) {
			my ($change, $bin);
			if ($add eq '-' && $del eq '-') {
				$change = 'binary';
				$bin = 1;
			}
			else {
				$change = "+$add/-$del";
			}
			$data{$file} = {
				INDEX => $change,
				BINARY => $bin,
				FILE => 'nothing',
			}
		}
		elsif (($adddel, $file) =
		       /^ (create|delete) mode [0-7]+ (.*)$/) {
			$data{$file}{INDEX_ADDDEL} = $adddel;
		}
	}

	for (run_cmd_pipe(qw(git diff-files --numstat --summary --), @tracked)) {
		if (($add, $del, $file) =
		    /^([-\d]+)	([-\d]+)	(.*)/) {
			if (!exists $data{$file}) {
				$data{$file} = +{
					INDEX => 'unchanged',
					BINARY => 0,
				};
			}
			my ($change, $bin);
			if ($add eq '-' && $del eq '-') {
				$change = 'binary';
				$bin = 1;
			}
			else {
				$change = "+$add/-$del";
			}
			$data{$file}{FILE} = $change;
			if ($bin) {
				$data{$file}{BINARY} = 1;
			}
		}
		elsif (($adddel, $file) =
		       /^ (create|delete) mode [0-7]+ (.*)$/) {
			$data{$file}{FILE_ADDDEL} = $adddel;
		}
	}

	for (sort keys %data) {
		my $it = $data{$_};

		if ($only) {
			if ($only eq 'index-only') {
				next if ($it->{INDEX} eq 'unchanged');
			}
			if ($only eq 'file-only') {
				next if ($it->{FILE} eq 'nothing');
			}
		}
		push @return, +{
			VALUE => $_,
			PRINT => (sprintf $status_fmt,
				  $it->{INDEX}, $it->{FILE}, $_),
			%$it,
		};
	}
	return @return;
}

sub find_unique {
	my ($string, @stuff) = @_;
	my $found = undef;
	for (my $i = 0; $i < @stuff; $i++) {
		my $it = $stuff[$i];
		my $hit = undef;
		if (ref $it) {
			if ((ref $it) eq 'ARRAY') {
				$it = $it->[0];
			}
			else {
				$it = $it->{VALUE};
			}
		}
		eval {
			if ($it =~ /^$string/) {
				$hit = 1;
			};
		};
		if (defined $hit && defined $found) {
			return undef;
		}
		if ($hit) {
			$found = $i + 1;
		}
	}
	return $found;
}

sub list_and_choose {
	my ($opts, @stuff) = @_;
	my (@chosen, @return);
	my $i;

      TOPLOOP:
	while (1) {
		my $last_lf = 0;

		if ($opts->{HEADER}) {
			if (!$opts->{LIST_FLAT}) {
				print "     ";
			}
			print "$opts->{HEADER}\n";
		}
		for ($i = 0; $i < @stuff; $i++) {
			my $chosen = $chosen[$i] ? '*' : ' ';
			my $print = $stuff[$i];
			if (ref $print) {
				if ((ref $print) eq 'ARRAY') {
					$print = $print->[0];
				}
				else {
					$print = $print->{PRINT};
				}
			}
			printf("%s%2d: %s", $chosen, $i+1, $print);
			if (($opts->{LIST_FLAT}) &&
			    (($i + 1) % ($opts->{LIST_FLAT}))) {
				print "\t";
				$last_lf = 0;
			}
			else {
				print "\n";
				$last_lf = 1;
			}
		}
		if (!$last_lf) {
			print "\n";
		}

		return if ($opts->{LIST_ONLY});

		print $opts->{PROMPT};
		if ($opts->{SINGLETON}) {
			print "> ";
		}
		else {
			print ">> ";
		}
		my $line = <STDIN>;
		if (!$line) {
			print "\n";
			$opts->{ON_EOF}->() if $opts->{ON_EOF};
			last;
		}
		chomp $line;
		last if $line eq '';
		for my $choice (split(/[\s,]+/, $line)) {
			my $choose = 1;
			my ($bottom, $top);

			# Input that begins with '-'; unchoose
			if ($choice =~ s/^-//) {
				$choose = 0;
			}
			# A range can be specified like 5-7
			if ($choice =~ /^(\d+)-(\d+)$/) {
				($bottom, $top) = ($1, $2);
			}
			elsif ($choice =~ /^\d+$/) {
				$bottom = $top = $choice;
			}
			elsif ($choice eq '*') {
				$bottom = 1;
				$top = 1 + @stuff;
			}
			else {
				$bottom = $top = find_unique($choice, @stuff);
				if (!defined $bottom) {
					print "Huh ($choice)?\n";
					next TOPLOOP;
				}
			}
			if ($opts->{SINGLETON} && $bottom != $top) {
				print "Huh ($choice)?\n";
				next TOPLOOP;
			}
			for ($i = $bottom-1; $i <= $top-1; $i++) {
				next if (@stuff <= $i || $i < 0);
				$chosen[$i] = $choose;
			}
		}
		last if ($opts->{IMMEDIATE} || $line eq '*');
	}
	for ($i = 0; $i < @stuff; $i++) {
		if ($chosen[$i]) {
			push @return, $stuff[$i];
		}
	}
	return @return;
}

sub status_cmd {
	list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
			list_modified());
	print "\n";
}

sub say_n_paths {
	my $did = shift @_;
	my $cnt = scalar @_;
	print "$did ";
	if (1 < $cnt) {
		print "$cnt paths\n";
	}
	else {
		print "one path\n";
	}
}

sub update_cmd {
	my @mods = list_modified('file-only');
	return if (!@mods);

	my @update = list_and_choose({ PROMPT => 'Update',
				       HEADER => $status_head, },
				     @mods);
	if (@update) {
		system(qw(git update-index --add --remove --),
		       map { $_->{VALUE} } @update);
		say_n_paths('updated', @update);
	}
	print "\n";
}

sub revert_cmd {
	my @update = list_and_choose({ PROMPT => 'Revert',
				       HEADER => $status_head, },
				     list_modified());
	if (@update) {
		my @lines = run_cmd_pipe(qw(git ls-tree HEAD --),
					 map { $_->{VALUE} } @update);
		my $fh;
		open $fh, '| git update-index --index-info'
		    or die;
		for (@lines) {
			print $fh $_;
		}
		close($fh);
		for (@update) {
			if ($_->{INDEX_ADDDEL} &&
			    $_->{INDEX_ADDDEL} eq 'create') {
				system(qw(git update-index --force-remove --),
				       $_->{VALUE});
				print "note: $_->{VALUE} is untracked now.\n";
			}
		}
		refresh();
		say_n_paths('reverted', @update);
	}
	print "\n";
}

sub add_untracked_cmd {
	my @add = list_and_choose({ PROMPT => 'Add untracked' },
				  list_untracked());
	if (@add) {
		system(qw(git update-index --add --), @add);
		say_n_paths('added', @add);
	}
	print "\n";
}

sub parse_diff {
	my ($path) = @_;
	my @diff = run_cmd_pipe(qw(git diff-files -p --), $path);
	my (@hunk) = { TEXT => [] };

	for (@diff) {
		if (/^@@ /) {
			push @hunk, { TEXT => [] };
		}
		push @{$hunk[-1]{TEXT}}, $_;
	}
	return @hunk;
}

sub hunk_splittable {
	my ($text) = @_;

	my @s = split_hunk($text);
	return (1 < @s);
}

sub parse_hunk_header {
	my ($line) = @_;
	my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
	    $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
	$o_cnt = 1 unless defined $o_cnt;
	$n_cnt = 1 unless defined $n_cnt;
	return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
}

sub split_hunk {
	my ($text) = @_;
	my @split = ();

	# If there are context lines in the middle of a hunk,
	# it can be split, but we would need to take care of
	# overlaps later.

	my ($o_ofs, undef, $n_ofs) = parse_hunk_header($text->[0]);
	my $hunk_start = 1;

      OUTER:
	while (1) {
		my $next_hunk_start = undef;
		my $i = $hunk_start - 1;
		my $this = +{
			TEXT => [],
			OLD => $o_ofs,
			NEW => $n_ofs,
			OCNT => 0,
			NCNT => 0,
			ADDDEL => 0,
			POSTCTX => 0,
		};

		while (++$i < @$text) {
			my $line = $text->[$i];
			if ($line =~ /^ /) {
				if ($this->{ADDDEL} &&
				    !defined $next_hunk_start) {
					# We have seen leading context and
					# adds/dels and then here is another
					# context, which is trailing for this
					# split hunk and leading for the next
					# one.
					$next_hunk_start = $i;
				}
				push @{$this->{TEXT}}, $line;
				$this->{OCNT}++;
				$this->{NCNT}++;
				if (defined $next_hunk_start) {
					$this->{POSTCTX}++;
				}
				next;
			}

			# add/del
			if (defined $next_hunk_start) {
				# We are done with the current hunk and
				# this is the first real change for the
				# next split one.
				$hunk_start = $next_hunk_start;
				$o_ofs = $this->{OLD} + $this->{OCNT};
				$n_ofs = $this->{NEW} + $this->{NCNT};
				$o_ofs -= $this->{POSTCTX};
				$n_ofs -= $this->{POSTCTX};
				push @split, $this;
				redo OUTER;
			}
			push @{$this->{TEXT}}, $line;
			$this->{ADDDEL}++;
			if ($line =~ /^-/) {
				$this->{OCNT}++;
			}
			else {
				$this->{NCNT}++;
			}
		}

		push @split, $this;
		last;
	}

	for my $hunk (@split) {
		$o_ofs = $hunk->{OLD};
		$n_ofs = $hunk->{NEW};
		my $o_cnt = $hunk->{OCNT};
		my $n_cnt = $hunk->{NCNT};

		my $head = ("@@ -$o_ofs" .
			    (($o_cnt != 1) ? ",$o_cnt" : '') .
			    " +$n_ofs" .
			    (($n_cnt != 1) ? ",$n_cnt" : '') .
			    " @@\n");
		unshift @{$hunk->{TEXT}}, $head;
	}
	return map { $_->{TEXT} } @split;
}

sub find_last_o_ctx {
	my ($it) = @_;
	my $text = $it->{TEXT};
	my ($o_ofs, $o_cnt) = parse_hunk_header($text->[0]);
	my $i = @{$text};
	my $last_o_ctx = $o_ofs + $o_cnt;
	while (0 < --$i) {
		my $line = $text->[$i];
		if ($line =~ /^ /) {
			$last_o_ctx--;
			next;
		}
		last;
	}
	return $last_o_ctx;
}

sub merge_hunk {
	my ($prev, $this) = @_;
	my ($o0_ofs, $o0_cnt, $n0_ofs, $n0_cnt) =
	    parse_hunk_header($prev->{TEXT}[0]);
	my ($o1_ofs, $o1_cnt, $n1_ofs, $n1_cnt) =
	    parse_hunk_header($this->{TEXT}[0]);

	my (@line, $i, $ofs, $o_cnt, $n_cnt);
	$ofs = $o0_ofs;
	$o_cnt = $n_cnt = 0;
	for ($i = 1; $i < @{$prev->{TEXT}}; $i++) {
		my $line = $prev->{TEXT}[$i];
		if ($line =~ /^\+/) {
			$n_cnt++;
			push @line, $line;
			next;
		}

		last if ($o1_ofs <= $ofs);

		$o_cnt++;
		$ofs++;
		if ($line =~ /^ /) {
			$n_cnt++;
		}
		push @line, $line;
	}

	for ($i = 1; $i < @{$this->{TEXT}}; $i++) {
		my $line = $this->{TEXT}[$i];
		if ($line =~ /^\+/) {
			$n_cnt++;
			push @line, $line;
			next;
		}
		$ofs++;
		$o_cnt++;
		if ($line =~ /^ /) {
			$n_cnt++;
		}
		push @line, $line;
	}
	my $head = ("@@ -$o0_ofs" .
		    (($o_cnt != 1) ? ",$o_cnt" : '') .
		    " +$n0_ofs" .
		    (($n_cnt != 1) ? ",$n_cnt" : '') .
		    " @@\n");
	@{$prev->{TEXT}} = ($head, @line);
}

sub coalesce_overlapping_hunks {
	my (@in) = @_;
	my @out = ();

	my ($last_o_ctx);

	for (grep { $_->{USE} } @in) {
		my $text = $_->{TEXT};
		my ($o_ofs) = parse_hunk_header($text->[0]);
		if (defined $last_o_ctx &&
		    $o_ofs <= $last_o_ctx) {
			merge_hunk($out[-1], $_);
		}
		else {
			push @out, $_;
		}
		$last_o_ctx = find_last_o_ctx($out[-1]);
	}
	return @out;
}

sub help_patch_cmd {
	print <<\EOF ;
y - stage this hunk
n - do not stage this hunk
a - stage this and all the remaining hunks in the file
d - do not stage this hunk nor any of the remaining hunks in the file
j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
? - print help
EOF
}

sub patch_update_cmd {
	my @mods = grep { !($_->{BINARY}) } list_modified('file-only');
	my @them;

	if (!@mods) {
		print STDERR "No changes.\n";
		return 0;
	}
	if ($patch_mode) {
		@them = @mods;
	}
	else {
		@them = list_and_choose({ PROMPT => 'Patch update',
					  HEADER => $status_head, },
					@mods);
	}
	for (@them) {
		patch_update_file($_->{VALUE});
	}
}

sub patch_update_file {
	my ($ix, $num);
	my $path = shift;
	my ($head, @hunk) = parse_diff($path);
	for (@{$head->{TEXT}}) {
		print;
	}
	$num = scalar @hunk;
	$ix = 0;

	while (1) {
		my ($prev, $next, $other, $undecided, $i);
		$other = '';

		if ($num <= $ix) {
			$ix = 0;
		}
		for ($i = 0; $i < $ix; $i++) {
			if (!defined $hunk[$i]{USE}) {
				$prev = 1;
				$other .= '/k';
				last;
			}
		}
		if ($ix) {
			$other .= '/K';
		}
		for ($i = $ix + 1; $i < $num; $i++) {
			if (!defined $hunk[$i]{USE}) {
				$next = 1;
				$other .= '/j';
				last;
			}
		}
		if ($ix < $num - 1) {
			$other .= '/J';
		}
		for ($i = 0; $i < $num; $i++) {
			if (!defined $hunk[$i]{USE}) {
				$undecided = 1;
				last;
			}
		}
		last if (!$undecided);

		if (hunk_splittable($hunk[$ix]{TEXT})) {
			$other .= '/s';
		}
		for (@{$hunk[$ix]{TEXT}}) {
			print;
		}
		print "Stage this hunk [y/n/a/d$other/?]? ";
		my $line = <STDIN>;
		if ($line) {
			if ($line =~ /^y/i) {
				$hunk[$ix]{USE} = 1;
			}
			elsif ($line =~ /^n/i) {
				$hunk[$ix]{USE} = 0;
			}
			elsif ($line =~ /^a/i) {
				while ($ix < $num) {
					if (!defined $hunk[$ix]{USE}) {
						$hunk[$ix]{USE} = 1;
					}
					$ix++;
				}
				next;
			}
			elsif ($line =~ /^d/i) {
				while ($ix < $num) {
					if (!defined $hunk[$ix]{USE}) {
						$hunk[$ix]{USE} = 0;
					}
					$ix++;
				}
				next;
			}
			elsif ($other =~ /K/ && $line =~ /^K/) {
				$ix--;
				next;
			}
			elsif ($other =~ /J/ && $line =~ /^J/) {
				$ix++;
				next;
			}
			elsif ($other =~ /k/ && $line =~ /^k/) {
				while (1) {
					$ix--;
					last if (!$ix ||
						 !defined $hunk[$ix]{USE});
				}
				next;
			}
			elsif ($other =~ /j/ && $line =~ /^j/) {
				while (1) {
					$ix++;
					last if ($ix >= $num ||
						 !defined $hunk[$ix]{USE});
				}
				next;
			}
			elsif ($other =~ /s/ && $line =~ /^s/) {
				my @split = split_hunk($hunk[$ix]{TEXT});
				if (1 < @split) {
					print "Split into ",
					scalar(@split), " hunks.\n";
				}
				splice(@hunk, $ix, 1,
				       map { +{ TEXT => $_, USE => undef } }
				       @split);
				$num = scalar @hunk;
				next;
			}
			else {
				help_patch_cmd($other);
				next;
			}
			# soft increment
			while (1) {
				$ix++;
				last if ($ix >= $num ||
					 !defined $hunk[$ix]{USE});
			}
		}
	}

	@hunk = coalesce_overlapping_hunks(@hunk);

	my $n_lofs = 0;
	my @result = ();
	for (@hunk) {
		my $text = $_->{TEXT};
		my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
		    parse_hunk_header($text->[0]);

		if (!$_->{USE}) {
			# We would have added ($n_cnt - $o_cnt) lines
			# to the postimage if we were to use this hunk,
			# but we didn't.  So the line number that the next
			# hunk starts at would be shifted by that much.
			$n_lofs -= ($n_cnt - $o_cnt);
			next;
		}
		else {
			if ($n_lofs) {
				$n_ofs += $n_lofs;
				$text->[0] = ("@@ -$o_ofs" .
					      (($o_cnt != 1)
					       ? ",$o_cnt" : '') .
					      " +$n_ofs" .
					      (($n_cnt != 1)
					       ? ",$n_cnt" : '') .
					      " @@\n");
			}
			for (@$text) {
				push @result, $_;
			}
		}
	}

	if (@result) {
		my $fh;

		open $fh, '| git apply --cached';
		for (@{$head->{TEXT}}, @result) {
			print $fh $_;
		}
		if (!close $fh) {
			for (@{$head->{TEXT}}, @result) {
				print STDERR $_;
			}
		}
		refresh();
	}

	print "\n";
}

sub diff_cmd {
	my @mods = list_modified('index-only');
	@mods = grep { !($_->{BINARY}) } @mods;
	return if (!@mods);
	my (@them) = list_and_choose({ PROMPT => 'Review diff',
				     IMMEDIATE => 1,
				     HEADER => $status_head, },
				   @mods);
	return if (!@them);
	system(qw(git diff-index -p --cached HEAD --),
	       map { $_->{VALUE} } @them);
}

sub quit_cmd {
	print "Bye.\n";
	exit(0);
}

sub help_cmd {
	print <<\EOF ;
status        - show paths with changes
update        - add working tree state to the staged set of changes
revert        - revert staged set of changes back to the HEAD version
patch         - pick hunks and update selectively
diff	      - view diff between HEAD and index
add untracked - add contents of untracked files to the staged set of changes
EOF
}

sub process_args {
	return unless @ARGV;
	my $arg = shift @ARGV;
	if ($arg eq "--patch") {
		$patch_mode = 1;
		$arg = shift @ARGV or die "missing --";
		die "invalid argument $arg, expecting --"
		    unless $arg eq "--";
	}
	elsif ($arg ne "--") {
		die "invalid argument $arg, expecting --";
	}
}

sub main_loop {
	my @cmd = ([ 'status', \&status_cmd, ],
		   [ 'update', \&update_cmd, ],
		   [ 'revert', \&revert_cmd, ],
		   [ 'add untracked', \&add_untracked_cmd, ],
		   [ 'patch', \&patch_update_cmd, ],
		   [ 'diff', \&diff_cmd, ],
		   [ 'quit', \&quit_cmd, ],
		   [ 'help', \&help_cmd, ],
	);
	while (1) {
		my ($it) = list_and_choose({ PROMPT => 'What now',
					     SINGLETON => 1,
					     LIST_FLAT => 4,
					     HEADER => '*** Commands ***',
					     ON_EOF => \&quit_cmd,
					     IMMEDIATE => 1 }, @cmd);
		if ($it) {
			eval {
				$it->[1]->();
			};
			if ($@) {
				print "$@";
			}
		}
	}
}

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