Diffstat (limited to 'ui-refs.c')
| -rw-r--r-- | ui-refs.c | 88 |
1 files changed, 62 insertions, 26 deletions
@@ -6,17 +6,23 @@ * (see COPYING for full license text) */ -#define USE_THE_REPOSITORY_VARIABLE - #include "cgit.h" #include "ui-refs.h" #include "html.h" #include "ui-shared.h" -static inline int cmp_age(int age1, int age2) +static int cmp_age(int age1, int age2) { - /* age1 and age2 are assumed to be non-negative */ - return age2 - age1; + 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) @@ -65,17 +71,17 @@ static int print_branch(struct refinfo *ref) return 1; html("<tr><td>"); cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL, - ctx.qry.showmsg, 0); + ctx.qry.showmsg); html("</td><td>"); if (ref->object->type == OBJ_COMMIT) { - cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL); + cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0); html("</td><td>"); cgit_open_filter(ctx.repo->email_filter, info->author_email, "refs"); html_txt(info->author); cgit_close_filter(ctx.repo->email_filter); html("</td><td colspan='2'>"); - cgit_print_age(info->committer_date, info->committer_tz, -1); + cgit_print_age(info->commit->date, -1, NULL); } else { html("</td><td></td><td>"); cgit_object_link(ref->object); @@ -84,7 +90,7 @@ static int print_branch(struct refinfo *ref) return 0; } -static void print_tag_header(void) +static void print_tag_header() { html("<tr class='nohover'><th class='left'>Tag</th>" "<th class='left'>Download</th>" @@ -92,6 +98,40 @@ static void print_tag_header(void) "<th class='left' colspan='2'>Age</th></tr>\n"); } +static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) +{ + const struct cgit_snapshot_format* f; + struct strbuf filename = STRBUF_INIT; + const char *basename; + int free_ref = 0; + + if (!ref || strlen(ref) < 2) + return; + + basename = cgit_repobasename(repo->url); + if (prefixcmp(ref, basename) != 0) { + if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) + ref++; + if (isdigit(ref[0])) { + ref = fmtalloc("%s-%s", basename, ref); + free_ref = 1; + } + } + + for (f = cgit_snapshot_formats; f->suffix; f++) { + if (!(repo->snapshots & f->bit)) + continue; + strbuf_reset(&filename); + strbuf_addf(&filename, "%s%s", ref, f->suffix); + cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf); + html(" "); + } + + if (free_ref) + free((char *)ref); + strbuf_release(&filename); +} + static int print_tag(struct refinfo *ref) { struct tag *tag = NULL; @@ -103,15 +143,15 @@ static int print_tag(struct refinfo *ref) tag = (struct tag *)obj; obj = tag->tagged; info = ref->tag; - if (!info) + if (!tag || !info) return 1; } html("<tr><td>"); - cgit_tag_link(name, NULL, NULL, name); + cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); html("</td><td>"); if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT)) - cgit_print_snapshot_links(ctx.repo, name, " "); + print_tag_downloads(ctx.repo, name); else cgit_object_link(obj); html("</td><td>"); @@ -129,16 +169,16 @@ static int print_tag(struct refinfo *ref) html("</td><td colspan='2'>"); if (info) { if (info->tagger_date > 0) - cgit_print_age(info->tagger_date, info->tagger_tz, -1); + cgit_print_age(info->tagger_date, -1, NULL); } else if (ref->object->type == OBJ_COMMIT) { - cgit_print_age(ref->commit->commit->date, 0, -1); + cgit_print_age(ref->commit->commit->date, -1, NULL); } html("</td></tr>\n"); return 0; } -static void print_refs_link(const char *path) +static void print_refs_link(char *path) { html("<tr class='nohover'><td colspan='5'>"); cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); @@ -157,11 +197,9 @@ void cgit_print_branches(int maxcount) list.refs = NULL; list.alloc = list.count = 0; - refs_for_each_branch_ref(get_main_ref_store(the_repository), - cgit_refs_cb, &list); + for_each_branch_ref(cgit_refs_cb, &list); if (ctx.repo->enable_remote_branches) - refs_for_each_remote_ref(get_main_ref_store(the_repository), - cgit_refs_cb, &list); + for_each_remote_ref(cgit_refs_cb, &list); if (maxcount == 0 || maxcount > list.count) maxcount = list.count; @@ -186,8 +224,7 @@ void cgit_print_tags(int maxcount) list.refs = NULL; list.alloc = list.count = 0; - refs_for_each_tag_ref(get_main_ref_store(the_repository), - cgit_refs_cb, &list); + for_each_tag_ref(cgit_refs_cb, &list); if (list.count == 0) return; qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); @@ -205,14 +242,14 @@ void cgit_print_tags(int maxcount) cgit_free_reflist_inner(&list); } -void cgit_print_refs(void) +void cgit_print_refs() { - cgit_print_layout_start(); + html("<table class='list nowrap'>"); - if (ctx.qry.path && starts_with(ctx.qry.path, "heads")) + if (ctx.qry.path && !prefixcmp(ctx.qry.path, "heads")) cgit_print_branches(0); - else if (ctx.qry.path && starts_with(ctx.qry.path, "tags")) + else if (ctx.qry.path && !prefixcmp(ctx.qry.path, "tags")) cgit_print_tags(0); else { cgit_print_branches(0); @@ -220,5 +257,4 @@ void cgit_print_refs(void) cgit_print_tags(0); } html("</table>"); - cgit_print_layout_end(); } |