resolve textual hashes when looking up "refs"

diff --git a/gitweb.cgi b/gitweb.cgi
index f56d3036901810a2a7b9bfbfa78405720828e24a..1814f7f2b3784a61e40cf04fa72cdfd2218de22e 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -17,7 +17,7 @@ use Fcntl ':mode';
 binmode STDOUT, ':utf8';
 
 my $cgi = new CGI;
-my $version =          "259";
+my $version =          "262";
 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
 my $rss_link =         "";
@@ -260,7 +260,10 @@ sub git_header_html {
 <title>$title</title>
 $rss_link
 <style type="text/css">
-body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
+body {
+       font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px;
+       margin:10px; background-color:#ffffff; color:#000000;
+}
 a { color:#0000cc; }
 a:hover, a:visited, a:active { color:#880000; }
 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
@@ -531,6 +534,7 @@ sub git_read_commit {
        };
 
        foreach my $title (@commit_lines) {
+               $title =~ s/^    //;
                if ($title ne "") {
                        $co{'title'} = chop_str($title, 80, 5);
                        # remove leading stuff of merges to make the interesting part visible
@@ -912,6 +916,7 @@ sub read_info_ref {
        # c39ae07f393806ccf406ef966e9a15afc43cc36a      refs/tags/v2.6.11^{}
        open my $fd, "$projectroot/$project/info/refs" or return;
        while (my $line = <$fd>) {
+               chomp($line);
                if ($line =~ m/^([0-9a-fA-F]{40})\t.*$type\/([^\^]+)/) {
                        if (defined $refs{$1}) {
                                $refs{$1} .= " / $2";
@@ -1050,7 +1055,7 @@ sub git_summary {
                if ($i-- > 0) {
                        my $ref = "";
                        if (defined $refs->{$commit}) {
-                               $ref = " <span class=\"tag\">$refs->{$commit}</span>";
+                               $ref = " <span class=\"tag\">" . esc_html($refs->{$commit}) . "</span>";
                        }
                        print "<td><i>$co{'age_string'}</i></td>\n" .
                              "<td><i>" . esc_html(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
@@ -1417,6 +1422,11 @@ sub git_tree {
        close $fd or die_error(undef, "Reading tree failed.");
        $/ = "\n";
 
+       my $refs = read_info_ref();
+       my $ref = "";
+       if (defined $refs->{$hash_base}) {
+               $ref = " <span class=\"tag\">" . esc_html($refs->{$hash_base}) . "</span>";
+       }
        git_header_html();
        my $base_key = "";
        my $base = "";
@@ -1432,7 +1442,7 @@ sub git_tree {
                      "<br/><br/>\n" .
                      "</div>\n";
                print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "\n" .
+                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
                      "</div>\n";
        } else {
                print "<div class=\"page_nav\">\n";
@@ -1629,7 +1639,7 @@ sub git_log {
                my $commit = $revlist[$i];
                my $ref = "";
                if (defined $refs->{$commit}) {
-                       $ref = " <span class=\"tag\">$refs->{$commit}</span>";
+                       $ref = " <span class=\"tag\">" . esc_html($refs->{$commit}) . "</span>";
                }
                my %co = git_read_commit($commit);
                next if !%co;
@@ -1695,6 +1705,11 @@ sub git_commit {
        if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
                $expires = "+1d";
        }
+       my $refs = read_info_ref();
+       my $ref = "";
+       if (defined $refs->{$co{'id'}}) {
+               $ref = " <span class=\"tag\">" . esc_html($refs->{$co{'id'}}) . "</span>";
+       }
        git_header_html(undef, $expires);
        print "<div class=\"page_nav\">\n" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
@@ -1708,7 +1723,7 @@ sub git_commit {
              "<br/><br/></div>\n";
        if (defined $co{'parent'}) {
                print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" .
+                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
                      "</div>\n";
        } else {
                print "<div>\n" .
@@ -1932,6 +1947,11 @@ sub git_commitdiff {
        if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
                $expires = "+1d";
        }
+       my $refs = read_info_ref();
+       my $ref = "";
+       if (defined $refs->{$co{'id'}}) {
+               $ref = " <span class=\"tag\">" . esc_html($refs->{$co{'id'}}) . "</span>";
+       }
        git_header_html(undef, $expires);
        print "<div class=\"page_nav\">\n" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
@@ -1943,7 +1963,7 @@ sub git_commitdiff {
        print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent")}, "plain") . "\n" .
              "</div>\n";
        print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" .
+             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
              "</div>\n";
        print "<div class=\"page_body\">\n";
        my $comment = $co{'comment'};
@@ -2041,7 +2061,7 @@ sub git_commitdiff_plain {
              "\n";
 
        foreach my $line (@$comment) {;
-               print "  $line\n";
+               print "$line\n";
        }
        print "---\n\n";
 
@@ -2101,7 +2121,7 @@ sub git_history {
                        }
                        my $ref = "";
                        if (defined $refs->{$commit}) {
-                               $ref = " <span class=\"tag\">$refs->{$commit}</span>";
+                               $ref = " <span class=\"tag\">" . esc_html($refs->{$commit}) . "</span>";
                        }
                        if ($alternate) {
                                print "<tr class=\"dark\">\n";
@@ -2330,7 +2350,7 @@ sub git_shortlog {
                my $commit = $revlist[$i];
                my $ref = "";
                if (defined $refs->{$commit}) {
-                       $ref = " <span class=\"tag\">$refs->{$commit}</span>";
+                       $ref = " <span class=\"tag\">" . esc_html($refs->{$commit}) . "</span>";
                }
                my %co = git_read_commit($commit);
                my %ad = date_str($co{'author_epoch'});