From: Phillip Wood <phillip.wood@talktalk.net> To: Git Mailing List <git@vger.kernel.org> Cc: Phillip Wood <phillip.wood@dunelm.org.uk> Subject: [PATCH v1 3/3] add -p: optimize line selection for short hunks Date: Mon, 19 Feb 2018 11:36:19 +0000 Message-ID: <20180219113619.26566-4-phillip.wood@talktalk.net> (raw) In-Reply-To: <20180219113619.26566-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> --- git-add--interactive.perl | 30 ++++++++++++++++++++++++++++++ t/t3701-add-interactive.sh | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 0e3960b1ecf004bff51d28d540f685a5dc91fad1..3d9720af03eb113c7f3d2b73f17b4b51a7685bf3 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1067,6 +1067,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) = @_; @@ -1085,6 +1112,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 4ae706fd121f157e9cbd93ec293f45ce2a3a53b5..c6d847dc495c92782e37ef7b0e2800d7936aabd7 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -390,7 +390,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 | sed /^index/d >actual && -- 2.16.1
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 ` Phillip Wood [this message] 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 ` [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
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=20180219113619.26566-4-phillip.wood@talktalk.net \ --to=phillip.wood@talktalk.net \ --cc=git@vger.kernel.org \ --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