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 57997739e37bd834ccab72bae14f4f4916ead53f..ba90510f0289d11dcfa9263cf86a03ae5c6a0bb3 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -10,67 +10,67 @@
 
 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_age(int age1, int age2)

 {
 {

-       struct commit *commit;
-       struct commitinfo *info;
-       char buf[256], *url;
+       if (age1 != 0 && age2 != 0)
+               return age2 - age1;

 
 

-       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_age(commit->date, -1, NULL);
-               html("</td><td>");
-               html_txt(info->author);
-               html("</td><td>");
-               url = cgit_pageurl(cgit_query_repo, "commit",
-                                  fmt("h=%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;
+       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;

 
 

-static void cgit_print_object_ref(struct object *obj)
+       return strcmp(r1->refname, r2->refname);
+}
+
+static int cmp_branch_age(const void *a, const void *b)

 {
 {

-       char *page, *arg, *url;
-
-       if (obj->type == OBJ_COMMIT) {
-               page = "commit";
-               arg = "h";
-       } else if (obj->type == OBJ_TREE) {
-               page = "tree";
-               arg = "id";
+       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;
+
+       return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
+}
+
+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);
+       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);

        } else {
        } else {

-               page = "view";
-               arg = "id";
+               html("</td><td></td><td>");
+               cgit_object_link(ref->object);

        }
        }

-
-       url = cgit_pageurl(cgit_query_repo, page,
-                          fmt("%s=%s", arg, 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();
+       html("</td></tr>\n");
+       return 0;

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


@@ -82,29 +82,22 @@ 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 (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
-                       return 2;
-               if (!header)
-                       print_tag_header();
+       if (ref->object->type == OBJ_TAG) {
+               tag = (struct tag *)ref->object;
+               info = ref->tag;
+               if (!tag || !info)
+                       return 1;

                html("<tr><td>");
                html("<tr><td>");

-               url = cgit_pageurl(cgit_query_repo, "view",
-                                  fmt("id=%s", sha1_to_hex(sha1)));
+               url = cgit_pageurl(cgit_query_repo, "tag",
+                                  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)


@@ -113,15 +106,15 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                if (info->tagger)
                        html(info->tagger);
                html("</td><td>");
                if (info->tagger)
                        html(info->tagger);
                html("</td><td>");

-               cgit_print_object_ref(tag->tagged);
+               cgit_object_link(tag->tagged);

                html("</td></tr>\n");
        } else {
                if (!header)
                        print_tag_header();
                html("<tr><td>");
                html("</td></tr>\n");
        } else {
                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_print_object_ref(obj);
+               cgit_object_link(ref->object);

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


@@ -153,34 +146,79 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
                hashcpy(fileid, sha1);
        }
        if (!header) {
                hashcpy(fileid, sha1);
        }
        if (!header) {

-               html("<table>");
+               html("<table id='downloads'>");

                html("<tr><th>Downloads</th></tr>");
                header = 1;
        }
        html("<tr><td>");
        url = cgit_pageurl(cgit_query_repo, "blob",
                html("<tr><th>Downloads</th></tr>");
                header = 1;
        }
        html("<tr><td>");
        url = cgit_pageurl(cgit_query_repo, "blob",

-                          fmt("id=%s&path=%s", sha1_to_hex(fileid),
+                          fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),

                               buf));
        html_link_open(url, NULL, NULL);
        html_txt(buf);
        html_link_close();
                               buf));
        html_link_open(url, NULL, NULL);
        html_txt(buf);
        html_link_close();

-       html("</td><tr>");
+       html("</td></tr>");

        return 0;
 }
 
        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;
+

        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);
+
+       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()
+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]);
+
+       if (maxcount < list.count)
+               print_refs_link("tags");

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


@@ -193,18 +231,23 @@ static void cgit_print_archives()
 
 void cgit_print_summary()
 {
 
 void cgit_print_summary()
 {

-       html("<table class='list nowrap'>");
-       html("<tr class='nohover'><td id='summary' colspan='3'>");
+       html("<div id='summary'>");
+       cgit_print_archives();

        html("<h2>");
        html_txt(cgit_repo->name);
        html(" - ");
        html_txt(cgit_repo->desc);
        html("</h2>");
        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();
+       if (cgit_repo->readme)
+               html_include(cgit_repo->readme);
+       html("</div>");
+       if (cgit_summary_log > 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_summary_branches);

        html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
        html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");

-       cgit_print_tags();
+       cgit_print_tags(cgit_summary_tags);

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