blob: b7767b3c07a23ea06e3aa3aab103fe3bf765cfe4 [file] [log] [blame]
Lars Hjemli36aba002006-12-20 22:48:27 +01001/* ui-diff.c: show diff between two blobs
2 *
3 * Copyright (C) 2006 Lars Hjemli
4 *
5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text)
7 */
8
9#include "cgit.h"
Lars Hjemlib1f9b9c2008-02-23 22:45:33 +010010#include "html.h"
Lars Hjemlia4d1ca12008-03-24 16:50:57 +010011#include "ui-shared.h"
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +020012#include "ui-ssdiff.h"
Lars Hjemli36aba002006-12-20 22:48:27 +010013
Lars Hjemlie238ebe2007-10-01 12:30:29 +020014unsigned char old_rev_sha1[20];
15unsigned char new_rev_sha1[20];
16
Lars Hjemlife1230d2008-04-24 23:32:02 +020017static int files, slots;
18static int total_adds, total_rems, max_changes;
19static int lines_added, lines_removed;
Lars Hjemlife1230d2008-04-24 23:32:02 +020020
21static struct fileinfo {
22 char status;
23 unsigned char old_sha1[20];
24 unsigned char new_sha1[20];
25 unsigned short old_mode;
26 unsigned short new_mode;
27 char *old_path;
28 char *new_path;
29 unsigned int added;
30 unsigned int removed;
Lars Hjemlic495cf02009-01-31 10:40:40 +010031 unsigned long old_size;
32 unsigned long new_size;
33 int binary:1;
Lars Hjemlife1230d2008-04-24 23:32:02 +020034} *items;
35
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +020036static int use_ssdiff = 0;
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +010037static struct diff_filepair *current_filepair;
38
39struct diff_filespec *cgit_get_current_old_file(void)
40{
41 return current_filepair->one;
42}
43
44struct diff_filespec *cgit_get_current_new_file(void)
45{
46 return current_filepair->two;
47}
Lars Hjemlife1230d2008-04-24 23:32:02 +020048
49static void print_fileinfo(struct fileinfo *info)
50{
51 char *class;
52
53 switch (info->status) {
54 case DIFF_STATUS_ADDED:
55 class = "add";
56 break;
57 case DIFF_STATUS_COPIED:
58 class = "cpy";
59 break;
60 case DIFF_STATUS_DELETED:
61 class = "del";
62 break;
63 case DIFF_STATUS_MODIFIED:
64 class = "upd";
65 break;
66 case DIFF_STATUS_RENAMED:
67 class = "mov";
68 break;
69 case DIFF_STATUS_TYPE_CHANGED:
70 class = "typ";
71 break;
72 case DIFF_STATUS_UNKNOWN:
73 class = "unk";
74 break;
75 case DIFF_STATUS_UNMERGED:
76 class = "stg";
77 break;
78 default:
79 die("bug: unhandled diff status %c", info->status);
80 }
81
82 html("<tr>");
83 htmlf("<td class='mode'>");
84 if (is_null_sha1(info->new_sha1)) {
85 cgit_print_filemode(info->old_mode);
86 } else {
87 cgit_print_filemode(info->new_mode);
88 }
89
90 if (info->old_mode != info->new_mode &&
91 !is_null_sha1(info->old_sha1) &&
92 !is_null_sha1(info->new_sha1)) {
93 html("<span class='modechange'>[");
94 cgit_print_filemode(info->old_mode);
95 html("]</span>");
96 }
97 htmlf("</td><td class='%s'>", class);
Lars Hjemli04619c92008-09-23 17:47:26 +020098 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
Ragnar Ouchterlonyc358aa32009-09-14 20:19:02 +020099 ctx.qry.sha2, info->new_path, 0);
Lars Hjemlife1230d2008-04-24 23:32:02 +0200100 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
101 htmlf(" (%s from %s)",
102 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
103 info->old_path);
104 html("</td><td class='right'>");
Lars Hjemlic495cf02009-01-31 10:40:40 +0100105 if (info->binary) {
Mark Lodatoe4ddc8f2010-09-04 11:30:18 -0400106 htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
Lars Hjemlic495cf02009-01-31 10:40:40 +0100107 info->old_size, info->new_size);
108 return;
109 }
Lars Hjemlife1230d2008-04-24 23:32:02 +0200110 htmlf("%d", info->added + info->removed);
111 html("</td><td class='graph'>");
112 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
113 htmlf("<td class='add' style='width: %.1f%%;'/>",
114 info->added * 100.0 / max_changes);
115 htmlf("<td class='rem' style='width: %.1f%%;'/>",
116 info->removed * 100.0 / max_changes);
117 htmlf("<td class='none' style='width: %.1f%%;'/>",
118 (max_changes - info->removed - info->added) * 100.0 / max_changes);
119 html("</tr></table></td></tr>\n");
120}
121
122static void count_diff_lines(char *line, int len)
123{
124 if (line && (len > 0)) {
125 if (line[0] == '+')
126 lines_added++;
127 else if (line[0] == '-')
128 lines_removed++;
129 }
130}
131
132static void inspect_filepair(struct diff_filepair *pair)
133{
Lars Hjemlic495cf02009-01-31 10:40:40 +0100134 int binary = 0;
135 unsigned long old_size = 0;
136 unsigned long new_size = 0;
Lars Hjemlife1230d2008-04-24 23:32:02 +0200137 files++;
138 lines_added = 0;
139 lines_removed = 0;
Lars Hjemlic495cf02009-01-31 10:40:40 +0100140 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
Johan Herland2cc8b992010-06-24 17:52:57 +0200141 &binary, 0, ctx.qry.ignorews, count_diff_lines);
Lars Hjemlife1230d2008-04-24 23:32:02 +0200142 if (files >= slots) {
143 if (slots == 0)
144 slots = 4;
145 else
146 slots = slots * 2;
147 items = xrealloc(items, slots * sizeof(struct fileinfo));
148 }
149 items[files-1].status = pair->status;
150 hashcpy(items[files-1].old_sha1, pair->one->sha1);
151 hashcpy(items[files-1].new_sha1, pair->two->sha1);
152 items[files-1].old_mode = pair->one->mode;
153 items[files-1].new_mode = pair->two->mode;
154 items[files-1].old_path = xstrdup(pair->one->path);
155 items[files-1].new_path = xstrdup(pair->two->path);
156 items[files-1].added = lines_added;
157 items[files-1].removed = lines_removed;
Lars Hjemlic495cf02009-01-31 10:40:40 +0100158 items[files-1].old_size = old_size;
159 items[files-1].new_size = new_size;
160 items[files-1].binary = binary;
Lars Hjemlife1230d2008-04-24 23:32:02 +0200161 if (lines_added + lines_removed > max_changes)
162 max_changes = lines_added + lines_removed;
163 total_adds += lines_added;
164 total_rems += lines_removed;
165}
166
167void cgit_print_diffstat(const unsigned char *old_sha1,
Johan Herlandc46e4682010-06-10 01:09:31 +0200168 const unsigned char *new_sha1, const char *prefix)
Lars Hjemlife1230d2008-04-24 23:32:02 +0200169{
Lars Hjemli962a2482011-03-06 23:59:56 +0100170 int i;
Lars Hjemlife1230d2008-04-24 23:32:02 +0200171
Lars Hjemlif82b1942008-09-23 17:54:45 +0200172 html("<div class='diffstat-header'>");
173 cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
Ragnar Ouchterlonyc358aa32009-09-14 20:19:02 +0200174 ctx.qry.sha2, NULL, 0);
Lukasz Janyst7f3c6e02011-03-05 14:10:55 +0100175 if (prefix) {
176 html(" (limited to '");
177 html_txt(prefix);
178 html("')");
179 }
Lars Hjemlif82b1942008-09-23 17:54:45 +0200180 html("</div>");
Lars Hjemlife1230d2008-04-24 23:32:02 +0200181 html("<table summary='diffstat' class='diffstat'>");
182 max_changes = 0;
Johan Herland2cc8b992010-06-24 17:52:57 +0200183 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
184 ctx.qry.ignorews);
Lars Hjemlife1230d2008-04-24 23:32:02 +0200185 for(i = 0; i<files; i++)
186 print_fileinfo(&items[i]);
187 html("</table>");
188 html("<div class='diffstat-summary'>");
189 htmlf("%d files changed, %d insertions, %d deletions",
190 files, total_adds, total_rems);
191 html("</div>");
192}
193
194
Lars Hjemli36aba002006-12-20 22:48:27 +0100195/*
196 * print a single line returned from xdiff
197 */
198static void print_line(char *line, int len)
199{
200 char *class = "ctx";
201 char c = line[len-1];
202
203 if (line[0] == '+')
204 class = "add";
205 else if (line[0] == '-')
206 class = "del";
207 else if (line[0] == '@')
208 class = "hunk";
209
210 htmlf("<div class='%s'>", class);
211 line[len-1] = '\0';
212 html_txt(line);
213 html("</div>");
214 line[len-1] = c;
215}
216
Lars Hjemlif4f13392007-05-16 04:21:06 +0200217static void header(unsigned char *sha1, char *path1, int mode1,
218 unsigned char *sha2, char *path2, int mode2)
Lars Hjemlia342ac62007-05-14 18:31:05 +0200219{
220 char *abbrev1, *abbrev2;
Lars Hjemlif4f13392007-05-16 04:21:06 +0200221 int subproject;
222
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -0500223 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
Lars Hjemlia342ac62007-05-14 18:31:05 +0200224 html("<div class='head'>");
225 html("diff --git a/");
226 html_txt(path1);
227 html(" b/");
228 html_txt(path2);
Lars Hjemlif4f13392007-05-16 04:21:06 +0200229
230 if (is_null_sha1(sha1))
231 path1 = "dev/null";
232 if (is_null_sha1(sha2))
233 path2 = "dev/null";
234
235 if (mode1 == 0)
236 htmlf("<br/>new file mode %.6o", mode2);
237
238 if (mode2 == 0)
239 htmlf("<br/>deleted file mode %.6o", mode1);
240
241 if (!subproject) {
242 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
243 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
244 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
245 free(abbrev1);
246 free(abbrev2);
247 if (mode1 != 0 && mode2 != 0) {
248 htmlf(" %.6o", mode1);
249 if (mode2 != mode1)
250 htmlf("..%.6o", mode2);
251 }
252 html("<br/>--- a/");
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200253 if (mode1 != 0)
Lars Hjemlid14d77f2008-02-16 11:53:40 +0100254 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200255 sha1_to_hex(old_rev_sha1), path1);
256 else
257 html_txt(path1);
Lars Hjemlif4f13392007-05-16 04:21:06 +0200258 html("<br/>+++ b/");
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200259 if (mode2 != 0)
Lars Hjemlid14d77f2008-02-16 11:53:40 +0100260 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200261 sha1_to_hex(new_rev_sha1), path2);
262 else
263 html_txt(path2);
Lars Hjemlif4f13392007-05-16 04:21:06 +0200264 }
Lars Hjemlia342ac62007-05-14 18:31:05 +0200265 html("</div>");
266}
267
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200268static void filepair_cb(struct diff_filepair *pair)
269{
Lars Hjemlic495cf02009-01-31 10:40:40 +0100270 unsigned long old_size = 0;
271 unsigned long new_size = 0;
272 int binary = 0;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200273 linediff_fn print_line_fn = print_line;
Lars Hjemlic495cf02009-01-31 10:40:40 +0100274
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100275 current_filepair = pair;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200276 if (use_ssdiff) {
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200277 cgit_ssdiff_header_begin();
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200278 print_line_fn = cgit_ssdiff_line_cb;
279 }
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200280 header(pair->one->sha1, pair->one->path, pair->one->mode,
281 pair->two->sha1, pair->two->path, pair->two->mode);
282 if (use_ssdiff)
283 cgit_ssdiff_header_end();
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -0500284 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
285 if (S_ISGITLINK(pair->one->mode))
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200286 print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -0500287 if (S_ISGITLINK(pair->two->mode))
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200288 print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200289 if (use_ssdiff)
290 cgit_ssdiff_footer();
Lars Hjemlif4f13392007-05-16 04:21:06 +0200291 return;
292 }
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200293 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
Johan Herland2cc8b992010-06-24 17:52:57 +0200294 &new_size, &binary, ctx.qry.context,
295 ctx.qry.ignorews, print_line_fn))
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200296 cgit_print_error("Error running diff");
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200297 if (binary) {
298 if (use_ssdiff)
299 html("<tr><td colspan='4'>Binary files differ</td></tr>");
300 else
301 html("Binary files differ");
302 }
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200303 if (use_ssdiff)
304 cgit_ssdiff_footer();
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200305}
306
Lars Hjemli962a2482011-03-06 23:59:56 +0100307void cgit_print_diff_ctrls()
308{
309 int i, curr;
310
311 html("<div class='cgit-panel'>");
312 html("<b>diff options</b>");
313 html("<form method='get' action='.'>");
314 cgit_add_hidden_formfields(1, 0, ctx.qry.page);
315 html("<table>");
316 html("<tr><td colspan='2'/></tr>");
317 html("<tr>");
318 html("<td class='label'>context:</td>");
319 html("<td class='ctrl'>");
320 html("<select name='context' onchange='this.form.submit();'>");
321 curr = ctx.qry.context;
322 if (!curr)
323 curr = 3;
324 for (i = 1; i <= 10; i++)
325 html_intoption(i, fmt("%d", i), curr);
326 for (i = 15; i <= 40; i += 5)
327 html_intoption(i, fmt("%d", i), curr);
328 html("</select>");
329 html("</td>");
330 html("</tr><tr>");
331 html("<td class='label'>space:</td>");
332 html("<td class='ctrl'>");
333 html("<select name='ignorews' onchange='this.form.submit();'>");
334 html_intoption(0, "include", ctx.qry.ignorews);
335 html_intoption(1, "ignore", ctx.qry.ignorews);
336 html("</select>");
337 html("</td>");
338 html("</tr><tr>");
339 html("<td class='label'>mode:</td>");
340 html("<td class='ctrl'>");
341 html("<select name='ss' onchange='this.form.submit();'>");
342 curr = ctx.qry.ssdiff;
343 if (!curr && ctx.cfg.ssdiff)
344 curr = 1;
345 html_intoption(0, "unified", curr);
346 html_intoption(1, "ssdiff", curr);
347 html("</select></td></tr>");
348 html("<tr><td/><td class='ctrl'>");
349 html("<noscript><input type='submit' value='reload'/></noscript>");
350 html("</td></tr></table>");
351 html("</form>");
352 html("</div>");
353}
354
355void cgit_print_diff(const char *new_rev, const char *old_rev,
356 const char *prefix, int show_ctrls)
Lars Hjemli36aba002006-12-20 22:48:27 +0100357{
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200358 enum object_type type;
359 unsigned long size;
Lars Hjemli4a0be582007-06-17 18:12:03 +0200360 struct commit *commit, *commit2;
Lars Hjemlif9ff7df2007-05-16 00:58:35 +0200361
Lars Hjemli4a0be582007-06-17 18:12:03 +0200362 if (!new_rev)
Lars Hjemlid14d77f2008-02-16 11:53:40 +0100363 new_rev = ctx.qry.head;
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200364 get_sha1(new_rev, new_rev_sha1);
365 type = sha1_object_info(new_rev_sha1, &size);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200366 if (type == OBJ_BAD) {
367 cgit_print_error(fmt("Bad object name: %s", new_rev));
368 return;
369 }
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200370 commit = lookup_commit_reference(new_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200371 if (!commit || parse_commit(commit))
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200372 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
Lars Hjemli36aba002006-12-20 22:48:27 +0100373
Lars Hjemli4a0be582007-06-17 18:12:03 +0200374 if (old_rev)
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200375 get_sha1(old_rev, old_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200376 else if (commit->parents && commit->parents->item)
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200377 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200378 else
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200379 hashclr(old_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200380
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200381 if (!is_null_sha1(old_rev_sha1)) {
382 type = sha1_object_info(old_rev_sha1, &size);
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200383 if (type == OBJ_BAD) {
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200384 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200385 return;
386 }
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200387 commit2 = lookup_commit_reference(old_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200388 if (!commit2 || parse_commit(commit2))
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200389 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200390 }
Ragnar Ouchterlonyc358aa32009-09-14 20:19:02 +0200391
392 if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
393 use_ssdiff = 1;
394
Lars Hjemli962a2482011-03-06 23:59:56 +0100395 if (show_ctrls)
396 cgit_print_diff_ctrls();
397
Johan Herlandc46e4682010-06-10 01:09:31 +0200398 cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
Lars Hjemlife1230d2008-04-24 23:32:02 +0200399
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200400 if (use_ssdiff) {
401 html("<table summary='ssdiff' class='ssdiff'>");
402 } else {
403 html("<table summary='diff' class='diff'>");
404 html("<tr><td>");
405 }
Johan Herland2cc8b992010-06-24 17:52:57 +0200406 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
407 ctx.qry.ignorews);
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200408 if (!use_ssdiff)
409 html("</td></tr>");
Ondrej Jirman0928d882007-05-26 01:14:25 +0200410 html("</table>");
Lars Hjemli36aba002006-12-20 22:48:27 +0100411}