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