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