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