|
diff --git a/ui-diff.c b/ui-diff.c index a92a768..fb836df 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -109,107 +109,109 @@ static void print_fileinfo(struct fileinfo *info) |
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, 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) |
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"; |
184 | char c = line[len-1]; |
186 | char c = line[len-1]; |
185 | |
187 | |
186 | if (line[0] == '+') |
188 | if (line[0] == '+') |
187 | class = "add"; |
189 | class = "add"; |
188 | else if (line[0] == '-') |
190 | else if (line[0] == '-') |
189 | class = "del"; |
191 | class = "del"; |
190 | else if (line[0] == '@') |
192 | else if (line[0] == '@') |
191 | class = "hunk"; |
193 | class = "hunk"; |
192 | |
194 | |
193 | htmlf("<div class='%s'>", class); |
195 | htmlf("<div class='%s'>", class); |
194 | line[len-1] = '\0'; |
196 | line[len-1] = '\0'; |
195 | html_txt(line); |
197 | html_txt(line); |
196 | html("</div>"); |
198 | html("</div>"); |
197 | line[len-1] = c; |
199 | line[len-1] = c; |
198 | } |
200 | } |
199 | |
201 | |
200 | static void header(unsigned char *sha1, char *path1, int mode1, |
202 | static void header(unsigned char *sha1, char *path1, int mode1, |
201 | unsigned char *sha2, char *path2, int mode2) |
203 | unsigned char *sha2, char *path2, int mode2) |
202 | { |
204 | { |
203 | char *abbrev1, *abbrev2; |
205 | char *abbrev1, *abbrev2; |
204 | int subproject; |
206 | int subproject; |
205 | |
207 | |
206 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
208 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
207 | html("<div class='head'>"); |
209 | html("<div class='head'>"); |
208 | html("diff --git a/"); |
210 | html("diff --git a/"); |
209 | html_txt(path1); |
211 | html_txt(path1); |
210 | html(" b/"); |
212 | html(" b/"); |
211 | html_txt(path2); |
213 | html_txt(path2); |
212 | |
214 | |
213 | if (is_null_sha1(sha1)) |
215 | if (is_null_sha1(sha1)) |
214 | path1 = "dev/null"; |
216 | path1 = "dev/null"; |
215 | if (is_null_sha1(sha2)) |
217 | if (is_null_sha1(sha2)) |
@@ -293,61 +295,61 @@ static void filepair_cb(struct diff_filepair *pair) |
293 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
295 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
294 | else |
296 | else |
295 | html("Binary files differ"); |
297 | html("Binary files differ"); |
296 | } |
298 | } |
297 | if (use_ssdiff) |
299 | if (use_ssdiff) |
298 | cgit_ssdiff_footer(); |
300 | cgit_ssdiff_footer(); |
299 | } |
301 | } |
300 | |
302 | |
301 | 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) |
302 | { |
304 | { |
303 | enum object_type type; |
305 | enum object_type type; |
304 | unsigned long size; |
306 | unsigned long size; |
305 | struct commit *commit, *commit2; |
307 | struct commit *commit, *commit2; |
306 | |
308 | |
307 | if (!new_rev) |
309 | if (!new_rev) |
308 | new_rev = ctx.qry.head; |
310 | new_rev = ctx.qry.head; |
309 | get_sha1(new_rev, new_rev_sha1); |
311 | get_sha1(new_rev, new_rev_sha1); |
310 | type = sha1_object_info(new_rev_sha1, &size); |
312 | type = sha1_object_info(new_rev_sha1, &size); |
311 | if (type == OBJ_BAD) { |
313 | if (type == OBJ_BAD) { |
312 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
314 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
313 | return; |
315 | return; |
314 | } |
316 | } |
315 | commit = lookup_commit_reference(new_rev_sha1); |
317 | commit = lookup_commit_reference(new_rev_sha1); |
316 | if (!commit || parse_commit(commit)) |
318 | if (!commit || parse_commit(commit)) |
317 | 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))); |
318 | |
320 | |
319 | if (old_rev) |
321 | if (old_rev) |
320 | get_sha1(old_rev, old_rev_sha1); |
322 | get_sha1(old_rev, old_rev_sha1); |
321 | else if (commit->parents && commit->parents->item) |
323 | else if (commit->parents && commit->parents->item) |
322 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
324 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
323 | else |
325 | else |
324 | hashclr(old_rev_sha1); |
326 | hashclr(old_rev_sha1); |
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 | } |
|