gitweb: Refactor generation of shortlog, tags and heads body
[gitweb.git] / gitweb / gitweb.cgi
index 03002f04f35dcfd615861604c6ab47444d7d3b62..c741e739d0c73f3cfd133919ec6eb7cf3f2a3839 100755 (executable)
@@ -420,6 +420,49 @@ sub git_page_nav {
              "</div>\n";
 }
 
+sub git_header_div {
+       my ($action, $title, $hash, $hash_base) = @_;
+       my $rest = '';
+
+       $rest .= ";h=$hash" if $hash;
+       $rest .= ";hb=$hash_base" if $hash_base;
+
+       print "<div class=\"header\">\n" .
+             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action$rest"),
+                      -class => "title"}, $title ? $title : $action) . "\n" .
+             "</div>\n";
+}
+
+sub git_get_paging_nav {
+       my ($action, $hash, $head, $page, $nrevs) = @_;
+       my $paging_nav;
+
+
+       if ($hash ne $head || $page) {
+               $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action")}, "HEAD");
+       } else {
+               $paging_nav .= "HEAD";
+       }
+
+       if ($page > 0) {
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page-1)),
+                                                        -accesskey => "p", -title => "Alt-p"}, "prev");
+       } else {
+               $paging_nav .= " &sdot; prev";
+       }
+
+       if ($nrevs >= (100 * ($page+1)-1)) {
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page+1)),
+                                                        -accesskey => "n", -title => "Alt-n"}, "next");
+       } else {
+               $paging_nav .= " &sdot; next";
+       }
+
+       return $paging_nav;
+}
+
 sub git_get_type {
        my $hash = shift;
 
@@ -733,6 +776,7 @@ sub chop_str {
        my $tail = $2;
        if (length($tail) > 4) {
                $tail = " ...";
+               $body =~ s/&[^;]$//; # remove chopped character entities
        }
        return "$body$tail";
 }
@@ -980,6 +1024,8 @@ sub read_info_ref {
        open my $fd, "$projectroot/$project/info/refs" or return;
        while (my $line = <$fd>) {
                chomp $line;
+               # attention: for $type == "" it saves only last path part of ref name
+               # e.g. from 'refs/heads/jn/gitweb' it would leave only 'gitweb'
                if ($line =~ m/^([0-9a-fA-F]{40})\t.*$type\/([^\^]+)/) {
                        if (defined $refs{$1}) {
                                $refs{$1} .= " / $2";
@@ -992,6 +1038,16 @@ sub read_info_ref {
        return \%refs;
 }
 
+sub git_get_referencing {
+       my ($refs, $id) = @_;
+
+       if (defined $refs->{$id}) {
+               return ' <span class="tag">' . esc_html($refs->{$id}) . '</span>';
+       } else {
+               return "";
+       }
+}
+
 sub git_read_refs {
        my $ref_dir = shift;
        my @reflist;
@@ -1046,6 +1102,10 @@ sub git_read_refs {
                        $ref_item{'refid'} = $ref_id;
                        $ref_item{'epoch'} = $co{'committer_epoch'};
                        $ref_item{'age'} = $co{'age_string'};
+               } else {
+                       $ref_item{'reftype'} = $type;
+                       $ref_item{'name'} = $ref_file;
+                       $ref_item{'refid'} = $ref_id;
                }
 
                push @reflist, \%ref_item;
@@ -1055,6 +1115,156 @@ sub git_read_refs {
        return \@reflist;
 }
 
+sub git_shortlog_body {
+       # uses global variable $project
+       my ($revlist, $from, $to, $refs, $extra) = @_;
+       $from = 0 unless defined $from;
+       $to = $#{$revlist} if (!defined $to || $#{$revlist} < $to);
+
+       print "<table class=\"shortlog\" cellspacing=\"0\">\n";
+       my $alternate = 0;
+       for (my $i = $from; $i <= $to; $i++) {
+               my $commit = $revlist->[$i];
+               #my $ref = defined $refs ? git_get_referencing($refs, $commit) : '';
+               my $ref = git_get_referencing($refs, $commit);
+               my %co = git_read_commit($commit);
+               my %ad = date_str($co{'author_epoch'});
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               # git_summary() used print "<td><i>$co{'age_string'}</i></td>\n" .
+               print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</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'}) . "$ref</b>");
+               } else {
+                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"),
+                                      -class => "list"},
+                             "<b>" . esc_html($co{'title'}) . "$ref</b>");
+               }
+               print "</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") .
+                     "</td>\n" .
+                     "</tr>\n";
+       }
+       if (defined $extra) {
+               print "<tr>\n" .
+                     "<td colspan=\"4\">$extra</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table>\n";
+}
+
+sub git_tags_body {
+       # uses global variable $project
+       my ($taglist, $from, $to, $extra) = @_;
+       $from = 0 unless defined $from;
+       $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
+
+       print "<table class=\"tags\" cellspacing=\"0\">\n";
+       my $alternate = 0;
+       for (my $i = $from; $i <= $to; $i++) {
+               my $entry = $taglist->[$i];
+               my %tag = %$entry;
+               my $comment_lines = $tag{'comment'};
+               my $comment = shift @$comment_lines;
+               my $comment_short;
+               if (defined $comment) {
+                       $comment_short = chop_str($comment, 30, 5);
+               }
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               print "<td><i>$tag{'age'}</i></td>\n" .
+                     "<td>" .
+                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}"),
+                              -class => "list"}, "<b>" . esc_html($tag{'name'}) . "</b>") .
+                     "</td>\n" .
+                     "<td>";
+               if (defined $comment) {
+                       if (length($comment_short) < length($comment)) {
+                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}"),
+                                              -class => "list", -title => $comment}, $comment_short);
+                       } else {
+                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}"),
+                                              -class => "list"}, $comment);
+                       }
+               }
+               print "</td>\n" .
+                     "<td class=\"selflink\">";
+               if ($tag{'type'} eq "tag") {
+                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag");
+               } else {
+                       print "&nbsp;";
+               }
+               print "</td>\n" .
+                     "<td class=\"link\">" . " | " .
+                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'});
+               if ($tag{'reftype'} eq "commit") {
+                       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
+                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
+               } elsif ($tag{'reftype'} eq "blob") {
+                       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$tag{'refid'}")}, "raw");
+               }
+               print "</td>\n" .
+                     "</tr>";
+       }
+       if (defined $extra) {
+               print "<tr>\n" .
+                     "<td colspan=\"5\">$extra</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table>\n";
+}
+
+sub git_heads_body {
+       # uses global variable $project
+       my ($taglist, $head, $from, $to, $extra) = @_;
+       $from = 0 unless defined $from;
+       $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
+
+       print "<table class=\"heads\" cellspacing=\"0\">\n";
+       my $alternate = 0;
+       for (my $i = $from; $i <= $to; $i++) {
+               my $entry = $taglist->[$i];
+               my %tag = %$entry;
+               my $curr = $tag{'id'} eq $head;
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               print "<td><i>$tag{'age'}</i></td>\n" .
+                     ($tag{'id'} eq $head ? "<td class=\"current_head\">" : "<td>") .
+                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}"),
+                              -class => "list"}, "<b>" . esc_html($tag{'name'}) . "</b>") .
+                     "</td>\n" .
+                     "<td class=\"link\">" .
+                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . " | " .
+                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'name'}")}, "log") .
+                     "</td>\n" .
+                     "</tr>";
+       }
+       if (defined $extra) {
+               print "<tr>\n" .
+                     "<td colspan=\"3\">$extra</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table>\n";
+}
+
 sub git_summary {
        my $descr = git_read_description($project) || "none";
        my $head = git_read_head($project);
@@ -1083,147 +1293,36 @@ sub git_summary {
        my $refs = read_info_ref();
        git_header_html();
        git_page_nav('summary','', $head);
+
        print "<div class=\"title\">&nbsp;</div>\n";
        print "<table cellspacing=\"0\">\n" .
              "<tr><td>description</td><td>" . esc_html($descr) . "</td></tr>\n" .
              "<tr><td>owner</td><td>$owner</td></tr>\n" .
              "<tr><td>last change</td><td>$cd{'rfc2822'}</td></tr>\n" .
              "</table>\n";
+
        open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_read_head($project)
                or die_error(undef, "Open git-rev-list failed.");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog"), -class => "title"}, "shortlog") .
-             "</div>\n";
-       my $i = 16;
-       print "<table cellspacing=\"0\">\n";
-       my $alternate = 0;
-       foreach my $commit (@revlist) {
-               my %co = git_read_commit($commit);
-               my %ad = date_str($co{'author_epoch'});
-               if ($alternate) {
-                       print "<tr class=\"dark\">\n";
-               } else {
-                       print "<tr class=\"light\">\n";
-               }
-               $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'}) . "$ref</b>");
-                       } else {
-                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"},
-                                     "<b>" . esc_html($co{'title'}) . "$ref</b>");
-                       }
-                       print "</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") .
-                             "</td>\n" .
-                             "</tr>";
-               } else {
-                       print "<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "...") . "</td>\n" .
-                       "</tr>";
-                       last;
-               }
-       }
-       print "</table\n>";
+       git_header_div('shortlog');
+       git_shortlog_body(\@revlist, 0, 15, $refs,
+                         $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "..."));
 
        my $taglist = git_read_refs("refs/tags");
        if (defined @$taglist) {
-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tags"), -class => "title"}, "tags") .
-                     "</div>\n";
-               my $i = 16;
-               print "<table cellspacing=\"0\">\n";
-               my $alternate = 0;
-               foreach my $entry (@$taglist) {
-                       my %tag = %$entry;
-                       my $comment_lines = $tag{'comment'};
-                       my $comment = shift @$comment_lines;
-                       if (defined($comment)) {
-                               $comment = chop_str($comment, 30, 5);
-                       }
-                       if ($alternate) {
-                               print "<tr class=\"dark\">\n";
-                       } else {
-                               print "<tr class=\"light\">\n";
-                       }
-                       $alternate ^= 1;
-                       if ($i-- > 0) {
-                               print "<td><i>$tag{'age'}</i></td>\n" .
-                                     "<td>" .
-                                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}"), -class => "list"},
-                                     "<b>" . esc_html($tag{'name'}) . "</b>") .
-                                     "</td>\n" .
-                                     "<td>";
-                               if (defined($comment)) {
-                                       print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, esc_html($comment));
-                               }
-                               print "</td>\n" .
-                                     "<td class=\"link\">";
-                               if ($tag{'type'} eq "tag") {
-                                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
-                               }
-                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'});
-                               if ($tag{'reftype'} eq "commit") {
-                                       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
-                                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
-                               }
-                               print "</td>\n" .
-                                     "</tr>";
-                       } else {
-                               print "<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tags")}, "...") . "</td>\n" .
-                               "</tr>";
-                               last;
-                       }
-               }
-               print "</table\n>";
+               git_header_div('tags');
+               git_tags_body($taglist, 0, 15,
+                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tags")}, "..."));
        }
 
        my $headlist = git_read_refs("refs/heads");
        if (defined @$headlist) {
-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=heads"), -class => "title"}, "heads") .
-                     "</div>\n";
-               my $i = 16;
-               print "<table cellspacing=\"0\">\n";
-               my $alternate = 0;
-               foreach my $entry (@$headlist) {
-                       my %tag = %$entry;
-                       if ($alternate) {
-                               print "<tr class=\"dark\">\n";
-                       } else {
-                               print "<tr class=\"light\">\n";
-                       }
-                       $alternate ^= 1;
-                       if ($i-- > 0) {
-                               print "<td><i>$tag{'age'}</i></td>\n" .
-                                     "<td>" .
-                                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}"), -class => "list"},
-                                     "<b>" . esc_html($tag{'name'}) . "</b>") .
-                                     "</td>\n" .
-                                     "<td class=\"link\">" .
-                                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
-                                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'name'}")}, "log") .
-                                     "</td>\n" .
-                                     "</tr>";
-                       } else {
-                               print "<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=heads")}, "...") . "</td>\n" .
-                               "</tr>";
-                               last;
-                       }
-               }
-               print "</table\n>";
+               git_header_div('heads');
+               git_heads_body($taglist, $head, 0, 15,
+                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=heads")}, "..."));
        }
