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