From: Igor Djordjevic <igor.d.djordjevic@gmail.com>
To: Phillip Wood <phillip.wood@dunelm.org.uk>,
Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Gustavo Leite <gustavoleite.ti@gmail.com>
Subject: Re: [PATCH v2 2/3] add -p: allow line selection to be inverted
Date: Tue, 6 Mar 2018 21:41:00 +0100 [thread overview]
Message-ID: <4ce95d01-5cda-44f6-0504-f06ffe217032@gmail.com> (raw)
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/
>
> 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.
> +
> 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 &&
>
next prev parent reply other threads:[~2018-03-06 20:41 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-19 11:36 [PATCH v1 0/3] add -p: select individual hunk lines Phillip Wood
2018-02-19 11:36 ` [PATCH v1 1/3] " Phillip Wood
2018-02-19 11:36 ` [PATCH v1 2/3] add -p: allow line selection to be inverted Phillip Wood
2018-02-19 11:36 ` [PATCH v1 3/3] add -p: optimize line selection for short hunks Phillip Wood
2018-02-19 12:20 ` [PATCH v1 0/3] add -p: select individual hunk lines Gustavo Leite
2018-03-06 10:17 ` [PATCH v2 " Phillip Wood
2018-03-06 10:17 ` [PATCH v2 1/3] " Phillip Wood
2018-03-06 20:29 ` Igor Djordjevic
2018-03-06 21:33 ` Igor Djordjevic
2018-03-06 10:17 ` [PATCH v2 2/3] add -p: allow line selection to be inverted Phillip Wood
2018-03-06 19:57 ` Junio C Hamano
2018-03-08 11:05 ` Phillip Wood
2018-03-08 17:53 ` Junio C Hamano
2018-03-13 12:06 ` Phillip Wood
2018-03-13 16:32 ` Junio C Hamano
2018-03-14 11:02 ` Phillip Wood
2018-03-06 20:41 ` Igor Djordjevic [this message]
2018-03-06 10:17 ` [PATCH v2 3/3] add -p: optimize line selection for short hunks Phillip Wood
2018-03-06 20:33 ` Igor Djordjevic
2018-03-06 20:19 ` [PATCH v2 0/3] add -p: select individual hunk lines Igor Djordjevic
2018-03-06 21:03 ` Junio C Hamano
2018-03-06 21:20 ` Igor Djordjevic
2018-03-16 10:13 ` [PATCH v3 " Phillip Wood
2018-03-16 10:13 ` [PATCH v3 1/3] " Phillip Wood
2018-03-16 10:13 ` [PATCH v3 2/3] add -p: allow line selection to be inverted Phillip Wood
2018-03-16 10:13 ` [PATCH v3 3/3] add -p: optimize line selection for short hunks Phillip Wood
2018-03-29 18:32 ` [PATCH v3 0/3] add -p: select individual hunk lines Junio C Hamano
2018-03-30 11:09 ` Phillip Wood
2018-03-31 19:20 ` Ævar Arnfjörð Bjarmason
2018-04-02 10:55 ` Phillip Wood
2018-04-02 11:39 ` Ævar Arnfjörð Bjarmason
2018-07-26 10:22 ` [RFC PATCH v4 0/4] " Phillip Wood
2018-07-26 10:22 ` [PATCH v4 1/4] " Phillip Wood
2018-07-26 10:22 ` [RFC PATCH v4 2/4] add -p: select modified lines correctly Phillip Wood
2018-07-26 10:22 ` [PATCH v4 3/4] add -p: allow line selection to be inverted Phillip Wood
2018-07-26 10:22 ` [PATCH v4 4/4] add -p: optimize line selection for short hunks Phillip Wood
2018-07-26 15:58 ` [RFC PATCH v5 0/4] add -p: select individual hunk lines Phillip Wood
2018-07-26 15:58 ` [PATCH v5 1/4] " Phillip Wood
2018-07-26 19:36 ` Junio C Hamano
2018-07-27 10:05 ` Phillip Wood
2018-07-27 16:09 ` Junio C Hamano
2018-07-26 15:58 ` [RFC PATCH v5 2/4] add -p: select modified lines correctly Phillip Wood
2018-07-26 19:30 ` Junio C Hamano
2018-07-27 10:19 ` Phillip Wood
2018-07-27 16:14 ` Junio C Hamano
2018-07-26 15:58 ` [PATCH v5 3/4] add -p: allow line selection to be inverted Phillip Wood
2018-07-26 15:58 ` [PATCH v5 4/4] add -p: optimize line selection for short hunks Phillip Wood
2018-07-27 18:27 ` [RFC PATCH v5 0/4] add -p: select individual hunk lines Ævar Arnfjörð Bjarmason
2018-07-28 10:08 ` Phillip Wood
2018-07-28 12:40 ` Ævar Arnfjörð Bjarmason
2018-08-03 10:01 ` Phillip Wood
2018-08-03 16:51 ` Junio C Hamano
2018-08-03 17:59 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ce95d01-5cda-44f6-0504-f06ffe217032@gmail.com \
--to=igor.d.djordjevic@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gustavoleite.ti@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).