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>, Igor Djordjevic <igor.d.djordjevic@gmail.com>, Phillip Wood <phillip.wood@dunelm.org.uk> Subject: [PATCH v3 3/3] add -p: optimize line selection for short hunks Date: Fri, 16 Mar 2018 10:13:46 +0000 Message-ID: <20180316101346.7137-4-phillip.wood@talktalk.net> (raw) In-Reply-To: <20180316101346.7137-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 1-357 to stage lines 1, 2, 3, 5 & 7. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> --- Notes: changes since v2: - removed code that handled the default lower bound now that '-...' means invert the selection. Documentation/git-add.txt | 9 +++++---- git-add--interactive.perl | 26 ++++++++++++++++++++++++++ t/t3701-add-interactive.sh | 2 +- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 01ff4d7d24..f3c81dfb11 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -340,10 +340,11 @@ 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 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. +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 54fbe114f3..d65ad7c26d 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1082,6 +1082,29 @@ sub check_hunk_label { return 1; } +sub split_hunk_selection { + local $_; + my @fields = @_; + my @ret; + for (@fields) { + 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 +1123,9 @@ sub parse_hunk_selection { } } } + if ($max_label < 10) { + @fields = split_hunk_selection(@fields) or return undef; + } for (@fields) { if (my ($lo, $hi) = /^([0-9]+)-([0-9]*)$/) { if ($hi eq '') { diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 46814babf3..467c6eff0e 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 index Thread overview: 29+ 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 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 ` [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 ` Phillip Wood [this message] 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
Reply instructions: You may reply publically 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=20180316101346.7137-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=igor.d.djordjevic@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
git@vger.kernel.org mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox