undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add -i: add function to format hunk header

Browse Source 
This code is duplicated in a couple of places so make it into a
function as we're going to add some more callers shortly.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2018-02-19 11:29:02 +00:00 committed by Junio C Hamano
parent 8279ed033f
commit 492e60c824
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
git-add--interactive.perl
View File

@ -751,6 +751,15 @@ sub parse_hunk_header {
return ($o_ofs, $o_cnt, $n_ofs, $n_cnt); return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
} }
sub format_hunk_header {
my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) = @_;
return ("@@ -$o_ofs" .
(($o_cnt != 1) ? ",$o_cnt" : '') .
" +$n_ofs" .
(($n_cnt != 1) ? ",$n_cnt" : '') .
" @@\n");
}
sub split_hunk { sub split_hunk {
my ($text, $display) = @_; my ($text, $display) = @_;
my @split = (); my @split = ();
@ -838,11 +847,7 @@ sub split_hunk {
my $o_cnt = $hunk->{OCNT}; my $o_cnt = $hunk->{OCNT};
my $n_cnt = $hunk->{NCNT}; my $n_cnt = $hunk->{NCNT};
my $head = ("@@ -$o_ofs" . my $head = format_hunk_header($o_ofs, $o_cnt, $n_ofs, $n_cnt);
(($o_cnt != 1) ? ",$o_cnt" : '') .
" +$n_ofs" .
(($n_cnt != 1) ? ",$n_cnt" : '') .
" @@\n");
my $display_head = $head; my $display_head = $head;
unshift @{$hunk->{TEXT}}, $head; unshift @{$hunk->{TEXT}}, $head;
if ($diff_use_color) { if ($diff_use_color) {
@ -912,11 +917,7 @@ sub merge_hunk {
} }
push @line, $line; push @line, $line;
} }
my $head = ("@@ -$o0_ofs" . my $head = format_hunk_header($o0_ofs, $o_cnt, $n0_ofs, $n_cnt);
(($o_cnt != 1) ? ",$o_cnt" : '') .
" +$n0_ofs" .
(($n_cnt != 1) ? ",$n_cnt" : '') .
" @@\n");
@{$prev->{TEXT}} = ($head, @line); @{$prev->{TEXT}} = ($head, @line);
} }