gitweb: Use print_diff_chunk() for both side-by-side and inline diffs

This renames print_sidebyside_diff_chunk() to print_diff_chunk() and
makes use of it for both side-by-side and inline diffs.  Now diff lines
are always accumulated before they are printed.  This opens the
possibility to preprocess diff output before it's printed, which is
needed for diff refinement highlightning (implemented in incoming
patches).

If print_diff_chunk() was left as is, the new function
print_inline_diff_lines() could reorder diff lines.  It first prints all
context lines, then all removed lines and finally all added lines.  If
the diff output consisted of mixed added and removed lines, gitweb would
reorder these lines.  This is true for combined diff output, for
example:

- removed line for first parent
+ added line for first parent
-removed line for second parent
++added line for both parents

would be rendered as:

- removed line for first parent
-removed line for second parent
+ added line for first parent
++added line for both parents

To prevent gitweb from reordering lines, print_diff_chunk() calls
print_diff_lines() as soon as it detects that both added and removed
lines are present and there was a class change, and at the end of chunk.

Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 82717490c182c1dfaba908b9fd2b6e53c973f6d5..90836e633c145207ee8a919908feadc47fe5e3ae 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -5048,10 +5048,32 @@ sub print_sidebyside_diff_lines {
        }
 }
 
        }
 }
 

-sub print_sidebyside_diff_chunk {
-       my @chunk = @_;
+# Print context lines and then rem/add lines in inline manner.
+sub print_inline_diff_lines {
+       my ($ctx, $rem, $add) = @_;
+
+       print @$ctx, @$rem, @$add;
+}
+
+# Print context lines and then rem/add lines.
+sub print_diff_lines {
+       my ($ctx, $rem, $add, $diff_style, $is_combined) = @_;
+
+       if ($diff_style eq 'sidebyside' && !$is_combined) {
+               print_sidebyside_diff_lines($ctx, $rem, $add);
+       } else {
+               # default 'inline' style and unknown styles
+               print_inline_diff_lines($ctx, $rem, $add);
+       }
+}
+
+sub print_diff_chunk {
+       my ($diff_style, $is_combined, @chunk) = @_;

        my (@ctx, @rem, @add);
 
        my (@ctx, @rem, @add);
 

+       # The class of the previous line.
+       my $prev_class = '';
+

        return unless @chunk;
 
        # incomplete last line might be among removed or added lines,
        return unless @chunk;
 
        # incomplete last line might be among removed or added lines,


@@ -5075,9 +5097,13 @@ sub print_sidebyside_diff_chunk {
                }
 
                ## print from accumulator when have some add/rem lines or end
                }
 
                ## print from accumulator when have some add/rem lines or end

-               # of chunk (flush context lines)
-               if (!$class || ((@rem || @add) && $class eq 'ctx')) {
-                       print_sidebyside_diff_lines(\@ctx, \@rem, \@add);
+               # of chunk (flush context lines), or when have add and rem
+               # lines and new block is reached (otherwise add/rem lines could
+               # be reordered)
+               if (!$class || ((@rem || @add) && $class eq 'ctx') ||
+                   (@rem && @add && $class ne $prev_class)) {
+                       print_diff_lines(\@ctx, \@rem, \@add,
+                                        $diff_style, $is_combined);

                        @ctx = @rem = @add = ();
                }
 
                        @ctx = @rem = @add = ();
                }
 


@@ -5094,6 +5120,8 @@ sub print_sidebyside_diff_chunk {
                if ($class eq 'ctx') {
                        push @ctx, $line;
                }
                if ($class eq 'ctx') {
                        push @ctx, $line;
                }

+
+               $prev_class = $class;

        }
 }
 
        }
 }
 


@@ -5220,22 +5248,17 @@ sub git_patchset_body {
                        $diff_classes .= " $class" if ($class);
                        $line = "<div class=\"$diff_classes\">$line</div>\n";
 
                        $diff_classes .= " $class" if ($class);
                        $line = "<div class=\"$diff_classes\">$line</div>\n";
 

-                       if ($diff_style eq 'sidebyside' && !$is_combined) {
-                               if ($class eq 'chunk_header') {
-                                       print_sidebyside_diff_chunk(@chunk);
-                                       @chunk = ( [ $class, $line ] );
-                               } else {
-                                       push @chunk, [ $class, $line ];
-                               }
-                       } else {
-                               # default 'inline' style and unknown styles
-                               print $line;
+                       if ($class eq 'chunk_header') {
+                               print_diff_chunk($diff_style, $is_combined, @chunk);
+                               @chunk = ();

                        }
                        }

+
+                       push @chunk, [ $class, $line ];

                }
 
        } continue {
                if (@chunk) {
                }
 
        } continue {
                if (@chunk) {

-                       print_sidebyside_diff_chunk(@chunk);
+                       print_diff_chunk($diff_style, $is_combined, @chunk);

                        @chunk = ();
                }
                print "</div>\n"; # class="patch"
                        @chunk = ();
                }
                print "</div>\n"; # class="patch"