X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/79c985e13c10b498c3ea62f4607c2e2a460c3b10..0899eb644fab415e9a3b304f53da9da50aaf91aa:/ui-refs.c diff --git a/ui-refs.c b/ui-refs.c index 7e58737..2ec3858 100644 --- a/ui-refs.c +++ b/ui-refs.c @@ -63,17 +63,17 @@ static int print_branch(struct refinfo *ref) return 1; html(""); cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL, - ctx.qry.showmsg); + ctx.qry.showmsg, 0); html(""); if (ref->object->type == OBJ_COMMIT) { - cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0); + cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL); html(""); cgit_open_filter(ctx.repo->email_filter, info->author_email, "refs"); html_txt(info->author); cgit_close_filter(ctx.repo->email_filter); html(""); - cgit_print_age(info->commit->date, -1, NULL); + cgit_print_age(info->committer_date, info->committer_tz, -1); } else { html(""); cgit_object_link(ref->object); @@ -82,7 +82,7 @@ static int print_branch(struct refinfo *ref) return 0; } -static void print_tag_header() +static void print_tag_header(void) { html("Tag" "Download" @@ -90,40 +90,6 @@ static void print_tag_header() "Age\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) < 1) - return; - - basename = cgit_repobasename(repo->url); - if (!starts_with(ref, basename)) { - 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; @@ -135,15 +101,15 @@ static int print_tag(struct refinfo *ref) tag = (struct tag *)obj; obj = tag->tagged; info = ref->tag; - if (!tag || !info) + if (!info) return 1; } html(""); - cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); + cgit_tag_link(name, NULL, NULL, name); html(""); if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT)) - print_tag_downloads(ctx.repo, name); + cgit_print_snapshot_links(ctx.repo, name, "  "); else cgit_object_link(obj); html(""); @@ -161,9 +127,9 @@ static int print_tag(struct refinfo *ref) html(""); if (info) { if (info->tagger_date > 0) - cgit_print_age(info->tagger_date, -1, NULL); + cgit_print_age(info->tagger_date, info->tagger_tz, -1); } else if (ref->object->type == OBJ_COMMIT) { - cgit_print_age(ref->commit->commit->date, -1, NULL); + cgit_print_age(ref->commit->commit->date, 0, -1); } html("\n"); @@ -234,9 +200,9 @@ void cgit_print_tags(int maxcount) cgit_free_reflist_inner(&list); } -void cgit_print_refs() +void cgit_print_refs(void) { - + cgit_print_layout_start(); html(""); if (ctx.qry.path && starts_with(ctx.qry.path, "heads")) @@ -249,4 +215,5 @@ void cgit_print_refs() cgit_print_tags(0); } html("
"); + cgit_print_layout_end(); }