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