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