Fix html error detected by test-suite

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 532ddbf525c9cafb55d72e223d0c0c6e31cba9f5..b96414e18a826009c782794beca8897186fd07e5 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -8,48 +8,193 @@
 
 #include "cgit.h"
 
 
 #include "cgit.h"
 

-static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
-                               int flags, void *cb_data)
+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 commit *commit;
-       char buf[256], *url;
+       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;
+
+       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, NULL, NULL);
+       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 {
+               html("</td><td></td><td>");
+               cgit_object_link(ref->object);
+       }
+       html("</td></tr>\n");
+       return 0;
+}

 
 

-       commit = lookup_commit(sha1);
-       if (commit && !parse_commit(commit)){
+static void print_tag_header()
+{
+       html("<tr class='nohover'><th class='left'>Tag</th>"
+            "<th class='left'>Age</th>"
+            "<th class='left'>Author</th>"
+            "<th class='left'>Reference</th></tr>\n");
+       header = 1;
+}
+
+static int print_tag(struct refinfo *ref)
+{
+       struct tag *tag;
+       struct taginfo *info;
+       char *url, *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>");
                html("<tr><td>");

-               url = cgit_pageurl(cgit_query_repo, "log", 
-                                  fmt("h=%s", refname));
+               url = cgit_pageurl(cgit_query_repo, "tag",
+                                  fmt("id=%s", name));

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

-               strncpy(buf, refname, sizeof(buf));
-               html_txt(buf);
+               html_txt(name);

                html_link_close();
                html("</td><td>");
                html_link_close();
                html("</td><td>");

-               pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
-                                   sizeof(buf), 0, NULL, NULL, 0);
-               html_txt(buf);
+               if (info->tagger_date > 0)
+                       cgit_print_age(info->tagger_date, -1, NULL);
+               html("</td><td>");
+               if (info->tagger)
+                       html(info->tagger);
+               html("</td><td>");
+               cgit_object_link(tag->tagged);

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

+               if (!header)
+                       print_tag_header();

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

-               html_txt(buf);
-               html("</td><td>");
-               htmlf("*** bad ref %s", sha1_to_hex(sha1));
+               html_txt(name);
+               html("</td><td colspan='2'/><td>");
+               cgit_object_link(ref->object);

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

-static void cgit_print_branches()
+static void print_refs_link(char *path)

 {
 {

-       html("<table class='list'>");
-       html("<tr><th>Branch name</th><th>Head commit</th></tr>\n");
-       for_each_branch_ref(cgit_print_branch_cb, NULL);
-       html("</table>");
+       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");
+
+       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_repo_summary()
+void cgit_print_tags(int maxcount)

 {
 {

-       html("<h2>");
-       html_txt("Repo summary page");
-       html("</h2>");
-       cgit_print_branches();
+       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_summary()
+{
+       if (cgit_repo->readme) {
+               html("<div id='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, NULL, 0);
+       html("<table summary='repository info' 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>");
+       cgit_print_tags(cgit_summary_tags);
+       html("</table>");

 }
 }