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