X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/a4d1ca1dc6ff8171694d9e2280b6075a1beced0c..583aa5d80eb01075c0f3f35df37b9144a0c9651e:/ui-refs.c diff --git a/ui-refs.c b/ui-refs.c index 12533cd..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) @@ -42,12 +33,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,15 +62,18 @@ 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, 0); html(""); if (ref->object->type == OBJ_COMMIT) { - cgit_print_age(info->commit->date, -1, NULL); + 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); - html(""); - cgit_commit_link(info->subject, NULL, NULL, name, NULL); + cgit_close_filter(ctx.repo->email_filter); + html(""); + cgit_print_age(info->committer_date, info->committer_tz, -1); } else { html(""); cgit_object_link(ref->object); @@ -75,56 +82,63 @@ static int print_branch(struct refinfo *ref) return 0; } -static void print_tag_header() +static void print_tag_header(void) { html("Tag" - "Age" + "Download" "Author" - "Reference\n"); - header = 1; + "Age\n"); } static int print_tag(struct refinfo *ref) { - struct tag *tag; - struct taginfo *info; - char *url, *name = (char *)ref->refname; + 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(""); - url = cgit_pageurl(ctx.qry.repo, "tag", - fmt("id=%s", name)); - html_link_open(url, NULL, NULL); - html_txt(name); - html_link_close(); - 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(""); - if (info->tagger) - html(info->tagger); - html(""); - cgit_object_link(tag->tagged); - html("\n"); - } else { - if (!header) - print_tag_header(); - html(""); - html_txt(name); - html(""); - cgit_object_link(ref->object); - 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(""); } @@ -135,27 +149,30 @@ void cgit_print_branches(int maxcount) int i; html("Branch" - "Idle" + "Commit message" "Author" - "Head commit\n"); + "Age\n"); 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; - 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 && 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(); }