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