+
        git_footer_html();
 }
 
@@ -1246,9 +1345,7 @@ sub git_tag {
        git_header_html();
        git_page_nav('','', $head,undef,$head);
        my %tag = git_read_tag($hash);
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($tag{'name'})) . "\n" .
-             "</div>\n";
+       git_header_div('commit', esc_html($tag{'name'}), $hash);
        print "<div class=\"title_text\">\n" .
              "<table cellspacing=\"0\">\n" .
              "<tr>\n" .
@@ -1296,9 +1393,7 @@ sub git_blame2 {
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
                " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
        git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-       print "<div>" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
-             "</div>\n";
+       git_header_div('commit', esc_html($co{'title'}), $hash_base);
        git_print_page_path($file_name, $ftype);
        my @rev_color = (qw(light dark));
        my $num_colors = scalar(@rev_color);
@@ -1352,9 +1447,7 @@ sub git_blame {
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
                " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
        git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-       print "<div>" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
-             "</div>\n";
+       git_header_div('commit', esc_html($co{'title'}), $hash_base);
        git_print_page_path($file_name);
        print "<div class=\"page_body\">\n";
        print <<HTML;
@@ -1430,50 +1523,12 @@ sub git_tags {
        my $head = git_read_head($project);
        git_header_html();
        git_page_nav('','', $head,undef,$head);
+       git_header_div('summary', $project);
+
        my $taglist = git_read_refs("refs/tags");
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
-             "</div>\n";
-       print "<table cellspacing=\"0\">\n";
-       my $alternate = 0;
        if (defined @$taglist) {
-               foreach my $entry (@$taglist) {
-                       my %tag = %$entry;
-                       my $comment_lines = $tag{'comment'};
-                       my $comment = shift @$comment_lines;
-                       if (defined($comment)) {
-                               $comment = chop_str($comment, 30, 5);
-                       }
-                       if ($alternate) {
-                               print "<tr class=\"dark\">\n";
-                       } else {
-                               print "<tr class=\"light\">\n";
-                       }
-                       $alternate ^= 1;
-                       print "<td><i>$tag{'age'}</i></td>\n" .
-                             "<td>" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}"), -class => "list"},
-                             "<b>" . esc_html($tag{'name'}) . "</b>") .
-                             "</td>\n" .
-                             "<td>";
-                       if (defined($comment)) {
-                               print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, $comment);
-                       }
-                       print "</td>\n" .
-                             "<td class=\"link\">";
-                       if ($tag{'type'} eq "tag") {
-                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
-                       }
-                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'});
-                       if ($tag{'reftype'} eq "commit") {
-                               print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
-                                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
-                       }
-                       print "</td>\n" .
-                             "</tr>";
-               }
+               git_tags_body($taglist);
        }
