diff options
author | Lars Hjemli | 2011-03-06 23:59:56 +0100 |
---|---|---|
committer | Lars Hjemli | 2011-03-06 23:59:56 +0100 |
commit | 962a24892feb9e3d69542bcf0a219dc14836e921 (patch) | |
tree | 991b67cd914a708d83f08dd7f859a9cadbb74490 /ui-commit.c | |
parent | 1a64fd2f83affda41fb9903b7c299d35170bfc05 (diff) | |
download | cgit-962a24892feb9e3d69542bcf0a219dc14836e921.tar.gz cgit-962a24892feb9e3d69542bcf0a219dc14836e921.tar.bz2 cgit-962a24892feb9e3d69542bcf0a219dc14836e921.zip |
ui-diff.c: create a control panel for diff options
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
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 2b4f677..536a8e8 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); |