aboutsummaryrefslogtreecommitdiff
path: root/ui-commit.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2011-03-06 23:59:56 +0100
committerLars Hjemli <hjemli@gmail.com>2011-03-06 23:59:56 +0100
commit962a24892feb9e3d69542bcf0a219dc14836e921 (patch)
tree991b67cd914a708d83f08dd7f859a9cadbb74490 /ui-commit.c
parent1a64fd2f83affda41fb9903b7c299d35170bfc05 (diff)
downloadcgit-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.c10
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)
format_note(NULL, sha1, &notes, 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(&notes);
cgit_free_commitinfo(info);