-       print "</table\n>";
        git_footer_html();
 }
 
@@ -1481,33 +1536,13 @@ sub git_heads {
        my $head = git_read_head($project);
        git_header_html();
        git_page_nav('','', $head,undef,$head);
+       git_header_div('summary', $project);
+
        my $taglist = git_read_refs("refs/heads");
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
-             "</div>\n";
-       print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        if (defined @$taglist) {
-               foreach my $entry (@$taglist) {
-                       my %tag = %$entry;
-                       if ($alternate) {
-                               print "<tr class=\"dark\">\n";
-                       } else {
-                               print "<tr class=\"light\">\n";
-                       }
-                       $alternate ^= 1;
-                       print "<td><i>$tag{'age'}</i></td>\n" .
-                             "<td>" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}"), -class => "list"}, "<b>" . esc_html($tag{'name'}) . "</b>") .
-                             "</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'name'}")}, "log") .
-                             "</td>\n" .
-                             "</tr>";
-               }
+               git_heads_body($taglist, $head);
        }
-       print "</table\n>";
        git_footer_html();
 }
 
@@ -1654,9 +1689,7 @@ sub git_blob {
                        $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash")}, "plain");
                }
                git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-               print "<div>" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
-                     "</div>\n";
+               git_header_div('commit', esc_html($co{'title'}), $hash_base);
        } else {
                print "<div class=\"page_nav\">\n" .
                      "<br/><br/></div>\n" .
@@ -1700,19 +1733,14 @@ sub git_tree {
        $/ = "\n";
 
        my $refs = read_info_ref();
-       my $ref = "";
-       if (defined $refs->{$hash_base}) {
-               $ref = " <span class=\"tag\">" . esc_html($refs->{$hash_base}) . "</span>";
-       }
+       my $ref = git_get_referencing($refs, $hash_base);
        git_header_html();
        my $base_key = "";
        my $base = "";
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                $base_key = ";hb=$hash_base";
                git_page_nav('tree','', $hash_base);
-               print "<div>\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";
+               git_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
        } else {
                print "<div class=\"page_nav\">\n";
                print "<br/><br/></div>\n";
@@ -1873,48 +1901,27 @@ sub git_log {
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
 
-       my $paging_nav = '';
-       if ($hash ne $head || $page) {
-               $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "HEAD");
-       } else {
-               $paging_nav .= "HEAD";
-       }
-       if ($page > 0) {
-               $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
-       } else {
-               $paging_nav .= " &sdot; prev";
-       }
-       if ($#revlist >= (100 * ($page+1)-1)) {
-               $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
-       } else {
-               $paging_nav .= " &sdot; next";
-       }
+       my $paging_nav = git_get_paging_nav('log', $hash, $head, $page, $#revlist);
 
        git_header_html();
        git_page_nav('log','', $hash,undef,undef, $paging_nav);
 
        if (!@revlist) {
-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
-                     "</div>\n";
                my %co = git_read_commit($hash);
+
+               git_header_div('summary', $project);
                print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";
        }
        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 $ref = git_get_referencing($refs, $commit);
                my %co = git_read_commit($commit);
                next if !%co;
                my %ad = date_str($co{'author_epoch'});
-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "title"},
-                     "<span class=\"age\">$co{'age_string'}</span>" . esc_html($co{'title'}) . $ref) . "\n";
-               print "</div>\n";
+               git_header_div('commit',
+                                                                        "<span class=\"age\">$co{'age_string'}</span>" .
+                                                                        esc_html($co{'title'}) . $ref,
+                                                                        $commit);
                print "<div class=\"title_text\">\n" .
                      "<div class=\"log_link\">\n" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
@@ -1971,28 +1978,21 @@ sub git_commit {
                $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);
+       my $ref = git_get_referencing($refs, $co{'id'});
        my $formats_nav = '';
        if (defined $file_name && defined $co{'parent'}) {
                my $parent = $co{'parent'};
                $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;hb=$parent;f=$file_name")}, "blame");
        }
+       git_header_html(undef, $expires);
        git_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
                                                         $hash, $co{'tree'}, $hash,
                                                         $formats_nav);
 
        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'}) . $ref) . "\n" .
