about summary refs log tree commit diff stats
path: root/ui-commit.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-commit.c')
-rw-r--r--ui-commit.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/ui-commit.c b/ui-commit.c index 2b4f677..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, &notes, PAGE_ENCODING, 0); 39 format_note(NULL, sha1, &notes, 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);
@@ -110,7 +106,7 @@ void cgit_print_commit(char *hex, const char *prefix)
110 html("</table>\n"); 106 html("</table>\n");
111 html("<div class='commit-subject'>"); 107 html("<div class='commit-subject'>");
112 if (ctx.repo->commit_filter) 108 if (ctx.repo->commit_filter)
113 cgit_open_filter(ctx.repo->commit_filter); 109 cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
114 html_txt(info->subject); 110 html_txt(info->subject);
115 if (ctx.repo->commit_filter) 111 if (ctx.repo->commit_filter)
116 cgit_close_filter(ctx.repo->commit_filter); 112 cgit_close_filter(ctx.repo->commit_filter);
@@ -118,7 +114,7 @@ void cgit_print_commit(char *hex, const char *prefix)
118 html("</div>"); 114 html("</div>");
119 html("<div class='commit-msg'>"); 115 html("<div class='commit-msg'>");
120 if (ctx.repo->commit_filter) 116 if (ctx.repo->commit_filter)
121 cgit_open_filter(ctx.repo->commit_filter); 117 cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
122 html_txt(info->msg); 118 html_txt(info->msg);
123 if (ctx.repo->commit_filter) 119 if (ctx.repo->commit_filter)
124 cgit_close_filter(ctx.repo->commit_filter); 120 cgit_close_filter(ctx.repo->commit_filter);
@@ -127,7 +123,7 @@ void cgit_print_commit(char *hex, const char *prefix)
127 html("<div class='notes-header'>Notes</div>"); 123 html("<div class='notes-header'>Notes</div>");
128 html("<div class='notes'>"); 124 html("<div class='notes'>");
129 if (ctx.repo->commit_filter) 125 if (ctx.repo->commit_filter)
130 cgit_open_filter(ctx.repo->commit_filter); 126 cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
131 html_txt(notes.buf); 127 html_txt(notes.buf);
132 if (ctx.repo->commit_filter) 128 if (ctx.repo->commit_filter)
133 cgit_close_filter(ctx.repo->commit_filter); 129 cgit_close_filter(ctx.repo->commit_filter);
@@ -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(&notes); 140 strbuf_release(&notes);
145 cgit_free_commitinfo(info); 141 cgit_free_commitinfo(info);