Make print_branch() handle refs not pointing at commits

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 05170cc9fd50e51ced8d74a03193019a0b44ba98..ba90510f0289d11dcfa9263cf86a03ae5c6a0bb3 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -24,6 +24,22 @@ static int cmp_age(int age1, int age2)
        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;
@@ -32,35 +48,29 @@ static int cmp_tag_age(const void *a, const void *b)
        return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
 }
 
-static void cgit_print_branch(struct refinfo *ref)
+static int print_branch(struct refinfo *ref)
 {
-       struct commit *commit;
-       struct commitinfo *info;
+       struct commitinfo *info = ref->commit;
        char *name = (char *)ref->refname;
 
-       commit = lookup_commit(ref->object->sha1);
-       // object is not really parsed at this point, because of some fallout
-       // from previous calls to git functions in cgit_print_log()
-       commit->object.parsed = 0;
-       if (commit && !parse_commit(commit)){
-               info = cgit_parse_commit(commit);
-               html("<tr><td>");
-               cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0);
-               html("</td><td>");
-               cgit_print_age(commit->date, -1, NULL);
+       if (!info)
+               return 1;
+       html("<tr><td>");
+       cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0);
+       html("</td><td>");
+
+       if (ref->object->type == OBJ_COMMIT) {
+               cgit_print_age(info->commit->date, -1, NULL);
                html("</td><td>");
                html_txt(info->author);
                html("</td><td>");
                cgit_commit_link(info->subject, NULL, NULL, name, NULL);
-               html("</td></tr>\n");
-               cgit_free_commitinfo(info);
        } else {
-               html("<tr><td>");
-               html_txt(name);
-               html("</td><td colspan='3'>");
-               htmlf("*** bad ref %s ***", sha1_to_hex(ref->object->sha1));
-               html("</td></tr>\n");
+               html("</td><td></td><td>");
+               cgit_object_link(ref->object);
        }
+       html("</td></tr>\n");
+       return 0;
 }
 
 static void print_tag_header()
@@ -79,9 +89,10 @@ static int print_tag(struct refinfo *ref)
        char *url, *name = (char *)ref->refname;
 
        if (ref->object->type == OBJ_TAG) {
-               tag = lookup_tag(ref->object->sha1);
-               if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
-                       return 2;
+               tag = (struct tag *)ref->object;
+               info = ref->tag;
+               if (!tag || !info)
+                       return 1;
                html("<tr><td>");
                url = cgit_pageurl(cgit_query_repo, "tag",
                                   fmt("id=%s", name));
@@ -150,7 +161,14 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
-static void cgit_print_branches()
+static void print_refs_link(char *path)
+{
+       html("<tr class='nohover'><td colspan='4'>");
+       cgit_refs_link("[...]", NULL, NULL, cgit_query_head, NULL, path);
+       html("</td></tr>");
+}
+
+void cgit_print_branches(int maxcount)
 {
        struct reflist list;
        int i;
@@ -163,11 +181,23 @@ static void cgit_print_branches()
        list.refs = NULL;
        list.alloc = list.count = 0;
        for_each_branch_ref(cgit_refs_cb, &list);
-       for(i=0; i<list.count; i++)
-               cgit_print_branch(list.refs[i]);
+
+       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");
 }
 
-static void cgit_print_tags(int maxcount)
+void cgit_print_tags(int maxcount)
 {
        struct reflist list;
        int i;
@@ -186,6 +216,9 @@ static void cgit_print_tags(int maxcount)
        print_tag_header();
        for(i=0; i<maxcount; i++)
                print_tag(list.refs[i]);
+
+       if (maxcount < list.count)
+               print_refs_link("tags");
 }
 
 static void cgit_print_archives()
@@ -209,11 +242,11 @@ void cgit_print_summary()
                html_include(cgit_repo->readme);
        html("</div>");
        if (cgit_summary_log > 0)
-               cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0);
+               cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, NULL, 0);
        html("<table class='list nowrap'>");
        if (cgit_summary_log > 0)
                html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
-       cgit_print_branches();
+       cgit_print_branches(cgit_summary_branches);
        html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
        cgit_print_tags(cgit_summary_tags);
        html("</table>");