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