resolve textual hashes when looking up "refs"

diff --git a/gitweb.cgi b/gitweb.cgi
index ad8c6deea1cf35e752dc48248c14f8e5ca52a66b..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 =          "258";
+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; }
@@ -312,7 +315,7 @@ a.rss_logo {
 }
 a.rss_logo:hover { background-color:#ee5500; }
 span.tag {
-       padding:0px 4px; font-size:10px;
+       padding:0px 4px; font-size:10px; font-weight:normal;
        background-color:#ffffaa; border:1px solid; border-color:#ffffcc #ffee00 #ffee00 #ffffcc;
 }
 </style>
@@ -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
@@ -906,12 +910,14 @@ sub git_project_list {
 }
 
 sub read_info_ref {
+       my $type = shift || "";
        my %refs;
        # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c      refs/tags/v2.6.11
        # c39ae07f393806ccf406ef966e9a15afc43cc36a      refs/tags/v2.6.11^{}
        open my $fd, "$projectroot/$project/info/refs" or return;
        while (my $line = <$fd>) {
-               if ($line =~ m/^([0-9a-fA-F]{40})\t.*\/([^\^]+)/) {
+               chomp($line);
+               if ($line =~ m/^([0-9a-fA-F]{40})\t.*$type\/([^\^]+)/) {
                        if (defined $refs{$1}) {
                                $refs{$1} .= " / $2";
                        } else {
@@ -1047,18 +1053,19 @@ sub git_summary {
                }
                $alternate ^= 1;
                if ($i-- > 0) {
+                       my $ref = "";
+                       if (defined $refs->{$commit}) {
+                               $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" .
                              "<td>";
                        if (length($co{'title_short'}) < length($co{'title'})) {
                                print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list", -title => "$co{'title'}"},
-                                     "<b>" . esc_html($co{'title_short'}) . "</b>");
+                                     "<b>" . esc_html($co{'title_short'}) . "$ref</b>");
                        } else {
                                print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"},
-                                     "<b>" . esc_html($co{'title'}) . "</b>");
-                       }
-                       if (defined $refs->{$commit}) {
-                               print " <span class=\"tag\">$refs->{$commit}</span>";
+                                     "<b>" . esc_html($co{'title'}) . "$ref</b>");
                        }
                        print "</td>\n" .
                              "<td class=\"link\">" .
@@ -1415,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 = "";
@@ -1430,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";
@@ -1627,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;
@@ -1693,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") .
@@ -1706,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" .
@@ -1930,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") .
@@ -1941,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'};
@@ -2012,7 +2034,7 @@ sub git_commitdiff_plain {
 
        # try to figure out the next tag after this commit
        my $tagname;
-       my $refs = read_info_ref();
+       my $refs = read_info_ref("tags");
        open $fd, "-|", "$gitbin/git-rev-list HEAD";
        chomp (my (@commits) = <$fd>);
        close $fd;
@@ -2039,7 +2061,7 @@ sub git_commitdiff_plain {
              "\n";
 
        foreach my $line (@$comment) {;
-               print "  $line\n";
+               print "$line\n";
        }
        print "---\n\n";
 
@@ -2099,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";
@@ -2110,7 +2132,7 @@ sub git_history {
                        print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                              "<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 3)) . "</i></td>\n" .
                              "<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"}, "<b>" .
-                             esc_html(chop_str($co{'title'}, 50)) . "</b>") . "$ref</td>\n" .
+                             esc_html(chop_str($co{'title'}, 50)) . "$ref</b>") . "</td>\n" .
                              "<td class=\"link\">" .
                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
                              " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$commit")}, "commitdiff") .
@@ -2326,6 +2348,10 @@ sub git_shortlog {
        my $alternate = 0;
        for (my $i = ($page * 100); $i <= $#revlist; $i++) {
                my $commit = $revlist[$i];
+               my $ref = "";
+               if (defined $refs->{$commit}) {
+                       $ref = " <span class=\"tag\">" . esc_html($refs->{$commit}) . "</span>";
+               }
                my %co = git_read_commit($commit);
                my %ad = date_str($co{'author_epoch'});
                if ($alternate) {
@@ -2339,13 +2365,10 @@ sub git_shortlog {
                      "<td>";
                if (length($co{'title_short'}) < length($co{'title'})) {
                        print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list", -title => "$co{'title'}"},
-                             "<b>" . esc_html($co{'title_short'}) . "</b>");
+                             "<b>" . esc_html($co{'title_short'}) . "$ref</b>");
                } else {
                        print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"},
-                             "<b>" . esc_html($co{'title_short'}) . "</b>");
-               }
-               if (defined $refs->{$commit}) {
-                       print " <span class=\"tag\">$refs->{$commit}</span>";
+                             "<b>" . esc_html($co{'title_short'}) . "$ref</b>");
                }
                print "</td>\n" .
                      "<td class=\"link\">" .