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