ui-refs.c: improve handling of lightweight tags

When a lightweight tag is referencing a commit object, cgit now uses
the commit date when comparing tag age. Also, the commitdate and author
info is printed in the refs view, making lightweight tags appear similar
to annotated tags.

Signed-off-by: Stefan Bühler <lighttpd@stbuehler.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 18 insertions, 1 deletions

diff --git a/ui-refs.c b/ui-refs.c
index 25da00a..d3b4f6e 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -1,228 +1,245 @@
 /* ui-refs.c: browse symbolic refs
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 static int header;
 
 static int cmp_age(int age1, int age2)
 {
         if (age1 != 0 && age2 != 0)
                 return age2 - age1;
 
         if (age1 == 0 && age2 == 0)
                 return 0;
 
         if (age1 == 0)
                 return +1;
 
         return -1;
 }
 
 static int cmp_ref_name(const void *a, const void *b)
 {
         struct refinfo *r1 = *(struct refinfo **)a;
         struct refinfo *r2 = *(struct refinfo **)b;
 
         return strcmp(r1->refname, r2->refname);
 }
 
 static int cmp_branch_age(const void *a, const void *b)
 {
         struct refinfo *r1 = *(struct refinfo **)a;
         struct refinfo *r2 = *(struct refinfo **)b;
 
         return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
 }
 
 static int cmp_tag_age(const void *a, const void *b)
 {
         struct refinfo *r1 = *(struct refinfo **)a;
         struct refinfo *r2 = *(struct refinfo **)b;
+        int r1date, r2date;
 
-        return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
+        if (r1->object->type != OBJ_COMMIT)
+                r1date = r1->tag->tagger_date;
+        else
+                r1date = r1->commit->committer_date;
+
+        if (r2->object->type != OBJ_COMMIT)
+                r2date = r2->tag->tagger_date;
+        else
+                r2date = r2->commit->committer_date;
+
+        return cmp_age(r1date, r2date);
 }
 
 static int print_branch(struct refinfo *ref)
 {
         struct commitinfo *info = ref->commit;
         char *name = (char *)ref->refname;
 
         if (!info)
                 return 1;
         html("<tr><td>");
         cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
                       ctx.qry.showmsg);
         html("</td><td>");
 
         if (ref->object->type == OBJ_COMMIT) {
                 cgit_commit_link(info->subject, NULL, NULL, name, NULL);
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td><td colspan='2'>");
                 cgit_print_age(info->commit->date, -1, NULL);
         } else {
                 html("</td><td></td><td>");
                 cgit_object_link(ref->object);
         }
         html("</td></tr>\n");
         return 0;
 }
 
 static void print_tag_header()
 {
         html("<tr class='nohover'><th class='left'>Tag</th>"
              "<th class='left'>Download</th>"
              "<th class='left'>Author</th>"
              "<th class='left' colspan='2'>Age</th></tr>\n");
         header = 1;
 }
 
 static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
 {
         const struct cgit_snapshot_format* f;
             char *filename;
         const char *basename;
 
         if (!ref || strlen(ref) < 2)
                 return;
 
         basename = cgit_repobasename(repo->url);
         if (prefixcmp(ref, basename) != 0) {
                 if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
                         ref++;
                 if (isdigit(ref[0]))
                         ref = xstrdup(fmt("%s-%s", basename, ref));
         }
 
         for (f = cgit_snapshot_formats; f->suffix; f++) {
                 if (!(repo->snapshots & f->bit))
                         continue;
                 filename = fmt("%s%s", ref, f->suffix);
                 cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                 html("&nbsp;&nbsp;");
         }
 }
 static int print_tag(struct refinfo *ref)
 {
         struct tag *tag;
         struct taginfo *info;
         char *name = (char *)ref->refname;
 
         if (ref->object->type == OBJ_TAG) {
                 tag = (struct tag *)ref->object;
                 info = ref->tag;
                 if (!tag || !info)
                         return 1;
                 html("<tr><td>");
                 cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
                 html("</td><td>");
                 if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
                         print_tag_downloads(ctx.repo, name);
                 else
                         cgit_object_link(tag->tagged);
                 html("</td><td>");
                 if (info->tagger)
                         html(info->tagger);
                 html("</td><td colspan='2'>");
                 if (info->tagger_date > 0)
                         cgit_print_age(info->tagger_date, -1, NULL);
                 html("</td></tr>\n");
         } else {
                 if (!header)
                         print_tag_header();
                 html("<tr><td>");
                 cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
                 html("</td><td>");
                 if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
                         print_tag_downloads(ctx.repo, name);
                 else
                         cgit_object_link(ref->object);
+                html("</td><td>");
+                if (ref->object->type == OBJ_COMMIT)
+                        html(ref->commit->author);
+                html("</td><td colspan='2'>");
+                if (ref->object->type == OBJ_COMMIT)
+                        cgit_print_age(ref->commit->commit->date, -1, NULL);
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 static void print_refs_link(char *path)
 {
         html("<tr class='nohover'><td colspan='4'>");
         cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
         html("</td></tr>");
 }
 
 void cgit_print_branches(int maxcount)
 {
         struct reflist list;
         int i;
 
         html("<tr class='nohover'><th class='left'>Branch</th>"
              "<th class='left'>Commit message</th>"
              "<th class='left'>Author</th>"
              "<th class='left' colspan='2'>Age</th></tr>\n");
 
         list.refs = NULL;
         list.alloc = list.count = 0;
         for_each_branch_ref(cgit_refs_cb, &list);
 
         if (maxcount == 0 || maxcount > list.count)
                 maxcount = list.count;
 
         if (maxcount < list.count) {
                 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
                 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
         }
 
         for(i=0; i<maxcount; i++)
                 print_branch(list.refs[i]);
 
         if (maxcount < list.count)
                 print_refs_link("heads");
 }
 
 void cgit_print_tags(int maxcount)
 {
         struct reflist list;
         int i;
 
         header = 0;
         list.refs = NULL;
         list.alloc = list.count = 0;
         for_each_tag_ref(cgit_refs_cb, &list);
         if (list.count == 0)
                 return;
         qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
         if (!maxcount)
                 maxcount = list.count;
         else if (maxcount > list.count)
                 maxcount = list.count;
         print_tag_header();
         for(i=0; i<maxcount; i++)
                 print_tag(list.refs[i]);
 
         if (maxcount < list.count)
                 print_refs_link("tags");
 }
 
 void cgit_print_refs()
 {
 
         html("<table class='list nowrap'>");
 
         if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5))
                 cgit_print_branches(0);
         else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4))
                 cgit_print_tags(0);
         else {
                 cgit_print_branches(0);
                 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
                 cgit_print_tags(0);
         }
         html("</table>");
 }