]>
Commit | Line | Data |
---|---|---|
6973dcae JH |
1 | /* |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
6973dcae JH |
4 | #include "cache.h" |
5 | #include "quote.h" | |
6 | #include "diff.h" | |
7 | #include "diffcore.h" | |
051308f6 | 8 | #include "delta.h" |
6973dcae | 9 | #include "xdiff-interface.h" |
7c92fe0e | 10 | #include "color.h" |
6973dcae | 11 | |
1510fea7 SP |
12 | #ifdef NO_FAST_WORKING_DIRECTORY |
13 | #define FAST_WORKING_DIRECTORY 0 | |
14 | #else | |
15 | #define FAST_WORKING_DIRECTORY 1 | |
16 | #endif | |
17 | ||
6973dcae JH |
18 | static int use_size_cache; |
19 | ||
96f1e58f | 20 | static int diff_detect_rename_default; |
801235c5 | 21 | static int diff_rename_limit_default = -1; |
96f1e58f | 22 | static int diff_use_color_default; |
6973dcae | 23 | |
7c92fe0e | 24 | static char diff_colors[][COLOR_MAXLEN] = { |
f37399e6 | 25 | "\033[m", /* reset */ |
448c3ef1 JH |
26 | "", /* PLAIN (normal) */ |
27 | "\033[1m", /* METAINFO (bold) */ | |
28 | "\033[36m", /* FRAGINFO (cyan) */ | |
29 | "\033[31m", /* OLD (red) */ | |
30 | "\033[32m", /* NEW (green) */ | |
31 | "\033[33m", /* COMMIT (yellow) */ | |
32 | "\033[41m", /* WHITESPACE (red background) */ | |
cd112cef JS |
33 | }; |
34 | ||
801235c5 JH |
35 | static int parse_diff_color_slot(const char *var, int ofs) |
36 | { | |
37 | if (!strcasecmp(var+ofs, "plain")) | |
38 | return DIFF_PLAIN; | |
39 | if (!strcasecmp(var+ofs, "meta")) | |
40 | return DIFF_METAINFO; | |
41 | if (!strcasecmp(var+ofs, "frag")) | |
42 | return DIFF_FRAGINFO; | |
43 | if (!strcasecmp(var+ofs, "old")) | |
44 | return DIFF_FILE_OLD; | |
45 | if (!strcasecmp(var+ofs, "new")) | |
46 | return DIFF_FILE_NEW; | |
ce436973 JK |
47 | if (!strcasecmp(var+ofs, "commit")) |
48 | return DIFF_COMMIT; | |
448c3ef1 JH |
49 | if (!strcasecmp(var+ofs, "whitespace")) |
50 | return DIFF_WHITESPACE; | |
801235c5 JH |
51 | die("bad config variable '%s'", var); |
52 | } | |
53 | ||
83ad63cf JH |
54 | /* |
55 | * These are to give UI layer defaults. | |
56 | * The core-level commands such as git-diff-files should | |
57 | * never be affected by the setting of diff.renames | |
58 | * the user happens to have in the configuration file. | |
59 | */ | |
60 | int git_diff_ui_config(const char *var, const char *value) | |
801235c5 JH |
61 | { |
62 | if (!strcmp(var, "diff.renamelimit")) { | |
63 | diff_rename_limit_default = git_config_int(var, value); | |
64 | return 0; | |
65 | } | |
a159ca0c | 66 | if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { |
7c92fe0e | 67 | diff_use_color_default = git_config_colorbool(var, value); |
801235c5 JH |
68 | return 0; |
69 | } | |
b68ea12e EW |
70 | if (!strcmp(var, "diff.renames")) { |
71 | if (!value) | |
72 | diff_detect_rename_default = DIFF_DETECT_RENAME; | |
73 | else if (!strcasecmp(value, "copies") || | |
74 | !strcasecmp(value, "copy")) | |
75 | diff_detect_rename_default = DIFF_DETECT_COPY; | |
76 | else if (git_config_bool(var,value)) | |
77 | diff_detect_rename_default = DIFF_DETECT_RENAME; | |
78 | return 0; | |
79 | } | |
1968d77d | 80 | if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) { |
801235c5 | 81 | int slot = parse_diff_color_slot(var, 11); |
7c92fe0e | 82 | color_parse(value, var, diff_colors[slot]); |
801235c5 JH |
83 | return 0; |
84 | } | |
85 | return git_default_config(var, value); | |
86 | } | |
87 | ||
6973dcae JH |
88 | static char *quote_one(const char *str) |
89 | { | |
90 | int needlen; | |
91 | char *xp; | |
92 | ||
93 | if (!str) | |
94 | return NULL; | |
95 | needlen = quote_c_style(str, NULL, NULL, 0); | |
96 | if (!needlen) | |
9befac47 | 97 | return xstrdup(str); |
6973dcae JH |
98 | xp = xmalloc(needlen + 1); |
99 | quote_c_style(str, xp, NULL, 0); | |
100 | return xp; | |
101 | } | |
102 | ||
103 | static char *quote_two(const char *one, const char *two) | |
104 | { | |
105 | int need_one = quote_c_style(one, NULL, NULL, 1); | |
106 | int need_two = quote_c_style(two, NULL, NULL, 1); | |
107 | char *xp; | |
108 | ||
109 | if (need_one + need_two) { | |
110 | if (!need_one) need_one = strlen(one); | |
111 | if (!need_two) need_one = strlen(two); | |
112 | ||
113 | xp = xmalloc(need_one + need_two + 3); | |
114 | xp[0] = '"'; | |
115 | quote_c_style(one, xp + 1, NULL, 1); | |
116 | quote_c_style(two, xp + need_one + 1, NULL, 1); | |
117 | strcpy(xp + need_one + need_two + 1, "\""); | |
118 | return xp; | |
119 | } | |
120 | need_one = strlen(one); | |
121 | need_two = strlen(two); | |
122 | xp = xmalloc(need_one + need_two + 1); | |
123 | strcpy(xp, one); | |
124 | strcpy(xp + need_one, two); | |
125 | return xp; | |
126 | } | |
127 | ||
128 | static const char *external_diff(void) | |
129 | { | |
130 | static const char *external_diff_cmd = NULL; | |
131 | static int done_preparing = 0; | |
132 | ||
133 | if (done_preparing) | |
134 | return external_diff_cmd; | |
135 | external_diff_cmd = getenv("GIT_EXTERNAL_DIFF"); | |
136 | done_preparing = 1; | |
137 | return external_diff_cmd; | |
138 | } | |
139 | ||
140 | #define TEMPFILE_PATH_LEN 50 | |
141 | ||
142 | static struct diff_tempfile { | |
143 | const char *name; /* filename external diff should read from */ | |
144 | char hex[41]; | |
145 | char mode[10]; | |
146 | char tmp_path[TEMPFILE_PATH_LEN]; | |
147 | } diff_temp[2]; | |
148 | ||
149 | static int count_lines(const char *data, int size) | |
150 | { | |
151 | int count, ch, completely_empty = 1, nl_just_seen = 0; | |
152 | count = 0; | |
153 | while (0 < size--) { | |
154 | ch = *data++; | |
155 | if (ch == '\n') { | |
156 | count++; | |
157 | nl_just_seen = 1; | |
158 | completely_empty = 0; | |
159 | } | |
160 | else { | |
161 | nl_just_seen = 0; | |
162 | completely_empty = 0; | |
163 | } | |
164 | } | |
165 | if (completely_empty) | |
166 | return 0; | |
167 | if (!nl_just_seen) | |
168 | count++; /* no trailing newline */ | |
169 | return count; | |
170 | } | |
171 | ||
172 | static void print_line_count(int count) | |
173 | { | |
174 | switch (count) { | |
175 | case 0: | |
176 | printf("0,0"); | |
177 | break; | |
178 | case 1: | |
179 | printf("1"); | |
180 | break; | |
181 | default: | |
182 | printf("1,%d", count); | |
183 | break; | |
184 | } | |
185 | } | |
186 | ||
13e36ec5 JS |
187 | static void copy_file(int prefix, const char *data, int size, |
188 | const char *set, const char *reset) | |
6973dcae JH |
189 | { |
190 | int ch, nl_just_seen = 1; | |
191 | while (0 < size--) { | |
192 | ch = *data++; | |
13e36ec5 JS |
193 | if (nl_just_seen) { |
194 | fputs(set, stdout); | |
6973dcae | 195 | putchar(prefix); |
13e36ec5 JS |
196 | } |
197 | if (ch == '\n') { | |
6973dcae | 198 | nl_just_seen = 1; |
13e36ec5 JS |
199 | fputs(reset, stdout); |
200 | } else | |
6973dcae | 201 | nl_just_seen = 0; |
13e36ec5 | 202 | putchar(ch); |
6973dcae JH |
203 | } |
204 | if (!nl_just_seen) | |
13e36ec5 | 205 | printf("%s\n\\ No newline at end of file\n", reset); |
6973dcae JH |
206 | } |
207 | ||
208 | static void emit_rewrite_diff(const char *name_a, | |
209 | const char *name_b, | |
210 | struct diff_filespec *one, | |
13e36ec5 JS |
211 | struct diff_filespec *two, |
212 | int color_diff) | |
6973dcae JH |
213 | { |
214 | int lc_a, lc_b; | |
1a9eb3b9 | 215 | const char *name_a_tab, *name_b_tab; |
13e36ec5 JS |
216 | const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO); |
217 | const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO); | |
218 | const char *old = diff_get_color(color_diff, DIFF_FILE_OLD); | |
219 | const char *new = diff_get_color(color_diff, DIFF_FILE_NEW); | |
220 | const char *reset = diff_get_color(color_diff, DIFF_RESET); | |
1a9eb3b9 | 221 | |
8a13becc JH |
222 | name_a += (*name_a == '/'); |
223 | name_b += (*name_b == '/'); | |
1a9eb3b9 JH |
224 | name_a_tab = strchr(name_a, ' ') ? "\t" : ""; |
225 | name_b_tab = strchr(name_b, ' ') ? "\t" : ""; | |
226 | ||
6973dcae JH |
227 | diff_populate_filespec(one, 0); |
228 | diff_populate_filespec(two, 0); | |
229 | lc_a = count_lines(one->data, one->size); | |
230 | lc_b = count_lines(two->data, two->size); | |
13e36ec5 JS |
231 | printf("%s--- a/%s%s%s\n%s+++ b/%s%s%s\n%s@@ -", |
232 | metainfo, name_a, name_a_tab, reset, | |
233 | metainfo, name_b, name_b_tab, reset, fraginfo); | |
6973dcae JH |
234 | print_line_count(lc_a); |
235 | printf(" +"); | |
236 | print_line_count(lc_b); | |
13e36ec5 | 237 | printf(" @@%s\n", reset); |
6973dcae | 238 | if (lc_a) |
13e36ec5 | 239 | copy_file('-', one->data, one->size, old, reset); |
6973dcae | 240 | if (lc_b) |
13e36ec5 | 241 | copy_file('+', two->data, two->size, new, reset); |
6973dcae JH |
242 | } |
243 | ||
244 | static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one) | |
245 | { | |
246 | if (!DIFF_FILE_VALID(one)) { | |
d2543b8e | 247 | mf->ptr = (char *)""; /* does not matter */ |
6973dcae JH |
248 | mf->size = 0; |
249 | return 0; | |
250 | } | |
251 | else if (diff_populate_filespec(one, 0)) | |
252 | return -1; | |
253 | mf->ptr = one->data; | |
254 | mf->size = one->size; | |
255 | return 0; | |
256 | } | |
257 | ||
f59a59e2 JS |
258 | struct diff_words_buffer { |
259 | mmfile_t text; | |
260 | long alloc; | |
261 | long current; /* output pointer */ | |
262 | int suppressed_newline; | |
263 | }; | |
264 | ||
265 | static void diff_words_append(char *line, unsigned long len, | |
266 | struct diff_words_buffer *buffer) | |
267 | { | |
268 | if (buffer->text.size + len > buffer->alloc) { | |
269 | buffer->alloc = (buffer->text.size + len) * 3 / 2; | |
270 | buffer->text.ptr = xrealloc(buffer->text.ptr, buffer->alloc); | |
271 | } | |
272 | line++; | |
273 | len--; | |
274 | memcpy(buffer->text.ptr + buffer->text.size, line, len); | |
275 | buffer->text.size += len; | |
276 | } | |
277 | ||
278 | struct diff_words_data { | |
279 | struct xdiff_emit_state xm; | |
280 | struct diff_words_buffer minus, plus; | |
281 | }; | |
282 | ||
283 | static void print_word(struct diff_words_buffer *buffer, int len, int color, | |
284 | int suppress_newline) | |
285 | { | |
286 | const char *ptr; | |
287 | int eol = 0; | |
288 | ||
289 | if (len == 0) | |
290 | return; | |
291 | ||
292 | ptr = buffer->text.ptr + buffer->current; | |
293 | buffer->current += len; | |
294 | ||
295 | if (ptr[len - 1] == '\n') { | |
296 | eol = 1; | |
297 | len--; | |
298 | } | |
299 | ||
300 | fputs(diff_get_color(1, color), stdout); | |
301 | fwrite(ptr, len, 1, stdout); | |
302 | fputs(diff_get_color(1, DIFF_RESET), stdout); | |
303 | ||
304 | if (eol) { | |
305 | if (suppress_newline) | |
306 | buffer->suppressed_newline = 1; | |
307 | else | |
308 | putchar('\n'); | |
309 | } | |
310 | } | |
311 | ||
312 | static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len) | |
313 | { | |
314 | struct diff_words_data *diff_words = priv; | |
315 | ||
316 | if (diff_words->minus.suppressed_newline) { | |
317 | if (line[0] != '+') | |
318 | putchar('\n'); | |
319 | diff_words->minus.suppressed_newline = 0; | |
320 | } | |
321 | ||
322 | len--; | |
323 | switch (line[0]) { | |
324 | case '-': | |
325 | print_word(&diff_words->minus, len, DIFF_FILE_OLD, 1); | |
326 | break; | |
327 | case '+': | |
328 | print_word(&diff_words->plus, len, DIFF_FILE_NEW, 0); | |
329 | break; | |
330 | case ' ': | |
331 | print_word(&diff_words->plus, len, DIFF_PLAIN, 0); | |
332 | diff_words->minus.current += len; | |
333 | break; | |
334 | } | |
335 | } | |
336 | ||
337 | /* this executes the word diff on the accumulated buffers */ | |
338 | static void diff_words_show(struct diff_words_data *diff_words) | |
339 | { | |
340 | xpparam_t xpp; | |
341 | xdemitconf_t xecfg; | |
342 | xdemitcb_t ecb; | |
343 | mmfile_t minus, plus; | |
344 | int i; | |
345 | ||
346 | minus.size = diff_words->minus.text.size; | |
347 | minus.ptr = xmalloc(minus.size); | |
348 | memcpy(minus.ptr, diff_words->minus.text.ptr, minus.size); | |
349 | for (i = 0; i < minus.size; i++) | |
350 | if (isspace(minus.ptr[i])) | |
351 | minus.ptr[i] = '\n'; | |
352 | diff_words->minus.current = 0; | |
353 | ||
354 | plus.size = diff_words->plus.text.size; | |
355 | plus.ptr = xmalloc(plus.size); | |
356 | memcpy(plus.ptr, diff_words->plus.text.ptr, plus.size); | |
357 | for (i = 0; i < plus.size; i++) | |
358 | if (isspace(plus.ptr[i])) | |
359 | plus.ptr[i] = '\n'; | |
360 | diff_words->plus.current = 0; | |
361 | ||
362 | xpp.flags = XDF_NEED_MINIMAL; | |
363 | xecfg.ctxlen = diff_words->minus.alloc + diff_words->plus.alloc; | |
364 | xecfg.flags = 0; | |
365 | ecb.outf = xdiff_outf; | |
366 | ecb.priv = diff_words; | |
367 | diff_words->xm.consume = fn_out_diff_words_aux; | |
368 | xdl_diff(&minus, &plus, &xpp, &xecfg, &ecb); | |
369 | ||
370 | free(minus.ptr); | |
371 | free(plus.ptr); | |
372 | diff_words->minus.text.size = diff_words->plus.text.size = 0; | |
373 | ||
374 | if (diff_words->minus.suppressed_newline) { | |
375 | putchar('\n'); | |
376 | diff_words->minus.suppressed_newline = 0; | |
377 | } | |
378 | } | |
379 | ||
6973dcae | 380 | struct emit_callback { |
cd112cef JS |
381 | struct xdiff_emit_state xm; |
382 | int nparents, color_diff; | |
6973dcae | 383 | const char **label_path; |
f59a59e2 | 384 | struct diff_words_data *diff_words; |
34a5e1a2 | 385 | int *found_changesp; |
6973dcae JH |
386 | }; |
387 | ||
f59a59e2 JS |
388 | static void free_diff_words_data(struct emit_callback *ecbdata) |
389 | { | |
390 | if (ecbdata->diff_words) { | |
391 | /* flush buffers */ | |
392 | if (ecbdata->diff_words->minus.text.size || | |
393 | ecbdata->diff_words->plus.text.size) | |
394 | diff_words_show(ecbdata->diff_words); | |
395 | ||
396 | if (ecbdata->diff_words->minus.text.ptr) | |
397 | free (ecbdata->diff_words->minus.text.ptr); | |
398 | if (ecbdata->diff_words->plus.text.ptr) | |
399 | free (ecbdata->diff_words->plus.text.ptr); | |
400 | free(ecbdata->diff_words); | |
401 | ecbdata->diff_words = NULL; | |
402 | } | |
403 | } | |
404 | ||
ce436973 | 405 | const char *diff_get_color(int diff_use_color, enum color_diff ix) |
cd112cef JS |
406 | { |
407 | if (diff_use_color) | |
50f575fc LT |
408 | return diff_colors[ix]; |
409 | return ""; | |
cd112cef JS |
410 | } |
411 | ||
448c3ef1 JH |
412 | static void emit_line(const char *set, const char *reset, const char *line, int len) |
413 | { | |
414 | if (len > 0 && line[len-1] == '\n') | |
415 | len--; | |
416 | fputs(set, stdout); | |
417 | fwrite(line, len, 1, stdout); | |
418 | puts(reset); | |
419 | } | |
420 | ||
c5a8c3ec JS |
421 | static void emit_line_with_ws(int nparents, |
422 | const char *set, const char *reset, const char *ws, | |
423 | const char *line, int len) | |
448c3ef1 | 424 | { |
c5a8c3ec | 425 | int col0 = nparents; |
448c3ef1 JH |
426 | int last_tab_in_indent = -1; |
427 | int last_space_in_indent = -1; | |
428 | int i; | |
429 | int tail = len; | |
430 | int need_highlight_leading_space = 0; | |
448c3ef1 JH |
431 | /* The line is a newly added line. Does it have funny leading |
432 | * whitespaces? In indent, SP should never precede a TAB. | |
433 | */ | |
434 | for (i = col0; i < len; i++) { | |
435 | if (line[i] == '\t') { | |
436 | last_tab_in_indent = i; | |
437 | if (0 <= last_space_in_indent) | |
438 | need_highlight_leading_space = 1; | |
439 | } | |
440 | else if (line[i] == ' ') | |
441 | last_space_in_indent = i; | |
442 | else | |
443 | break; | |
444 | } | |
445 | fputs(set, stdout); | |
446 | fwrite(line, col0, 1, stdout); | |
447 | fputs(reset, stdout); | |
448 | if (((i == len) || line[i] == '\n') && i != col0) { | |
449 | /* The whole line was indent */ | |
450 | emit_line(ws, reset, line + col0, len - col0); | |
451 | return; | |
452 | } | |
453 | i = col0; | |
454 | if (need_highlight_leading_space) { | |
455 | while (i < last_tab_in_indent) { | |
456 | if (line[i] == ' ') { | |
457 | fputs(ws, stdout); | |
458 | putchar(' '); | |
459 | fputs(reset, stdout); | |
460 | } | |
461 | else | |
462 | putchar(line[i]); | |
463 | i++; | |
464 | } | |
465 | } | |
466 | tail = len - 1; | |
467 | if (line[tail] == '\n' && i < tail) | |
468 | tail--; | |
469 | while (i < tail) { | |
470 | if (!isspace(line[tail])) | |
471 | break; | |
472 | tail--; | |
473 | } | |
474 | if ((i < tail && line[tail + 1] != '\n')) { | |
475 | /* This has whitespace between tail+1..len */ | |
476 | fputs(set, stdout); | |
477 | fwrite(line + i, tail - i + 1, 1, stdout); | |
478 | fputs(reset, stdout); | |
479 | emit_line(ws, reset, line + tail + 1, len - tail - 1); | |
480 | } | |
481 | else | |
482 | emit_line(set, reset, line + i, len - i); | |
483 | } | |
484 | ||
c5a8c3ec JS |
485 | static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len) |
486 | { | |
487 | const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE); | |
488 | const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW); | |
489 | ||
490 | if (!*ws) | |
491 | emit_line(set, reset, line, len); | |
492 | else | |
493 | emit_line_with_ws(ecbdata->nparents, set, reset, ws, | |
494 | line, len); | |
495 | } | |
496 | ||
cd112cef | 497 | static void fn_out_consume(void *priv, char *line, unsigned long len) |
6973dcae JH |
498 | { |
499 | int i; | |
448c3ef1 | 500 | int color; |
6973dcae | 501 | struct emit_callback *ecbdata = priv; |
ce436973 JK |
502 | const char *set = diff_get_color(ecbdata->color_diff, DIFF_METAINFO); |
503 | const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET); | |
6973dcae | 504 | |
34a5e1a2 JS |
505 | *(ecbdata->found_changesp) = 1; |
506 | ||
6973dcae | 507 | if (ecbdata->label_path[0]) { |
1a9eb3b9 JH |
508 | const char *name_a_tab, *name_b_tab; |
509 | ||
510 | name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : ""; | |
511 | name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : ""; | |
512 | ||
513 | printf("%s--- %s%s%s\n", | |
514 | set, ecbdata->label_path[0], reset, name_a_tab); | |
515 | printf("%s+++ %s%s%s\n", | |
516 | set, ecbdata->label_path[1], reset, name_b_tab); | |
6973dcae JH |
517 | ecbdata->label_path[0] = ecbdata->label_path[1] = NULL; |
518 | } | |
cd112cef JS |
519 | |
520 | /* This is not really necessary for now because | |
521 | * this codepath only deals with two-way diffs. | |
522 | */ | |
523 | for (i = 0; i < len && line[i] == '@'; i++) | |
524 | ; | |
525 | if (2 <= i && i < len && line[i] == ' ') { | |
526 | ecbdata->nparents = i - 1; | |
448c3ef1 JH |
527 | emit_line(diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO), |
528 | reset, line, len); | |
529 | return; | |
cd112cef | 530 | } |
448c3ef1 JH |
531 | |
532 | if (len < ecbdata->nparents) { | |
50f575fc | 533 | set = reset; |
448c3ef1 JH |
534 | emit_line(reset, reset, line, len); |
535 | return; | |
cd112cef | 536 | } |
448c3ef1 JH |
537 | |
538 | color = DIFF_PLAIN; | |
539 | if (ecbdata->diff_words && ecbdata->nparents != 1) | |
540 | /* fall back to normal diff */ | |
541 | free_diff_words_data(ecbdata); | |
542 | if (ecbdata->diff_words) { | |
543 | if (line[0] == '-') { | |
544 | diff_words_append(line, len, | |
545 | &ecbdata->diff_words->minus); | |
546 | return; | |
547 | } else if (line[0] == '+') { | |
548 | diff_words_append(line, len, | |
549 | &ecbdata->diff_words->plus); | |
550 | return; | |
551 | } | |
552 | if (ecbdata->diff_words->minus.text.size || | |
553 | ecbdata->diff_words->plus.text.size) | |
554 | diff_words_show(ecbdata->diff_words); | |
555 | line++; | |
50f575fc | 556 | len--; |
448c3ef1 JH |
557 | emit_line(set, reset, line, len); |
558 | return; | |
559 | } | |
560 | for (i = 0; i < ecbdata->nparents && len; i++) { | |
561 | if (line[i] == '-') | |
562 | color = DIFF_FILE_OLD; | |
563 | else if (line[i] == '+') | |
564 | color = DIFF_FILE_NEW; | |
565 | } | |
566 | ||
567 | if (color != DIFF_FILE_NEW) { | |
568 | emit_line(diff_get_color(ecbdata->color_diff, color), | |
569 | reset, line, len); | |
570 | return; | |
571 | } | |
572 | emit_add_line(reset, ecbdata, line, len); | |
6973dcae JH |
573 | } |
574 | ||
575 | static char *pprint_rename(const char *a, const char *b) | |
576 | { | |
577 | const char *old = a; | |
578 | const char *new = b; | |
579 | char *name = NULL; | |
580 | int pfx_length, sfx_length; | |
581 | int len_a = strlen(a); | |
582 | int len_b = strlen(b); | |
e5bfbf9b AJ |
583 | int qlen_a = quote_c_style(a, NULL, NULL, 0); |
584 | int qlen_b = quote_c_style(b, NULL, NULL, 0); | |
585 | ||
586 | if (qlen_a || qlen_b) { | |
587 | if (qlen_a) len_a = qlen_a; | |
588 | if (qlen_b) len_b = qlen_b; | |
589 | name = xmalloc( len_a + len_b + 5 ); | |
590 | if (qlen_a) | |
591 | quote_c_style(a, name, NULL, 0); | |
592 | else | |
593 | memcpy(name, a, len_a); | |
594 | memcpy(name + len_a, " => ", 4); | |
595 | if (qlen_b) | |
596 | quote_c_style(b, name + len_a + 4, NULL, 0); | |
597 | else | |
598 | memcpy(name + len_a + 4, b, len_b + 1); | |
599 | return name; | |
600 | } | |
6973dcae JH |
601 | |
602 | /* Find common prefix */ | |
603 | pfx_length = 0; | |
604 | while (*old && *new && *old == *new) { | |
605 | if (*old == '/') | |
606 | pfx_length = old - a + 1; | |
607 | old++; | |
608 | new++; | |
609 | } | |
610 | ||
611 | /* Find common suffix */ | |
612 | old = a + len_a; | |
613 | new = b + len_b; | |
614 | sfx_length = 0; | |
615 | while (a <= old && b <= new && *old == *new) { | |
616 | if (*old == '/') | |
617 | sfx_length = len_a - (old - a); | |
618 | old--; | |
619 | new--; | |
620 | } | |
621 | ||
622 | /* | |
623 | * pfx{mid-a => mid-b}sfx | |
624 | * {pfx-a => pfx-b}sfx | |
625 | * pfx{sfx-a => sfx-b} | |
626 | * name-a => name-b | |
627 | */ | |
628 | if (pfx_length + sfx_length) { | |
cc908b82 JH |
629 | int a_midlen = len_a - pfx_length - sfx_length; |
630 | int b_midlen = len_b - pfx_length - sfx_length; | |
631 | if (a_midlen < 0) a_midlen = 0; | |
632 | if (b_midlen < 0) b_midlen = 0; | |
633 | ||
e3008464 | 634 | name = xmalloc(pfx_length + a_midlen + b_midlen + sfx_length + 7); |
6973dcae JH |
635 | sprintf(name, "%.*s{%.*s => %.*s}%s", |
636 | pfx_length, a, | |
cc908b82 JH |
637 | a_midlen, a + pfx_length, |
638 | b_midlen, b + pfx_length, | |
6973dcae JH |
639 | a + len_a - sfx_length); |
640 | } | |
641 | else { | |
642 | name = xmalloc(len_a + len_b + 5); | |
643 | sprintf(name, "%s => %s", a, b); | |
644 | } | |
645 | return name; | |
646 | } | |
647 | ||
648 | struct diffstat_t { | |
649 | struct xdiff_emit_state xm; | |
650 | ||
651 | int nr; | |
652 | int alloc; | |
653 | struct diffstat_file { | |
654 | char *name; | |
655 | unsigned is_unmerged:1; | |
656 | unsigned is_binary:1; | |
657 | unsigned is_renamed:1; | |
658 | unsigned int added, deleted; | |
659 | } **files; | |
660 | }; | |
661 | ||
662 | static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat, | |
663 | const char *name_a, | |
664 | const char *name_b) | |
665 | { | |
666 | struct diffstat_file *x; | |
667 | x = xcalloc(sizeof (*x), 1); | |
668 | if (diffstat->nr == diffstat->alloc) { | |
669 | diffstat->alloc = alloc_nr(diffstat->alloc); | |
670 | diffstat->files = xrealloc(diffstat->files, | |
671 | diffstat->alloc * sizeof(x)); | |
672 | } | |
673 | diffstat->files[diffstat->nr++] = x; | |
674 | if (name_b) { | |
675 | x->name = pprint_rename(name_a, name_b); | |
676 | x->is_renamed = 1; | |
677 | } | |
678 | else | |
9befac47 | 679 | x->name = xstrdup(name_a); |
6973dcae JH |
680 | return x; |
681 | } | |
682 | ||
683 | static void diffstat_consume(void *priv, char *line, unsigned long len) | |
684 | { | |
685 | struct diffstat_t *diffstat = priv; | |
686 | struct diffstat_file *x = diffstat->files[diffstat->nr - 1]; | |
687 | ||
688 | if (line[0] == '+') | |
689 | x->added++; | |
690 | else if (line[0] == '-') | |
691 | x->deleted++; | |
692 | } | |
693 | ||
698ce6f8 | 694 | const char mime_boundary_leader[] = "------------"; |
6973dcae | 695 | |
a2540023 JH |
696 | static int scale_linear(int it, int width, int max_change) |
697 | { | |
698 | /* | |
3ed74e60 JS |
699 | * make sure that at least one '-' is printed if there were deletions, |
700 | * and likewise for '+'. | |
a2540023 | 701 | */ |
3ed74e60 JS |
702 | if (max_change < 2) |
703 | return it; | |
704 | return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1); | |
a2540023 JH |
705 | } |
706 | ||
785f7432 JH |
707 | static void show_name(const char *prefix, const char *name, int len, |
708 | const char *reset, const char *set) | |
a2540023 | 709 | { |
785f7432 | 710 | printf(" %s%s%-*s%s |", set, prefix, len, name, reset); |
a2540023 JH |
711 | } |
712 | ||
785f7432 | 713 | static void show_graph(char ch, int cnt, const char *set, const char *reset) |
a2540023 JH |
714 | { |
715 | if (cnt <= 0) | |
716 | return; | |
785f7432 | 717 | printf("%s", set); |
a2540023 JH |
718 | while (cnt--) |
719 | putchar(ch); | |
785f7432 | 720 | printf("%s", reset); |
a2540023 JH |
721 | } |
722 | ||
723 | static void show_stats(struct diffstat_t* data, struct diff_options *options) | |
6973dcae | 724 | { |
6973dcae | 725 | int i, len, add, del, total, adds = 0, dels = 0; |
a2540023 | 726 | int max_change = 0, max_len = 0; |
6973dcae | 727 | int total_files = data->nr; |
a2540023 | 728 | int width, name_width; |
785f7432 | 729 | const char *reset, *set, *add_c, *del_c; |
6973dcae JH |
730 | |
731 | if (data->nr == 0) | |
732 | return; | |
733 | ||
a2540023 JH |
734 | width = options->stat_width ? options->stat_width : 80; |
735 | name_width = options->stat_name_width ? options->stat_name_width : 50; | |
736 | ||
737 | /* Sanity: give at least 5 columns to the graph, | |
738 | * but leave at least 10 columns for the name. | |
739 | */ | |
740 | if (width < name_width + 15) { | |
741 | if (name_width <= 25) | |
742 | width = name_width + 15; | |
743 | else | |
744 | name_width = width - 15; | |
745 | } | |
746 | ||
747 | /* Find the longest filename and max number of changes */ | |
785f7432 JH |
748 | reset = diff_get_color(options->color_diff, DIFF_RESET); |
749 | set = diff_get_color(options->color_diff, DIFF_PLAIN); | |
750 | add_c = diff_get_color(options->color_diff, DIFF_FILE_NEW); | |
751 | del_c = diff_get_color(options->color_diff, DIFF_FILE_OLD); | |
752 | ||
6973dcae JH |
753 | for (i = 0; i < data->nr; i++) { |
754 | struct diffstat_file *file = data->files[i]; | |
a2540023 JH |
755 | int change = file->added + file->deleted; |
756 | ||
e5bfbf9b AJ |
757 | if (!file->is_renamed) { /* renames are already quoted by pprint_rename */ |
758 | len = quote_c_style(file->name, NULL, NULL, 0); | |
759 | if (len) { | |
760 | char *qname = xmalloc(len + 1); | |
761 | quote_c_style(file->name, qname, NULL, 0); | |
762 | free(file->name); | |
763 | file->name = qname; | |
764 | } | |
a2540023 | 765 | } |
6973dcae JH |
766 | |
767 | len = strlen(file->name); | |
768 | if (max_len < len) | |
769 | max_len = len; | |
770 | ||
771 | if (file->is_binary || file->is_unmerged) | |
772 | continue; | |
a2540023 JH |
773 | if (max_change < change) |
774 | max_change = change; | |
6973dcae JH |
775 | } |
776 | ||
a2540023 JH |
777 | /* Compute the width of the graph part; |
778 | * 10 is for one blank at the beginning of the line plus | |
779 | * " | count " between the name and the graph. | |
780 | * | |
781 | * From here on, name_width is the width of the name area, | |
782 | * and width is the width of the graph area. | |
783 | */ | |
784 | name_width = (name_width < max_len) ? name_width : max_len; | |
785 | if (width < (name_width + 10) + max_change) | |
786 | width = width - (name_width + 10); | |
787 | else | |
788 | width = max_change; | |
789 | ||
6973dcae | 790 | for (i = 0; i < data->nr; i++) { |
d2543b8e | 791 | const char *prefix = ""; |
6973dcae JH |
792 | char *name = data->files[i]->name; |
793 | int added = data->files[i]->added; | |
794 | int deleted = data->files[i]->deleted; | |
a2540023 | 795 | int name_len; |
6973dcae JH |
796 | |
797 | /* | |
798 | * "scale" the filename | |
799 | */ | |
a2540023 JH |
800 | len = name_width; |
801 | name_len = strlen(name); | |
802 | if (name_width < name_len) { | |
6973dcae JH |
803 | char *slash; |
804 | prefix = "..."; | |
a2540023 JH |
805 | len -= 3; |
806 | name += name_len - len; | |
6973dcae JH |
807 | slash = strchr(name, '/'); |
808 | if (slash) | |
809 | name = slash; | |
810 | } | |
6973dcae JH |
811 | |
812 | if (data->files[i]->is_binary) { | |
785f7432 | 813 | show_name(prefix, name, len, reset, set); |
a2540023 | 814 | printf(" Bin\n"); |
6973dcae JH |
815 | goto free_diffstat_file; |
816 | } | |
817 | else if (data->files[i]->is_unmerged) { | |
785f7432 | 818 | show_name(prefix, name, len, reset, set); |
a2540023 | 819 | printf(" Unmerged\n"); |
6973dcae JH |
820 | goto free_diffstat_file; |
821 | } | |
822 | else if (!data->files[i]->is_renamed && | |
823 | (added + deleted == 0)) { | |
824 | total_files--; | |
825 | goto free_diffstat_file; | |
826 | } | |
827 | ||
a2540023 JH |
828 | /* |
829 | * scale the add/delete | |
830 | */ | |
6973dcae JH |
831 | add = added; |
832 | del = deleted; | |
833 | total = add + del; | |
834 | adds += add; | |
835 | dels += del; | |
836 | ||
a2540023 | 837 | if (width <= max_change) { |
a2540023 | 838 | add = scale_linear(add, width, max_change); |
3ed74e60 JS |
839 | del = scale_linear(del, width, max_change); |
840 | total = add + del; | |
6973dcae | 841 | } |
785f7432 | 842 | show_name(prefix, name, len, reset, set); |
a2540023 | 843 | printf("%5d ", added + deleted); |
785f7432 JH |
844 | show_graph('+', add, add_c, reset); |
845 | show_graph('-', del, del_c, reset); | |
a2540023 | 846 | putchar('\n'); |
6973dcae JH |
847 | free_diffstat_file: |
848 | free(data->files[i]->name); | |
849 | free(data->files[i]); | |
850 | } | |
851 | free(data->files); | |
785f7432 JH |
852 | printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n", |
853 | set, total_files, adds, dels, reset); | |
6973dcae JH |
854 | } |
855 | ||
ebd124c6 NP |
856 | static void show_shortstats(struct diffstat_t* data) |
857 | { | |
858 | int i, adds = 0, dels = 0, total_files = data->nr; | |
859 | ||
860 | if (data->nr == 0) | |
861 | return; | |
862 | ||
863 | for (i = 0; i < data->nr; i++) { | |
864 | if (!data->files[i]->is_binary && | |
865 | !data->files[i]->is_unmerged) { | |
866 | int added = data->files[i]->added; | |
867 | int deleted= data->files[i]->deleted; | |
868 | if (!data->files[i]->is_renamed && | |
869 | (added + deleted == 0)) { | |
870 | total_files--; | |
871 | } else { | |
872 | adds += added; | |
873 | dels += deleted; | |
874 | } | |
875 | } | |
876 | free(data->files[i]->name); | |
877 | free(data->files[i]); | |
878 | } | |
879 | free(data->files); | |
880 | ||
881 | printf(" %d files changed, %d insertions(+), %d deletions(-)\n", | |
882 | total_files, adds, dels); | |
883 | } | |
884 | ||
74e2abe5 JH |
885 | static void show_numstat(struct diffstat_t* data, struct diff_options *options) |
886 | { | |
887 | int i; | |
888 | ||
889 | for (i = 0; i < data->nr; i++) { | |
890 | struct diffstat_file *file = data->files[i]; | |
891 | ||
bfddbc5e JH |
892 | if (file->is_binary) |
893 | printf("-\t-\t"); | |
894 | else | |
895 | printf("%d\t%d\t", file->added, file->deleted); | |
e5bfbf9b | 896 | if (options->line_termination && !file->is_renamed && |
74e2abe5 JH |
897 | quote_c_style(file->name, NULL, NULL, 0)) |
898 | quote_c_style(file->name, NULL, stdout, 0); | |
899 | else | |
900 | fputs(file->name, stdout); | |
901 | putchar(options->line_termination); | |
902 | } | |
903 | } | |
904 | ||
88246898 JS |
905 | struct checkdiff_t { |
906 | struct xdiff_emit_state xm; | |
907 | const char *filename; | |
c5a8c3ec | 908 | int lineno, color_diff; |
88246898 JS |
909 | }; |
910 | ||
911 | static void checkdiff_consume(void *priv, char *line, unsigned long len) | |
912 | { | |
913 | struct checkdiff_t *data = priv; | |
c5a8c3ec JS |
914 | const char *ws = diff_get_color(data->color_diff, DIFF_WHITESPACE); |
915 | const char *reset = diff_get_color(data->color_diff, DIFF_RESET); | |
916 | const char *set = diff_get_color(data->color_diff, DIFF_FILE_NEW); | |
88246898 JS |
917 | |
918 | if (line[0] == '+') { | |
c5a8c3ec | 919 | int i, spaces = 0, space_before_tab = 0, white_space_at_end = 0; |
88246898 | 920 | |
88246898 JS |
921 | /* check space before tab */ |
922 | for (i = 1; i < len && (line[i] == ' ' || line[i] == '\t'); i++) | |
923 | if (line[i] == ' ') | |
924 | spaces++; | |
925 | if (line[i - 1] == '\t' && spaces) | |
c5a8c3ec | 926 | space_before_tab = 1; |
88246898 JS |
927 | |
928 | /* check white space at line end */ | |
929 | if (line[len - 1] == '\n') | |
930 | len--; | |
931 | if (isspace(line[len - 1])) | |
c5a8c3ec JS |
932 | white_space_at_end = 1; |
933 | ||
934 | if (space_before_tab || white_space_at_end) { | |
935 | printf("%s:%d: %s", data->filename, data->lineno, ws); | |
936 | if (space_before_tab) { | |
937 | printf("space before tab"); | |
938 | if (white_space_at_end) | |
939 | putchar(','); | |
940 | } | |
941 | if (white_space_at_end) | |
942 | printf("white space at end"); | |
943 | printf(":%s ", reset); | |
944 | emit_line_with_ws(1, set, reset, ws, line, len); | |
945 | } | |
e6d40d65 JS |
946 | |
947 | data->lineno++; | |
88246898 JS |
948 | } else if (line[0] == ' ') |
949 | data->lineno++; | |
950 | else if (line[0] == '@') { | |
951 | char *plus = strchr(line, '+'); | |
952 | if (plus) | |
9e848163 | 953 | data->lineno = strtol(plus, NULL, 10); |
88246898 JS |
954 | else |
955 | die("invalid diff"); | |
956 | } | |
957 | } | |
958 | ||
0660626c JH |
959 | static unsigned char *deflate_it(char *data, |
960 | unsigned long size, | |
961 | unsigned long *result_size) | |
051308f6 | 962 | { |
0660626c JH |
963 | int bound; |
964 | unsigned char *deflated; | |
965 | z_stream stream; | |
966 | ||
967 | memset(&stream, 0, sizeof(stream)); | |
12f6c308 | 968 | deflateInit(&stream, zlib_compression_level); |
0660626c JH |
969 | bound = deflateBound(&stream, size); |
970 | deflated = xmalloc(bound); | |
971 | stream.next_out = deflated; | |
972 | stream.avail_out = bound; | |
973 | ||
974 | stream.next_in = (unsigned char *)data; | |
975 | stream.avail_in = size; | |
976 | while (deflate(&stream, Z_FINISH) == Z_OK) | |
977 | ; /* nothing */ | |
978 | deflateEnd(&stream); | |
979 | *result_size = stream.total_out; | |
980 | return deflated; | |
051308f6 JH |
981 | } |
982 | ||
d4c452f0 | 983 | static void emit_binary_diff_body(mmfile_t *one, mmfile_t *two) |
051308f6 | 984 | { |
0660626c JH |
985 | void *cp; |
986 | void *delta; | |
987 | void *deflated; | |
988 | void *data; | |
989 | unsigned long orig_size; | |
990 | unsigned long delta_size; | |
991 | unsigned long deflate_size; | |
992 | unsigned long data_size; | |
051308f6 | 993 | |
0660626c JH |
994 | /* We could do deflated delta, or we could do just deflated two, |
995 | * whichever is smaller. | |
051308f6 | 996 | */ |
0660626c JH |
997 | delta = NULL; |
998 | deflated = deflate_it(two->ptr, two->size, &deflate_size); | |
999 | if (one->size && two->size) { | |
1000 | delta = diff_delta(one->ptr, one->size, | |
1001 | two->ptr, two->size, | |
1002 | &delta_size, deflate_size); | |
1003 | if (delta) { | |
1004 | void *to_free = delta; | |
1005 | orig_size = delta_size; | |
1006 | delta = deflate_it(delta, delta_size, &delta_size); | |
1007 | free(to_free); | |
051308f6 JH |
1008 | } |
1009 | } | |
051308f6 | 1010 | |
0660626c JH |
1011 | if (delta && delta_size < deflate_size) { |
1012 | printf("delta %lu\n", orig_size); | |
1013 | free(deflated); | |
1014 | data = delta; | |
1015 | data_size = delta_size; | |
1016 | } | |
1017 | else { | |
1018 | printf("literal %lu\n", two->size); | |
1019 | free(delta); | |
1020 | data = deflated; | |
1021 | data_size = deflate_size; | |
1022 | } | |
051308f6 | 1023 | |
0660626c JH |
1024 | /* emit data encoded in base85 */ |
1025 | cp = data; | |
1026 | while (data_size) { | |
1027 | int bytes = (52 < data_size) ? 52 : data_size; | |
051308f6 | 1028 | char line[70]; |
0660626c | 1029 | data_size -= bytes; |
051308f6 JH |
1030 | if (bytes <= 26) |
1031 | line[0] = bytes + 'A' - 1; | |
1032 | else | |
1033 | line[0] = bytes - 26 + 'a' - 1; | |
1034 | encode_85(line + 1, cp, bytes); | |
1d7f171c | 1035 | cp = (char *) cp + bytes; |
051308f6 JH |
1036 | puts(line); |
1037 | } | |
1038 | printf("\n"); | |
0660626c | 1039 | free(data); |
051308f6 JH |
1040 | } |
1041 | ||
d4c452f0 JH |
1042 | static void emit_binary_diff(mmfile_t *one, mmfile_t *two) |
1043 | { | |
1044 | printf("GIT binary patch\n"); | |
1045 | emit_binary_diff_body(one, two); | |
1046 | emit_binary_diff_body(two, one); | |
1047 | } | |
1048 | ||
6973dcae JH |
1049 | #define FIRST_FEW_BYTES 8000 |
1050 | static int mmfile_is_binary(mmfile_t *mf) | |
1051 | { | |
1052 | long sz = mf->size; | |
1053 | if (FIRST_FEW_BYTES < sz) | |
1054 | sz = FIRST_FEW_BYTES; | |
8c0b2bb6 | 1055 | return !!memchr(mf->ptr, 0, sz); |
6973dcae JH |
1056 | } |
1057 | ||
1058 | static void builtin_diff(const char *name_a, | |
1059 | const char *name_b, | |
1060 | struct diff_filespec *one, | |
1061 | struct diff_filespec *two, | |
1062 | const char *xfrm_msg, | |
051308f6 | 1063 | struct diff_options *o, |
6973dcae JH |
1064 | int complete_rewrite) |
1065 | { | |
1066 | mmfile_t mf1, mf2; | |
1067 | const char *lbl[2]; | |
1068 | char *a_one, *b_two; | |
ce436973 JK |
1069 | const char *set = diff_get_color(o->color_diff, DIFF_METAINFO); |
1070 | const char *reset = diff_get_color(o->color_diff, DIFF_RESET); | |
6973dcae | 1071 | |
50892777 JH |
1072 | a_one = quote_two("a/", name_a + (*name_a == '/')); |
1073 | b_two = quote_two("b/", name_b + (*name_b == '/')); | |
6973dcae JH |
1074 | lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null"; |
1075 | lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null"; | |
50f575fc | 1076 | printf("%sdiff --git %s %s%s\n", set, a_one, b_two, reset); |
6973dcae JH |
1077 | if (lbl[0][0] == '/') { |
1078 | /* /dev/null */ | |
50f575fc LT |
1079 | printf("%snew file mode %06o%s\n", set, two->mode, reset); |
1080 | if (xfrm_msg && xfrm_msg[0]) | |
1081 | printf("%s%s%s\n", set, xfrm_msg, reset); | |
6973dcae JH |
1082 | } |
1083 | else if (lbl[1][0] == '/') { | |
50f575fc LT |
1084 | printf("%sdeleted file mode %06o%s\n", set, one->mode, reset); |
1085 | if (xfrm_msg && xfrm_msg[0]) | |
1086 | printf("%s%s%s\n", set, xfrm_msg, reset); | |
6973dcae JH |
1087 | } |
1088 | else { | |
1089 | if (one->mode != two->mode) { | |
50f575fc LT |
1090 | printf("%sold mode %06o%s\n", set, one->mode, reset); |
1091 | printf("%snew mode %06o%s\n", set, two->mode, reset); | |
cd112cef | 1092 | } |
50f575fc LT |
1093 | if (xfrm_msg && xfrm_msg[0]) |
1094 | printf("%s%s%s\n", set, xfrm_msg, reset); | |
6973dcae JH |
1095 | /* |
1096 | * we do not run diff between different kind | |
1097 | * of objects. | |
1098 | */ | |
1099 | if ((one->mode ^ two->mode) & S_IFMT) | |
1100 | goto free_ab_and_return; | |
1101 | if (complete_rewrite) { | |
13e36ec5 JS |
1102 | emit_rewrite_diff(name_a, name_b, one, two, |
1103 | o->color_diff); | |
34a5e1a2 | 1104 | o->found_changes = 1; |
6973dcae JH |
1105 | goto free_ab_and_return; |
1106 | } | |
1107 | } | |
1108 | ||
1109 | if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) | |
1110 | die("unable to read files to diff"); | |
1111 | ||
6d64ea96 | 1112 | if (!o->text && (mmfile_is_binary(&mf1) || mmfile_is_binary(&mf2))) { |
0660626c JH |
1113 | /* Quite common confusing case */ |
1114 | if (mf1.size == mf2.size && | |
1115 | !memcmp(mf1.ptr, mf2.ptr, mf1.size)) | |
1116 | goto free_ab_and_return; | |
1117 | if (o->binary) | |
051308f6 JH |
1118 | emit_binary_diff(&mf1, &mf2); |
1119 | else | |
1120 | printf("Binary files %s and %s differ\n", | |
1121 | lbl[0], lbl[1]); | |
34a5e1a2 | 1122 | o->found_changes = 1; |
051308f6 | 1123 | } |
6973dcae JH |
1124 | else { |
1125 | /* Crazy xdl interfaces.. */ | |
1126 | const char *diffopts = getenv("GIT_DIFF_OPTS"); | |
1127 | xpparam_t xpp; | |
1128 | xdemitconf_t xecfg; | |
1129 | xdemitcb_t ecb; | |
1130 | struct emit_callback ecbdata; | |
1131 | ||
cd112cef | 1132 | memset(&ecbdata, 0, sizeof(ecbdata)); |
6973dcae | 1133 | ecbdata.label_path = lbl; |
cd112cef | 1134 | ecbdata.color_diff = o->color_diff; |
34a5e1a2 | 1135 | ecbdata.found_changesp = &o->found_changes; |
0d21efa5 | 1136 | xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts; |
ee1e5412 | 1137 | xecfg.ctxlen = o->context; |
6973dcae JH |
1138 | xecfg.flags = XDL_EMIT_FUNCNAMES; |
1139 | if (!diffopts) | |
1140 | ; | |
cc44c765 | 1141 | else if (!prefixcmp(diffopts, "--unified=")) |
6973dcae | 1142 | xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10); |
cc44c765 | 1143 | else if (!prefixcmp(diffopts, "-u")) |
6973dcae | 1144 | xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10); |
cd112cef | 1145 | ecb.outf = xdiff_outf; |
6973dcae | 1146 | ecb.priv = &ecbdata; |
cd112cef | 1147 | ecbdata.xm.consume = fn_out_consume; |
f59a59e2 JS |
1148 | if (o->color_diff_words) |
1149 | ecbdata.diff_words = | |
1150 | xcalloc(1, sizeof(struct diff_words_data)); | |
6973dcae | 1151 | xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb); |
f59a59e2 JS |
1152 | if (o->color_diff_words) |
1153 | free_diff_words_data(&ecbdata); | |
6973dcae JH |
1154 | } |
1155 | ||
1156 | free_ab_and_return: | |
1157 | free(a_one); | |
1158 | free(b_two); | |
1159 | return; | |
1160 | } | |
1161 | ||
1162 | static void builtin_diffstat(const char *name_a, const char *name_b, | |
1163 | struct diff_filespec *one, | |
1164 | struct diff_filespec *two, | |
710158e3 | 1165 | struct diffstat_t *diffstat, |
0d21efa5 | 1166 | struct diff_options *o, |
710158e3 | 1167 | int complete_rewrite) |
6973dcae JH |
1168 | { |
1169 | mmfile_t mf1, mf2; | |
1170 | struct diffstat_file *data; | |
1171 | ||
1172 | data = diffstat_add(diffstat, name_a, name_b); | |
1173 | ||
1174 | if (!one || !two) { | |
1175 | data->is_unmerged = 1; | |
1176 | return; | |
1177 | } | |
710158e3 JH |
1178 | if (complete_rewrite) { |
1179 | diff_populate_filespec(one, 0); | |
1180 | diff_populate_filespec(two, 0); | |
1181 | data->deleted = count_lines(one->data, one->size); | |
1182 | data->added = count_lines(two->data, two->size); | |
1183 | return; | |
1184 | } | |
6973dcae JH |
1185 | if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) |
1186 | die("unable to read files to diff"); | |
1187 | ||
1188 | if (mmfile_is_binary(&mf1) || mmfile_is_binary(&mf2)) | |
1189 | data->is_binary = 1; | |
1190 | else { | |
1191 | /* Crazy xdl interfaces.. */ | |
1192 | xpparam_t xpp; | |
1193 | xdemitconf_t xecfg; | |
1194 | xdemitcb_t ecb; | |
1195 | ||
0d21efa5 | 1196 | xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts; |
6973dcae JH |
1197 | xecfg.ctxlen = 0; |
1198 | xecfg.flags = 0; | |
1199 | ecb.outf = xdiff_outf; | |
1200 | ecb.priv = diffstat; | |
1201 | xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb); | |
1202 | } | |
1203 | } | |
1204 | ||
88246898 JS |
1205 | static void builtin_checkdiff(const char *name_a, const char *name_b, |
1206 | struct diff_filespec *one, | |
c5a8c3ec | 1207 | struct diff_filespec *two, struct diff_options *o) |
88246898 JS |
1208 | { |
1209 | mmfile_t mf1, mf2; | |
1210 | struct checkdiff_t data; | |
1211 | ||
1212 | if (!two) | |
1213 | return; | |
1214 | ||
1215 | memset(&data, 0, sizeof(data)); | |
1216 | data.xm.consume = checkdiff_consume; | |
1217 | data.filename = name_b ? name_b : name_a; | |
1218 | data.lineno = 0; | |
c5a8c3ec | 1219 | data.color_diff = o->color_diff; |
88246898 JS |
1220 | |
1221 | if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) | |
1222 | die("unable to read files to diff"); | |
1223 | ||
1224 | if (mmfile_is_binary(&mf2)) | |
1225 | return; | |
1226 | else { | |
1227 | /* Crazy xdl interfaces.. */ | |
1228 | xpparam_t xpp; | |
1229 | xdemitconf_t xecfg; | |
1230 | xdemitcb_t ecb; | |
1231 | ||
1232 | xpp.flags = XDF_NEED_MINIMAL; | |
1233 | xecfg.ctxlen = 0; | |
1234 | xecfg.flags = 0; | |
1235 | ecb.outf = xdiff_outf; | |
1236 | ecb.priv = &data; | |
1237 | xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb); | |
1238 | } | |
1239 | } | |
1240 | ||
6973dcae JH |
1241 | struct diff_filespec *alloc_filespec(const char *path) |
1242 | { | |
1243 | int namelen = strlen(path); | |
1244 | struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1); | |
1245 | ||
1246 | memset(spec, 0, sizeof(*spec)); | |
1247 | spec->path = (char *)(spec + 1); | |
1248 | memcpy(spec->path, path, namelen+1); | |
1249 | return spec; | |
1250 | } | |
1251 | ||
1252 | void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1, | |
1253 | unsigned short mode) | |
1254 | { | |
1255 | if (mode) { | |
1256 | spec->mode = canon_mode(mode); | |
e702496e | 1257 | hashcpy(spec->sha1, sha1); |
0bef57ee | 1258 | spec->sha1_valid = !is_null_sha1(sha1); |
6973dcae JH |
1259 | } |
1260 | } | |
1261 | ||
1262 | /* | |
1263 | * Given a name and sha1 pair, if the dircache tells us the file in | |
1264 | * the work tree has that object contents, return true, so that | |
1265 | * prepare_temp_file() does not have to inflate and extract. | |
1266 | */ | |
1510fea7 | 1267 | static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file) |
6973dcae JH |
1268 | { |
1269 | struct cache_entry *ce; | |
1270 | struct stat st; | |
1271 | int pos, len; | |
1272 | ||
1273 | /* We do not read the cache ourselves here, because the | |
1274 | * benchmark with my previous version that always reads cache | |
1275 | * shows that it makes things worse for diff-tree comparing | |
1276 | * two linux-2.6 kernel trees in an already checked out work | |
1277 | * tree. This is because most diff-tree comparisons deal with | |
1278 | * only a small number of files, while reading the cache is | |
1279 | * expensive for a large project, and its cost outweighs the | |
1280 | * savings we get by not inflating the object to a temporary | |
1281 | * file. Practically, this code only helps when we are used | |
1282 | * by diff-cache --cached, which does read the cache before | |
1283 | * calling us. | |
1284 | */ | |
1285 | if (!active_cache) | |
1286 | return 0; | |
1287 | ||
1510fea7 SP |
1288 | /* We want to avoid the working directory if our caller |
1289 | * doesn't need the data in a normal file, this system | |
1290 | * is rather slow with its stat/open/mmap/close syscalls, | |
1291 | * and the object is contained in a pack file. The pack | |
1292 | * is probably already open and will be faster to obtain | |
1293 | * the data through than the working directory. Loose | |
1294 | * objects however would tend to be slower as they need | |
1295 | * to be individually opened and inflated. | |
1296 | */ | |
5caf9232 | 1297 | if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL)) |
1510fea7 SP |
1298 | return 0; |
1299 | ||
6973dcae JH |
1300 | len = strlen(name); |
1301 | pos = cache_name_pos(name, len); | |
1302 | if (pos < 0) | |
1303 | return 0; | |
1304 | ce = active_cache[pos]; | |
1305 | if ((lstat(name, &st) < 0) || | |
1306 | !S_ISREG(st.st_mode) || /* careful! */ | |
1307 | ce_match_stat(ce, &st, 0) || | |
a89fccd2 | 1308 | hashcmp(sha1, ce->sha1)) |
6973dcae JH |
1309 | return 0; |
1310 | /* we return 1 only when we can stat, it is a regular file, | |
1311 | * stat information matches, and sha1 recorded in the cache | |
1312 | * matches. I.e. we know the file in the work tree really is | |
1313 | * the same as the <name, sha1> pair. | |
1314 | */ | |
1315 | return 1; | |
1316 | } | |
1317 | ||
1318 | static struct sha1_size_cache { | |
1319 | unsigned char sha1[20]; | |
1320 | unsigned long size; | |
1321 | } **sha1_size_cache; | |
1322 | static int sha1_size_cache_nr, sha1_size_cache_alloc; | |
1323 | ||
1324 | static struct sha1_size_cache *locate_size_cache(unsigned char *sha1, | |
1325 | int find_only, | |
1326 | unsigned long size) | |
1327 | { | |
1328 | int first, last; | |
1329 | struct sha1_size_cache *e; | |
1330 | ||
1331 | first = 0; | |
1332 | last = sha1_size_cache_nr; | |
1333 | while (last > first) { | |
1334 | int cmp, next = (last + first) >> 1; | |
1335 | e = sha1_size_cache[next]; | |
a89fccd2 | 1336 | cmp = hashcmp(e->sha1, sha1); |
6973dcae JH |
1337 | if (!cmp) |
1338 | return e; | |
1339 | if (cmp < 0) { | |
1340 | last = next; | |
1341 | continue; | |
1342 | } | |
1343 | first = next+1; | |
1344 | } | |
1345 | /* not found */ | |
1346 | if (find_only) | |
1347 | return NULL; | |
1348 | /* insert to make it at "first" */ | |
1349 | if (sha1_size_cache_alloc <= sha1_size_cache_nr) { | |
1350 | sha1_size_cache_alloc = alloc_nr(sha1_size_cache_alloc); | |
1351 | sha1_size_cache = xrealloc(sha1_size_cache, | |
1352 | sha1_size_cache_alloc * | |
1353 | sizeof(*sha1_size_cache)); | |
1354 | } | |
1355 | sha1_size_cache_nr++; | |
1356 | if (first < sha1_size_cache_nr) | |
1357 | memmove(sha1_size_cache + first + 1, sha1_size_cache + first, | |
1358 | (sha1_size_cache_nr - first - 1) * | |
1359 | sizeof(*sha1_size_cache)); | |
1360 | e = xmalloc(sizeof(struct sha1_size_cache)); | |
1361 | sha1_size_cache[first] = e; | |
e702496e | 1362 | hashcpy(e->sha1, sha1); |
6973dcae JH |
1363 | e->size = size; |
1364 | return e; | |
1365 | } | |
1366 | ||
3afaa72d JH |
1367 | static int populate_from_stdin(struct diff_filespec *s) |
1368 | { | |
1369 | #define INCREMENT 1024 | |
1370 | char *buf; | |
1371 | unsigned long size; | |
1372 | int got; | |
1373 | ||
1374 | size = 0; | |
1375 | buf = NULL; | |
1376 | while (1) { | |
1377 | buf = xrealloc(buf, size + INCREMENT); | |
1378 | got = xread(0, buf + size, INCREMENT); | |
1379 | if (!got) | |
1380 | break; /* EOF */ | |
1381 | if (got < 0) | |
1382 | return error("error while reading from stdin %s", | |
1383 | strerror(errno)); | |
1384 | size += got; | |
1385 | } | |
1386 | s->should_munmap = 0; | |
1387 | s->data = buf; | |
1388 | s->size = size; | |
1389 | s->should_free = 1; | |
1390 | return 0; | |
1391 | } | |
1392 | ||
6973dcae JH |
1393 | /* |
1394 | * While doing rename detection and pickaxe operation, we may need to | |
1395 | * grab the data for the blob (or file) for our own in-core comparison. | |
1396 | * diff_filespec has data and size fields for this purpose. | |
1397 | */ | |
1398 | int diff_populate_filespec(struct diff_filespec *s, int size_only) | |
1399 | { | |
1400 | int err = 0; | |
1401 | if (!DIFF_FILE_VALID(s)) | |
1402 | die("internal error: asking to populate invalid file."); | |
1403 | if (S_ISDIR(s->mode)) | |
1404 | return -1; | |
1405 | ||
1406 | if (!use_size_cache) | |
1407 | size_only = 0; | |
1408 | ||
1409 | if (s->data) | |
1410 | return err; | |
1411 | if (!s->sha1_valid || | |
1510fea7 | 1412 | reuse_worktree_file(s->path, s->sha1, 0)) { |
6973dcae JH |
1413 | struct stat st; |
1414 | int fd; | |
6c510bee LT |
1415 | char *buf; |
1416 | unsigned long size; | |
1417 | ||
3afaa72d JH |
1418 | if (!strcmp(s->path, "-")) |
1419 | return populate_from_stdin(s); | |
1420 | ||
6973dcae JH |
1421 | if (lstat(s->path, &st) < 0) { |
1422 | if (errno == ENOENT) { | |
1423 | err_empty: | |
1424 | err = -1; | |
1425 | empty: | |
d2543b8e | 1426 | s->data = (char *)""; |
6973dcae JH |
1427 | s->size = 0; |
1428 | return err; | |
1429 | } | |
1430 | } | |
dc49cd76 | 1431 | s->size = xsize_t(st.st_size); |
6973dcae JH |
1432 | if (!s->size) |
1433 | goto empty; | |
1434 | if (size_only) | |
1435 | return 0; | |
1436 | if (S_ISLNK(st.st_mode)) { | |
1437 | int ret; | |
1438 | s->data = xmalloc(s->size); | |
1439 | s->should_free = 1; | |
1440 | ret = readlink(s->path, s->data, s->size); | |
1441 | if (ret < 0) { | |
1442 | free(s->data); | |
1443 | goto err_empty; | |
1444 | } | |
1445 | return 0; | |
1446 | } | |
1447 | fd = open(s->path, O_RDONLY); | |
1448 | if (fd < 0) | |
1449 | goto err_empty; | |
c4712e45 | 1450 | s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0); |
6973dcae | 1451 | close(fd); |
6973dcae | 1452 | s->should_munmap = 1; |
6c510bee LT |
1453 | |
1454 | /* | |
1455 | * Convert from working tree format to canonical git format | |
1456 | */ | |
1457 | buf = s->data; | |
1458 | size = s->size; | |
1459 | if (convert_to_git(s->path, &buf, &size)) { | |
1460 | munmap(s->data, s->size); | |
1461 | s->should_munmap = 0; | |
1462 | s->data = buf; | |
1463 | s->size = size; | |
1464 | s->should_free = 1; | |
1465 | } | |
6973dcae JH |
1466 | } |
1467 | else { | |
21666f1a | 1468 | enum object_type type; |
6973dcae JH |
1469 | struct sha1_size_cache *e; |
1470 | ||
1471 | if (size_only) { | |
1472 | e = locate_size_cache(s->sha1, 1, 0); | |
1473 | if (e) { | |
1474 | s->size = e->size; | |
1475 | return 0; | |
1476 | } | |
21666f1a NP |
1477 | type = sha1_object_info(s->sha1, &s->size); |
1478 | if (type < 0) | |
6973dcae JH |
1479 | locate_size_cache(s->sha1, 0, s->size); |
1480 | } | |
1481 | else { | |
21666f1a | 1482 | s->data = read_sha1_file(s->sha1, &type, &s->size); |
6973dcae JH |
1483 | s->should_free = 1; |
1484 | } | |
1485 | } | |
1486 | return 0; | |
1487 | } | |
1488 | ||
1489 | void diff_free_filespec_data(struct diff_filespec *s) | |
1490 | { | |
1491 | if (s->should_free) | |
1492 | free(s->data); | |
1493 | else if (s->should_munmap) | |
1494 | munmap(s->data, s->size); | |
1495 | s->should_free = s->should_munmap = 0; | |
1496 | s->data = NULL; | |
1497 | free(s->cnt_data); | |
1498 | s->cnt_data = NULL; | |
1499 | } | |
1500 | ||
1501 | static void prep_temp_blob(struct diff_tempfile *temp, | |
1502 | void *blob, | |
1503 | unsigned long size, | |
1504 | const unsigned char *sha1, | |
1505 | int mode) | |
1506 | { | |
1507 | int fd; | |
1508 | ||
1509 | fd = git_mkstemp(temp->tmp_path, TEMPFILE_PATH_LEN, ".diff_XXXXXX"); | |
1510 | if (fd < 0) | |
1511 | die("unable to create temp-file"); | |
93822c22 | 1512 | if (write_in_full(fd, blob, size) != size) |
6973dcae JH |
1513 | die("unable to write temp-file"); |
1514 | close(fd); | |
1515 | temp->name = temp->tmp_path; | |
1516 | strcpy(temp->hex, sha1_to_hex(sha1)); | |
1517 | temp->hex[40] = 0; | |
1518 | sprintf(temp->mode, "%06o", mode); | |
1519 | } | |
1520 | ||
1521 | static void prepare_temp_file(const char *name, | |
1522 | struct diff_tempfile *temp, | |
1523 | struct diff_filespec *one) | |
1524 | { | |
1525 | if (!DIFF_FILE_VALID(one)) { | |
1526 | not_a_valid_file: | |
1527 | /* A '-' entry produces this for file-2, and | |
1528 | * a '+' entry produces this for file-1. | |
1529 | */ | |
1530 | temp->name = "/dev/null"; | |
1531 | strcpy(temp->hex, "."); | |
1532 | strcpy(temp->mode, "."); | |
1533 | return; | |
1534 | } | |
1535 | ||
1536 | if (!one->sha1_valid || | |
1510fea7 | 1537 | reuse_worktree_file(name, one->sha1, 1)) { |
6973dcae JH |
1538 | struct stat st; |
1539 | if (lstat(name, &st) < 0) { | |
1540 | if (errno == ENOENT) | |
1541 | goto not_a_valid_file; | |
1542 | die("stat(%s): %s", name, strerror(errno)); | |
1543 | } | |
1544 | if (S_ISLNK(st.st_mode)) { | |
1545 | int ret; | |
1546 | char buf[PATH_MAX + 1]; /* ought to be SYMLINK_MAX */ | |
dc49cd76 | 1547 | size_t sz = xsize_t(st.st_size); |
6973dcae JH |
1548 | if (sizeof(buf) <= st.st_size) |
1549 | die("symlink too long: %s", name); | |
dc49cd76 | 1550 | ret = readlink(name, buf, sz); |
6973dcae JH |
1551 | if (ret < 0) |
1552 | die("readlink(%s)", name); | |
dc49cd76 | 1553 | prep_temp_blob(temp, buf, sz, |
6973dcae JH |
1554 | (one->sha1_valid ? |
1555 | one->sha1 : null_sha1), | |
1556 | (one->sha1_valid ? | |
1557 | one->mode : S_IFLNK)); | |
1558 | } | |
1559 | else { | |
1560 | /* we can borrow from the file in the work tree */ | |
1561 | temp->name = name; | |
1562 | if (!one->sha1_valid) | |
1563 | strcpy(temp->hex, sha1_to_hex(null_sha1)); | |
1564 | else | |
1565 | strcpy(temp->hex, sha1_to_hex(one->sha1)); | |
1566 | /* Even though we may sometimes borrow the | |
1567 | * contents from the work tree, we always want | |
1568 | * one->mode. mode is trustworthy even when | |
1569 | * !(one->sha1_valid), as long as | |
1570 | * DIFF_FILE_VALID(one). | |
1571 | */ | |
1572 | sprintf(temp->mode, "%06o", one->mode); | |
1573 | } | |
1574 | return; | |
1575 | } | |
1576 | else { | |
1577 | if (diff_populate_filespec(one, 0)) | |
1578 | die("cannot read data blob for %s", one->path); | |
1579 | prep_temp_blob(temp, one->data, one->size, | |
1580 | one->sha1, one->mode); | |
1581 | } | |
1582 | } | |
1583 | ||
1584 | static void remove_tempfile(void) | |
1585 | { | |
1586 | int i; | |
1587 | ||
1588 | for (i = 0; i < 2; i++) | |
1589 | if (diff_temp[i].name == diff_temp[i].tmp_path) { | |
1590 | unlink(diff_temp[i].name); | |
1591 | diff_temp[i].name = NULL; | |
1592 | } | |
1593 | } | |
1594 | ||
1595 | static void remove_tempfile_on_signal(int signo) | |
1596 | { | |
1597 | remove_tempfile(); | |
1598 | signal(SIGINT, SIG_DFL); | |
1599 | raise(signo); | |
1600 | } | |
1601 | ||
1602 | static int spawn_prog(const char *pgm, const char **arg) | |
1603 | { | |
1604 | pid_t pid; | |
1605 | int status; | |
1606 | ||
1607 | fflush(NULL); | |
1608 | pid = fork(); | |
1609 | if (pid < 0) | |
1610 | die("unable to fork"); | |
1611 | if (!pid) { | |
1612 | execvp(pgm, (char *const*) arg); | |
1613 | exit(255); | |
1614 | } | |
1615 | ||
1616 | while (waitpid(pid, &status, 0) < 0) { | |
1617 | if (errno == EINTR) | |
1618 | continue; | |
1619 | return -1; | |
1620 | } | |
1621 | ||
1622 | /* Earlier we did not check the exit status because | |
1623 | * diff exits non-zero if files are different, and | |
1624 | * we are not interested in knowing that. It was a | |
1625 | * mistake which made it harder to quit a diff-* | |
1626 | * session that uses the git-apply-patch-script as | |
1627 | * the GIT_EXTERNAL_DIFF. A custom GIT_EXTERNAL_DIFF | |
1628 | * should also exit non-zero only when it wants to | |
1629 | * abort the entire diff-* session. | |
1630 | */ | |
1631 | if (WIFEXITED(status) && !WEXITSTATUS(status)) | |
1632 | return 0; | |
1633 | return -1; | |
1634 | } | |
1635 | ||
1636 | /* An external diff command takes: | |
1637 | * | |
1638 | * diff-cmd name infile1 infile1-sha1 infile1-mode \ | |
1639 | * infile2 infile2-sha1 infile2-mode [ rename-to ] | |
1640 | * | |
1641 | */ | |
1642 | static void run_external_diff(const char *pgm, | |
1643 | const char *name, | |
1644 | const char *other, | |
1645 | struct diff_filespec *one, | |
1646 | struct diff_filespec *two, | |
1647 | const char *xfrm_msg, | |
1648 | int complete_rewrite) | |
1649 | { | |
1650 | const char *spawn_arg[10]; | |
1651 | struct diff_tempfile *temp = diff_temp; | |
1652 | int retval; | |
1653 | static int atexit_asked = 0; | |
1654 | const char *othername; | |
1655 | const char **arg = &spawn_arg[0]; | |
1656 | ||
1657 | othername = (other? other : name); | |
1658 | if (one && two) { | |
1659 | prepare_temp_file(name, &temp[0], one); | |
1660 | prepare_temp_file(othername, &temp[1], two); | |
1661 | if (! atexit_asked && | |
1662 | (temp[0].name == temp[0].tmp_path || | |
1663 | temp[1].name == temp[1].tmp_path)) { | |
1664 | atexit_asked = 1; | |
1665 | atexit(remove_tempfile); | |
1666 | } | |
1667 | signal(SIGINT, remove_tempfile_on_signal); | |
1668 | } | |
1669 | ||
1670 | if (one && two) { | |
1671 | *arg++ = pgm; | |
1672 | *arg++ = name; | |
1673 | *arg++ = temp[0].name; | |
1674 | *arg++ = temp[0].hex; | |
1675 | *arg++ = temp[0].mode; | |
1676 | *arg++ = temp[1].name; | |
1677 | *arg++ = temp[1].hex; | |
1678 | *arg++ = temp[1].mode; | |
1679 | if (other) { | |
1680 | *arg++ = other; | |
1681 | *arg++ = xfrm_msg; | |
1682 | } | |
1683 | } else { | |
1684 | *arg++ = pgm; | |
1685 | *arg++ = name; | |
1686 | } | |
1687 | *arg = NULL; | |
1688 | retval = spawn_prog(pgm, spawn_arg); | |
1689 | remove_tempfile(); | |
1690 | if (retval) { | |
1691 | fprintf(stderr, "external diff died, stopping at %s.\n", name); | |
1692 | exit(1); | |
1693 | } | |
1694 | } | |
1695 | ||
1696 | static void run_diff_cmd(const char *pgm, | |
1697 | const char *name, | |
1698 | const char *other, | |
1699 | struct diff_filespec *one, | |
1700 | struct diff_filespec *two, | |
1701 | const char *xfrm_msg, | |
051308f6 | 1702 | struct diff_options *o, |
6973dcae JH |
1703 | int complete_rewrite) |
1704 | { | |
1705 | if (pgm) { | |
1706 | run_external_diff(pgm, name, other, one, two, xfrm_msg, | |
1707 | complete_rewrite); | |
1708 | return; | |
1709 | } | |
1710 | if (one && two) | |
1711 | builtin_diff(name, other ? other : name, | |
051308f6 | 1712 | one, two, xfrm_msg, o, complete_rewrite); |
6973dcae JH |
1713 | else |
1714 | printf("* Unmerged path %s\n", name); | |
1715 | } | |
1716 | ||
1717 | static void diff_fill_sha1_info(struct diff_filespec *one) | |
1718 | { | |
1719 | if (DIFF_FILE_VALID(one)) { | |
1720 | if (!one->sha1_valid) { | |
1721 | struct stat st; | |
5332b2af JS |
1722 | if (!strcmp(one->path, "-")) { |
1723 | hashcpy(one->sha1, null_sha1); | |
1724 | return; | |
1725 | } | |
6973dcae JH |
1726 | if (lstat(one->path, &st) < 0) |
1727 | die("stat %s", one->path); | |
1728 | if (index_path(one->sha1, one->path, &st, 0)) | |
1729 | die("cannot hash %s\n", one->path); | |
1730 | } | |
1731 | } | |
1732 | else | |
e702496e | 1733 | hashclr(one->sha1); |
6973dcae JH |
1734 | } |
1735 | ||
1736 | static void run_diff(struct diff_filepair *p, struct diff_options *o) | |
1737 | { | |
1738 | const char *pgm = external_diff(); | |
1739 | char msg[PATH_MAX*2+300], *xfrm_msg; | |
1740 | struct diff_filespec *one; | |
1741 | struct diff_filespec *two; | |
1742 | const char *name; | |
1743 | const char *other; | |
1744 | char *name_munged, *other_munged; | |
1745 | int complete_rewrite = 0; | |
1746 | int len; | |
1747 | ||
1748 | if (DIFF_PAIR_UNMERGED(p)) { | |
1749 | /* unmerged */ | |
051308f6 | 1750 | run_diff_cmd(pgm, p->one->path, NULL, NULL, NULL, NULL, o, 0); |
6973dcae JH |
1751 | return; |
1752 | } | |
1753 | ||
1754 | name = p->one->path; | |
1755 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
1756 | name_munged = quote_one(name); | |
1757 | other_munged = quote_one(other); | |
1758 | one = p->one; two = p->two; | |
1759 | ||
1760 | diff_fill_sha1_info(one); | |
1761 | diff_fill_sha1_info(two); | |
1762 | ||
1763 | len = 0; | |
1764 | switch (p->status) { | |
1765 | case DIFF_STATUS_COPIED: | |
1766 | len += snprintf(msg + len, sizeof(msg) - len, | |
1767 | "similarity index %d%%\n" | |
1768 | "copy from %s\n" | |
1769 | "copy to %s\n", | |
1770 | (int)(0.5 + p->score * 100.0/MAX_SCORE), | |
1771 | name_munged, other_munged); | |
1772 | break; | |
1773 | case DIFF_STATUS_RENAMED: | |
1774 | len += snprintf(msg + len, sizeof(msg) - len, | |
1775 | "similarity index %d%%\n" | |
1776 | "rename from %s\n" | |
1777 | "rename to %s\n", | |
1778 | (int)(0.5 + p->score * 100.0/MAX_SCORE), | |
1779 | name_munged, other_munged); | |
1780 | break; | |
1781 | case DIFF_STATUS_MODIFIED: | |
1782 | if (p->score) { | |
1783 | len += snprintf(msg + len, sizeof(msg) - len, | |
1784 | "dissimilarity index %d%%\n", | |
1785 | (int)(0.5 + p->score * | |
1786 | 100.0/MAX_SCORE)); | |
1787 | complete_rewrite = 1; | |
1788 | break; | |
1789 | } | |
1790 | /* fallthru */ | |
1791 | default: | |
1792 | /* nothing */ | |
1793 | ; | |
1794 | } | |
1795 | ||
a89fccd2 | 1796 | if (hashcmp(one->sha1, two->sha1)) { |
6973dcae | 1797 | int abbrev = o->full_index ? 40 : DEFAULT_ABBREV; |
6973dcae | 1798 | |
82793c55 JH |
1799 | if (o->binary) { |
1800 | mmfile_t mf; | |
1801 | if ((!fill_mmfile(&mf, one) && mmfile_is_binary(&mf)) || | |
1802 | (!fill_mmfile(&mf, two) && mmfile_is_binary(&mf))) | |
1803 | abbrev = 40; | |
1804 | } | |
6973dcae JH |
1805 | len += snprintf(msg + len, sizeof(msg) - len, |
1806 | "index %.*s..%.*s", | |
dcb3450f LT |
1807 | abbrev, sha1_to_hex(one->sha1), |
1808 | abbrev, sha1_to_hex(two->sha1)); | |
6973dcae JH |
1809 | if (one->mode == two->mode) |
1810 | len += snprintf(msg + len, sizeof(msg) - len, | |
1811 | " %06o", one->mode); | |
1812 | len += snprintf(msg + len, sizeof(msg) - len, "\n"); | |
1813 | } | |
1814 | ||
1815 | if (len) | |
1816 | msg[--len] = 0; | |
1817 | xfrm_msg = len ? msg : NULL; | |
1818 | ||
1819 | if (!pgm && | |
1820 | DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) && | |
1821 | (S_IFMT & one->mode) != (S_IFMT & two->mode)) { | |
1822 | /* a filepair that changes between file and symlink | |
1823 | * needs to be split into deletion and creation. | |
1824 | */ | |
1825 | struct diff_filespec *null = alloc_filespec(two->path); | |
051308f6 | 1826 | run_diff_cmd(NULL, name, other, one, null, xfrm_msg, o, 0); |
6973dcae JH |
1827 | free(null); |
1828 | null = alloc_filespec(one->path); | |
051308f6 | 1829 | run_diff_cmd(NULL, name, other, null, two, xfrm_msg, o, 0); |
6973dcae JH |
1830 | free(null); |
1831 | } | |
1832 | else | |
051308f6 | 1833 | run_diff_cmd(pgm, name, other, one, two, xfrm_msg, o, |
6973dcae JH |
1834 | complete_rewrite); |
1835 | ||
1836 | free(name_munged); | |
1837 | free(other_munged); | |
1838 | } | |
1839 | ||
1840 | static void run_diffstat(struct diff_filepair *p, struct diff_options *o, | |
1841 | struct diffstat_t *diffstat) | |
1842 | { | |
1843 | const char *name; | |
1844 | const char *other; | |
710158e3 | 1845 | int complete_rewrite = 0; |
6973dcae JH |
1846 | |
1847 | if (DIFF_PAIR_UNMERGED(p)) { | |
1848 | /* unmerged */ | |
0d21efa5 | 1849 | builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0); |
6973dcae JH |
1850 | return; |
1851 | } | |
1852 | ||
1853 | name = p->one->path; | |
1854 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
1855 | ||
1856 | diff_fill_sha1_info(p->one); | |
1857 | diff_fill_sha1_info(p->two); | |
1858 | ||
710158e3 JH |
1859 | if (p->status == DIFF_STATUS_MODIFIED && p->score) |
1860 | complete_rewrite = 1; | |
0d21efa5 | 1861 | builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite); |
6973dcae JH |
1862 | } |
1863 | ||
88246898 JS |
1864 | static void run_checkdiff(struct diff_filepair *p, struct diff_options *o) |
1865 | { | |
1866 | const char *name; | |
1867 | const char *other; | |
1868 | ||
1869 | if (DIFF_PAIR_UNMERGED(p)) { | |
1870 | /* unmerged */ | |
1871 | return; | |
1872 | } | |
1873 | ||
1874 | name = p->one->path; | |
1875 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
1876 | ||
1877 | diff_fill_sha1_info(p->one); | |
1878 | diff_fill_sha1_info(p->two); | |
1879 | ||
c5a8c3ec | 1880 | builtin_checkdiff(name, other, p->one, p->two, o); |
88246898 JS |
1881 | } |
1882 | ||
6973dcae JH |
1883 | void diff_setup(struct diff_options *options) |
1884 | { | |
1885 | memset(options, 0, sizeof(*options)); | |
6973dcae JH |
1886 | options->line_termination = '\n'; |
1887 | options->break_opt = -1; | |
1888 | options->rename_limit = -1; | |
ee1e5412 | 1889 | options->context = 3; |
3969cf7d | 1890 | options->msg_sep = ""; |
6973dcae JH |
1891 | |
1892 | options->change = diff_change; | |
1893 | options->add_remove = diff_addremove; | |
801235c5 | 1894 | options->color_diff = diff_use_color_default; |
b68ea12e | 1895 | options->detect_rename = diff_detect_rename_default; |
6973dcae JH |
1896 | } |
1897 | ||
1898 | int diff_setup_done(struct diff_options *options) | |
1899 | { | |
d7de00f7 TH |
1900 | int count = 0; |
1901 | ||
1902 | if (options->output_format & DIFF_FORMAT_NAME) | |
1903 | count++; | |
1904 | if (options->output_format & DIFF_FORMAT_NAME_STATUS) | |
1905 | count++; | |
1906 | if (options->output_format & DIFF_FORMAT_CHECKDIFF) | |
1907 | count++; | |
1908 | if (options->output_format & DIFF_FORMAT_NO_OUTPUT) | |
1909 | count++; | |
1910 | if (count > 1) | |
1911 | die("--name-only, --name-status, --check and -s are mutually exclusive"); | |
1912 | ||
03b9d560 JH |
1913 | if (options->find_copies_harder) |
1914 | options->detect_rename = DIFF_DETECT_COPY; | |
1915 | ||
c6744349 TH |
1916 | if (options->output_format & (DIFF_FORMAT_NAME | |
1917 | DIFF_FORMAT_NAME_STATUS | | |
1918 | DIFF_FORMAT_CHECKDIFF | | |
1919 | DIFF_FORMAT_NO_OUTPUT)) | |
1920 | options->output_format &= ~(DIFF_FORMAT_RAW | | |
74e2abe5 | 1921 | DIFF_FORMAT_NUMSTAT | |
c6744349 | 1922 | DIFF_FORMAT_DIFFSTAT | |
ebd124c6 | 1923 | DIFF_FORMAT_SHORTSTAT | |
c6744349 TH |
1924 | DIFF_FORMAT_SUMMARY | |
1925 | DIFF_FORMAT_PATCH); | |
1926 | ||
6973dcae JH |
1927 | /* |
1928 | * These cases always need recursive; we do not drop caller-supplied | |
1929 | * recursive bits for other formats here. | |
1930 | */ | |
c6744349 | 1931 | if (options->output_format & (DIFF_FORMAT_PATCH | |
74e2abe5 | 1932 | DIFF_FORMAT_NUMSTAT | |
c6744349 | 1933 | DIFF_FORMAT_DIFFSTAT | |
ebd124c6 | 1934 | DIFF_FORMAT_SHORTSTAT | |
d7014dc0 | 1935 | DIFF_FORMAT_SUMMARY | |
c6744349 | 1936 | DIFF_FORMAT_CHECKDIFF)) |
6973dcae | 1937 | options->recursive = 1; |
5e363541 | 1938 | /* |
3969cf7d | 1939 | * Also pickaxe would not work very well if you do not say recursive |
5e363541 | 1940 | */ |
3969cf7d JH |
1941 | if (options->pickaxe) |
1942 | options->recursive = 1; | |
5e363541 | 1943 | |
6973dcae JH |
1944 | if (options->detect_rename && options->rename_limit < 0) |
1945 | options->rename_limit = diff_rename_limit_default; | |
1946 | if (options->setup & DIFF_SETUP_USE_CACHE) { | |
1947 | if (!active_cache) | |
1948 | /* read-cache does not die even when it fails | |
1949 | * so it is safe for us to do this here. Also | |
1950 | * it does not smudge active_cache or active_nr | |
1951 | * when it fails, so we do not have to worry about | |
1952 | * cleaning it up ourselves either. | |
1953 | */ | |
1954 | read_cache(); | |
1955 | } | |
1956 | if (options->setup & DIFF_SETUP_USE_SIZE_CACHE) | |
1957 | use_size_cache = 1; | |
1958 | if (options->abbrev <= 0 || 40 < options->abbrev) | |
1959 | options->abbrev = 40; /* full */ | |
1960 | ||
68aacb2f JH |
1961 | /* |
1962 | * It does not make sense to show the first hit we happened | |
1963 | * to have found. It does not make sense not to return with | |
1964 | * exit code in such a case either. | |
1965 | */ | |
1966 | if (options->quiet) { | |
1967 | options->output_format = DIFF_FORMAT_NO_OUTPUT; | |
1968 | options->exit_with_status = 1; | |
1969 | } | |
1970 | ||
1971 | /* | |
1972 | * If we postprocess in diffcore, we cannot simply return | |
1973 | * upon the first hit. We need to run diff as usual. | |
1974 | */ | |
1975 | if (options->pickaxe || options->filter) | |
1976 | options->quiet = 0; | |
1977 | ||
6973dcae JH |
1978 | return 0; |
1979 | } | |
1980 | ||
d2543b8e | 1981 | static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val) |
ee1e5412 LT |
1982 | { |
1983 | char c, *eq; | |
1984 | int len; | |
1985 | ||
1986 | if (*arg != '-') | |
1987 | return 0; | |
1988 | c = *++arg; | |
1989 | if (!c) | |
1990 | return 0; | |
1991 | if (c == arg_short) { | |
1992 | c = *++arg; | |
1993 | if (!c) | |
1994 | return 1; | |
1995 | if (val && isdigit(c)) { | |
1996 | char *end; | |
1997 | int n = strtoul(arg, &end, 10); | |
1998 | if (*end) | |
1999 | return 0; | |
2000 | *val = n; | |
2001 | return 1; | |
2002 | } | |
2003 | return 0; | |
2004 | } | |
2005 | if (c != '-') | |
2006 | return 0; | |
2007 | arg++; | |
2008 | eq = strchr(arg, '='); | |
2009 | if (eq) | |
2010 | len = eq - arg; | |
2011 | else | |
2012 | len = strlen(arg); | |
2013 | if (!len || strncmp(arg, arg_long, len)) | |
2014 | return 0; | |
2015 | if (eq) { | |
2016 | int n; | |
2017 | char *end; | |
2018 | if (!isdigit(*++eq)) | |
2019 | return 0; | |
2020 | n = strtoul(eq, &end, 10); | |
2021 | if (*end) | |
2022 | return 0; | |
2023 | *val = n; | |
2024 | } | |
2025 | return 1; | |
2026 | } | |
2027 | ||
6973dcae JH |
2028 | int diff_opt_parse(struct diff_options *options, const char **av, int ac) |
2029 | { | |
2030 | const char *arg = av[0]; | |
2031 | if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) | |
c6744349 | 2032 | options->output_format |= DIFF_FORMAT_PATCH; |
ee1e5412 | 2033 | else if (opt_arg(arg, 'U', "unified", &options->context)) |
c6744349 | 2034 | options->output_format |= DIFF_FORMAT_PATCH; |
a610786f TH |
2035 | else if (!strcmp(arg, "--raw")) |
2036 | options->output_format |= DIFF_FORMAT_RAW; | |
6973dcae | 2037 | else if (!strcmp(arg, "--patch-with-raw")) { |
c6744349 | 2038 | options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW; |
6973dcae | 2039 | } |
74e2abe5 JH |
2040 | else if (!strcmp(arg, "--numstat")) { |
2041 | options->output_format |= DIFF_FORMAT_NUMSTAT; | |
2042 | } | |
ebd124c6 NP |
2043 | else if (!strcmp(arg, "--shortstat")) { |
2044 | options->output_format |= DIFF_FORMAT_SHORTSTAT; | |
2045 | } | |
cc44c765 | 2046 | else if (!prefixcmp(arg, "--stat")) { |
5c5b2ea9 LT |
2047 | char *end; |
2048 | int width = options->stat_width; | |
2049 | int name_width = options->stat_name_width; | |
2050 | arg += 6; | |
2051 | end = (char *)arg; | |
2052 | ||
2053 | switch (*arg) { | |
2054 | case '-': | |
cc44c765 | 2055 | if (!prefixcmp(arg, "-width=")) |
5c5b2ea9 | 2056 | width = strtoul(arg + 7, &end, 10); |
cc44c765 | 2057 | else if (!prefixcmp(arg, "-name-width=")) |
5c5b2ea9 LT |
2058 | name_width = strtoul(arg + 12, &end, 10); |
2059 | break; | |
2060 | case '=': | |
2061 | width = strtoul(arg+1, &end, 10); | |
2062 | if (*end == ',') | |
2063 | name_width = strtoul(end+1, &end, 10); | |
2064 | } | |
2065 | ||
2066 | /* Important! This checks all the error cases! */ | |
2067 | if (*end) | |
2068 | return 0; | |
c6744349 | 2069 | options->output_format |= DIFF_FORMAT_DIFFSTAT; |
5c5b2ea9 LT |
2070 | options->stat_name_width = name_width; |
2071 | options->stat_width = width; | |
a2540023 | 2072 | } |
88246898 | 2073 | else if (!strcmp(arg, "--check")) |
c6744349 | 2074 | options->output_format |= DIFF_FORMAT_CHECKDIFF; |
4bbd261b | 2075 | else if (!strcmp(arg, "--summary")) |
c6744349 | 2076 | options->output_format |= DIFF_FORMAT_SUMMARY; |
6973dcae | 2077 | else if (!strcmp(arg, "--patch-with-stat")) { |
c6744349 | 2078 | options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT; |
6973dcae JH |
2079 | } |
2080 | else if (!strcmp(arg, "-z")) | |
2081 | options->line_termination = 0; | |
cc44c765 | 2082 | else if (!prefixcmp(arg, "-l")) |
6973dcae JH |
2083 | options->rename_limit = strtoul(arg+2, NULL, 10); |
2084 | else if (!strcmp(arg, "--full-index")) | |
2085 | options->full_index = 1; | |
0660626c | 2086 | else if (!strcmp(arg, "--binary")) { |
c6744349 | 2087 | options->output_format |= DIFF_FORMAT_PATCH; |
82793c55 | 2088 | options->binary = 1; |
0660626c | 2089 | } |
63ac4501 | 2090 | else if (!strcmp(arg, "-a") || !strcmp(arg, "--text")) { |
6d64ea96 SF |
2091 | options->text = 1; |
2092 | } | |
6973dcae | 2093 | else if (!strcmp(arg, "--name-only")) |
c6744349 | 2094 | options->output_format |= DIFF_FORMAT_NAME; |
6973dcae | 2095 | else if (!strcmp(arg, "--name-status")) |
c6744349 | 2096 | options->output_format |= DIFF_FORMAT_NAME_STATUS; |
6973dcae JH |
2097 | else if (!strcmp(arg, "-R")) |
2098 | options->reverse_diff = 1; | |
cc44c765 | 2099 | else if (!prefixcmp(arg, "-S")) |
6973dcae | 2100 | options->pickaxe = arg + 2; |
c6744349 TH |
2101 | else if (!strcmp(arg, "-s")) { |
2102 | options->output_format |= DIFF_FORMAT_NO_OUTPUT; | |
2103 | } | |
cc44c765 | 2104 | else if (!prefixcmp(arg, "-O")) |
6973dcae | 2105 | options->orderfile = arg + 2; |
cc44c765 | 2106 | else if (!prefixcmp(arg, "--diff-filter=")) |
6973dcae JH |
2107 | options->filter = arg + 14; |
2108 | else if (!strcmp(arg, "--pickaxe-all")) | |
2109 | options->pickaxe_opts = DIFF_PICKAXE_ALL; | |
2110 | else if (!strcmp(arg, "--pickaxe-regex")) | |
2111 | options->pickaxe_opts = DIFF_PICKAXE_REGEX; | |
cc44c765 | 2112 | else if (!prefixcmp(arg, "-B")) { |
6973dcae JH |
2113 | if ((options->break_opt = |
2114 | diff_scoreopt_parse(arg)) == -1) | |
2115 | return -1; | |
2116 | } | |
cc44c765 | 2117 | else if (!prefixcmp(arg, "-M")) { |
6973dcae JH |
2118 | if ((options->rename_score = |
2119 | diff_scoreopt_parse(arg)) == -1) | |
2120 | return -1; | |
2121 | options->detect_rename = DIFF_DETECT_RENAME; | |
2122 | } | |
cc44c765 | 2123 | else if (!prefixcmp(arg, "-C")) { |
6973dcae JH |
2124 | if ((options->rename_score = |
2125 | diff_scoreopt_parse(arg)) == -1) | |
2126 | return -1; | |
2127 | options->detect_rename = DIFF_DETECT_COPY; | |
2128 | } | |
2129 | else if (!strcmp(arg, "--find-copies-harder")) | |
2130 | options->find_copies_harder = 1; | |
2131 | else if (!strcmp(arg, "--abbrev")) | |
2132 | options->abbrev = DEFAULT_ABBREV; | |
cc44c765 | 2133 | else if (!prefixcmp(arg, "--abbrev=")) { |
6973dcae JH |
2134 | options->abbrev = strtoul(arg + 9, NULL, 10); |
2135 | if (options->abbrev < MINIMUM_ABBREV) | |
2136 | options->abbrev = MINIMUM_ABBREV; | |
2137 | else if (40 < options->abbrev) | |
2138 | options->abbrev = 40; | |
2139 | } | |
cd112cef JS |
2140 | else if (!strcmp(arg, "--color")) |
2141 | options->color_diff = 1; | |
fef88bb0 JH |
2142 | else if (!strcmp(arg, "--no-color")) |
2143 | options->color_diff = 0; | |
0d21efa5 JS |
2144 | else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space")) |
2145 | options->xdl_opts |= XDF_IGNORE_WHITESPACE; | |
2146 | else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change")) | |
2147 | options->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE; | |
859f9c45 JS |
2148 | else if (!strcmp(arg, "--ignore-space-at-eol")) |
2149 | options->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL; | |
f59a59e2 JS |
2150 | else if (!strcmp(arg, "--color-words")) |
2151 | options->color_diff = options->color_diff_words = 1; | |
b68ea12e EW |
2152 | else if (!strcmp(arg, "--no-renames")) |
2153 | options->detect_rename = 0; | |
41bbf9d5 AR |
2154 | else if (!strcmp(arg, "--exit-code")) |
2155 | options->exit_with_status = 1; | |
68aacb2f JH |
2156 | else if (!strcmp(arg, "--quiet")) |
2157 | options->quiet = 1; | |
6973dcae JH |
2158 | else |
2159 | return 0; | |
2160 | return 1; | |
2161 | } | |
2162 | ||
2163 | static int parse_num(const char **cp_p) | |
2164 | { | |
2165 | unsigned long num, scale; | |
2166 | int ch, dot; | |
2167 | const char *cp = *cp_p; | |
2168 | ||
2169 | num = 0; | |
2170 | scale = 1; | |
2171 | dot = 0; | |
2172 | for(;;) { | |
2173 | ch = *cp; | |
2174 | if ( !dot && ch == '.' ) { | |
2175 | scale = 1; | |
2176 | dot = 1; | |
2177 | } else if ( ch == '%' ) { | |
2178 | scale = dot ? scale*100 : 100; | |
2179 | cp++; /* % is always at the end */ | |
2180 | break; | |
2181 | } else if ( ch >= '0' && ch <= '9' ) { | |
2182 | if ( scale < 100000 ) { | |
2183 | scale *= 10; | |
2184 | num = (num*10) + (ch-'0'); | |
2185 | } | |
2186 | } else { | |
2187 | break; | |
2188 | } | |
2189 | cp++; | |
2190 | } | |
2191 | *cp_p = cp; | |
2192 | ||
2193 | /* user says num divided by scale and we say internally that | |
2194 | * is MAX_SCORE * num / scale. | |
2195 | */ | |
dc49cd76 | 2196 | return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale)); |
6973dcae JH |
2197 | } |
2198 | ||
2199 | int diff_scoreopt_parse(const char *opt) | |
2200 | { | |
2201 | int opt1, opt2, cmd; | |
2202 | ||
2203 | if (*opt++ != '-') | |
2204 | return -1; | |
2205 | cmd = *opt++; | |
2206 | if (cmd != 'M' && cmd != 'C' && cmd != 'B') | |
2207 | return -1; /* that is not a -M, -C nor -B option */ | |
2208 | ||
2209 | opt1 = parse_num(&opt); | |
2210 | if (cmd != 'B') | |
2211 | opt2 = 0; | |
2212 | else { | |
2213 | if (*opt == 0) | |
2214 | opt2 = 0; | |
2215 | else if (*opt != '/') | |
2216 | return -1; /* we expect -B80/99 or -B80 */ | |
2217 | else { | |
2218 | opt++; | |
2219 | opt2 = parse_num(&opt); | |
2220 | } | |
2221 | } | |
2222 | if (*opt != 0) | |
2223 | return -1; | |
2224 | return opt1 | (opt2 << 16); | |
2225 | } | |
2226 | ||
2227 | struct diff_queue_struct diff_queued_diff; | |
2228 | ||
2229 | void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp) | |
2230 | { | |
2231 | if (queue->alloc <= queue->nr) { | |
2232 | queue->alloc = alloc_nr(queue->alloc); | |
2233 | queue->queue = xrealloc(queue->queue, | |
2234 | sizeof(dp) * queue->alloc); | |
2235 | } | |
2236 | queue->queue[queue->nr++] = dp; | |
2237 | } | |
2238 | ||
2239 | struct diff_filepair *diff_queue(struct diff_queue_struct *queue, | |
2240 | struct diff_filespec *one, | |
2241 | struct diff_filespec *two) | |
2242 | { | |
ef677686 | 2243 | struct diff_filepair *dp = xcalloc(1, sizeof(*dp)); |
6973dcae JH |
2244 | dp->one = one; |
2245 | dp->two = two; | |
6973dcae JH |
2246 | if (queue) |
2247 | diff_q(queue, dp); | |
2248 | return dp; | |
2249 | } | |
2250 | ||
2251 | void diff_free_filepair(struct diff_filepair *p) | |
2252 | { | |
2253 | diff_free_filespec_data(p->one); | |
2254 | diff_free_filespec_data(p->two); | |
2255 | free(p->one); | |
2256 | free(p->two); | |
2257 | free(p); | |
2258 | } | |
2259 | ||
2260 | /* This is different from find_unique_abbrev() in that | |
2261 | * it stuffs the result with dots for alignment. | |
2262 | */ | |
2263 | const char *diff_unique_abbrev(const unsigned char *sha1, int len) | |
2264 | { | |
2265 | int abblen; | |
2266 | const char *abbrev; | |
2267 | if (len == 40) | |
2268 | return sha1_to_hex(sha1); | |
2269 | ||
2270 | abbrev = find_unique_abbrev(sha1, len); | |
2271 | if (!abbrev) | |
2272 | return sha1_to_hex(sha1); | |
2273 | abblen = strlen(abbrev); | |
2274 | if (abblen < 37) { | |
2275 | static char hex[41]; | |
2276 | if (len < abblen && abblen <= len + 2) | |
2277 | sprintf(hex, "%s%.*s", abbrev, len+3-abblen, ".."); | |
2278 | else | |
2279 | sprintf(hex, "%s...", abbrev); | |
2280 | return hex; | |
2281 | } | |
2282 | return sha1_to_hex(sha1); | |
2283 | } | |
2284 | ||
2285 | static void diff_flush_raw(struct diff_filepair *p, | |
c6744349 | 2286 | struct diff_options *options) |
6973dcae JH |
2287 | { |
2288 | int two_paths; | |
2289 | char status[10]; | |
2290 | int abbrev = options->abbrev; | |
2291 | const char *path_one, *path_two; | |
c6744349 TH |
2292 | int inter_name_termination = '\t'; |
2293 | int line_termination = options->line_termination; | |
2294 | ||
2295 | if (!line_termination) | |
2296 | inter_name_termination = 0; | |
6973dcae JH |
2297 | |
2298 | path_one = p->one->path; | |
2299 | path_two = p->two->path; | |
2300 | if (line_termination) { | |
2301 | path_one = quote_one(path_one); | |
2302 | path_two = quote_one(path_two); | |
2303 | } | |
2304 | ||
2305 | if (p->score) | |
2306 | sprintf(status, "%c%03d", p->status, | |
2307 | (int)(0.5 + p->score * 100.0/MAX_SCORE)); | |
2308 | else { | |
2309 | status[0] = p->status; | |
2310 | status[1] = 0; | |
2311 | } | |
2312 | switch (p->status) { | |
2313 | case DIFF_STATUS_COPIED: | |
2314 | case DIFF_STATUS_RENAMED: | |
2315 | two_paths = 1; | |
2316 | break; | |
2317 | case DIFF_STATUS_ADDED: | |
2318 | case DIFF_STATUS_DELETED: | |
2319 | two_paths = 0; | |
2320 | break; | |
2321 | default: | |
2322 | two_paths = 0; | |
2323 | break; | |
2324 | } | |
c6744349 | 2325 | if (!(options->output_format & DIFF_FORMAT_NAME_STATUS)) { |
6973dcae JH |
2326 | printf(":%06o %06o %s ", |
2327 | p->one->mode, p->two->mode, | |
2328 | diff_unique_abbrev(p->one->sha1, abbrev)); | |
2329 | printf("%s ", | |
2330 | diff_unique_abbrev(p->two->sha1, abbrev)); | |
2331 | } | |
2332 | printf("%s%c%s", status, inter_name_termination, path_one); | |
2333 | if (two_paths) | |
2334 | printf("%c%s", inter_name_termination, path_two); | |
2335 | putchar(line_termination); | |
2336 | if (path_one != p->one->path) | |
2337 | free((void*)path_one); | |
2338 | if (path_two != p->two->path) | |
2339 | free((void*)path_two); | |
2340 | } | |
2341 | ||
471efb09 | 2342 | static void diff_flush_name(struct diff_filepair *p, struct diff_options *opt) |
6973dcae JH |
2343 | { |
2344 | char *path = p->two->path; | |
2345 | ||
471efb09 | 2346 | if (opt->line_termination) |
6973dcae | 2347 | path = quote_one(p->two->path); |
471efb09 | 2348 | printf("%s%c", path, opt->line_termination); |
6973dcae JH |
2349 | if (p->two->path != path) |
2350 | free(path); | |
2351 | } | |
2352 | ||
2353 | int diff_unmodified_pair(struct diff_filepair *p) | |
2354 | { | |
2355 | /* This function is written stricter than necessary to support | |
2356 | * the currently implemented transformers, but the idea is to | |
2357 | * let transformers to produce diff_filepairs any way they want, | |
2358 | * and filter and clean them up here before producing the output. | |
2359 | */ | |
2360 | struct diff_filespec *one, *two; | |
2361 | ||
2362 | if (DIFF_PAIR_UNMERGED(p)) | |
2363 | return 0; /* unmerged is interesting */ | |
2364 | ||
2365 | one = p->one; | |
2366 | two = p->two; | |
2367 | ||
2368 | /* deletion, addition, mode or type change | |
2369 | * and rename are all interesting. | |
2370 | */ | |
2371 | if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) || | |
2372 | DIFF_PAIR_MODE_CHANGED(p) || | |
2373 | strcmp(one->path, two->path)) | |
2374 | return 0; | |
2375 | ||
2376 | /* both are valid and point at the same path. that is, we are | |
2377 | * dealing with a change. | |
2378 | */ | |
2379 | if (one->sha1_valid && two->sha1_valid && | |
a89fccd2 | 2380 | !hashcmp(one->sha1, two->sha1)) |
6973dcae JH |
2381 | return 1; /* no change */ |
2382 | if (!one->sha1_valid && !two->sha1_valid) | |
2383 | return 1; /* both look at the same file on the filesystem. */ | |
2384 | return 0; | |
2385 | } | |
2386 | ||
2387 | static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o) | |
2388 | { | |
2389 | if (diff_unmodified_pair(p)) | |
2390 | return; | |
2391 | ||
2392 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
2393 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
2394 | return; /* no tree diffs in patch format */ | |
2395 | ||
2396 | run_diff(p, o); | |
2397 | } | |
2398 | ||
2399 | static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o, | |
2400 | struct diffstat_t *diffstat) | |
2401 | { | |
2402 | if (diff_unmodified_pair(p)) | |
2403 | return; | |
2404 | ||
2405 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
2406 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
2407 | return; /* no tree diffs in patch format */ | |
2408 | ||
2409 | run_diffstat(p, o, diffstat); | |
2410 | } | |
2411 | ||
88246898 JS |
2412 | static void diff_flush_checkdiff(struct diff_filepair *p, |
2413 | struct diff_options *o) | |
2414 | { | |
2415 | if (diff_unmodified_pair(p)) | |
2416 | return; | |
2417 | ||
2418 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
2419 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
2420 | return; /* no tree diffs in patch format */ | |
2421 | ||
2422 | run_checkdiff(p, o); | |
2423 | } | |
2424 | ||
6973dcae JH |
2425 | int diff_queue_is_empty(void) |
2426 | { | |
2427 | struct diff_queue_struct *q = &diff_queued_diff; | |
2428 | int i; | |
2429 | for (i = 0; i < q->nr; i++) | |
2430 | if (!diff_unmodified_pair(q->queue[i])) | |
2431 | return 0; | |
2432 | return 1; | |
2433 | } | |
2434 | ||
2435 | #if DIFF_DEBUG | |
2436 | void diff_debug_filespec(struct diff_filespec *s, int x, const char *one) | |
2437 | { | |
2438 | fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n", | |
2439 | x, one ? one : "", | |
2440 | s->path, | |
2441 | DIFF_FILE_VALID(s) ? "valid" : "invalid", | |
2442 | s->mode, | |
2443 | s->sha1_valid ? sha1_to_hex(s->sha1) : ""); | |
2444 | fprintf(stderr, "queue[%d] %s size %lu flags %d\n", | |
2445 | x, one ? one : "", | |
2446 | s->size, s->xfrm_flags); | |
2447 | } | |
2448 | ||
2449 | void diff_debug_filepair(const struct diff_filepair *p, int i) | |
2450 | { | |
2451 | diff_debug_filespec(p->one, i, "one"); | |
2452 | diff_debug_filespec(p->two, i, "two"); | |
2453 | fprintf(stderr, "score %d, status %c stays %d broken %d\n", | |
2454 | p->score, p->status ? p->status : '?', | |
2455 | p->source_stays, p->broken_pair); | |
2456 | } | |
2457 | ||
2458 | void diff_debug_queue(const char *msg, struct diff_queue_struct *q) | |
2459 | { | |
2460 | int i; | |
2461 | if (msg) | |
2462 | fprintf(stderr, "%s\n", msg); | |
2463 | fprintf(stderr, "q->nr = %d\n", q->nr); | |
2464 | for (i = 0; i < q->nr; i++) { | |
2465 | struct diff_filepair *p = q->queue[i]; | |
2466 | diff_debug_filepair(p, i); | |
2467 | } | |
2468 | } | |
2469 | #endif | |
2470 | ||
2471 | static void diff_resolve_rename_copy(void) | |
2472 | { | |
2473 | int i, j; | |
2474 | struct diff_filepair *p, *pp; | |
2475 | struct diff_queue_struct *q = &diff_queued_diff; | |
2476 | ||
2477 | diff_debug_queue("resolve-rename-copy", q); | |
2478 | ||
2479 | for (i = 0; i < q->nr; i++) { | |
2480 | p = q->queue[i]; | |
2481 | p->status = 0; /* undecided */ | |
2482 | if (DIFF_PAIR_UNMERGED(p)) | |
2483 | p->status = DIFF_STATUS_UNMERGED; | |
2484 | else if (!DIFF_FILE_VALID(p->one)) | |
2485 | p->status = DIFF_STATUS_ADDED; | |
2486 | else if (!DIFF_FILE_VALID(p->two)) | |
2487 | p->status = DIFF_STATUS_DELETED; | |
2488 | else if (DIFF_PAIR_TYPE_CHANGED(p)) | |
2489 | p->status = DIFF_STATUS_TYPE_CHANGED; | |
2490 | ||
2491 | /* from this point on, we are dealing with a pair | |
2492 | * whose both sides are valid and of the same type, i.e. | |
2493 | * either in-place edit or rename/copy edit. | |
2494 | */ | |
2495 | else if (DIFF_PAIR_RENAME(p)) { | |
2496 | if (p->source_stays) { | |
2497 | p->status = DIFF_STATUS_COPIED; | |
2498 | continue; | |
2499 | } | |
2500 | /* See if there is some other filepair that | |
2501 | * copies from the same source as us. If so | |
2502 | * we are a copy. Otherwise we are either a | |
2503 | * copy if the path stays, or a rename if it | |
2504 | * does not, but we already handled "stays" case. | |
2505 | */ | |
2506 | for (j = i + 1; j < q->nr; j++) { | |
2507 | pp = q->queue[j]; | |
2508 | if (strcmp(pp->one->path, p->one->path)) | |
2509 | continue; /* not us */ | |
2510 | if (!DIFF_PAIR_RENAME(pp)) | |
2511 | continue; /* not a rename/copy */ | |
2512 | /* pp is a rename/copy from the same source */ | |
2513 | p->status = DIFF_STATUS_COPIED; | |
2514 | break; | |
2515 | } | |
2516 | if (!p->status) | |
2517 | p->status = DIFF_STATUS_RENAMED; | |
2518 | } | |
a89fccd2 | 2519 | else if (hashcmp(p->one->sha1, p->two->sha1) || |
d516c2d1 JS |
2520 | p->one->mode != p->two->mode || |
2521 | is_null_sha1(p->one->sha1)) | |
6973dcae JH |
2522 | p->status = DIFF_STATUS_MODIFIED; |
2523 | else { | |
2524 | /* This is a "no-change" entry and should not | |
2525 | * happen anymore, but prepare for broken callers. | |
2526 | */ | |
2527 | error("feeding unmodified %s to diffcore", | |
2528 | p->one->path); | |
2529 | p->status = DIFF_STATUS_UNKNOWN; | |
2530 | } | |
2531 | } | |
2532 | diff_debug_queue("resolve-rename-copy done", q); | |
2533 | } | |
2534 | ||
c6744349 | 2535 | static int check_pair_status(struct diff_filepair *p) |
6973dcae | 2536 | { |
6973dcae JH |
2537 | switch (p->status) { |
2538 | case DIFF_STATUS_UNKNOWN: | |
c6744349 | 2539 | return 0; |
6973dcae JH |
2540 | case 0: |
2541 | die("internal error in diff-resolve-rename-copy"); | |
6973dcae | 2542 | default: |
c6744349 | 2543 | return 1; |
6973dcae JH |
2544 | } |
2545 | } | |
2546 | ||
c6744349 TH |
2547 | static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt) |
2548 | { | |
2549 | int fmt = opt->output_format; | |
2550 | ||
2551 | if (fmt & DIFF_FORMAT_CHECKDIFF) | |
2552 | diff_flush_checkdiff(p, opt); | |
2553 | else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) | |
2554 | diff_flush_raw(p, opt); | |
2555 | else if (fmt & DIFF_FORMAT_NAME) | |
471efb09 | 2556 | diff_flush_name(p, opt); |
c6744349 TH |
2557 | } |
2558 | ||
4bbd261b SE |
2559 | static void show_file_mode_name(const char *newdelete, struct diff_filespec *fs) |
2560 | { | |
0d26a64e | 2561 | char *name = quote_one(fs->path); |
4bbd261b | 2562 | if (fs->mode) |
0d26a64e | 2563 | printf(" %s mode %06o %s\n", newdelete, fs->mode, name); |
4bbd261b | 2564 | else |
0d26a64e AJ |
2565 | printf(" %s %s\n", newdelete, name); |
2566 | free(name); | |
4bbd261b SE |
2567 | } |
2568 | ||
2569 | ||
2570 | static void show_mode_change(struct diff_filepair *p, int show_name) | |
2571 | { | |
2572 | if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) { | |
0d26a64e AJ |
2573 | if (show_name) { |
2574 | char *name = quote_one(p->two->path); | |
4bbd261b | 2575 | printf(" mode change %06o => %06o %s\n", |
0d26a64e AJ |
2576 | p->one->mode, p->two->mode, name); |
2577 | free(name); | |
2578 | } | |
4bbd261b SE |
2579 | else |
2580 | printf(" mode change %06o => %06o\n", | |
2581 | p->one->mode, p->two->mode); | |
2582 | } | |
2583 | } | |
2584 | ||
2585 | static void show_rename_copy(const char *renamecopy, struct diff_filepair *p) | |
2586 | { | |
b9f44164 | 2587 | char *names = pprint_rename(p->one->path, p->two->path); |
4bbd261b | 2588 | |
b9f44164 AJ |
2589 | printf(" %s %s (%d%%)\n", renamecopy, names, |
2590 | (int)(0.5 + p->score * 100.0/MAX_SCORE)); | |
2591 | free(names); | |
4bbd261b SE |
2592 | show_mode_change(p, 0); |
2593 | } | |
2594 | ||
2595 | static void diff_summary(struct diff_filepair *p) | |
2596 | { | |
2597 | switch(p->status) { | |
2598 | case DIFF_STATUS_DELETED: | |
2599 | show_file_mode_name("delete", p->one); | |
2600 | break; | |
2601 | case DIFF_STATUS_ADDED: | |
2602 | show_file_mode_name("create", p->two); | |
2603 | break; | |
2604 | case DIFF_STATUS_COPIED: | |
2605 | show_rename_copy("copy", p); | |
2606 | break; | |
2607 | case DIFF_STATUS_RENAMED: | |
2608 | show_rename_copy("rename", p); | |
2609 | break; | |
2610 | default: | |
2611 | if (p->score) { | |
0d26a64e AJ |
2612 | char *name = quote_one(p->two->path); |
2613 | printf(" rewrite %s (%d%%)\n", name, | |
4bbd261b | 2614 | (int)(0.5 + p->score * 100.0/MAX_SCORE)); |
0d26a64e | 2615 | free(name); |
4bbd261b SE |
2616 | show_mode_change(p, 0); |
2617 | } else show_mode_change(p, 1); | |
2618 | break; | |
2619 | } | |
2620 | } | |
2621 | ||
fcb3d0ad JS |
2622 | struct patch_id_t { |
2623 | struct xdiff_emit_state xm; | |
2624 | SHA_CTX *ctx; | |
2625 | int patchlen; | |
2626 | }; | |
2627 | ||
2628 | static int remove_space(char *line, int len) | |
2629 | { | |
2630 | int i; | |
2631 | char *dst = line; | |
2632 | unsigned char c; | |
2633 | ||
2634 | for (i = 0; i < len; i++) | |
2635 | if (!isspace((c = line[i]))) | |
2636 | *dst++ = c; | |
2637 | ||
2638 | return dst - line; | |
2639 | } | |
2640 | ||
2641 | static void patch_id_consume(void *priv, char *line, unsigned long len) | |
2642 | { | |
2643 | struct patch_id_t *data = priv; | |
2644 | int new_len; | |
2645 | ||
2646 | /* Ignore line numbers when computing the SHA1 of the patch */ | |
cc44c765 | 2647 | if (!prefixcmp(line, "@@ -")) |
fcb3d0ad JS |
2648 | return; |
2649 | ||
2650 | new_len = remove_space(line, len); | |
2651 | ||
2652 | SHA1_Update(data->ctx, line, new_len); | |
2653 | data->patchlen += new_len; | |
2654 | } | |
2655 | ||
2656 | /* returns 0 upon success, and writes result into sha1 */ | |
2657 | static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1) | |
2658 | { | |
2659 | struct diff_queue_struct *q = &diff_queued_diff; | |
2660 | int i; | |
2661 | SHA_CTX ctx; | |
2662 | struct patch_id_t data; | |
2663 | char buffer[PATH_MAX * 4 + 20]; | |
2664 | ||
2665 | SHA1_Init(&ctx); | |
2666 | memset(&data, 0, sizeof(struct patch_id_t)); | |
2667 | data.ctx = &ctx; | |
2668 | data.xm.consume = patch_id_consume; | |
2669 | ||
2670 | for (i = 0; i < q->nr; i++) { | |
2671 | xpparam_t xpp; | |
2672 | xdemitconf_t xecfg; | |
2673 | xdemitcb_t ecb; | |
2674 | mmfile_t mf1, mf2; | |
2675 | struct diff_filepair *p = q->queue[i]; | |
2676 | int len1, len2; | |
2677 | ||
2678 | if (p->status == 0) | |
2679 | return error("internal diff status error"); | |
2680 | if (p->status == DIFF_STATUS_UNKNOWN) | |
2681 | continue; | |
2682 | if (diff_unmodified_pair(p)) | |
2683 | continue; | |
2684 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
2685 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
2686 | continue; | |
2687 | if (DIFF_PAIR_UNMERGED(p)) | |
2688 | continue; | |
2689 | ||
2690 | diff_fill_sha1_info(p->one); | |
2691 | diff_fill_sha1_info(p->two); | |
2692 | if (fill_mmfile(&mf1, p->one) < 0 || | |
2693 | fill_mmfile(&mf2, p->two) < 0) | |
2694 | return error("unable to read files to diff"); | |
2695 | ||
2696 | /* Maybe hash p->two? into the patch id? */ | |
2697 | if (mmfile_is_binary(&mf2)) | |
2698 | continue; | |
2699 | ||
2700 | len1 = remove_space(p->one->path, strlen(p->one->path)); | |
2701 | len2 = remove_space(p->two->path, strlen(p->two->path)); | |
2702 | if (p->one->mode == 0) | |
2703 | len1 = snprintf(buffer, sizeof(buffer), | |
2704 | "diff--gita/%.*sb/%.*s" | |
2705 | "newfilemode%06o" | |
2706 | "---/dev/null" | |
2707 | "+++b/%.*s", | |
2708 | len1, p->one->path, | |
2709 | len2, p->two->path, | |
2710 | p->two->mode, | |
2711 | len2, p->two->path); | |
2712 | else if (p->two->mode == 0) | |
2713 | len1 = snprintf(buffer, sizeof(buffer), | |
2714 | "diff--gita/%.*sb/%.*s" | |
2715 | "deletedfilemode%06o" | |
2716 | "---a/%.*s" | |
2717 | "+++/dev/null", | |
2718 | len1, p->one->path, | |
2719 | len2, p->two->path, | |
2720 | p->one->mode, | |
2721 | len1, p->one->path); | |
2722 | else | |
2723 | len1 = snprintf(buffer, sizeof(buffer), | |
2724 | "diff--gita/%.*sb/%.*s" | |
2725 | "---a/%.*s" | |
2726 | "+++b/%.*s", | |
2727 | len1, p->one->path, | |
2728 | len2, p->two->path, | |
2729 | len1, p->one->path, | |
2730 | len2, p->two->path); | |
2731 | SHA1_Update(&ctx, buffer, len1); | |
2732 | ||
2733 | xpp.flags = XDF_NEED_MINIMAL; | |
2734 | xecfg.ctxlen = 3; | |
9fdc3bb5 | 2735 | xecfg.flags = XDL_EMIT_FUNCNAMES; |
fcb3d0ad JS |
2736 | ecb.outf = xdiff_outf; |
2737 | ecb.priv = &data; | |
2738 | xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb); | |
2739 | } | |
2740 | ||
2741 | SHA1_Final(sha1, &ctx); | |
2742 | return 0; | |
2743 | } | |
2744 | ||
2745 | int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1) | |
2746 | { | |
2747 | struct diff_queue_struct *q = &diff_queued_diff; | |
2748 | int i; | |
2749 | int result = diff_get_patch_id(options, sha1); | |
2750 | ||
2751 | for (i = 0; i < q->nr; i++) | |
2752 | diff_free_filepair(q->queue[i]); | |
2753 | ||
2754 | free(q->queue); | |
2755 | q->queue = NULL; | |
2756 | q->nr = q->alloc = 0; | |
2757 | ||
2758 | return result; | |
2759 | } | |
2760 | ||
946c3784 | 2761 | static int is_summary_empty(const struct diff_queue_struct *q) |
6973dcae | 2762 | { |
6973dcae | 2763 | int i; |
6973dcae | 2764 | |
946c3784 TH |
2765 | for (i = 0; i < q->nr; i++) { |
2766 | const struct diff_filepair *p = q->queue[i]; | |
2767 | ||
2768 | switch (p->status) { | |
2769 | case DIFF_STATUS_DELETED: | |
2770 | case DIFF_STATUS_ADDED: | |
2771 | case DIFF_STATUS_COPIED: | |
2772 | case DIFF_STATUS_RENAMED: | |
2773 | return 0; | |
2774 | default: | |
2775 | if (p->score) | |
2776 | return 0; | |
2777 | if (p->one->mode && p->two->mode && | |
2778 | p->one->mode != p->two->mode) | |
2779 | return 0; | |
2780 | break; | |
2781 | } | |
6973dcae | 2782 | } |
946c3784 TH |
2783 | return 1; |
2784 | } | |
2785 | ||
6973dcae JH |
2786 | void diff_flush(struct diff_options *options) |
2787 | { | |
2788 | struct diff_queue_struct *q = &diff_queued_diff; | |
c6744349 | 2789 | int i, output_format = options->output_format; |
946c3784 | 2790 | int separator = 0; |
6973dcae | 2791 | |
c6744349 TH |
2792 | /* |
2793 | * Order: raw, stat, summary, patch | |
2794 | * or: name/name-status/checkdiff (other bits clear) | |
2795 | */ | |
946c3784 TH |
2796 | if (!q->nr) |
2797 | goto free_queue; | |
6973dcae | 2798 | |
c6744349 TH |
2799 | if (output_format & (DIFF_FORMAT_RAW | |
2800 | DIFF_FORMAT_NAME | | |
2801 | DIFF_FORMAT_NAME_STATUS | | |
2802 | DIFF_FORMAT_CHECKDIFF)) { | |
6973dcae JH |
2803 | for (i = 0; i < q->nr; i++) { |
2804 | struct diff_filepair *p = q->queue[i]; | |
c6744349 TH |
2805 | if (check_pair_status(p)) |
2806 | flush_one_pair(p, options); | |
6973dcae | 2807 | } |
946c3784 | 2808 | separator++; |
6973dcae | 2809 | } |
c6744349 | 2810 | |
ebd124c6 | 2811 | if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) { |
5e2b0636 | 2812 | struct diffstat_t diffstat; |
c6744349 | 2813 | |
5e2b0636 TH |
2814 | memset(&diffstat, 0, sizeof(struct diffstat_t)); |
2815 | diffstat.xm.consume = diffstat_consume; | |
6973dcae JH |
2816 | for (i = 0; i < q->nr; i++) { |
2817 | struct diff_filepair *p = q->queue[i]; | |
c6744349 | 2818 | if (check_pair_status(p)) |
5e2b0636 | 2819 | diff_flush_stat(p, options, &diffstat); |
6973dcae | 2820 | } |
74e2abe5 JH |
2821 | if (output_format & DIFF_FORMAT_NUMSTAT) |
2822 | show_numstat(&diffstat, options); | |
2823 | if (output_format & DIFF_FORMAT_DIFFSTAT) | |
2824 | show_stats(&diffstat, options); | |
ebd124c6 NP |
2825 | else if (output_format & DIFF_FORMAT_SHORTSTAT) |
2826 | show_shortstats(&diffstat); | |
3969cf7d | 2827 | separator++; |
6973dcae JH |
2828 | } |
2829 | ||
946c3784 | 2830 | if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) { |
c6744349 TH |
2831 | for (i = 0; i < q->nr; i++) |
2832 | diff_summary(q->queue[i]); | |
3969cf7d | 2833 | separator++; |
6973dcae JH |
2834 | } |
2835 | ||
c6744349 | 2836 | if (output_format & DIFF_FORMAT_PATCH) { |
946c3784 TH |
2837 | if (separator) { |
2838 | if (options->stat_sep) { | |
2839 | /* attach patch instead of inline */ | |
c6744349 | 2840 | fputs(options->stat_sep, stdout); |
946c3784 | 2841 | } else { |
c6744349 | 2842 | putchar(options->line_termination); |
946c3784 | 2843 | } |
c6744349 TH |
2844 | } |
2845 | ||
2846 | for (i = 0; i < q->nr; i++) { | |
2847 | struct diff_filepair *p = q->queue[i]; | |
2848 | if (check_pair_status(p)) | |
2849 | diff_flush_patch(p, options); | |
2850 | } | |
4bbd261b SE |
2851 | } |
2852 | ||
04245581 JK |
2853 | if (output_format & DIFF_FORMAT_CALLBACK) |
2854 | options->format_callback(q, options, options->format_callback_data); | |
2855 | ||
c6744349 TH |
2856 | for (i = 0; i < q->nr; i++) |
2857 | diff_free_filepair(q->queue[i]); | |
946c3784 | 2858 | free_queue: |
6973dcae JH |
2859 | free(q->queue); |
2860 | q->queue = NULL; | |
2861 | q->nr = q->alloc = 0; | |
2862 | } | |
2863 | ||
2864 | static void diffcore_apply_filter(const char *filter) | |
2865 | { | |
2866 | int i; | |
2867 | struct diff_queue_struct *q = &diff_queued_diff; | |
2868 | struct diff_queue_struct outq; | |
2869 | outq.queue = NULL; | |
2870 | outq.nr = outq.alloc = 0; | |
2871 | ||
2872 | if (!filter) | |
2873 | return; | |
2874 | ||
2875 | if (strchr(filter, DIFF_STATUS_FILTER_AON)) { | |
2876 | int found; | |
2877 | for (i = found = 0; !found && i < q->nr; i++) { | |
2878 | struct diff_filepair *p = q->queue[i]; | |
2879 | if (((p->status == DIFF_STATUS_MODIFIED) && | |
2880 | ((p->score && | |
2881 | strchr(filter, DIFF_STATUS_FILTER_BROKEN)) || | |
2882 | (!p->score && | |
2883 | strchr(filter, DIFF_STATUS_MODIFIED)))) || | |
2884 | ((p->status != DIFF_STATUS_MODIFIED) && | |
2885 | strchr(filter, p->status))) | |
2886 | found++; | |
2887 | } | |
2888 | if (found) | |
2889 | return; | |
2890 | ||
2891 | /* otherwise we will clear the whole queue | |
2892 | * by copying the empty outq at the end of this | |
2893 | * function, but first clear the current entries | |
2894 | * in the queue. | |
2895 | */ | |
2896 | for (i = 0; i < q->nr; i++) | |
2897 | diff_free_filepair(q->queue[i]); | |
2898 | } | |
2899 | else { | |
2900 | /* Only the matching ones */ | |
2901 | for (i = 0; i < q->nr; i++) { | |
2902 | struct diff_filepair *p = q->queue[i]; | |
2903 | ||
2904 | if (((p->status == DIFF_STATUS_MODIFIED) && | |
2905 | ((p->score && | |
2906 | strchr(filter, DIFF_STATUS_FILTER_BROKEN)) || | |
2907 | (!p->score && | |
2908 | strchr(filter, DIFF_STATUS_MODIFIED)))) || | |
2909 | ((p->status != DIFF_STATUS_MODIFIED) && | |
2910 | strchr(filter, p->status))) | |
2911 | diff_q(&outq, p); | |
2912 | else | |
2913 | diff_free_filepair(p); | |
2914 | } | |
2915 | } | |
2916 | free(q->queue); | |
2917 | *q = outq; | |
2918 | } | |
2919 | ||
2920 | void diffcore_std(struct diff_options *options) | |
2921 | { | |
68aacb2f JH |
2922 | if (options->quiet) |
2923 | return; | |
6973dcae JH |
2924 | if (options->break_opt != -1) |
2925 | diffcore_break(options->break_opt); | |
2926 | if (options->detect_rename) | |
2927 | diffcore_rename(options); | |
2928 | if (options->break_opt != -1) | |
2929 | diffcore_merge_broken(); | |
2930 | if (options->pickaxe) | |
2931 | diffcore_pickaxe(options->pickaxe, options->pickaxe_opts); | |
2932 | if (options->orderfile) | |
2933 | diffcore_order(options->orderfile); | |
2934 | diff_resolve_rename_copy(); | |
2935 | diffcore_apply_filter(options->filter); | |
68aacb2f JH |
2936 | |
2937 | options->has_changes = !!diff_queued_diff.nr; | |
6973dcae JH |
2938 | } |
2939 | ||
2940 | ||
6973dcae JH |
2941 | void diff_addremove(struct diff_options *options, |
2942 | int addremove, unsigned mode, | |
2943 | const unsigned char *sha1, | |
2944 | const char *base, const char *path) | |
2945 | { | |
2946 | char concatpath[PATH_MAX]; | |
2947 | struct diff_filespec *one, *two; | |
2948 | ||
2949 | /* This may look odd, but it is a preparation for | |
2950 | * feeding "there are unchanged files which should | |
2951 | * not produce diffs, but when you are doing copy | |
2952 | * detection you would need them, so here they are" | |
2953 | * entries to the diff-core. They will be prefixed | |
2954 | * with something like '=' or '*' (I haven't decided | |
2955 | * which but should not make any difference). | |
2956 | * Feeding the same new and old to diff_change() | |
2957 | * also has the same effect. | |
2958 | * Before the final output happens, they are pruned after | |
2959 | * merged into rename/copy pairs as appropriate. | |
2960 | */ | |
2961 | if (options->reverse_diff) | |
2962 | addremove = (addremove == '+' ? '-' : | |
2963 | addremove == '-' ? '+' : addremove); | |
2964 | ||
2965 | if (!path) path = ""; | |
2966 | sprintf(concatpath, "%s%s", base, path); | |
2967 | one = alloc_filespec(concatpath); | |
2968 | two = alloc_filespec(concatpath); | |
2969 | ||
2970 | if (addremove != '+') | |
2971 | fill_filespec(one, sha1, mode); | |
2972 | if (addremove != '-') | |
2973 | fill_filespec(two, sha1, mode); | |
2974 | ||
2975 | diff_queue(&diff_queued_diff, one, two); | |
68aacb2f | 2976 | options->has_changes = 1; |
6973dcae JH |
2977 | } |
2978 | ||
2979 | void diff_change(struct diff_options *options, | |
2980 | unsigned old_mode, unsigned new_mode, | |
2981 | const unsigned char *old_sha1, | |
2982 | const unsigned char *new_sha1, | |
2983 | const char *base, const char *path) | |
2984 | { | |
2985 | char concatpath[PATH_MAX]; | |
2986 | struct diff_filespec *one, *two; | |
2987 | ||
2988 | if (options->reverse_diff) { | |
2989 | unsigned tmp; | |
2990 | const unsigned char *tmp_c; | |
2991 | tmp = old_mode; old_mode = new_mode; new_mode = tmp; | |
2992 | tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c; | |
2993 | } | |
2994 | if (!path) path = ""; | |
2995 | sprintf(concatpath, "%s%s", base, path); | |
2996 | one = alloc_filespec(concatpath); | |
2997 | two = alloc_filespec(concatpath); | |
2998 | fill_filespec(one, old_sha1, old_mode); | |
2999 | fill_filespec(two, new_sha1, new_mode); | |
3000 | ||
3001 | diff_queue(&diff_queued_diff, one, two); | |
68aacb2f | 3002 | options->has_changes = 1; |
6973dcae JH |
3003 | } |
3004 | ||
3005 | void diff_unmerge(struct diff_options *options, | |
e9c84099 JH |
3006 | const char *path, |
3007 | unsigned mode, const unsigned char *sha1) | |
6973dcae JH |
3008 | { |
3009 | struct diff_filespec *one, *two; | |
3010 | one = alloc_filespec(path); | |
3011 | two = alloc_filespec(path); | |
e9c84099 JH |
3012 | fill_filespec(one, sha1, mode); |
3013 | diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1; | |
6973dcae | 3014 | } |