Re: [PATCH v2 2/3] add -p: allow line selection to be inverted
- From
- Igor Djordjevic <igor.d.djordjevic@gmail.com>
- Date
- Mar 6, 2018, 20:41 UTC
- Message-ID
- <4ce95d01-5cda-44f6-0504-f06ffe217032@gmail.com>
- In-Reply-To
- <20180306101750.18794-3-phillip.wood@talktalk.net>
On 06/03/2018 11:17, Phillip Wood wrote:
> From: Phillip Wood <phillip.wood@dunelm.org.uk> > > If the list of lines to be selected begins with '^' select all the > lines except the ones listed.
s/to be selected begins with '^' select all/to be staged begins with '^' stage all/
Show 19 quoted lines
> > Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> > --- > Documentation/git-add.txt | 3 ++- > git-add--interactive.perl | 17 ++++++++++++++++- > t/t3701-add-interactive.sh | 2 +- > 3 files changed, 19 insertions(+), 3 deletions(-) > > diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt > index ad33fda9a2..0e2c11e97b 100644 > --- a/Documentation/git-add.txt > +++ b/Documentation/git-add.txt > @@ -341,7 +341,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, to specify a range of lines use a dash > -between them. > +between them. To invert the selection prefix it with "\^" so "^3-5,8" > +will select everything except lines 3, 4, 5 and 8.
Hmm, here, first "selection" seems to make sense as it is (I guess), but might still be better to later say s/will select everything/will stage everything/ ...?
That said, might be "to invert the selection" could rather be "to unstage," instead? Not sure, though.
Show 54 quoted lines
> +
> 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 a273b41e95..6fa3d0a87c 100755
> --- 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) = @_;
> - 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);
> + 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 (/^([0-9]*)-([0-9]*)$/) {
> if ($1 eq '' and $2 eq '') {
> @@ -1110,6 +1122,9 @@ sub parse_hunk_selection {
> return undef;
> }
> }
> + if ($invert) {
> + @selected = map { !$_ } @selected;
> + }
> return \@selected;
> }
>
> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
> index 65c8c3354b..89c0e73f2b 100755
> --- 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' '
> - 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 &&
>