X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/763a6a09deec7290365a0072d25630daa7b417e2..b4d4a25aa481aa3ac8ad69df4dfa53eaa5de6173:/ui-summary.c?ds=sidebyside diff --git a/ui-summary.c b/ui-summary.c index df79d01..178e959 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -48,35 +48,23 @@ static int cmp_tag_age(const void *a, const void *b) 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; - 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(""); - cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0); - html(""); - cgit_print_age(commit->date, -1, NULL); - html(""); - html_txt(info->author); - html(""); - cgit_commit_link(info->subject, NULL, NULL, name, NULL); - html("\n"); - cgit_free_commitinfo(info); - } else { - html(""); - html_txt(name); - html(""); - htmlf("*** bad ref %s ***", sha1_to_hex(ref->object->sha1)); - html("\n"); - } + if (!info) + return 1; + html(""); + cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0); + html(""); + cgit_print_age(info->commit->date, -1, NULL); + html(""); + html_txt(info->author); + html(""); + cgit_commit_link(info->subject, NULL, NULL, name, NULL); + html("\n"); + return 0; } static void print_tag_header() @@ -95,9 +83,10 @@ static int print_tag(struct refinfo *ref) 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(""); url = cgit_pageurl(cgit_query_repo, "tag", fmt("id=%s", name)); @@ -166,7 +155,14 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, return 0; } -static void cgit_print_branches(int maxcount) +static void print_refs_link(char *path) +{ + html(""); + cgit_refs_link("[...]", NULL, NULL, cgit_query_head, NULL, path); + html(""); +} + +void cgit_print_branches(int maxcount) { struct reflist list; int i; @@ -189,10 +185,13 @@ static void cgit_print_branches(int maxcount) } for(i=0; i