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