-                     "</div>\n";
+               git_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
        } else {
-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" .
-                     "</div>\n";
+               git_header_div('tree', esc_html($co{'title'}) . $ref, $co{'tree'}, $hash);
        }
        print "<div class=\"title_text\">\n" .
              "<table cellspacing=\"0\">\n";
@@ -2158,9 +2158,7 @@ sub git_blobdiff {
                my $formats_nav =
                        $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
                git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "\n" .
-                     "</div>\n";
+               git_header_div('commit', esc_html($co{'title'}), $hash_base);
        } else {
                print "<div class=\"page_nav\">\n" .
                      "<br/><br/></div>\n" .
@@ -2204,17 +2202,12 @@ sub git_commitdiff {
                $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);
+       my $ref = git_get_referencing($refs, $co{'id'});
        my $formats_nav =
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
+       git_header_html(undef, $expires);
        git_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
-             "</div>\n";
+       git_header_div('commit', esc_html($co{'title'}) . $ref, $hash);
        print "<div class=\"page_body\">\n";
        my $comment = $co{'comment'};
        my $empty = 0;
@@ -2344,9 +2337,7 @@ sub git_history {
        my $refs = read_info_ref();
        git_header_html();
        git_page_nav('','', $hash_base,$co{'tree'},$hash_base);
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "\n" .
-             "</div>\n";
+       git_header_div('commit', esc_html($co{'title'}), $hash_base);
        if (!defined $hash && defined $file_name) {
                $hash = git_get_hash_by_path($hash_base, $file_name);
        }
@@ -2366,10 +2357,7 @@ sub git_history {
                        if (!%co) {
                                next;
                        }
-                       my $ref = "";
-                       if (defined $refs->{$commit}) {
-                               $ref = " <span class=\"tag\">" . esc_html($refs->{$commit}) . "</span>";
-                       }
+                       my $ref = git_get_referencing($refs, $commit);
                        if ($alternate) {
                                print "<tr class=\"dark\">\n";
                        } else {
@@ -2427,10 +2415,8 @@ sub git_search {
        }
        git_header_html();
        git_page_nav('','', $hash,$co{'tree'},$hash);
+       git_header_div('commit', esc_html($co{'title'}), $hash);
 
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" .
-             "</div>\n";
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        if ($commit_search) {
@@ -2553,71 +2539,20 @@ sub git_shortlog {
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
 
-       my $paging_nav = '';
-       if ($hash ne $head || $page) {
-               $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "HEAD");
-       } else {
-               $paging_nav .= "HEAD";
-       }
-       if ($page > 0) {
-               $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
-       } else {
-               $paging_nav .= " &sdot; prev";
-       }
+       my $paging_nav = git_get_paging_nav('shortlog', $hash, $head, $page, $#revlist);
+       my $next_link = '';
        if ($#revlist >= (100 * ($page+1)-1)) {
-               $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
-       } else {
-               $paging_nav .= " &sdot; next";
+               $next_link =
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page+1)),
+                                -title => "Alt-n"}, "next");
        }
 
+
        git_header_html();
        git_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);
+       git_header_div('summary', $project);
+
+       git_shortlog_body(\@revlist, ($page * 100), $#revlist, $refs, $next_link);
 
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
-             "</div>\n";
-       print "<table cellspacing=\"0\">\n";
-       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) {
-                       print "<tr class=\"dark\">\n";
-               } else {
-                       print "<tr class=\"light\">\n";
-               }
-               $alternate ^= 1;
-               print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</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'}) . "$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'}) . "$ref</b>");
-               }
-               print "</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") .
-                     "</td>\n" .
-                     "</tr>";
-       }
-       if ($#revlist >= (100 * ($page+1)-1)) {
-               print "<tr>\n" .
-                     "<td>" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -title => "Alt-n"}, "next") .
-                     "</td>\n" .
-                     "</tr>\n";
-       }
-       print "</table\n>";
        git_footer_html();
 }