X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/c34e28835bc06ea9f76f440909f59a697910e9e8..6bef566f99c7f85cbab9692e22b183ae99f33c1d:/ui-shared.c diff --git a/ui-shared.c b/ui-shared.c index 2c88b72..2e4fcd9 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -66,10 +66,11 @@ char *cgit_hosturl(void) char *cgit_currenturl(void) { - if (!ctx.qry.url) - return xstrdup(cgit_rooturl()); const char *root = cgit_rooturl(); size_t len = strlen(root); + + if (!ctx.qry.url) + return xstrdup(root); if (len && root[len - 1] == '/') return fmtalloc("%s%s", root, ctx.qry.url); return fmtalloc("%s/%s", root, ctx.qry.url); @@ -253,7 +254,7 @@ static char *repolink(const char *title, const char *class, const char *page, } delim = "&"; } - if (head && strcmp(head, ctx.repo->defbranch)) { + if (head && ctx.repo->defbranch && strcmp(head, ctx.repo->defbranch)) { html(delim); html("h="); html_url_arg(head); @@ -349,6 +350,8 @@ void cgit_log_link(const char *name, const char *title, const char *class, void cgit_commit_link(char *name, const char *title, const char *class, const char *head, const char *rev, const char *path) { + char *delim; + if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { name[ctx.cfg.max_msg_len] = '\0'; name[ctx.cfg.max_msg_len - 1] = '.'; @@ -356,8 +359,6 @@ void cgit_commit_link(char *name, const char *title, const char *class, name[ctx.cfg.max_msg_len - 3] = '.'; } - char *delim; - delim = repolink(title, class, "commit", head, path); if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) { html(delim); @@ -714,13 +715,14 @@ static void print_rel_vcs_link(const char *url) void cgit_print_docstart(void) { + char *host = cgit_hosturl(); + if (ctx.cfg.embedded) { if (ctx.cfg.header) html_include(ctx.cfg.header); return; } - char *host = cgit_hosturl(); html(cgit_doctype); html("\n"); html("\n"); @@ -776,7 +778,7 @@ void cgit_print_docend(void) if (ctx.cfg.footer) html_include(ctx.cfg.footer); else { - htmlf("
generated by cgit %s at ", + htmlf("
generated by cgit %s at ", cgit_version); html_txt(show_date(time(NULL), 0, cgit_date_mode(DATE_ISO8601))); html("
\n"); @@ -1069,18 +1071,34 @@ void cgit_print_filemode(unsigned short mode) html_fileperm(mode); } +void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base, + const char *ref) +{ + struct object_id oid; + + /* + * Prettify snapshot names by stripping leading "v" or "V" if the tag + * name starts with {v,V}[0-9] and the prettify mapping is injective, + * i.e. each stripped tag can be inverted without ambiguities. + */ + if (get_oid(fmt("refs/tags/%s", ref), &oid) == 0 && + (ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]) && + ((get_oid(fmt("refs/tags/%s", ref + 1), &oid) == 0) + + (get_oid(fmt("refs/tags/v%s", ref + 1), &oid) == 0) + + (get_oid(fmt("refs/tags/V%s", ref + 1), &oid) == 0) == 1)) + ref++; + + strbuf_addf(filename, "%s-%s", base, ref); +} + void cgit_print_snapshot_links(const char *repo, const char *head, const char *hex, int snapshots) { const struct cgit_snapshot_format* f; struct strbuf filename = STRBUF_INIT; size_t prefixlen; - unsigned char sha1[20]; - if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && - (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) - hex++; - strbuf_addf(&filename, "%s-%s", cgit_repobasename(repo), hex); + cgit_compose_snapshot_prefix(&filename, cgit_repobasename(repo), hex); prefixlen = filename.len; for (f = cgit_snapshot_formats; f->suffix; f++) { if (!(snapshots & f->bit))