Git 1.7.12.4
[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;
6b2f2d98 28int diff_use_color_default = -1;
98a4d87b 29static const char *diff_word_regex_cfg;
cbe02100 30static const char *external_diff_cmd_cfg;
aecbf914 31int diff_auto_refresh_index = 1;
a5a818ee 32static int diff_mnemonic_prefix;
f89504dd 33static int diff_no_prefix;
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;
0974c117 1303 uintmax_t added, deleted;
6973dcae
JH
1304 } **files;
1305};
1306
1307static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
1308 const char *name_a,
1309 const char *name_b)
1310{
1311 struct diffstat_file *x;
1312 x = xcalloc(sizeof (*x), 1);
1313 if (diffstat->nr == diffstat->alloc) {
1314 diffstat->alloc = alloc_nr(diffstat->alloc);
1315 diffstat->files = xrealloc(diffstat->files,
1316 diffstat->alloc * sizeof(x));
1317 }
1318 diffstat->files[diffstat->nr++] = x;
1319 if (name_b) {
f604652e
JH
1320 x->from_name = xstrdup(name_a);
1321 x->name = xstrdup(name_b);
6973dcae
JH
1322 x->is_renamed = 1;
1323 }
f604652e
JH
1324 else {
1325 x->from_name = NULL;
9befac47 1326 x->name = xstrdup(name_a);
f604652e 1327 }
6973dcae
JH
1328 return x;
1329}
1330
1331static void diffstat_consume(void *priv, char *line, unsigned long len)
1332{
1333 struct diffstat_t *diffstat = priv;
1334 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
1335
1336 if (line[0] == '+')
1337 x->added++;
1338 else if (line[0] == '-')
1339 x->deleted++;
1340}
1341
698ce6f8 1342const char mime_boundary_leader[] = "------------";
6973dcae 1343
a2540023
JH
1344static int scale_linear(int it, int width, int max_change)
1345{
2eeeef24
JH
1346 if (!it)
1347 return 0;
a2540023 1348 /*
2eeeef24
JH
1349 * make sure that at least one '-' or '+' is printed if
1350 * there is any change to this path. The easiest way is to
1351 * scale linearly as if the alloted width is one column shorter
1352 * than it is, and then add 1 to the result.
a2540023 1353 */
2eeeef24 1354 return 1 + (it * (width - 1) / max_change);
a2540023
JH
1355}
1356
c0c77734 1357static void show_name(FILE *file,
a408e0e6 1358 const char *prefix, const char *name, int len)
a2540023 1359{
a408e0e6 1360 fprintf(file, " %s%-*s |", prefix, len, name);
a2540023
JH
1361}
1362
c0c77734 1363static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
a2540023
JH
1364{
1365 if (cnt <= 0)
1366 return;
c0c77734 1367 fprintf(file, "%s", set);
a2540023 1368 while (cnt--)
c0c77734
DB
1369 putc(ch, file);
1370 fprintf(file, "%s", reset);
a2540023
JH
1371}
1372
f604652e
JH
1373static void fill_print_name(struct diffstat_file *file)
1374{
1375 char *pname;
1376
1377 if (file->print_name)
1378 return;
1379
1380 if (!file->is_renamed) {
f285a2d7 1381 struct strbuf buf = STRBUF_INIT;
f604652e
JH
1382 if (quote_c_style(file->name, &buf, NULL, 0)) {
1383 pname = strbuf_detach(&buf, NULL);
1384 } else {
1385 pname = file->name;
1386 strbuf_release(&buf);
1387 }
1388 } else {
1389 pname = pprint_rename(file->from_name, file->name);
1390 }
1391 file->print_name = pname;
1392}
1393
7f814632
NTND
1394int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
1395{
1396 struct strbuf sb = STRBUF_INIT;
1397 int ret;
1398
1399 if (!files) {
1400 assert(insertions == 0 && deletions == 0);
218adaaa 1401 return fprintf(fp, "%s\n", " 0 files changed");
7f814632
NTND
1402 }
1403
1404 strbuf_addf(&sb,
218adaaa 1405 (files == 1) ? " %d file changed" : " %d files changed",
7f814632
NTND
1406 files);
1407
1408 /*
1409 * For binary diff, the caller may want to print "x files
1410 * changed" with insertions == 0 && deletions == 0.
1411 *
1412 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1413 * is probably less confusing (i.e skip over "2 files changed
1414 * but nothing about added/removed lines? Is this a bug in Git?").
1415 */
1416 if (insertions || deletions == 0) {
1417 /*
1418 * TRANSLATORS: "+" in (+) is a line addition marker;
1419 * do not translate it.
1420 */
1421 strbuf_addf(&sb,
218adaaa 1422 (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
7f814632
NTND
1423 insertions);
1424 }
1425
1426 if (deletions || insertions == 0) {
1427 /*
1428 * TRANSLATORS: "-" in (-) is a line removal marker;
1429 * do not translate it.
1430 */
1431 strbuf_addf(&sb,
218adaaa 1432 (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
7f814632
NTND
1433 deletions);
1434 }
1435 strbuf_addch(&sb, '\n');
1436 ret = fputs(sb.buf, fp);
1437 strbuf_release(&sb);
1438 return ret;
1439}
1440
4b25d091 1441static void show_stats(struct diffstat_t *data, struct diff_options *options)
6973dcae 1442{
eb3a9dd3 1443 int i, len, add, del, adds = 0, dels = 0;
0974c117 1444 uintmax_t max_change = 0, max_len = 0;
dc801e71
ZJS
1445 int total_files = data->nr, count;
1446 int width, name_width, graph_width, number_width = 0, bin_width = 0;
c0aa335c 1447 const char *reset, *add_c, *del_c;
7be57610 1448 const char *line_prefix = "";
e5f85df8 1449 int extra_shown = 0;
7be57610 1450 struct strbuf *msg = NULL;
6973dcae
JH
1451
1452 if (data->nr == 0)
1453 return;
1454
7be57610
BY
1455 if (options->output_prefix) {
1456 msg = options->output_prefix(options, options->output_prefix_data);
1457 line_prefix = msg->buf;
1458 }
1459
808e1db2 1460 count = options->stat_count ? options->stat_count : data->nr;
a2540023 1461
8f67f8ae 1462 reset = diff_get_color_opt(options, DIFF_RESET);
8f67f8ae
PH
1463 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1464 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
785f7432 1465
1b058bc3
ZJS
1466 /*
1467 * Find the longest filename and max number of changes
1468 */
808e1db2 1469 for (i = 0; (i < count) && (i < data->nr); i++) {
6973dcae 1470 struct diffstat_file *file = data->files[i];
0974c117 1471 uintmax_t change = file->added + file->deleted;
358e460e
MG
1472 if (!data->files[i]->is_renamed &&
1473 (change == 0)) {
808e1db2 1474 count++; /* not shown == room for one more */
358e460e
MG
1475 continue;
1476 }
f604652e
JH
1477 fill_print_name(file);
1478 len = strlen(file->print_name);
6973dcae
JH
1479 if (max_len < len)
1480 max_len = len;
1481
dc801e71
ZJS
1482 if (file->is_unmerged) {
1483 /* "Unmerged" is 8 characters */
1484 bin_width = bin_width < 8 ? 8 : bin_width;
6973dcae 1485 continue;
dc801e71
ZJS
1486 }
1487 if (file->is_binary) {
1488 /* "Bin XXX -> YYY bytes" */
1489 int w = 14 + decimal_width(file->added)
1490 + decimal_width(file->deleted);
1491 bin_width = bin_width < w ? w : bin_width;
1492 /* Display change counts aligned with "Bin" */
1493 number_width = 3;
1494 continue;
1495 }
1496
a2540023
JH
1497 if (max_change < change)
1498 max_change = change;
6973dcae 1499 }
808e1db2 1500 count = i; /* min(count, data->nr) */
6973dcae 1501
1b058bc3
ZJS
1502 /*
1503 * We have width = stat_width or term_columns() columns total.
1504 * We want a maximum of min(max_len, stat_name_width) for the name part.
969fe57b 1505 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1b058bc3
ZJS
1506 * We also need 1 for " " and 4 + decimal_width(max_change)
1507 * for " | NNNN " and one the empty column at the end, altogether
1508 * 6 + decimal_width(max_change).
1509 *
1510 * If there's not enough space, we will use the smaller of
1511 * stat_name_width (if set) and 5/8*width for the filename,
969fe57b
ZJS
1512 * and the rest for constant elements + graph part, but no more
1513 * than stat_graph_width for the graph part.
1b058bc3
ZJS
1514 * (5/8 gives 50 for filename and 30 for the constant parts + graph
1515 * for the standard terminal size).
a2540023 1516 *
1b058bc3
ZJS
1517 * In other words: stat_width limits the maximum width, and
1518 * stat_name_width fixes the maximum width of the filename,
1519 * and is also used to divide available columns if there
1520 * aren't enough.
dc801e71
ZJS
1521 *
1522 * Binary files are displayed with "Bin XXX -> YYY bytes"
1523 * instead of the change count and graph. This part is treated
1524 * similarly to the graph part, except that it is not
1525 * "scaled". If total width is too small to accomodate the
1526 * guaranteed minimum width of the filename part and the
1527 * separators and this message, this message will "overflow"
1528 * making the line longer than the maximum width.
a2540023 1529 */
1b058bc3
ZJS
1530
1531 if (options->stat_width == -1)
3f145132 1532 width = term_columns() - options->output_prefix_length;
a2540023 1533 else
1b058bc3 1534 width = options->stat_width ? options->stat_width : 80;
dc801e71
ZJS
1535 number_width = decimal_width(max_change) > number_width ?
1536 decimal_width(max_change) : number_width;
a2540023 1537
df44483a
ZJS
1538 if (options->stat_graph_width == -1)
1539 options->stat_graph_width = diff_stat_graph_width;
a2540023 1540
1b058bc3
ZJS
1541 /*
1542 * Guarantee 3/8*16==6 for the graph part
1543 * and 5/8*16==10 for the filename part
1544 */
1545 if (width < 16 + 6 + number_width)
1546 width = 16 + 6 + number_width;
1547
1548 /*
1549 * First assign sizes that are wanted, ignoring available width.
dc801e71
ZJS
1550 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1551 * starting from "XXX" should fit in graph_width.
1b058bc3 1552 */
dc801e71
ZJS
1553 graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
1554 if (options->stat_graph_width &&
1555 options->stat_graph_width < graph_width)
1556 graph_width = options->stat_graph_width;
1557
1b058bc3
ZJS
1558 name_width = (options->stat_name_width > 0 &&
1559 options->stat_name_width < max_len) ?
1560 options->stat_name_width : max_len;
1561
1562 /*
1563 * Adjust adjustable widths not to exceed maximum width
1564 */
1565 if (name_width + number_width + 6 + graph_width > width) {
678c5741 1566 if (graph_width > width * 3/8 - number_width - 6) {
1b058bc3 1567 graph_width = width * 3/8 - number_width - 6;
678c5741
LP
1568 if (graph_width < 6)
1569 graph_width = 6;
1570 }
1571
969fe57b
ZJS
1572 if (options->stat_graph_width &&
1573 graph_width > options->stat_graph_width)
1574 graph_width = options->stat_graph_width;
1b058bc3
ZJS
1575 if (name_width > width - number_width - 6 - graph_width)
1576 name_width = width - number_width - 6 - graph_width;
1577 else
1578 graph_width = width - number_width - 6 - name_width;
1579 }
1580
1581 /*
1582 * From here name_width is the width of the name area,
1583 * and graph_width is the width of the graph area.
1584 * max_change is used to scale graph properly.
1585 */
808e1db2 1586 for (i = 0; i < count; i++) {
d2543b8e 1587 const char *prefix = "";
f604652e 1588 char *name = data->files[i]->print_name;
0974c117
JK
1589 uintmax_t added = data->files[i]->added;
1590 uintmax_t deleted = data->files[i]->deleted;
a2540023 1591 int name_len;
6973dcae 1592
358e460e
MG
1593 if (!data->files[i]->is_renamed &&
1594 (added + deleted == 0)) {
1595 total_files--;
1596 continue;
1597 }
6973dcae
JH
1598 /*
1599 * "scale" the filename
1600 */
a2540023
JH
1601 len = name_width;
1602 name_len = strlen(name);
1603 if (name_width < name_len) {
6973dcae
JH
1604 char *slash;
1605 prefix = "...";
a2540023
JH
1606 len -= 3;
1607 name += name_len - len;
6973dcae
JH
1608 slash = strchr(name, '/');
1609 if (slash)
1610 name = slash;
1611 }
6973dcae
JH
1612
1613 if (data->files[i]->is_binary) {
7be57610 1614 fprintf(options->file, "%s", line_prefix);
a408e0e6 1615 show_name(options->file, prefix, name, len);
fc1320bf 1616 fprintf(options->file, " %*s", number_width, "Bin");
e18872b2
ZJS
1617 if (!added && !deleted) {
1618 putc('\n', options->file);
1619 continue;
1620 }
1621 fprintf(options->file, " %s%"PRIuMAX"%s",
0974c117 1622 del_c, deleted, reset);
c0c77734 1623 fprintf(options->file, " -> ");
0974c117
JK
1624 fprintf(options->file, "%s%"PRIuMAX"%s",
1625 add_c, added, reset);
c0c77734
DB
1626 fprintf(options->file, " bytes");
1627 fprintf(options->file, "\n");
f604652e 1628 continue;
6973dcae
JH
1629 }
1630 else if (data->files[i]->is_unmerged) {
7be57610 1631 fprintf(options->file, "%s", line_prefix);
a408e0e6 1632 show_name(options->file, prefix, name, len);
dc801e71 1633 fprintf(options->file, " Unmerged\n");
f604652e 1634 continue;
6973dcae 1635 }
6973dcae 1636
a2540023
JH
1637 /*
1638 * scale the add/delete
1639 */
6973dcae
JH
1640 add = added;
1641 del = deleted;
6973dcae
JH
1642 adds += add;
1643 dels += del;
1644
1b058bc3 1645 if (graph_width <= max_change) {
2eeeef24
JH
1646 int total = add + del;
1647
1b058bc3 1648 total = scale_linear(add + del, graph_width, max_change);
2eeeef24
JH
1649 if (total < 2 && add && del)
1650 /* width >= 2 due to the sanity check */
1651 total = 2;
1652 if (add < del) {
1b058bc3 1653 add = scale_linear(add, graph_width, max_change);
2eeeef24
JH
1654 del = total - add;
1655 } else {
1b058bc3 1656 del = scale_linear(del, graph_width, max_change);
2eeeef24
JH
1657 add = total - del;
1658 }
6973dcae 1659 }
7be57610 1660 fprintf(options->file, "%s", line_prefix);
a408e0e6 1661 show_name(options->file, prefix, name, len);
dc801e71
ZJS
1662 fprintf(options->file, " %*"PRIuMAX"%s",
1663 number_width, added + deleted,
1664 added + deleted ? " " : "");
c0c77734
DB
1665 show_graph(options->file, '+', add, add_c, reset);
1666 show_graph(options->file, '-', del, del_c, reset);
1667 fprintf(options->file, "\n");
1668 }
808e1db2
MG
1669 for (i = count; i < data->nr; i++) {
1670 uintmax_t added = data->files[i]->added;
1671 uintmax_t deleted = data->files[i]->deleted;
1672 if (!data->files[i]->is_renamed &&
1673 (added + deleted == 0)) {
1674 total_files--;
1675 continue;
1676 }
1677 adds += added;
1678 dels += deleted;
e5f85df8
JH
1679 if (!extra_shown)
1680 fprintf(options->file, "%s ...\n", line_prefix);
1681 extra_shown = 1;
808e1db2 1682 }
7be57610 1683 fprintf(options->file, "%s", line_prefix);
7f814632 1684 print_stat_summary(options->file, total_files, adds, dels);
6973dcae
JH
1685}
1686
2775d92c 1687static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
ebd124c6
NP
1688{
1689 int i, adds = 0, dels = 0, total_files = data->nr;
1690
1691 if (data->nr == 0)
1692 return;
1693
1694 for (i = 0; i < data->nr; i++) {
e18872b2
ZJS
1695 int added = data->files[i]->added;
1696 int deleted= data->files[i]->deleted;
1697
1698 if (data->files[i]->is_unmerged)
1699 continue;
1700 if (!data->files[i]->is_renamed && (added + deleted == 0)) {
1701 total_files--;
de9658b5 1702 } else if (!data->files[i]->is_binary) { /* don't count bytes */
e18872b2
ZJS
1703 adds += added;
1704 dels += deleted;
ebd124c6 1705 }
ebd124c6 1706 }
7be57610
BY
1707 if (options->output_prefix) {
1708 struct strbuf *msg = NULL;
1709 msg = options->output_prefix(options,
1710 options->output_prefix_data);
1711 fprintf(options->file, "%s", msg->buf);
1712 }
7f814632 1713 print_stat_summary(options->file, total_files, adds, dels);
ebd124c6
NP
1714}
1715
4b25d091 1716static void show_numstat(struct diffstat_t *data, struct diff_options *options)
74e2abe5
JH
1717{
1718 int i;
1719
f604652e
JH
1720 if (data->nr == 0)
1721 return;
1722
74e2abe5
JH
1723 for (i = 0; i < data->nr; i++) {
1724 struct diffstat_file *file = data->files[i];
1725
7be57610
BY
1726 if (options->output_prefix) {
1727 struct strbuf *msg = NULL;
1728 msg = options->output_prefix(options,
1729 options->output_prefix_data);
1730 fprintf(options->file, "%s", msg->buf);
1731 }
1732
bfddbc5e 1733 if (file->is_binary)
c0c77734 1734 fprintf(options->file, "-\t-\t");
bfddbc5e 1735 else
c0c77734 1736 fprintf(options->file,
0974c117
JK
1737 "%"PRIuMAX"\t%"PRIuMAX"\t",
1738 file->added, file->deleted);
f604652e
JH
1739 if (options->line_termination) {
1740 fill_print_name(file);
1741 if (!file->is_renamed)
c0c77734 1742 write_name_quoted(file->name, options->file,
f604652e
JH
1743 options->line_termination);
1744 else {
c0c77734
DB
1745 fputs(file->print_name, options->file);
1746 putc(options->line_termination, options->file);
f604652e 1747 }
663af342 1748 } else {
f604652e 1749 if (file->is_renamed) {
c0c77734
DB
1750 putc('\0', options->file);
1751 write_name_quoted(file->from_name, options->file, '\0');
f604652e 1752 }
c0c77734 1753 write_name_quoted(file->name, options->file, '\0');
663af342 1754 }
74e2abe5
JH
1755 }
1756}
1757
c04a7155
JH
1758struct dirstat_file {
1759 const char *name;
1760 unsigned long changed;
7df7c019
LT
1761};
1762
c04a7155
JH
1763struct dirstat_dir {
1764 struct dirstat_file *files;
712d2c7d 1765 int alloc, nr, permille, cumulative;
c04a7155
JH
1766};
1767
7be57610
BY
1768static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
1769 unsigned long changed, const char *base, int baselen)
7df7c019
LT
1770{
1771 unsigned long this_dir = 0;
1772 unsigned int sources = 0;
7be57610
BY
1773 const char *line_prefix = "";
1774 struct strbuf *msg = NULL;
1775
1776 if (opt->output_prefix) {
1777 msg = opt->output_prefix(opt, opt->output_prefix_data);
1778 line_prefix = msg->buf;
1779 }
7df7c019
LT
1780
1781 while (dir->nr) {
c04a7155 1782 struct dirstat_file *f = dir->files;
7df7c019
LT
1783 int namelen = strlen(f->name);
1784 unsigned long this;
1785 char *slash;
1786
1787 if (namelen < baselen)
1788 break;
1789 if (memcmp(f->name, base, baselen))
1790 break;
1791 slash = strchr(f->name + baselen, '/');
1792 if (slash) {
1793 int newbaselen = slash + 1 - f->name;
7be57610 1794 this = gather_dirstat(opt, dir, changed, f->name, newbaselen);
7df7c019
LT
1795 sources++;
1796 } else {
c04a7155 1797 this = f->changed;
7df7c019
LT
1798 dir->files++;
1799 dir->nr--;
1800 sources += 2;
1801 }
1802 this_dir += this;
1803 }
1804
1805 /*
1806 * We don't report dirstat's for
1807 * - the top level
1808 * - or cases where everything came from a single directory
1809 * under this directory (sources == 1).
1810 */
1811 if (baselen && sources != 1) {
58a8756a
JH
1812 if (this_dir) {
1813 int permille = this_dir * 1000 / changed;
712d2c7d 1814 if (permille >= dir->permille) {
7be57610 1815 fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
712d2c7d 1816 permille / 10, permille % 10, baselen, base);
7df7c019
LT
1817 if (!dir->cumulative)
1818 return 0;
1819 }
1820 }
1821 }
1822 return this_dir;
1823}
1824
441bca0b
LT
1825static int dirstat_compare(const void *_a, const void *_b)
1826{
1827 const struct dirstat_file *a = _a;
1828 const struct dirstat_file *b = _b;
1829 return strcmp(a->name, b->name);
1830}
1831
c04a7155 1832static void show_dirstat(struct diff_options *options)
7df7c019
LT
1833{
1834 int i;
1835 unsigned long changed;
c04a7155
JH
1836 struct dirstat_dir dir;
1837 struct diff_queue_struct *q = &diff_queued_diff;
1838
1839 dir.files = NULL;
1840 dir.alloc = 0;
1841 dir.nr = 0;
712d2c7d 1842 dir.permille = options->dirstat_permille;
f88d225f 1843 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
7df7c019 1844
7df7c019 1845 changed = 0;
c04a7155
JH
1846 for (i = 0; i < q->nr; i++) {
1847 struct diff_filepair *p = q->queue[i];
1848 const char *name;
1849 unsigned long copied, added, damage;
0133dab7 1850 int content_changed;
c04a7155 1851
2ca86714 1852 name = p->two->path ? p->two->path : p->one->path;
c04a7155 1853
0133dab7
JH
1854 if (p->one->sha1_valid && p->two->sha1_valid)
1855 content_changed = hashcmp(p->one->sha1, p->two->sha1);
1856 else
1857 content_changed = 1;
1858
2ff3a803
JH
1859 if (!content_changed) {
1860 /*
1861 * The SHA1 has not changed, so pre-/post-content is
1862 * identical. We can therefore skip looking at the
1863 * file contents altogether.
1864 */
1865 damage = 0;
1866 goto found_damage;
1867 }
1868
0133dab7
JH
1869 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) {
1870 /*
1871 * In --dirstat-by-file mode, we don't really need to
1872 * look at the actual file contents at all.
1873 * The fact that the SHA1 changed is enough for us to
1874 * add this file to the list of results
1875 * (with each file contributing equal damage).
1876 */
2ff3a803 1877 damage = 1;
0133dab7
JH
1878 goto found_damage;
1879 }
c04a7155
JH
1880
1881 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1882 diff_populate_filespec(p->one, 0);
1883 diff_populate_filespec(p->two, 0);
1884 diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1885 &copied, &added);
1886 diff_free_filespec_data(p->one);
1887 diff_free_filespec_data(p->two);
1888 } else if (DIFF_FILE_VALID(p->one)) {
1889 diff_populate_filespec(p->one, 1);
1890 copied = added = 0;
1891 diff_free_filespec_data(p->one);
1892 } else if (DIFF_FILE_VALID(p->two)) {
1893 diff_populate_filespec(p->two, 1);
1894 copied = 0;
1895 added = p->two->size;
1896 diff_free_filespec_data(p->two);
1897 } else
2b0b551d 1898 continue;
c04a7155
JH
1899
1900 /*
1901 * Original minus copied is the removed material,
1902 * added is the new material. They are both damages
0133dab7 1903 * made to the preimage.
2ff3a803
JH
1904 * If the resulting damage is zero, we know that
1905 * diffcore_count_changes() considers the two entries to
1906 * be identical, but since content_changed is true, we
1907 * know that there must have been _some_ kind of change,
1908 * so we force all entries to have damage > 0.
c04a7155
JH
1909 */
1910 damage = (p->one->size - copied) + added;
2ff3a803 1911 if (!damage)
fd33777b 1912 damage = 1;
c04a7155 1913
0133dab7 1914found_damage:
c04a7155
JH
1915 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1916 dir.files[dir.nr].name = name;
1917 dir.files[dir.nr].changed = damage;
1918 changed += damage;
1919 dir.nr++;
7df7c019
LT
1920 }
1921
1922 /* This can happen even with many files, if everything was renames */
1923 if (!changed)
1924 return;
1925
1926 /* Show all directories with more than x% of the changes */
441bca0b 1927 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
7be57610 1928 gather_dirstat(options, &dir, changed, "", 0);
7df7c019
LT
1929}
1930
1c57a627
JH
1931static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
1932{
1933 int i;
1934 unsigned long changed;
1935 struct dirstat_dir dir;
1936
1937 if (data->nr == 0)
1938 return;
1939
1940 dir.files = NULL;
1941 dir.alloc = 0;
1942 dir.nr = 0;
1943 dir.permille = options->dirstat_permille;
1944 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1945
1946 changed = 0;
1947 for (i = 0; i < data->nr; i++) {
1948 struct diffstat_file *file = data->files[i];
1949 unsigned long damage = file->added + file->deleted;
1950 if (file->is_binary)
1951 /*
1952 * binary files counts bytes, not lines. Must find some
1953 * way to normalize binary bytes vs. textual lines.
1954 * The following heuristic assumes that there are 64
1955 * bytes per "line".
1956 * This is stupid and ugly, but very cheap...
1957 */
1958 damage = (damage + 63) / 64;
1959 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1960 dir.files[dir.nr].name = file->name;
1961 dir.files[dir.nr].changed = damage;
1962 changed += damage;
1963 dir.nr++;
1964 }
1965
1966 /* This can happen even with many files, if everything was renames */
1967 if (!changed)
1968 return;
1969
1970 /* Show all directories with more than x% of the changes */
1971 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1972 gather_dirstat(options, &dir, changed, "", 0);
1973}
1974
f604652e
JH
1975static void free_diffstat_info(struct diffstat_t *diffstat)
1976{
1977 int i;
1978 for (i = 0; i < diffstat->nr; i++) {
1979 struct diffstat_file *f = diffstat->files[i];
1980 if (f->name != f->print_name)
1981 free(f->print_name);
1982 free(f->name);
1983 free(f->from_name);
1984 free(f);
1985 }
1986 free(diffstat->files);
1987}
1988
88246898 1989struct checkdiff_t {
88246898 1990 const char *filename;
1ba111d1 1991 int lineno;
a757c646 1992 int conflict_marker_size;
1ba111d1 1993 struct diff_options *o;
cf1b7869 1994 unsigned ws_rule;
62c64895 1995 unsigned status;
88246898
JS
1996};
1997
a757c646 1998static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
04954043
JH
1999{
2000 char firstchar;
2001 int cnt;
2002
a757c646 2003 if (len < marker_size + 1)
04954043
JH
2004 return 0;
2005 firstchar = line[0];
2006 switch (firstchar) {
a757c646 2007 case '=': case '>': case '<': case '|':
04954043
JH
2008 break;
2009 default:
2010 return 0;
2011 }
a757c646 2012 for (cnt = 1; cnt < marker_size; cnt++)
04954043
JH
2013 if (line[cnt] != firstchar)
2014 return 0;
a757c646
JH
2015 /* line[1] thru line[marker_size-1] are same as firstchar */
2016 if (len < marker_size + 1 || !isspace(line[marker_size]))
04954043 2017 return 0;
04954043
JH
2018 return 1;
2019}
2020
88246898
JS
2021static void checkdiff_consume(void *priv, char *line, unsigned long len)
2022{
2023 struct checkdiff_t *data = priv;
a757c646 2024 int marker_size = data->conflict_marker_size;
f1c96261
JK
2025 const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
2026 const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
2027 const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
c1795bb0 2028 char *err;
7be57610
BY
2029 char *line_prefix = "";
2030 struct strbuf *msgbuf;
2031
2032 assert(data->o);
2033 if (data->o->output_prefix) {
2034 msgbuf = data->o->output_prefix(data->o,
2035 data->o->output_prefix_data);
2036 line_prefix = msgbuf->buf;
2037 }
88246898
JS
2038
2039 if (line[0] == '+') {
18374e58 2040 unsigned bad;
0ef617f4 2041 data->lineno++;
a757c646 2042 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
04954043
JH
2043 data->status |= 1;
2044 fprintf(data->o->file,
7be57610
BY
2045 "%s%s:%d: leftover conflict marker\n",
2046 line_prefix, data->filename, data->lineno);
04954043 2047 }
8f8841e9 2048 bad = ws_check(line + 1, len - 1, data->ws_rule);
18374e58 2049 if (!bad)
c1795bb0 2050 return;
18374e58
JH
2051 data->status |= bad;
2052 err = whitespace_error_string(bad);
7be57610
BY
2053 fprintf(data->o->file, "%s%s:%d: %s.\n",
2054 line_prefix, data->filename, data->lineno, err);
c1795bb0 2055 free(err);
a3c158d4 2056 emit_line(data->o, set, reset, line, 1);
8f8841e9 2057 ws_check_emit(line + 1, len - 1, data->ws_rule,
1ba111d1 2058 data->o->file, set, reset, ws);
877f23cc 2059 } else if (line[0] == ' ') {
88246898 2060 data->lineno++;
877f23cc 2061 } else if (line[0] == '@') {
88246898
JS
2062 char *plus = strchr(line, '+');
2063 if (plus)
0ef617f4 2064 data->lineno = strtol(plus, NULL, 10) - 1;
88246898
JS
2065 else
2066 die("invalid diff");
2067 }
2068}
2069
0660626c
JH
2070static unsigned char *deflate_it(char *data,
2071 unsigned long size,
2072 unsigned long *result_size)
051308f6 2073{
0660626c
JH
2074 int bound;
2075 unsigned char *deflated;
ef49a7a0 2076 git_zstream stream;
0660626c
JH
2077
2078 memset(&stream, 0, sizeof(stream));
55bb5c91 2079 git_deflate_init(&stream, zlib_compression_level);
225a6f10 2080 bound = git_deflate_bound(&stream, size);
0660626c
JH
2081 deflated = xmalloc(bound);
2082 stream.next_out = deflated;
2083 stream.avail_out = bound;
2084
2085 stream.next_in = (unsigned char *)data;
2086 stream.avail_in = size;
55bb5c91 2087 while (git_deflate(&stream, Z_FINISH) == Z_OK)
0660626c 2088 ; /* nothing */
55bb5c91 2089 git_deflate_end(&stream);
0660626c
JH
2090 *result_size = stream.total_out;
2091 return deflated;
051308f6
JH
2092}
2093
7be57610 2094static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two, char *prefix)
051308f6 2095{
0660626c
JH
2096 void *cp;
2097 void *delta;
2098 void *deflated;
2099 void *data;
2100 unsigned long orig_size;
2101 unsigned long delta_size;
2102 unsigned long deflate_size;
2103 unsigned long data_size;
051308f6 2104
0660626c
JH
2105 /* We could do deflated delta, or we could do just deflated two,
2106 * whichever is smaller.
051308f6 2107 */
0660626c
JH
2108 delta = NULL;
2109 deflated = deflate_it(two->ptr, two->size, &deflate_size);
2110 if (one->size && two->size) {
2111 delta = diff_delta(one->ptr, one->size,
2112 two->ptr, two->size,
2113 &delta_size, deflate_size);
2114 if (delta) {
2115 void *to_free = delta;
2116 orig_size = delta_size;
2117 delta = deflate_it(delta, delta_size, &delta_size);
2118 free(to_free);
051308f6
JH
2119 }
2120 }
051308f6 2121
0660626c 2122 if (delta && delta_size < deflate_size) {
7be57610 2123 fprintf(file, "%sdelta %lu\n", prefix, orig_size);
0660626c
JH
2124 free(deflated);
2125 data = delta;
2126 data_size = delta_size;
2127 }
2128 else {
7be57610 2129 fprintf(file, "%sliteral %lu\n", prefix, two->size);
0660626c
JH
2130 free(delta);
2131 data = deflated;
2132 data_size = deflate_size;
2133 }
051308f6 2134
0660626c
JH
2135 /* emit data encoded in base85 */
2136 cp = data;
2137 while (data_size) {
2138 int bytes = (52 < data_size) ? 52 : data_size;
051308f6 2139 char line[70];
0660626c 2140 data_size -= bytes;
051308f6
JH
2141 if (bytes <= 26)
2142 line[0] = bytes + 'A' - 1;
2143 else
2144 line[0] = bytes - 26 + 'a' - 1;
2145 encode_85(line + 1, cp, bytes);
1d7f171c 2146 cp = (char *) cp + bytes;
7be57610 2147 fprintf(file, "%s", prefix);
c0c77734
DB
2148 fputs(line, file);
2149 fputc('\n', file);
051308f6 2150 }
7be57610 2151 fprintf(file, "%s\n", prefix);
0660626c 2152 free(data);
051308f6
JH
2153}
2154
7be57610 2155static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two, char *prefix)
d4c452f0 2156{
7be57610
BY
2157 fprintf(file, "%sGIT binary patch\n", prefix);
2158 emit_binary_diff_body(file, one, two, prefix);
2159 emit_binary_diff_body(file, two, one, prefix);
d4c452f0
JH
2160}
2161
29a3eefd
JH
2162int diff_filespec_is_binary(struct diff_filespec *one)
2163{
122aa6f9
JK
2164 if (one->is_binary == -1) {
2165 diff_filespec_load_driver(one);
2166 if (one->driver->binary != -1)
2167 one->is_binary = one->driver->binary;
2168 else {
2169 if (!one->data && DIFF_FILE_VALID(one))
2170 diff_populate_filespec(one, 0);
2171 if (one->data)
2172 one->is_binary = buffer_is_binary(one->data,
2173 one->size);
2174 if (one->is_binary == -1)
2175 one->is_binary = 0;
2176 }
2177 }
29a3eefd 2178 return one->is_binary;
6973dcae
JH
2179}
2180
be58e70d 2181static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
f258475a 2182{
122aa6f9
JK
2183 diff_filespec_load_driver(one);
2184 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
f258475a
JH
2185}
2186
a5a818ee
JH
2187void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
2188{
2189 if (!options->a_prefix)
2190 options->a_prefix = a;
2191 if (!options->b_prefix)
2192 options->b_prefix = b;
2193}
2194
a788d7d5 2195struct userdiff_driver *get_textconv(struct diff_filespec *one)
04427ac8
JK
2196{
2197 if (!DIFF_FILE_VALID(one))
2198 return NULL;
d391c0ff 2199
04427ac8 2200 diff_filespec_load_driver(one);
3813e690 2201 return userdiff_get_textconv(one->driver);
04427ac8
JK
2202}
2203
6973dcae
JH
2204static void builtin_diff(const char *name_a,
2205 const char *name_b,
2206 struct diff_filespec *one,
2207 struct diff_filespec *two,
2208 const char *xfrm_msg,
296c6bb2 2209 int must_show_header,
051308f6 2210 struct diff_options *o,
6973dcae
JH
2211 int complete_rewrite)
2212{
2213 mmfile_t mf1, mf2;
2214 const char *lbl[2];
2215 char *a_one, *b_two;
8f67f8ae
PH
2216 const char *set = diff_get_color_opt(o, DIFF_METAINFO);
2217 const char *reset = diff_get_color_opt(o, DIFF_RESET);
a5a818ee 2218 const char *a_prefix, *b_prefix;
d9bae1a1
JK
2219 struct userdiff_driver *textconv_one = NULL;
2220 struct userdiff_driver *textconv_two = NULL;
3e97c7c6 2221 struct strbuf header = STRBUF_INIT;
7be57610
BY
2222 struct strbuf *msgbuf;
2223 char *line_prefix = "";
2224
2225 if (o->output_prefix) {
2226 msgbuf = o->output_prefix(o, o->output_prefix_data);
2227 line_prefix = msgbuf->buf;
2228 }
a5a818ee 2229
752c0c24
JS
2230 if (DIFF_OPT_TST(o, SUBMODULE_LOG) &&
2231 (!one->mode || S_ISGITLINK(one->mode)) &&
2232 (!two->mode || S_ISGITLINK(two->mode))) {
2233 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
2234 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2235 show_submodule_summary(o->file, one ? one->path : two->path,
721ceec1 2236 one->sha1, two->sha1, two->dirty_submodule,
752c0c24
JS
2237 del, add, reset);
2238 return;
2239 }
2240
3aa1f7ca
JK
2241 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
2242 textconv_one = get_textconv(one);
2243 textconv_two = get_textconv(two);
2244 }
2245
a5a818ee
JH
2246 diff_set_mnemonic_prefix(o, "a/", "b/");
2247 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
2248 a_prefix = o->b_prefix;
2249 b_prefix = o->a_prefix;
2250 } else {
2251 a_prefix = o->a_prefix;
2252 b_prefix = o->b_prefix;
2253 }
6973dcae 2254
71b989e7
LT
2255 /* Never use a non-valid filename anywhere if at all possible */
2256 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
2257 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
2258
a5a818ee
JH
2259 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
2260 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
6973dcae
JH
2261 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
2262 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
7be57610 2263 strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, set, a_one, b_two, reset);
6973dcae
JH
2264 if (lbl[0][0] == '/') {
2265 /* /dev/null */
7be57610 2266 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, set, two->mode, reset);
37466447
BW
2267 if (xfrm_msg)
2268 strbuf_addstr(&header, xfrm_msg);
296c6bb2 2269 must_show_header = 1;
6973dcae
JH
2270 }
2271 else if (lbl[1][0] == '/') {
7be57610 2272 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, set, one->mode, reset);
37466447
BW
2273 if (xfrm_msg)
2274 strbuf_addstr(&header, xfrm_msg);
296c6bb2 2275 must_show_header = 1;
6973dcae
JH
2276 }
2277 else {
2278 if (one->mode != two->mode) {
7be57610
BY
2279 strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, set, one->mode, reset);
2280 strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, set, two->mode, reset);
296c6bb2 2281 must_show_header = 1;
cd112cef 2282 }
37466447
BW
2283 if (xfrm_msg)
2284 strbuf_addstr(&header, xfrm_msg);
3e97c7c6 2285
6973dcae
JH
2286 /*
2287 * we do not run diff between different kind
2288 * of objects.
2289 */
2290 if ((one->mode ^ two->mode) & S_IFMT)
2291 goto free_ab_and_return;
0c01857d 2292 if (complete_rewrite &&
3aa1f7ca
JK
2293 (textconv_one || !diff_filespec_is_binary(one)) &&
2294 (textconv_two || !diff_filespec_is_binary(two))) {
3e97c7c6
GB
2295 fprintf(o->file, "%s", header.buf);
2296 strbuf_reset(&header);
3aa1f7ca
JK
2297 emit_rewrite_diff(name_a, name_b, one, two,
2298 textconv_one, textconv_two, o);
34a5e1a2 2299 o->found_changes = 1;
6973dcae
JH
2300 goto free_ab_and_return;
2301 }
2302 }
2303
467ddc14
JH
2304 if (o->irreversible_delete && lbl[1][0] == '/') {
2305 fprintf(o->file, "%s", header.buf);
2306 strbuf_reset(&header);
2307 goto free_ab_and_return;
2308 } else if (!DIFF_OPT_TST(o, TEXT) &&
b3373982
JK
2309 ( (!textconv_one && diff_filespec_is_binary(one)) ||
2310 (!textconv_two && diff_filespec_is_binary(two)) )) {
2311 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2312 die("unable to read files to diff");
0660626c
JH
2313 /* Quite common confusing case */
2314 if (mf1.size == mf2.size &&
296c6bb2
CC
2315 !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
2316 if (must_show_header)
2317 fprintf(o->file, "%s", header.buf);
0660626c 2318 goto free_ab_and_return;
296c6bb2 2319 }
3e97c7c6
GB
2320 fprintf(o->file, "%s", header.buf);
2321 strbuf_reset(&header);
8f67f8ae 2322 if (DIFF_OPT_TST(o, BINARY))
7be57610 2323 emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
051308f6 2324 else
7be57610
BY
2325 fprintf(o->file, "%sBinary files %s and %s differ\n",
2326 line_prefix, lbl[0], lbl[1]);
34a5e1a2 2327 o->found_changes = 1;
467ddc14 2328 } else {
6973dcae
JH
2329 /* Crazy xdl interfaces.. */
2330 const char *diffopts = getenv("GIT_DIFF_OPTS");
2331 xpparam_t xpp;
2332 xdemitconf_t xecfg;
6973dcae 2333 struct emit_callback ecbdata;
be58e70d 2334 const struct userdiff_funcname *pe;
f258475a 2335
b3f01ff2 2336 if (must_show_header) {
3e97c7c6
GB
2337 fprintf(o->file, "%s", header.buf);
2338 strbuf_reset(&header);
2339 }
2340
840383b2
JK
2341 mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
2342 mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
04427ac8 2343
45e7ca0f
BC
2344 pe = diff_funcname_pattern(one);
2345 if (!pe)
2346 pe = diff_funcname_pattern(two);
6973dcae 2347
9ccd0a88 2348 memset(&xpp, 0, sizeof(xpp));
30b25010 2349 memset(&xecfg, 0, sizeof(xecfg));
cd112cef 2350 memset(&ecbdata, 0, sizeof(ecbdata));
6973dcae 2351 ecbdata.label_path = lbl;
daa0c3d9 2352 ecbdata.color_diff = want_color(o->use_color);
34a5e1a2 2353 ecbdata.found_changesp = &o->found_changes;
cf1b7869 2354 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
690ed843 2355 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
d68fe26f 2356 check_blank_at_eof(&mf1, &mf2, &ecbdata);
a3c158d4 2357 ecbdata.opt = o;
3e97c7c6 2358 ecbdata.header = header.len ? &header : NULL;
582aa00b 2359 xpp.flags = o->xdl_opts;
ee1e5412 2360 xecfg.ctxlen = o->context;
6d0e674a 2361 xecfg.interhunkctxlen = o->interhunkcontext;
6973dcae 2362 xecfg.flags = XDL_EMIT_FUNCNAMES;
14937c2c
RS
2363 if (DIFF_OPT_TST(o, FUNCCONTEXT))
2364 xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
45e7ca0f 2365 if (pe)
a013585b 2366 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
6973dcae
JH
2367 if (!diffopts)
2368 ;
cc44c765 2369 else if (!prefixcmp(diffopts, "--unified="))
6973dcae 2370 xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
cc44c765 2371 else if (!prefixcmp(diffopts, "-u"))
6973dcae 2372 xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
77d1a520
TR
2373 if (o->word_diff)
2374 init_diff_words_data(&ecbdata, o, one, two);
8a3f524b 2375 xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
dfea7900 2376 &xpp, &xecfg);
882749a0 2377 if (o->word_diff)
f59a59e2 2378 free_diff_words_data(&ecbdata);
04427ac8
JK
2379 if (textconv_one)
2380 free(mf1.ptr);
2381 if (textconv_two)
2382 free(mf2.ptr);
8cfe5f1c 2383 xdiff_clear_find_func(&xecfg);
6973dcae
JH
2384 }
2385
2386 free_ab_and_return:
3e97c7c6 2387 strbuf_release(&header);
fc3abdf5
JH
2388 diff_free_filespec_data(one);
2389 diff_free_filespec_data(two);
6973dcae
JH
2390 free(a_one);
2391 free(b_two);
2392 return;
2393}
2394
2395static void builtin_diffstat(const char *name_a, const char *name_b,
2396 struct diff_filespec *one,
2397 struct diff_filespec *two,
710158e3 2398 struct diffstat_t *diffstat,
0d21efa5 2399 struct diff_options *o,
710158e3 2400 int complete_rewrite)
6973dcae
JH
2401{
2402 mmfile_t mf1, mf2;
2403 struct diffstat_file *data;
352ca4e1 2404 int same_contents;
6973dcae
JH
2405
2406 data = diffstat_add(diffstat, name_a, name_b);
2407
2408 if (!one || !two) {
2409 data->is_unmerged = 1;
2410 return;
2411 }
ded0abc7 2412
352ca4e1
ZJS
2413 same_contents = !hashcmp(one->sha1, two->sha1);
2414
ded0abc7 2415 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
ded0abc7 2416 data->is_binary = 1;
352ca4e1 2417 if (same_contents) {
e18872b2
ZJS
2418 data->added = 0;
2419 data->deleted = 0;
2420 } else {
2421 data->added = diff_filespec_size(two);
2422 data->deleted = diff_filespec_size(one);
2423 }
ded0abc7
JK
2424 }
2425
2426 else if (complete_rewrite) {
710158e3
JH
2427 diff_populate_filespec(one, 0);
2428 diff_populate_filespec(two, 0);
2429 data->deleted = count_lines(one->data, one->size);
2430 data->added = count_lines(two->data, two->size);
710158e3 2431 }
6973dcae 2432
352ca4e1 2433 else if (!same_contents) {
6973dcae
JH
2434 /* Crazy xdl interfaces.. */
2435 xpparam_t xpp;
2436 xdemitconf_t xecfg;
6973dcae 2437
ded0abc7
JK
2438 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2439 die("unable to read files to diff");
2440
9ccd0a88 2441 memset(&xpp, 0, sizeof(xpp));
30b25010 2442 memset(&xecfg, 0, sizeof(xecfg));
582aa00b 2443 xpp.flags = o->xdl_opts;
f01cae91
JH
2444 xecfg.ctxlen = o->context;
2445 xecfg.interhunkctxlen = o->interhunkcontext;
8a3f524b 2446 xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
dfea7900 2447 &xpp, &xecfg);
6973dcae 2448 }
fc3abdf5 2449
fc3abdf5
JH
2450 diff_free_filespec_data(one);
2451 diff_free_filespec_data(two);
6973dcae
JH
2452}
2453
88246898 2454static void builtin_checkdiff(const char *name_a, const char *name_b,
cd676a51 2455 const char *attr_path,
5ff10dd6
JH
2456 struct diff_filespec *one,
2457 struct diff_filespec *two,
2458 struct diff_options *o)
88246898
JS
2459{
2460 mmfile_t mf1, mf2;
2461 struct checkdiff_t data;
2462
2463 if (!two)
2464 return;
2465
2466 memset(&data, 0, sizeof(data));
88246898
JS
2467 data.filename = name_b ? name_b : name_a;
2468 data.lineno = 0;
1ba111d1 2469 data.o = o;
cd676a51 2470 data.ws_rule = whitespace_rule(attr_path);
a757c646 2471 data.conflict_marker_size = ll_merge_marker_size(attr_path);
88246898
JS
2472
2473 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2474 die("unable to read files to diff");
2475
5ff10dd6
JH
2476 /*
2477 * All the other codepaths check both sides, but not checking
2478 * the "old" side here is deliberate. We are checking the newly
2479 * introduced changes, and as long as the "new" side is text, we
2480 * can and should check what it introduces.
2481 */
29a3eefd 2482 if (diff_filespec_is_binary(two))
fc3abdf5 2483 goto free_and_return;
88246898
JS
2484 else {
2485 /* Crazy xdl interfaces.. */
2486 xpparam_t xpp;
2487 xdemitconf_t xecfg;
88246898 2488
9ccd0a88 2489 memset(&xpp, 0, sizeof(xpp));
30b25010 2490 memset(&xecfg, 0, sizeof(xecfg));
c35539eb 2491 xecfg.ctxlen = 1; /* at least one context line */
582aa00b 2492 xpp.flags = 0;
8a3f524b 2493 xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
dfea7900 2494 &xpp, &xecfg);
877f23cc 2495
467babf8 2496 if (data.ws_rule & WS_BLANK_AT_EOF) {
d68fe26f
JH
2497 struct emit_callback ecbdata;
2498 int blank_at_eof;
2499
2500 ecbdata.ws_rule = data.ws_rule;
2501 check_blank_at_eof(&mf1, &mf2, &ecbdata);
8837d335 2502 blank_at_eof = ecbdata.blank_at_eof_in_postimage;
d68fe26f 2503
467babf8
JH
2504 if (blank_at_eof) {
2505 static char *err;
2506 if (!err)
2507 err = whitespace_error_string(WS_BLANK_AT_EOF);
2508 fprintf(o->file, "%s:%d: %s.\n",
2509 data.filename, blank_at_eof, err);
2510 data.status = 1; /* report errors */
2511 }
877f23cc 2512 }
88246898 2513 }
fc3abdf5
JH
2514 free_and_return:
2515 diff_free_filespec_data(one);
2516 diff_free_filespec_data(two);
62c64895
WC
2517 if (data.status)
2518 DIFF_OPT_SET(o, CHECK_FAILED);
88246898
JS
2519}
2520
6973dcae
JH
2521struct diff_filespec *alloc_filespec(const char *path)
2522{
2523 int namelen = strlen(path);
2524 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
2525
2526 memset(spec, 0, sizeof(*spec));
2527 spec->path = (char *)(spec + 1);
2528 memcpy(spec->path, path, namelen+1);
9fb88419 2529 spec->count = 1;
122aa6f9 2530 spec->is_binary = -1;
6973dcae
JH
2531 return spec;
2532}
2533
9fb88419
LT
2534void free_filespec(struct diff_filespec *spec)
2535{
2536 if (!--spec->count) {
2537 diff_free_filespec_data(spec);
2538 free(spec);
2539 }
2540}
2541
6973dcae 2542void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
e5450100 2543 int sha1_valid, unsigned short mode)
6973dcae
JH
2544{
2545 if (mode) {
2546 spec->mode = canon_mode(mode);
e702496e 2547 hashcpy(spec->sha1, sha1);
e5450100 2548 spec->sha1_valid = sha1_valid;
6973dcae
JH
2549 }
2550}
2551
2552/*
5adf317b 2553 * Given a name and sha1 pair, if the index tells us the file in
6973dcae
JH
2554 * the work tree has that object contents, return true, so that
2555 * prepare_temp_file() does not have to inflate and extract.
2556 */
1510fea7 2557static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
6973dcae
JH
2558{
2559 struct cache_entry *ce;
2560 struct stat st;
2561 int pos, len;
2562
150115ad
JH
2563 /*
2564 * We do not read the cache ourselves here, because the
6973dcae
JH
2565 * benchmark with my previous version that always reads cache
2566 * shows that it makes things worse for diff-tree comparing
2567 * two linux-2.6 kernel trees in an already checked out work
2568 * tree. This is because most diff-tree comparisons deal with
2569 * only a small number of files, while reading the cache is
2570 * expensive for a large project, and its cost outweighs the
2571 * savings we get by not inflating the object to a temporary
2572 * file. Practically, this code only helps when we are used
2573 * by diff-cache --cached, which does read the cache before
2574 * calling us.
2575 */
2576 if (!active_cache)
2577 return 0;
2578
1510fea7
SP
2579 /* We want to avoid the working directory if our caller
2580 * doesn't need the data in a normal file, this system
2581 * is rather slow with its stat/open/mmap/close syscalls,
2582 * and the object is contained in a pack file. The pack
2583 * is probably already open and will be faster to obtain
2584 * the data through than the working directory. Loose
2585 * objects however would tend to be slower as they need
2586 * to be individually opened and inflated.
2587 */
cd673c1f 2588 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
1510fea7
SP
2589 return 0;
2590
6973dcae
JH
2591 len = strlen(name);
2592 pos = cache_name_pos(name, len);
2593 if (pos < 0)
2594 return 0;
2595 ce = active_cache[pos];
eadb5831
JH
2596
2597 /*
2598 * This is not the sha1 we are looking for, or
2599 * unreusable because it is not a regular file.
2600 */
2601 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
6973dcae 2602 return 0;
eadb5831 2603
150115ad
JH
2604 /*
2605 * If ce is marked as "assume unchanged", there is no
2606 * guarantee that work tree matches what we are looking for.
2607 */
b4d1690d 2608 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
150115ad
JH
2609 return 0;
2610
eadb5831
JH
2611 /*
2612 * If ce matches the file in the work tree, we can reuse it.
6973dcae 2613 */
eadb5831
JH
2614 if (ce_uptodate(ce) ||
2615 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
2616 return 1;
2617
2618 return 0;
6973dcae
JH
2619}
2620
04786756
LT
2621static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2622{
2623 int len;
8e08b419
JH
2624 char *data = xmalloc(100), *dirty = "";
2625
2626 /* Are we looking at the work tree? */
85adbf2f 2627 if (s->dirty_submodule)
8e08b419
JH
2628 dirty = "-dirty";
2629
04786756 2630 len = snprintf(data, 100,
8e08b419 2631 "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty);
04786756
LT
2632 s->data = data;
2633 s->size = len;
2634 s->should_free = 1;
2635 if (size_only) {
2636 s->data = NULL;
2637 free(data);
2638 }
2639 return 0;
2640}
2641
6973dcae
JH
2642/*
2643 * While doing rename detection and pickaxe operation, we may need to
2644 * grab the data for the blob (or file) for our own in-core comparison.
2645 * diff_filespec has data and size fields for this purpose.
2646 */
2647int diff_populate_filespec(struct diff_filespec *s, int size_only)
2648{
2649 int err = 0;
2650 if (!DIFF_FILE_VALID(s))
2651 die("internal error: asking to populate invalid file.");
2652 if (S_ISDIR(s->mode))
2653 return -1;
2654
6973dcae 2655 if (s->data)
fc3abdf5 2656 return 0;
04786756 2657
6e0b8ed6
JH
2658 if (size_only && 0 < s->size)
2659 return 0;
2660
302b9282 2661 if (S_ISGITLINK(s->mode))
04786756
LT
2662 return diff_populate_gitlink(s, size_only);
2663
6973dcae 2664 if (!s->sha1_valid ||
1510fea7 2665 reuse_worktree_file(s->path, s->sha1, 0)) {
f285a2d7 2666 struct strbuf buf = STRBUF_INIT;
6973dcae
JH
2667 struct stat st;
2668 int fd;
6c510bee 2669
6973dcae
JH
2670 if (lstat(s->path, &st) < 0) {
2671 if (errno == ENOENT) {
2672 err_empty:
2673 err = -1;
2674 empty:
d2543b8e 2675 s->data = (char *)"";
6973dcae
JH
2676 s->size = 0;
2677 return err;
2678 }
2679 }
dc49cd76 2680 s->size = xsize_t(st.st_size);
6973dcae
JH
2681 if (!s->size)
2682 goto empty;
6973dcae 2683 if (S_ISLNK(st.st_mode)) {
cf219d8c
LT
2684 struct strbuf sb = STRBUF_INIT;
2685
2686 if (strbuf_readlink(&sb, s->path, s->size))
6973dcae 2687 goto err_empty;
0956a6db
RS
2688 s->size = sb.len;
2689 s->data = strbuf_detach(&sb, NULL);
cf219d8c 2690 s->should_free = 1;
6973dcae
JH
2691 return 0;
2692 }
cf219d8c
LT
2693 if (size_only)
2694 return 0;
6973dcae
JH
2695 fd = open(s->path, O_RDONLY);
2696 if (fd < 0)
2697 goto err_empty;
c4712e45 2698 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
6973dcae 2699 close(fd);
6973dcae 2700 s->should_munmap = 1;
6c510bee
LT
2701
2702 /*
2703 * Convert from working tree format to canonical git format
2704 */
21e5ad50 2705 if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
c32f749f 2706 size_t size = 0;
6c510bee
LT
2707 munmap(s->data, s->size);
2708 s->should_munmap = 0;
c32f749f
RS
2709 s->data = strbuf_detach(&buf, &size);
2710 s->size = size;
6c510bee
LT
2711 s->should_free = 1;
2712 }
6973dcae
JH
2713 }
2714 else {
21666f1a 2715 enum object_type type;
c50c4316 2716 if (size_only) {
21666f1a 2717 type = sha1_object_info(s->sha1, &s->size);
c50c4316
NP
2718 if (type < 0)
2719 die("unable to read %s", sha1_to_hex(s->sha1));
2720 } else {
21666f1a 2721 s->data = read_sha1_file(s->sha1, &type, &s->size);
c50c4316
NP
2722 if (!s->data)
2723 die("unable to read %s", sha1_to_hex(s->sha1));
6973dcae
JH
2724 s->should_free = 1;
2725 }
2726 }
2727 return 0;
2728}
2729
8ae92e63 2730void diff_free_filespec_blob(struct diff_filespec *s)
6973dcae
JH
2731{
2732 if (s->should_free)
2733 free(s->data);
2734 else if (s->should_munmap)
2735 munmap(s->data, s->size);
fc3abdf5
JH
2736
2737 if (s->should_free || s->should_munmap) {
2738 s->should_free = s->should_munmap = 0;
2739 s->data = NULL;
2740 }
eede7b7d
JK
2741}
2742
2743void diff_free_filespec_data(struct diff_filespec *s)
2744{
8ae92e63 2745 diff_free_filespec_blob(s);
6973dcae
JH
2746 free(s->cnt_data);
2747 s->cnt_data = NULL;
2748}
2749
4e218f54 2750static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
6973dcae
JH
2751 void *blob,
2752 unsigned long size,
2753 const unsigned char *sha1,
2754 int mode)
2755{
2756 int fd;
4e218f54 2757 struct strbuf buf = STRBUF_INIT;
003b33a8
DA
2758 struct strbuf template = STRBUF_INIT;
2759 char *path_dup = xstrdup(path);
2760 const char *base = basename(path_dup);
6973dcae 2761
003b33a8
DA
2762 /* Generate "XXXXXX_basename.ext" */
2763 strbuf_addstr(&template, "XXXXXX_");
2764 strbuf_addstr(&template, base);
2765
2766 fd = git_mkstemps(temp->tmp_path, PATH_MAX, template.buf,
2767 strlen(base) + 1);
6973dcae 2768 if (fd < 0)
d824cbba 2769 die_errno("unable to create temp-file");
4e218f54
JS
2770 if (convert_to_working_tree(path,
2771 (const char *)blob, (size_t)size, &buf)) {
2772 blob = buf.buf;
2773 size = buf.len;
2774 }
93822c22 2775 if (write_in_full(fd, blob, size) != size)
0721c314 2776 die_errno("unable to write temp-file");
6973dcae
JH
2777 close(fd);
2778 temp->name = temp->tmp_path;
2779 strcpy(temp->hex, sha1_to_hex(sha1));
2780 temp->hex[40] = 0;
2781 sprintf(temp->mode, "%06o", mode);
4e218f54 2782 strbuf_release(&buf);
003b33a8
DA
2783 strbuf_release(&template);
2784 free(path_dup);
6973dcae
JH
2785}
2786
479b0ae8
JK
2787static struct diff_tempfile *prepare_temp_file(const char *name,
2788 struct diff_filespec *one)
6973dcae 2789{
479b0ae8
JK
2790 struct diff_tempfile *temp = claim_diff_tempfile();
2791
6973dcae
JH
2792 if (!DIFF_FILE_VALID(one)) {
2793 not_a_valid_file:
2794 /* A '-' entry produces this for file-2, and
2795 * a '+' entry produces this for file-1.
2796 */
2797 temp->name = "/dev/null";
2798 strcpy(temp->hex, ".");
2799 strcpy(temp->mode, ".");
479b0ae8
JK
2800 return temp;
2801 }
2802
2803 if (!remove_tempfile_installed) {
2804 atexit(remove_tempfile);
57b235a4 2805 sigchain_push_common(remove_tempfile_on_signal);
479b0ae8 2806 remove_tempfile_installed = 1;
6973dcae
JH
2807 }
2808
2809 if (!one->sha1_valid ||
1510fea7 2810 reuse_worktree_file(name, one->sha1, 1)) {
6973dcae
JH
2811 struct stat st;
2812 if (lstat(name, &st) < 0) {
2813 if (errno == ENOENT)
2814 goto not_a_valid_file;
d824cbba 2815 die_errno("stat(%s)", name);
6973dcae
JH
2816 }
2817 if (S_ISLNK(st.st_mode)) {
3cd7388d
JK
2818 struct strbuf sb = STRBUF_INIT;
2819 if (strbuf_readlink(&sb, name, st.st_size) < 0)
0721c314 2820 die_errno("readlink(%s)", name);
3cd7388d 2821 prep_temp_blob(name, temp, sb.buf, sb.len,
6973dcae
JH
2822 (one->sha1_valid ?
2823 one->sha1 : null_sha1),
2824 (one->sha1_valid ?
2825 one->mode : S_IFLNK));
3cd7388d 2826 strbuf_release(&sb);
6973dcae
JH
2827 }
2828 else {
2829 /* we can borrow from the file in the work tree */
2830 temp->name = name;
2831 if (!one->sha1_valid)
2832 strcpy(temp->hex, sha1_to_hex(null_sha1));
2833 else
2834 strcpy(temp->hex, sha1_to_hex(one->sha1));
2835 /* Even though we may sometimes borrow the
2836 * contents from the work tree, we always want
2837 * one->mode. mode is trustworthy even when
2838 * !(one->sha1_valid), as long as
2839 * DIFF_FILE_VALID(one).
2840 */
2841 sprintf(temp->mode, "%06o", one->mode);
2842 }
479b0ae8 2843 return temp;
6973dcae
JH
2844 }
2845 else {
2846 if (diff_populate_filespec(one, 0))
2847 die("cannot read data blob for %s", one->path);
4e218f54 2848 prep_temp_blob(name, temp, one->data, one->size,
6973dcae
JH
2849 one->sha1, one->mode);
2850 }
479b0ae8 2851 return temp;
6973dcae
JH
2852}
2853
6973dcae
JH
2854/* An external diff command takes:
2855 *
2856 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2857 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2858 *
2859 */
2860static void run_external_diff(const char *pgm,
2861 const char *name,
2862 const char *other,
2863 struct diff_filespec *one,
2864 struct diff_filespec *two,
2865 const char *xfrm_msg,
2866 int complete_rewrite)
2867{
2868 const char *spawn_arg[10];
6973dcae 2869 int retval;
6973dcae
JH
2870 const char **arg = &spawn_arg[0];
2871
6973dcae 2872 if (one && two) {
479b0ae8
JK
2873 struct diff_tempfile *temp_one, *temp_two;
2874 const char *othername = (other ? other : name);
2875 temp_one = prepare_temp_file(name, one);
2876 temp_two = prepare_temp_file(othername, two);
6973dcae
JH
2877 *arg++ = pgm;
2878 *arg++ = name;
479b0ae8
JK
2879 *arg++ = temp_one->name;
2880 *arg++ = temp_one->hex;
2881 *arg++ = temp_one->mode;
2882 *arg++ = temp_two->name;
2883 *arg++ = temp_two->hex;
2884 *arg++ = temp_two->mode;
6973dcae
JH
2885 if (other) {
2886 *arg++ = other;
2887 *arg++ = xfrm_msg;
2888 }
2889 } else {
2890 *arg++ = pgm;
2891 *arg++ = name;
2892 }
2893 *arg = NULL;
d5535ec7 2894 fflush(NULL);
7ed7fac4 2895 retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL);
6973dcae
JH
2896 remove_tempfile();
2897 if (retval) {
2898 fprintf(stderr, "external diff died, stopping at %s.\n", name);
2899 exit(1);
2900 }
2901}
2902
b67b9612
JH
2903static int similarity_index(struct diff_filepair *p)
2904{
2905 return p->score * 100 / MAX_SCORE;
2906}
2907
2908static void fill_metainfo(struct strbuf *msg,
2909 const char *name,
2910 const char *other,
2911 struct diff_filespec *one,
2912 struct diff_filespec *two,
2913 struct diff_options *o,
37466447 2914 struct diff_filepair *p,
5977744d 2915 int *must_show_header,
37466447 2916 int use_color)
b67b9612 2917{
37466447
BW
2918 const char *set = diff_get_color(use_color, DIFF_METAINFO);
2919 const char *reset = diff_get_color(use_color, DIFF_RESET);
7be57610
BY
2920 struct strbuf *msgbuf;
2921 char *line_prefix = "";
2922
296c6bb2 2923 *must_show_header = 1;
7be57610
BY
2924 if (o->output_prefix) {
2925 msgbuf = o->output_prefix(o, o->output_prefix_data);
2926 line_prefix = msgbuf->buf;
2927 }
b67b9612
JH
2928 strbuf_init(msg, PATH_MAX * 2 + 300);
2929 switch (p->status) {
2930 case DIFF_STATUS_COPIED:
98ad90fb
JH
2931 strbuf_addf(msg, "%s%ssimilarity index %d%%",
2932 line_prefix, set, similarity_index(p));
2933 strbuf_addf(msg, "%s\n%s%scopy from ",
2934 reset, line_prefix, set);
b67b9612 2935 quote_c_style(name, msg, NULL, 0);
98ad90fb 2936 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
b67b9612 2937 quote_c_style(other, msg, NULL, 0);
37466447 2938 strbuf_addf(msg, "%s\n", reset);
b67b9612
JH
2939 break;
2940 case DIFF_STATUS_RENAMED:
98ad90fb
JH
2941 strbuf_addf(msg, "%s%ssimilarity index %d%%",
2942 line_prefix, set, similarity_index(p));
2943 strbuf_addf(msg, "%s\n%s%srename from ",
2944 reset, line_prefix, set);
b67b9612 2945 quote_c_style(name, msg, NULL, 0);
98ad90fb
JH
2946 strbuf_addf(msg, "%s\n%s%srename to ",
2947 reset, line_prefix, set);
b67b9612 2948 quote_c_style(other, msg, NULL, 0);
37466447 2949 strbuf_addf(msg, "%s\n", reset);
b67b9612
JH
2950 break;
2951 case DIFF_STATUS_MODIFIED:
2952 if (p->score) {
98ad90fb
JH
2953 strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
2954 line_prefix,
37466447 2955 set, similarity_index(p), reset);
b67b9612
JH
2956 break;
2957 }
2958 /* fallthru */
2959 default:
296c6bb2 2960 *must_show_header = 0;
b67b9612
JH
2961 }
2962 if (one && two && hashcmp(one->sha1, two->sha1)) {
2963 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
2964
2965 if (DIFF_OPT_TST(o, BINARY)) {
2966 mmfile_t mf;
2967 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2968 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2969 abbrev = 40;
2970 }
e13f38a3 2971 strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
3e5a188f
JH
2972 find_unique_abbrev(one->sha1, abbrev));
2973 strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
b67b9612
JH
2974 if (one->mode == two->mode)
2975 strbuf_addf(msg, " %06o", one->mode);
37466447 2976 strbuf_addf(msg, "%s\n", reset);
b67b9612 2977 }
b67b9612
JH
2978}
2979
6973dcae
JH
2980static void run_diff_cmd(const char *pgm,
2981 const char *name,
2982 const char *other,
cd676a51 2983 const char *attr_path,
6973dcae
JH
2984 struct diff_filespec *one,
2985 struct diff_filespec *two,
b67b9612 2986 struct strbuf *msg,
051308f6 2987 struct diff_options *o,
b67b9612 2988 struct diff_filepair *p)
6973dcae 2989{
b67b9612
JH
2990 const char *xfrm_msg = NULL;
2991 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
296c6bb2 2992 int must_show_header = 0;
b67b9612 2993
bd8c1a9b
JH
2994
2995 if (DIFF_OPT_TST(o, ALLOW_EXTERNAL)) {
be58e70d
JK
2996 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
2997 if (drv && drv->external)
2998 pgm = drv->external;
f1af60bd
JH
2999 }
3000
37466447
BW
3001 if (msg) {
3002 /*
3003 * don't use colors when the header is intended for an
3004 * external diff driver
3005 */
3006 fill_metainfo(msg, name, other, one, two, o, p,
5977744d 3007 &must_show_header,
daa0c3d9 3008 want_color(o->use_color) && !pgm);
37466447
BW
3009 xfrm_msg = msg->len ? msg->buf : NULL;
3010 }
3011
6973dcae
JH
3012 if (pgm) {
3013 run_external_diff(pgm, name, other, one, two, xfrm_msg,
3014 complete_rewrite);
3015 return;
3016 }
3017 if (one && two)
3018 builtin_diff(name, other ? other : name,
296c6bb2
CC
3019 one, two, xfrm_msg, must_show_header,
3020 o, complete_rewrite);
6973dcae 3021 else
c0c77734 3022 fprintf(o->file, "* Unmerged path %s\n", name);
6973dcae
JH
3023}
3024
3025static void diff_fill_sha1_info(struct diff_filespec *one)
3026{
3027 if (DIFF_FILE_VALID(one)) {
3028 if (!one->sha1_valid) {
3029 struct stat st;
4682d852 3030 if (one->is_stdin) {
5332b2af
JS
3031 hashcpy(one->sha1, null_sha1);
3032 return;
3033 }
6973dcae 3034 if (lstat(one->path, &st) < 0)
0721c314 3035 die_errno("stat '%s'", one->path);
6973dcae 3036 if (index_path(one->sha1, one->path, &st, 0))
d7530708 3037 die("cannot hash %s", one->path);
6973dcae
JH
3038 }
3039 }
3040 else
e702496e 3041 hashclr(one->sha1);
6973dcae
JH
3042}
3043
cd676a51
JH
3044static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
3045{
3046 /* Strip the prefix but do not molest /dev/null and absolute paths */
d8faea9d 3047 if (*namep && **namep != '/') {
cd676a51 3048 *namep += prefix_length;
d8faea9d
JN
3049 if (**namep == '/')
3050 ++*namep;
3051 }
3052 if (*otherp && **otherp != '/') {
cd676a51 3053 *otherp += prefix_length;
d8faea9d
JN
3054 if (**otherp == '/')
3055 ++*otherp;
3056 }
cd676a51
JH
3057}
3058
6973dcae
JH
3059static void run_diff(struct diff_filepair *p, struct diff_options *o)
3060{
3061 const char *pgm = external_diff();
663af342 3062 struct strbuf msg;
663af342
PH
3063 struct diff_filespec *one = p->one;
3064 struct diff_filespec *two = p->two;
6973dcae
JH
3065 const char *name;
3066 const char *other;
cd676a51 3067 const char *attr_path;
663af342 3068
cd676a51
JH
3069 name = p->one->path;
3070 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3071 attr_path = name;
3072 if (o->prefix_length)
3073 strip_prefix(o->prefix_length, &name, &other);
6973dcae 3074
bd8c1a9b
JH
3075 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
3076 pgm = NULL;
3077
6973dcae 3078 if (DIFF_PAIR_UNMERGED(p)) {
cd676a51 3079 run_diff_cmd(pgm, name, NULL, attr_path,
b67b9612 3080 NULL, NULL, NULL, o, p);
6973dcae
JH
3081 return;
3082 }
3083
6973dcae
JH
3084 diff_fill_sha1_info(one);
3085 diff_fill_sha1_info(two);
3086
6973dcae
JH
3087 if (!pgm &&
3088 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
3089 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
b67b9612
JH
3090 /*
3091 * a filepair that changes between file and symlink
6973dcae
JH
3092 * needs to be split into deletion and creation.
3093 */
3094 struct diff_filespec *null = alloc_filespec(two->path);
cd676a51 3095 run_diff_cmd(NULL, name, other, attr_path,
b67b9612 3096 one, null, &msg, o, p);
6973dcae 3097 free(null);
b67b9612
JH
3098 strbuf_release(&msg);
3099
6973dcae 3100 null = alloc_filespec(one->path);
cd676a51 3101 run_diff_cmd(NULL, name, other, attr_path,
b67b9612 3102 null, two, &msg, o, p);
6973dcae
JH
3103 free(null);
3104 }
3105 else
cd676a51 3106 run_diff_cmd(pgm, name, other, attr_path,
b67b9612 3107 one, two, &msg, o, p);
6973dcae 3108
663af342 3109 strbuf_release(&msg);
6973dcae
JH
3110}
3111
3112static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
3113 struct diffstat_t *diffstat)
3114{
3115 const char *name;
3116 const char *other;
710158e3 3117 int complete_rewrite = 0;
6973dcae
JH
3118
3119 if (DIFF_PAIR_UNMERGED(p)) {
3120 /* unmerged */
0d21efa5 3121 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
6973dcae
JH
3122 return;
3123 }
3124
3125 name = p->one->path;
3126 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3127
cd676a51
JH
3128 if (o->prefix_length)
3129 strip_prefix(o->prefix_length, &name, &other);
3130
6973dcae
JH
3131 diff_fill_sha1_info(p->one);
3132 diff_fill_sha1_info(p->two);
3133
710158e3
JH
3134 if (p->status == DIFF_STATUS_MODIFIED && p->score)
3135 complete_rewrite = 1;
0d21efa5 3136 builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
6973dcae
JH
3137}
3138
88246898
JS
3139static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
3140{
3141 const char *name;
3142 const char *other;
cd676a51 3143 const char *attr_path;
88246898
JS
3144
3145 if (DIFF_PAIR_UNMERGED(p)) {
3146 /* unmerged */
3147 return;
3148 }
3149
3150 name = p->one->path;
3151 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
cd676a51
JH
3152 attr_path = other ? other : name;
3153
3154 if (o->prefix_length)
3155 strip_prefix(o->prefix_length, &name, &other);
88246898
JS
3156
3157 diff_fill_sha1_info(p->one);
3158 diff_fill_sha1_info(p->two);
3159
cd676a51 3160 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
88246898
JS
3161}
3162
6973dcae
JH
3163void diff_setup(struct diff_options *options)
3164{
be4f2b40 3165 memcpy(options, &default_diff_options, sizeof(*options));
c0c77734
DB
3166
3167 options->file = stdout;
3168
6973dcae
JH
3169 options->line_termination = '\n';
3170 options->break_opt = -1;
3171 options->rename_limit = -1;
712d2c7d 3172 options->dirstat_permille = diff_dirstat_permille_default;
ee1e5412 3173 options->context = 3;
90d43b07 3174 DIFF_OPT_SET(options, RENAME_EMPTY);
6973dcae
JH
3175
3176 options->change = diff_change;
3177 options->add_remove = diff_addremove;
f1c96261 3178 options->use_color = diff_use_color_default;
b68ea12e 3179 options->detect_rename = diff_detect_rename_default;
eab9a40b 3180
f89504dd
EC
3181 if (diff_no_prefix) {
3182 options->a_prefix = options->b_prefix = "";
3183 } else if (!diff_mnemonic_prefix) {
a5a818ee
JH
3184 options->a_prefix = "a/";
3185 options->b_prefix = "b/";
3186 }
6973dcae
JH
3187}
3188
28452655 3189void diff_setup_done(struct diff_options *options)
6973dcae 3190{
d7de00f7
TH
3191 int count = 0;
3192
3193 if (options->output_format & DIFF_FORMAT_NAME)
3194 count++;
3195 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
3196 count++;
3197 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
3198 count++;
3199 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
3200 count++;
3201 if (count > 1)
3202 die("--name-only, --name-status, --check and -s are mutually exclusive");
3203
f245194f
JH
3204 /*
3205 * Most of the time we can say "there are changes"
3206 * only by checking if there are changed paths, but
3207 * --ignore-whitespace* options force us to look
97bf2a08 3208 * inside contents.
f245194f
JH
3209 */
3210
3211 if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
3212 DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
3213 DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
3214 DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
3215 else
3216 DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
3217
8f67f8ae 3218 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
03b9d560
JH
3219 options->detect_rename = DIFF_DETECT_COPY;
3220
cd676a51
JH
3221 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
3222 options->prefix = NULL;
3223 if (options->prefix)
3224 options->prefix_length = strlen(options->prefix);
3225 else
3226 options->prefix_length = 0;
3227
c6744349
TH
3228 if (options->output_format & (DIFF_FORMAT_NAME |
3229 DIFF_FORMAT_NAME_STATUS |
3230 DIFF_FORMAT_CHECKDIFF |
3231 DIFF_FORMAT_NO_OUTPUT))
3232 options->output_format &= ~(DIFF_FORMAT_RAW |
74e2abe5 3233 DIFF_FORMAT_NUMSTAT |
c6744349 3234 DIFF_FORMAT_DIFFSTAT |
ebd124c6 3235 DIFF_FORMAT_SHORTSTAT |
7df7c019 3236 DIFF_FORMAT_DIRSTAT |
c6744349
TH
3237 DIFF_FORMAT_SUMMARY |
3238 DIFF_FORMAT_PATCH);
3239
6973dcae
JH
3240 /*
3241 * These cases always need recursive; we do not drop caller-supplied
3242 * recursive bits for other formats here.
3243 */
c6744349 3244 if (options->output_format & (DIFF_FORMAT_PATCH |
74e2abe5 3245 DIFF_FORMAT_NUMSTAT |
c6744349 3246 DIFF_FORMAT_DIFFSTAT |
ebd124c6 3247 DIFF_FORMAT_SHORTSTAT |
7df7c019 3248 DIFF_FORMAT_DIRSTAT |
d7014dc0 3249 DIFF_FORMAT_SUMMARY |
c6744349 3250 DIFF_FORMAT_CHECKDIFF))
8f67f8ae 3251 DIFF_OPT_SET(options, RECURSIVE);
5e363541 3252 /*
3969cf7d 3253 * Also pickaxe would not work very well if you do not say recursive
5e363541 3254 */
3969cf7d 3255 if (options->pickaxe)
8f67f8ae 3256 DIFF_OPT_SET(options, RECURSIVE);
ae6d5c1b
JL
3257 /*
3258 * When patches are generated, submodules diffed against the work tree
3259 * must be checked for dirtiness too so it can be shown in the output
3260 */
3261 if (options->output_format & DIFF_FORMAT_PATCH)
3262 DIFF_OPT_SET(options, DIRTY_SUBMODULES);
5e363541 3263
6973dcae
JH
3264 if (options->detect_rename && options->rename_limit < 0)
3265 options->rename_limit = diff_rename_limit_default;
3266 if (options->setup & DIFF_SETUP_USE_CACHE) {
3267 if (!active_cache)
3268 /* read-cache does not die even when it fails
3269 * so it is safe for us to do this here. Also
3270 * it does not smudge active_cache or active_nr
3271 * when it fails, so we do not have to worry about
3272 * cleaning it up ourselves either.
3273 */
3274 read_cache();
3275 }
6973dcae
JH
3276 if (options->abbrev <= 0 || 40 < options->abbrev)
3277 options->abbrev = 40; /* full */
3278
68aacb2f
JH
3279 /*
3280 * It does not make sense to show the first hit we happened
3281 * to have found. It does not make sense not to return with
3282 * exit code in such a case either.
3283 */
90b19941 3284 if (DIFF_OPT_TST(options, QUICK)) {
68aacb2f 3285 options->output_format = DIFF_FORMAT_NO_OUTPUT;
8f67f8ae 3286 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
68aacb2f 3287 }
6973dcae
JH
3288}
3289
d2543b8e 3290static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
ee1e5412
LT
3291{
3292 char c, *eq;
3293 int len;
3294
3295 if (*arg != '-')
3296 return 0;
3297 c = *++arg;
3298 if (!c)
3299 return 0;
3300 if (c == arg_short) {
3301 c = *++arg;
3302 if (!c)
3303 return 1;
3304 if (val && isdigit(c)) {
3305 char *end;
3306 int n = strtoul(arg, &end, 10);
3307 if (*end)
3308 return 0;
3309 *val = n;
3310 return 1;
3311 }
3312 return 0;
3313 }
3314 if (c != '-')
3315 return 0;
3316 arg++;
3317 eq = strchr(arg, '=');
3318 if (eq)
3319 len = eq - arg;
3320 else
3321 len = strlen(arg);
3322 if (!len || strncmp(arg, arg_long, len))
3323 return 0;
3324 if (eq) {
3325 int n;
3326 char *end;
3327 if (!isdigit(*++eq))
3328 return 0;
3329 n = strtoul(eq, &end, 10);
3330 if (*end)
3331 return 0;
3332 *val = n;
3333 }
3334 return 1;
3335}
3336
16befb8b
JH
3337static int diff_scoreopt_parse(const char *opt);
3338
dea007fb
MM
3339static inline int short_opt(char opt, const char **argv,
3340 const char **optarg)
3341{
3342 const char *arg = argv[0];
3343 if (arg[0] != '-' || arg[1] != opt)
3344 return 0;
3345 if (arg[2] != '\0') {
3346 *optarg = arg + 2;
3347 return 1;
3348 }
3349 if (!argv[1])
3350 die("Option '%c' requires a value", opt);
3351 *optarg = argv[1];
3352 return 2;
3353}
3354
3355int parse_long_opt(const char *opt, const char **argv,
3356 const char **optarg)
3357{
3358 const char *arg = argv[0];
3359 if (arg[0] != '-' || arg[1] != '-')
3360 return 0;
3361 arg += strlen("--");
3362 if (prefixcmp(arg, opt))
3363 return 0;
3364 arg += strlen(opt);
3365 if (*arg == '=') { /* sticked form: --option=value */
3366 *optarg = arg + 1;
3367 return 1;
3368 }
3369 if (*arg != '\0')
3370 return 0;
3371 /* separate form: --option value */
3372 if (!argv[1])
3373 die("Option '--%s' requires a value", opt);
3374 *optarg = argv[1];
3375 return 2;
3376}
3377
4d7f7a4a
JN
3378static int stat_opt(struct diff_options *options, const char **av)
3379{
3380 const char *arg = av[0];
3381 char *end;
3382 int width = options->stat_width;
3383 int name_width = options->stat_name_width;
969fe57b 3384 int graph_width = options->stat_graph_width;
808e1db2 3385 int count = options->stat_count;
1e57208e 3386 int argcount = 1;
4d7f7a4a
JN
3387
3388 arg += strlen("--stat");
3389 end = (char *)arg;
3390
3391 switch (*arg) {
3392 case '-':
1e57208e
MM
3393 if (!prefixcmp(arg, "-width")) {
3394 arg += strlen("-width");
3395 if (*arg == '=')
3396 width = strtoul(arg + 1, &end, 10);
3397 else if (!*arg && !av[1])
3398 die("Option '--stat-width' requires a value");
3399 else if (!*arg) {
3400 width = strtoul(av[1], &end, 10);
3401 argcount = 2;
3402 }
3403 } else if (!prefixcmp(arg, "-name-width")) {
3404 arg += strlen("-name-width");
3405 if (*arg == '=')
3406 name_width = strtoul(arg + 1, &end, 10);
3407 else if (!*arg && !av[1])
3408 die("Option '--stat-name-width' requires a value");
3409 else if (!*arg) {
3410 name_width = strtoul(av[1], &end, 10);
3411 argcount = 2;
3412 }
969fe57b
ZJS
3413 } else if (!prefixcmp(arg, "-graph-width")) {
3414 arg += strlen("-graph-width");
3415 if (*arg == '=')
3416 graph_width = strtoul(arg + 1, &end, 10);
3417 else if (!*arg && !av[1])
3418 die("Option '--stat-graph-width' requires a value");
3419 else if (!*arg) {
3420 graph_width = strtoul(av[1], &end, 10);
3421 argcount = 2;
3422 }
808e1db2
MG
3423 } else if (!prefixcmp(arg, "-count")) {
3424 arg += strlen("-count");
3425 if (*arg == '=')
3426 count = strtoul(arg + 1, &end, 10);
3427 else if (!*arg && !av[1])
3428 die("Option '--stat-count' requires a value");
3429 else if (!*arg) {
3430 count = strtoul(av[1], &end, 10);
3431 argcount = 2;
3432 }
1e57208e 3433 }
4d7f7a4a
JN
3434 break;
3435 case '=':
3436 width = strtoul(arg+1, &end, 10);
3437 if (*end == ',')
3438 name_width = strtoul(end+1, &end, 10);
808e1db2
MG
3439 if (*end == ',')
3440 count = strtoul(end+1, &end, 10);
4d7f7a4a
JN
3441 }
3442
3443 /* Important! This checks all the error cases! */
3444 if (*end)
3445 return 0;
3446 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3447 options->stat_name_width = name_width;
969fe57b 3448 options->stat_graph_width = graph_width;
4d7f7a4a 3449 options->stat_width = width;
808e1db2 3450 options->stat_count = count;
1e57208e 3451 return argcount;
4d7f7a4a
JN
3452}
3453
333f3fb0
JH
3454static int parse_dirstat_opt(struct diff_options *options, const char *params)
3455{
51670fc8
JH
3456 struct strbuf errmsg = STRBUF_INIT;
3457 if (parse_dirstat_params(options, params, &errmsg))
7478ac57 3458 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
51670fc8
JH
3459 errmsg.buf);
3460 strbuf_release(&errmsg);
333f3fb0
JH
3461 /*
3462 * The caller knows a dirstat-related option is given from the command
3463 * line; allow it to say "return this_function();"
3464 */
3465 options->output_format |= DIFF_FORMAT_DIRSTAT;
3466 return 1;
3467}
3468
6973dcae
JH
3469int diff_opt_parse(struct diff_options *options, const char **av, int ac)
3470{
3471 const char *arg = av[0];
dea007fb
MM
3472 const char *optarg;
3473 int argcount;
d054680c
PH
3474
3475 /* Output format options */
1c9eecff 3476 if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch"))
c6744349 3477 options->output_format |= DIFF_FORMAT_PATCH;
ee1e5412 3478 else if (opt_arg(arg, 'U', "unified", &options->context))
c6744349 3479 options->output_format |= DIFF_FORMAT_PATCH;
a610786f
TH
3480 else if (!strcmp(arg, "--raw"))
3481 options->output_format |= DIFF_FORMAT_RAW;
8f67f8ae 3482 else if (!strcmp(arg, "--patch-with-raw"))
c6744349 3483 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
8f67f8ae 3484 else if (!strcmp(arg, "--numstat"))
74e2abe5 3485 options->output_format |= DIFF_FORMAT_NUMSTAT;
8f67f8ae 3486 else if (!strcmp(arg, "--shortstat"))
ebd124c6 3487 options->output_format |= DIFF_FORMAT_SHORTSTAT;
333f3fb0
JH
3488 else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat"))
3489 return parse_dirstat_opt(options, "");
3490 else if (!prefixcmp(arg, "-X"))
3491 return parse_dirstat_opt(options, arg + 2);
3492 else if (!prefixcmp(arg, "--dirstat="))
3493 return parse_dirstat_opt(options, arg + 10);
3494 else if (!strcmp(arg, "--cumulative"))
3495 return parse_dirstat_opt(options, "cumulative");
3496 else if (!strcmp(arg, "--dirstat-by-file"))
3497 return parse_dirstat_opt(options, "files");
3498 else if (!prefixcmp(arg, "--dirstat-by-file=")) {
3499 parse_dirstat_opt(options, "files");
3500 return parse_dirstat_opt(options, arg + 18);
f88d225f 3501 }
d054680c
PH
3502 else if (!strcmp(arg, "--check"))
3503 options->output_format |= DIFF_FORMAT_CHECKDIFF;
3504 else if (!strcmp(arg, "--summary"))
3505 options->output_format |= DIFF_FORMAT_SUMMARY;
3506 else if (!strcmp(arg, "--patch-with-stat"))
3507 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
3508 else if (!strcmp(arg, "--name-only"))
3509 options->output_format |= DIFF_FORMAT_NAME;
3510 else if (!strcmp(arg, "--name-status"))
3511 options->output_format |= DIFF_FORMAT_NAME_STATUS;
3512 else if (!strcmp(arg, "-s"))
3513 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
4d7f7a4a 3514 else if (!prefixcmp(arg, "--stat"))
808e1db2 3515 /* --stat, --stat-width, --stat-name-width, or --stat-count */
4d7f7a4a 3516 return stat_opt(options, av);
d054680c
PH
3517
3518 /* renames options */
37ab5156
KB
3519 else if (!prefixcmp(arg, "-B") || !prefixcmp(arg, "--break-rewrites=") ||
3520 !strcmp(arg, "--break-rewrites")) {
8f67f8ae 3521 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
07cd7265 3522 return error("invalid argument to -B: %s", arg+2);
6973dcae 3523 }
f611ddc7
YD
3524 else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--find-renames=") ||
3525 !strcmp(arg, "--find-renames")) {
8f67f8ae 3526 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
07cd7265 3527 return error("invalid argument to -M: %s", arg+2);
6973dcae
JH
3528 options->detect_rename = DIFF_DETECT_RENAME;
3529 }
467ddc14
JH
3530 else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
3531 options->irreversible_delete = 1;
3532 }
f611ddc7
YD
3533 else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--find-copies=") ||
3534 !strcmp(arg, "--find-copies")) {
ca6c0970 3535 if (options->detect_rename == DIFF_DETECT_COPY)
8f67f8ae
PH
3536 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3537 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
07cd7265 3538 return error("invalid argument to -C: %s", arg+2);
6973dcae
JH
3539 options->detect_rename = DIFF_DETECT_COPY;
3540 }
d054680c
PH
3541 else if (!strcmp(arg, "--no-renames"))
3542 options->detect_rename = 0;
90d43b07
JK
3543 else if (!strcmp(arg, "--rename-empty"))
3544 DIFF_OPT_SET(options, RENAME_EMPTY);
3545 else if (!strcmp(arg, "--no-rename-empty"))
3546 DIFF_OPT_CLR(options, RENAME_EMPTY);
cd676a51
JH
3547 else if (!strcmp(arg, "--relative"))
3548 DIFF_OPT_SET(options, RELATIVE_NAME);
c0cb4a06
JH
3549 else if (!prefixcmp(arg, "--relative=")) {
3550 DIFF_OPT_SET(options, RELATIVE_NAME);
3551 options->prefix = arg + 11;
3552 }
d054680c
PH
3553
3554 /* xdiff options */
81b568c8
JH
3555 else if (!strcmp(arg, "--minimal"))
3556 DIFF_XDL_SET(options, NEED_MINIMAL);
3557 else if (!strcmp(arg, "--no-minimal"))
3558 DIFF_XDL_CLR(options, NEED_MINIMAL);
d054680c 3559 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
628d5c2b 3560 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
d054680c 3561 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
628d5c2b 3562 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
d054680c 3563 else if (!strcmp(arg, "--ignore-space-at-eol"))
628d5c2b 3564 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
34292bdd 3565 else if (!strcmp(arg, "--patience"))
307ab20b 3566 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
8c912eea 3567 else if (!strcmp(arg, "--histogram"))
307ab20b 3568 options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
d054680c
PH
3569
3570 /* flags options */
3571 else if (!strcmp(arg, "--binary")) {
3572 options->output_format |= DIFF_FORMAT_PATCH;
3573 DIFF_OPT_SET(options, BINARY);
3574 }
3575 else if (!strcmp(arg, "--full-index"))
3576 DIFF_OPT_SET(options, FULL_INDEX);
3577 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
3578 DIFF_OPT_SET(options, TEXT);
3579 else if (!strcmp(arg, "-R"))
3580 DIFF_OPT_SET(options, REVERSE_DIFF);
6973dcae 3581 else if (!strcmp(arg, "--find-copies-harder"))
8f67f8ae 3582 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
750f7b66 3583 else if (!strcmp(arg, "--follow"))
8f67f8ae 3584 DIFF_OPT_SET(options, FOLLOW_RENAMES