From: Phillip Wood <phillip.wood@talktalk.net>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Gustavo Leite <gustavoleite.ti@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH v2 3/3] add -p: optimize line selection for short hunks
Date: Tue, 6 Mar 2018 10:17:50 +0000 [thread overview]
Message-ID: <20180306101750.18794-4-phillip.wood@talktalk.net> (raw)
In-Reply-To: <20180306101750.18794-1-phillip.wood@talktalk.net>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
If there are fewer than ten changes in a hunk then make spaces
optional when selecting individual lines. This means that for short
hunks one can just type -357 to stage lines 1, 2, 3, 5 & 7.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
Documentation/git-add.txt | 3 ++-
git-add--interactive.perl | 30 ++++++++++++++++++++++++++++++
t/t3701-add-interactive.sh | 2 +-
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 0e2c11e97b..d52acfc722 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -340,7 +340,8 @@ patch::
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
+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.
+
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 6fa3d0a87c..9a6bcd5085 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1082,6 +1082,33 @@ sub check_hunk_label {
return 1;
}
+sub split_hunk_selection {
+ local $_;
+ my @fields = @_;
+ my @ret;
+ for (@fields) {
+ if (/^(-[0-9])(.*)/) {
+ push @ret, $1;
+ $_ = $2;
+ }
+ while ($_ ne '') {
+ if (/^[0-9]-$/) {
+ push @ret, $_;
+ last;
+ } elsif (/^([0-9](?:-[0-9])?)(.*)/) {
+ push @ret, $1;
+ $_ = $2;
+ } else {
+ error_msg sprintf
+ __("invalid hunk line '%s'\n"),
+ substr($_, 0, 1);
+ return ();
+ }
+ }
+ }
+ return @ret;
+}
+
sub parse_hunk_selection {
local $_;
my ($hunk, $line) = @_;
@@ -1100,6 +1127,9 @@ sub parse_hunk_selection {
}
}
}
+ if ($max_label < 10) {
+ @fields = split_hunk_selection(@fields) or return undef;
+ }
for (@fields) {
if (/^([0-9]*)-([0-9]*)$/) {
if ($1 eq '' and $2 eq '') {
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 89c0e73f2b..d3bce154da 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 "^1 3" |
+ printf "%s\n" l ^13 |
EDITOR=: git reset -p 2>error &&
test_must_be_empty error &&
git diff --cached HEAD >actual &&
--
2.16.2
next prev parent reply other threads:[~2018-03-06 10:18 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
2018-03-06 10:17 ` Phillip Wood [this message]
2018-03-06 20:33 ` [PATCH v2 3/3] add -p: optimize line selection for short hunks 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=20180306101750.18794-4-phillip.wood@talktalk.net \
--to=phillip.wood@talktalk.net \
--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).