summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
Unidiff
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-diff.c b/ui-diff.c
index fb836df..d3a3b2c 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -66,129 +66,129 @@ static void print_fileinfo(struct fileinfo *info)
66 break; 66 break;
67 default: 67 default:
68 die("bug: unhandled diff status %c", info->status); 68 die("bug: unhandled diff status %c", info->status);
69 } 69 }
70 70
71 html("<tr>"); 71 html("<tr>");
72 htmlf("<td class='mode'>"); 72 htmlf("<td class='mode'>");
73 if (is_null_sha1(info->new_sha1)) { 73 if (is_null_sha1(info->new_sha1)) {
74 cgit_print_filemode(info->old_mode); 74 cgit_print_filemode(info->old_mode);
75 } else { 75 } else {
76 cgit_print_filemode(info->new_mode); 76 cgit_print_filemode(info->new_mode);
77 } 77 }
78 78
79 if (info->old_mode != info->new_mode && 79 if (info->old_mode != info->new_mode &&
80 !is_null_sha1(info->old_sha1) && 80 !is_null_sha1(info->old_sha1) &&
81 !is_null_sha1(info->new_sha1)) { 81 !is_null_sha1(info->new_sha1)) {
82 html("<span class='modechange'>["); 82 html("<span class='modechange'>[");
83 cgit_print_filemode(info->old_mode); 83 cgit_print_filemode(info->old_mode);
84 html("]</span>"); 84 html("]</span>");
85 } 85 }
86 htmlf("</td><td class='%s'>", class); 86 htmlf("</td><td class='%s'>", class);
87 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, 87 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
88 ctx.qry.sha2, info->new_path, 0); 88 ctx.qry.sha2, info->new_path, 0);
89 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) 89 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
90 htmlf(" (%s from %s)", 90 htmlf(" (%s from %s)",
91 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", 91 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
92 info->old_path); 92 info->old_path);
93 html("</td><td class='right'>"); 93 html("</td><td class='right'>");
94 if (info->binary) { 94 if (info->binary) {
95 htmlf("bin</td><td class='graph'>%d -> %d bytes", 95 htmlf("bin</td><td class='graph'>%d -> %d bytes",
96 info->old_size, info->new_size); 96 info->old_size, info->new_size);
97 return; 97 return;
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
111static void count_diff_lines(char *line, int len) 111static 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
121static void inspect_filepair(struct diff_filepair *pair) 121static 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
156void cgit_print_diffstat(const unsigned char *old_sha1, 156void 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,
163 ctx.qry.sha2, NULL, 0); 163 ctx.qry.sha2, NULL, 0);
164 if (prefix) 164 if (prefix)
165 htmlf(" (limited to '%s')", prefix); 165 htmlf(" (limited to '%s')", prefix);
166 html("</div>"); 166 html("</div>");
167 html("<table summary='diffstat' class='diffstat'>"); 167 html("<table summary='diffstat' class='diffstat'>");
168 max_changes = 0; 168 max_changes = 0;
169 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); 169 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix);
170 for(i = 0; i<files; i++) 170 for(i = 0; i<files; i++)
171 print_fileinfo(&items[i]); 171 print_fileinfo(&items[i]);
172 html("</table>"); 172 html("</table>");
173 html("<div class='diffstat-summary'>"); 173 html("<div class='diffstat-summary'>");
174 htmlf("%d files changed, %d insertions, %d deletions", 174 htmlf("%d files changed, %d insertions, %d deletions",
175 files, total_adds, total_rems); 175 files, total_adds, total_rems);
176 html("</div>"); 176 html("</div>");
177} 177}
178 178
179 179
180/* 180/*
181 * print a single line returned from xdiff 181 * print a single line returned from xdiff
182 */ 182 */
183static void print_line(char *line, int len) 183static void print_line(char *line, int len)
184{ 184{
185 char *class = "ctx"; 185 char *class = "ctx";
186 char c = line[len-1]; 186 char c = line[len-1];
187 187
188 if (line[0] == '+') 188 if (line[0] == '+')
189 class = "add"; 189 class = "add";
190 else if (line[0] == '-') 190 else if (line[0] == '-')
191 class = "del"; 191 class = "del";
192 else if (line[0] == '@') 192 else if (line[0] == '@')
193 class = "hunk"; 193 class = "hunk";
194 194
@@ -227,129 +227,129 @@ static void header(unsigned char *sha1, char *path1, int mode1,
227 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); 227 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
228 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); 228 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
229 htmlf("<br/>index %s..%s", abbrev1, abbrev2); 229 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
230 free(abbrev1); 230 free(abbrev1);
231 free(abbrev2); 231 free(abbrev2);
232 if (mode1 != 0 && mode2 != 0) { 232 if (mode1 != 0 && mode2 != 0) {
233 htmlf(" %.6o", mode1); 233 htmlf(" %.6o", mode1);
234 if (mode2 != mode1) 234 if (mode2 != mode1)
235 htmlf("..%.6o", mode2); 235 htmlf("..%.6o", mode2);
236 } 236 }
237 html("<br/>--- a/"); 237 html("<br/>--- a/");
238 if (mode1 != 0) 238 if (mode1 != 0)
239 cgit_tree_link(path1, NULL, NULL, ctx.qry.head, 239 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
240 sha1_to_hex(old_rev_sha1), path1); 240 sha1_to_hex(old_rev_sha1), path1);
241 else 241 else
242 html_txt(path1); 242 html_txt(path1);
243 html("<br/>+++ b/"); 243 html("<br/>+++ b/");
244 if (mode2 != 0) 244 if (mode2 != 0)
245 cgit_tree_link(path2, NULL, NULL, ctx.qry.head, 245 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
246 sha1_to_hex(new_rev_sha1), path2); 246 sha1_to_hex(new_rev_sha1), path2);
247 else 247 else
248 html_txt(path2); 248 html_txt(path2);
249 } 249 }
250 html("</div>"); 250 html("</div>");
251} 251}
252 252
253static void print_ssdiff_link() 253static void print_ssdiff_link()
254{ 254{
255 if (!strcmp(ctx.qry.page, "diff")) { 255 if (!strcmp(ctx.qry.page, "diff")) {
256 if (use_ssdiff) 256 if (use_ssdiff)
257 cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, 257 cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
258 ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); 258 ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
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
266static void filepair_cb(struct diff_filepair *pair) 266static 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
303void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) 303void 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)
324 hashcpy(old_rev_sha1, commit->parents->item->object.sha1); 324 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
325 else 325 else
326 hashclr(old_rev_sha1); 326 hashclr(old_rev_sha1);
327 327
328 if (!is_null_sha1(old_rev_sha1)) { 328 if (!is_null_sha1(old_rev_sha1)) {
329 type = sha1_object_info(old_rev_sha1, &size); 329 type = sha1_object_info(old_rev_sha1, &size);
330 if (type == OBJ_BAD) { 330 if (type == OBJ_BAD) {
331 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)));
332 return; 332 return;
333 } 333 }
334 commit2 = lookup_commit_reference(old_rev_sha1); 334 commit2 = lookup_commit_reference(old_rev_sha1);
335 if (!commit2 || parse_commit(commit2)) 335 if (!commit2 || parse_commit(commit2))
336 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)));
337 } 337 }
338 338
339 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))
340 use_ssdiff = 1; 340 use_ssdiff = 1;
341 341
342 print_ssdiff_link(); 342 print_ssdiff_link();
343 cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); 343 cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
344 344
345 if (use_ssdiff) { 345 if (use_ssdiff) {
346 html("<table summary='ssdiff' class='ssdiff'>"); 346 html("<table summary='ssdiff' class='ssdiff'>");
347 } else { 347 } else {
348 html("<table summary='diff' class='diff'>"); 348 html("<table summary='diff' class='diff'>");
349 html("<tr><td>"); 349 html("<tr><td>");
350 } 350 }
351 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);
352 if (!use_ssdiff) 352 if (!use_ssdiff)
353 html("</td></tr>"); 353 html("</td></tr>");
354 html("</table>"); 354 html("</table>");
355} 355}