X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/5c5d189635287a3bfaa1a4aef133dc0c582a27c2..da218fcd9eb554a8405ca72e84bcc0feb371194f:/ui-refs.c diff --git a/ui-refs.c b/ui-refs.c index 94ff6be..20c91e3 100644 --- a/ui-refs.c +++ b/ui-refs.c @@ -1,17 +1,16 @@ /* ui-refs.c: browse symbolic refs * - * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2006-2014 cgit Development Team * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" +#include "ui-refs.h" #include "html.h" #include "ui-shared.h" -static int header; - static int cmp_age(int age1, int age2) { if (age1 != 0 && age2 != 0) @@ -42,23 +41,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; - int r1date, r2date; - - if (r1->object->type != OBJ_COMMIT) - r1date = r1->tag->tagger_date; - else - r1date = r1->commit->committer_date; - - if (r2->object->type != OBJ_COMMIT) - r2date = r2->tag->tagger_date; - else - r2date = r2->commit->committer_date; - return cmp_age(r1date, r2date); + return cmp_age(get_ref_age(r1), get_ref_age(r2)); } static int print_branch(struct refinfo *ref) @@ -93,14 +94,14 @@ static void print_tag_header() "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; + struct strbuf filename = STRBUF_INIT; const char *basename; + int free_ref = 0; if (!ref || strlen(ref) < 2) return; @@ -109,67 +110,70 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) 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)); + 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; - filename = fmt("%s%s", ref, f->suffix); - cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); + 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; - struct taginfo *info; + struct tag *tag = NULL; + struct taginfo *info = NULL; char *name = (char *)ref->refname; + struct object *obj = ref->object; - if (ref->object->type == OBJ_TAG) { - tag = (struct tag *)ref->object; + if (obj->type == OBJ_TAG) { + tag = (struct tag *)obj; + obj = tag->tagged; info = ref->tag; if (!tag || !info) return 1; - html(""); - cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); - html(""); - if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) - print_tag_downloads(ctx.repo, name); - else - cgit_object_link(tag->tagged); - html(""); + } + + html(""); + cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); + html(""); + if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT)) + print_tag_downloads(ctx.repo, name); + else + cgit_object_link(obj); + html(""); + if (info) { if (info->tagger) html(info->tagger); - html(""); + } else if (ref->object->type == OBJ_COMMIT) { + html(ref->commit->author); + } + html(""); + if (info) { if (info->tagger_date > 0) cgit_print_age(info->tagger_date, -1, NULL); - html("\n"); - } else { - if (!header) - print_tag_header(); - html(""); - cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); - html(""); - 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"); + } else if (ref->object->type == OBJ_COMMIT) { + cgit_print_age(ref->commit->commit->date, -1, NULL); } + html("\n"); + return 0; } static void print_refs_link(char *path) { - html(""); + html(""); cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); html(""); } @@ -193,16 +197,17 @@ void cgit_print_branches(int maxcount) if (maxcount == 0 || maxcount > list.count) maxcount = list.count; - if (maxcount < list.count) { - qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); + qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); + if (ctx.repo->branch_sort == 0) qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); - } - for(i=0; i list.count) maxcount = list.count; print_tag_header(); - for(i=0; i"); - if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5)) + if (ctx.qry.path && !prefixcmp(ctx.qry.path, "heads")) cgit_print_branches(0); - else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4)) + else if (ctx.qry.path && !prefixcmp(ctx.qry.path, "tags")) cgit_print_tags(0); else { cgit_print_branches(0); - html(" "); + html(" "); cgit_print_tags(0); } html("");