X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/5764fe95469f65fdee285467f0f87d188fc1a780..225c8aba3171156fb917abe043ea55797e2cc1f9:/ui-refs.c diff --git a/ui-refs.c b/ui-refs.c index 44c8f9a..caddfbc 100644 --- a/ui-refs.c +++ b/ui-refs.c @@ -42,12 +42,25 @@ static int cmp_branch_age(const void *a, const void *b) return cmp_age(r1->commit->committer_date, r2->commit->committer_date); } +static int get_ref_age(struct refinfo *ref) +{ + if (!ref->object) + return 0; + switch (ref->object->type) { + case OBJ_TAG: + return ref->tag ? ref->tag->tagger_date : 0; + case OBJ_COMMIT: + return ref->commit ? ref->commit->committer_date : 0; + } + return 0; +} + static int cmp_tag_age(const void *a, const void *b) { struct refinfo *r1 = *(struct refinfo **)a; struct refinfo *r2 = *(struct refinfo **)b; - return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date); + return cmp_age(get_ref_age(r1), get_ref_age(r2)); } static int print_branch(struct refinfo *ref) @@ -58,11 +71,12 @@ static int print_branch(struct refinfo *ref) if (!info) return 1; html(""); - cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL); + cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL, + ctx.qry.showmsg); html(""); if (ref->object->type == OBJ_COMMIT) { - cgit_commit_link(info->subject, NULL, NULL, name, NULL); + cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0); html(""); html_txt(info->author); html(""); @@ -78,17 +92,42 @@ static int print_branch(struct refinfo *ref) static void print_tag_header() { html("Tag" - "Reference" + "Download" "Author" "Age\n"); header = 1; } +static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) +{ + const struct cgit_snapshot_format* f; + char *filename; + const char *basename; + + 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 = xstrdup(fmt("%s-%s", basename, ref)); + } + + for (f = cgit_snapshot_formats; f->suffix; f++) { + if (!(repo->snapshots & f->bit)) + continue; + filename = fmt("%s%s", ref, f->suffix); + cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); + html("  "); + } +} static int print_tag(struct refinfo *ref) { struct tag *tag; struct taginfo *info; - char *url, *name = (char *)ref->refname; + char *name = (char *)ref->refname; if (ref->object->type == OBJ_TAG) { tag = (struct tag *)ref->object; @@ -96,13 +135,12 @@ static int print_tag(struct refinfo *ref) if (!tag || !info) return 1; html(""); - url = cgit_pageurl(ctx.qry.repo, "tag", - fmt("id=%s", name)); - html_link_open(url, NULL, NULL); - html_txt(name); - html_link_close(); + cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); html(""); - cgit_object_link(tag->tagged); + if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) + print_tag_downloads(ctx.repo, name); + else + cgit_object_link(tag->tagged); html(""); if (info->tagger) html(info->tagger); @@ -114,9 +152,18 @@ static int print_tag(struct refinfo *ref) if (!header) print_tag_header(); html(""); - html_txt(name); + cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); html(""); - cgit_object_link(ref->object); + if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT)) + print_tag_downloads(ctx.repo, name); + else + cgit_object_link(ref->object); + html(""); + if (ref->object->type == OBJ_COMMIT) + html(ref->commit->author); + html(""); + if (ref->object->type == OBJ_COMMIT) + cgit_print_age(ref->commit->commit->date, -1, NULL); html("\n"); } return 0; @@ -142,6 +189,8 @@ void cgit_print_branches(int maxcount) list.refs = NULL; list.alloc = list.count = 0; for_each_branch_ref(cgit_refs_cb, &list); + if (ctx.repo->enable_remote_branches) + for_each_remote_ref(cgit_refs_cb, &list); if (maxcount == 0 || maxcount > list.count) maxcount = list.count;