diff options
author | Lars Hjemli <hjemli@gmail.com> | 2011-05-23 23:29:24 +0200 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-05-23 23:29:24 +0200 |
commit | 2ffeecb7a6827dcf0f81cf543ed312155f6e8f83 (patch) | |
tree | 328117f4fe71862b7432359b4d6a7237affd42fe /ui-commit.c | |
parent | ab350a77b1d3b0e251cc28329f2e16f0566e521e (diff) | |
parent | 1b5c336cc99f01a0f8d6668cbfc9273f49a6be25 (diff) |
Merge branch 'lh/panel'
Diffstat (limited to 'ui-commit.c')
-rw-r--r-- | ui-commit.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ui-commit.c b/ui-commit.c index 2da9fcf..a69dec6 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -39,7 +39,8 @@ void cgit_print_commit(char *hex, const char *prefix) format_note(NULL, sha1, ¬es, PAGE_ENCODING, 0); load_ref_decorations(DECORATE_FULL_REFS); - + + cgit_print_diff_ctrls(); html("<table summary='commit info' class='commit-info'>\n"); html("<tr><th>author</th><td>"); html_txt(info->author); @@ -64,11 +65,6 @@ void cgit_print_commit(char *hex, const char *prefix) cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0); 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); html(")</td></tr>\n"); html("<tr><th>tree</th><td colspan='2' class='sha1'>"); tmp = xstrdup(hex); @@ -139,7 +135,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, prefix, 0); } strbuf_release(¬es); cgit_free_commitinfo(info); |