blob: 68c2044dcc75c8ab58df847c36e0debe3665acba [file] [log] [blame]
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +02001#include "cgit.h"
John Keeping8f208792013-04-06 11:37:59 +01002#include "ui-ssdiff.h"
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +02003#include "html.h"
4#include "ui-shared.h"
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +01005#include "ui-diff.h"
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +02006
7extern int use_ssdiff;
8
9static int current_old_line, current_new_line;
Jamie Couturee19f7d72011-09-17 18:25:01 -040010static int **L = NULL;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +020011
12struct deferred_lines {
13 int line_no;
14 char *line;
15 struct deferred_lines *next;
16};
17
18static struct deferred_lines *deferred_old, *deferred_old_last;
19static struct deferred_lines *deferred_new, *deferred_new_last;
20
John Keepinge3d3fff2015-03-08 16:32:16 +000021static void create_or_reset_lcs_table(void)
Jamie Couturee19f7d72011-09-17 18:25:01 -040022{
23 int i;
24
25 if (L != NULL) {
Jamie Couture6a575b82012-01-11 22:38:49 -050026 memset(*L, 0, sizeof(int) * MAX_SSDIFF_SIZE);
Jamie Couturee19f7d72011-09-17 18:25:01 -040027 return;
28 }
29
30 // xcalloc will die if we ran out of memory;
31 // not very helpful for debugging
32 L = (int**)xcalloc(MAX_SSDIFF_M, sizeof(int *));
33 *L = (int*)xcalloc(MAX_SSDIFF_SIZE, sizeof(int));
34
35 for (i = 1; i < MAX_SSDIFF_M; i++) {
36 L[i] = *L + i * MAX_SSDIFF_N;
37 }
38}
39
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +010040static char *longest_common_subsequence(char *A, char *B)
41{
42 int i, j, ri;
43 int m = strlen(A);
44 int n = strlen(B);
Eric Wong19c31232012-01-04 08:59:15 +000045 int tmp1, tmp2;
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +010046 int lcs_length;
47 char *result;
48
Jamie Couturee19f7d72011-09-17 18:25:01 -040049 // We bail if the lines are too long
Eric Wong19c31232012-01-04 08:59:15 +000050 if (m >= MAX_SSDIFF_M || n >= MAX_SSDIFF_N)
Jamie Couturee19f7d72011-09-17 18:25:01 -040051 return NULL;
52
53 create_or_reset_lcs_table();
54
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +010055 for (i = m; i >= 0; i--) {
56 for (j = n; j >= 0; j--) {
57 if (A[i] == '\0' || B[j] == '\0') {
58 L[i][j] = 0;
59 } else if (A[i] == B[j]) {
60 L[i][j] = 1 + L[i + 1][j + 1];
61 } else {
62 tmp1 = L[i + 1][j];
63 tmp2 = L[i][j + 1];
64 L[i][j] = (tmp1 > tmp2 ? tmp1 : tmp2);
65 }
66 }
67 }
68
69 lcs_length = L[0][0];
70 result = xmalloc(lcs_length + 2);
71 memset(result, 0, sizeof(*result) * (lcs_length + 2));
72
73 ri = 0;
74 i = 0;
75 j = 0;
76 while (i < m && j < n) {
77 if (A[i] == B[j]) {
78 result[ri] = A[i];
79 ri += 1;
80 i += 1;
81 j += 1;
82 } else if (L[i + 1][j] >= L[i][j + 1]) {
83 i += 1;
84 } else {
85 j += 1;
86 }
87 }
Jamie Couturee19f7d72011-09-17 18:25:01 -040088
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +010089 return result;
90}
91
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +020092static int line_from_hunk(char *line, char type)
93{
94 char *buf1, *buf2;
John Keeping7e67c642016-08-07 16:14:49 +010095 int len, res;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +020096
97 buf1 = strchr(line, type);
98 if (buf1 == NULL)
99 return 0;
100 buf1 += 1;
101 buf2 = strchr(buf1, ',');
102 if (buf2 == NULL)
103 return 0;
104 len = buf2 - buf1;
105 buf2 = xmalloc(len + 1);
106 strncpy(buf2, buf1, len);
107 buf2[len] = '\0';
John Keeping7e67c642016-08-07 16:14:49 +0100108 res = atoi(buf2);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200109 free(buf2);
110 return res;
111}
112
113static char *replace_tabs(char *line)
114{
115 char *prev_buf = line;
116 char *cur_buf;
Jason A. Donenfeld08a2b1b2018-07-04 03:13:31 +0200117 size_t linelen = strlen(line);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200118 int n_tabs = 0;
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200119 int i;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200120 char *result;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200121
122 if (linelen == 0) {
123 result = xmalloc(1);
124 result[0] = '\0';
125 return result;
126 }
127
Jason A. Donenfeld08a2b1b2018-07-04 03:13:31 +0200128 for (i = 0; i < linelen; i++) {
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200129 if (line[i] == '\t')
130 n_tabs += 1;
Jason A. Donenfeld08a2b1b2018-07-04 03:13:31 +0200131 }
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200132 result = xmalloc(linelen + n_tabs * 8 + 1);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200133 result[0] = '\0';
134
Jason A. Donenfeld08a2b1b2018-07-04 03:13:31 +0200135 for (;;) {
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200136 cur_buf = strchr(prev_buf, '\t');
137 if (!cur_buf) {
138 strcat(result, prev_buf);
139 break;
140 } else {
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200141 strncat(result, prev_buf, cur_buf - prev_buf);
Jason A. Donenfeld08a2b1b2018-07-04 03:13:31 +0200142 linelen = strlen(result);
143 memset(&result[linelen], ' ', 8 - (linelen % 8));
144 result[linelen + 8 - (linelen % 8)] = '\0';
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200145 }
146 prev_buf = cur_buf + 1;
147 }
148 return result;
149}
150
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100151static int calc_deferred_lines(struct deferred_lines *start)
152{
153 struct deferred_lines *item = start;
154 int result = 0;
155 while (item) {
156 result += 1;
157 item = item->next;
158 }
159 return result;
160}
161
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200162static void deferred_old_add(char *line, int line_no)
163{
164 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
165 item->line = xstrdup(line);
166 item->line_no = line_no;
167 item->next = NULL;
168 if (deferred_old) {
169 deferred_old_last->next = item;
170 deferred_old_last = item;
171 } else {
172 deferred_old = deferred_old_last = item;
173 }
174}
175
176static void deferred_new_add(char *line, int line_no)
177{
178 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
179 item->line = xstrdup(line);
180 item->line_no = line_no;
181 item->next = NULL;
182 if (deferred_new) {
183 deferred_new_last->next = item;
184 deferred_new_last = item;
185 } else {
186 deferred_new = deferred_new_last = item;
187 }
188}
189
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100190static void print_part_with_lcs(char *class, char *line, char *lcs)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200191{
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100192 int line_len = strlen(line);
193 int i, j;
194 char c[2] = " ";
195 int same = 1;
196
197 j = 0;
198 for (i = 0; i < line_len; i++) {
199 c[0] = line[i];
200 if (same) {
201 if (line[i] == lcs[j])
202 j += 1;
203 else {
204 same = 0;
205 htmlf("<span class='%s'>", class);
206 }
207 } else if (line[i] == lcs[j]) {
208 same = 1;
209 htmlf("</span>");
210 j += 1;
211 }
212 html_txt(c);
213 }
214}
215
216static void print_ssdiff_line(char *class,
217 int old_line_no,
218 char *old_line,
219 int new_line_no,
220 char *new_line, int individual_chars)
221{
222 char *lcs = NULL;
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100223
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100224 if (old_line)
225 old_line = replace_tabs(old_line + 1);
226 if (new_line)
227 new_line = replace_tabs(new_line + 1);
228 if (individual_chars && old_line && new_line)
229 lcs = longest_common_subsequence(old_line, new_line);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100230 html("<tr>\n");
231 if (old_line_no > 0) {
232 struct diff_filespec *old_file = cgit_get_current_old_file();
233 char *lineno_str = fmt("n%d", old_line_no);
Christian Hesse11695a52016-09-04 12:38:18 +0200234 char *id_str = fmt("id=%s#%s", is_null_oid(&old_file->oid)?"HEAD":oid_to_hex(old_rev_oid), lineno_str);
Christian Hessefa5810e2015-10-09 13:15:45 +0200235 char *fileurl = cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str);
Peter Wu4468ec12013-10-03 12:17:23 +0200236 html("<td class='lineno'><a href='");
Christian Hessefa5810e2015-10-09 13:15:45 +0200237 html(fileurl);
Peter Wu4468ec12013-10-03 12:17:23 +0200238 htmlf("' id='%s'>%s</a>", lineno_str, lineno_str + 1);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100239 html("</td>");
240 htmlf("<td class='%s'>", class);
Christian Hessefa5810e2015-10-09 13:15:45 +0200241 free(fileurl);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100242 } else if (old_line)
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200243 htmlf("<td class='lineno'></td><td class='%s'>", class);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200244 else
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200245 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200246 if (old_line) {
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100247 if (lcs)
248 print_part_with_lcs("del", old_line, lcs);
249 else
250 html_txt(old_line);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200251 }
252
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100253 html("</td>\n");
254 if (new_line_no > 0) {
255 struct diff_filespec *new_file = cgit_get_current_new_file();
256 char *lineno_str = fmt("n%d", new_line_no);
Christian Hesse11695a52016-09-04 12:38:18 +0200257 char *id_str = fmt("id=%s#%s", is_null_oid(&new_file->oid)?"HEAD":oid_to_hex(new_rev_oid), lineno_str);
Christian Hessefa5810e2015-10-09 13:15:45 +0200258 char *fileurl = cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str);
Peter Wu4468ec12013-10-03 12:17:23 +0200259 html("<td class='lineno'><a href='");
Christian Hessefa5810e2015-10-09 13:15:45 +0200260 html(fileurl);
Peter Wu4468ec12013-10-03 12:17:23 +0200261 htmlf("' id='%s'>%s</a>", lineno_str, lineno_str + 1);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100262 html("</td>");
263 htmlf("<td class='%s'>", class);
Christian Hessefa5810e2015-10-09 13:15:45 +0200264 free(fileurl);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100265 } else if (new_line)
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200266 htmlf("<td class='lineno'></td><td class='%s'>", class);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200267 else
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200268 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200269 if (new_line) {
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100270 if (lcs)
271 print_part_with_lcs("add", new_line, lcs);
272 else
273 html_txt(new_line);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200274 }
275
276 html("</td></tr>");
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100277 if (lcs)
278 free(lcs);
279 if (new_line)
280 free(new_line);
281 if (old_line)
282 free(old_line);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200283}
284
John Keepinge3d3fff2015-03-08 16:32:16 +0000285static void print_deferred_old_lines(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200286{
287 struct deferred_lines *iter_old, *tmp;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200288 iter_old = deferred_old;
289 while (iter_old) {
290 print_ssdiff_line("del", iter_old->line_no,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100291 iter_old->line, -1, NULL, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200292 tmp = iter_old->next;
293 free(iter_old);
294 iter_old = tmp;
295 }
296}
297
John Keepinge3d3fff2015-03-08 16:32:16 +0000298static void print_deferred_new_lines(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200299{
300 struct deferred_lines *iter_new, *tmp;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200301 iter_new = deferred_new;
302 while (iter_new) {
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100303 print_ssdiff_line("add", -1, NULL,
304 iter_new->line_no, iter_new->line, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200305 tmp = iter_new->next;
306 free(iter_new);
307 iter_new = tmp;
308 }
309}
310
John Keepinge3d3fff2015-03-08 16:32:16 +0000311static void print_deferred_changed_lines(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200312{
313 struct deferred_lines *iter_old, *iter_new, *tmp;
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100314 int n_old_lines = calc_deferred_lines(deferred_old);
315 int n_new_lines = calc_deferred_lines(deferred_new);
316 int individual_chars = (n_old_lines == n_new_lines ? 1 : 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200317
318 iter_old = deferred_old;
319 iter_new = deferred_new;
320 while (iter_old || iter_new) {
321 if (iter_old && iter_new)
322 print_ssdiff_line("changed", iter_old->line_no,
323 iter_old->line,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100324 iter_new->line_no, iter_new->line,
325 individual_chars);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200326 else if (iter_old)
327 print_ssdiff_line("changed", iter_old->line_no,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100328 iter_old->line, -1, NULL, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200329 else if (iter_new)
330 print_ssdiff_line("changed", -1, NULL,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100331 iter_new->line_no, iter_new->line, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200332 if (iter_old) {
333 tmp = iter_old->next;
334 free(iter_old);
335 iter_old = tmp;
336 }
337
338 if (iter_new) {
339 tmp = iter_new->next;
340 free(iter_new);
341 iter_new = tmp;
342 }
343 }
344}
345
John Keepinge3d3fff2015-03-08 16:32:16 +0000346void cgit_ssdiff_print_deferred_lines(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200347{
348 if (!deferred_old && !deferred_new)
349 return;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200350 if (deferred_old && !deferred_new)
351 print_deferred_old_lines();
352 else if (!deferred_old && deferred_new)
353 print_deferred_new_lines();
354 else
355 print_deferred_changed_lines();
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200356 deferred_old = deferred_old_last = NULL;
357 deferred_new = deferred_new_last = NULL;
358}
359
360/*
361 * print a single line returned from xdiff
362 */
363void cgit_ssdiff_line_cb(char *line, int len)
364{
365 char c = line[len - 1];
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200366 line[len - 1] = '\0';
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200367 if (line[0] == '@') {
368 current_old_line = line_from_hunk(line, '-');
369 current_new_line = line_from_hunk(line, '+');
370 }
371
372 if (line[0] == ' ') {
373 if (deferred_old || deferred_new)
374 cgit_ssdiff_print_deferred_lines();
375 print_ssdiff_line("ctx", current_old_line, line,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100376 current_new_line, line, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200377 current_old_line += 1;
378 current_new_line += 1;
379 } else if (line[0] == '+') {
380 deferred_new_add(line, current_new_line);
381 current_new_line += 1;
382 } else if (line[0] == '-') {
383 deferred_old_add(line, current_old_line);
384 current_old_line += 1;
385 } else if (line[0] == '@') {
386 html("<tr><td colspan='4' class='hunk'>");
387 html_txt(line);
388 html("</td></tr>");
389 } else {
390 html("<tr><td colspan='4' class='ctx'>");
391 html_txt(line);
392 html("</td></tr>");
393 }
394 line[len - 1] = c;
395}
396
John Keepinge3d3fff2015-03-08 16:32:16 +0000397void cgit_ssdiff_header_begin(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200398{
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200399 current_old_line = -1;
400 current_new_line = -1;
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200401 html("<tr><td class='space' colspan='4'><div></div></td></tr>");
402 html("<tr><td class='head' colspan='4'>");
403}
404
John Keepinge3d3fff2015-03-08 16:32:16 +0000405void cgit_ssdiff_header_end(void)
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200406{
407 html("</td><tr>");
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200408}
409
John Keepinge3d3fff2015-03-08 16:32:16 +0000410void cgit_ssdiff_footer(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200411{
412 if (deferred_old || deferred_new)
413 cgit_ssdiff_print_deferred_lines();
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200414 html("<tr><td class='foot' colspan='4'></td></tr>");
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200415}