-rw-r--r-- | ui-commit.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ui-commit.c b/ui-commit.c index 8019e36..dd36cc0 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -4,16 +4,17 @@ | |||
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | #include "ui-diff.h" | ||
12 | 13 | ||
13 | static int files, slots; | 14 | static int files, slots; |
14 | static int total_adds, total_rems, max_changes; | 15 | static int total_adds, total_rems, max_changes; |
15 | static int lines_added, lines_removed; | 16 | static int lines_added, lines_removed; |
16 | static char *curr_rev; | 17 | static char *curr_rev; |
17 | 18 | ||
18 | static struct fileinfo { | 19 | static struct fileinfo { |
19 | char status; | 20 | char status; |
@@ -169,16 +170,22 @@ void cgit_print_commit(char *hex) | |||
169 | html("</td></tr>\n"); | 170 | html("</td></tr>\n"); |
170 | html("<tr><th>committer</th><td>"); | 171 | html("<tr><th>committer</th><td>"); |
171 | html_txt(info->committer); | 172 | html_txt(info->committer); |
172 | html(" "); | 173 | html(" "); |
173 | html_txt(info->committer_email); | 174 | html_txt(info->committer_email); |
174 | html("</td><td class='right'>"); | 175 | html("</td><td class='right'>"); |
175 | cgit_print_date(info->committer_date, FMT_LONGDATE); | 176 | cgit_print_date(info->committer_date, FMT_LONGDATE); |
176 | html("</td></tr>\n"); | 177 | html("</td></tr>\n"); |
178 | html("<tr><th>commit</th><td colspan='2' class='sha1'>"); | ||
179 | tmp = sha1_to_hex(commit->object.sha1); | ||
180 | cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp); | ||
181 | html(" ("); | ||
182 | cgit_patch_link("patch", NULL, NULL, NULL, tmp); | ||
183 | html(")</td></tr>\n"); | ||
177 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 184 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
178 | tmp = xstrdup(hex); | 185 | tmp = xstrdup(hex); |
179 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, | 186 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, |
180 | ctx.qry.head, tmp, NULL); | 187 | ctx.qry.head, tmp, NULL); |
181 | html("</td></tr>\n"); | 188 | html("</td></tr>\n"); |
182 | for (p = commit->parents; p ; p = p->next) { | 189 | for (p = commit->parents; p ; p = p->next) { |
183 | parent = lookup_commit_reference(p->item->object.sha1); | 190 | parent = lookup_commit_reference(p->item->object.sha1); |
184 | if (!parent) { | 191 | if (!parent) { |
@@ -213,16 +220,17 @@ void cgit_print_commit(char *hex) | |||
213 | html("<div class='diffstat-header'>Diffstat</div>"); | 220 | html("<div class='diffstat-header'>Diffstat</div>"); |
214 | html("<table summary='diffstat' class='diffstat'>"); | 221 | html("<table summary='diffstat' class='diffstat'>"); |
215 | max_changes = 0; | 222 | max_changes = 0; |
216 | cgit_diff_commit(commit, inspect_filepair); | 223 | cgit_diff_commit(commit, inspect_filepair); |
217 | for(i = 0; i<files; i++) | 224 | for(i = 0; i<files; i++) |
218 | print_fileinfo(&items[i]); | 225 | print_fileinfo(&items[i]); |
219 | html("</table>"); | 226 | html("</table>"); |
220 | html("<div class='diffstat-summary'>"); | 227 | html("<div class='diffstat-summary'>"); |
221 | htmlf("%d files changed, %d insertions, %d deletions (", | 228 | htmlf("%d files changed, %d insertions, %d deletions", |
222 | files, total_adds, total_rems); | 229 | files, total_adds, total_rems); |
223 | cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex, | 230 | cgit_print_diff(ctx.qry.sha1, |
224 | NULL, NULL); | 231 | sha1_to_hex(commit->parents->item->object.sha1), |
232 | NULL); | ||
225 | html(")</div>"); | 233 | html(")</div>"); |
226 | } | 234 | } |
227 | cgit_free_commitinfo(info); | 235 | cgit_free_commitinfo(info); |
228 | } | 236 | } |