Diffstat (limited to 'ui-shared.c')
| -rw-r--r-- | ui-shared.c | 43 |
1 files changed, 8 insertions, 35 deletions
diff --git a/ui-shared.c b/ui-shared.c index 8827fff..8a7cc32 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -317,7 +317,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head, } void cgit_commit_link(char *name, char *title, char *class, char *head, - char *rev, int toggle_ssdiff) + char *rev) { if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { name[ctx.cfg.max_msg_len] = '\0'; @@ -325,23 +325,7 @@ void cgit_commit_link(char *name, char *title, char *class, char *head, name[ctx.cfg.max_msg_len - 2] = '.'; name[ctx.cfg.max_msg_len - 3] = '.'; } - - char *delim; - - delim = repolink(title, class, "commit", head, NULL); - if (rev && strcmp(rev, ctx.qry.head)) { - html(delim); - html("id="); - html_url_arg(rev); - delim = "&"; - } - if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { - html(delim); - html("ss=1"); - } - html("'>"); - html_txt(name); - html("</a>"); + reporevlink("commit", name, title, class, head, rev, NULL); } void cgit_refs_link(char *name, char *title, char *class, char *head, @@ -357,8 +341,7 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head, } void cgit_diff_link(char *name, char *title, char *class, char *head, - char *new_rev, char *old_rev, char *path, - int toggle_ssdiff) + char *new_rev, char *old_rev, char *path) { char *delim; @@ -373,11 +356,6 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, html(delim); html("id2="); html_url_arg(old_rev); - delim = "&"; - } - if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { - html(delim); - html("ss=1"); } html("'>"); html_txt(name); @@ -405,7 +383,7 @@ void cgit_object_link(struct object *obj) shortrev[10] = '\0'; if (obj->type == OBJ_COMMIT) { cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, - ctx.qry.head, fullrev, 0); + ctx.qry.head, fullrev); return; } else if (obj->type == OBJ_TREE) page = "tree"; @@ -717,9 +695,9 @@ void cgit_print_pageheader(struct cgit_context *ctx) cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, ctx->qry.sha1, NULL); cgit_commit_link("commit", NULL, hc(cmd, "commit"), - ctx->qry.head, ctx->qry.sha1, 0); + ctx->qry.head, ctx->qry.sha1); cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, - ctx->qry.sha1, ctx->qry.sha2, NULL, 0); + ctx->qry.sha1, ctx->qry.sha2, NULL); if (ctx->repo->max_stats) cgit_stats_link("stats", NULL, hc(cmd, "stats"), ctx->qry.head, NULL); @@ -782,18 +760,13 @@ void cgit_print_snapshot_links(const char *repo, const char *head, const char *hex, int snapshots) { const struct cgit_snapshot_format* f; - char *prefix; char *filename; - unsigned char sha1[20]; - if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && - (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) - hex++; - prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); for (f = cgit_snapshot_formats; f->suffix; f++) { if (!(snapshots & f->bit)) continue; - filename = fmt("%s%s", prefix, f->suffix); + filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, + f->suffix); cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); html("<br/>"); } |