author | Lars Hjemli <hjemli@gmail.com> | 2007-10-25 08:13:25 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 07:34:15 (UTC) |
commit | 0c1ebce2042e69569d99551d7749b97b4e579609 (patch) (side-by-side diff) | |
tree | a0bcb407541d4c11017d78380866600096d39c22 /ui-summary.c | |
parent | e397ff7024293223f48f235fcf072fc526cae7af (diff) | |
download | cgit-0c1ebce2042e69569d99551d7749b97b4e579609.zip cgit-0c1ebce2042e69569d99551d7749b97b4e579609.tar.gz cgit-0c1ebce2042e69569d99551d7749b97b4e579609.tar.bz2 |
Use reflist to print branch info
This updates ui-summary.c to use a reflist instead of for_each_branch_ref(),
as a step towards more flexible branch handling (filtering/sorting).
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-summary.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/ui-summary.c b/ui-summary.c index de8a180..1e895a6 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -12,4 +12,3 @@ 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) { @@ -17,8 +16,5 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, 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 @@ -29,3 +25,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, 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>"); @@ -35,3 +31,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, 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"); @@ -40,9 +36,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, html("<tr><td>"); - html_txt(buf); + html_txt(name); 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"); } - free(ref); - return 0; } @@ -146,2 +140,5 @@ static void cgit_print_branches() { + struct reflist list; + int i; + html("<tr class='nohover'><th class='left'>Branch</th>" @@ -150,3 +147,8 @@ static void cgit_print_branches() "<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]); } |