|
diff --git a/ui-diff.c b/ui-diff.c index fb836df..d3a3b2c 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -98,65 +98,65 @@ static void print_fileinfo(struct fileinfo *info) |
98 | } |
98 | } |
99 | htmlf("%d", info->added + info->removed); |
99 | htmlf("%d", info->added + info->removed); |
100 | html("</td><td class='graph'>"); |
100 | html("</td><td class='graph'>"); |
101 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
101 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
102 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
102 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
103 | info->added * 100.0 / max_changes); |
103 | info->added * 100.0 / max_changes); |
104 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
104 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
105 | info->removed * 100.0 / max_changes); |
105 | info->removed * 100.0 / max_changes); |
106 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
106 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
107 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
107 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
108 | html("</tr></table></td></tr>\n"); |
108 | html("</tr></table></td></tr>\n"); |
109 | } |
109 | } |
110 | |
110 | |
111 | static void count_diff_lines(char *line, int len) |
111 | static void count_diff_lines(char *line, int len) |
112 | { |
112 | { |
113 | if (line && (len > 0)) { |
113 | if (line && (len > 0)) { |
114 | if (line[0] == '+') |
114 | if (line[0] == '+') |
115 | lines_added++; |
115 | lines_added++; |
116 | else if (line[0] == '-') |
116 | else if (line[0] == '-') |
117 | lines_removed++; |
117 | lines_removed++; |
118 | } |
118 | } |
119 | } |
119 | } |
120 | |
120 | |
121 | static void inspect_filepair(struct diff_filepair *pair) |
121 | static void inspect_filepair(struct diff_filepair *pair) |
122 | { |
122 | { |
123 | int binary = 0; |
123 | int binary = 0; |
124 | unsigned long old_size = 0; |
124 | unsigned long old_size = 0; |
125 | unsigned long new_size = 0; |
125 | unsigned long new_size = 0; |
126 | files++; |
126 | files++; |
127 | lines_added = 0; |
127 | lines_added = 0; |
128 | lines_removed = 0; |
128 | lines_removed = 0; |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
130 | &binary, count_diff_lines); |
130 | &binary, 0, count_diff_lines); |
131 | if (files >= slots) { |
131 | if (files >= slots) { |
132 | if (slots == 0) |
132 | if (slots == 0) |
133 | slots = 4; |
133 | slots = 4; |
134 | else |
134 | else |
135 | slots = slots * 2; |
135 | slots = slots * 2; |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
137 | } |
137 | } |
138 | items[files-1].status = pair->status; |
138 | items[files-1].status = pair->status; |
139 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
139 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
140 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
140 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
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, const char *prefix) |
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, |
@@ -259,65 +259,65 @@ static void print_ssdiff_link() |
259 | else |
259 | else |
260 | cgit_diff_link("Side-by-side diff", NULL, NULL, |
260 | cgit_diff_link("Side-by-side diff", NULL, NULL, |
261 | ctx.qry.head, ctx.qry.sha1, |
261 | ctx.qry.head, ctx.qry.sha1, |
262 | ctx.qry.sha2, ctx.qry.path, 1); |
262 | ctx.qry.sha2, ctx.qry.path, 1); |
263 | } |
263 | } |
264 | } |
264 | } |
265 | |
265 | |
266 | static void filepair_cb(struct diff_filepair *pair) |
266 | static void filepair_cb(struct diff_filepair *pair) |
267 | { |
267 | { |
268 | unsigned long old_size = 0; |
268 | unsigned long old_size = 0; |
269 | unsigned long new_size = 0; |
269 | unsigned long new_size = 0; |
270 | int binary = 0; |
270 | int binary = 0; |
271 | linediff_fn print_line_fn = print_line; |
271 | linediff_fn print_line_fn = print_line; |
272 | |
272 | |
273 | if (use_ssdiff) { |
273 | if (use_ssdiff) { |
274 | cgit_ssdiff_header_begin(); |
274 | cgit_ssdiff_header_begin(); |
275 | print_line_fn = cgit_ssdiff_line_cb; |
275 | print_line_fn = cgit_ssdiff_line_cb; |
276 | } |
276 | } |
277 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
277 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
278 | pair->two->sha1, pair->two->path, pair->two->mode); |
278 | pair->two->sha1, pair->two->path, pair->two->mode); |
279 | if (use_ssdiff) |
279 | if (use_ssdiff) |
280 | cgit_ssdiff_header_end(); |
280 | cgit_ssdiff_header_end(); |
281 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
281 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
282 | if (S_ISGITLINK(pair->one->mode)) |
282 | if (S_ISGITLINK(pair->one->mode)) |
283 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
283 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
284 | if (S_ISGITLINK(pair->two->mode)) |
284 | if (S_ISGITLINK(pair->two->mode)) |
285 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
285 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
286 | if (use_ssdiff) |
286 | if (use_ssdiff) |
287 | cgit_ssdiff_footer(); |
287 | cgit_ssdiff_footer(); |
288 | return; |
288 | return; |
289 | } |
289 | } |
290 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
290 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
291 | &new_size, &binary, print_line_fn)) |
291 | &new_size, &binary, ctx.qry.context, print_line_fn)) |
292 | cgit_print_error("Error running diff"); |
292 | cgit_print_error("Error running diff"); |
293 | if (binary) { |
293 | if (binary) { |
294 | if (use_ssdiff) |
294 | if (use_ssdiff) |
295 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
295 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
296 | else |
296 | else |
297 | html("Binary files differ"); |
297 | html("Binary files differ"); |
298 | } |
298 | } |
299 | if (use_ssdiff) |
299 | if (use_ssdiff) |
300 | cgit_ssdiff_footer(); |
300 | cgit_ssdiff_footer(); |
301 | } |
301 | } |
302 | |
302 | |
303 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
303 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
304 | { |
304 | { |
305 | enum object_type type; |
305 | enum object_type type; |
306 | unsigned long size; |
306 | unsigned long size; |
307 | struct commit *commit, *commit2; |
307 | struct commit *commit, *commit2; |
308 | |
308 | |
309 | if (!new_rev) |
309 | if (!new_rev) |
310 | new_rev = ctx.qry.head; |
310 | new_rev = ctx.qry.head; |
311 | get_sha1(new_rev, new_rev_sha1); |
311 | get_sha1(new_rev, new_rev_sha1); |
312 | type = sha1_object_info(new_rev_sha1, &size); |
312 | type = sha1_object_info(new_rev_sha1, &size); |
313 | if (type == OBJ_BAD) { |
313 | if (type == OBJ_BAD) { |
314 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
314 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
315 | return; |
315 | return; |
316 | } |
316 | } |
317 | commit = lookup_commit_reference(new_rev_sha1); |
317 | commit = lookup_commit_reference(new_rev_sha1); |
318 | if (!commit || parse_commit(commit)) |
318 | if (!commit || parse_commit(commit)) |
319 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
319 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
320 | |
320 | |
321 | if (old_rev) |
321 | if (old_rev) |
322 | get_sha1(old_rev, old_rev_sha1); |
322 | get_sha1(old_rev, old_rev_sha1); |
323 | else if (commit->parents && commit->parents->item) |
323 | else if (commit->parents && commit->parents->item) |
|