diff options
author | Lars Hjemli <hjemli@gmail.com> | 2011-05-24 06:29:24 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-05-24 06:29:24 (JST) |
commit | 2ffeecb7a6827dcf0f81cf543ed312155f6e8f83 (patch) | |
tree | 328117f4fe71862b7432359b4d6a7237affd42fe /ui-commit.c | |
parent | ab350a77b1d3b0e251cc28329f2e16f0566e521e (diff) | |
parent | 1b5c336cc99f01a0f8d6668cbfc9273f49a6be25 (diff) | |
download | cgit-2ffeecb7a6827dcf0f81cf543ed312155f6e8f83.zip cgit-2ffeecb7a6827dcf0f81cf543ed312155f6e8f83.tar.gz |
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) | |||
39 | format_note(NULL, sha1, ¬es, PAGE_ENCODING, 0); | 39 | format_note(NULL, sha1, ¬es, PAGE_ENCODING, 0); |
40 | 40 | ||
41 | load_ref_decorations(DECORATE_FULL_REFS); | 41 | load_ref_decorations(DECORATE_FULL_REFS); |
42 | 42 | ||
43 | cgit_print_diff_ctrls(); | ||
43 | html("<table summary='commit info' class='commit-info'>\n"); | 44 | html("<table summary='commit info' class='commit-info'>\n"); |
44 | html("<tr><th>author</th><td>"); | 45 | html("<tr><th>author</th><td>"); |
45 | html_txt(info->author); | 46 | html_txt(info->author); |
@@ -64,11 +65,6 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
64 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0); | 65 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0); |
65 | html(" ("); | 66 | html(" ("); |
66 | cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); | 67 | cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); |
67 | html(") ("); | ||
68 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) | ||
69 | cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); | ||
70 | else | ||
71 | cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); | ||
72 | html(")</td></tr>\n"); | 68 | html(")</td></tr>\n"); |
73 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 69 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
74 | tmp = xstrdup(hex); | 70 | tmp = xstrdup(hex); |
@@ -139,7 +135,7 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
139 | tmp = sha1_to_hex(commit->parents->item->object.sha1); | 135 | tmp = sha1_to_hex(commit->parents->item->object.sha1); |
140 | else | 136 | else |
141 | tmp = NULL; | 137 | tmp = NULL; |
142 | cgit_print_diff(ctx.qry.sha1, tmp, prefix); | 138 | cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0); |
143 | } | 139 | } |
144 | strbuf_release(¬es); | 140 | strbuf_release(¬es); |
145 | cgit_free_commitinfo(info); | 141 | cgit_free_commitinfo(info); |