From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> Since v2 I've updated the patches to use '-' instead of '^' to invert the selection to match the rest of add -i and clean -i. These patches build on top of the recount fixes in [1]. The commit message for the first patch describes the motivation: "When I end up editing hunks it is almost always because I want to stage a subset of the lines in the hunk. Doing this by editing the hunk is inconvenient and error prone (especially so if the patch is going to be reversed before being applied). Instead offer an option for add -p to stage individual lines. When the user presses 'l' the hunk is redrawn with labels by the insertions and deletions and they are prompted to enter a list of the lines they wish to stage. Ranges of lines may be specified using 'a-b' where either 'a' or 'b' may be omitted to mean all lines from 'a' to the end of the hunk or all lines from 1 upto and including 'b'." [1] https://public-inbox.org/git/xmqqbmg29x1n.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx/T/#m01d0f1af90f32b698e583b56f8e53b986bcec7c6 Interdiff to v2: diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index d52acfc722..f3c81dfb11 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -337,13 +337,14 @@ patch:: e - manually edit the current hunk ? - print help + -If you press "l" then the hunk will be reprinted with each insertion -or deletion labelled with a number and you will be prompted to enter -which lines you wish to select. Individual line numbers should be -separated by a space or comma (these can be omitted if there are fewer -than ten labelled lines), to specify a range of lines use a dash -between them. To invert the selection prefix it with "\^" so "^3-5,8" -will select everything except lines 3, 4, 5 and 8. +If you press "l" then the hunk will be reprinted with each insertion or +deletion labelled with a number and you will be prompted to enter which +lines you wish to select. Individual line numbers should be separated by +a space or comma (these can be omitted if there are fewer than ten +labelled lines), to specify a range of lines use a dash between them. If +the upper bound of a range of lines is omitted it defaults to the last +line. To invert the selection prefix it with "-" so "-3-5,8" will select +everything except lines 3, 4, 5 and 8. + After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks. diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 9a6bcd5085..d65ad7c26d 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1087,10 +1087,6 @@ sub split_hunk_selection { my @fields = @_; my @ret; for (@fields) { - if (/^(-[0-9])(.*)/) { - push @ret, $1; - $_ = $2; - } while ($_ ne '') { if (/^[0-9]-$/) { push @ret, $_; @@ -1115,7 +1111,7 @@ sub parse_hunk_selection { my ($max_label, $invert) = ($hunk->{MAX_LABEL}, undef); my @selected = (0) x ($max_label + 1); my @fields = split(/[,\s]+/, $line); - if ($fields[0] =~ /^\^(.*)/) { + if ($fields[0] =~ /^-(.*)/) { $invert = 1; if ($1 ne '') { $fields[0] = $1; @@ -1131,13 +1127,10 @@ sub parse_hunk_selection { @fields = split_hunk_selection(@fields) or return undef; } for (@fields) { - if (/^([0-9]*)-([0-9]*)$/) { - if ($1 eq '' and $2 eq '') { - error_msg __("range '-' missing upper or lower bound\n"); - return undef; + if (my ($lo, $hi) = /^([0-9]+)-([0-9]*)$/) { + if ($hi eq '') { + $hi = $max_label; } - my $lo = $1 eq '' ? 1 : $1; - my $hi = $2 eq '' ? $max_label : $2; check_hunk_label($hunk, $lo) or return undef; check_hunk_label($hunk, $hi) or return undef; if ($hi < $lo) { diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index d3bce154da..467c6eff0e 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -383,7 +383,7 @@ test_expect_success 'setup expected diff' ' test_expect_success 'can stage individual lines of patch' ' git reset && printf 61 >>test && - printf "%s\n" l "-2 4" | + printf "%s\n" l "1,2 4-" | EDITOR=: git add -p 2>error && test_must_be_empty error && git diff --cached HEAD >actual && @@ -410,7 +410,7 @@ test_expect_success 'setup expected diff' ' ' test_expect_success 'can reset individual lines of patch' ' - printf "%s\n" l ^13 | + printf "%s\n" l -13 | EDITOR=: git reset -p 2>error && test_must_be_empty error && git diff --cached HEAD >actual && Phillip Wood (3): add -p: select individual hunk lines add -p: allow line selection to be inverted add -p: optimize line selection for short hunks Documentation/git-add.txt | 10 +++ git-add--interactive.perl | 181 +++++++++++++++++++++++++++++++++++++++++++++ t/t3701-add-interactive.sh | 65 ++++++++++++++++ 3 files changed, 256 insertions(+) -- 2.16.2
