summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 1c182aa..7ab1e49 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -13,13 +13,12 @@
13unsigned char old_rev_sha1[20]; 13unsigned char old_rev_sha1[20];
14unsigned char new_rev_sha1[20]; 14unsigned char new_rev_sha1[20];
15 15
16static int files, slots; 16static int files, slots;
17static int total_adds, total_rems, max_changes; 17static int total_adds, total_rems, max_changes;
18static int lines_added, lines_removed; 18static int lines_added, lines_removed;
19static char *curr_rev;
20 19
21static struct fileinfo { 20static struct fileinfo {
22 char status; 21 char status;
23 unsigned char old_sha1[20]; 22 unsigned char old_sha1[20];
24 unsigned char new_sha1[20]; 23 unsigned char new_sha1[20];
25 unsigned short old_mode; 24 unsigned short old_mode;
@@ -77,14 +76,14 @@ static void print_fileinfo(struct fileinfo *info)
77 !is_null_sha1(info->new_sha1)) { 76 !is_null_sha1(info->new_sha1)) {
78 html("<span class='modechange'>["); 77 html("<span class='modechange'>[");
79 cgit_print_filemode(info->old_mode); 78 cgit_print_filemode(info->old_mode);
80 html("]</span>"); 79 html("]</span>");
81 } 80 }
82 htmlf("</td><td class='%s'>", class); 81 htmlf("</td><td class='%s'>", class);
83 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev, 82 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
84 NULL, info->new_path); 83 ctx.qry.sha2, info->new_path);
85 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) 84 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
86 htmlf(" (%s from %s)", 85 htmlf(" (%s from %s)",
87 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", 86 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
88 info->old_path); 87 info->old_path);
89 html("</td><td class='right'>"); 88 html("</td><td class='right'>");
90 htmlf("%d", info->added + info->removed); 89 htmlf("%d", info->added + info->removed);
@@ -142,13 +141,12 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
142{ 141{
143 int i; 142 int i;
144 143
145 html("<div class='diffstat-header'>Diffstat</div>"); 144 html("<div class='diffstat-header'>Diffstat</div>");
146 html("<table summary='diffstat' class='diffstat'>"); 145 html("<table summary='diffstat' class='diffstat'>");
147 max_changes = 0; 146 max_changes = 0;
148 curr_rev = xstrdup(sha1_to_hex(new_sha1));
149 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); 147 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
150 for(i = 0; i<files; i++) 148 for(i = 0; i<files; i++)
151 print_fileinfo(&items[i]); 149 print_fileinfo(&items[i]);
152 html("</table>"); 150 html("</table>");
153 html("<div class='diffstat-summary'>"); 151 html("<div class='diffstat-summary'>");
154 htmlf("%d files changed, %d insertions, %d deletions", 152 htmlf("%d files changed, %d insertions, %d deletions",