Show tag heading even if first tag is of the lightweight kind

The tag printing code waited for valid tags before printing the
table heading, but forgot to count unannotated tags. This fixes it.

Noticed by Kristian Høgsberg <krh@bitplanet.net>

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 19 insertions, 13 deletions

diff --git a/ui-summary.c b/ui-summary.c
index f6120f9..3410e1a 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,197 +1,203 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
-static int items;
+static int header;
 
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                                 int flags, void *cb_data)
 {
         struct commit *commit;
         struct commitinfo *info;
         char buf[256], *url;
 
         strncpy(buf, refname, sizeof(buf));
         commit = lookup_commit(sha1);
         if (commit && !parse_commit(commit)){
                 info = cgit_parse_commit(commit);
                 html("<tr><td>");
                 url = cgit_pageurl(cgit_query_repo, "log",
                                    fmt("h=%s", refname));
                 html_link_open(url, NULL, NULL);
                 html_txt(buf);
                 html_link_close();
                 html("</td><td>");
                 cgit_print_date(commit->date);
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td><td>");
                 url = cgit_pageurl(cgit_query_repo, "commit",
                                    fmt("id=%s", sha1_to_hex(sha1)));
                 html_link_open(url, NULL, NULL);
                 html_ntxt(cgit_max_msg_len, info->subject);
                 html_link_close();
                 html("</td></tr>\n");
                 cgit_free_commitinfo(info);
         } else {
                 html("<tr><td>");
                 html_txt(buf);
                 html("</td><td colspan='3'>");
                 htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 
 static void cgit_print_object_ref(struct object *obj)
 {
         char *page, *url;
 
         if (obj->type == OBJ_COMMIT)
                 page = "commit";
         else if (obj->type == OBJ_TREE)
                 page = "tree";
         else
                 page = "view";
 
         url = cgit_pageurl(cgit_query_repo, page,
                            fmt("id=%s", sha1_to_hex(obj->sha1)));
         html_link_open(url, NULL, NULL);
         htmlf("%s %s", typename(obj->type),
               sha1_to_hex(obj->sha1));
         html_link_close();
 }
 
+static void print_tag_header()
+{
+        html("<tr class='nohover'><th class='left'>Tag</th>"
+             "<th class='left'>Created</th>"
+             "<th class='left'>Author</th>"
+             "<th class='left'>Reference</th></tr>\n");
+        header = 1;
+}
+
 static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                                 int flags, void *cb_data)
 {
         struct tag *tag;
         struct taginfo *info;
         struct object *obj;
         char buf[256], *url;
 
         strncpy(buf, refname, sizeof(buf));
         obj = parse_object(sha1);
         if (!obj)
                 return 1;
         if (obj->type == OBJ_TAG) {
                 tag = lookup_tag(sha1);
                 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                         return 2;
-                if (!items) {
-                        html("<tr class='nohover'><th class='left'>Tag</th>"
-                             "<th class='left'>Created</th>"
-                             "<th class='left'>Author</th>"
-                             "<th class='left'>Reference</th></tr>\n");
-                }
-                items++;
+                if (!header)
+                        print_tag_header();
                 html("<tr><td>");
                 url = cgit_pageurl(cgit_query_repo, "view",
                                    fmt("id=%s", sha1_to_hex(sha1)));
                 html_link_open(url, NULL, NULL);
                 html_txt(buf);
                 html_link_close();
                 html("</td><td>");
                 if (info->tagger_date > 0)
                         cgit_print_date(info->tagger_date);
                 html("</td><td>");
                 if (info->tagger)
                         html(info->tagger);
                 html("</td><td>");
                 cgit_print_object_ref(tag->tagged);
                 html("</td></tr>\n");
         } else {
+                if (!header)
+                        print_tag_header();
                 html("<tr><td>");
                 html_txt(buf);
                 html("</td><td colspan='2'/><td>");
                 cgit_print_object_ref(obj);
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
                                  int flags, void *cb_data)
 {
         struct tag *tag;
         struct taginfo *info;
         struct object *obj;
         char buf[256], *url;
 
         if (prefixcmp(refname, "refs/archives"))
                 return 0;
         strncpy(buf, refname+14, sizeof(buf));
         obj = parse_object(sha1);
         if (!obj)
                 return 1;
         if (obj->type == OBJ_TAG) {
                 tag = lookup_tag(sha1);
                 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                         return 0;
                 hashcpy(sha1, tag->tagged->sha1);
         } else if (obj->type != OBJ_BLOB) {
                 return 0;
         }
-        if (!items) {
+        if (!header) {
                 html("<table>");
                 html("<tr><th>Downloads</th></tr>");
+                header = 1;
         }
-        items++;
         html("<tr><td>");
         url = cgit_pageurl(cgit_query_repo, "blob",
                            fmt("id=%s&path=%s", sha1_to_hex(sha1),
                                buf));
         html_link_open(url, NULL, NULL);
         html_txt(buf);
         html_link_close();
         html("</td><tr>");
         return 0;
 }
 
 static void cgit_print_branches()
 {
         html("<tr class='nohover'><th class='left'>Branch</th>"
              "<th class='left'>Updated</th>"
              "<th class='left'>Author</th>"
              "<th class='left'>Head commit</th></tr>\n");
         for_each_branch_ref(cgit_print_branch_cb, NULL);
 }
 
 static void cgit_print_tags()
 {
-        items = 0;
+        header = 0;
         for_each_tag_ref(cgit_print_tag_cb, NULL);
 }
 
 static void cgit_print_archives()
 {
-        items = 0;
+        header = 0;
         for_each_ref(cgit_print_archive_cb, NULL);
-        if (items)
+        if (header)
                 html("</table>");
 }
 
 void cgit_print_summary()
 {
         html("<table class='list nowrap'>");
         html("<tr class='nohover'><td id='summary' colspan='3'>");
         html("<h2>");
         html_txt(cgit_repo->name);
         html(" - ");
         html_txt(cgit_repo->desc);
         html("</h2>");
         html("</td><td id='archivelist'>");
         cgit_print_archives();
         html("</td></tr>");
         cgit_print_branches();
         html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
         cgit_print_tags();
         html("</table>");
 }