Diffstat (limited to 'ui-commit.c')
| -rw-r--r-- | ui-commit.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/ui-commit.c b/ui-commit.c index a11bc5f..f5b0ae5 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -12,13 +12,13 @@ #include "ui-diff.h" #include "ui-log.h" -void cgit_print_commit(char *hex, const char *prefix) +void cgit_print_commit(char *hex) { struct commit *commit, *parent; - struct commitinfo *info, *parent_info; + struct commitinfo *info; struct commit_list *p; unsigned char sha1[20]; - char *tmp, *tmp2; + char *tmp; int parents = 0; if (!hex) @@ -58,23 +58,14 @@ void cgit_print_commit(char *hex, const char *prefix) html("</td></tr>\n"); html("<tr><th>commit</th><td colspan='2' class='sha1'>"); tmp = sha1_to_hex(commit->object.sha1); - cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0); + cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); html(" ("); - cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); - html(") ("); - if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) - cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); - else - cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); + cgit_patch_link("patch", NULL, NULL, NULL, tmp); html(")</td></tr>\n"); html("<tr><th>tree</th><td colspan='2' class='sha1'>"); tmp = xstrdup(hex); cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, ctx.qry.head, tmp, NULL); - if (prefix) { - html(" /"); - cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix); - } html("</td></tr>\n"); for (p = commit->parents; p ; p = p->next) { parent = lookup_commit_reference(p->item->object.sha1); @@ -86,15 +77,11 @@ void cgit_print_commit(char *hex, const char *prefix) } html("<tr><th>parent</th>" "<td colspan='2' class='sha1'>"); - tmp = tmp2 = sha1_to_hex(p->item->object.sha1); - if (ctx.repo->enable_subject_links) { - parent_info = cgit_parse_commit(parent); - tmp2 = parent_info->subject; - } - cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0); + cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, + ctx.qry.head, sha1_to_hex(p->item->object.sha1)); html(" ("); cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, - sha1_to_hex(p->item->object.sha1), prefix, 0); + sha1_to_hex(p->item->object.sha1), NULL); html(")</td></tr>"); parents++; } @@ -125,7 +112,7 @@ void cgit_print_commit(char *hex, const char *prefix) tmp = sha1_to_hex(commit->parents->item->object.sha1); else tmp = NULL; - cgit_print_diff(ctx.qry.sha1, tmp, prefix); + cgit_print_diff(ctx.qry.sha1, tmp, NULL); } cgit_free_commitinfo(info); } |