Use reflist to print branch info

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index fdee66b8e6d6af30e0e1d12763e55ae6f8d5abdd..1e895a6c5c3818230d7da6ba1ab8adf47382a6d9 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -10,66 +10,35 @@
 
 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 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 cgit_print_object_ref(struct object *obj)
-{
-       char *page, *arg, *url;
-
-       if (obj->type == OBJ_COMMIT) {
-                cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
-                                cgit_query_head, sha1_to_hex(obj->sha1));
-               return;
-       } else if (obj->type == OBJ_TREE) {
-               page = "tree";
-               arg = "id";
-       } else {
-               page = "blob";
-               arg = "id";
-       }
-
-       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();

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


@@ -100,8 +69,8 @@ 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>");

-               url = cgit_pageurl(cgit_query_repo, "view",
-                                  fmt("id=%s", sha1_to_hex(sha1)));
+               url = cgit_pageurl(cgit_query_repo, "tag",
+                                  fmt("id=%s", refname));

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


@@ -112,7 +81,7 @@ 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)
                html("</td></tr>\n");
        } else {
                if (!header)


@@ -120,7 +89,7 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                html("<tr><td>");
                html_txt(buf);
                html("</td><td colspan='2'/><td>");
                html("<tr><td>");
                html_txt(buf);
                html("</td><td colspan='2'/><td>");

-               cgit_print_object_ref(obj);
+               cgit_object_link(obj);

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


@@ -169,11 +138,19 @@ 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()