Re: [PATCH v2 3/3] add -p: optimize line selection for short hunks

[Igor Djordjevic <igor.d.djordjevic@gmail.com>]

On 06/03/2018 11:17, Phillip Wood wrote:
> 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

Not sure if using s/selecting individual lines/staging individual lines/ 
would make sense here, too, but not that important (as you later do 
say "to stage lines").

> 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 &&
>