diff options
author | lookshe <github@lookshe.org> | 2016-07-12 09:22:30 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-07-12 09:22:30 +0200 |
commit | 1787404b6a618d07200db241c004d1bedc92f874 (patch) | |
tree | aff8c654e8f3190210f80b4c886ee5a8e88e26fd /ui-refs.c | |
parent | 2209fe5157b431cf57898deb889acdcc704dda64 (diff) | |
parent | 40fbefba0514b33988d453aea05aa2b956e98f84 (diff) |
Merge branch 'master' into lookshe/masterlookshe/master
Conflicts:
filters/html-converters/md2html
Diffstat (limited to 'ui-refs.c')
-rw-r--r-- | ui-refs.c | 30 |
1 files changed, 12 insertions, 18 deletions
@@ -73,7 +73,7 @@ static int print_branch(struct refinfo *ref) cgit_author_link(info->author, name); cgit_close_filter(ctx.repo->email_filter); html("</td><td colspan='2'>"); - cgit_print_age(info->commit->date, -1, NULL); + cgit_print_age(info->committer_date, info->committer_tz, -1); } else { html("</td><td></td><td>"); cgit_object_link(ref->object); @@ -93,34 +93,28 @@ static void print_tag_header(void) 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; + struct strbuf filename = STRBUF_INIT; + size_t prefixlen; 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; - } - } - + if (starts_with(ref, basename)) + strbuf_addstr(&filename, ref); + else + cgit_compose_snapshot_prefix(&filename, basename, ref); + prefixlen = filename.len; 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); + strbuf_setlen(&filename, prefixlen); + strbuf_addstr(&filename, f->suffix); cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf); html(" "); } - if (free_ref) - free((char *)ref); strbuf_release(&filename); } @@ -161,9 +155,9 @@ static int print_tag(struct refinfo *ref) html("</td><td colspan='2'>"); 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("</td></tr>\n"); |