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