[PATCH v2 6/8] gitweb: Push formatting diff lines to print_diff_chunk()
From: Michał Kiedrowicz <hidden>
Date: 2016-06-15 22:53:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
Now git_patchset_body() only calls diff_line_class(), which is removed from process_diff_line(). The latter function is renamed to format_diff_line() and its output is changed to return only HTML-formatted line, which brings it in line with outher format_* subroutined. This slightly changes the order of operations performed on diff lines. Before this commit, each read line was formatted and then put to the @chunk accumulator. Now, lines are formatted inside print_diff_chunk(), This is a preparation patch for diff refinement highlightning. It's not meant to change gitweb output. Signed-off-by: Michał Kiedrowicz <redacted> Acked-by: Jakub Narębski <redacted> --- gitweb/gitweb.perl | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index aacf518..db32588 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl@@ -2426,12 +2426,9 @@ sub format_cc_diff_chunk_header { } # process patch (diff) line (not to be used for diff headers), -# returning class and HTML-formatted (but not wrapped) line -sub process_diff_line { - my $line = shift; - my ($from, $to) = @_; - - my $diff_class = diff_line_class($line, $from, $to); +# returning HTML-formatted (but not wrapped) line +sub format_diff_line { + my ($line, $diff_class, $from, $to) = @_; chomp $line; $line = untabify($line);
@@ -2448,7 +2445,7 @@ sub process_diff_line { $diff_classes .= " $diff_class" if ($diff_class); $line = "<div class=\"$diff_classes\">$line</div>\n"; - return $diff_class, $line; + return $line; } # Generates undef or something like "_snapshot_" or "snapshot (_tbz2_ _zip_)",
@@ -5070,7 +5067,7 @@ sub print_diff_lines { } sub print_diff_chunk { - my ($diff_style, $is_combined, @chunk) = @_; + my ($diff_style, $is_combined, $from, $to, @chunk) = @_; my (@ctx, @rem, @add); # The class of the previous line.
@@ -5092,6 +5089,8 @@ sub print_diff_chunk { foreach my $line_info (@chunk) { my ($class, $line) = @$line_info; + $line = format_diff_line($line, $class, $from, $to); + # print chunk headers if ($class && $class eq 'chunk_header') { print $line;
@@ -5245,19 +5244,19 @@ sub git_patchset_body { next PATCH if ($patch_line =~ m/^diff /); - my ($class, $line) = process_diff_line($patch_line, \%from, \%to); + my $class = diff_line_class($patch_line, \%from, \%to); if ($class eq 'chunk_header') { - print_diff_chunk($diff_style, $is_combined, @chunk); - @chunk = ( [ $class, $line ] ); + print_diff_chunk($diff_style, $is_combined, \%from, \%to, @chunk); + @chunk = ( [ $class, $patch_line ] ); } else { - push @chunk, [ $class, $line ]; + push @chunk, [ $class, $patch_line ]; } } } continue { if (@chunk) { - print_diff_chunk($diff_style, $is_combined, @chunk); + print_diff_chunk($diff_style, $is_combined, \%from, \%to, @chunk); @chunk = (); } print "</div>\n"; # class="patch"
--
1.7.8.4