blob: c4560330a9c265a67bc2e65a28d4617b5de74a07 [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);
Christian Hesse0899eb62018-08-28 18:22:26 +0200106 strlcpy(buf2, buf1, len + 1);
John Keeping7e67c642016-08-07 16:14:49 +0100107 res = atoi(buf2);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200108 free(buf2);
109 return res;
110}
111
112static char *replace_tabs(char *line)
113{
114 char *prev_buf = line;
115 char *cur_buf;
Jason A. Donenfeld08a2b1b2018-07-04 03:13:31 +0200116 size_t linelen = strlen(line);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200117 int n_tabs = 0;
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200118 int i;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200119 char *result;
Christian Hessea96f2892018-08-28 18:23:36 +0200120 int result_len;
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 }
Christian Hessea96f2892018-08-28 18:23:36 +0200132 result_len = linelen + n_tabs * 8;
133 result = xmalloc(result_len + 1);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200134 result[0] = '\0';
135
Jason A. Donenfeld08a2b1b2018-07-04 03:13:31 +0200136 for (;;) {
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200137 cur_buf = strchr(prev_buf, '\t');
138 if (!cur_buf) {
Christian Hessea96f2892018-08-28 18:23:36 +0200139 strncat(result, prev_buf, result_len);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200140 break;
141 } else {
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200142 strncat(result, prev_buf, cur_buf - prev_buf);
Jason A. Donenfeld08a2b1b2018-07-04 03:13:31 +0200143 linelen = strlen(result);
144 memset(&result[linelen], ' ', 8 - (linelen % 8));
145 result[linelen + 8 - (linelen % 8)] = '\0';
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200146 }
147 prev_buf = cur_buf + 1;
148 }
149 return result;
150}
151
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100152static int calc_deferred_lines(struct deferred_lines *start)
153{
154 struct deferred_lines *item = start;
155 int result = 0;
156 while (item) {
157 result += 1;
158 item = item->next;
159 }
160 return result;
161}
162
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200163static void deferred_old_add(char *line, int line_no)
164{
165 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
166 item->line = xstrdup(line);
167 item->line_no = line_no;
168 item->next = NULL;
169 if (deferred_old) {
170 deferred_old_last->next = item;
171 deferred_old_last = item;
172 } else {
173 deferred_old = deferred_old_last = item;
174 }
175}
176
177static void deferred_new_add(char *line, int line_no)
178{
179 struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
180 item->line = xstrdup(line);
181 item->line_no = line_no;
182 item->next = NULL;
183 if (deferred_new) {
184 deferred_new_last->next = item;
185 deferred_new_last = item;
186 } else {
187 deferred_new = deferred_new_last = item;
188 }
189}
190
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100191static void print_part_with_lcs(char *class, char *line, char *lcs)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200192{
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100193 int line_len = strlen(line);
194 int i, j;
195 char c[2] = " ";
196 int same = 1;
197
198 j = 0;
199 for (i = 0; i < line_len; i++) {
200 c[0] = line[i];
201 if (same) {
202 if (line[i] == lcs[j])
203 j += 1;
204 else {
205 same = 0;
206 htmlf("<span class='%s'>", class);
207 }
208 } else if (line[i] == lcs[j]) {
209 same = 1;
210 htmlf("</span>");
211 j += 1;
212 }
213 html_txt(c);
214 }
215}
216
217static void print_ssdiff_line(char *class,
218 int old_line_no,
219 char *old_line,
220 int new_line_no,
221 char *new_line, int individual_chars)
222{
223 char *lcs = NULL;
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100224
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100225 if (old_line)
226 old_line = replace_tabs(old_line + 1);
227 if (new_line)
228 new_line = replace_tabs(new_line + 1);
229 if (individual_chars && old_line && new_line)
230 lcs = longest_common_subsequence(old_line, new_line);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100231 html("<tr>\n");
232 if (old_line_no > 0) {
233 struct diff_filespec *old_file = cgit_get_current_old_file();
234 char *lineno_str = fmt("n%d", old_line_no);
Christian Hesse11695a52016-09-04 12:38:18 +0200235 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 +0200236 char *fileurl = cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str);
Peter Wu4468ec12013-10-03 12:17:23 +0200237 html("<td class='lineno'><a href='");
Christian Hessefa5810e2015-10-09 13:15:45 +0200238 html(fileurl);
Peter Wu4468ec12013-10-03 12:17:23 +0200239 htmlf("' id='%s'>%s</a>", lineno_str, lineno_str + 1);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100240 html("</td>");
241 htmlf("<td class='%s'>", class);
Christian Hessefa5810e2015-10-09 13:15:45 +0200242 free(fileurl);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100243 } else if (old_line)
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200244 htmlf("<td class='lineno'></td><td class='%s'>", class);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200245 else
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200246 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200247 if (old_line) {
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100248 if (lcs)
249 print_part_with_lcs("del", old_line, lcs);
250 else
251 html_txt(old_line);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200252 }
253
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100254 html("</td>\n");
255 if (new_line_no > 0) {
256 struct diff_filespec *new_file = cgit_get_current_new_file();
257 char *lineno_str = fmt("n%d", new_line_no);
Christian Hesse11695a52016-09-04 12:38:18 +0200258 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 +0200259 char *fileurl = cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str);
Peter Wu4468ec12013-10-03 12:17:23 +0200260 html("<td class='lineno'><a href='");
Christian Hessefa5810e2015-10-09 13:15:45 +0200261 html(fileurl);
Peter Wu4468ec12013-10-03 12:17:23 +0200262 htmlf("' id='%s'>%s</a>", lineno_str, lineno_str + 1);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100263 html("</td>");
264 htmlf("<td class='%s'>", class);
Christian Hessefa5810e2015-10-09 13:15:45 +0200265 free(fileurl);
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100266 } else if (new_line)
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200267 htmlf("<td class='lineno'></td><td class='%s'>", class);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200268 else
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200269 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200270 if (new_line) {
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100271 if (lcs)
272 print_part_with_lcs("add", new_line, lcs);
273 else
274 html_txt(new_line);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200275 }
276
277 html("</td></tr>");
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100278 if (lcs)
279 free(lcs);
280 if (new_line)
281 free(new_line);
282 if (old_line)
283 free(old_line);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200284}
285
John Keepinge3d3fff2015-03-08 16:32:16 +0000286static void print_deferred_old_lines(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200287{
288 struct deferred_lines *iter_old, *tmp;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200289 iter_old = deferred_old;
290 while (iter_old) {
291 print_ssdiff_line("del", iter_old->line_no,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100292 iter_old->line, -1, NULL, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200293 tmp = iter_old->next;
294 free(iter_old);
295 iter_old = tmp;
296 }
297}
298
John Keepinge3d3fff2015-03-08 16:32:16 +0000299static void print_deferred_new_lines(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200300{
301 struct deferred_lines *iter_new, *tmp;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200302 iter_new = deferred_new;
303 while (iter_new) {
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100304 print_ssdiff_line("add", -1, NULL,
305 iter_new->line_no, iter_new->line, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200306 tmp = iter_new->next;
307 free(iter_new);
308 iter_new = tmp;
309 }
310}
311
John Keepinge3d3fff2015-03-08 16:32:16 +0000312static void print_deferred_changed_lines(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200313{
314 struct deferred_lines *iter_old, *iter_new, *tmp;
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100315 int n_old_lines = calc_deferred_lines(deferred_old);
316 int n_new_lines = calc_deferred_lines(deferred_new);
317 int individual_chars = (n_old_lines == n_new_lines ? 1 : 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200318
319 iter_old = deferred_old;
320 iter_new = deferred_new;
321 while (iter_old || iter_new) {
322 if (iter_old && iter_new)
323 print_ssdiff_line("changed", iter_old->line_no,
324 iter_old->line,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100325 iter_new->line_no, iter_new->line,
326 individual_chars);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200327 else if (iter_old)
328 print_ssdiff_line("changed", iter_old->line_no,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100329 iter_old->line, -1, NULL, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200330 else if (iter_new)
331 print_ssdiff_line("changed", -1, NULL,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100332 iter_new->line_no, iter_new->line, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200333 if (iter_old) {
334 tmp = iter_old->next;
335 free(iter_old);
336 iter_old = tmp;
337 }
338
339 if (iter_new) {
340 tmp = iter_new->next;
341 free(iter_new);
342 iter_new = tmp;
343 }
344 }
345}
346
John Keepinge3d3fff2015-03-08 16:32:16 +0000347void cgit_ssdiff_print_deferred_lines(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200348{
349 if (!deferred_old && !deferred_new)
350 return;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200351 if (deferred_old && !deferred_new)
352 print_deferred_old_lines();
353 else if (!deferred_old && deferred_new)
354 print_deferred_new_lines();
355 else
356 print_deferred_changed_lines();
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200357 deferred_old = deferred_old_last = NULL;
358 deferred_new = deferred_new_last = NULL;
359}
360
361/*
362 * print a single line returned from xdiff
363 */
364void cgit_ssdiff_line_cb(char *line, int len)
365{
366 char c = line[len - 1];
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200367 line[len - 1] = '\0';
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200368 if (line[0] == '@') {
369 current_old_line = line_from_hunk(line, '-');
370 current_new_line = line_from_hunk(line, '+');
371 }
372
373 if (line[0] == ' ') {
374 if (deferred_old || deferred_new)
375 cgit_ssdiff_print_deferred_lines();
376 print_ssdiff_line("ctx", current_old_line, line,
Ragnar Ouchterlony735e15e2009-10-25 18:13:22 +0100377 current_new_line, line, 0);
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200378 current_old_line += 1;
379 current_new_line += 1;
380 } else if (line[0] == '+') {
381 deferred_new_add(line, current_new_line);
382 current_new_line += 1;
383 } else if (line[0] == '-') {
384 deferred_old_add(line, current_old_line);
385 current_old_line += 1;
386 } else if (line[0] == '@') {
387 html("<tr><td colspan='4' class='hunk'>");
388 html_txt(line);
389 html("</td></tr>");
390 } else {
391 html("<tr><td colspan='4' class='ctx'>");
392 html_txt(line);
393 html("</td></tr>");
394 }
395 line[len - 1] = c;
396}
397
John Keepinge3d3fff2015-03-08 16:32:16 +0000398void cgit_ssdiff_header_begin(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200399{
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200400 current_old_line = -1;
401 current_new_line = -1;
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200402 html("<tr><td class='space' colspan='4'><div></div></td></tr>");
403 html("<tr><td class='head' colspan='4'>");
404}
405
John Keepinge3d3fff2015-03-08 16:32:16 +0000406void cgit_ssdiff_header_end(void)
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200407{
408 html("</td><tr>");
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200409}
410
John Keepinge3d3fff2015-03-08 16:32:16 +0000411void cgit_ssdiff_footer(void)
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200412{
413 if (deferred_old || deferred_new)
414 cgit_ssdiff_print_deferred_lines();
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200415 html("<tr><td class='foot' colspan='4'></td></tr>");
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200416}