gitweb.cgi: git_blame2: Revision blocks now have alternating colors

A revision block is the largest number of adjacent
lines of code originating from the same revision.

This patch adds color to git_blame2(), in that no two
adjacent revision blocks have the same color.  The color
alternates between light and dark.

As we annotate the code lines, we alternate the color
(light, dark) of code lines _per revision_.  This makes it
easier to see line conglomerations per revision.

Signed-off-by: Luben Tuikov <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/gitweb.cgi b/gitweb.cgi
index ca8a2eee732df011cadea3b3bbc66774c2bd9873a05fcd81269f6b31a378131b..c5b62091a6f4193442d9643e9fa7cdda88bb39e230a212462b9349832ee760ad 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -1281,9 +1281,11 @@ sub git_blame2 {
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
                "</div>\n";
        git_print_page_path($file_name, $ftype);
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
                "</div>\n";
        git_print_page_path($file_name, $ftype);

-
+       my @rev_color = (qw(light dark));
+       my $num_colors = scalar(@rev_color);
+       my $current_color = 0;
+       my $last_rev;

        print "<div class=\"page_body\">\n";
        print "<div class=\"page_body\">\n";

-

        print "<table class=\"blame\">\n";
        print "<tr><th>Commit</th><th>Line</th><th>Data</th></tr>\n";
        while (my $line = <$fd>) {
        print "<table class=\"blame\">\n";
        print "<tr><th>Commit</th><th>Line</th><th>Data</th></tr>\n";
        while (my $line = <$fd>) {


@@ -1293,7 +1295,13 @@ sub git_blame2 {
                my $lineno = $blame_line{'lineno'};
                my $data = $blame_line{'data'};
 
                my $lineno = $blame_line{'lineno'};
                my $data = $blame_line{'data'};
 

-               print "<tr>\n";
+               if (!defined $last_rev) {
+                       $last_rev = $full_rev;
+               } elsif ($last_rev ne $full_rev) {
+                       $last_rev = $full_rev;
+                       $current_color = ++$current_color % $num_colors;
+               }
+               print "<tr class=\"$rev_color[$current_color]\">\n";

                print "<td class=\"sha1\">" .
                        $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$full_rev;f=$file_name")}, esc_html($rev)) . "</td>\n";
                print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" . esc_html($lineno) . "</a></td>\n";
                print "<td class=\"sha1\">" .
                        $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$full_rev;f=$file_name")}, esc_html($rev)) . "</td>\n";
                print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" . esc_html($lineno) . "</a></td>\n";


@@ -1302,7 +1310,6 @@ sub git_blame2 {
        }
        print "</table>\n";
        print "</div>";
        }
        print "</table>\n";
        print "</div>";

-

        close $fd or print "Reading blob failed\n";
        git_footer_html();
 }
        close $fd or print "Reading blob failed\n";
        git_footer_html();
 }