|
diff --git a/ui-diff.c b/ui-diff.c index a92a768..fb836df 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -141,43 +141,45 @@ static void inspect_filepair(struct diff_filepair *pair) |
141 | items[files-1].old_mode = pair->one->mode; |
141 | items[files-1].old_mode = pair->one->mode; |
142 | items[files-1].new_mode = pair->two->mode; |
142 | items[files-1].new_mode = pair->two->mode; |
143 | items[files-1].old_path = xstrdup(pair->one->path); |
143 | items[files-1].old_path = xstrdup(pair->one->path); |
144 | items[files-1].new_path = xstrdup(pair->two->path); |
144 | items[files-1].new_path = xstrdup(pair->two->path); |
145 | items[files-1].added = lines_added; |
145 | items[files-1].added = lines_added; |
146 | items[files-1].removed = lines_removed; |
146 | items[files-1].removed = lines_removed; |
147 | items[files-1].old_size = old_size; |
147 | items[files-1].old_size = old_size; |
148 | items[files-1].new_size = new_size; |
148 | items[files-1].new_size = new_size; |
149 | items[files-1].binary = binary; |
149 | items[files-1].binary = binary; |
150 | if (lines_added + lines_removed > max_changes) |
150 | if (lines_added + lines_removed > max_changes) |
151 | max_changes = lines_added + lines_removed; |
151 | max_changes = lines_added + lines_removed; |
152 | total_adds += lines_added; |
152 | total_adds += lines_added; |
153 | total_rems += lines_removed; |
153 | total_rems += lines_removed; |
154 | } |
154 | } |
155 | |
155 | |
156 | void cgit_print_diffstat(const unsigned char *old_sha1, |
156 | void cgit_print_diffstat(const unsigned char *old_sha1, |
157 | const unsigned char *new_sha1) |
157 | const unsigned char *new_sha1, const char *prefix) |
158 | { |
158 | { |
159 | int i; |
159 | int i; |
160 | |
160 | |
161 | html("<div class='diffstat-header'>"); |
161 | html("<div class='diffstat-header'>"); |
162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
163 | ctx.qry.sha2, NULL, 0); |
163 | ctx.qry.sha2, NULL, 0); |
| |
164 | if (prefix) |
| |
165 | htmlf(" (limited to '%s')", prefix); |
164 | html("</div>"); |
166 | html("</div>"); |
165 | html("<table summary='diffstat' class='diffstat'>"); |
167 | html("<table summary='diffstat' class='diffstat'>"); |
166 | max_changes = 0; |
168 | max_changes = 0; |
167 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
169 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); |
168 | for(i = 0; i<files; i++) |
170 | for(i = 0; i<files; i++) |
169 | print_fileinfo(&items[i]); |
171 | print_fileinfo(&items[i]); |
170 | html("</table>"); |
172 | html("</table>"); |
171 | html("<div class='diffstat-summary'>"); |
173 | html("<div class='diffstat-summary'>"); |
172 | htmlf("%d files changed, %d insertions, %d deletions", |
174 | htmlf("%d files changed, %d insertions, %d deletions", |
173 | files, total_adds, total_rems); |
175 | files, total_adds, total_rems); |
174 | html("</div>"); |
176 | html("</div>"); |
175 | } |
177 | } |
176 | |
178 | |
177 | |
179 | |
178 | /* |
180 | /* |
179 | * print a single line returned from xdiff |
181 | * print a single line returned from xdiff |
180 | */ |
182 | */ |
181 | static void print_line(char *line, int len) |
183 | static void print_line(char *line, int len) |
182 | { |
184 | { |
183 | char *class = "ctx"; |
185 | char *class = "ctx"; |
@@ -325,29 +327,29 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
325 | |
327 | |
326 | if (!is_null_sha1(old_rev_sha1)) { |
328 | if (!is_null_sha1(old_rev_sha1)) { |
327 | type = sha1_object_info(old_rev_sha1, &size); |
329 | type = sha1_object_info(old_rev_sha1, &size); |
328 | if (type == OBJ_BAD) { |
330 | if (type == OBJ_BAD) { |
329 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); |
331 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); |
330 | return; |
332 | return; |
331 | } |
333 | } |
332 | commit2 = lookup_commit_reference(old_rev_sha1); |
334 | commit2 = lookup_commit_reference(old_rev_sha1); |
333 | if (!commit2 || parse_commit(commit2)) |
335 | if (!commit2 || parse_commit(commit2)) |
334 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
336 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
335 | } |
337 | } |
336 | |
338 | |
337 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) |
339 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) |
338 | use_ssdiff = 1; |
340 | use_ssdiff = 1; |
339 | |
341 | |
340 | print_ssdiff_link(); |
342 | print_ssdiff_link(); |
341 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); |
343 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); |
342 | |
344 | |
343 | if (use_ssdiff) { |
345 | if (use_ssdiff) { |
344 | html("<table summary='ssdiff' class='ssdiff'>"); |
346 | html("<table summary='ssdiff' class='ssdiff'>"); |
345 | } else { |
347 | } else { |
346 | html("<table summary='diff' class='diff'>"); |
348 | html("<table summary='diff' class='diff'>"); |
347 | html("<tr><td>"); |
349 | html("<tr><td>"); |
348 | } |
350 | } |
349 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
351 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
350 | if (!use_ssdiff) |
352 | if (!use_ssdiff) |
351 | html("</td></tr>"); |
353 | html("</td></tr>"); |
352 | html("</table>"); |
354 | html("</table>"); |
353 | } |
355 | } |
|