]>
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" |
8c701249 | 11 | #include "attr.h" |
d5535ec7 | 12 | #include "run-command.h" |
23707811 | 13 | #include "utf8.h" |
be58e70d | 14 | #include "userdiff.h" |
4a16d072 | 15 | #include "sigchain.h" |
752c0c24 | 16 | #include "submodule.h" |
a757c646 | 17 | #include "ll-merge.h" |
6973dcae | 18 | |
1510fea7 SP |
19 | #ifdef NO_FAST_WORKING_DIRECTORY |
20 | #define FAST_WORKING_DIRECTORY 0 | |
21 | #else | |
22 | #define FAST_WORKING_DIRECTORY 1 | |
23 | #endif | |
24 | ||
96f1e58f | 25 | static int diff_detect_rename_default; |
50705915 | 26 | static int diff_rename_limit_default = 200; |
a624eaa7 | 27 | static int diff_suppress_blank_empty; |
6b2f2d98 | 28 | int diff_use_color_default = -1; |
98a4d87b | 29 | static const char *diff_word_regex_cfg; |
cbe02100 | 30 | static const char *external_diff_cmd_cfg; |
aecbf914 | 31 | int diff_auto_refresh_index = 1; |
a5a818ee | 32 | static int diff_mnemonic_prefix; |
6973dcae | 33 | |
7c92fe0e | 34 | static char diff_colors[][COLOR_MAXLEN] = { |
dc6ebd4c AL |
35 | GIT_COLOR_RESET, |
36 | GIT_COLOR_NORMAL, /* PLAIN */ | |
37 | GIT_COLOR_BOLD, /* METAINFO */ | |
38 | GIT_COLOR_CYAN, /* FRAGINFO */ | |
39 | GIT_COLOR_RED, /* OLD */ | |
40 | GIT_COLOR_GREEN, /* NEW */ | |
41 | GIT_COLOR_YELLOW, /* COMMIT */ | |
42 | GIT_COLOR_BG_RED, /* WHITESPACE */ | |
89cb73a1 | 43 | GIT_COLOR_NORMAL, /* FUNCINFO */ |
cd112cef JS |
44 | }; |
45 | ||
9cb92c39 JK |
46 | static void diff_filespec_load_driver(struct diff_filespec *one); |
47 | static char *run_textconv(const char *, struct diff_filespec *, size_t *); | |
48 | ||
801235c5 JH |
49 | static int parse_diff_color_slot(const char *var, int ofs) |
50 | { | |
51 | if (!strcasecmp(var+ofs, "plain")) | |
52 | return DIFF_PLAIN; | |
53 | if (!strcasecmp(var+ofs, "meta")) | |
54 | return DIFF_METAINFO; | |
55 | if (!strcasecmp(var+ofs, "frag")) | |
56 | return DIFF_FRAGINFO; | |
57 | if (!strcasecmp(var+ofs, "old")) | |
58 | return DIFF_FILE_OLD; | |
59 | if (!strcasecmp(var+ofs, "new")) | |
60 | return DIFF_FILE_NEW; | |
ce436973 JK |
61 | if (!strcasecmp(var+ofs, "commit")) |
62 | return DIFF_COMMIT; | |
448c3ef1 JH |
63 | if (!strcasecmp(var+ofs, "whitespace")) |
64 | return DIFF_WHITESPACE; | |
89cb73a1 BW |
65 | if (!strcasecmp(var+ofs, "func")) |
66 | return DIFF_FUNCINFO; | |
8b8e8624 | 67 | return -1; |
801235c5 JH |
68 | } |
69 | ||
cced5fbc LT |
70 | static int git_config_rename(const char *var, const char *value) |
71 | { | |
72 | if (!value) | |
73 | return DIFF_DETECT_RENAME; | |
74 | if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy")) | |
75 | return DIFF_DETECT_COPY; | |
76 | return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0; | |
77 | } | |
78 | ||
83ad63cf JH |
79 | /* |
80 | * These are to give UI layer defaults. | |
81 | * The core-level commands such as git-diff-files should | |
82 | * never be affected by the setting of diff.renames | |
83 | * the user happens to have in the configuration file. | |
84 | */ | |
ef90d6d4 | 85 | int git_diff_ui_config(const char *var, const char *value, void *cb) |
801235c5 | 86 | { |
a159ca0c | 87 | if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { |
0f6f5a40 | 88 | diff_use_color_default = git_config_colorbool(var, value, -1); |
801235c5 JH |
89 | return 0; |
90 | } | |
b68ea12e | 91 | if (!strcmp(var, "diff.renames")) { |
cced5fbc | 92 | diff_detect_rename_default = git_config_rename(var, value); |
b68ea12e EW |
93 | return 0; |
94 | } | |
aecbf914 JH |
95 | if (!strcmp(var, "diff.autorefreshindex")) { |
96 | diff_auto_refresh_index = git_config_bool(var, value); | |
97 | return 0; | |
98 | } | |
a5a818ee JH |
99 | if (!strcmp(var, "diff.mnemonicprefix")) { |
100 | diff_mnemonic_prefix = git_config_bool(var, value); | |
101 | return 0; | |
102 | } | |
daec808c BH |
103 | if (!strcmp(var, "diff.external")) |
104 | return git_config_string(&external_diff_cmd_cfg, var, value); | |
98a4d87b BSSJ |
105 | if (!strcmp(var, "diff.wordregex")) |
106 | return git_config_string(&diff_word_regex_cfg, var, value); | |
f1af60bd | 107 | |
ef90d6d4 | 108 | return git_diff_basic_config(var, value, cb); |
9a1805a8 JK |
109 | } |
110 | ||
ef90d6d4 | 111 | int git_diff_basic_config(const char *var, const char *value, void *cb) |
9a1805a8 | 112 | { |
2b6ca6df LT |
113 | if (!strcmp(var, "diff.renamelimit")) { |
114 | diff_rename_limit_default = git_config_int(var, value); | |
115 | return 0; | |
116 | } | |
117 | ||
c7534ef4 JK |
118 | switch (userdiff_config(var, value)) { |
119 | case 0: break; | |
120 | case -1: return -1; | |
121 | default: return 0; | |
122 | } | |
123 | ||
1968d77d | 124 | if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) { |
801235c5 | 125 | int slot = parse_diff_color_slot(var, 11); |
8b8e8624 JK |
126 | if (slot < 0) |
127 | return 0; | |
64f30e94 JH |
128 | if (!value) |
129 | return config_error_nonbool(var); | |
7c92fe0e | 130 | color_parse(value, var, diff_colors[slot]); |
801235c5 JH |
131 | return 0; |
132 | } | |
f1af60bd | 133 | |
a624eaa7 | 134 | /* like GNU diff's --suppress-blank-empty option */ |
950db879 JS |
135 | if (!strcmp(var, "diff.suppressblankempty") || |
136 | /* for backwards compatibility */ | |
137 | !strcmp(var, "diff.suppress-blank-empty")) { | |
a624eaa7 JM |
138 | diff_suppress_blank_empty = git_config_bool(var, value); |
139 | return 0; | |
140 | } | |
141 | ||
ef90d6d4 | 142 | return git_color_default_config(var, value, cb); |
801235c5 JH |
143 | } |
144 | ||
6973dcae JH |
145 | static char *quote_two(const char *one, const char *two) |
146 | { | |
147 | int need_one = quote_c_style(one, NULL, NULL, 1); | |
148 | int need_two = quote_c_style(two, NULL, NULL, 1); | |
f285a2d7 | 149 | struct strbuf res = STRBUF_INIT; |
6973dcae JH |
150 | |
151 | if (need_one + need_two) { | |
663af342 PH |
152 | strbuf_addch(&res, '"'); |
153 | quote_c_style(one, &res, NULL, 1); | |
154 | quote_c_style(two, &res, NULL, 1); | |
155 | strbuf_addch(&res, '"'); | |
156 | } else { | |
157 | strbuf_addstr(&res, one); | |
158 | strbuf_addstr(&res, two); | |
6973dcae | 159 | } |
b315c5c0 | 160 | return strbuf_detach(&res, NULL); |
6973dcae JH |
161 | } |
162 | ||
163 | static const char *external_diff(void) | |
164 | { | |
165 | static const char *external_diff_cmd = NULL; | |
166 | static int done_preparing = 0; | |
167 | ||
168 | if (done_preparing) | |
169 | return external_diff_cmd; | |
170 | external_diff_cmd = getenv("GIT_EXTERNAL_DIFF"); | |
cbe02100 JS |
171 | if (!external_diff_cmd) |
172 | external_diff_cmd = external_diff_cmd_cfg; | |
6973dcae JH |
173 | done_preparing = 1; |
174 | return external_diff_cmd; | |
175 | } | |
176 | ||
6973dcae JH |
177 | static struct diff_tempfile { |
178 | const char *name; /* filename external diff should read from */ | |
179 | char hex[41]; | |
180 | char mode[10]; | |
1472966c | 181 | char tmp_path[PATH_MAX]; |
6973dcae JH |
182 | } diff_temp[2]; |
183 | ||
6957eb9a JH |
184 | typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len); |
185 | ||
186 | struct emit_callback { | |
6957eb9a JH |
187 | int color_diff; |
188 | unsigned ws_rule; | |
189 | int blank_at_eof_in_preimage; | |
190 | int blank_at_eof_in_postimage; | |
191 | int lno_in_preimage; | |
192 | int lno_in_postimage; | |
193 | sane_truncate_fn truncate; | |
194 | const char **label_path; | |
195 | struct diff_words_data *diff_words; | |
196 | int *found_changesp; | |
197 | FILE *file; | |
3e97c7c6 | 198 | struct strbuf *header; |
6957eb9a JH |
199 | }; |
200 | ||
6973dcae JH |
201 | static int count_lines(const char *data, int size) |
202 | { | |
203 | int count, ch, completely_empty = 1, nl_just_seen = 0; | |
204 | count = 0; | |
205 | while (0 < size--) { | |
206 | ch = *data++; | |
207 | if (ch == '\n') { | |
208 | count++; | |
209 | nl_just_seen = 1; | |
210 | completely_empty = 0; | |
211 | } | |
212 | else { | |
213 | nl_just_seen = 0; | |
214 | completely_empty = 0; | |
215 | } | |
216 | } | |
217 | if (completely_empty) | |
218 | return 0; | |
219 | if (!nl_just_seen) | |
220 | count++; /* no trailing newline */ | |
221 | return count; | |
222 | } | |
223 | ||
6957eb9a JH |
224 | static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one) |
225 | { | |
226 | if (!DIFF_FILE_VALID(one)) { | |
227 | mf->ptr = (char *)""; /* does not matter */ | |
228 | mf->size = 0; | |
229 | return 0; | |
230 | } | |
231 | else if (diff_populate_filespec(one, 0)) | |
232 | return -1; | |
bb35fefb | 233 | |
6957eb9a JH |
234 | mf->ptr = one->data; |
235 | mf->size = one->size; | |
236 | return 0; | |
237 | } | |
238 | ||
239 | static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule) | |
240 | { | |
241 | char *ptr = mf->ptr; | |
242 | long size = mf->size; | |
243 | int cnt = 0; | |
244 | ||
245 | if (!size) | |
246 | return cnt; | |
247 | ptr += size - 1; /* pointing at the very end */ | |
248 | if (*ptr != '\n') | |
249 | ; /* incomplete line */ | |
250 | else | |
251 | ptr--; /* skip the last LF */ | |
252 | while (mf->ptr < ptr) { | |
253 | char *prev_eol; | |
254 | for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--) | |
255 | if (*prev_eol == '\n') | |
256 | break; | |
257 | if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule)) | |
258 | break; | |
259 | cnt++; | |
260 | ptr = prev_eol - 1; | |
261 | } | |
262 | return cnt; | |
263 | } | |
264 | ||
265 | static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2, | |
266 | struct emit_callback *ecbdata) | |
267 | { | |
268 | int l1, l2, at; | |
269 | unsigned ws_rule = ecbdata->ws_rule; | |
270 | l1 = count_trailing_blank(mf1, ws_rule); | |
271 | l2 = count_trailing_blank(mf2, ws_rule); | |
272 | if (l2 <= l1) { | |
273 | ecbdata->blank_at_eof_in_preimage = 0; | |
274 | ecbdata->blank_at_eof_in_postimage = 0; | |
275 | return; | |
276 | } | |
277 | at = count_lines(mf1->ptr, mf1->size); | |
278 | ecbdata->blank_at_eof_in_preimage = (at - l1) + 1; | |
279 | ||
280 | at = count_lines(mf2->ptr, mf2->size); | |
281 | ecbdata->blank_at_eof_in_postimage = (at - l2) + 1; | |
282 | } | |
283 | ||
250f7993 JH |
284 | static void emit_line_0(FILE *file, const char *set, const char *reset, |
285 | int first, const char *line, int len) | |
6957eb9a JH |
286 | { |
287 | int has_trailing_newline, has_trailing_carriage_return; | |
250f7993 | 288 | int nofirst; |
6957eb9a | 289 | |
250f7993 JH |
290 | if (len == 0) { |
291 | has_trailing_newline = (first == '\n'); | |
292 | has_trailing_carriage_return = (!has_trailing_newline && | |
293 | (first == '\r')); | |
294 | nofirst = has_trailing_newline || has_trailing_carriage_return; | |
295 | } else { | |
296 | has_trailing_newline = (len > 0 && line[len-1] == '\n'); | |
297 | if (has_trailing_newline) | |
298 | len--; | |
299 | has_trailing_carriage_return = (len > 0 && line[len-1] == '\r'); | |
300 | if (has_trailing_carriage_return) | |
301 | len--; | |
302 | nofirst = 0; | |
303 | } | |
6957eb9a | 304 | |
06a47552 JH |
305 | if (len || !nofirst) { |
306 | fputs(set, file); | |
307 | if (!nofirst) | |
308 | fputc(first, file); | |
309 | fwrite(line, len, 1, file); | |
310 | fputs(reset, file); | |
311 | } | |
6957eb9a JH |
312 | if (has_trailing_carriage_return) |
313 | fputc('\r', file); | |
314 | if (has_trailing_newline) | |
315 | fputc('\n', file); | |
316 | } | |
317 | ||
250f7993 JH |
318 | static void emit_line(FILE *file, const char *set, const char *reset, |
319 | const char *line, int len) | |
320 | { | |
321 | emit_line_0(file, set, reset, line[0], line+1, len-1); | |
322 | } | |
323 | ||
6957eb9a JH |
324 | static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len) |
325 | { | |
326 | if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) && | |
327 | ecbdata->blank_at_eof_in_preimage && | |
328 | ecbdata->blank_at_eof_in_postimage && | |
329 | ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage && | |
330 | ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage)) | |
331 | return 0; | |
018cff70 | 332 | return ws_blank_line(line, len, ecbdata->ws_rule); |
6957eb9a JH |
333 | } |
334 | ||
018cff70 JH |
335 | static void emit_add_line(const char *reset, |
336 | struct emit_callback *ecbdata, | |
337 | const char *line, int len) | |
6957eb9a JH |
338 | { |
339 | const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE); | |
340 | const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW); | |
341 | ||
342 | if (!*ws) | |
018cff70 | 343 | emit_line_0(ecbdata->file, set, reset, '+', line, len); |
6957eb9a JH |
344 | else if (new_blank_line_at_eof(ecbdata, line, len)) |
345 | /* Blank line at EOF - paint '+' as well */ | |
018cff70 | 346 | emit_line_0(ecbdata->file, ws, reset, '+', line, len); |
6957eb9a JH |
347 | else { |
348 | /* Emit just the prefix, then the rest. */ | |
018cff70 JH |
349 | emit_line_0(ecbdata->file, set, reset, '+', "", 0); |
350 | ws_check_emit(line, len, ecbdata->ws_rule, | |
6957eb9a JH |
351 | ecbdata->file, set, reset, ws); |
352 | } | |
353 | } | |
354 | ||
89cb73a1 BW |
355 | static void emit_hunk_header(struct emit_callback *ecbdata, |
356 | const char *line, int len) | |
357 | { | |
358 | const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN); | |
359 | const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO); | |
360 | const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO); | |
361 | const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET); | |
362 | static const char atat[2] = { '@', '@' }; | |
363 | const char *cp, *ep; | |
364 | ||
365 | /* | |
366 | * As a hunk header must begin with "@@ -<old>, +<new> @@", | |
367 | * it always is at least 10 bytes long. | |
368 | */ | |
369 | if (len < 10 || | |
370 | memcmp(line, atat, 2) || | |
371 | !(ep = memmem(line + 2, len - 2, atat, 2))) { | |
372 | emit_line(ecbdata->file, plain, reset, line, len); | |
373 | return; | |
374 | } | |
375 | ep += 2; /* skip over @@ */ | |
376 | ||
377 | /* The hunk header in fraginfo color */ | |
378 | emit_line(ecbdata->file, frag, reset, line, ep - line); | |
379 | ||
380 | /* blank before the func header */ | |
381 | for (cp = ep; ep - line < len; ep++) | |
382 | if (*ep != ' ' && *ep != '\t') | |
383 | break; | |
384 | if (ep != cp) | |
385 | emit_line(ecbdata->file, plain, reset, cp, ep - cp); | |
386 | ||
387 | if (ep < line + len) | |
388 | emit_line(ecbdata->file, func, reset, ep, line + len - ep); | |
389 | } | |
390 | ||
479b0ae8 JK |
391 | static struct diff_tempfile *claim_diff_tempfile(void) { |
392 | int i; | |
393 | for (i = 0; i < ARRAY_SIZE(diff_temp); i++) | |
394 | if (!diff_temp[i].name) | |
395 | return diff_temp + i; | |
396 | die("BUG: diff is failing to clean up its tempfiles"); | |
397 | } | |
398 | ||
399 | static int remove_tempfile_installed; | |
400 | ||
401 | static void remove_tempfile(void) | |
402 | { | |
403 | int i; | |
a8344abe NR |
404 | for (i = 0; i < ARRAY_SIZE(diff_temp); i++) { |
405 | if (diff_temp[i].name == diff_temp[i].tmp_path) | |
691f1a28 | 406 | unlink_or_warn(diff_temp[i].name); |
a8344abe NR |
407 | diff_temp[i].name = NULL; |
408 | } | |
479b0ae8 JK |
409 | } |
410 | ||
411 | static void remove_tempfile_on_signal(int signo) | |
412 | { | |
413 | remove_tempfile(); | |
4a16d072 | 414 | sigchain_pop(signo); |
479b0ae8 JK |
415 | raise(signo); |
416 | } | |
417 | ||
c0c77734 | 418 | static void print_line_count(FILE *file, int count) |
6973dcae JH |
419 | { |
420 | switch (count) { | |
421 | case 0: | |
c0c77734 | 422 | fprintf(file, "0,0"); |
6973dcae JH |
423 | break; |
424 | case 1: | |
c0c77734 | 425 | fprintf(file, "1"); |
6973dcae JH |
426 | break; |
427 | default: | |
c0c77734 | 428 | fprintf(file, "1,%d", count); |
6973dcae JH |
429 | break; |
430 | } | |
431 | } | |
432 | ||
7f7ee2ff JH |
433 | static void emit_rewrite_lines(struct emit_callback *ecb, |
434 | int prefix, const char *data, int size) | |
6973dcae | 435 | { |
7f7ee2ff JH |
436 | const char *endp = NULL; |
437 | static const char *nneof = " No newline at end of file\n"; | |
438 | const char *old = diff_get_color(ecb->color_diff, DIFF_FILE_OLD); | |
439 | const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET); | |
440 | ||
441 | while (0 < size) { | |
442 | int len; | |
443 | ||
444 | endp = memchr(data, '\n', size); | |
445 | len = endp ? (endp - data + 1) : size; | |
446 | if (prefix != '+') { | |
447 | ecb->lno_in_preimage++; | |
448 | emit_line_0(ecb->file, old, reset, '-', | |
449 | data, len); | |
450 | } else { | |
451 | ecb->lno_in_postimage++; | |
452 | emit_add_line(reset, ecb, data, len); | |
13e36ec5 | 453 | } |
7f7ee2ff JH |
454 | size -= len; |
455 | data += len; | |
456 | } | |
457 | if (!endp) { | |
458 | const char *plain = diff_get_color(ecb->color_diff, | |
459 | DIFF_PLAIN); | |
460 | emit_line_0(ecb->file, plain, reset, '\\', | |
461 | nneof, strlen(nneof)); | |
6973dcae | 462 | } |
6973dcae JH |
463 | } |
464 | ||
465 | static void emit_rewrite_diff(const char *name_a, | |
466 | const char *name_b, | |
467 | struct diff_filespec *one, | |
13e36ec5 | 468 | struct diff_filespec *two, |
3aa1f7ca JK |
469 | const char *textconv_one, |
470 | const char *textconv_two, | |
eab9a40b | 471 | struct diff_options *o) |
6973dcae JH |
472 | { |
473 | int lc_a, lc_b; | |
eab9a40b | 474 | int color_diff = DIFF_OPT_TST(o, COLOR_DIFF); |
1a9eb3b9 | 475 | const char *name_a_tab, *name_b_tab; |
13e36ec5 JS |
476 | const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO); |
477 | const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO); | |
13e36ec5 | 478 | const char *reset = diff_get_color(color_diff, DIFF_RESET); |
d5625091 | 479 | static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT; |
a5a818ee | 480 | const char *a_prefix, *b_prefix; |
3aa1f7ca JK |
481 | const char *data_one, *data_two; |
482 | size_t size_one, size_two; | |
7f7ee2ff | 483 | struct emit_callback ecbdata; |
a5a818ee JH |
484 | |
485 | if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) { | |
486 | a_prefix = o->b_prefix; | |
487 | b_prefix = o->a_prefix; | |
488 | } else { | |
489 | a_prefix = o->a_prefix; | |
490 | b_prefix = o->b_prefix; | |
491 | } | |
1a9eb3b9 | 492 | |
8a13becc JH |
493 | name_a += (*name_a == '/'); |
494 | name_b += (*name_b == '/'); | |
1a9eb3b9 JH |
495 | name_a_tab = strchr(name_a, ' ') ? "\t" : ""; |
496 | name_b_tab = strchr(name_b, ' ') ? "\t" : ""; | |
497 | ||
d5625091 JH |
498 | strbuf_reset(&a_name); |
499 | strbuf_reset(&b_name); | |
a5a818ee JH |
500 | quote_two_c_style(&a_name, a_prefix, name_a, 0); |
501 | quote_two_c_style(&b_name, b_prefix, name_b, 0); | |
d5625091 | 502 | |
6973dcae JH |
503 | diff_populate_filespec(one, 0); |
504 | diff_populate_filespec(two, 0); | |
3aa1f7ca JK |
505 | if (textconv_one) { |
506 | data_one = run_textconv(textconv_one, one, &size_one); | |
507 | if (!data_one) | |
508 | die("unable to read files to diff"); | |
509 | } | |
510 | else { | |
511 | data_one = one->data; | |
512 | size_one = one->size; | |
513 | } | |
514 | if (textconv_two) { | |
515 | data_two = run_textconv(textconv_two, two, &size_two); | |
516 | if (!data_two) | |
517 | die("unable to read files to diff"); | |
518 | } | |
519 | else { | |
520 | data_two = two->data; | |
521 | size_two = two->size; | |
522 | } | |
523 | ||
d91ba8fa JH |
524 | memset(&ecbdata, 0, sizeof(ecbdata)); |
525 | ecbdata.color_diff = color_diff; | |
526 | ecbdata.found_changesp = &o->found_changes; | |
527 | ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a); | |
528 | ecbdata.file = o->file; | |
529 | if (ecbdata.ws_rule & WS_BLANK_AT_EOF) { | |
530 | mmfile_t mf1, mf2; | |
531 | mf1.ptr = (char *)data_one; | |
532 | mf2.ptr = (char *)data_two; | |
533 | mf1.size = size_one; | |
534 | mf2.size = size_two; | |
535 | check_blank_at_eof(&mf1, &mf2, &ecbdata); | |
536 | } | |
537 | ecbdata.lno_in_preimage = 1; | |
538 | ecbdata.lno_in_postimage = 1; | |
539 | ||
3aa1f7ca JK |
540 | lc_a = count_lines(data_one, size_one); |
541 | lc_b = count_lines(data_two, size_two); | |
c0c77734 DB |
542 | fprintf(o->file, |
543 | "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -", | |
544 | metainfo, a_name.buf, name_a_tab, reset, | |
545 | metainfo, b_name.buf, name_b_tab, reset, fraginfo); | |
546 | print_line_count(o->file, lc_a); | |
547 | fprintf(o->file, " +"); | |
548 | print_line_count(o->file, lc_b); | |
549 | fprintf(o->file, " @@%s\n", reset); | |
6973dcae | 550 | if (lc_a) |
d91ba8fa | 551 | emit_rewrite_lines(&ecbdata, '-', data_one, size_one); |
6973dcae | 552 | if (lc_b) |
d91ba8fa | 553 | emit_rewrite_lines(&ecbdata, '+', data_two, size_two); |
b76c056b | 554 | if (textconv_one) |
aed6ca52 | 555 | free((char *)data_one); |
b76c056b | 556 | if (textconv_two) |
aed6ca52 | 557 | free((char *)data_two); |
6973dcae JH |
558 | } |
559 | ||
f59a59e2 JS |
560 | struct diff_words_buffer { |
561 | mmfile_t text; | |
562 | long alloc; | |
2e5d2003 JS |
563 | struct diff_words_orig { |
564 | const char *begin, *end; | |
565 | } *orig; | |
566 | int orig_nr, orig_alloc; | |
f59a59e2 JS |
567 | }; |
568 | ||
569 | static void diff_words_append(char *line, unsigned long len, | |
570 | struct diff_words_buffer *buffer) | |
571 | { | |
23c1575f | 572 | ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc); |
f59a59e2 JS |
573 | line++; |
574 | len--; | |
575 | memcpy(buffer->text.ptr + buffer->text.size, line, len); | |
576 | buffer->text.size += len; | |
2b6a5417 | 577 | buffer->text.ptr[buffer->text.size] = '\0'; |
f59a59e2 JS |
578 | } |
579 | ||
580 | struct diff_words_data { | |
f59a59e2 | 581 | struct diff_words_buffer minus, plus; |
2e5d2003 | 582 | const char *current_plus; |
c0c77734 | 583 | FILE *file; |
2b6a5417 | 584 | regex_t *word_regex; |
f59a59e2 JS |
585 | }; |
586 | ||
f59a59e2 | 587 | static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len) |
f59a59e2 | 588 | { |
f59a59e2 | 589 | struct diff_words_data *diff_words = priv; |
2e5d2003 JS |
590 | int minus_first, minus_len, plus_first, plus_len; |
591 | const char *minus_begin, *minus_end, *plus_begin, *plus_end; | |
f59a59e2 | 592 | |
2e5d2003 JS |
593 | if (line[0] != '@' || parse_hunk_header(line, len, |
594 | &minus_first, &minus_len, &plus_first, &plus_len)) | |
f59a59e2 JS |
595 | return; |
596 | ||
2e5d2003 JS |
597 | /* POSIX requires that first be decremented by one if len == 0... */ |
598 | if (minus_len) { | |
599 | minus_begin = diff_words->minus.orig[minus_first].begin; | |
600 | minus_end = | |
601 | diff_words->minus.orig[minus_first + minus_len - 1].end; | |
602 | } else | |
603 | minus_begin = minus_end = | |
604 | diff_words->minus.orig[minus_first].end; | |
605 | ||
606 | if (plus_len) { | |
607 | plus_begin = diff_words->plus.orig[plus_first].begin; | |
608 | plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end; | |
609 | } else | |
610 | plus_begin = plus_end = diff_words->plus.orig[plus_first].end; | |
611 | ||
612 | if (diff_words->current_plus != plus_begin) | |
613 | fwrite(diff_words->current_plus, | |
614 | plus_begin - diff_words->current_plus, 1, | |
615 | diff_words->file); | |
616 | if (minus_begin != minus_end) | |
617 | color_fwrite_lines(diff_words->file, | |
618 | diff_get_color(1, DIFF_FILE_OLD), | |
619 | minus_end - minus_begin, minus_begin); | |
620 | if (plus_begin != plus_end) | |
621 | color_fwrite_lines(diff_words->file, | |
622 | diff_get_color(1, DIFF_FILE_NEW), | |
623 | plus_end - plus_begin, plus_begin); | |
624 | ||
625 | diff_words->current_plus = plus_end; | |
f59a59e2 JS |
626 | } |
627 | ||
2b6a5417 JS |
628 | /* This function starts looking at *begin, and returns 0 iff a word was found. */ |
629 | static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex, | |
630 | int *begin, int *end) | |
631 | { | |
632 | if (word_regex && *begin < buffer->size) { | |
633 | regmatch_t match[1]; | |
634 | if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) { | |
635 | char *p = memchr(buffer->ptr + *begin + match[0].rm_so, | |
636 | '\n', match[0].rm_eo - match[0].rm_so); | |
637 | *end = p ? p - buffer->ptr : match[0].rm_eo + *begin; | |
638 | *begin += match[0].rm_so; | |
639 | return *begin >= *end; | |
640 | } | |
641 | return -1; | |
f59a59e2 JS |
642 | } |
643 | ||
2b6a5417 JS |
644 | /* find the next word */ |
645 | while (*begin < buffer->size && isspace(buffer->ptr[*begin])) | |
646 | (*begin)++; | |
647 | if (*begin >= buffer->size) | |
648 | return -1; | |
f59a59e2 | 649 | |
2b6a5417 JS |
650 | /* find the end of the word */ |
651 | *end = *begin + 1; | |
652 | while (*end < buffer->size && !isspace(buffer->ptr[*end])) | |
653 | (*end)++; | |
654 | ||
655 | return 0; | |
f59a59e2 JS |
656 | } |
657 | ||
23c1575f | 658 | /* |
2e5d2003 JS |
659 | * This function splits the words in buffer->text, stores the list with |
660 | * newline separator into out, and saves the offsets of the original words | |
661 | * in buffer->orig. | |
23c1575f | 662 | */ |
2b6a5417 JS |
663 | static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out, |
664 | regex_t *word_regex) | |
f59a59e2 | 665 | { |
2e5d2003 | 666 | int i, j; |
2b6a5417 | 667 | long alloc = 0; |
f59a59e2 | 668 | |
2e5d2003 | 669 | out->size = 0; |
2b6a5417 | 670 | out->ptr = NULL; |
f59a59e2 | 671 | |
2e5d2003 JS |
672 | /* fake an empty "0th" word */ |
673 | ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc); | |
674 | buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr; | |
675 | buffer->orig_nr = 1; | |
676 | ||
677 | for (i = 0; i < buffer->text.size; i++) { | |
2b6a5417 JS |
678 | if (find_word_boundaries(&buffer->text, word_regex, &i, &j)) |
679 | return; | |
2e5d2003 JS |
680 | |
681 | /* store original boundaries */ | |
682 | ALLOC_GROW(buffer->orig, buffer->orig_nr + 1, | |
683 | buffer->orig_alloc); | |
684 | buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i; | |
685 | buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j; | |
686 | buffer->orig_nr++; | |
687 | ||
688 | /* store one word */ | |
2b6a5417 | 689 | ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc); |
2e5d2003 JS |
690 | memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i); |
691 | out->ptr[out->size + j - i] = '\n'; | |
692 | out->size += j - i + 1; | |
693 | ||
694 | i = j - 1; | |
f59a59e2 JS |
695 | } |
696 | } | |
697 | ||
698 | /* this executes the word diff on the accumulated buffers */ | |
699 | static void diff_words_show(struct diff_words_data *diff_words) | |
700 | { | |
701 | xpparam_t xpp; | |
702 | xdemitconf_t xecfg; | |
f59a59e2 | 703 | mmfile_t minus, plus; |
f59a59e2 | 704 | |
2e5d2003 JS |
705 | /* special case: only removal */ |
706 | if (!diff_words->plus.text.size) { | |
707 | color_fwrite_lines(diff_words->file, | |
708 | diff_get_color(1, DIFF_FILE_OLD), | |
709 | diff_words->minus.text.size, diff_words->minus.text.ptr); | |
710 | diff_words->minus.text.size = 0; | |
711 | return; | |
712 | } | |
713 | ||
714 | diff_words->current_plus = diff_words->plus.text.ptr; | |
f59a59e2 | 715 | |
9ccd0a88 | 716 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 717 | memset(&xecfg, 0, sizeof(xecfg)); |
2b6a5417 JS |
718 | diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex); |
719 | diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex); | |
f59a59e2 | 720 | xpp.flags = XDF_NEED_MINIMAL; |
2b6a5417 | 721 | /* as only the hunk header will be parsed, we need a 0-context */ |
2e5d2003 | 722 | xecfg.ctxlen = 0; |
8a3f524b | 723 | xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words, |
dfea7900 | 724 | &xpp, &xecfg); |
f59a59e2 JS |
725 | free(minus.ptr); |
726 | free(plus.ptr); | |
2e5d2003 JS |
727 | if (diff_words->current_plus != diff_words->plus.text.ptr + |
728 | diff_words->plus.text.size) | |
729 | fwrite(diff_words->current_plus, | |
730 | diff_words->plus.text.ptr + diff_words->plus.text.size | |
731 | - diff_words->current_plus, 1, | |
732 | diff_words->file); | |
f59a59e2 | 733 | diff_words->minus.text.size = diff_words->plus.text.size = 0; |
f59a59e2 JS |
734 | } |
735 | ||
76fd2828 JH |
736 | /* In "color-words" mode, show word-diff of words accumulated in the buffer */ |
737 | static void diff_words_flush(struct emit_callback *ecbdata) | |
738 | { | |
739 | if (ecbdata->diff_words->minus.text.size || | |
740 | ecbdata->diff_words->plus.text.size) | |
741 | diff_words_show(ecbdata->diff_words); | |
742 | } | |
743 | ||
f59a59e2 JS |
744 | static void free_diff_words_data(struct emit_callback *ecbdata) |
745 | { | |
746 | if (ecbdata->diff_words) { | |
76fd2828 | 747 | diff_words_flush(ecbdata); |
8e0f7003 | 748 | free (ecbdata->diff_words->minus.text.ptr); |
2e5d2003 | 749 | free (ecbdata->diff_words->minus.orig); |
8e0f7003 | 750 | free (ecbdata->diff_words->plus.text.ptr); |
2e5d2003 | 751 | free (ecbdata->diff_words->plus.orig); |
2b6a5417 | 752 | free(ecbdata->diff_words->word_regex); |
f59a59e2 JS |
753 | free(ecbdata->diff_words); |
754 | ecbdata->diff_words = NULL; | |
755 | } | |
756 | } | |
757 | ||
ce436973 | 758 | const char *diff_get_color(int diff_use_color, enum color_diff ix) |
cd112cef JS |
759 | { |
760 | if (diff_use_color) | |
50f575fc LT |
761 | return diff_colors[ix]; |
762 | return ""; | |
cd112cef JS |
763 | } |
764 | ||
23707811 JH |
765 | static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len) |
766 | { | |
767 | const char *cp; | |
768 | unsigned long allot; | |
769 | size_t l = len; | |
770 | ||
771 | if (ecb->truncate) | |
772 | return ecb->truncate(line, len); | |
773 | cp = line; | |
774 | allot = l; | |
775 | while (0 < l) { | |
776 | (void) utf8_width(&cp, &l); | |
777 | if (!cp) | |
778 | break; /* truncated in the middle? */ | |
779 | } | |
780 | return allot - l; | |
781 | } | |
782 | ||
d68fe26f | 783 | static void find_lno(const char *line, struct emit_callback *ecbdata) |
690ed843 | 784 | { |
d68fe26f JH |
785 | const char *p; |
786 | ecbdata->lno_in_preimage = 0; | |
787 | ecbdata->lno_in_postimage = 0; | |
788 | p = strchr(line, '-'); | |
690ed843 | 789 | if (!p) |
d68fe26f JH |
790 | return; /* cannot happen */ |
791 | ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10); | |
792 | p = strchr(p, '+'); | |
793 | if (!p) | |
794 | return; /* cannot happen */ | |
795 | ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10); | |
690ed843 JH |
796 | } |
797 | ||
cd112cef | 798 | static void fn_out_consume(void *priv, char *line, unsigned long len) |
6973dcae | 799 | { |
6973dcae | 800 | struct emit_callback *ecbdata = priv; |
472ca780 JK |
801 | const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO); |
802 | const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN); | |
ce436973 | 803 | const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET); |
6973dcae | 804 | |
3e97c7c6 GB |
805 | if (ecbdata->header) { |
806 | fprintf(ecbdata->file, "%s", ecbdata->header->buf); | |
807 | strbuf_reset(ecbdata->header); | |
808 | ecbdata->header = NULL; | |
809 | } | |
34a5e1a2 JS |
810 | *(ecbdata->found_changesp) = 1; |
811 | ||
6973dcae | 812 | if (ecbdata->label_path[0]) { |
1a9eb3b9 JH |
813 | const char *name_a_tab, *name_b_tab; |
814 | ||
815 | name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : ""; | |
816 | name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : ""; | |
817 | ||
c0c77734 DB |
818 | fprintf(ecbdata->file, "%s--- %s%s%s\n", |
819 | meta, ecbdata->label_path[0], reset, name_a_tab); | |
820 | fprintf(ecbdata->file, "%s+++ %s%s%s\n", | |
821 | meta, ecbdata->label_path[1], reset, name_b_tab); | |
6973dcae JH |
822 | ecbdata->label_path[0] = ecbdata->label_path[1] = NULL; |
823 | } | |
cd112cef | 824 | |
a624eaa7 JM |
825 | if (diff_suppress_blank_empty |
826 | && len == 2 && line[0] == ' ' && line[1] == '\n') { | |
827 | line[0] = '\n'; | |
828 | len = 1; | |
829 | } | |
830 | ||
b8d9c1a6 | 831 | if (line[0] == '@') { |
76fd2828 JH |
832 | if (ecbdata->diff_words) |
833 | diff_words_flush(ecbdata); | |
23707811 | 834 | len = sane_truncate_line(ecbdata, line, len); |
d68fe26f | 835 | find_lno(line, ecbdata); |
89cb73a1 | 836 | emit_hunk_header(ecbdata, line, len); |
23707811 | 837 | if (line[len-1] != '\n') |
c0c77734 | 838 | putc('\n', ecbdata->file); |
448c3ef1 | 839 | return; |
cd112cef | 840 | } |
448c3ef1 | 841 | |
b8d9c1a6 | 842 | if (len < 1) { |
c0c77734 | 843 | emit_line(ecbdata->file, reset, reset, line, len); |
448c3ef1 | 844 | return; |
cd112cef | 845 | } |
448c3ef1 | 846 | |
448c3ef1 JH |
847 | if (ecbdata->diff_words) { |
848 | if (line[0] == '-') { | |
849 | diff_words_append(line, len, | |
850 | &ecbdata->diff_words->minus); | |
851 | return; | |
852 | } else if (line[0] == '+') { | |
853 | diff_words_append(line, len, | |
854 | &ecbdata->diff_words->plus); | |
855 | return; | |
856 | } | |
76fd2828 | 857 | diff_words_flush(ecbdata); |
448c3ef1 | 858 | line++; |
50f575fc | 859 | len--; |
c0c77734 | 860 | emit_line(ecbdata->file, plain, reset, line, len); |
448c3ef1 JH |
861 | return; |
862 | } | |
448c3ef1 | 863 | |
690ed843 JH |
864 | if (line[0] != '+') { |
865 | const char *color = | |
866 | diff_get_color(ecbdata->color_diff, | |
867 | line[0] == '-' ? DIFF_FILE_OLD : DIFF_PLAIN); | |
868 | ecbdata->lno_in_preimage++; | |
d68fe26f JH |
869 | if (line[0] == ' ') |
870 | ecbdata->lno_in_postimage++; | |
690ed843 | 871 | emit_line(ecbdata->file, color, reset, line, len); |
d68fe26f JH |
872 | } else { |
873 | ecbdata->lno_in_postimage++; | |
018cff70 | 874 | emit_add_line(reset, ecbdata, line + 1, len - 1); |
448c3ef1 | 875 | } |
6973dcae JH |
876 | } |
877 | ||
878 | static char *pprint_rename(const char *a, const char *b) | |
879 | { | |
880 | const char *old = a; | |
881 | const char *new = b; | |
f285a2d7 | 882 | struct strbuf name = STRBUF_INIT; |
6973dcae JH |
883 | int pfx_length, sfx_length; |
884 | int len_a = strlen(a); | |
885 | int len_b = strlen(b); | |
663af342 | 886 | int a_midlen, b_midlen; |
e5bfbf9b AJ |
887 | int qlen_a = quote_c_style(a, NULL, NULL, 0); |
888 | int qlen_b = quote_c_style(b, NULL, NULL, 0); | |
889 | ||
890 | if (qlen_a || qlen_b) { | |
663af342 PH |
891 | quote_c_style(a, &name, NULL, 0); |
892 | strbuf_addstr(&name, " => "); | |
893 | quote_c_style(b, &name, NULL, 0); | |
b315c5c0 | 894 | return strbuf_detach(&name, NULL); |
e5bfbf9b | 895 | } |
6973dcae JH |
896 | |
897 | /* Find common prefix */ | |
898 | pfx_length = 0; | |
899 | while (*old && *new && *old == *new) { | |
900 | if (*old == '/') | |
901 | pfx_length = old - a + 1; | |
902 | old++; | |
903 | new++; | |
904 | } | |
905 | ||
906 | /* Find common suffix */ | |
907 | old = a + len_a; | |
908 | new = b + len_b; | |
909 | sfx_length = 0; | |
910 | while (a <= old && b <= new && *old == *new) { | |
911 | if (*old == '/') | |
912 | sfx_length = len_a - (old - a); | |
913 | old--; | |
914 | new--; | |
915 | } | |
916 | ||
917 | /* | |
918 | * pfx{mid-a => mid-b}sfx | |
919 | * {pfx-a => pfx-b}sfx | |
920 | * pfx{sfx-a => sfx-b} | |
921 | * name-a => name-b | |
922 | */ | |
663af342 PH |
923 | a_midlen = len_a - pfx_length - sfx_length; |
924 | b_midlen = len_b - pfx_length - sfx_length; | |
925 | if (a_midlen < 0) | |
926 | a_midlen = 0; | |
927 | if (b_midlen < 0) | |
928 | b_midlen = 0; | |
929 | ||
930 | strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7); | |
6973dcae | 931 | if (pfx_length + sfx_length) { |
663af342 PH |
932 | strbuf_add(&name, a, pfx_length); |
933 | strbuf_addch(&name, '{'); | |
6973dcae | 934 | } |
663af342 PH |
935 | strbuf_add(&name, a + pfx_length, a_midlen); |
936 | strbuf_addstr(&name, " => "); | |
937 | strbuf_add(&name, b + pfx_length, b_midlen); | |
938 | if (pfx_length + sfx_length) { | |
939 | strbuf_addch(&name, '}'); | |
940 | strbuf_add(&name, a + len_a - sfx_length, sfx_length); | |
6973dcae | 941 | } |
b315c5c0 | 942 | return strbuf_detach(&name, NULL); |
6973dcae JH |
943 | } |
944 | ||
945 | struct diffstat_t { | |
6973dcae JH |
946 | int nr; |
947 | int alloc; | |
948 | struct diffstat_file { | |
f604652e | 949 | char *from_name; |
6973dcae | 950 | char *name; |
f604652e | 951 | char *print_name; |
6973dcae JH |
952 | unsigned is_unmerged:1; |
953 | unsigned is_binary:1; | |
954 | unsigned is_renamed:1; | |
0974c117 | 955 | uintmax_t added, deleted; |
6973dcae JH |
956 | } **files; |
957 | }; | |
958 | ||
959 | static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat, | |
960 | const char *name_a, | |
961 | const char *name_b) | |
962 | { | |
963 | struct diffstat_file *x; | |
964 | x = xcalloc(sizeof (*x), 1); | |
965 | if (diffstat->nr == diffstat->alloc) { | |
966 | diffstat->alloc = alloc_nr(diffstat->alloc); | |
967 | diffstat->files = xrealloc(diffstat->files, | |
968 | diffstat->alloc * sizeof(x)); | |
969 | } | |
970 | diffstat->files[diffstat->nr++] = x; | |
971 | if (name_b) { | |
f604652e JH |
972 | x->from_name = xstrdup(name_a); |
973 | x->name = xstrdup(name_b); | |
6973dcae JH |
974 | x->is_renamed = 1; |
975 | } | |
f604652e JH |
976 | else { |
977 | x->from_name = NULL; | |
9befac47 | 978 | x->name = xstrdup(name_a); |
f604652e | 979 | } |
6973dcae JH |
980 | return x; |
981 | } | |
982 | ||
983 | static void diffstat_consume(void *priv, char *line, unsigned long len) | |
984 | { | |
985 | struct diffstat_t *diffstat = priv; | |
986 | struct diffstat_file *x = diffstat->files[diffstat->nr - 1]; | |
987 | ||
988 | if (line[0] == '+') | |
989 | x->added++; | |
990 | else if (line[0] == '-') | |
991 | x->deleted++; | |
992 | } | |
993 | ||
698ce6f8 | 994 | const char mime_boundary_leader[] = "------------"; |
6973dcae | 995 | |
a2540023 JH |
996 | static int scale_linear(int it, int width, int max_change) |
997 | { | |
998 | /* | |
3ed74e60 JS |
999 | * make sure that at least one '-' is printed if there were deletions, |
1000 | * and likewise for '+'. | |
a2540023 | 1001 | */ |
3ed74e60 JS |
1002 | if (max_change < 2) |
1003 | return it; | |
1004 | return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1); | |
a2540023 JH |
1005 | } |
1006 | ||
c0c77734 | 1007 | static void show_name(FILE *file, |
a408e0e6 | 1008 | const char *prefix, const char *name, int len) |
a2540023 | 1009 | { |
a408e0e6 | 1010 | fprintf(file, " %s%-*s |", prefix, len, name); |
a2540023 JH |
1011 | } |
1012 | ||
c0c77734 | 1013 | static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset) |
a2540023 JH |
1014 | { |
1015 | if (cnt <= 0) | |
1016 | return; | |
c0c77734 | 1017 | fprintf(file, "%s", set); |
a2540023 | 1018 | while (cnt--) |
c0c77734 DB |
1019 | putc(ch, file); |
1020 | fprintf(file, "%s", reset); | |
a2540023 JH |
1021 | } |
1022 | ||
f604652e JH |
1023 | static void fill_print_name(struct diffstat_file *file) |
1024 | { | |
1025 | char *pname; | |
1026 | ||
1027 | if (file->print_name) | |
1028 | return; | |
1029 | ||
1030 | if (!file->is_renamed) { | |
f285a2d7 | 1031 | struct strbuf buf = STRBUF_INIT; |
f604652e JH |
1032 | if (quote_c_style(file->name, &buf, NULL, 0)) { |
1033 | pname = strbuf_detach(&buf, NULL); | |
1034 | } else { | |
1035 | pname = file->name; | |
1036 | strbuf_release(&buf); | |
1037 | } | |
1038 | } else { | |
1039 | pname = pprint_rename(file->from_name, file->name); | |
1040 | } | |
1041 | file->print_name = pname; | |
1042 | } | |
1043 | ||
4b25d091 | 1044 | static void show_stats(struct diffstat_t *data, struct diff_options *options) |
6973dcae | 1045 | { |
eb3a9dd3 | 1046 | int i, len, add, del, adds = 0, dels = 0; |
0974c117 | 1047 | uintmax_t max_change = 0, max_len = 0; |
6973dcae | 1048 | int total_files = data->nr; |
a2540023 | 1049 | int width, name_width; |
785f7432 | 1050 | const char *reset, *set, *add_c, *del_c; |
6973dcae JH |
1051 | |
1052 | if (data->nr == 0) | |
1053 | return; | |
1054 | ||
a2540023 JH |
1055 | width = options->stat_width ? options->stat_width : 80; |
1056 | name_width = options->stat_name_width ? options->stat_name_width : 50; | |
1057 | ||
1058 | /* Sanity: give at least 5 columns to the graph, | |
1059 | * but leave at least 10 columns for the name. | |
1060 | */ | |
861d1af3 OM |
1061 | if (width < 25) |
1062 | width = 25; | |
1063 | if (name_width < 10) | |
1064 | name_width = 10; | |
1065 | else if (width < name_width + 15) | |
1066 | name_width = width - 15; | |
a2540023 JH |
1067 | |
1068 | /* Find the longest filename and max number of changes */ | |
8f67f8ae PH |
1069 | reset = diff_get_color_opt(options, DIFF_RESET); |
1070 | set = diff_get_color_opt(options, DIFF_PLAIN); | |
1071 | add_c = diff_get_color_opt(options, DIFF_FILE_NEW); | |
1072 | del_c = diff_get_color_opt(options, DIFF_FILE_OLD); | |
785f7432 | 1073 | |
6973dcae JH |
1074 | for (i = 0; i < data->nr; i++) { |
1075 | struct diffstat_file *file = data->files[i]; | |
0974c117 | 1076 | uintmax_t change = file->added + file->deleted; |
f604652e JH |
1077 | fill_print_name(file); |
1078 | len = strlen(file->print_name); | |
6973dcae JH |
1079 | if (max_len < len) |
1080 | max_len = len; | |
1081 | ||
1082 | if (file->is_binary || file->is_unmerged) | |
1083 | continue; | |
a2540023 JH |
1084 | if (max_change < change) |
1085 | max_change = change; | |
6973dcae JH |
1086 | } |
1087 | ||
a2540023 JH |
1088 | /* Compute the width of the graph part; |
1089 | * 10 is for one blank at the beginning of the line plus | |
1090 | * " | count " between the name and the graph. | |
1091 | * | |
1092 | * From here on, name_width is the width of the name area, | |
1093 | * and width is the width of the graph area. | |
1094 | */ | |
1095 | name_width = (name_width < max_len) ? name_width : max_len; | |
1096 | if (width < (name_width + 10) + max_change) | |
1097 | width = width - (name_width + 10); | |
1098 | else | |
1099 | width = max_change; | |
1100 | ||
6973dcae | 1101 | for (i = 0; i < data->nr; i++) { |
d2543b8e | 1102 | const char *prefix = ""; |
f604652e | 1103 | char *name = data->files[i]->print_name; |
0974c117 JK |
1104 | uintmax_t added = data->files[i]->added; |
1105 | uintmax_t deleted = data->files[i]->deleted; | |
a2540023 | 1106 | int name_len; |
6973dcae JH |
1107 | |
1108 | /* | |
1109 | * "scale" the filename | |
1110 | */ | |
a2540023 JH |
1111 | len = name_width; |
1112 | name_len = strlen(name); | |
1113 | if (name_width < name_len) { | |
6973dcae JH |
1114 | char *slash; |
1115 | prefix = "..."; | |
a2540023 JH |
1116 | len -= 3; |
1117 | name += name_len - len; | |
6973dcae JH |
1118 | slash = strchr(name, '/'); |
1119 | if (slash) | |
1120 | name = slash; | |
1121 | } | |
6973dcae JH |
1122 | |
1123 | if (data->files[i]->is_binary) { | |
a408e0e6 | 1124 | show_name(options->file, prefix, name, len); |
c0c77734 | 1125 | fprintf(options->file, " Bin "); |
0974c117 JK |
1126 | fprintf(options->file, "%s%"PRIuMAX"%s", |
1127 | del_c, deleted, reset); | |
c0c77734 | 1128 | fprintf(options->file, " -> "); |
0974c117 JK |
1129 | fprintf(options->file, "%s%"PRIuMAX"%s", |
1130 | add_c, added, reset); | |
c0c77734 DB |
1131 | fprintf(options->file, " bytes"); |
1132 | fprintf(options->file, "\n"); | |
f604652e | 1133 | continue; |
6973dcae JH |
1134 | } |
1135 | else if (data->files[i]->is_unmerged) { | |
a408e0e6 | 1136 | show_name(options->file, prefix, name, len); |
c0c77734 | 1137 | fprintf(options->file, " Unmerged\n"); |
f604652e | 1138 | continue; |
6973dcae JH |
1139 | } |
1140 | else if (!data->files[i]->is_renamed && | |
1141 | (added + deleted == 0)) { | |
1142 | total_files--; | |
f604652e | 1143 | continue; |
6973dcae JH |
1144 | } |
1145 | ||
a2540023 JH |
1146 | /* |
1147 | * scale the add/delete | |
1148 | */ | |
6973dcae JH |
1149 | add = added; |
1150 | del = deleted; | |
6973dcae JH |
1151 | adds += add; |
1152 | dels += del; | |
1153 | ||
a2540023 | 1154 | if (width <= max_change) { |
a2540023 | 1155 | add = scale_linear(add, width, max_change); |
3ed74e60 | 1156 | del = scale_linear(del, width, max_change); |
6973dcae | 1157 | } |
a408e0e6 | 1158 | show_name(options->file, prefix, name, len); |
0974c117 | 1159 | fprintf(options->file, "%5"PRIuMAX"%s", added + deleted, |
4d9b5359 | 1160 | added + deleted ? " " : ""); |
c0c77734 DB |
1161 | show_graph(options->file, '+', add, add_c, reset); |
1162 | show_graph(options->file, '-', del, del_c, reset); | |
1163 | fprintf(options->file, "\n"); | |
1164 | } | |
1165 | fprintf(options->file, | |
a408e0e6 MH |
1166 | " %d files changed, %d insertions(+), %d deletions(-)\n", |
1167 | total_files, adds, dels); | |
6973dcae JH |
1168 | } |
1169 | ||
2775d92c | 1170 | static void show_shortstats(struct diffstat_t *data, struct diff_options *options) |
ebd124c6 NP |
1171 | { |
1172 | int i, adds = 0, dels = 0, total_files = data->nr; | |
1173 | ||
1174 | if (data->nr == 0) | |
1175 | return; | |
1176 | ||
1177 | for (i = 0; i < data->nr; i++) { | |
1178 | if (!data->files[i]->is_binary && | |
1179 | !data->files[i]->is_unmerged) { | |
1180 | int added = data->files[i]->added; | |
1181 | int deleted= data->files[i]->deleted; | |
1182 | if (!data->files[i]->is_renamed && | |
1183 | (added + deleted == 0)) { | |
1184 | total_files--; | |
1185 | } else { | |
1186 | adds += added; | |
1187 | dels += deleted; | |
1188 | } | |
1189 | } | |
ebd124c6 | 1190 | } |
c0c77734 | 1191 | fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n", |
ebd124c6 NP |
1192 | total_files, adds, dels); |
1193 | } | |
1194 | ||
4b25d091 | 1195 | static void show_numstat(struct diffstat_t *data, struct diff_options *options) |
74e2abe5 JH |
1196 | { |
1197 | int i; | |
1198 | ||
f604652e JH |
1199 | if (data->nr == 0) |
1200 | return; | |
1201 | ||
74e2abe5 JH |
1202 | for (i = 0; i < data->nr; i++) { |
1203 | struct diffstat_file *file = data->files[i]; | |
1204 | ||
bfddbc5e | 1205 | if (file->is_binary) |
c0c77734 | 1206 | fprintf(options->file, "-\t-\t"); |
bfddbc5e | 1207 | else |
c0c77734 | 1208 | fprintf(options->file, |
0974c117 JK |
1209 | "%"PRIuMAX"\t%"PRIuMAX"\t", |
1210 | file->added, file->deleted); | |
f604652e JH |
1211 | if (options->line_termination) { |
1212 | fill_print_name(file); | |
1213 | if (!file->is_renamed) | |
c0c77734 | 1214 | write_name_quoted(file->name, options->file, |
f604652e JH |
1215 | options->line_termination); |
1216 | else { | |
c0c77734 DB |
1217 | fputs(file->print_name, options->file); |
1218 | putc(options->line_termination, options->file); | |
f604652e | 1219 | } |
663af342 | 1220 | } else { |
f604652e | 1221 | if (file->is_renamed) { |
c0c77734 DB |
1222 | putc('\0', options->file); |
1223 | write_name_quoted(file->from_name, options->file, '\0'); | |
f604652e | 1224 | } |
c0c77734 | 1225 | write_name_quoted(file->name, options->file, '\0'); |
663af342 | 1226 | } |
74e2abe5 JH |
1227 | } |
1228 | } | |
1229 | ||
c04a7155 JH |
1230 | struct dirstat_file { |
1231 | const char *name; | |
1232 | unsigned long changed; | |
7df7c019 LT |
1233 | }; |
1234 | ||
c04a7155 JH |
1235 | struct dirstat_dir { |
1236 | struct dirstat_file *files; | |
1237 | int alloc, nr, percent, cumulative; | |
1238 | }; | |
1239 | ||
1240 | static long gather_dirstat(FILE *file, struct dirstat_dir *dir, unsigned long changed, const char *base, int baselen) | |
7df7c019 LT |
1241 | { |
1242 | unsigned long this_dir = 0; | |
1243 | unsigned int sources = 0; | |
1244 | ||
1245 | while (dir->nr) { | |
c04a7155 | 1246 | struct dirstat_file *f = dir->files; |
7df7c019 LT |
1247 | int namelen = strlen(f->name); |
1248 | unsigned long this; | |
1249 | char *slash; | |
1250 | ||
1251 | if (namelen < baselen) | |
1252 | break; | |
1253 | if (memcmp(f->name, base, baselen)) | |
1254 | break; | |
1255 | slash = strchr(f->name + baselen, '/'); | |
1256 | if (slash) { | |
1257 | int newbaselen = slash + 1 - f->name; | |
c0c77734 | 1258 | this = gather_dirstat(file, dir, changed, f->name, newbaselen); |
7df7c019 LT |
1259 | sources++; |
1260 | } else { | |
c04a7155 | 1261 | this = f->changed; |
7df7c019 LT |
1262 | dir->files++; |
1263 | dir->nr--; | |
1264 | sources += 2; | |
1265 | } | |
1266 | this_dir += this; | |
1267 | } | |
1268 | ||
1269 | /* | |
1270 | * We don't report dirstat's for | |
1271 | * - the top level | |
1272 | * - or cases where everything came from a single directory | |
1273 | * under this directory (sources == 1). | |
1274 | */ | |
1275 | if (baselen && sources != 1) { | |
1276 | int permille = this_dir * 1000 / changed; | |
1277 | if (permille) { | |
1278 | int percent = permille / 10; | |
1279 | if (percent >= dir->percent) { | |
c0c77734 | 1280 | fprintf(file, "%4d.%01d%% %.*s\n", percent, permille % 10, baselen, base); |
7df7c019 LT |
1281 | if (!dir->cumulative) |
1282 | return 0; | |
1283 | } | |
1284 | } | |
1285 | } | |
1286 | return this_dir; | |
1287 | } | |
1288 | ||
441bca0b LT |
1289 | static int dirstat_compare(const void *_a, const void *_b) |
1290 | { | |
1291 | const struct dirstat_file *a = _a; | |
1292 | const struct dirstat_file *b = _b; | |
1293 | return strcmp(a->name, b->name); | |
1294 | } | |
1295 | ||
c04a7155 | 1296 | static void show_dirstat(struct diff_options *options) |
7df7c019 LT |
1297 | { |
1298 | int i; | |
1299 | unsigned long changed; | |
c04a7155 JH |
1300 | struct dirstat_dir dir; |
1301 | struct diff_queue_struct *q = &diff_queued_diff; | |
1302 | ||
1303 | dir.files = NULL; | |
1304 | dir.alloc = 0; | |
1305 | dir.nr = 0; | |
1306 | dir.percent = options->dirstat_percent; | |
f88d225f | 1307 | dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE); |
7df7c019 | 1308 | |
7df7c019 | 1309 | changed = 0; |
c04a7155 JH |
1310 | for (i = 0; i < q->nr; i++) { |
1311 | struct diff_filepair *p = q->queue[i]; | |
1312 | const char *name; | |
1313 | unsigned long copied, added, damage; | |
1314 | ||
1315 | name = p->one->path ? p->one->path : p->two->path; | |
1316 | ||
1317 | if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { | |
1318 | diff_populate_filespec(p->one, 0); | |
1319 | diff_populate_filespec(p->two, 0); | |
1320 | diffcore_count_changes(p->one, p->two, NULL, NULL, 0, | |
1321 | &copied, &added); | |
1322 | diff_free_filespec_data(p->one); | |
1323 | diff_free_filespec_data(p->two); | |
1324 | } else if (DIFF_FILE_VALID(p->one)) { | |
1325 | diff_populate_filespec(p->one, 1); | |
1326 | copied = added = 0; | |
1327 | diff_free_filespec_data(p->one); | |
1328 | } else if (DIFF_FILE_VALID(p->two)) { | |
1329 | diff_populate_filespec(p->two, 1); | |
1330 | copied = 0; | |
1331 | added = p->two->size; | |
1332 | diff_free_filespec_data(p->two); | |
1333 | } else | |
2b0b551d | 1334 | continue; |
c04a7155 JH |
1335 | |
1336 | /* | |
1337 | * Original minus copied is the removed material, | |
1338 | * added is the new material. They are both damages | |
fd33777b HO |
1339 | * made to the preimage. In --dirstat-by-file mode, count |
1340 | * damaged files, not damaged lines. This is done by | |
1341 | * counting only a single damaged line per file. | |
c04a7155 JH |
1342 | */ |
1343 | damage = (p->one->size - copied) + added; | |
fd33777b HO |
1344 | if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE) && damage > 0) |
1345 | damage = 1; | |
c04a7155 JH |
1346 | |
1347 | ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc); | |
1348 | dir.files[dir.nr].name = name; | |
1349 | dir.files[dir.nr].changed = damage; | |
1350 | changed += damage; | |
1351 | dir.nr++; | |
7df7c019 LT |
1352 | } |
1353 | ||
1354 | /* This can happen even with many files, if everything was renames */ | |
1355 | if (!changed) | |
1356 | return; | |
1357 | ||
1358 | /* Show all directories with more than x% of the changes */ | |
441bca0b | 1359 | qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare); |
c0c77734 | 1360 | gather_dirstat(options->file, &dir, changed, "", 0); |
7df7c019 LT |
1361 | } |
1362 | ||
f604652e JH |
1363 | static void free_diffstat_info(struct diffstat_t *diffstat) |
1364 | { | |
1365 | int i; | |
1366 | for (i = 0; i < diffstat->nr; i++) { | |
1367 | struct diffstat_file *f = diffstat->files[i]; | |
1368 | if (f->name != f->print_name) | |
1369 | free(f->print_name); | |
1370 | free(f->name); | |
1371 | free(f->from_name); | |
1372 | free(f); | |
1373 | } | |
1374 | free(diffstat->files); | |
1375 | } | |
1376 | ||
88246898 | 1377 | struct checkdiff_t { |
88246898 | 1378 | const char *filename; |
1ba111d1 | 1379 | int lineno; |
a757c646 | 1380 | int conflict_marker_size; |
1ba111d1 | 1381 | struct diff_options *o; |
cf1b7869 | 1382 | unsigned ws_rule; |
62c64895 | 1383 | unsigned status; |
88246898 JS |
1384 | }; |
1385 | ||
a757c646 | 1386 | static int is_conflict_marker(const char *line, int marker_size, unsigned long len) |
04954043 JH |
1387 | { |
1388 | char firstchar; | |
1389 | int cnt; | |
1390 | ||
a757c646 | 1391 | if (len < marker_size + 1) |
04954043 JH |
1392 | return 0; |
1393 | firstchar = line[0]; | |
1394 | switch (firstchar) { | |
a757c646 | 1395 | case '=': case '>': case '<': case '|': |
04954043 JH |
1396 | break; |
1397 | default: | |
1398 | return 0; | |
1399 | } | |
a757c646 | 1400 | for (cnt = 1; cnt < marker_size; cnt++) |
04954043 JH |
1401 | if (line[cnt] != firstchar) |
1402 | return 0; | |
a757c646 JH |
1403 | /* line[1] thru line[marker_size-1] are same as firstchar */ |
1404 | if (len < marker_size + 1 || !isspace(line[marker_size])) | |
04954043 | 1405 | return 0; |
04954043 JH |
1406 | return 1; |
1407 | } | |
1408 | ||
88246898 JS |
1409 | static void checkdiff_consume(void *priv, char *line, unsigned long len) |
1410 | { | |
1411 | struct checkdiff_t *data = priv; | |
1ba111d1 | 1412 | int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF); |
a757c646 | 1413 | int marker_size = data->conflict_marker_size; |
1ba111d1 JH |
1414 | const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE); |
1415 | const char *reset = diff_get_color(color_diff, DIFF_RESET); | |
1416 | const char *set = diff_get_color(color_diff, DIFF_FILE_NEW); | |
c1795bb0 | 1417 | char *err; |
88246898 JS |
1418 | |
1419 | if (line[0] == '+') { | |
18374e58 | 1420 | unsigned bad; |
0ef617f4 | 1421 | data->lineno++; |
a757c646 | 1422 | if (is_conflict_marker(line + 1, marker_size, len - 1)) { |
04954043 JH |
1423 | data->status |= 1; |
1424 | fprintf(data->o->file, | |
1425 | "%s:%d: leftover conflict marker\n", | |
1426 | data->filename, data->lineno); | |
1427 | } | |
8f8841e9 | 1428 | bad = ws_check(line + 1, len - 1, data->ws_rule); |
18374e58 | 1429 | if (!bad) |
c1795bb0 | 1430 | return; |
18374e58 JH |
1431 | data->status |= bad; |
1432 | err = whitespace_error_string(bad); | |
1ba111d1 JH |
1433 | fprintf(data->o->file, "%s:%d: %s.\n", |
1434 | data->filename, data->lineno, err); | |
c1795bb0 | 1435 | free(err); |
1ba111d1 | 1436 | emit_line(data->o->file, set, reset, line, 1); |
8f8841e9 | 1437 | ws_check_emit(line + 1, len - 1, data->ws_rule, |
1ba111d1 | 1438 | data->o->file, set, reset, ws); |
877f23cc | 1439 | } else if (line[0] == ' ') { |
88246898 | 1440 | data->lineno++; |
877f23cc | 1441 | } else if (line[0] == '@') { |
88246898 JS |
1442 | char *plus = strchr(line, '+'); |
1443 | if (plus) | |
0ef617f4 | 1444 | data->lineno = strtol(plus, NULL, 10) - 1; |
88246898 JS |
1445 | else |
1446 | die("invalid diff"); | |
1447 | } | |
1448 | } | |
1449 | ||
0660626c JH |
1450 | static unsigned char *deflate_it(char *data, |
1451 | unsigned long size, | |
1452 | unsigned long *result_size) | |
051308f6 | 1453 | { |
0660626c JH |
1454 | int bound; |
1455 | unsigned char *deflated; | |
1456 | z_stream stream; | |
1457 | ||
1458 | memset(&stream, 0, sizeof(stream)); | |
12f6c308 | 1459 | deflateInit(&stream, zlib_compression_level); |
0660626c JH |
1460 | bound = deflateBound(&stream, size); |
1461 | deflated = xmalloc(bound); | |
1462 | stream.next_out = deflated; | |
1463 | stream.avail_out = bound; | |
1464 | ||
1465 | stream.next_in = (unsigned char *)data; | |
1466 | stream.avail_in = size; | |
1467 | while (deflate(&stream, Z_FINISH) == Z_OK) | |
1468 | ; /* nothing */ | |
1469 | deflateEnd(&stream); | |
1470 | *result_size = stream.total_out; | |
1471 | return deflated; | |
051308f6 JH |
1472 | } |
1473 | ||
c0c77734 | 1474 | static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two) |
051308f6 | 1475 | { |
0660626c JH |
1476 | void *cp; |
1477 | void *delta; | |
1478 | void *deflated; | |
1479 | void *data; | |
1480 | unsigned long orig_size; | |
1481 | unsigned long delta_size; | |
1482 | unsigned long deflate_size; | |
1483 | unsigned long data_size; | |
051308f6 | 1484 | |
0660626c JH |
1485 | /* We could do deflated delta, or we could do just deflated two, |
1486 | * whichever is smaller. | |
051308f6 | 1487 | */ |
0660626c JH |
1488 | delta = NULL; |
1489 | deflated = deflate_it(two->ptr, two->size, &deflate_size); | |
1490 | if (one->size && two->size) { | |
1491 | delta = diff_delta(one->ptr, one->size, | |
1492 | two->ptr, two->size, | |
1493 | &delta_size, deflate_size); | |
1494 | if (delta) { | |
1495 | void *to_free = delta; | |
1496 | orig_size = delta_size; | |
1497 | delta = deflate_it(delta, delta_size, &delta_size); | |
1498 | free(to_free); | |
051308f6 JH |
1499 | } |
1500 | } | |
051308f6 | 1501 | |
0660626c | 1502 | if (delta && delta_size < deflate_size) { |
c0c77734 | 1503 | fprintf(file, "delta %lu\n", orig_size); |
0660626c JH |
1504 | free(deflated); |
1505 | data = delta; | |
1506 | data_size = delta_size; | |
1507 | } | |
1508 | else { | |
c0c77734 | 1509 | fprintf(file, "literal %lu\n", two->size); |
0660626c JH |
1510 | free(delta); |
1511 | data = deflated; | |
1512 | data_size = deflate_size; | |
1513 | } | |
051308f6 | 1514 | |
0660626c JH |
1515 | /* emit data encoded in base85 */ |
1516 | cp = data; | |
1517 | while (data_size) { | |
1518 | int bytes = (52 < data_size) ? 52 : data_size; | |
051308f6 | 1519 | char line[70]; |
0660626c | 1520 | data_size -= bytes; |
051308f6 JH |
1521 | if (bytes <= 26) |
1522 | line[0] = bytes + 'A' - 1; | |
1523 | else | |
1524 | line[0] = bytes - 26 + 'a' - 1; | |
1525 | encode_85(line + 1, cp, bytes); | |
1d7f171c | 1526 | cp = (char *) cp + bytes; |
c0c77734 DB |
1527 | fputs(line, file); |
1528 | fputc('\n', file); | |
051308f6 | 1529 | } |
c0c77734 | 1530 | fprintf(file, "\n"); |
0660626c | 1531 | free(data); |
051308f6 JH |
1532 | } |
1533 | ||
c0c77734 | 1534 | static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two) |
d4c452f0 | 1535 | { |
c0c77734 DB |
1536 | fprintf(file, "GIT binary patch\n"); |
1537 | emit_binary_diff_body(file, one, two); | |
1538 | emit_binary_diff_body(file, two, one); | |
d4c452f0 JH |
1539 | } |
1540 | ||
72cf4841 | 1541 | static void diff_filespec_load_driver(struct diff_filespec *one) |
6973dcae | 1542 | { |
122aa6f9 JK |
1543 | if (!one->driver) |
1544 | one->driver = userdiff_find_by_path(one->path); | |
1545 | if (!one->driver) | |
1546 | one->driver = userdiff_find_by_name("default"); | |
29a3eefd JH |
1547 | } |
1548 | ||
1549 | int diff_filespec_is_binary(struct diff_filespec *one) | |
1550 | { | |
122aa6f9 JK |
1551 | if (one->is_binary == -1) { |
1552 | diff_filespec_load_driver(one); | |
1553 | if (one->driver->binary != -1) | |
1554 | one->is_binary = one->driver->binary; | |
1555 | else { | |
1556 | if (!one->data && DIFF_FILE_VALID(one)) | |
1557 | diff_populate_filespec(one, 0); | |
1558 | if (one->data) | |
1559 | one->is_binary = buffer_is_binary(one->data, | |
1560 | one->size); | |
1561 | if (one->is_binary == -1) | |
1562 | one->is_binary = 0; | |
1563 | } | |
1564 | } | |
29a3eefd | 1565 | return one->is_binary; |
6973dcae JH |
1566 | } |
1567 | ||
be58e70d | 1568 | static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one) |
f258475a | 1569 | { |
122aa6f9 JK |
1570 | diff_filespec_load_driver(one); |
1571 | return one->driver->funcname.pattern ? &one->driver->funcname : NULL; | |
f258475a JH |
1572 | } |
1573 | ||
80c49c3d TR |
1574 | static const char *userdiff_word_regex(struct diff_filespec *one) |
1575 | { | |
1576 | diff_filespec_load_driver(one); | |
1577 | return one->driver->word_regex; | |
1578 | } | |
1579 | ||
a5a818ee JH |
1580 | void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b) |
1581 | { | |
1582 | if (!options->a_prefix) | |
1583 | options->a_prefix = a; | |
1584 | if (!options->b_prefix) | |
1585 | options->b_prefix = b; | |
1586 | } | |
1587 | ||
04427ac8 JK |
1588 | static const char *get_textconv(struct diff_filespec *one) |
1589 | { | |
1590 | if (!DIFF_FILE_VALID(one)) | |
1591 | return NULL; | |
2675773a JK |
1592 | if (!S_ISREG(one->mode)) |
1593 | return NULL; | |
04427ac8 JK |
1594 | diff_filespec_load_driver(one); |
1595 | return one->driver->textconv; | |
1596 | } | |
1597 | ||
6973dcae JH |
1598 | static void builtin_diff(const char *name_a, |
1599 | const char *name_b, | |
1600 | struct diff_filespec *one, | |
1601 | struct diff_filespec *two, | |
1602 | const char *xfrm_msg, | |
051308f6 | 1603 | struct diff_options *o, |
6973dcae JH |
1604 | int complete_rewrite) |
1605 | { | |
1606 | mmfile_t mf1, mf2; | |
1607 | const char *lbl[2]; | |
1608 | char *a_one, *b_two; | |
8f67f8ae PH |
1609 | const char *set = diff_get_color_opt(o, DIFF_METAINFO); |
1610 | const char *reset = diff_get_color_opt(o, DIFF_RESET); | |
a5a818ee | 1611 | const char *a_prefix, *b_prefix; |
c7534ef4 | 1612 | const char *textconv_one = NULL, *textconv_two = NULL; |
3e97c7c6 | 1613 | struct strbuf header = STRBUF_INIT; |
a5a818ee | 1614 | |
752c0c24 JS |
1615 | if (DIFF_OPT_TST(o, SUBMODULE_LOG) && |
1616 | (!one->mode || S_ISGITLINK(one->mode)) && | |
1617 | (!two->mode || S_ISGITLINK(two->mode))) { | |
1618 | const char *del = diff_get_color_opt(o, DIFF_FILE_OLD); | |
1619 | const char *add = diff_get_color_opt(o, DIFF_FILE_NEW); | |
1620 | show_submodule_summary(o->file, one ? one->path : two->path, | |
721ceec1 | 1621 | one->sha1, two->sha1, two->dirty_submodule, |
752c0c24 JS |
1622 | del, add, reset); |
1623 | return; | |
1624 | } | |
1625 | ||
3aa1f7ca JK |
1626 | if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) { |
1627 | textconv_one = get_textconv(one); | |
1628 | textconv_two = get_textconv(two); | |
1629 | } | |
1630 | ||
a5a818ee JH |
1631 | diff_set_mnemonic_prefix(o, "a/", "b/"); |
1632 | if (DIFF_OPT_TST(o, REVERSE_DIFF)) { | |
1633 | a_prefix = o->b_prefix; | |
1634 | b_prefix = o->a_prefix; | |
1635 | } else { | |
1636 | a_prefix = o->a_prefix; | |
1637 | b_prefix = o->b_prefix; | |
1638 | } | |
6973dcae | 1639 | |
71b989e7 LT |
1640 | /* Never use a non-valid filename anywhere if at all possible */ |
1641 | name_a = DIFF_FILE_VALID(one) ? name_a : name_b; | |
1642 | name_b = DIFF_FILE_VALID(two) ? name_b : name_a; | |
1643 | ||
a5a818ee JH |
1644 | a_one = quote_two(a_prefix, name_a + (*name_a == '/')); |
1645 | b_two = quote_two(b_prefix, name_b + (*name_b == '/')); | |
6973dcae JH |
1646 | lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null"; |
1647 | lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null"; | |
3e97c7c6 | 1648 | strbuf_addf(&header, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset); |
6973dcae JH |
1649 | if (lbl[0][0] == '/') { |
1650 | /* /dev/null */ | |
3e97c7c6 | 1651 | strbuf_addf(&header, "%snew file mode %06o%s\n", set, two->mode, reset); |
50f575fc | 1652 | if (xfrm_msg && xfrm_msg[0]) |
3e97c7c6 | 1653 | strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset); |
6973dcae JH |
1654 | } |
1655 | else if (lbl[1][0] == '/') { | |
3e97c7c6 | 1656 | strbuf_addf(&header, "%sdeleted file mode %06o%s\n", set, one->mode, reset); |
50f575fc | 1657 | if (xfrm_msg && xfrm_msg[0]) |
3e97c7c6 | 1658 | strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset); |
6973dcae JH |
1659 | } |
1660 | else { | |
1661 | if (one->mode != two->mode) { | |
3e97c7c6 GB |
1662 | strbuf_addf(&header, "%sold mode %06o%s\n", set, one->mode, reset); |
1663 | strbuf_addf(&header, "%snew mode %06o%s\n", set, two->mode, reset); | |
cd112cef | 1664 | } |
50f575fc | 1665 | if (xfrm_msg && xfrm_msg[0]) |
3e97c7c6 GB |
1666 | strbuf_addf(&header, "%s%s%s\n", set, xfrm_msg, reset); |
1667 | ||
6973dcae JH |
1668 | /* |
1669 | * we do not run diff between different kind | |
1670 | * of objects. | |
1671 | */ | |
1672 | if ((one->mode ^ two->mode) & S_IFMT) | |
1673 | goto free_ab_and_return; | |
0c01857d | 1674 | if (complete_rewrite && |
3aa1f7ca JK |
1675 | (textconv_one || !diff_filespec_is_binary(one)) && |
1676 | (textconv_two || !diff_filespec_is_binary(two))) { | |
3e97c7c6 GB |
1677 | fprintf(o->file, "%s", header.buf); |
1678 | strbuf_reset(&header); | |
3aa1f7ca JK |
1679 | emit_rewrite_diff(name_a, name_b, one, two, |
1680 | textconv_one, textconv_two, o); | |
34a5e1a2 | 1681 | o->found_changes = 1; |
6973dcae JH |
1682 | goto free_ab_and_return; |
1683 | } | |
1684 | } | |
1685 | ||
1686 | if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) | |
1687 | die("unable to read files to diff"); | |
1688 | ||
8f67f8ae | 1689 | if (!DIFF_OPT_TST(o, TEXT) && |
04427ac8 JK |
1690 | ( (diff_filespec_is_binary(one) && !textconv_one) || |
1691 | (diff_filespec_is_binary(two) && !textconv_two) )) { | |
0660626c JH |
1692 | /* Quite common confusing case */ |
1693 | if (mf1.size == mf2.size && | |
1694 | !memcmp(mf1.ptr, mf2.ptr, mf1.size)) | |
1695 | goto free_ab_and_return; | |
3e97c7c6 GB |
1696 | fprintf(o->file, "%s", header.buf); |
1697 | strbuf_reset(&header); | |
8f67f8ae | 1698 | if (DIFF_OPT_TST(o, BINARY)) |
c0c77734 | 1699 | emit_binary_diff(o->file, &mf1, &mf2); |
051308f6 | 1700 | else |
c0c77734 DB |
1701 | fprintf(o->file, "Binary files %s and %s differ\n", |
1702 | lbl[0], lbl[1]); | |
34a5e1a2 | 1703 | o->found_changes = 1; |
051308f6 | 1704 | } |
6973dcae JH |
1705 | else { |
1706 | /* Crazy xdl interfaces.. */ | |
1707 | const char *diffopts = getenv("GIT_DIFF_OPTS"); | |
1708 | xpparam_t xpp; | |
1709 | xdemitconf_t xecfg; | |
6973dcae | 1710 | struct emit_callback ecbdata; |
be58e70d | 1711 | const struct userdiff_funcname *pe; |
f258475a | 1712 | |
3e97c7c6 GB |
1713 | if (!DIFF_XDL_TST(o, WHITESPACE_FLAGS)) { |
1714 | fprintf(o->file, "%s", header.buf); | |
1715 | strbuf_reset(&header); | |
1716 | } | |
1717 | ||
04427ac8 JK |
1718 | if (textconv_one) { |
1719 | size_t size; | |
1720 | mf1.ptr = run_textconv(textconv_one, one, &size); | |
1721 | if (!mf1.ptr) | |
1722 | die("unable to read files to diff"); | |
1723 | mf1.size = size; | |
1724 | } | |
1725 | if (textconv_two) { | |
1726 | size_t size; | |
1727 | mf2.ptr = run_textconv(textconv_two, two, &size); | |
1728 | if (!mf2.ptr) | |
1729 | die("unable to read files to diff"); | |
1730 | mf2.size = size; | |
1731 | } | |
1732 | ||
45e7ca0f BC |
1733 | pe = diff_funcname_pattern(one); |
1734 | if (!pe) | |
1735 | pe = diff_funcname_pattern(two); | |
6973dcae | 1736 | |
9ccd0a88 | 1737 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 1738 | memset(&xecfg, 0, sizeof(xecfg)); |
cd112cef | 1739 | memset(&ecbdata, 0, sizeof(ecbdata)); |
6973dcae | 1740 | ecbdata.label_path = lbl; |
8f67f8ae | 1741 | ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF); |
34a5e1a2 | 1742 | ecbdata.found_changesp = &o->found_changes; |
cf1b7869 | 1743 | ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a); |
690ed843 | 1744 | if (ecbdata.ws_rule & WS_BLANK_AT_EOF) |
d68fe26f | 1745 | check_blank_at_eof(&mf1, &mf2, &ecbdata); |
c0c77734 | 1746 | ecbdata.file = o->file; |
3e97c7c6 | 1747 | ecbdata.header = header.len ? &header : NULL; |
0d21efa5 | 1748 | xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts; |
ee1e5412 | 1749 | xecfg.ctxlen = o->context; |
6d0e674a | 1750 | xecfg.interhunkctxlen = o->interhunkcontext; |
6973dcae | 1751 | xecfg.flags = XDL_EMIT_FUNCNAMES; |
45e7ca0f | 1752 | if (pe) |
a013585b | 1753 | xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags); |
6973dcae JH |
1754 | if (!diffopts) |
1755 | ; | |
cc44c765 | 1756 | else if (!prefixcmp(diffopts, "--unified=")) |
6973dcae | 1757 | xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10); |
cc44c765 | 1758 | else if (!prefixcmp(diffopts, "-u")) |
6973dcae | 1759 | xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10); |
c0c77734 | 1760 | if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) { |
f59a59e2 JS |
1761 | ecbdata.diff_words = |
1762 | xcalloc(1, sizeof(struct diff_words_data)); | |
c0c77734 | 1763 | ecbdata.diff_words->file = o->file; |
80c49c3d TR |
1764 | if (!o->word_regex) |
1765 | o->word_regex = userdiff_word_regex(one); | |
1766 | if (!o->word_regex) | |
1767 | o->word_regex = userdiff_word_regex(two); | |
98a4d87b BSSJ |
1768 | if (!o->word_regex) |
1769 | o->word_regex = diff_word_regex_cfg; | |
2b6a5417 JS |
1770 | if (o->word_regex) { |
1771 | ecbdata.diff_words->word_regex = (regex_t *) | |
1772 | xmalloc(sizeof(regex_t)); | |
1773 | if (regcomp(ecbdata.diff_words->word_regex, | |
bf82940d TR |
1774 | o->word_regex, |
1775 | REG_EXTENDED | REG_NEWLINE)) | |
2b6a5417 JS |
1776 | die ("Invalid regular expression: %s", |
1777 | o->word_regex); | |
1778 | } | |
c0c77734 | 1779 | } |
8a3f524b | 1780 | xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata, |
dfea7900 | 1781 | &xpp, &xecfg); |
8f67f8ae | 1782 | if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) |
f59a59e2 | 1783 | free_diff_words_data(&ecbdata); |
04427ac8 JK |
1784 | if (textconv_one) |
1785 | free(mf1.ptr); | |
1786 | if (textconv_two) | |
1787 | free(mf2.ptr); | |
8cfe5f1c | 1788 | xdiff_clear_find_func(&xecfg); |
6973dcae JH |
1789 | } |
1790 | ||
1791 | free_ab_and_return: | |
3e97c7c6 | 1792 | strbuf_release(&header); |
fc3abdf5 JH |
1793 | diff_free_filespec_data(one); |
1794 | diff_free_filespec_data(two); | |
6973dcae JH |
1795 | free(a_one); |
1796 | free(b_two); | |
1797 | return; | |
1798 | } | |
1799 | ||
1800 | static void builtin_diffstat(const char *name_a, const char *name_b, | |
1801 | struct diff_filespec *one, | |
1802 | struct diff_filespec *two, | |
710158e3 | 1803 | struct diffstat_t *diffstat, |
0d21efa5 | 1804 | struct diff_options *o, |
710158e3 | 1805 | int complete_rewrite) |
6973dcae JH |
1806 | { |
1807 | mmfile_t mf1, mf2; | |
1808 | struct diffstat_file *data; | |
1809 | ||
1810 | data = diffstat_add(diffstat, name_a, name_b); | |
1811 | ||
1812 | if (!one || !two) { | |
1813 | data->is_unmerged = 1; | |
1814 | return; | |
1815 | } | |
710158e3 JH |
1816 | if (complete_rewrite) { |
1817 | diff_populate_filespec(one, 0); | |
1818 | diff_populate_filespec(two, 0); | |
1819 | data->deleted = count_lines(one->data, one->size); | |
1820 | data->added = count_lines(two->data, two->size); | |
fc3abdf5 | 1821 | goto free_and_return; |
710158e3 | 1822 | } |
6973dcae JH |
1823 | if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) |
1824 | die("unable to read files to diff"); | |
1825 | ||
29a3eefd | 1826 | if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) { |
6973dcae | 1827 | data->is_binary = 1; |
b1882587 AP |
1828 | data->added = mf2.size; |
1829 | data->deleted = mf1.size; | |
1830 | } else { | |
6973dcae JH |
1831 | /* Crazy xdl interfaces.. */ |
1832 | xpparam_t xpp; | |
1833 | xdemitconf_t xecfg; | |
6973dcae | 1834 | |
9ccd0a88 | 1835 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 1836 | memset(&xecfg, 0, sizeof(xecfg)); |
0d21efa5 | 1837 | xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts; |
8a3f524b | 1838 | xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat, |
dfea7900 | 1839 | &xpp, &xecfg); |
6973dcae | 1840 | } |
fc3abdf5 JH |
1841 | |
1842 | free_and_return: | |
1843 | diff_free_filespec_data(one); | |
1844 | diff_free_filespec_data(two); | |
6973dcae JH |
1845 | } |
1846 | ||
88246898 | 1847 | static void builtin_checkdiff(const char *name_a, const char *name_b, |
cd676a51 | 1848 | const char *attr_path, |
5ff10dd6 JH |
1849 | struct diff_filespec *one, |
1850 | struct diff_filespec *two, | |
1851 | struct diff_options *o) | |
88246898 JS |
1852 | { |
1853 | mmfile_t mf1, mf2; | |
1854 | struct checkdiff_t data; | |
1855 | ||
1856 | if (!two) | |
1857 | return; | |
1858 | ||
1859 | memset(&data, 0, sizeof(data)); | |
88246898 JS |
1860 | data.filename = name_b ? name_b : name_a; |
1861 | data.lineno = 0; | |
1ba111d1 | 1862 | data.o = o; |
cd676a51 | 1863 | data.ws_rule = whitespace_rule(attr_path); |
a757c646 | 1864 | data.conflict_marker_size = ll_merge_marker_size(attr_path); |
88246898 JS |
1865 | |
1866 | if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0) | |
1867 | die("unable to read files to diff"); | |
1868 | ||
5ff10dd6 JH |
1869 | /* |
1870 | * All the other codepaths check both sides, but not checking | |
1871 | * the "old" side here is deliberate. We are checking the newly | |
1872 | * introduced changes, and as long as the "new" side is text, we | |
1873 | * can and should check what it introduces. | |
1874 | */ | |
29a3eefd | 1875 | if (diff_filespec_is_binary(two)) |
fc3abdf5 | 1876 | goto free_and_return; |
88246898 JS |
1877 | else { |
1878 | /* Crazy xdl interfaces.. */ | |
1879 | xpparam_t xpp; | |
1880 | xdemitconf_t xecfg; | |
88246898 | 1881 | |
9ccd0a88 | 1882 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 1883 | memset(&xecfg, 0, sizeof(xecfg)); |
c35539eb | 1884 | xecfg.ctxlen = 1; /* at least one context line */ |
88246898 | 1885 | xpp.flags = XDF_NEED_MINIMAL; |
8a3f524b | 1886 | xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data, |
dfea7900 | 1887 | &xpp, &xecfg); |
877f23cc | 1888 | |
467babf8 | 1889 | if (data.ws_rule & WS_BLANK_AT_EOF) { |
d68fe26f JH |
1890 | struct emit_callback ecbdata; |
1891 | int blank_at_eof; | |
1892 | ||
1893 | ecbdata.ws_rule = data.ws_rule; | |
1894 | check_blank_at_eof(&mf1, &mf2, &ecbdata); | |
1895 | blank_at_eof = ecbdata.blank_at_eof_in_preimage; | |
1896 | ||
467babf8 JH |
1897 | if (blank_at_eof) { |
1898 | static char *err; | |
1899 | if (!err) | |
1900 | err = whitespace_error_string(WS_BLANK_AT_EOF); | |
1901 | fprintf(o->file, "%s:%d: %s.\n", | |
1902 | data.filename, blank_at_eof, err); | |
1903 | data.status = 1; /* report errors */ | |
1904 | } | |
877f23cc | 1905 | } |
88246898 | 1906 | } |
fc3abdf5 JH |
1907 | free_and_return: |
1908 | diff_free_filespec_data(one); | |
1909 | diff_free_filespec_data(two); | |
62c64895 WC |
1910 | if (data.status) |
1911 | DIFF_OPT_SET(o, CHECK_FAILED); | |
88246898 JS |
1912 | } |
1913 | ||
6973dcae JH |
1914 | struct diff_filespec *alloc_filespec(const char *path) |
1915 | { | |
1916 | int namelen = strlen(path); | |
1917 | struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1); | |
1918 | ||
1919 | memset(spec, 0, sizeof(*spec)); | |
1920 | spec->path = (char *)(spec + 1); | |
1921 | memcpy(spec->path, path, namelen+1); | |
9fb88419 | 1922 | spec->count = 1; |
122aa6f9 | 1923 | spec->is_binary = -1; |
6973dcae JH |
1924 | return spec; |
1925 | } | |
1926 | ||
9fb88419 LT |
1927 | void free_filespec(struct diff_filespec *spec) |
1928 | { | |
1929 | if (!--spec->count) { | |
1930 | diff_free_filespec_data(spec); | |
1931 | free(spec); | |
1932 | } | |
1933 | } | |
1934 | ||
6973dcae JH |
1935 | void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1, |
1936 | unsigned short mode) | |
1937 | { | |
1938 | if (mode) { | |
1939 | spec->mode = canon_mode(mode); | |
e702496e | 1940 | hashcpy(spec->sha1, sha1); |
0bef57ee | 1941 | spec->sha1_valid = !is_null_sha1(sha1); |
6973dcae JH |
1942 | } |
1943 | } | |
1944 | ||
1945 | /* | |
5adf317b | 1946 | * Given a name and sha1 pair, if the index tells us the file in |
6973dcae JH |
1947 | * the work tree has that object contents, return true, so that |
1948 | * prepare_temp_file() does not have to inflate and extract. | |
1949 | */ | |
1510fea7 | 1950 | static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file) |
6973dcae JH |
1951 | { |
1952 | struct cache_entry *ce; | |
1953 | struct stat st; | |
1954 | int pos, len; | |
1955 | ||
150115ad JH |
1956 | /* |
1957 | * We do not read the cache ourselves here, because the | |
6973dcae JH |
1958 | * benchmark with my previous version that always reads cache |
1959 | * shows that it makes things worse for diff-tree comparing | |
1960 | * two linux-2.6 kernel trees in an already checked out work | |
1961 | * tree. This is because most diff-tree comparisons deal with | |
1962 | * only a small number of files, while reading the cache is | |
1963 | * expensive for a large project, and its cost outweighs the | |
1964 | * savings we get by not inflating the object to a temporary | |
1965 | * file. Practically, this code only helps when we are used | |
1966 | * by diff-cache --cached, which does read the cache before | |
1967 | * calling us. | |
1968 | */ | |
1969 | if (!active_cache) | |
1970 | return 0; | |
1971 | ||
1510fea7 SP |
1972 | /* We want to avoid the working directory if our caller |
1973 | * doesn't need the data in a normal file, this system | |
1974 | * is rather slow with its stat/open/mmap/close syscalls, | |
1975 | * and the object is contained in a pack file. The pack | |
1976 | * is probably already open and will be faster to obtain | |
1977 | * the data through than the working directory. Loose | |
1978 | * objects however would tend to be slower as they need | |
1979 | * to be individually opened and inflated. | |
1980 | */ | |
cd673c1f | 1981 | if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1)) |
1510fea7 SP |
1982 | return 0; |
1983 | ||
6973dcae JH |
1984 | len = strlen(name); |
1985 | pos = cache_name_pos(name, len); | |
1986 | if (pos < 0) | |
1987 | return 0; | |
1988 | ce = active_cache[pos]; | |
eadb5831 JH |
1989 | |
1990 | /* | |
1991 | * This is not the sha1 we are looking for, or | |
1992 | * unreusable because it is not a regular file. | |
1993 | */ | |
1994 | if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode)) | |
6973dcae | 1995 | return 0; |
eadb5831 | 1996 | |
150115ad JH |
1997 | /* |
1998 | * If ce is marked as "assume unchanged", there is no | |
1999 | * guarantee that work tree matches what we are looking for. | |
2000 | */ | |
b4d1690d | 2001 | if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) |
150115ad JH |
2002 | return 0; |
2003 | ||
eadb5831 JH |
2004 | /* |
2005 | * If ce matches the file in the work tree, we can reuse it. | |
6973dcae | 2006 | */ |
eadb5831 JH |
2007 | if (ce_uptodate(ce) || |
2008 | (!lstat(name, &st) && !ce_match_stat(ce, &st, 0))) | |
2009 | return 1; | |
2010 | ||
2011 | return 0; | |
6973dcae JH |
2012 | } |
2013 | ||
3afaa72d JH |
2014 | static int populate_from_stdin(struct diff_filespec *s) |
2015 | { | |
f285a2d7 | 2016 | struct strbuf buf = STRBUF_INIT; |
c32f749f | 2017 | size_t size = 0; |
af6eb822 | 2018 | |
f1696ee3 | 2019 | if (strbuf_read(&buf, 0, 0) < 0) |
af6eb822 | 2020 | return error("error while reading from stdin %s", |
3afaa72d | 2021 | strerror(errno)); |
af6eb822 | 2022 | |
3afaa72d | 2023 | s->should_munmap = 0; |
c32f749f RS |
2024 | s->data = strbuf_detach(&buf, &size); |
2025 | s->size = size; | |
3afaa72d JH |
2026 | s->should_free = 1; |
2027 | return 0; | |
2028 | } | |
2029 | ||
04786756 LT |
2030 | static int diff_populate_gitlink(struct diff_filespec *s, int size_only) |
2031 | { | |
2032 | int len; | |
8e08b419 JH |
2033 | char *data = xmalloc(100), *dirty = ""; |
2034 | ||
2035 | /* Are we looking at the work tree? */ | |
85adbf2f | 2036 | if (s->dirty_submodule) |
8e08b419 JH |
2037 | dirty = "-dirty"; |
2038 | ||
04786756 | 2039 | len = snprintf(data, 100, |
8e08b419 | 2040 | "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty); |
04786756 LT |
2041 | s->data = data; |
2042 | s->size = len; | |
2043 | s->should_free = 1; | |
2044 | if (size_only) { | |
2045 | s->data = NULL; | |
2046 | free(data); | |
2047 | } | |
2048 | return 0; | |
2049 | } | |
2050 | ||
6973dcae JH |
2051 | /* |
2052 | * While doing rename detection and pickaxe operation, we may need to | |
2053 | * grab the data for the blob (or file) for our own in-core comparison. | |
2054 | * diff_filespec has data and size fields for this purpose. | |
2055 | */ | |
2056 | int diff_populate_filespec(struct diff_filespec *s, int size_only) | |
2057 | { | |
2058 | int err = 0; | |
2059 | if (!DIFF_FILE_VALID(s)) | |
2060 | die("internal error: asking to populate invalid file."); | |
2061 | if (S_ISDIR(s->mode)) | |
2062 | return -1; | |
2063 | ||
6973dcae | 2064 | if (s->data) |
fc3abdf5 | 2065 | return 0; |
04786756 | 2066 | |
6e0b8ed6 JH |
2067 | if (size_only && 0 < s->size) |
2068 | return 0; | |
2069 | ||
302b9282 | 2070 | if (S_ISGITLINK(s->mode)) |
04786756 LT |
2071 | return diff_populate_gitlink(s, size_only); |
2072 | ||
6973dcae | 2073 | if (!s->sha1_valid || |
1510fea7 | 2074 | reuse_worktree_file(s->path, s->sha1, 0)) { |
f285a2d7 | 2075 | struct strbuf buf = STRBUF_INIT; |
6973dcae JH |
2076 | struct stat st; |
2077 | int fd; | |
6c510bee | 2078 | |
3afaa72d JH |
2079 | if (!strcmp(s->path, "-")) |
2080 | return populate_from_stdin(s); | |
2081 | ||
6973dcae JH |
2082 | if (lstat(s->path, &st) < 0) { |
2083 | if (errno == ENOENT) { | |
2084 | err_empty: | |
2085 | err = -1; | |
2086 | empty: | |
d2543b8e | 2087 | s->data = (char *)""; |
6973dcae JH |
2088 | s->size = 0; |
2089 | return err; | |
2090 | } | |
2091 | } | |
dc49cd76 | 2092 | s->size = xsize_t(st.st_size); |
6973dcae JH |
2093 | if (!s->size) |
2094 | goto empty; | |
6973dcae | 2095 | if (S_ISLNK(st.st_mode)) { |
cf219d8c LT |
2096 | struct strbuf sb = STRBUF_INIT; |
2097 | ||
2098 | if (strbuf_readlink(&sb, s->path, s->size)) | |
6973dcae | 2099 | goto err_empty; |
0956a6db RS |
2100 | s->size = sb.len; |
2101 | s->data = strbuf_detach(&sb, NULL); | |
cf219d8c | 2102 | s->should_free = 1; |
6973dcae JH |
2103 | return 0; |
2104 | } | |
cf219d8c LT |
2105 | if (size_only) |
2106 | return 0; | |
6973dcae JH |
2107 | fd = open(s->path, O_RDONLY); |
2108 | if (fd < 0) | |
2109 | goto err_empty; | |
c4712e45 | 2110 | s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0); |
6973dcae | 2111 | close(fd); |
6973dcae | 2112 | s->should_munmap = 1; |
6c510bee LT |
2113 | |
2114 | /* | |
2115 | * Convert from working tree format to canonical git format | |
2116 | */ | |
21e5ad50 | 2117 | if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) { |
c32f749f | 2118 | size_t size = 0; |
6c510bee LT |
2119 | munmap(s->data, s->size); |
2120 | s->should_munmap = 0; | |
c32f749f RS |
2121 | s->data = strbuf_detach(&buf, &size); |
2122 | s->size = size; | |
6c510bee LT |
2123 | s->should_free = 1; |
2124 | } | |
6973dcae JH |
2125 | } |
2126 | else { | |
21666f1a | 2127 | enum object_type type; |
6e0b8ed6 | 2128 | if (size_only) |
21666f1a | 2129 | type = sha1_object_info(s->sha1, &s->size); |
6973dcae | 2130 | else { |
21666f1a | 2131 | s->data = read_sha1_file(s->sha1, &type, &s->size); |
6973dcae JH |
2132 | s->should_free = 1; |
2133 | } | |
2134 | } | |
2135 | return 0; | |
2136 | } | |
2137 | ||
8ae92e63 | 2138 | void diff_free_filespec_blob(struct diff_filespec *s) |
6973dcae JH |
2139 | { |
2140 | if (s->should_free) | |
2141 | free(s->data); | |
2142 | else if (s->should_munmap) | |
2143 | munmap(s->data, s->size); | |
fc3abdf5 JH |
2144 | |
2145 | if (s->should_free || s->should_munmap) { | |
2146 | s->should_free = s->should_munmap = 0; | |
2147 | s->data = NULL; | |
2148 | } | |
eede7b7d JK |
2149 | } |
2150 | ||
2151 | void diff_free_filespec_data(struct diff_filespec *s) | |
2152 | { | |
8ae92e63 | 2153 | diff_free_filespec_blob(s); |
6973dcae JH |
2154 | free(s->cnt_data); |
2155 | s->cnt_data = NULL; | |
2156 | } | |
2157 | ||
4e218f54 | 2158 | static void prep_temp_blob(const char *path, struct diff_tempfile *temp, |
6973dcae JH |
2159 | void *blob, |
2160 | unsigned long size, | |
2161 | const unsigned char *sha1, | |
2162 | int mode) | |
2163 | { | |
2164 | int fd; | |
4e218f54 | 2165 | struct strbuf buf = STRBUF_INIT; |
003b33a8 DA |
2166 | struct strbuf template = STRBUF_INIT; |
2167 | char *path_dup = xstrdup(path); | |
2168 | const char *base = basename(path_dup); | |
6973dcae | 2169 | |
003b33a8 DA |
2170 | /* Generate "XXXXXX_basename.ext" */ |
2171 | strbuf_addstr(&template, "XXXXXX_"); | |
2172 | strbuf_addstr(&template, base); | |
2173 | ||
2174 | fd = git_mkstemps(temp->tmp_path, PATH_MAX, template.buf, | |
2175 | strlen(base) + 1); | |
6973dcae | 2176 | if (fd < 0) |
d824cbba | 2177 | die_errno("unable to create temp-file"); |
4e218f54 JS |
2178 | if (convert_to_working_tree(path, |
2179 | (const char *)blob, (size_t)size, &buf)) { | |
2180 | blob = buf.buf; | |
2181 | size = buf.len; | |
2182 | } | |
93822c22 | 2183 | if (write_in_full(fd, blob, size) != size) |
0721c314 | 2184 | die_errno("unable to write temp-file"); |
6973dcae JH |
2185 | close(fd); |
2186 | temp->name = temp->tmp_path; | |
2187 | strcpy(temp->hex, sha1_to_hex(sha1)); | |
2188 | temp->hex[40] = 0; | |
2189 | sprintf(temp->mode, "%06o", mode); | |
4e218f54 | 2190 | strbuf_release(&buf); |
003b33a8 DA |
2191 | strbuf_release(&template); |
2192 | free(path_dup); | |
6973dcae JH |
2193 | } |
2194 | ||
479b0ae8 JK |
2195 | static struct diff_tempfile *prepare_temp_file(const char *name, |
2196 | struct diff_filespec *one) | |
6973dcae | 2197 | { |
479b0ae8 JK |
2198 | struct diff_tempfile *temp = claim_diff_tempfile(); |
2199 | ||
6973dcae JH |
2200 | if (!DIFF_FILE_VALID(one)) { |
2201 | not_a_valid_file: | |
2202 | /* A '-' entry produces this for file-2, and | |
2203 | * a '+' entry produces this for file-1. | |
2204 | */ | |
2205 | temp->name = "/dev/null"; | |
2206 | strcpy(temp->hex, "."); | |
2207 | strcpy(temp->mode, "."); | |
479b0ae8 JK |
2208 | return temp; |
2209 | } | |
2210 | ||
2211 | if (!remove_tempfile_installed) { | |
2212 | atexit(remove_tempfile); | |
57b235a4 | 2213 | sigchain_push_common(remove_tempfile_on_signal); |
479b0ae8 | 2214 | remove_tempfile_installed = 1; |
6973dcae JH |
2215 | } |
2216 | ||
2217 | if (!one->sha1_valid || | |
1510fea7 | 2218 | reuse_worktree_file(name, one->sha1, 1)) { |
6973dcae JH |
2219 | struct stat st; |
2220 | if (lstat(name, &st) < 0) { | |
2221 | if (errno == ENOENT) | |
2222 | goto not_a_valid_file; | |
d824cbba | 2223 | die_errno("stat(%s)", name); |
6973dcae JH |
2224 | } |
2225 | if (S_ISLNK(st.st_mode)) { | |
3cd7388d JK |
2226 | struct strbuf sb = STRBUF_INIT; |
2227 | if (strbuf_readlink(&sb, name, st.st_size) < 0) | |
0721c314 | 2228 | die_errno("readlink(%s)", name); |
3cd7388d | 2229 | prep_temp_blob(name, temp, sb.buf, sb.len, |
6973dcae JH |
2230 | (one->sha1_valid ? |
2231 | one->sha1 : null_sha1), | |
2232 | (one->sha1_valid ? | |
2233 | one->mode : S_IFLNK)); | |
3cd7388d | 2234 | strbuf_release(&sb); |
6973dcae JH |
2235 | } |
2236 | else { | |
2237 | /* we can borrow from the file in the work tree */ | |
2238 | temp->name = name; | |
2239 | if (!one->sha1_valid) | |
2240 | strcpy(temp->hex, sha1_to_hex(null_sha1)); | |
2241 | else | |
2242 | strcpy(temp->hex, sha1_to_hex(one->sha1)); | |
2243 | /* Even though we may sometimes borrow the | |
2244 | * contents from the work tree, we always want | |
2245 | * one->mode. mode is trustworthy even when | |
2246 | * !(one->sha1_valid), as long as | |
2247 | * DIFF_FILE_VALID(one). | |
2248 | */ | |
2249 | sprintf(temp->mode, "%06o", one->mode); | |
2250 | } | |
479b0ae8 | 2251 | return temp; |
6973dcae JH |
2252 | } |
2253 | else { | |
2254 | if (diff_populate_filespec(one, 0)) | |
2255 | die("cannot read data blob for %s", one->path); | |
4e218f54 | 2256 | prep_temp_blob(name, temp, one->data, one->size, |
6973dcae JH |
2257 | one->sha1, one->mode); |
2258 | } | |
479b0ae8 | 2259 | return temp; |
6973dcae JH |
2260 | } |
2261 | ||
6973dcae JH |
2262 | /* An external diff command takes: |
2263 | * | |
2264 | * diff-cmd name infile1 infile1-sha1 infile1-mode \ | |
2265 | * infile2 infile2-sha1 infile2-mode [ rename-to ] | |
2266 | * | |
2267 | */ | |
2268 | static void run_external_diff(const char *pgm, | |
2269 | const char *name, | |
2270 | const char *other, | |
2271 | struct diff_filespec *one, | |
2272 | struct diff_filespec *two, | |
2273 | const char *xfrm_msg, | |
2274 | int complete_rewrite) | |
2275 | { | |
2276 | const char *spawn_arg[10]; | |
6973dcae | 2277 | int retval; |
6973dcae JH |
2278 | const char **arg = &spawn_arg[0]; |
2279 | ||
6973dcae | 2280 | if (one && two) { |
479b0ae8 JK |
2281 | struct diff_tempfile *temp_one, *temp_two; |
2282 | const char *othername = (other ? other : name); | |
2283 | temp_one = prepare_temp_file(name, one); | |
2284 | temp_two = prepare_temp_file(othername, two); | |
6973dcae JH |
2285 | *arg++ = pgm; |
2286 | *arg++ = name; | |
479b0ae8 JK |
2287 | *arg++ = temp_one->name; |
2288 | *arg++ = temp_one->hex; | |
2289 | *arg++ = temp_one->mode; | |
2290 | *arg++ = temp_two->name; | |
2291 | *arg++ = temp_two->hex; | |
2292 | *arg++ = temp_two->mode; | |
6973dcae JH |
2293 | if (other) { |
2294 | *arg++ = other; | |
2295 | *arg++ = xfrm_msg; | |
2296 | } | |
2297 | } else { | |
2298 | *arg++ = pgm; | |
2299 | *arg++ = name; | |
2300 | } | |
2301 | *arg = NULL; | |
d5535ec7 | 2302 | fflush(NULL); |
7ed7fac4 | 2303 | retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL); |
6973dcae JH |
2304 | remove_tempfile(); |
2305 | if (retval) { | |
2306 | fprintf(stderr, "external diff died, stopping at %s.\n", name); | |
2307 | exit(1); | |
2308 | } | |
2309 | } | |
2310 | ||
b67b9612 JH |
2311 | static int similarity_index(struct diff_filepair *p) |
2312 | { | |
2313 | return p->score * 100 / MAX_SCORE; | |
2314 | } | |
2315 | ||
2316 | static void fill_metainfo(struct strbuf *msg, | |
2317 | const char *name, | |
2318 | const char *other, | |
2319 | struct diff_filespec *one, | |
2320 | struct diff_filespec *two, | |
2321 | struct diff_options *o, | |
2322 | struct diff_filepair *p) | |
2323 | { | |
2324 | strbuf_init(msg, PATH_MAX * 2 + 300); | |
2325 | switch (p->status) { | |
2326 | case DIFF_STATUS_COPIED: | |
2327 | strbuf_addf(msg, "similarity index %d%%", similarity_index(p)); | |
2328 | strbuf_addstr(msg, "\ncopy from "); | |
2329 | quote_c_style(name, msg, NULL, 0); | |
2330 | strbuf_addstr(msg, "\ncopy to "); | |
2331 | quote_c_style(other, msg, NULL, 0); | |
2332 | strbuf_addch(msg, '\n'); | |
2333 | break; | |
2334 | case DIFF_STATUS_RENAMED: | |
2335 | strbuf_addf(msg, "similarity index %d%%", similarity_index(p)); | |
2336 | strbuf_addstr(msg, "\nrename from "); | |
2337 | quote_c_style(name, msg, NULL, 0); | |
2338 | strbuf_addstr(msg, "\nrename to "); | |
2339 | quote_c_style(other, msg, NULL, 0); | |
2340 | strbuf_addch(msg, '\n'); | |
2341 | break; | |
2342 | case DIFF_STATUS_MODIFIED: | |
2343 | if (p->score) { | |
2344 | strbuf_addf(msg, "dissimilarity index %d%%\n", | |
2345 | similarity_index(p)); | |
2346 | break; | |
2347 | } | |
2348 | /* fallthru */ | |
2349 | default: | |
2350 | /* nothing */ | |
2351 | ; | |
2352 | } | |
2353 | if (one && two && hashcmp(one->sha1, two->sha1)) { | |
2354 | int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV; | |
2355 | ||
2356 | if (DIFF_OPT_TST(o, BINARY)) { | |
2357 | mmfile_t mf; | |
2358 | if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) || | |
2359 | (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two))) | |
2360 | abbrev = 40; | |
2361 | } | |
2362 | strbuf_addf(msg, "index %.*s..%.*s", | |
2363 | abbrev, sha1_to_hex(one->sha1), | |
2364 | abbrev, sha1_to_hex(two->sha1)); | |
2365 | if (one->mode == two->mode) | |
2366 | strbuf_addf(msg, " %06o", one->mode); | |
2367 | strbuf_addch(msg, '\n'); | |
2368 | } | |
2369 | if (msg->len) | |
2370 | strbuf_setlen(msg, msg->len - 1); | |
2371 | } | |
2372 | ||
6973dcae JH |
2373 | static void run_diff_cmd(const char *pgm, |
2374 | const char *name, | |
2375 | const char *other, | |
cd676a51 | 2376 | const char *attr_path, |
6973dcae JH |
2377 | struct diff_filespec *one, |
2378 | struct diff_filespec *two, | |
b67b9612 | 2379 | struct strbuf *msg, |
051308f6 | 2380 | struct diff_options *o, |
b67b9612 | 2381 | struct diff_filepair *p) |
6973dcae | 2382 | { |
b67b9612 JH |
2383 | const char *xfrm_msg = NULL; |
2384 | int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score; | |
2385 | ||
2386 | if (msg) { | |
2387 | fill_metainfo(msg, name, other, one, two, o, p); | |
2388 | xfrm_msg = msg->len ? msg->buf : NULL; | |
2389 | } | |
2390 | ||
8f67f8ae | 2391 | if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL)) |
f1af60bd JH |
2392 | pgm = NULL; |
2393 | else { | |
be58e70d JK |
2394 | struct userdiff_driver *drv = userdiff_find_by_path(attr_path); |
2395 | if (drv && drv->external) | |
2396 | pgm = drv->external; | |
f1af60bd JH |
2397 | } |
2398 | ||
6973dcae JH |
2399 | if (pgm) { |
2400 | run_external_diff(pgm, name, other, one, two, xfrm_msg, | |
2401 | complete_rewrite); | |
2402 | return; | |
2403 | } | |
2404 | if (one && two) | |
2405 | builtin_diff(name, other ? other : name, | |
051308f6 | 2406 | one, two, xfrm_msg, o, complete_rewrite); |
6973dcae | 2407 | else |
c0c77734 | 2408 | fprintf(o->file, "* Unmerged path %s\n", name); |
6973dcae JH |
2409 | } |
2410 | ||
2411 | static void diff_fill_sha1_info(struct diff_filespec *one) | |
2412 | { | |
2413 | if (DIFF_FILE_VALID(one)) { | |
2414 | if (!one->sha1_valid) { | |
2415 | struct stat st; | |
5332b2af JS |
2416 | if (!strcmp(one->path, "-")) { |
2417 | hashcpy(one->sha1, null_sha1); | |
2418 | return; | |
2419 | } | |
6973dcae | 2420 | if (lstat(one->path, &st) < 0) |
0721c314 | 2421 | die_errno("stat '%s'", one->path); |
6973dcae | 2422 | if (index_path(one->sha1, one->path, &st, 0)) |
d7530708 | 2423 | die("cannot hash %s", one->path); |
6973dcae JH |
2424 | } |
2425 | } | |
2426 | else | |
e702496e | 2427 | hashclr(one->sha1); |
6973dcae JH |
2428 | } |
2429 | ||
cd676a51 JH |
2430 | static void strip_prefix(int prefix_length, const char **namep, const char **otherp) |
2431 | { | |
2432 | /* Strip the prefix but do not molest /dev/null and absolute paths */ | |
2433 | if (*namep && **namep != '/') | |
2434 | *namep += prefix_length; | |
2435 | if (*otherp && **otherp != '/') | |
2436 | *otherp += prefix_length; | |
2437 | } | |
2438 | ||
6973dcae JH |
2439 | static void run_diff(struct diff_filepair *p, struct diff_options *o) |
2440 | { | |
2441 | const char *pgm = external_diff(); | |
663af342 | 2442 | struct strbuf msg; |
663af342 PH |
2443 | struct diff_filespec *one = p->one; |
2444 | struct diff_filespec *two = p->two; | |
6973dcae JH |
2445 | const char *name; |
2446 | const char *other; | |
cd676a51 | 2447 | const char *attr_path; |
663af342 | 2448 | |
cd676a51 JH |
2449 | name = p->one->path; |
2450 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
2451 | attr_path = name; | |
2452 | if (o->prefix_length) | |
2453 | strip_prefix(o->prefix_length, &name, &other); | |
6973dcae JH |
2454 | |
2455 | if (DIFF_PAIR_UNMERGED(p)) { | |
cd676a51 | 2456 | run_diff_cmd(pgm, name, NULL, attr_path, |
b67b9612 | 2457 | NULL, NULL, NULL, o, p); |
6973dcae JH |
2458 | return; |
2459 | } | |
2460 | ||
6973dcae JH |
2461 | diff_fill_sha1_info(one); |
2462 | diff_fill_sha1_info(two); | |
2463 | ||
6973dcae JH |
2464 | if (!pgm && |
2465 | DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) && | |
2466 | (S_IFMT & one->mode) != (S_IFMT & two->mode)) { | |
b67b9612 JH |
2467 | /* |
2468 | * a filepair that changes between file and symlink | |
6973dcae JH |
2469 | * needs to be split into deletion and creation. |
2470 | */ | |
2471 | struct diff_filespec *null = alloc_filespec(two->path); | |
cd676a51 | 2472 | run_diff_cmd(NULL, name, other, attr_path, |
b67b9612 | 2473 | one, null, &msg, o, p); |
6973dcae | 2474 | free(null); |
b67b9612 JH |
2475 | strbuf_release(&msg); |
2476 | ||
6973dcae | 2477 | null = alloc_filespec(one->path); |
cd676a51 | 2478 | run_diff_cmd(NULL, name, other, attr_path, |
b67b9612 | 2479 | null, two, &msg, o, p); |
6973dcae JH |
2480 | free(null); |
2481 | } | |
2482 | else | |
cd676a51 | 2483 | run_diff_cmd(pgm, name, other, attr_path, |
b67b9612 | 2484 | one, two, &msg, o, p); |
6973dcae | 2485 | |
663af342 | 2486 | strbuf_release(&msg); |
6973dcae JH |
2487 | } |
2488 | ||
2489 | static void run_diffstat(struct diff_filepair *p, struct diff_options *o, | |
2490 | struct diffstat_t *diffstat) | |
2491 | { | |
2492 | const char *name; | |
2493 | const char *other; | |
710158e3 | 2494 | int complete_rewrite = 0; |
6973dcae JH |
2495 | |
2496 | if (DIFF_PAIR_UNMERGED(p)) { | |
2497 | /* unmerged */ | |
0d21efa5 | 2498 | builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0); |
6973dcae JH |
2499 | return; |
2500 | } | |
2501 | ||
2502 | name = p->one->path; | |
2503 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
2504 | ||
cd676a51 JH |
2505 | if (o->prefix_length) |
2506 | strip_prefix(o->prefix_length, &name, &other); | |
2507 | ||
6973dcae JH |
2508 | diff_fill_sha1_info(p->one); |
2509 | diff_fill_sha1_info(p->two); | |
2510 | ||
710158e3 JH |
2511 | if (p->status == DIFF_STATUS_MODIFIED && p->score) |
2512 | complete_rewrite = 1; | |
0d21efa5 | 2513 | builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite); |
6973dcae JH |
2514 | } |
2515 | ||
88246898 JS |
2516 | static void run_checkdiff(struct diff_filepair *p, struct diff_options *o) |
2517 | { | |
2518 | const char *name; | |
2519 | const char *other; | |
cd676a51 | 2520 | const char *attr_path; |
88246898 JS |
2521 | |
2522 | if (DIFF_PAIR_UNMERGED(p)) { | |
2523 | /* unmerged */ | |
2524 | return; | |
2525 | } | |
2526 | ||
2527 | name = p->one->path; | |
2528 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
cd676a51 JH |
2529 | attr_path = other ? other : name; |
2530 | ||
2531 | if (o->prefix_length) | |
2532 | strip_prefix(o->prefix_length, &name, &other); | |
88246898 JS |
2533 | |
2534 | diff_fill_sha1_info(p->one); | |
2535 | diff_fill_sha1_info(p->two); | |
2536 | ||
cd676a51 | 2537 | builtin_checkdiff(name, other, attr_path, p->one, p->two, o); |
88246898 JS |
2538 | } |
2539 | ||
6973dcae JH |
2540 | void diff_setup(struct diff_options *options) |
2541 | { | |
2542 | memset(options, 0, sizeof(*options)); | |
c0c77734 DB |
2543 | |
2544 | options->file = stdout; | |
2545 | ||
6973dcae JH |
2546 | options->line_termination = '\n'; |
2547 | options->break_opt = -1; | |
2548 | options->rename_limit = -1; | |
7df7c019 | 2549 | options->dirstat_percent = 3; |
ee1e5412 | 2550 | options->context = 3; |
6973dcae JH |
2551 | |
2552 | options->change = diff_change; | |
2553 | options->add_remove = diff_addremove; | |
6b2f2d98 | 2554 | if (diff_use_color_default > 0) |
8f67f8ae | 2555 | DIFF_OPT_SET(options, COLOR_DIFF); |
b68ea12e | 2556 | options->detect_rename = diff_detect_rename_default; |
eab9a40b | 2557 | |
a5a818ee JH |
2558 | if (!diff_mnemonic_prefix) { |
2559 | options->a_prefix = "a/"; | |
2560 | options->b_prefix = "b/"; | |
2561 | } | |
6973dcae JH |
2562 | } |
2563 | ||
2564 | int diff_setup_done(struct diff_options *options) | |
2565 | { | |
d7de00f7 TH |
2566 | int count = 0; |
2567 | ||
2568 | if (options->output_format & DIFF_FORMAT_NAME) | |
2569 | count++; | |
2570 | if (options->output_format & DIFF_FORMAT_NAME_STATUS) | |
2571 | count++; | |
2572 | if (options->output_format & DIFF_FORMAT_CHECKDIFF) | |
2573 | count++; | |
2574 | if (options->output_format & DIFF_FORMAT_NO_OUTPUT) | |
2575 | count++; | |
2576 | if (count > 1) | |
2577 | die("--name-only, --name-status, --check and -s are mutually exclusive"); | |
2578 | ||
f245194f JH |
2579 | /* |
2580 | * Most of the time we can say "there are changes" | |
2581 | * only by checking if there are changed paths, but | |
2582 | * --ignore-whitespace* options force us to look | |
97bf2a08 | 2583 | * inside contents. |
f245194f JH |
2584 | */ |
2585 | ||
2586 | if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) || | |
2587 | DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) || | |
2588 | DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL)) | |
2589 | DIFF_OPT_SET(options, DIFF_FROM_CONTENTS); | |
2590 | else | |
2591 | DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS); | |
2592 | ||
8f67f8ae | 2593 | if (DIFF_OPT_TST(options, FIND_COPIES_HARDER)) |
03b9d560 JH |
2594 | options->detect_rename = DIFF_DETECT_COPY; |
2595 | ||
cd676a51 JH |
2596 | if (!DIFF_OPT_TST(options, RELATIVE_NAME)) |
2597 | options->prefix = NULL; | |
2598 | if (options->prefix) | |
2599 | options->prefix_length = strlen(options->prefix); | |
2600 | else | |
2601 | options->prefix_length = 0; | |
2602 | ||
c6744349 TH |
2603 | if (options->output_format & (DIFF_FORMAT_NAME | |
2604 | DIFF_FORMAT_NAME_STATUS | | |
2605 | DIFF_FORMAT_CHECKDIFF | | |
2606 | DIFF_FORMAT_NO_OUTPUT)) | |
2607 | options->output_format &= ~(DIFF_FORMAT_RAW | | |
74e2abe5 | 2608 | DIFF_FORMAT_NUMSTAT | |
c6744349 | 2609 | DIFF_FORMAT_DIFFSTAT | |
ebd124c6 | 2610 | DIFF_FORMAT_SHORTSTAT | |
7df7c019 | 2611 | DIFF_FORMAT_DIRSTAT | |
c6744349 TH |
2612 | DIFF_FORMAT_SUMMARY | |
2613 | DIFF_FORMAT_PATCH); | |
2614 | ||
6973dcae JH |
2615 | /* |
2616 | * These cases always need recursive; we do not drop caller-supplied | |
2617 | * recursive bits for other formats here. | |
2618 | */ | |
c6744349 | 2619 | if (options->output_format & (DIFF_FORMAT_PATCH | |
74e2abe5 | 2620 | DIFF_FORMAT_NUMSTAT | |
c6744349 | 2621 | DIFF_FORMAT_DIFFSTAT | |
ebd124c6 | 2622 | DIFF_FORMAT_SHORTSTAT | |
7df7c019 | 2623 | DIFF_FORMAT_DIRSTAT | |
d7014dc0 | 2624 | DIFF_FORMAT_SUMMARY | |
c6744349 | 2625 | DIFF_FORMAT_CHECKDIFF)) |
8f67f8ae | 2626 | DIFF_OPT_SET(options, RECURSIVE); |
5e363541 | 2627 | /* |
3969cf7d | 2628 | * Also pickaxe would not work very well if you do not say recursive |
5e363541 | 2629 | */ |
3969cf7d | 2630 | if (options->pickaxe) |
8f67f8ae | 2631 | DIFF_OPT_SET(options, RECURSIVE); |
ae6d5c1b JL |
2632 | /* |
2633 | * When patches are generated, submodules diffed against the work tree | |
2634 | * must be checked for dirtiness too so it can be shown in the output | |
2635 | */ | |
2636 | if (options->output_format & DIFF_FORMAT_PATCH) | |
2637 | DIFF_OPT_SET(options, DIRTY_SUBMODULES); | |
5e363541 | 2638 | |
6973dcae JH |
2639 | if (options->detect_rename && options->rename_limit < 0) |
2640 | options->rename_limit = diff_rename_limit_default; | |
2641 | if (options->setup & DIFF_SETUP_USE_CACHE) { | |
2642 | if (!active_cache) | |
2643 | /* read-cache does not die even when it fails | |
2644 | * so it is safe for us to do this here. Also | |
2645 | * it does not smudge active_cache or active_nr | |
2646 | * when it fails, so we do not have to worry about | |
2647 | * cleaning it up ourselves either. | |
2648 | */ | |
2649 | read_cache(); | |
2650 | } | |
6973dcae JH |
2651 | if (options->abbrev <= 0 || 40 < options->abbrev) |
2652 | options->abbrev = 40; /* full */ | |
2653 | ||
68aacb2f JH |
2654 | /* |
2655 | * It does not make sense to show the first hit we happened | |
2656 | * to have found. It does not make sense not to return with | |
2657 | * exit code in such a case either. | |
2658 | */ | |
90b19941 | 2659 | if (DIFF_OPT_TST(options, QUICK)) { |
68aacb2f | 2660 | options->output_format = DIFF_FORMAT_NO_OUTPUT; |
8f67f8ae | 2661 | DIFF_OPT_SET(options, EXIT_WITH_STATUS); |
68aacb2f JH |
2662 | } |
2663 | ||
6973dcae JH |
2664 | return 0; |
2665 | } | |
2666 | ||
d2543b8e | 2667 | static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val) |
ee1e5412 LT |
2668 | { |
2669 | char c, *eq; | |
2670 | int len; | |
2671 | ||
2672 | if (*arg != '-') | |
2673 | return 0; | |
2674 | c = *++arg; | |
2675 | if (!c) | |
2676 | return 0; | |
2677 | if (c == arg_short) { | |
2678 | c = *++arg; | |
2679 | if (!c) | |
2680 | return 1; | |
2681 | if (val && isdigit(c)) { | |
2682 | char *end; | |
2683 | int n = strtoul(arg, &end, 10); | |
2684 | if (*end) | |
2685 | return 0; | |
2686 | *val = n; | |
2687 | return 1; | |
2688 | } | |
2689 | return 0; | |
2690 | } | |
2691 | if (c != '-') | |
2692 | return 0; | |
2693 | arg++; | |
2694 | eq = strchr(arg, '='); | |
2695 | if (eq) | |
2696 | len = eq - arg; | |
2697 | else | |
2698 | len = strlen(arg); | |
2699 | if (!len || strncmp(arg, arg_long, len)) | |
2700 | return 0; | |
2701 | if (eq) { | |
2702 | int n; | |
2703 | char *end; | |
2704 | if (!isdigit(*++eq)) | |
2705 | return 0; | |
2706 | n = strtoul(eq, &end, 10); | |
2707 | if (*end) | |
2708 | return 0; | |
2709 | *val = n; | |
2710 | } | |
2711 | return 1; | |
2712 | } | |
2713 | ||
16befb8b JH |
2714 | static int diff_scoreopt_parse(const char *opt); |
2715 | ||
6973dcae JH |
2716 | int diff_opt_parse(struct diff_options *options, const char **av, int ac) |
2717 | { | |
2718 | const char *arg = av[0]; | |
d054680c PH |
2719 | |
2720 | /* Output format options */ | |
6973dcae | 2721 | if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) |
c6744349 | 2722 | options->output_format |= DIFF_FORMAT_PATCH; |
ee1e5412 | 2723 | else if (opt_arg(arg, 'U', "unified", &options->context)) |
c6744349 | 2724 | options->output_format |= DIFF_FORMAT_PATCH; |
a610786f TH |
2725 | else if (!strcmp(arg, "--raw")) |
2726 | options->output_format |= DIFF_FORMAT_RAW; | |
8f67f8ae | 2727 | else if (!strcmp(arg, "--patch-with-raw")) |
c6744349 | 2728 | options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW; |
8f67f8ae | 2729 | else if (!strcmp(arg, "--numstat")) |
74e2abe5 | 2730 | options->output_format |= DIFF_FORMAT_NUMSTAT; |
8f67f8ae | 2731 | else if (!strcmp(arg, "--shortstat")) |
ebd124c6 | 2732 | options->output_format |= DIFF_FORMAT_SHORTSTAT; |
7df7c019 LT |
2733 | else if (opt_arg(arg, 'X', "dirstat", &options->dirstat_percent)) |
2734 | options->output_format |= DIFF_FORMAT_DIRSTAT; | |
f88d225f JH |
2735 | else if (!strcmp(arg, "--cumulative")) { |
2736 | options->output_format |= DIFF_FORMAT_DIRSTAT; | |
2737 | DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE); | |
fd33777b HO |
2738 | } else if (opt_arg(arg, 0, "dirstat-by-file", |
2739 | &options->dirstat_percent)) { | |
2740 | options->output_format |= DIFF_FORMAT_DIRSTAT; | |
2741 | DIFF_OPT_SET(options, DIRSTAT_BY_FILE); | |
f88d225f | 2742 | } |
d054680c PH |
2743 | else if (!strcmp(arg, "--check")) |
2744 | options->output_format |= DIFF_FORMAT_CHECKDIFF; | |
2745 | else if (!strcmp(arg, "--summary")) | |
2746 | options->output_format |= DIFF_FORMAT_SUMMARY; | |
2747 | else if (!strcmp(arg, "--patch-with-stat")) | |
2748 | options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT; | |
2749 | else if (!strcmp(arg, "--name-only")) | |
2750 | options->output_format |= DIFF_FORMAT_NAME; | |
2751 | else if (!strcmp(arg, "--name-status")) | |
2752 | options->output_format |= DIFF_FORMAT_NAME_STATUS; | |
2753 | else if (!strcmp(arg, "-s")) | |
2754 | options->output_format |= DIFF_FORMAT_NO_OUTPUT; | |
cc44c765 | 2755 | else if (!prefixcmp(arg, "--stat")) { |
5c5b2ea9 LT |
2756 | char *end; |
2757 | int width = options->stat_width; | |
2758 | int name_width = options->stat_name_width; | |
2759 | arg += 6; | |
2760 | end = (char *)arg; | |
2761 | ||
2762 | switch (*arg) { | |
2763 | case '-': | |
cc44c765 | 2764 | if (!prefixcmp(arg, "-width=")) |
5c5b2ea9 | 2765 | width = strtoul(arg + 7, &end, 10); |
cc44c765 | 2766 | else if (!prefixcmp(arg, "-name-width=")) |
5c5b2ea9 LT |
2767 | name_width = strtoul(arg + 12, &end, 10); |
2768 | break; | |
2769 | case '=': | |
2770 | width = strtoul(arg+1, &end, 10); | |
2771 | if (*end == ',') | |
2772 | name_width = strtoul(end+1, &end, 10); | |
2773 | } | |
2774 | ||
2775 | /* Important! This checks all the error cases! */ | |
2776 | if (*end) | |
2777 | return 0; | |
c6744349 | 2778 | options->output_format |= DIFF_FORMAT_DIFFSTAT; |
5c5b2ea9 LT |
2779 | options->stat_name_width = name_width; |
2780 | options->stat_width = width; | |
a2540023 | 2781 | } |
d054680c PH |
2782 | |
2783 | /* renames options */ | |
cc44c765 | 2784 | else if (!prefixcmp(arg, "-B")) { |
8f67f8ae | 2785 | if ((options->break_opt = diff_scoreopt_parse(arg)) == -1) |
6973dcae JH |
2786 | return -1; |
2787 | } | |
cc44c765 | 2788 | else if (!prefixcmp(arg, "-M")) { |
8f67f8ae | 2789 | if ((options->rename_score = diff_scoreopt_parse(arg)) == -1) |
6973dcae JH |
2790 | return -1; |
2791 | options->detect_rename = DIFF_DETECT_RENAME; | |
2792 | } | |
cc44c765 | 2793 | else if (!prefixcmp(arg, "-C")) { |
ca6c0970 | 2794 | if (options->detect_rename == DIFF_DETECT_COPY) |
8f67f8ae PH |
2795 | DIFF_OPT_SET(options, FIND_COPIES_HARDER); |
2796 | if ((options->rename_score = diff_scoreopt_parse(arg)) == -1) | |
6973dcae JH |
2797 | return -1; |
2798 | options->detect_rename = DIFF_DETECT_COPY; | |
2799 | } | |
d054680c PH |
2800 | else if (!strcmp(arg, "--no-renames")) |
2801 | options->detect_rename = 0; | |
cd676a51 JH |
2802 | else if (!strcmp(arg, "--relative")) |
2803 | DIFF_OPT_SET(options, RELATIVE_NAME); | |
c0cb4a06 JH |
2804 | else if (!prefixcmp(arg, "--relative=")) { |
2805 | DIFF_OPT_SET(options, RELATIVE_NAME); | |
2806 | options->prefix = arg + 11; | |
2807 | } | |
d054680c PH |
2808 | |
2809 | /* xdiff options */ | |
2810 | else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space")) | |
628d5c2b | 2811 | DIFF_XDL_SET(options, IGNORE_WHITESPACE); |
d054680c | 2812 | else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change")) |
628d5c2b | 2813 | DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE); |
d054680c | 2814 | else if (!strcmp(arg, "--ignore-space-at-eol")) |
628d5c2b | 2815 | DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL); |
34292bdd | 2816 | else if (!strcmp(arg, "--patience")) |
628d5c2b | 2817 | DIFF_XDL_SET(options, PATIENCE_DIFF); |
d054680c PH |
2818 | |
2819 | /* flags options */ | |
2820 | else if (!strcmp(arg, "--binary")) { | |
2821 | options->output_format |= DIFF_FORMAT_PATCH; | |
2822 | DIFF_OPT_SET(options, BINARY); | |
2823 | } | |
2824 | else if (!strcmp(arg, "--full-index")) | |
2825 | DIFF_OPT_SET(options, FULL_INDEX); | |
2826 | else if (!strcmp(arg, "-a") || !strcmp(arg, "--text")) | |
2827 | DIFF_OPT_SET(options, TEXT); | |
2828 | else if (!strcmp(arg, "-R")) | |
2829 | DIFF_OPT_SET(options, REVERSE_DIFF); | |
6973dcae | 2830 | else if (!strcmp(arg, "--find-copies-harder")) |
8f67f8ae | 2831 | DIFF_OPT_SET(options, FIND_COPIES_HARDER); |
750f7b66 | 2832 | else if (!strcmp(arg, "--follow")) |
8f67f8ae | 2833 | DIFF_OPT_SET(options, FOLLOW_RENAMES); |
cd112cef | 2834 | else if (!strcmp(arg, "--color")) |
8f67f8ae | 2835 | DIFF_OPT_SET(options, COLOR_DIFF); |
73e9da01 ML |
2836 | else if (!prefixcmp(arg, "--color=")) { |
2837 | int value = git_config_colorbool(NULL, arg+8, -1); | |
2838 | if (value == 0) | |
2839 | DIFF_OPT_CLR(options, COLOR_DIFF); | |
2840 | else if (value > 0) | |
2841 | DIFF_OPT_SET(options, COLOR_DIFF); | |
2842 | else | |
2843 | return error("option `color' expects \"always\", \"auto\", or \"never\""); | |
2844 | } | |
fef88bb0 | 2845 | else if (!strcmp(arg, "--no-color")) |
8f67f8ae | 2846 | DIFF_OPT_CLR(options, COLOR_DIFF); |
628d5c2b KC |
2847 | else if (!strcmp(arg, "--color-words")) { |
2848 | DIFF_OPT_SET(options, COLOR_DIFF); | |
2849 | DIFF_OPT_SET(options, COLOR_DIFF_WORDS); | |
2850 | } | |
2b6a5417 | 2851 | else if (!prefixcmp(arg, "--color-words=")) { |
628d5c2b KC |
2852 | DIFF_OPT_SET(options, COLOR_DIFF); |
2853 | DIFF_OPT_SET(options, COLOR_DIFF_WORDS); | |
2b6a5417 JS |
2854 | options->word_regex = arg + 14; |
2855 | } | |
41bbf9d5 | 2856 | else if (!strcmp(arg, "--exit-code")) |
8f67f8ae | 2857 | DIFF_OPT_SET(options, EXIT_WITH_STATUS); |
68aacb2f | 2858 | else if (!strcmp(arg, "--quiet")) |
90b19941 | 2859 | DIFF_OPT_SET(options, QUICK); |
72909bef | 2860 | else if (!strcmp(arg, "--ext-diff")) |
8f67f8ae | 2861 | DIFF_OPT_SET(options, ALLOW_EXTERNAL); |
72909bef | 2862 | else if (!strcmp(arg, "--no-ext-diff")) |
8f67f8ae | 2863 | DIFF_OPT_CLR(options, ALLOW_EXTERNAL); |
e10ea812 JK |
2864 | else if (!strcmp(arg, "--textconv")) |
2865 | DIFF_OPT_SET(options, ALLOW_TEXTCONV); | |
2866 | else if (!strcmp(arg, "--no-textconv")) | |
2867 | DIFF_OPT_CLR(options, ALLOW_TEXTCONV); | |
50fd9bd8 JS |
2868 | else if (!strcmp(arg, "--ignore-submodules")) |
2869 | DIFF_OPT_SET(options, IGNORE_SUBMODULES); | |
752c0c24 JS |
2870 | else if (!strcmp(arg, "--submodule")) |
2871 | DIFF_OPT_SET(options, SUBMODULE_LOG); | |
2872 | else if (!prefixcmp(arg, "--submodule=")) { | |
2873 | if (!strcmp(arg + 12, "log")) | |
2874 | DIFF_OPT_SET(options, SUBMODULE_LOG); | |
2875 | } | |
d054680c PH |
2876 | |
2877 | /* misc options */ | |
2878 | else if (!strcmp(arg, "-z")) | |
2879 | options->line_termination = 0; | |
2880 | else if (!prefixcmp(arg, "-l")) | |
2881 | options->rename_limit = strtoul(arg+2, NULL, 10); | |
2882 | else if (!prefixcmp(arg, "-S")) | |
2883 | options->pickaxe = arg + 2; | |
2884 | else if (!strcmp(arg, "--pickaxe-all")) | |
2885 | options->pickaxe_opts = DIFF_PICKAXE_ALL; | |
2886 | else if (!strcmp(arg, "--pickaxe-regex")) | |
2887 | options->pickaxe_opts = DIFF_PICKAXE_REGEX; | |
2888 | else if (!prefixcmp(arg, "-O")) | |
2889 | options->orderfile = arg + 2; | |
2890 | else if (!prefixcmp(arg, "--diff-filter=")) | |
2891 | options->filter = arg + 14; | |
2892 | else if (!strcmp(arg, "--abbrev")) | |
2893 | options->abbrev = DEFAULT_ABBREV; | |
2894 | else if (!prefixcmp(arg, "--abbrev=")) { | |
2895 | options->abbrev = strtoul(arg + 9, NULL, 10); | |
2896 | if (options->abbrev < MINIMUM_ABBREV) | |
2897 | options->abbrev = MINIMUM_ABBREV; | |
2898 | else if (40 < options->abbrev) | |
2899 | options->abbrev = 40; | |
2900 | } | |
eab9a40b JS |
2901 | else if (!prefixcmp(arg, "--src-prefix=")) |
2902 | options->a_prefix = arg + 13; | |
2903 | else if (!prefixcmp(arg, "--dst-prefix=")) | |
2904 | options->b_prefix = arg + 13; | |
2905 | else if (!strcmp(arg, "--no-prefix")) | |
2906 | options->a_prefix = options->b_prefix = ""; | |
6d0e674a RS |
2907 | else if (opt_arg(arg, '\0', "inter-hunk-context", |
2908 | &options->interhunkcontext)) | |
2909 | ; | |
c0c77734 DB |
2910 | else if (!prefixcmp(arg, "--output=")) { |
2911 | options->file = fopen(arg + strlen("--output="), "w"); | |
8324b977 LA |
2912 | if (!options->file) |
2913 | die_errno("Could not open '%s'", arg + strlen("--output=")); | |
c0c77734 DB |
2914 | options->close_file = 1; |
2915 | } else | |
6973dcae JH |
2916 | return 0; |
2917 | return 1; | |
2918 | } | |
2919 | ||
2920 | static int parse_num(const char **cp_p) | |
2921 | { | |
2922 | unsigned long num, scale; | |
2923 | int ch, dot; | |
2924 | const char *cp = *cp_p; | |
2925 | ||
2926 | num = 0; | |
2927 | scale = 1; | |
2928 | dot = 0; | |
eeefa7c9 | 2929 | for (;;) { |
6973dcae JH |
2930 | ch = *cp; |
2931 | if ( !dot && ch == '.' ) { | |
2932 | scale = 1; | |
2933 | dot = 1; | |
2934 | } else if ( ch == '%' ) { | |
2935 | scale = dot ? scale*100 : 100; | |
2936 | cp++; /* % is always at the end */ | |
2937 | break; | |
2938 | } else if ( ch >= '0' && ch <= '9' ) { | |
2939 | if ( scale < 100000 ) { | |
2940 | scale *= 10; | |
2941 | num = (num*10) + (ch-'0'); | |
2942 | } | |
2943 | } else { | |
2944 | break; | |
2945 | } | |
2946 | cp++; | |
2947 | } | |
2948 | *cp_p = cp; | |
2949 | ||
2950 | /* user says num divided by scale and we say internally that | |
2951 | * is MAX_SCORE * num / scale. | |
2952 | */ | |
dc49cd76 | 2953 | return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale)); |
6973dcae JH |
2954 | } |
2955 | ||
16befb8b | 2956 | static int diff_scoreopt_parse(const char *opt) |
6973dcae JH |
2957 | { |
2958 | int opt1, opt2, cmd; | |
2959 | ||
2960 | if (*opt++ != '-') | |
2961 | return -1; | |
2962 | cmd = *opt++; | |
2963 | if (cmd != 'M' && cmd != 'C' && cmd != 'B') | |
2964 | return -1; /* that is not a -M, -C nor -B option */ | |
2965 | ||
2966 | opt1 = parse_num(&opt); | |
2967 | if (cmd != 'B') | |
2968 | opt2 = 0; | |
2969 | else { | |
2970 | if (*opt == 0) | |
2971 | opt2 = 0; | |
2972 | else if (*opt != '/') | |
2973 | return -1; /* we expect -B80/99 or -B80 */ | |
2974 | else { | |
2975 | opt++; | |
2976 | opt2 = parse_num(&opt); | |
2977 | } | |
2978 | } | |
2979 | if (*opt != 0) | |
2980 | return -1; | |
2981 | return opt1 | (opt2 << 16); | |
2982 | } | |
2983 | ||
2984 | struct diff_queue_struct diff_queued_diff; | |
2985 | ||
2986 | void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp) | |
2987 | { | |
2988 | if (queue->alloc <= queue->nr) { | |
2989 | queue->alloc = alloc_nr(queue->alloc); | |
2990 | queue->queue = xrealloc(queue->queue, | |
2991 | sizeof(dp) * queue->alloc); | |
2992 | } | |
2993 | queue->queue[queue->nr++] = dp; | |
2994 | } | |
2995 | ||
2996 | struct diff_filepair *diff_queue(struct diff_queue_struct *queue, | |
2997 | struct diff_filespec *one, | |
2998 | struct diff_filespec *two) | |
2999 | { | |
ef677686 | 3000 | struct diff_filepair *dp = xcalloc(1, sizeof(*dp)); |
6973dcae JH |
3001 | dp->one = one; |
3002 | dp->two = two; | |
6973dcae JH |
3003 | if (queue) |
3004 | diff_q(queue, dp); | |
3005 | return dp; | |
3006 | } | |
3007 | ||
3008 | void diff_free_filepair(struct diff_filepair *p) | |
3009 | { | |
9fb88419 LT |
3010 | free_filespec(p->one); |
3011 | free_filespec(p->two); | |
6973dcae JH |
3012 | free(p); |
3013 | } | |
3014 | ||
3015 | /* This is different from find_unique_abbrev() in that | |
3016 | * it stuffs the result with dots for alignment. | |
3017 | */ | |
3018 | const char *diff_unique_abbrev(const unsigned char *sha1, int len) | |
3019 | { | |
3020 | int abblen; | |
3021 | const char *abbrev; | |
3022 | if (len == 40) | |
3023 | return sha1_to_hex(sha1); | |
3024 | ||
3025 | abbrev = find_unique_abbrev(sha1, len); | |
6973dcae JH |
3026 | abblen = strlen(abbrev); |
3027 | if (abblen < 37) { | |
3028 | static char hex[41]; | |
3029 | if (len < abblen && abblen <= len + 2) | |
3030 | sprintf(hex, "%s%.*s", abbrev, len+3-abblen, ".."); | |
3031 | else | |
3032 | sprintf(hex, "%s...", abbrev); | |
3033 | return hex; | |
3034 | } | |
3035 | return sha1_to_hex(sha1); | |
3036 | } | |
3037 | ||
663af342 | 3038 | static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt) |
6973dcae | 3039 | { |
663af342 PH |
3040 | int line_termination = opt->line_termination; |
3041 | int inter_name_termination = line_termination ? '\t' : '\0'; | |
6973dcae | 3042 | |
663af342 | 3043 | if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) { |
c0c77734 DB |
3044 | fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode, |
3045 | diff_unique_abbrev(p->one->sha1, opt->abbrev)); | |
3046 | fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev)); | |
6973dcae | 3047 | } |
663af342 | 3048 | if (p->score) { |
c0c77734 DB |
3049 | fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p), |
3050 | inter_name_termination); | |
663af342 | 3051 | } else { |
c0c77734 | 3052 | fprintf(opt->file, "%c%c", p->status, inter_name_termination); |
6973dcae | 3053 | } |
6973dcae | 3054 | |
cd676a51 JH |
3055 | if (p->status == DIFF_STATUS_COPIED || |
3056 | p->status == DIFF_STATUS_RENAMED) { | |
3057 | const char *name_a, *name_b; | |
3058 | name_a = p->one->path; | |
3059 | name_b = p->two->path; | |
3060 | strip_prefix(opt->prefix_length, &name_a, &name_b); | |
c0c77734 DB |
3061 | write_name_quoted(name_a, opt->file, inter_name_termination); |
3062 | write_name_quoted(name_b, opt->file, line_termination); | |
663af342 | 3063 | } else { |
cd676a51 JH |
3064 | const char *name_a, *name_b; |
3065 | name_a = p->one->mode ? p->one->path : p->two->path; | |
3066 | name_b = NULL; | |
3067 | strip_prefix(opt->prefix_length, &name_a, &name_b); | |
c0c77734 | 3068 | write_name_quoted(name_a, opt->file, line_termination); |
663af342 | 3069 | } |
6973dcae JH |
3070 | } |
3071 | ||
3072 | int diff_unmodified_pair(struct diff_filepair *p) | |
3073 | { | |
3074 | /* This function is written stricter than necessary to support | |
3075 | * the currently implemented transformers, but the idea is to | |
3076 | * let transformers to produce diff_filepairs any way they want, | |
3077 | * and filter and clean them up here before producing the output. | |
3078 | */ | |
663af342 | 3079 | struct diff_filespec *one = p->one, *two = p->two; |
6973dcae JH |
3080 | |
3081 | if (DIFF_PAIR_UNMERGED(p)) | |
3082 | return 0; /* unmerged is interesting */ | |
3083 | ||
6973dcae JH |
3084 | /* deletion, addition, mode or type change |
3085 | * and rename are all interesting. | |
3086 | */ | |
3087 | if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) || | |
3088 | DIFF_PAIR_MODE_CHANGED(p) || | |
3089 | strcmp(one->path, two->path)) | |
3090 | return 0; | |
3091 | ||
3092 | /* both are valid and point at the same path. that is, we are | |
3093 | * dealing with a change. | |
3094 | */ | |
3095 | if (one->sha1_valid && two->sha1_valid && | |
85adbf2f JL |
3096 | !hashcmp(one->sha1, two->sha1) && |
3097 | !one->dirty_submodule && !two->dirty_submodule) | |
6973dcae JH |
3098 | return 1; /* no change */ |
3099 | if (!one->sha1_valid && !two->sha1_valid) | |
3100 | return 1; /* both look at the same file on the filesystem. */ | |
3101 | return 0; | |
3102 | } | |
3103 | ||
3104 | static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o) | |
3105 | { | |
3106 | if (diff_unmodified_pair(p)) | |
3107 | return; | |
3108 | ||
3109 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
3110 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
3111 | return; /* no tree diffs in patch format */ | |
3112 | ||
3113 | run_diff(p, o); | |
3114 | } | |
3115 | ||
3116 | static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o, | |
3117 | struct diffstat_t *diffstat) | |
3118 | { | |
3119 | if (diff_unmodified_pair(p)) | |
3120 | return; | |
3121 | ||
3122 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
3123 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
3124 | return; /* no tree diffs in patch format */ | |
3125 | ||
3126 | run_diffstat(p, o, diffstat); | |
3127 | } | |
3128 | ||
88246898 JS |
3129 | static void diff_flush_checkdiff(struct diff_filepair *p, |
3130 | struct diff_options *o) | |
3131 | { | |
3132 | if (diff_unmodified_pair(p)) | |
3133 | return; | |
3134 | ||
3135 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
3136 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
3137 | return; /* no tree diffs in patch format */ | |
3138 | ||
3139 | run_checkdiff(p, o); | |
3140 | } | |
3141 | ||
6973dcae JH |
3142 | int diff_queue_is_empty(void) |
3143 | { | |
3144 | struct diff_queue_struct *q = &diff_queued_diff; | |
3145 | int i; | |
3146 | for (i = 0; i < q->nr; i++) | |
3147 | if (!diff_unmodified_pair(q->queue[i])) | |
3148 | return 0; | |
3149 | return 1; | |
3150 | } | |
3151 | ||
3152 | #if DIFF_DEBUG | |
3153 | void diff_debug_filespec(struct diff_filespec *s, int x, const char *one) | |
3154 | { | |
3155 | fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n", | |
3156 | x, one ? one : "", | |
3157 | s->path, | |
3158 | DIFF_FILE_VALID(s) ? "valid" : "invalid", | |
3159 | s->mode, | |
3160 | s->sha1_valid ? sha1_to_hex(s->sha1) : ""); | |
3161 | fprintf(stderr, "queue[%d] %s size %lu flags %d\n", | |
3162 | x, one ? one : "", | |
3163 | s->size, s->xfrm_flags); | |
3164 | } | |
3165 | ||
3166 | void diff_debug_filepair(const struct diff_filepair *p, int i) | |
3167 | { | |
3168 | diff_debug_filespec(p->one, i, "one"); | |
3169 | diff_debug_filespec(p->two, i, "two"); | |
64479711 | 3170 | fprintf(stderr, "score %d, status %c rename_used %d broken %d\n", |
6973dcae | 3171 | p->score, p->status ? p->status : '?', |
64479711 | 3172 | p->one->rename_used, p->broken_pair); |
6973dcae JH |
3173 | } |
3174 | ||
3175 | void diff_debug_queue(const char *msg, struct diff_queue_struct *q) | |
3176 | { | |
3177 | int i; | |
3178 | if (msg) | |
3179 | fprintf(stderr, "%s\n", msg); | |
3180 | fprintf(stderr, "q->nr = %d\n", q->nr); | |
3181 | for (i = 0; i < q->nr; i++) { | |
3182 | struct diff_filepair *p = q->queue[i]; | |
3183 | diff_debug_filepair(p, i); | |
3184 | } | |
3185 | } | |
3186 | #endif | |
3187 | ||
3188 | static void diff_resolve_rename_copy(void) | |
3189 | { | |
64479711 LT |
3190 | int i; |
3191 | struct diff_filepair *p; | |
6973dcae JH |
3192 | struct diff_queue_struct *q = &diff_queued_diff; |
3193 | ||
3194 | diff_debug_queue("resolve-rename-copy", q); | |
3195 | ||
3196 | for (i = 0; i < q->nr; i++) { | |
3197 | p = q->queue[i]; | |
3198 | p->status = 0; /* undecided */ | |
3199 | if (DIFF_PAIR_UNMERGED(p)) | |
3200 | p->status = DIFF_STATUS_UNMERGED; | |
3201 | else if (!DIFF_FILE_VALID(p->one)) | |
3202 | p->status = DIFF_STATUS_ADDED; | |
3203 | else if (!DIFF_FILE_VALID(p->two)) | |
3204 | p->status = DIFF_STATUS_DELETED; | |
3205 | else if (DIFF_PAIR_TYPE_CHANGED(p)) | |
3206 | p->status = DIFF_STATUS_TYPE_CHANGED; | |
3207 | ||
3208 | /* from this point on, we are dealing with a pair | |
3209 | * whose both sides are valid and of the same type, i.e. | |
3210 | * either in-place edit or rename/copy edit. | |
3211 | */ | |
3212 | else if (DIFF_PAIR_RENAME(p)) { | |
64479711 LT |
3213 | /* |
3214 | * A rename might have re-connected a broken | |
3215 | * pair up, causing the pathnames to be the | |
3216 | * same again. If so, that's not a rename at | |
3217 | * all, just a modification.. | |
3218 | * | |
3219 | * Otherwise, see if this source was used for | |
3220 | * multiple renames, in which case we decrement | |
3221 | * the count, and call it a copy. | |
6973dcae | 3222 | */ |
64479711 LT |
3223 | if (!strcmp(p->one->path, p->two->path)) |
3224 | p->status = DIFF_STATUS_MODIFIED; | |
3225 | else if (--p->one->rename_used > 0) | |
6973dcae | 3226 | p->status = DIFF_STATUS_COPIED; |
64479711 | 3227 | else |
6973dcae JH |
3228 | p->status = DIFF_STATUS_RENAMED; |
3229 | } | |
a89fccd2 | 3230 | else if (hashcmp(p->one->sha1, p->two->sha1) || |
d516c2d1 | 3231 | p->one->mode != p->two->mode || |
85adbf2f JL |
3232 | p->one->dirty_submodule || |
3233 | p->two->dirty_submodule || | |
d516c2d1 | 3234 | is_null_sha1(p->one->sha1)) |
6973dcae JH |
3235 | p->status = DIFF_STATUS_MODIFIED; |
3236 | else { | |
3237 | /* This is a "no-change" entry and should not | |
3238 | * happen anymore, but prepare for broken callers. | |
3239 | */ | |
3240 | error("feeding unmodified %s to diffcore", | |
3241 | p->one->path); | |
3242 | p->status = DIFF_STATUS_UNKNOWN; | |
3243 | } | |
3244 | } | |
3245 | diff_debug_queue("resolve-rename-copy done", q); | |
3246 | } | |
3247 | ||
c6744349 | 3248 | static int check_pair_status(struct diff_filepair *p) |
6973dcae | 3249 | { |
6973dcae JH |
3250 | switch (p->status) { |
3251 | case DIFF_STATUS_UNKNOWN: | |
c6744349 | 3252 | return 0; |
6973dcae JH |
3253 | case 0: |
3254 | die("internal error in diff-resolve-rename-copy"); | |
6973dcae | 3255 | default: |
c6744349 | 3256 | return 1; |
6973dcae JH |
3257 | } |
3258 | } | |
3259 | ||
c6744349 TH |
3260 | static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt) |
3261 | { | |
3262 | int fmt = opt->output_format; | |
3263 | ||
3264 | if (fmt & DIFF_FORMAT_CHECKDIFF) | |
3265 | diff_flush_checkdiff(p, opt); | |
3266 | else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) | |
3267 | diff_flush_raw(p, opt); | |
cd676a51 JH |
3268 | else if (fmt & DIFF_FORMAT_NAME) { |
3269 | const char *name_a, *name_b; | |
3270 | name_a = p->two->path; | |
3271 | name_b = NULL; | |
3272 | strip_prefix(opt->prefix_length, &name_a, &name_b); | |
c0c77734 | 3273 | write_name_quoted(name_a, opt->file, opt->line_termination); |
cd676a51 | 3274 | } |
c6744349 TH |
3275 | } |
3276 | ||
c0c77734 | 3277 | static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs) |
4bbd261b SE |
3278 | { |
3279 | if (fs->mode) | |
c0c77734 | 3280 | fprintf(file, " %s mode %06o ", newdelete, fs->mode); |
4bbd261b | 3281 | else |
c0c77734 DB |
3282 | fprintf(file, " %s ", newdelete); |
3283 | write_name_quoted(fs->path, file, '\n'); | |
4bbd261b SE |
3284 | } |
3285 | ||
3286 | ||
c0c77734 | 3287 | static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name) |
4bbd261b SE |
3288 | { |
3289 | if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) { | |
c0c77734 | 3290 | fprintf(file, " mode change %06o => %06o%c", p->one->mode, p->two->mode, |
663af342 | 3291 | show_name ? ' ' : '\n'); |
0d26a64e | 3292 | if (show_name) { |
c0c77734 | 3293 | write_name_quoted(p->two->path, file, '\n'); |
0d26a64e | 3294 | } |
4bbd261b SE |
3295 | } |
3296 | } | |
3297 | ||
c0c77734 | 3298 | static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p) |
4bbd261b | 3299 | { |
b9f44164 | 3300 | char *names = pprint_rename(p->one->path, p->two->path); |
4bbd261b | 3301 | |
c0c77734 | 3302 | fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p)); |
b9f44164 | 3303 | free(names); |
c0c77734 | 3304 | show_mode_change(file, p, 0); |
4bbd261b SE |
3305 | } |
3306 | ||
c0c77734 | 3307 | static void diff_summary(FILE *file, struct diff_filepair *p) |
4bbd261b SE |
3308 | { |
3309 | switch(p->status) { | |
3310 | case DIFF_STATUS_DELETED: | |
c0c77734 | 3311 | show_file_mode_name(file, "delete", p->one); |
4bbd261b SE |
3312 | break; |
3313 | case DIFF_STATUS_ADDED: | |
c0c77734 | 3314 | show_file_mode_name(file, "create", p->two); |
4bbd261b SE |
3315 | break; |
3316 | case DIFF_STATUS_COPIED: | |
c0c77734 | 3317 | show_rename_copy(file, "copy", p); |
4bbd261b SE |
3318 | break; |
3319 | case DIFF_STATUS_RENAMED: | |
c0c77734 | 3320 | show_rename_copy(file, "rename", p); |
4bbd261b SE |
3321 | break; |
3322 | default: | |
3323 | if (p->score) { | |
c0c77734 DB |
3324 | fputs(" rewrite ", file); |
3325 | write_name_quoted(p->two->path, file, ' '); | |
3326 | fprintf(file, "(%d%%)\n", similarity_index(p)); | |
663af342 | 3327 | } |
c0c77734 | 3328 | show_mode_change(file, p, !p->score); |
4bbd261b SE |
3329 | break; |
3330 | } | |
3331 | } | |
3332 | ||
fcb3d0ad | 3333 | struct patch_id_t { |
9126f009 | 3334 | git_SHA_CTX *ctx; |
fcb3d0ad JS |
3335 | int patchlen; |
3336 | }; | |
3337 | ||
3338 | static int remove_space(char *line, int len) | |
3339 | { | |
3340 | int i; | |
663af342 PH |
3341 | char *dst = line; |
3342 | unsigned char c; | |
fcb3d0ad | 3343 | |
663af342 PH |
3344 | for (i = 0; i < len; i++) |
3345 | if (!isspace((c = line[i]))) | |
3346 | *dst++ = c; | |
fcb3d0ad | 3347 | |
663af342 | 3348 | return dst - line; |
fcb3d0ad JS |
3349 | } |
3350 | ||
3351 | static void patch_id_consume(void *priv, char *line, unsigned long len) | |
3352 | { | |
3353 | struct patch_id_t *data = priv; | |
3354 | int new_len; | |
3355 | ||
3356 | /* Ignore line numbers when computing the SHA1 of the patch */ | |
cc44c765 | 3357 | if (!prefixcmp(line, "@@ -")) |
fcb3d0ad JS |
3358 | return; |
3359 | ||
3360 | new_len = remove_space(line, len); | |
3361 | ||
9126f009 | 3362 | git_SHA1_Update(data->ctx, line, new_len); |
fcb3d0ad JS |
3363 | data->patchlen += new_len; |
3364 | } | |
3365 | ||
3366 | /* returns 0 upon success, and writes result into sha1 */ | |
3367 | static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1) | |
3368 | { | |
3369 | struct diff_queue_struct *q = &diff_queued_diff; | |
3370 | int i; | |
9126f009 | 3371 | git_SHA_CTX ctx; |
fcb3d0ad JS |
3372 | struct patch_id_t data; |
3373 | char buffer[PATH_MAX * 4 + 20]; | |
3374 | ||
9126f009 | 3375 | git_SHA1_Init(&ctx); |
fcb3d0ad JS |
3376 | memset(&data, 0, sizeof(struct patch_id_t)); |
3377 | data.ctx = &ctx; | |
fcb3d0ad JS |
3378 | |
3379 | for (i = 0; i < q->nr; i++) { | |
3380 | xpparam_t xpp; | |
3381 | xdemitconf_t xecfg; | |
fcb3d0ad JS |
3382 | mmfile_t mf1, mf2; |
3383 | struct diff_filepair *p = q->queue[i]; | |
3384 | int len1, len2; | |
3385 | ||
9ccd0a88 | 3386 | memset(&xpp, 0, sizeof(xpp)); |
30b25010 | 3387 | memset(&xecfg, 0, sizeof(xecfg)); |
fcb3d0ad JS |
3388 | if (p->status == 0) |
3389 | return error("internal diff status error"); | |
3390 | if (p->status == DIFF_STATUS_UNKNOWN) | |
3391 | continue; | |
3392 | if (diff_unmodified_pair(p)) | |
3393 | continue; | |
3394 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || | |
3395 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
3396 | continue; | |
3397 | if (DIFF_PAIR_UNMERGED(p)) | |
3398 | continue; | |
3399 | ||
3400 | diff_fill_sha1_info(p->one); | |
3401 | diff_fill_sha1_info(p->two); | |
3402 | if (fill_mmfile(&mf1, p->one) < 0 || | |
3403 | fill_mmfile(&mf2, p->two) < 0) | |
3404 | return error("unable to read files to diff"); | |
3405 | ||
fcb3d0ad JS |
3406 | len1 = remove_space(p->one->path, strlen(p->one->path)); |
3407 | len2 = remove_space(p->two->path, strlen(p->two->path)); | |
3408 | if (p->one->mode == 0) | |
3409 | len1 = snprintf(buffer, sizeof(buffer), | |
3410 | "diff--gita/%.*sb/%.*s" | |
3411 | "newfilemode%06o" | |
3412 | "---/dev/null" | |
3413 | "+++b/%.*s", | |
3414 | len1, p->one->path, | |
3415 | len2, p->two->path, | |
3416 | p->two->mode, | |
3417 | len2, p->two->path); | |
3418 | else if (p->two->mode == 0) | |
3419 | len1 = snprintf(buffer, sizeof(buffer), | |
3420 | "diff--gita/%.*sb/%.*s" | |
3421 | "deletedfilemode%06o" | |
3422 | "---a/%.*s" | |
3423 | "+++/dev/null", | |
3424 | len1, p->one->path, | |
3425 | len2, p->two->path, | |
3426 | p->one->mode, | |
3427 | len1, p->one->path); | |
3428 | else | |
3429 | len1 = snprintf(buffer, sizeof(buffer), | |
3430 | "diff--gita/%.*sb/%.*s" | |
3431 | "---a/%.*s" | |
3432 | "+++b/%.*s", | |
3433 | len1, p->one->path, | |
3434 | len2, p->two->path, | |
3435 | len1, p->one->path, | |
3436 | len2, p->two->path); | |
9126f009 | 3437 | git_SHA1_Update(&ctx, buffer, len1); |
fcb3d0ad JS |
3438 | |
3439 | xpp.flags = XDF_NEED_MINIMAL; | |
3440 | xecfg.ctxlen = 3; | |
9fdc3bb5 | 3441 | xecfg.flags = XDL_EMIT_FUNCNAMES; |
8a3f524b | 3442 | xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data, |
dfea7900 | 3443 | &xpp, &xecfg); |
fcb3d0ad JS |
3444 | } |
3445 | ||
9126f009 | 3446 | git_SHA1_Final(sha1, &ctx); |
fcb3d0ad JS |
3447 | return 0; |
3448 | } | |
3449 | ||
3450 | int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1) | |
3451 | { | |
3452 | struct diff_queue_struct *q = &diff_queued_diff; | |
3453 | int i; | |
3454 | int result = diff_get_patch_id(options, sha1); | |
3455 | ||
3456 | for (i = 0; i < q->nr; i++) | |
3457 | diff_free_filepair(q->queue[i]); | |
3458 | ||
3459 | free(q->queue); | |
3460 | q->queue = NULL; | |
3461 | q->nr = q->alloc = 0; | |
3462 | ||
3463 | return result; | |
3464 | } | |
3465 | ||
946c3784 | 3466 | static int is_summary_empty(const struct diff_queue_struct *q) |
6973dcae | 3467 | { |
6973dcae | 3468 | int i; |
6973dcae | 3469 | |
946c3784 TH |
3470 | for (i = 0; i < q->nr; i++) { |
3471 | const struct diff_filepair *p = q->queue[i]; | |
3472 | ||
3473 | switch (p->status) { | |
3474 | case DIFF_STATUS_DELETED: | |
3475 | case DIFF_STATUS_ADDED: | |
3476 | case DIFF_STATUS_COPIED: | |
3477 | case DIFF_STATUS_RENAMED: | |
3478 | return 0; | |
3479 | default: | |
3480 | if (p->score) | |
3481 | return 0; | |
3482 | if (p->one->mode && p->two->mode && | |
3483 | p->one->mode != p->two->mode) | |
3484 | return 0; | |
3485 | break; | |
3486 | } | |
6973dcae | 3487 | } |
946c3784 TH |
3488 | return 1; |
3489 | } | |
3490 | ||
6973dcae JH |
3491 | void diff_flush(struct diff_options *options) |
3492 | { | |
3493 | struct diff_queue_struct *q = &diff_queued_diff; | |
c6744349 | 3494 | int i, output_format = options->output_format; |
946c3784 | 3495 | int separator = 0; |
6973dcae | 3496 | |
c6744349 TH |
3497 | /* |
3498 | * Order: raw, stat, summary, patch | |
3499 | * or: name/name-status/checkdiff (other bits clear) | |
3500 | */ | |
946c3784 TH |
3501 | if (!q->nr) |
3502 | goto free_queue; | |
6973dcae | 3503 | |
c6744349 TH |
3504 | if (output_format & (DIFF_FORMAT_RAW | |
3505 | DIFF_FORMAT_NAME | | |
3506 | DIFF_FORMAT_NAME_STATUS | | |
3507 | DIFF_FORMAT_CHECKDIFF)) { | |
6973dcae JH |
3508 | for (i = 0; i < q->nr; i++) { |
3509 | struct diff_filepair *p = q->queue[i]; | |
c6744349 TH |
3510 | if (check_pair_status(p)) |
3511 | flush_one_pair(p, options); | |
6973dcae | 3512 | } |
946c3784 | 3513 | separator++; |
6973dcae | 3514 | } |
c6744349 | 3515 | |
c04a7155 | 3516 | if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) { |
5e2b0636 | 3517 | struct diffstat_t diffstat; |
c6744349 | 3518 | |
5e2b0636 | 3519 | memset(&diffstat, 0, sizeof(struct diffstat_t)); |
6973dcae JH |
3520 | for (i = 0; i < q->nr; i++) { |
3521 | struct diff_filepair *p = q->queue[i]; | |
c6744349 | 3522 | if (check_pair_status(p)) |
5e2b0636 | 3523 | diff_flush_stat(p, options, &diffstat); |
6973dcae | 3524 | } |
74e2abe5 JH |
3525 | if (output_format & DIFF_FORMAT_NUMSTAT) |
3526 | show_numstat(&diffstat, options); | |
3527 | if (output_format & DIFF_FORMAT_DIFFSTAT) | |
3528 | show_stats(&diffstat, options); | |
f604652e | 3529 | if (output_format & DIFF_FORMAT_SHORTSTAT) |
c0c77734 | 3530 | show_shortstats(&diffstat, options); |
f604652e | 3531 | free_diffstat_info(&diffstat); |
3969cf7d | 3532 | separator++; |
6973dcae | 3533 | } |
c04a7155 JH |
3534 | if (output_format & DIFF_FORMAT_DIRSTAT) |
3535 | show_dirstat(options); | |
6973dcae | 3536 | |
946c3784 | 3537 | if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) { |
c6744349 | 3538 | for (i = 0; i < q->nr; i++) |
c0c77734 | 3539 | diff_summary(options->file, q->queue[i]); |
3969cf7d | 3540 | separator++; |
6973dcae JH |
3541 | } |
3542 | ||
6977c250 LA |
3543 | if (output_format & DIFF_FORMAT_NO_OUTPUT && |
3544 | DIFF_OPT_TST(options, EXIT_WITH_STATUS) && | |
3545 | DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) { | |
3546 | /* | |
3547 | * run diff_flush_patch for the exit status. setting | |
3548 | * options->file to /dev/null should be safe, becaue we | |
3549 | * aren't supposed to produce any output anyway. | |
3550 | */ | |
3551 | if (options->close_file) | |
3552 | fclose(options->file); | |
3553 | options->file = fopen("/dev/null", "w"); | |
3554 | if (!options->file) | |
3555 | die_errno("Could not open /dev/null"); | |
3556 | options->close_file = 1; | |
3557 | for (i = 0; i < q->nr; i++) { | |
3558 | struct diff_filepair *p = q->queue[i]; | |
3559 | if (check_pair_status(p)) | |
3560 | diff_flush_patch(p, options); | |
3561 | if (options->found_changes) | |
3562 | break; | |
3563 | } | |
3564 | } | |
3565 | ||
c6744349 | 3566 | if (output_format & DIFF_FORMAT_PATCH) { |
946c3784 | 3567 | if (separator) { |
6b2fbaaf | 3568 | putc(options->line_termination, options->file); |
946c3784 TH |
3569 | if (options->stat_sep) { |
3570 | /* attach patch instead of inline */ | |
c0c77734 | 3571 | fputs(options->stat_sep, options->file); |
946c3784 | 3572 | } |
c6744349 TH |
3573 | } |
3574 | ||
3575 | for (i = 0; i < q->nr; i++) { | |
3576 | struct diff_filepair *p = q->queue[i]; | |
3577 | if (check_pair_status(p)) | |
3578 | diff_flush_patch(p, options); | |
3579 | } | |
4bbd261b SE |
3580 | } |
3581 | ||
04245581 JK |
3582 | if (output_format & DIFF_FORMAT_CALLBACK) |
3583 | options->format_callback(q, options, options->format_callback_data); | |
3584 | ||
c6744349 TH |
3585 | for (i = 0; i < q->nr; i++) |
3586 | diff_free_filepair(q->queue[i]); | |
946c3784 | 3587 | free_queue: |
6973dcae JH |
3588 | free(q->queue); |
3589 | q->queue = NULL; | |
3590 | q->nr = q->alloc = 0; | |
c0c77734 DB |
3591 | if (options->close_file) |
3592 | fclose(options->file); | |
f245194f JH |
3593 | |
3594 | /* | |
97bf2a08 | 3595 | * Report the content-level differences with HAS_CHANGES; |
f245194f JH |
3596 | * diff_addremove/diff_change does not set the bit when |
3597 | * DIFF_FROM_CONTENTS is in effect (e.g. with -w). | |
3598 | */ | |
3599 | if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) { | |
3600 | if (options->found_changes) | |
3601 | DIFF_OPT_SET(options, HAS_CHANGES); | |
3602 | else | |
3603 | DIFF_OPT_CLR(options, HAS_CHANGES); | |
3604 | } | |
6973dcae JH |
3605 | } |
3606 | ||
3607 | static void diffcore_apply_filter(const char *filter) | |
3608 | { | |
3609 | int i; | |
3610 | struct diff_queue_struct *q = &diff_queued_diff; | |
3611 | struct diff_queue_struct outq; | |
3612 | outq.queue = NULL; | |
3613 | outq.nr = outq.alloc = 0; | |
3614 | ||
3615 | if (!filter) | |
3616 | return; | |
3617 | ||
3618 | if (strchr(filter, DIFF_STATUS_FILTER_AON)) { | |
3619 | int found; | |
3620 | for (i = found = 0; !found && i < q->nr; i++) { | |
3621 | struct diff_filepair *p = q->queue[i]; | |
3622 | if (((p->status == DIFF_STATUS_MODIFIED) && | |
3623 | ((p->score && | |
3624 | strchr(filter, DIFF_STATUS_FILTER_BROKEN)) || | |
3625 | (!p->score && | |
3626 | strchr(filter, DIFF_STATUS_MODIFIED)))) || | |
3627 | ((p->status != DIFF_STATUS_MODIFIED) && | |
3628 | strchr(filter, p->status))) | |
3629 | found++; | |
3630 | } | |
3631 | if (found) | |
3632 | return; | |
3633 | ||
3634 | /* otherwise we will clear the whole queue | |
3635 | * by copying the empty outq at the end of this | |
3636 | * function, but first clear the current entries | |
3637 | * in the queue. | |
3638 | */ | |
3639 | for (i = 0; i < q->nr; i++) | |
3640 | diff_free_filepair(q->queue[i]); | |
3641 | } | |
3642 | else { | |
3643 | /* Only the matching ones */ | |
3644 | for (i = 0; i < q->nr; i++) { | |
3645 | struct diff_filepair *p = q->queue[i]; | |
3646 | ||
3647 | if (((p->status == DIFF_STATUS_MODIFIED) && | |
3648 | ((p->score && | |
3649 | strchr(filter, DIFF_STATUS_FILTER_BROKEN)) || | |
3650 | (!p->score && | |
3651 | strchr(filter, DIFF_STATUS_MODIFIED)))) || | |
3652 | ((p->status != DIFF_STATUS_MODIFIED) && | |
3653 | strchr(filter, p->status))) | |
3654 | diff_q(&outq, p); | |
3655 | else | |
3656 | diff_free_filepair(p); | |
3657 | } | |
3658 | } | |
3659 | free(q->queue); | |
3660 | *q = outq; | |
3661 | } | |
3662 | ||
5701115a SV |
3663 | /* Check whether two filespecs with the same mode and size are identical */ |
3664 | static int diff_filespec_is_identical(struct diff_filespec *one, | |
3665 | struct diff_filespec *two) | |
3666 | { | |
2b459b48 JH |
3667 | if (S_ISGITLINK(one->mode)) |
3668 | return 0; | |
5701115a SV |
3669 | if (diff_populate_filespec(one, 0)) |
3670 | return 0; | |
3671 | if (diff_populate_filespec(two, 0)) | |
3672 | return 0; | |
3673 | return !memcmp(one->data, two->data, one->size); | |
3674 | } | |
3675 | ||
fb13227e JH |
3676 | static void diffcore_skip_stat_unmatch(struct diff_options *diffopt) |
3677 | { | |
3678 | int i; | |
3679 | struct diff_queue_struct *q = &diff_queued_diff; | |
3680 | struct diff_queue_struct outq; | |
3681 | outq.queue = NULL; | |
3682 | outq.nr = outq.alloc = 0; | |
3683 | ||
3684 | for (i = 0; i < q->nr; i++) { | |
3685 | struct diff_filepair *p = q->queue[i]; | |
3686 | ||
3687 | /* | |
9517e6b8 | 3688 | * 1. Entries that come from stat info dirtiness |
fb13227e JH |
3689 | * always have both sides (iow, not create/delete), |
3690 | * one side of the object name is unknown, with | |
3691 | * the same mode and size. Keep the ones that | |
3692 | * do not match these criteria. They have real | |
3693 | * differences. | |
3694 | * | |
3695 | * 2. At this point, the file is known to be modified, | |
3696 | * with the same mode and size, and the object | |
3697 | * name of one side is unknown. Need to inspect | |
3698 | * the identical contents. | |
3699 | */ | |
3700 | if (!DIFF_FILE_VALID(p->one) || /* (1) */ | |
3701 | !DIFF_FILE_VALID(p->two) || | |
3702 | (p->one->sha1_valid && p->two->sha1_valid) || | |
3703 | (p->one->mode != p->two->mode) || | |
3704 | diff_populate_filespec(p->one, 1) || | |
3705 | diff_populate_filespec(p->two, 1) || | |
3706 | (p->one->size != p->two->size) || | |
5701115a | 3707 | !diff_filespec_is_identical(p->one, p->two)) /* (2) */ |
fb13227e JH |
3708 | diff_q(&outq, p); |
3709 | else { | |
3710 | /* | |
3711 | * The caller can subtract 1 from skip_stat_unmatch | |
3712 | * to determine how many paths were dirty only | |
3713 | * due to stat info mismatch. | |
3714 | */ | |
8f67f8ae | 3715 | if (!DIFF_OPT_TST(diffopt, NO_INDEX)) |
6d2d9e86 | 3716 | diffopt->skip_stat_unmatch++; |
fb13227e JH |
3717 | diff_free_filepair(p); |
3718 | } | |
3719 | } | |
3720 | free(q->queue); | |
3721 | *q = outq; | |
3722 | } | |
3723 | ||
730f7284 JH |
3724 | static int diffnamecmp(const void *a_, const void *b_) |
3725 | { | |
3726 | const struct diff_filepair *a = *((const struct diff_filepair **)a_); | |
3727 | const struct diff_filepair *b = *((const struct diff_filepair **)b_); | |
3728 | const char *name_a, *name_b; | |
3729 | ||
3730 | name_a = a->one ? a->one->path : a->two->path; | |
3731 | name_b = b->one ? b->one->path : b->two->path; | |
3732 | return strcmp(name_a, name_b); | |
3733 | } | |
3734 | ||
3735 | void diffcore_fix_diff_index(struct diff_options *options) | |
3736 | { | |
3737 | struct diff_queue_struct *q = &diff_queued_diff; | |
3738 | qsort(q->queue, q->nr, sizeof(q->queue[0]), diffnamecmp); | |
3739 | } | |
3740 | ||
6973dcae JH |
3741 | void diffcore_std(struct diff_options *options) |
3742 | { | |
9d865356 | 3743 | if (options->skip_stat_unmatch) |
fb13227e | 3744 | diffcore_skip_stat_unmatch(options); |
6973dcae JH |
3745 | if (options->break_opt != -1) |
3746 | diffcore_break(options->break_opt); | |
3747 | if (options->detect_rename) | |
3748 | diffcore_rename(options); | |
3749 | if (options->break_opt != -1) | |
3750 | diffcore_merge_broken(); | |
3751 | if (options->pickaxe) | |
3752 | diffcore_pickaxe(options->pickaxe, options->pickaxe_opts); | |
3753 | if (options->orderfile) | |
3754 | diffcore_order(options->orderfile); | |
3755 | diff_resolve_rename_copy(); | |
3756 | diffcore_apply_filter(options->filter); | |
68aacb2f | 3757 | |
f245194f | 3758 | if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) |
8f67f8ae PH |
3759 | DIFF_OPT_SET(options, HAS_CHANGES); |
3760 | else | |
3761 | DIFF_OPT_CLR(options, HAS_CHANGES); | |
6973dcae JH |
3762 | } |
3763 | ||
da31b358 JH |
3764 | int diff_result_code(struct diff_options *opt, int status) |
3765 | { | |
3766 | int result = 0; | |
3767 | if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) && | |
3768 | !(opt->output_format & DIFF_FORMAT_CHECKDIFF)) | |
3769 | return status; | |
3770 | if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) && | |
3771 | DIFF_OPT_TST(opt, HAS_CHANGES)) | |
3772 | result |= 01; | |
3773 | if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) && | |
3774 | DIFF_OPT_TST(opt, CHECK_FAILED)) | |
3775 | result |= 02; | |
3776 | return result; | |
3777 | } | |
6973dcae | 3778 | |
6973dcae JH |
3779 | void diff_addremove(struct diff_options *options, |
3780 | int addremove, unsigned mode, | |
3781 | const unsigned char *sha1, | |
e3d42c47 | 3782 | const char *concatpath, unsigned dirty_submodule) |
6973dcae | 3783 | { |
6973dcae JH |
3784 | struct diff_filespec *one, *two; |
3785 | ||
50fd9bd8 JS |
3786 | if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(mode)) |
3787 | return; | |
3788 | ||
6973dcae JH |
3789 | /* This may look odd, but it is a preparation for |
3790 | * feeding "there are unchanged files which should | |
3791 | * not produce diffs, but when you are doing copy | |
3792 | * detection you would need them, so here they are" | |
3793 | * entries to the diff-core. They will be prefixed | |
3794 | * with something like '=' or '*' (I haven't decided | |
3795 | * which but should not make any difference). | |
a6080a0a | 3796 | * Feeding the same new and old to diff_change() |
6973dcae JH |
3797 | * also has the same effect. |
3798 | * Before the final output happens, they are pruned after | |
3799 | * merged into rename/copy pairs as appropriate. | |
3800 | */ | |
8f67f8ae | 3801 | if (DIFF_OPT_TST(options, REVERSE_DIFF)) |
6973dcae JH |
3802 | addremove = (addremove == '+' ? '-' : |
3803 | addremove == '-' ? '+' : addremove); | |
3804 | ||
cd676a51 JH |
3805 | if (options->prefix && |
3806 | strncmp(concatpath, options->prefix, options->prefix_length)) | |
3807 | return; | |
3808 | ||
6973dcae JH |
3809 | one = alloc_filespec(concatpath); |
3810 | two = alloc_filespec(concatpath); | |
3811 | ||
3812 | if (addremove != '+') | |
3813 | fill_filespec(one, sha1, mode); | |
e3d42c47 | 3814 | if (addremove != '-') { |
6973dcae | 3815 | fill_filespec(two, sha1, mode); |
e3d42c47 JL |
3816 | two->dirty_submodule = dirty_submodule; |
3817 | } | |
6973dcae JH |
3818 | |
3819 | diff_queue(&diff_queued_diff, one, two); | |
f245194f JH |
3820 | if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) |
3821 | DIFF_OPT_SET(options, HAS_CHANGES); | |
6973dcae JH |
3822 | } |
3823 | ||
3824 | void diff_change(struct diff_options *options, | |
3825 | unsigned old_mode, unsigned new_mode, | |
3826 | const unsigned char *old_sha1, | |
3827 | const unsigned char *new_sha1, | |
e3d42c47 JL |
3828 | const char *concatpath, |
3829 | unsigned old_dirty_submodule, unsigned new_dirty_submodule) | |
6973dcae | 3830 | { |
6973dcae JH |
3831 | struct diff_filespec *one, *two; |
3832 | ||
50fd9bd8 JS |
3833 | if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(old_mode) |
3834 | && S_ISGITLINK(new_mode)) | |
3835 | return; | |
3836 | ||
8f67f8ae | 3837 | if (DIFF_OPT_TST(options, REVERSE_DIFF)) { |
6973dcae JH |
3838 | unsigned tmp; |
3839 | const unsigned char *tmp_c; | |
3840 | tmp = old_mode; old_mode = new_mode; new_mode = tmp; | |
3841 | tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c; | |
e3d42c47 JL |
3842 | tmp = old_dirty_submodule; old_dirty_submodule = new_dirty_submodule; |
3843 | new_dirty_submodule = tmp; | |
6973dcae | 3844 | } |
cd676a51 JH |
3845 | |
3846 | if (options->prefix && | |
3847 | strncmp(concatpath, options->prefix, options->prefix_length)) | |
3848 | return; | |
3849 | ||
6973dcae JH |
3850 | one = alloc_filespec(concatpath); |
3851 | two = alloc_filespec(concatpath); | |
3852 | fill_filespec(one, old_sha1, old_mode); | |
3853 | fill_filespec(two, new_sha1, new_mode); | |
e3d42c47 JL |
3854 | one->dirty_submodule = old_dirty_submodule; |
3855 | two->dirty_submodule = new_dirty_submodule; | |
6973dcae JH |
3856 | |
3857 | diff_queue(&diff_queued_diff, one, two); | |
f245194f JH |
3858 | if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) |
3859 | DIFF_OPT_SET(options, HAS_CHANGES); | |
6973dcae JH |
3860 | } |
3861 | ||
3862 | void diff_unmerge(struct diff_options *options, | |
e9c84099 JH |
3863 | const char *path, |
3864 | unsigned mode, const unsigned char *sha1) | |
6973dcae JH |
3865 | { |
3866 | struct diff_filespec *one, *two; | |
cd676a51 JH |
3867 | |
3868 | if (options->prefix && | |
3869 | strncmp(path, options->prefix, options->prefix_length)) | |
3870 | return; | |
3871 | ||
6973dcae JH |
3872 | one = alloc_filespec(path); |
3873 | two = alloc_filespec(path); | |
e9c84099 JH |
3874 | fill_filespec(one, sha1, mode); |
3875 | diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1; | |
6973dcae | 3876 | } |
9cb92c39 JK |
3877 | |
3878 | static char *run_textconv(const char *pgm, struct diff_filespec *spec, | |
3879 | size_t *outsize) | |
3880 | { | |
479b0ae8 | 3881 | struct diff_tempfile *temp; |
9cb92c39 JK |
3882 | const char *argv[3]; |
3883 | const char **arg = argv; | |
3884 | struct child_process child; | |
3885 | struct strbuf buf = STRBUF_INIT; | |
da1fbed3 | 3886 | int err = 0; |
9cb92c39 | 3887 | |
479b0ae8 | 3888 | temp = prepare_temp_file(spec->path, spec); |
9cb92c39 | 3889 | *arg++ = pgm; |
479b0ae8 | 3890 | *arg++ = temp->name; |
9cb92c39 JK |
3891 | *arg = NULL; |
3892 | ||
3893 | memset(&child, 0, sizeof(child)); | |
41a457e4 | 3894 | child.use_shell = 1; |
9cb92c39 JK |
3895 | child.argv = argv; |
3896 | child.out = -1; | |
da1fbed3 | 3897 | if (start_command(&child)) { |
479b0ae8 | 3898 | remove_tempfile(); |
9cb92c39 JK |
3899 | return NULL; |
3900 | } | |
da1fbed3 JS |
3901 | |
3902 | if (strbuf_read(&buf, child.out, 0) < 0) | |
3903 | err = error("error reading from textconv command '%s'", pgm); | |
70d70999 | 3904 | close(child.out); |
da1fbed3 JS |
3905 | |
3906 | if (finish_command(&child) || err) { | |
3907 | strbuf_release(&buf); | |
3908 | remove_tempfile(); | |
3909 | return NULL; | |
3910 | } | |
479b0ae8 | 3911 | remove_tempfile(); |
9cb92c39 JK |
3912 | |
3913 | return strbuf_detach(&buf, outsize); | |
3914 | } |