Diffstat (limited to 'ui-shared.c')
| -rw-r--r-- | ui-shared.c | 44 |
1 files changed, 13 insertions, 31 deletions
diff --git a/ui-shared.c b/ui-shared.c index 4f28512..76cd00d 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -281,8 +281,7 @@ void cgit_plain_link(char *name, char *title, char *class, char *head, } void cgit_log_link(char *name, char *title, char *class, char *head, - char *rev, char *path, int ofs, char *grep, char *pattern, - int showmsg) + char *rev, char *path, int ofs, char *grep, char *pattern) { char *delim; @@ -306,11 +305,6 @@ void cgit_log_link(char *name, char *title, char *class, char *head, html(delim); html("ofs="); htmlf("%d", ofs); - delim = "&"; - } - if (showmsg) { - html(delim); - html("showmsg=1"); } html("'>"); html_txt(name); @@ -369,22 +363,13 @@ void cgit_patch_link(char *name, char *title, char *class, char *head, reporevlink("patch", name, title, class, head, rev, NULL); } -void cgit_stats_link(char *name, char *title, char *class, char *head, - char *path) -{ - reporevlink("stats", name, title, class, head, NULL, path); -} - void cgit_object_link(struct object *obj) { - char *page, *shortrev, *fullrev, *name; + char *page, *rev, *name; - fullrev = sha1_to_hex(obj->sha1); - shortrev = xstrdup(fullrev); - shortrev[10] = '\0'; if (obj->type == OBJ_COMMIT) { - cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, - ctx.qry.head, fullrev); + cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, + ctx.qry.head, sha1_to_hex(obj->sha1)); return; } else if (obj->type == OBJ_TREE) page = "tree"; @@ -392,8 +377,9 @@ void cgit_object_link(struct object *obj) page = "tag"; else page = "blob"; - name = fmt("%s %s...", typename(obj->type), shortrev); - reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); + rev = sha1_to_hex(obj->sha1); + name = fmt("%s %s", typename(obj->type), rev); + reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL); } void cgit_print_date(time_t secs, char *format, int local_time) @@ -563,7 +549,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, return 0; } -void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) +void add_hidden_formfields(int incl_head, int incl_search, char *page) { char *url; @@ -582,8 +568,6 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) html_hidden("id", ctx.qry.sha1); if (ctx.qry.sha2) html_hidden("id2", ctx.qry.sha2); - if (ctx.qry.showmsg) - html_hidden("showmsg", "1"); if (incl_search) { if (ctx.qry.grep) @@ -625,7 +609,7 @@ void cgit_print_pageheader(struct cgit_context *ctx) cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); html("</td><td class='form'>"); html("<form method='get' action=''>\n"); - cgit_add_hidden_formfields(0, 1, ctx->qry.page); + add_hidden_formfields(0, 1, ctx->qry.page); html("<select name='h' onchange='this.form.submit();'>\n"); for_each_branch_ref(print_branch_option, ctx->qry.head); html("</select> "); @@ -655,16 +639,13 @@ void cgit_print_pageheader(struct cgit_context *ctx) cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, ctx->qry.sha1, NULL); cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, - NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); + NULL, NULL, 0, NULL, NULL); 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); cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, ctx->qry.sha1, ctx->qry.sha2, NULL); - if (ctx->repo->max_stats) - cgit_stats_link("stats", NULL, hc(cmd, "stats"), - ctx->qry.head, NULL); if (ctx->repo->readme) reporevlink("about", "about", NULL, hc(cmd, "about"), ctx->qry.head, NULL, @@ -675,7 +656,7 @@ void cgit_print_pageheader(struct cgit_context *ctx) html_url_path(cgit_fileurl(ctx->qry.repo, "log", ctx->qry.path, NULL)); html("'>\n"); - cgit_add_hidden_formfields(1, 0, "log"); + add_hidden_formfields(1, 0, "log"); html("<select name='qt'>\n"); html_option("grep", "log msg", ctx->qry.grep); html_option("author", "author", ctx->qry.grep); @@ -731,7 +712,8 @@ void cgit_print_snapshot_links(const char *repo, const char *head, continue; filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, f->suffix); - cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); + cgit_snapshot_link(filename, NULL, NULL, (char *)head, + (char *)hex, filename); html("<br/>"); } } |