add -p: allow line selection to be inverted

If the list of lines to be selected begins with '-' select all the
lines except the ones listed.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 965e192a091313a4f3843e475e2a7bca2720f7b8..01ff4d7d24b50a57a99999e040d244f338809c60 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -342,7 +342,8 @@ 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, 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
 lines you wish to select. Individual line numbers should be separated by
 a space or comma, 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.
+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.
 +
 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 d8131d9a0a20d7984256cbc463be948004879cac..8bc0626f0e29cc8a4ea3408352b5c867c34b0834 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1085,9 +1085,21 @@ sub check_hunk_label {
 sub parse_hunk_selection {
        local $_;
        my ($hunk, $line) = @_;
 sub parse_hunk_selection {
        local $_;
        my ($hunk, $line) = @_;

-       my $max_label = $hunk->{MAX_LABEL};
+       my ($max_label, $invert) = ($hunk->{MAX_LABEL}, undef);

        my @selected = (0) x ($max_label + 1);
        my @fields = split(/[,\s]+/, $line);
        my @selected = (0) x ($max_label + 1);
        my @fields = split(/[,\s]+/, $line);

+       if ($fields[0] =~ /^-(.*)/) {
+               $invert = 1;
+               if ($1 ne '') {
+                       $fields[0] = $1;
+               } else {
+                       shift @fields;
+                       unless (@fields) {
+                               error_msg __("no lines to invert\n");
+                               return undef;
+                       }
+               }
+       }

        for (@fields) {
                if (my ($lo, $hi) = /^([0-9]+)-([0-9]*)$/) {
                        if ($hi eq '') {
        for (@fields) {
                if (my ($lo, $hi) = /^([0-9]+)-([0-9]*)$/) {
                        if ($hi eq '') {


@@ -1107,6 +1119,9 @@ sub parse_hunk_selection {
                        return undef;
                }
        }
                        return undef;
                }
        }

+       if ($invert) {
+               @selected = map { !$_ } @selected;
+       }

        return \@selected;
 }
 
        return \@selected;
 }
 

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 6d8f17c61a2ee81d6323324f2f0e482107ad0ce7..c1703725f23926cd17a0621503d99b3fc42a328d 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -410,7 +410,7 @@ test_expect_success 'setup expected diff' '
 '
 
 test_expect_success 'can reset individual lines of patch' '
 '
 
 test_expect_success 'can reset individual lines of patch' '

-       printf "%s\n" l 2 |
+       printf "%s\n" l "-1 3" |

        EDITOR=: git reset -p 2>error &&
        test_must_be_empty error &&
        git diff --cached HEAD >actual &&
        EDITOR=: git reset -p 2>error &&
        test_must_be_empty error &&
        git diff --cached HEAD >actual &&