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

diff-highlight: refactor to prepare for multi-line hunks

Browse Source 
The current code structure assumes that we will only look at
a pair of lines at any given time, and that the end result
should always be to output that pair. However, we want to
eventually handle multi-line hunks, which will involve
collating pairs of removed/added lines. Let's refactor the
code to return highlighted pairs instead of printing them.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2012-02-13 17:33:10 -05:00 committed by Junio C Hamano
parent 097128d1bc
commit 6463fd7ed1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/diff-highlight/diff-highlight
View File

@ -23,7 +23,7 @@ while (<>) {
$window[2] =~ /^$COLOR*\+/ &&
$window[3] !~ /^$COLOR*\+/) {
print shift @window;
show_pair(shift @window, shift @window);
show_hunk(shift @window, shift @window);
}
else {
print shift @window;
@ -48,7 +48,7 @@ if (@window == 3 &&
$window[1] =~ /^$COLOR*-/ &&
$window[2] =~ /^$COLOR*\+/) {
print shift @window;
show_pair(shift @window, shift @window);
show_hunk(shift @window, shift @window);
}
# And then flush any remaining lines.
@ -58,7 +58,13 @@ while (@window) {
exit 0;
sub show_pair {
sub show_hunk {
my ($a, $b) = @_;
print highlight_pair($a, $b);
}
sub highlight_pair {
my @a = split_line(shift);
my @b = split_line(shift);
@ -106,12 +112,12 @@ sub show_pair {
}
if (is_pair_interesting(\@a, $pa, $sa, \@b, $pb, $sb)) {
print highlight(\@a, $pa, $sa);
print highlight(\@b, $pb, $sb);
return highlight_line(\@a, $pa, $sa),
highlight_line(\@b, $pb, $sb);
}
else {
print join('', @a);
print join('', @b);
return join('', @a),
join('', @b);
}
}
@ -121,7 +127,7 @@ sub split_line {
split /($COLOR*)/;
}
sub highlight {
sub highlight_line {
my ($line, $prefix, $suffix) = @_;
return join('',