Re: [PATCH v2 1/3] add -p: select individual hunk lines
On 06/03/2018 21:29, Igor Djordjevic wrote: > > > diff --git a/git-add--interactive.perl b/git-add--interactive.perl > > index f83e7450ad..a273b41e95 100755 > > --- a/git-add--interactive.perl > > +++ b/git-add--interactive.perl > > > > [...] > > > > @@ -1255,6 +1382,7 @@ j - leave this hunk undecided, see next undecided hunk > > J - leave this hunk undecided, see next hunk > > k - leave this hunk undecided, see previous undecided hunk > > K - leave this hunk undecided, see previous hunk > > +l - select hunk lines to use > > s/select hunk lines to use/stage hunk lines/ I was wrong here - in the context of Junio`s remark, I now think this might even belong to context-aware "help_patch_modes" instead, phrased accordingly in there (stage/stash/unstage... etc.).
Re: [PATCH v2 1/3] add -p: select individual hunk lines
On 06/03/2018 11:17, Phillip Wood wrote:
> From: Phillip Wood
>
> When I end up editing hunks it is almost always because I want to
> stage a subset of the lines in the hunk. Doing this by editing the
> hunk is inconvenient and error prone (especially so if the patch is
> going to be reversed before being applied). Instead offer an option
> for add -p to stage individual lines. When the user presses 'l' the
> hunk is redrawn with labels by the insertions and deletions and they
> are prompted to enter a list of the lines they wish to stage. Ranges
> of lines may be specified using 'a-b' where either 'a' or 'b' may be
> omitted to mean all lines from 'a' to the end of the hunk or all lines
> from 1 upto and including 'b'.
>
> Signed-off-by: Phillip Wood
> ---
> Documentation/git-add.txt | 7 +++
> git-add--interactive.perl | 143
> +
> t/t3701-add-interactive.sh | 65 +
> 3 files changed, 215 insertions(+)
>
> diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
> index d50fa339dc..ad33fda9a2 100644
> --- a/Documentation/git-add.txt
> +++ b/Documentation/git-add.txt
> @@ -332,10 +332,17 @@ patch::
> J - leave this hunk undecided, see next hunk
> k - leave this hunk undecided, see previous undecided hunk
> K - leave this hunk undecided, see previous hunk
> + l - select hunk lines to use
Might be more surrounding context aligned to say "stage hunk lines"
here (phrase "stage", instead of "select to use").
> s - split the current hunk into smaller hunks
> e - manually edit the current hunk
> ? - print help
> +
> +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
Likewise, s/you wish to select/you wish to stage/.
> +separated by a space or comma, to specify a range of lines use a dash
> +between them.
> ++
> 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 f83e7450ad..a273b41e95 100755
> --- a/git-add--interactive.perl
> +++ b/git-add--interactive.perl
> @@ -1013,6 +1013,133 @@ sub color_diff {
> } @_;
> }
>
> +sub label_hunk_lines {
> + local $_;
> + my $hunk = shift;
> + my $i = 0;
> + my $labels = [ map { /^[-+]/ ? ++$i : 0 } @{$hunk->{TEXT}} ];
> + if ($i > 1) {
> + @{$hunk}{qw(LABELS MAX_LABEL)} = ($labels, $i);
> + return 1;
> + }
> + return 0;
> +}
> +
> +sub select_hunk_lines {
This is just something I`ve spotted, but I have no actual idea if
renaming this to "stage_hunk_lines" might be better, too, or not
(depending on the surrounding code context), so please take this with
a big grain of salt.
> + my ($hunk, $selected) = @_;
> + my ($text, $labels) = @{$hunk}{qw(TEXT LABELS)};
> + my ($i, $o_cnt, $n_cnt) = (0, 0, 0);
> + my ($push_eol, @newtext);
> + # Lines with this mode will become context lines if they are
> + # not selected
> + my $context_mode = $patch_mode_flavour{IS_REVERSE} ? '+' : '-';
> + for $i (1..$#{$text}) {
> + my $mode = substr($text->[$i], 0, 1);
> + if ($mode eq '\\') {
> + push @newtext, $text->[$i] if ($push_eol);
> + undef $push_eol;
> + } elsif ($labels->[$i] and $selected->[$labels->[$i]]) {
> + push @newtext, $text->[$i];
> + if ($mode eq '+') {
> + $n_cnt++;
> + } else {
> + $o_cnt++;
> + }
> + $push_eol = 1;
> + } elsif ($mode eq ' ' or $mode eq $context_mode) {
> + push @newtext, ' ' . substr($text->[$i], 1);
> + $o_cnt++; $n_cnt++;
> + $push_eol = 1;
> + } else {
> + undef $push_eol;
> + }
> + }
> + my ($o_ofs, $orig_o_cnt, $n_ofs, $orig_n_cnt) =
> + parse_hunk_header($text->[0]);
> + unshift @newtext, format_hunk_header($o_ofs, $o_cnt, $n_ofs, $n_cnt);
> + my $newhunk = {
> + TEXT => \@newtext,
> + DISPLAY => [ color_diff(@newtext) ],
> + OFS_DELTA => $orig_o_cnt - $orig_n_cnt - $o_cnt + $n_cnt,
> + TYPE => $hunk->{TYPE},
> + USE => 1,
> + };
> + # If this hunk has previously been edited add the offset delta
> + # of the old hunk to get the real delta from the original
> + # hunk.
> + if ($hunk->{OFS_DELTA}) {
> + $newhunk->{OFS_DELTA} += $hunk->{OFS_DELTA};
> + }
> + return $newhunk;
> +}
> +
> +sub check_hunk_label {
> +
[PATCH v2 1/3] add -p: select individual hunk lines
From: Phillip Wood
When I end up editing hunks it is almost always because I want to
stage a subset of the lines in the hunk. Doing this by editing the
hunk is inconvenient and error prone (especially so if the patch is
going to be reversed before being applied). Instead offer an option
for add -p to stage individual lines. When the user presses 'l' the
hunk is redrawn with labels by the insertions and deletions and they
are prompted to enter a list of the lines they wish to stage. Ranges
of lines may be specified using 'a-b' where either 'a' or 'b' may be
omitted to mean all lines from 'a' to the end of the hunk or all lines
from 1 upto and including 'b'.
Signed-off-by: Phillip Wood
---
Documentation/git-add.txt | 7 +++
git-add--interactive.perl | 143 +
t/t3701-add-interactive.sh | 65 +
3 files changed, 215 insertions(+)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index d50fa339dc..ad33fda9a2 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -332,10 +332,17 @@ patch::
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
+ l - select hunk lines to use
s - split the current hunk into smaller hunks
e - manually edit the current hunk
? - print help
+
+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.
++
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 f83e7450ad..a273b41e95 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1013,6 +1013,133 @@ sub color_diff {
} @_;
}
+sub label_hunk_lines {
+ local $_;
+ my $hunk = shift;
+ my $i = 0;
+ my $labels = [ map { /^[-+]/ ? ++$i : 0 } @{$hunk->{TEXT}} ];
+ if ($i > 1) {
+ @{$hunk}{qw(LABELS MAX_LABEL)} = ($labels, $i);
+ return 1;
+ }
+ return 0;
+}
+
+sub select_hunk_lines {
+ my ($hunk, $selected) = @_;
+ my ($text, $labels) = @{$hunk}{qw(TEXT LABELS)};
+ my ($i, $o_cnt, $n_cnt) = (0, 0, 0);
+ my ($push_eol, @newtext);
+ # Lines with this mode will become context lines if they are
+ # not selected
+ my $context_mode = $patch_mode_flavour{IS_REVERSE} ? '+' : '-';
+ for $i (1..$#{$text}) {
+ my $mode = substr($text->[$i], 0, 1);
+ if ($mode eq '\\') {
+ push @newtext, $text->[$i] if ($push_eol);
+ undef $push_eol;
+ } elsif ($labels->[$i] and $selected->[$labels->[$i]]) {
+ push @newtext, $text->[$i];
+ if ($mode eq '+') {
+ $n_cnt++;
+ } else {
+ $o_cnt++;
+ }
+ $push_eol = 1;
+ } elsif ($mode eq ' ' or $mode eq $context_mode) {
+ push @newtext, ' ' . substr($text->[$i], 1);
+ $o_cnt++; $n_cnt++;
+ $push_eol = 1;
+ } else {
+ undef $push_eol;
+ }
+ }
+ my ($o_ofs, $orig_o_cnt, $n_ofs, $orig_n_cnt) =
+ parse_hunk_header($text->[0]);
+ unshift @newtext, format_hunk_header($o_ofs, $o_cnt, $n_ofs, $n_cnt);
+ my $newhunk = {
+ TEXT => \@newtext,
+ DISPLAY => [ color_diff(@newtext) ],
+ OFS_DELTA => $orig_o_cnt - $orig_n_cnt - $o_cnt + $n_cnt,
+ TYPE => $hunk->{TYPE},
+ USE => 1,
+ };
+ # If this hunk has previously been edited add the offset delta
+ # of the old hunk to get the real delta from the original
+ # hunk.
+ if ($hunk->{OFS_DELTA}) {
+ $newhunk->{OFS_DELTA} += $hunk->{OFS_DELTA};
+ }
+ return $newhunk;
+}
+
+sub check_hunk_label {
+ my ($max_label, $label) = ($_[0]->{MAX_LABEL}, $_[1]);
+ if ($label < 1 or $label > $max_label) {
+ error_msg sprintf(__("invalid hunk line '%d'\n"), $label);
+ return 0;
+ }
+ return 1;
+}
+
+sub parse_hunk_selection {
+ local $_;
+ my ($hunk, $line) = @_;
+ my $max_label = $hunk->{MAX_LABEL};
+ my @selected = (0) x ($max_label + 1);
+ my @fields = split(/[,\s]+/, $line);
+ for (@fields) {
+ if (/^([0-9]*)-([0-9]*)$/) {
+ if ($1 eq ''
