Add support for config param summary-tags

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index de8a1808cf8a3f6e498b3ad8e06148768bdb4bb7..3d5eda84f1261841606fe12f1430495c77f31b55 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -10,41 +10,52 @@
 
 static int header;
 
 
 static int header;
 

-static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
-                               int flags, void *cb_data)
+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;
        struct commitinfo *info;
 {
        struct commit *commit;
        struct commitinfo *info;

-       char buf[256];
-       char *ref;
+       char *name = (char *)ref->refname;

 
 

-       ref = xstrdup(refname);
-       strncpy(buf, refname, sizeof(buf));
-       commit = lookup_commit(sha1);
+       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>");
        // 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(ref, NULL, NULL, ref, NULL, NULL, 0);
+               cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0);

                html("</td><td>");
                cgit_print_age(commit->date, -1, NULL);
                html("</td><td>");
                html_txt(info->author);
                html("</td><td>");
                html("</td><td>");
                cgit_print_age(commit->date, -1, NULL);
                html("</td><td>");
                html_txt(info->author);
                html("</td><td>");

-               cgit_commit_link(info->subject, NULL, NULL, ref, NULL);
+               cgit_commit_link(info->subject, NULL, NULL, name, NULL);

                html("</td></tr>\n");
                cgit_free_commitinfo(info);
        } else {
                html("<tr><td>");
                html("</td></tr>\n");
                cgit_free_commitinfo(info);
        } else {
                html("<tr><td>");

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

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

-               htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
+               htmlf("*** bad ref %s ***", sha1_to_hex(ref->object->sha1));

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

-       free(ref);
-       return 0;

 }
 
 static void print_tag_header()
 }
 
 static void print_tag_header()


@@ -56,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)


@@ -93,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;


@@ -144,17 +147,40 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
 
 static void cgit_print_branches()
 {
 
 static void cgit_print_branches()
 {

+       struct reflist list;
+       int i;
+

        html("<tr class='nohover'><th class='left'>Branch</th>"
             "<th class='left'>Idle</th>"
             "<th class='left'>Author</th>"
             "<th class='left'>Head commit</th></tr>\n");
        html("<tr class='nohover'><th class='left'>Branch</th>"
             "<th class='left'>Idle</th>"
             "<th class='left'>Author</th>"
             "<th class='left'>Head commit</th></tr>\n");

-       for_each_branch_ref(cgit_print_branch_cb, NULL);
+
+       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]);

 }
 
 }
 

-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()


@@ -184,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>");
 }