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