Add support for config param summary-tags

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 1e895a6c5c3818230d7da6ba1ab8adf47382a6d9..3d5eda84f1261841606fe12f1430495c77f31b55 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -10,6 +10,23 @@
 
 static int header;
 
 
 static int header;
 

+static int cmp_tag_age(void *a, void *b)
+{
+       struct refinfo *r1 = *(struct refinfo **)a;
+       struct refinfo *r2 = *(struct refinfo **)b;
+
+       if (r1->tag->tagger_date != 0 && r2->tag->tagger_date != 0)
+               return r2->tag->tagger_date - r1->tag->tagger_date;
+
+       if (r1->tag->tagger_date == 0 && r2->tag->tagger_date == 0)
+               return 0;
+
+       if (r1 == 0)
+               return +1;
+
+       return -1;
+}
+

 static void cgit_print_branch(struct refinfo *ref)
 {
        struct commit *commit;
 static void cgit_print_branch(struct refinfo *ref)
 {
        struct commit *commit;


@@ -50,29 +67,21 @@ static void print_tag_header()
        header = 1;
 }
 
        header = 1;
 }
 

-static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
-                               int flags, void *cb_data)
+static int print_tag(struct refinfo *ref)

 {
        struct tag *tag;
        struct taginfo *info;
 {
        struct tag *tag;
        struct taginfo *info;

-       struct object *obj;
-       char buf[256], *url;
+       char *url, *name = (char *)ref->refname;

 
 

-       strncpy(buf, refname, sizeof(buf));
-       obj = parse_object(sha1);
-       if (!obj)
-               return 1;
-       if (obj->type == OBJ_TAG) {
-               tag = lookup_tag(sha1);
+       if (ref->object->type == OBJ_TAG) {
+               tag = lookup_tag(ref->object->sha1);

                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 2;
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 2;

-               if (!header)
-                       print_tag_header();

                html("<tr><td>");
                url = cgit_pageurl(cgit_query_repo, "tag",
                html("<tr><td>");
                url = cgit_pageurl(cgit_query_repo, "tag",

-                                  fmt("id=%s", refname));
+                                  fmt("id=%s", name));

                html_link_open(url, NULL, NULL);
                html_link_open(url, NULL, NULL);

-               html_txt(buf);
+               html_txt(name);

                html_link_close();
                html("</td><td>");
                if (info->tagger_date > 0)
                html_link_close();
                html("</td><td>");
                if (info->tagger_date > 0)


@@ -87,9 +96,9 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                if (!header)
                        print_tag_header();
                html("<tr><td>");
                if (!header)
                        print_tag_header();
                html("<tr><td>");

-               html_txt(buf);
+               html_txt(name);

                html("</td><td colspan='2'/><td>");
                html("</td><td colspan='2'/><td>");

-               cgit_object_link(obj);
+               cgit_object_link(ref->object);

                html("</td></tr>\n");
        }
        return 0;
                html("</td></tr>\n");
        }
        return 0;


@@ -153,10 +162,25 @@ static void cgit_print_branches()
                cgit_print_branch(list.refs[i]);
 }
 
                cgit_print_branch(list.refs[i]);
 }
 

-static void cgit_print_tags()
+static void cgit_print_tags(int maxcount)

 {
 {

+       struct reflist list;
+       int i;
+

        header = 0;
        header = 0;

-       for_each_tag_ref(cgit_print_tag_cb, NULL);
+       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]);

 }
 
 static void cgit_print_archives()
 }
 
 static void cgit_print_archives()


@@ -186,6 +210,6 @@ void cgit_print_summary()
                html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
        cgit_print_branches();
        html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
                html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
        cgit_print_branches();
        html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");

-       cgit_print_tags();
+       cgit_print_tags(cgit_summary_tags);

        html("</table>");
 }
        html("</table>");
 }