Fix html error detected by test-suite

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 016fea2107668b507dfbfb0a3f5366c96f2dd3cb..b96414e18a826009c782794beca8897186fd07e5 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -48,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);
 }
 
        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;
 
        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, 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);
                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 {
        } 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()
 }
 
 static void print_tag_header()


@@ -95,9 +89,10 @@ static int print_tag(struct refinfo *ref)
        char *url, *name = (char *)ref->refname;
 
        if (ref->object->type == OBJ_TAG) {
        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));
                html("<tr><td>");
                url = cgit_pageurl(cgit_query_repo, "tag",
                                   fmt("id=%s", name));


@@ -125,47 +120,6 @@ static int print_tag(struct refinfo *ref)
        return 0;
 }
 
        return 0;
 }
 

-static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
-                                int flags, void *cb_data)
-{
-       struct tag *tag;
-       struct taginfo *info;
-       struct object *obj;
-       char buf[256], *url;
-       unsigned char fileid[20];
-
-       if (prefixcmp(refname, "refs/archives"))
-               return 0;
-       strncpy(buf, refname+14, 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 0;
-               hashcpy(fileid, tag->tagged->sha1);
-       } else if (obj->type != OBJ_BLOB) {
-               return 0;
-       } else {
-               hashcpy(fileid, sha1);
-       }
-       if (!header) {
-               html("<table id='downloads'>");
-               html("<tr><th>Downloads</th></tr>");
-               header = 1;
-       }
-       html("<tr><td>");
-       url = cgit_pageurl(cgit_query_repo, "blob",
-                          fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
-                              buf));
-       html_link_open(url, NULL, NULL);
-       html_txt(buf);
-       html_link_close();
-       html("</td></tr>");
-       return 0;
-}
-

 static void print_refs_link(char *path)
 {
        html("<tr class='nohover'><td colspan='4'>");
 static void print_refs_link(char *path)
 {
        html("<tr class='nohover'><td colspan='4'>");


@@ -196,7 +150,7 @@ void cgit_print_branches(int maxcount)
        }
 
        for(i=0; i<maxcount; i++)
        }
 
        for(i=0; i<maxcount; i++)

-               cgit_print_branch(list.refs[i]);
+               print_branch(list.refs[i]);

 
        if (maxcount < list.count)
                print_refs_link("heads");
 
        if (maxcount < list.count)
                print_refs_link("heads");


@@ -226,29 +180,17 @@ void cgit_print_tags(int maxcount)
                print_refs_link("tags");
 }
 
                print_refs_link("tags");
 }
 

-static void cgit_print_archives()
-{
-       header = 0;
-       for_each_ref(cgit_print_archive_cb, NULL);
-       if (header)
-               html("</table>");
-}
-

 void cgit_print_summary()
 {
 void cgit_print_summary()
 {

-       html("<div id='summary'>");
-       cgit_print_archives();
-       html("<h2>");
-       html_txt(cgit_repo->name);
-       html(" - ");
-       html_txt(cgit_repo->desc);
-       html("</h2>");
-       if (cgit_repo->readme)
+       if (cgit_repo->readme) {
+               html("<div id='summary'>");

                html_include(cgit_repo->readme);
                html_include(cgit_repo->readme);

-       html("</div>");
+               html("</div>");
+       }

        if (cgit_summary_log > 0)
        if (cgit_summary_log > 0)

-               cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0);
-       html("<table class='list nowrap'>");
+               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);
        if (cgit_summary_log > 0)
                html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
        cgit_print_branches(cgit_summary_branches);