X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/fab385ef5ca516dcda79df87eb926eccdda64a54..HEAD:/ui-refs.c diff --git a/ui-refs.c b/ui-refs.c index e89f836..456f610 100644 --- a/ui-refs.c +++ b/ui-refs.c @@ -1,29 +1,20 @@ /* 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) +static inline int cmp_age(int age1, int age2) { - if (age1 != 0 && age2 != 0) - return age2 - age1; - - if (age1 == 0 && age2 == 0) - return 0; - - if (age1 == 0) - return +1; - - return -1; + /* age1 and age2 are assumed to be non-negative */ + return age2 - age1; } static int cmp_ref_name(const void *a, const void *b) @@ -72,15 +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); @@ -89,95 +82,63 @@ static int print_branch(struct refinfo *ref) return 0; } -static void print_tag_header() +static void print_tag_header(void) { html("Tag" "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; - 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 = xstrdup(fmt("%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); - html("  "); - } - - if (free_ref) - free((char *)ref); -} 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) + if (!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(""); - if (info->tagger) - html(info->tagger); - html(""); + } + + html(""); + cgit_tag_link(name, NULL, NULL, name); + html(""); + if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT)) + cgit_print_snapshot_links(ctx.repo, name, "  "); + else + cgit_object_link(obj); + html(""); + if (info) { + if (info->tagger) { + cgit_open_filter(ctx.repo->email_filter, info->tagger_email, "refs"); + html_txt(info->tagger); + cgit_close_filter(ctx.repo->email_filter); + } + } else if (ref->object->type == OBJ_COMMIT) { + cgit_open_filter(ctx.repo->email_filter, ref->commit->author_email, "refs"); + html_txt(ref->commit->author); + cgit_close_filter(ctx.repo->email_filter); + } + 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"); + cgit_print_age(info->tagger_date, info->tagger_tz, -1); + } else if (ref->object->type == OBJ_COMMIT) { + cgit_print_age(ref->commit->commit->date, 0, -1); } + html("\n"); + return 0; } -static void print_refs_link(char *path) +static void print_refs_link(const char *path) { - html(""); + html(""); cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); html(""); } @@ -201,10 +162,9 @@ 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 < maxcount; i++) print_branch(list.refs[i]); @@ -220,7 +180,6 @@ void cgit_print_tags(int maxcount) struct reflist list; int i; - header = 0; list.refs = NULL; list.alloc = list.count = 0; for_each_tag_ref(cgit_refs_cb, &list); @@ -241,19 +200,20 @@ 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 && !strncmp(ctx.qry.path, "heads", 5)) + if (ctx.qry.path && starts_with(ctx.qry.path, "heads")) cgit_print_branches(0); - else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4)) + else if (ctx.qry.path && starts_with(ctx.qry.path, "tags")) cgit_print_tags(0); else { cgit_print_branches(0); - html(""); + html(""); cgit_print_tags(0); } html("
 
 
"); + cgit_print_layout_end(); }