summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 7ab1e49..878496d 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -120,49 +120,52 @@ static void inspect_filepair(struct diff_filepair *pair)
120 else 120 else
121 slots = slots * 2; 121 slots = slots * 2;
122 items = xrealloc(items, slots * sizeof(struct fileinfo)); 122 items = xrealloc(items, slots * sizeof(struct fileinfo));
123 } 123 }
124 items[files-1].status = pair->status; 124 items[files-1].status = pair->status;
125 hashcpy(items[files-1].old_sha1, pair->one->sha1); 125 hashcpy(items[files-1].old_sha1, pair->one->sha1);
126 hashcpy(items[files-1].new_sha1, pair->two->sha1); 126 hashcpy(items[files-1].new_sha1, pair->two->sha1);
127 items[files-1].old_mode = pair->one->mode; 127 items[files-1].old_mode = pair->one->mode;
128 items[files-1].new_mode = pair->two->mode; 128 items[files-1].new_mode = pair->two->mode;
129 items[files-1].old_path = xstrdup(pair->one->path); 129 items[files-1].old_path = xstrdup(pair->one->path);
130 items[files-1].new_path = xstrdup(pair->two->path); 130 items[files-1].new_path = xstrdup(pair->two->path);
131 items[files-1].added = lines_added; 131 items[files-1].added = lines_added;
132 items[files-1].removed = lines_removed; 132 items[files-1].removed = lines_removed;
133 if (lines_added + lines_removed > max_changes) 133 if (lines_added + lines_removed > max_changes)
134 max_changes = lines_added + lines_removed; 134 max_changes = lines_added + lines_removed;
135 total_adds += lines_added; 135 total_adds += lines_added;
136 total_rems += lines_removed; 136 total_rems += lines_removed;
137} 137}
138 138
139void cgit_print_diffstat(const unsigned char *old_sha1, 139void cgit_print_diffstat(const unsigned char *old_sha1,
140 const unsigned char *new_sha1) 140 const unsigned char *new_sha1)
141{ 141{
142 int i; 142 int i;
143 143
144 html("<div class='diffstat-header'>Diffstat</div>"); 144 html("<div class='diffstat-header'>");
145 cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
146 ctx.qry.sha2, NULL);
147 html("</div>");
145 html("<table summary='diffstat' class='diffstat'>"); 148 html("<table summary='diffstat' class='diffstat'>");
146 max_changes = 0; 149 max_changes = 0;
147 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); 150 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
148 for(i = 0; i<files; i++) 151 for(i = 0; i<files; i++)
149 print_fileinfo(&items[i]); 152 print_fileinfo(&items[i]);
150 html("</table>"); 153 html("</table>");
151 html("<div class='diffstat-summary'>"); 154 html("<div class='diffstat-summary'>");
152 htmlf("%d files changed, %d insertions, %d deletions", 155 htmlf("%d files changed, %d insertions, %d deletions",
153 files, total_adds, total_rems); 156 files, total_adds, total_rems);
154 html("</div>"); 157 html("</div>");
155} 158}
156 159
157 160
158/* 161/*
159 * print a single line returned from xdiff 162 * print a single line returned from xdiff
160 */ 163 */
161static void print_line(char *line, int len) 164static void print_line(char *line, int len)
162{ 165{
163 char *class = "ctx"; 166 char *class = "ctx";
164 char c = line[len-1]; 167 char c = line[len-1];
165 168
166 if (line[0] == '+') 169 if (line[0] == '+')
167 class = "add"; 170 class = "add";
168 else if (line[0] == '-') 171 else if (line[0] == '-')