undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add -p: improve error messages

Browse Source 
If the user presses a key that isn't currently active then explain why
it isn't active rather than just listing all the keys. It already did
this for some keys, this patch does the same for the those that
weren't already handled.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2018-02-13 10:32:41 +00:00 committed by Junio C Hamano
parent 88f6ffc1c2
commit 4bdd6e7ce3
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-add--interactive.perl
View File

@ -1437,8 +1437,12 @@ sub patch_update_file {
} }
next; next;
} }
elsif ($other =~ /g/ && $line =~ /^g(.*)/) { elsif ($line =~ /^g(.*)/) {
my $response = $1; my $response = $1;
unless ($other =~ /g/) {
error_msg __("No other hunks to goto\n");
next;
}
my $no = $ix > 10 ? $ix - 10 : 0; my $no = $ix > 10 ? $ix - 10 : 0;
while ($response eq '') { while ($response eq '') {
$no = display_hunks(\@hunk, $no); $no = display_hunks(\@hunk, $no);
@ -1556,7 +1560,11 @@ sub patch_update_file {
next; next;
} }
} }
elsif ($other =~ /s/ && $line =~ /^s/) { elsif ($line =~ /^s/) {
unless ($other =~ /s/) {
error_msg __("Sorry, cannot split this hunk\n");
next;
}
my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY}); my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});
if (1 < @split) { if (1 < @split) {
print colored $header_color, sprintf( print colored $header_color, sprintf(
@ -1568,7 +1576,11 @@ sub patch_update_file {
$num = scalar @hunk; $num = scalar @hunk;
next; next;
} }
elsif ($other =~ /e/ && $line =~ /^e/) { elsif ($line =~ /^e/) {
unless ($other =~ /e/) {
error_msg __("Sorry, cannot edit this hunk\n");
next;
}
my $newhunk = edit_hunk_loop($head, \@hunk, $ix); my $newhunk = edit_hunk_loop($head, \@hunk, $ix);
if (defined $newhunk) { if (defined $newhunk) {
splice @hunk, $ix, 1, $newhunk; splice @hunk, $ix, 1, $newhunk;