summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-diff.c14
-rw-r--r--ui-ssdiff.c8
2 files changed, 16 insertions, 6 deletions
diff --git a/ui-diff.c b/ui-diff.c
index b21c2c1..a92a768 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -232,83 +232,89 @@ static void header(unsigned char *sha1, char *path1, int mode1,
232 if (mode2 != mode1) 232 if (mode2 != mode1)
233 htmlf("..%.6o", mode2); 233 htmlf("..%.6o", mode2);
234 } 234 }
235 html("<br/>--- a/"); 235 html("<br/>--- a/");
236 if (mode1 != 0) 236 if (mode1 != 0)
237 cgit_tree_link(path1, NULL, NULL, ctx.qry.head, 237 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
238 sha1_to_hex(old_rev_sha1), path1); 238 sha1_to_hex(old_rev_sha1), path1);
239 else 239 else
240 html_txt(path1); 240 html_txt(path1);
241 html("<br/>+++ b/"); 241 html("<br/>+++ b/");
242 if (mode2 != 0) 242 if (mode2 != 0)
243 cgit_tree_link(path2, NULL, NULL, ctx.qry.head, 243 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
244 sha1_to_hex(new_rev_sha1), path2); 244 sha1_to_hex(new_rev_sha1), path2);
245 else 245 else
246 html_txt(path2); 246 html_txt(path2);
247 } 247 }
248 html("</div>"); 248 html("</div>");
249} 249}
250 250
251static void print_ssdiff_link() 251static void print_ssdiff_link()
252{ 252{
253 if (!strcmp(ctx.qry.page, "diff")) { 253 if (!strcmp(ctx.qry.page, "diff")) {
254 if (use_ssdiff) 254 if (use_ssdiff)
255 cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, 255 cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
256 ctx.qry.sha1, ctx.qry.sha2, NULL, 1); 256 ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
257 else 257 else
258 cgit_diff_link("Side-by-side diff", NULL, NULL, 258 cgit_diff_link("Side-by-side diff", NULL, NULL,
259 ctx.qry.head, ctx.qry.sha1, 259 ctx.qry.head, ctx.qry.sha1,
260 ctx.qry.sha2, NULL, 1); 260 ctx.qry.sha2, ctx.qry.path, 1);
261 } 261 }
262} 262}
263 263
264static void filepair_cb(struct diff_filepair *pair) 264static void filepair_cb(struct diff_filepair *pair)
265{ 265{
266 unsigned long old_size = 0; 266 unsigned long old_size = 0;
267 unsigned long new_size = 0; 267 unsigned long new_size = 0;
268 int binary = 0; 268 int binary = 0;
269 linediff_fn print_line_fn = print_line; 269 linediff_fn print_line_fn = print_line;
270 270
271 if (use_ssdiff) { 271 if (use_ssdiff) {
272 cgit_ssdiff_header_begin(); 272 cgit_ssdiff_header_begin();
273 print_line_fn = cgit_ssdiff_line_cb; 273 print_line_fn = cgit_ssdiff_line_cb;
274 } 274 }
275 header(pair->one->sha1, pair->one->path, pair->one->mode, 275 header(pair->one->sha1, pair->one->path, pair->one->mode,
276 pair->two->sha1, pair->two->path, pair->two->mode); 276 pair->two->sha1, pair->two->path, pair->two->mode);
277 if (use_ssdiff) 277 if (use_ssdiff)
278 cgit_ssdiff_header_end(); 278 cgit_ssdiff_header_end();
279 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 279 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
280 if (S_ISGITLINK(pair->one->mode)) 280 if (S_ISGITLINK(pair->one->mode))
281 print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 281 print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
282 if (S_ISGITLINK(pair->two->mode)) 282 if (S_ISGITLINK(pair->two->mode))
283 print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 283 print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
284 if (use_ssdiff)
285 cgit_ssdiff_footer();
284 return; 286 return;
285 } 287 }
286 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 288 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
287 &new_size, &binary, print_line_fn)) 289 &new_size, &binary, print_line_fn))
288 cgit_print_error("Error running diff"); 290 cgit_print_error("Error running diff");
289 if (binary) 291 if (binary) {
290 print_line_fn(" Binary files differ", 20); 292 if (use_ssdiff)
293 html("<tr><td colspan='4'>Binary files differ</td></tr>");
294 else
295 html("Binary files differ");
296 }
291 if (use_ssdiff) 297 if (use_ssdiff)
292 cgit_ssdiff_footer(); 298 cgit_ssdiff_footer();
293} 299}
294 300
295void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) 301void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
296{ 302{
297 enum object_type type; 303 enum object_type type;
298 unsigned long size; 304 unsigned long size;
299 struct commit *commit, *commit2; 305 struct commit *commit, *commit2;
300 306
301 if (!new_rev) 307 if (!new_rev)
302 new_rev = ctx.qry.head; 308 new_rev = ctx.qry.head;
303 get_sha1(new_rev, new_rev_sha1); 309 get_sha1(new_rev, new_rev_sha1);
304 type = sha1_object_info(new_rev_sha1, &size); 310 type = sha1_object_info(new_rev_sha1, &size);
305 if (type == OBJ_BAD) { 311 if (type == OBJ_BAD) {
306 cgit_print_error(fmt("Bad object name: %s", new_rev)); 312 cgit_print_error(fmt("Bad object name: %s", new_rev));
307 return; 313 return;
308 } 314 }
309 commit = lookup_commit_reference(new_rev_sha1); 315 commit = lookup_commit_reference(new_rev_sha1);
310 if (!commit || parse_commit(commit)) 316 if (!commit || parse_commit(commit))
311 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); 317 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
312 318
313 if (old_rev) 319 if (old_rev)
314 get_sha1(old_rev, old_rev_sha1); 320 get_sha1(old_rev, old_rev_sha1);
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 8215051..5673642 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -87,62 +87,66 @@ static void deferred_old_add(char *line, int line_no)
87 } 87 }
88} 88}
89 89
90static void deferred_new_add(char *line, int line_no) 90static void deferred_new_add(char *line, int line_no)
91{ 91{
92 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines)); 92 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
93 item->line = xstrdup(line); 93 item->line = xstrdup(line);
94 item->line_no = line_no; 94 item->line_no = line_no;
95 item->next = NULL; 95 item->next = NULL;
96 if (deferred_new) { 96 if (deferred_new) {
97 deferred_new_last->next = item; 97 deferred_new_last->next = item;
98 deferred_new_last = item; 98 deferred_new_last = item;
99 } else { 99 } else {
100 deferred_new = deferred_new_last = item; 100 deferred_new = deferred_new_last = item;
101 } 101 }
102} 102}
103 103
104static void print_ssdiff_line(char *class, int old_line_no, char *old_line, 104static void print_ssdiff_line(char *class, int old_line_no, char *old_line,
105 int new_line_no, char *new_line) 105 int new_line_no, char *new_line)
106{ 106{
107 html("<tr>"); 107 html("<tr>");
108 if (old_line_no > 0) 108 if (old_line_no > 0)
109 htmlf("<td class='lineno'>%d</td><td class='%s'>", 109 htmlf("<td class='lineno'>%d</td><td class='%s'>",
110 old_line_no, class); 110 old_line_no, class);
111 else if (old_line)
112 htmlf("<td class='lineno'></td><td class='%s'>", class);
111 else 113 else
112 htmlf("<td class='lineno'></td><td class='%s_dark'>", class); 114 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
113 115
114 if (old_line) { 116 if (old_line) {
115 old_line = replace_tabs(old_line + 1); 117 old_line = replace_tabs(old_line + 1);
116 html_txt(old_line); 118 html_txt(old_line);
117 free(old_line); 119 free(old_line);
118 } 120 }
119 121
120 html("</td>"); 122 html("</td>");
121 123
122 if (new_line_no > 0) 124 if (new_line_no > 0)
123 htmlf("<td class='lineno'>%d</td><td class='%s'>", 125 htmlf("<td class='lineno'>%d</td><td class='%s'>",
124 new_line_no, class); 126 new_line_no, class);
127 else if (new_line)
128 htmlf("<td class='lineno'></td><td class='%s'>", class);
125 else 129 else
126 htmlf("<td class='lineno'></td><td class='%s_dark'>", class); 130 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
127 131
128 if (new_line) { 132 if (new_line) {
129 new_line = replace_tabs(new_line + 1); 133 new_line = replace_tabs(new_line + 1);
130 html_txt(new_line); 134 html_txt(new_line);
131 free(new_line); 135 free(new_line);
132 } 136 }
133 137
134 html("</td></tr>"); 138 html("</td></tr>");
135} 139}
136 140
137static void print_deferred_old_lines() 141static void print_deferred_old_lines()
138{ 142{
139 struct deferred_lines *iter_old, *tmp; 143 struct deferred_lines *iter_old, *tmp;
140 144
141 iter_old = deferred_old; 145 iter_old = deferred_old;
142 while (iter_old) { 146 while (iter_old) {
143 print_ssdiff_line("del", iter_old->line_no, 147 print_ssdiff_line("del", iter_old->line_no,
144 iter_old->line, -1, NULL); 148 iter_old->line, -1, NULL);
145 tmp = iter_old->next; 149 tmp = iter_old->next;
146 free(iter_old); 150 free(iter_old);
147 iter_old = tmp; 151 iter_old = tmp;
148 } 152 }
@@ -230,41 +234,41 @@ void cgit_ssdiff_line_cb(char *line, int len)
230 print_ssdiff_line("ctx", current_old_line, line, 234 print_ssdiff_line("ctx", current_old_line, line,
231 current_new_line, line); 235 current_new_line, line);
232 current_old_line += 1; 236 current_old_line += 1;
233 current_new_line += 1; 237 current_new_line += 1;
234 } else if (line[0] == '+') { 238 } else if (line[0] == '+') {
235 deferred_new_add(line, current_new_line); 239 deferred_new_add(line, current_new_line);
236 current_new_line += 1; 240 current_new_line += 1;
237 } else if (line[0] == '-') { 241 } else if (line[0] == '-') {
238 deferred_old_add(line, current_old_line); 242 deferred_old_add(line, current_old_line);
239 current_old_line += 1; 243 current_old_line += 1;
240 } else if (line[0] == '@') { 244 } else if (line[0] == '@') {
241 html("<tr><td colspan='4' class='hunk'>"); 245 html("<tr><td colspan='4' class='hunk'>");
242 html_txt(line); 246 html_txt(line);
243 html("</td></tr>"); 247 html("</td></tr>");
244 } else { 248 } else {
245 html("<tr><td colspan='4' class='ctx'>"); 249 html("<tr><td colspan='4' class='ctx'>");
246 html_txt(line); 250 html_txt(line);
247 html("</td></tr>"); 251 html("</td></tr>");
248 } 252 }
249 line[len - 1] = c; 253 line[len - 1] = c;
250} 254}
251 255
252void cgit_ssdiff_header_begin() 256void cgit_ssdiff_header_begin()
253{ 257{
254 current_old_line = 0; 258 current_old_line = -1;
255 current_new_line = 0; 259 current_new_line = -1;
256 html("<tr><td class='space' colspan='4'><div></div></td></tr>"); 260 html("<tr><td class='space' colspan='4'><div></div></td></tr>");
257 html("<tr><td class='head' colspan='4'>"); 261 html("<tr><td class='head' colspan='4'>");
258} 262}
259 263
260void cgit_ssdiff_header_end() 264void cgit_ssdiff_header_end()
261{ 265{
262 html("</td><tr>"); 266 html("</td><tr>");
263} 267}
264 268
265void cgit_ssdiff_footer() 269void cgit_ssdiff_footer()
266{ 270{
267 if (deferred_old || deferred_new) 271 if (deferred_old || deferred_new)
268 cgit_ssdiff_print_deferred_lines(); 272 cgit_ssdiff_print_deferred_lines();
269 html("<tr><td class='foot' colspan='4'></td></tr>"); 273 html("<tr><td class='foot' colspan='4'></td></tr>");
270} 274}