i18n: for-each-ref: mark parseopt strings for translation
[git/jnareb-git.git] / diff.c
blob95706a5b4098afc8f20fe53425ff760c996a3b4e
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #include "cache.h"
5 #include "quote.h"
6 #include "diff.h"
7 #include "diffcore.h"
8 #include "delta.h"
9 #include "xdiff-interface.h"
10 #include "color.h"
11 #include "attr.h"
12 #include "run-command.h"
13 #include "utf8.h"
14 #include "userdiff.h"
15 #include "sigchain.h"
16 #include "submodule.h"
17 #include "ll-merge.h"
19 #ifdef NO_FAST_WORKING_DIRECTORY
20 #define FAST_WORKING_DIRECTORY 0
21 #else
22 #define FAST_WORKING_DIRECTORY 1
23 #endif
25 static int diff_detect_rename_default;
26 static int diff_rename_limit_default = 400;
27 static int diff_suppress_blank_empty;
28 int diff_use_color_default = -1;
29 static const char *diff_word_regex_cfg;
30 static const char *external_diff_cmd_cfg;
31 int diff_auto_refresh_index = 1;
32 static int diff_mnemonic_prefix;
33 static int diff_no_prefix;
34 static int diff_stat_graph_width;
35 static int diff_dirstat_permille_default = 30;
36 static struct diff_options default_diff_options;
38 static char diff_colors[][COLOR_MAXLEN] = {
39 GIT_COLOR_RESET,
40 GIT_COLOR_NORMAL, /* PLAIN */
41 GIT_COLOR_BOLD, /* METAINFO */
42 GIT_COLOR_CYAN, /* FRAGINFO */
43 GIT_COLOR_RED, /* OLD */
44 GIT_COLOR_GREEN, /* NEW */
45 GIT_COLOR_YELLOW, /* COMMIT */
46 GIT_COLOR_BG_RED, /* WHITESPACE */
47 GIT_COLOR_NORMAL, /* FUNCINFO */
50 static int parse_diff_color_slot(const char *var, int ofs)
52 if (!strcasecmp(var+ofs, "plain"))
53 return DIFF_PLAIN;
54 if (!strcasecmp(var+ofs, "meta"))
55 return DIFF_METAINFO;
56 if (!strcasecmp(var+ofs, "frag"))
57 return DIFF_FRAGINFO;
58 if (!strcasecmp(var+ofs, "old"))
59 return DIFF_FILE_OLD;
60 if (!strcasecmp(var+ofs, "new"))
61 return DIFF_FILE_NEW;
62 if (!strcasecmp(var+ofs, "commit"))
63 return DIFF_COMMIT;
64 if (!strcasecmp(var+ofs, "whitespace"))
65 return DIFF_WHITESPACE;
66 if (!strcasecmp(var+ofs, "func"))
67 return DIFF_FUNCINFO;
68 return -1;
71 static int parse_dirstat_params(struct diff_options *options, const char *params,
72 struct strbuf *errmsg)
74 const char *p = params;
75 int p_len, ret = 0;
77 while (*p) {
78 p_len = strchrnul(p, ',') - p;
79 if (!memcmp(p, "changes", p_len)) {
80 DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
81 DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
82 } else if (!memcmp(p, "lines", p_len)) {
83 DIFF_OPT_SET(options, DIRSTAT_BY_LINE);
84 DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
85 } else if (!memcmp(p, "files", p_len)) {
86 DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
87 DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
88 } else if (!memcmp(p, "noncumulative", p_len)) {
89 DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
90 } else if (!memcmp(p, "cumulative", p_len)) {
91 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
92 } else if (isdigit(*p)) {
93 char *end;
94 int permille = strtoul(p, &end, 10) * 10;
95 if (*end == '.' && isdigit(*++end)) {
96 /* only use first digit */
97 permille += *end - '0';
98 /* .. and ignore any further digits */
99 while (isdigit(*++end))
100 ; /* nothing */
102 if (end - p == p_len)
103 options->dirstat_permille = permille;
104 else {
105 strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%.*s'\n"),
106 p_len, p);
107 ret++;
109 } else {
110 strbuf_addf(errmsg, _(" Unknown dirstat parameter '%.*s'\n"),
111 p_len, p);
112 ret++;
115 p += p_len;
117 if (*p)
118 p++; /* more parameters, swallow separator */
120 return ret;
123 static int git_config_rename(const char *var, const char *value)
125 if (!value)
126 return DIFF_DETECT_RENAME;
127 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
128 return DIFF_DETECT_COPY;
129 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
133 * These are to give UI layer defaults.
134 * The core-level commands such as git-diff-files should
135 * never be affected by the setting of diff.renames
136 * the user happens to have in the configuration file.
138 int git_diff_ui_config(const char *var, const char *value, void *cb)
140 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
141 diff_use_color_default = git_config_colorbool(var, value);
142 return 0;
144 if (!strcmp(var, "diff.renames")) {
145 diff_detect_rename_default = git_config_rename(var, value);
146 return 0;
148 if (!strcmp(var, "diff.autorefreshindex")) {
149 diff_auto_refresh_index = git_config_bool(var, value);
150 return 0;
152 if (!strcmp(var, "diff.mnemonicprefix")) {
153 diff_mnemonic_prefix = git_config_bool(var, value);
154 return 0;
156 if (!strcmp(var, "diff.noprefix")) {
157 diff_no_prefix = git_config_bool(var, value);
158 return 0;
160 if (!strcmp(var, "diff.statgraphwidth")) {
161 diff_stat_graph_width = git_config_int(var, value);
162 return 0;
164 if (!strcmp(var, "diff.external"))
165 return git_config_string(&external_diff_cmd_cfg, var, value);
166 if (!strcmp(var, "diff.wordregex"))
167 return git_config_string(&diff_word_regex_cfg, var, value);
169 if (!strcmp(var, "diff.ignoresubmodules"))
170 handle_ignore_submodules_arg(&default_diff_options, value);
172 if (git_color_config(var, value, cb) < 0)
173 return -1;
175 return git_diff_basic_config(var, value, cb);
178 int git_diff_basic_config(const char *var, const char *value, void *cb)
180 if (!strcmp(var, "diff.renamelimit")) {
181 diff_rename_limit_default = git_config_int(var, value);
182 return 0;
185 if (userdiff_config(var, value) < 0)
186 return -1;
188 if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
189 int slot = parse_diff_color_slot(var, 11);
190 if (slot < 0)
191 return 0;
192 if (!value)
193 return config_error_nonbool(var);
194 color_parse(value, var, diff_colors[slot]);
195 return 0;
198 /* like GNU diff's --suppress-blank-empty option */
199 if (!strcmp(var, "diff.suppressblankempty") ||
200 /* for backwards compatibility */
201 !strcmp(var, "diff.suppress-blank-empty")) {
202 diff_suppress_blank_empty = git_config_bool(var, value);
203 return 0;
206 if (!strcmp(var, "diff.dirstat")) {
207 struct strbuf errmsg = STRBUF_INIT;
208 default_diff_options.dirstat_permille = diff_dirstat_permille_default;
209 if (parse_dirstat_params(&default_diff_options, value, &errmsg))
210 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
211 errmsg.buf);
212 strbuf_release(&errmsg);
213 diff_dirstat_permille_default = default_diff_options.dirstat_permille;
214 return 0;
217 if (!prefixcmp(var, "submodule."))
218 return parse_submodule_config_option(var, value);
220 return git_default_config(var, value, cb);
223 static char *quote_two(const char *one, const char *two)
225 int need_one = quote_c_style(one, NULL, NULL, 1);
226 int need_two = quote_c_style(two, NULL, NULL, 1);
227 struct strbuf res = STRBUF_INIT;
229 if (need_one + need_two) {
230 strbuf_addch(&res, '"');
231 quote_c_style(one, &res, NULL, 1);
232 quote_c_style(two, &res, NULL, 1);
233 strbuf_addch(&res, '"');
234 } else {
235 strbuf_addstr(&res, one);
236 strbuf_addstr(&res, two);
238 return strbuf_detach(&res, NULL);
241 static const char *external_diff(void)
243 static const char *external_diff_cmd = NULL;
244 static int done_preparing = 0;
246 if (done_preparing)
247 return external_diff_cmd;
248 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
249 if (!external_diff_cmd)
250 external_diff_cmd = external_diff_cmd_cfg;
251 done_preparing = 1;
252 return external_diff_cmd;
255 static struct diff_tempfile {
256 const char *name; /* filename external diff should read from */
257 char hex[41];
258 char mode[10];
259 char tmp_path[PATH_MAX];
260 } diff_temp[2];
262 typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
264 struct emit_callback {
265 int color_diff;
266 unsigned ws_rule;
267 int blank_at_eof_in_preimage;
268 int blank_at_eof_in_postimage;
269 int lno_in_preimage;
270 int lno_in_postimage;
271 sane_truncate_fn truncate;
272 const char **label_path;
273 struct diff_words_data *diff_words;
274 struct diff_options *opt;
275 int *found_changesp;
276 struct strbuf *header;
279 static int count_lines(const char *data, int size)
281 int count, ch, completely_empty = 1, nl_just_seen = 0;
282 count = 0;
283 while (0 < size--) {
284 ch = *data++;
285 if (ch == '\n') {
286 count++;
287 nl_just_seen = 1;
288 completely_empty = 0;
290 else {
291 nl_just_seen = 0;
292 completely_empty = 0;
295 if (completely_empty)
296 return 0;
297 if (!nl_just_seen)
298 count++; /* no trailing newline */
299 return count;
302 static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
304 if (!DIFF_FILE_VALID(one)) {
305 mf->ptr = (char *)""; /* does not matter */
306 mf->size = 0;
307 return 0;
309 else if (diff_populate_filespec(one, 0))
310 return -1;
312 mf->ptr = one->data;
313 mf->size = one->size;
314 return 0;
317 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
318 static unsigned long diff_filespec_size(struct diff_filespec *one)
320 if (!DIFF_FILE_VALID(one))
321 return 0;
322 diff_populate_filespec(one, 1);
323 return one->size;
326 static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
328 char *ptr = mf->ptr;
329 long size = mf->size;
330 int cnt = 0;
332 if (!size)
333 return cnt;
334 ptr += size - 1; /* pointing at the very end */
335 if (*ptr != '\n')
336 ; /* incomplete line */
337 else
338 ptr--; /* skip the last LF */
339 while (mf->ptr < ptr) {
340 char *prev_eol;
341 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
342 if (*prev_eol == '\n')
343 break;
344 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
345 break;
346 cnt++;
347 ptr = prev_eol - 1;
349 return cnt;
352 static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
353 struct emit_callback *ecbdata)
355 int l1, l2, at;
356 unsigned ws_rule = ecbdata->ws_rule;
357 l1 = count_trailing_blank(mf1, ws_rule);
358 l2 = count_trailing_blank(mf2, ws_rule);
359 if (l2 <= l1) {
360 ecbdata->blank_at_eof_in_preimage = 0;
361 ecbdata->blank_at_eof_in_postimage = 0;
362 return;
364 at = count_lines(mf1->ptr, mf1->size);
365 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
367 at = count_lines(mf2->ptr, mf2->size);
368 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
371 static void emit_line_0(struct diff_options *o, const char *set, const char *reset,
372 int first, const char *line, int len)
374 int has_trailing_newline, has_trailing_carriage_return;
375 int nofirst;
376 FILE *file = o->file;
378 if (o->output_prefix) {
379 struct strbuf *msg = NULL;
380 msg = o->output_prefix(o, o->output_prefix_data);
381 assert(msg);
382 fwrite(msg->buf, msg->len, 1, file);
385 if (len == 0) {
386 has_trailing_newline = (first == '\n');
387 has_trailing_carriage_return = (!has_trailing_newline &&
388 (first == '\r'));
389 nofirst = has_trailing_newline || has_trailing_carriage_return;
390 } else {
391 has_trailing_newline = (len > 0 && line[len-1] == '\n');
392 if (has_trailing_newline)
393 len--;
394 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
395 if (has_trailing_carriage_return)
396 len--;
397 nofirst = 0;
400 if (len || !nofirst) {
401 fputs(set, file);
402 if (!nofirst)
403 fputc(first, file);
404 fwrite(line, len, 1, file);
405 fputs(reset, file);
407 if (has_trailing_carriage_return)
408 fputc('\r', file);
409 if (has_trailing_newline)
410 fputc('\n', file);
413 static void emit_line(struct diff_options *o, const char *set, const char *reset,
414 const char *line, int len)
416 emit_line_0(o, set, reset, line[0], line+1, len-1);
419 static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
421 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
422 ecbdata->blank_at_eof_in_preimage &&
423 ecbdata->blank_at_eof_in_postimage &&
424 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
425 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
426 return 0;
427 return ws_blank_line(line, len, ecbdata->ws_rule);
430 static void emit_add_line(const char *reset,
431 struct emit_callback *ecbdata,
432 const char *line, int len)
434 const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
435 const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
437 if (!*ws)
438 emit_line_0(ecbdata->opt, set, reset, '+', line, len);
439 else if (new_blank_line_at_eof(ecbdata, line, len))
440 /* Blank line at EOF - paint '+' as well */
441 emit_line_0(ecbdata->opt, ws, reset, '+', line, len);
442 else {
443 /* Emit just the prefix, then the rest. */
444 emit_line_0(ecbdata->opt, set, reset, '+', "", 0);
445 ws_check_emit(line, len, ecbdata->ws_rule,
446 ecbdata->opt->file, set, reset, ws);
450 static void emit_hunk_header(struct emit_callback *ecbdata,
451 const char *line, int len)
453 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
454 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
455 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
456 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
457 static const char atat[2] = { '@', '@' };
458 const char *cp, *ep;
459 struct strbuf msgbuf = STRBUF_INIT;
460 int org_len = len;
461 int i = 1;
464 * As a hunk header must begin with "@@ -<old>, +<new> @@",
465 * it always is at least 10 bytes long.
467 if (len < 10 ||
468 memcmp(line, atat, 2) ||
469 !(ep = memmem(line + 2, len - 2, atat, 2))) {
470 emit_line(ecbdata->opt, plain, reset, line, len);
471 return;
473 ep += 2; /* skip over @@ */
475 /* The hunk header in fraginfo color */
476 strbuf_add(&msgbuf, frag, strlen(frag));
477 strbuf_add(&msgbuf, line, ep - line);
478 strbuf_add(&msgbuf, reset, strlen(reset));
481 * trailing "\r\n"
483 for ( ; i < 3; i++)
484 if (line[len - i] == '\r' || line[len - i] == '\n')
485 len--;
487 /* blank before the func header */
488 for (cp = ep; ep - line < len; ep++)
489 if (*ep != ' ' && *ep != '\t')
490 break;
491 if (ep != cp) {
492 strbuf_add(&msgbuf, plain, strlen(plain));
493 strbuf_add(&msgbuf, cp, ep - cp);
494 strbuf_add(&msgbuf, reset, strlen(reset));
497 if (ep < line + len) {
498 strbuf_add(&msgbuf, func, strlen(func));
499 strbuf_add(&msgbuf, ep, line + len - ep);
500 strbuf_add(&msgbuf, reset, strlen(reset));
503 strbuf_add(&msgbuf, line + len, org_len - len);
504 emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
505 strbuf_release(&msgbuf);
508 static struct diff_tempfile *claim_diff_tempfile(void) {
509 int i;
510 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
511 if (!diff_temp[i].name)
512 return diff_temp + i;
513 die("BUG: diff is failing to clean up its tempfiles");
516 static int remove_tempfile_installed;
518 static void remove_tempfile(void)
520 int i;
521 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
522 if (diff_temp[i].name == diff_temp[i].tmp_path)
523 unlink_or_warn(diff_temp[i].name);
524 diff_temp[i].name = NULL;
528 static void remove_tempfile_on_signal(int signo)
530 remove_tempfile();
531 sigchain_pop(signo);
532 raise(signo);
535 static void print_line_count(FILE *file, int count)
537 switch (count) {
538 case 0:
539 fprintf(file, "0,0");
540 break;
541 case 1:
542 fprintf(file, "1");
543 break;
544 default:
545 fprintf(file, "1,%d", count);
546 break;
550 static void emit_rewrite_lines(struct emit_callback *ecb,
551 int prefix, const char *data, int size)
553 const char *endp = NULL;
554 static const char *nneof = " No newline at end of file\n";
555 const char *old = diff_get_color(ecb->color_diff, DIFF_FILE_OLD);
556 const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
558 while (0 < size) {
559 int len;
561 endp = memchr(data, '\n', size);
562 len = endp ? (endp - data + 1) : size;
563 if (prefix != '+') {
564 ecb->lno_in_preimage++;
565 emit_line_0(ecb->opt, old, reset, '-',
566 data, len);
567 } else {
568 ecb->lno_in_postimage++;
569 emit_add_line(reset, ecb, data, len);
571 size -= len;
572 data += len;
574 if (!endp) {
575 const char *plain = diff_get_color(ecb->color_diff,
576 DIFF_PLAIN);
577 emit_line_0(ecb->opt, plain, reset, '\\',
578 nneof, strlen(nneof));
582 static void emit_rewrite_diff(const char *name_a,
583 const char *name_b,
584 struct diff_filespec *one,
585 struct diff_filespec *two,
586 struct userdiff_driver *textconv_one,
587 struct userdiff_driver *textconv_two,
588 struct diff_options *o)
590 int lc_a, lc_b;
591 const char *name_a_tab, *name_b_tab;
592 const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO);
593 const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
594 const char *reset = diff_get_color(o->use_color, DIFF_RESET);
595 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
596 const char *a_prefix, *b_prefix;
597 char *data_one, *data_two;
598 size_t size_one, size_two;
599 struct emit_callback ecbdata;
600 char *line_prefix = "";
601 struct strbuf *msgbuf;
603 if (o && o->output_prefix) {
604 msgbuf = o->output_prefix(o, o->output_prefix_data);
605 line_prefix = msgbuf->buf;
608 if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
609 a_prefix = o->b_prefix;
610 b_prefix = o->a_prefix;
611 } else {
612 a_prefix = o->a_prefix;
613 b_prefix = o->b_prefix;
616 name_a += (*name_a == '/');
617 name_b += (*name_b == '/');
618 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
619 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
621 strbuf_reset(&a_name);
622 strbuf_reset(&b_name);
623 quote_two_c_style(&a_name, a_prefix, name_a, 0);
624 quote_two_c_style(&b_name, b_prefix, name_b, 0);
626 size_one = fill_textconv(textconv_one, one, &data_one);
627 size_two = fill_textconv(textconv_two, two, &data_two);
629 memset(&ecbdata, 0, sizeof(ecbdata));
630 ecbdata.color_diff = want_color(o->use_color);
631 ecbdata.found_changesp = &o->found_changes;
632 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
633 ecbdata.opt = o;
634 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
635 mmfile_t mf1, mf2;
636 mf1.ptr = (char *)data_one;
637 mf2.ptr = (char *)data_two;
638 mf1.size = size_one;
639 mf2.size = size_two;
640 check_blank_at_eof(&mf1, &mf2, &ecbdata);
642 ecbdata.lno_in_preimage = 1;
643 ecbdata.lno_in_postimage = 1;
645 lc_a = count_lines(data_one, size_one);
646 lc_b = count_lines(data_two, size_two);
647 fprintf(o->file,
648 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
649 line_prefix, metainfo, a_name.buf, name_a_tab, reset,
650 line_prefix, metainfo, b_name.buf, name_b_tab, reset,
651 line_prefix, fraginfo);
652 if (!o->irreversible_delete)
653 print_line_count(o->file, lc_a);
654 else
655 fprintf(o->file, "?,?");
656 fprintf(o->file, " +");
657 print_line_count(o->file, lc_b);
658 fprintf(o->file, " @@%s\n", reset);
659 if (lc_a && !o->irreversible_delete)
660 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
661 if (lc_b)
662 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
663 if (textconv_one)
664 free((char *)data_one);
665 if (textconv_two)
666 free((char *)data_two);
669 struct diff_words_buffer {
670 mmfile_t text;
671 long alloc;
672 struct diff_words_orig {
673 const char *begin, *end;
674 } *orig;
675 int orig_nr, orig_alloc;
678 static void diff_words_append(char *line, unsigned long len,
679 struct diff_words_buffer *buffer)
681 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
682 line++;
683 len--;
684 memcpy(buffer->text.ptr + buffer->text.size, line, len);
685 buffer->text.size += len;
686 buffer->text.ptr[buffer->text.size] = '\0';
689 struct diff_words_style_elem {
690 const char *prefix;
691 const char *suffix;
692 const char *color; /* NULL; filled in by the setup code if
693 * color is enabled */
696 struct diff_words_style {
697 enum diff_words_type type;
698 struct diff_words_style_elem new, old, ctx;
699 const char *newline;
702 static struct diff_words_style diff_words_styles[] = {
703 { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
704 { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
705 { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
708 struct diff_words_data {
709 struct diff_words_buffer minus, plus;
710 const char *current_plus;
711 int last_minus;
712 struct diff_options *opt;
713 regex_t *word_regex;
714 enum diff_words_type type;
715 struct diff_words_style *style;
718 static int fn_out_diff_words_write_helper(FILE *fp,
719 struct diff_words_style_elem *st_el,
720 const char *newline,
721 size_t count, const char *buf,
722 const char *line_prefix)
724 int print = 0;
726 while (count) {
727 char *p = memchr(buf, '\n', count);
728 if (print)
729 fputs(line_prefix, fp);
730 if (p != buf) {
731 if (st_el->color && fputs(st_el->color, fp) < 0)
732 return -1;
733 if (fputs(st_el->prefix, fp) < 0 ||
734 fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
735 fputs(st_el->suffix, fp) < 0)
736 return -1;
737 if (st_el->color && *st_el->color
738 && fputs(GIT_COLOR_RESET, fp) < 0)
739 return -1;
741 if (!p)
742 return 0;
743 if (fputs(newline, fp) < 0)
744 return -1;
745 count -= p + 1 - buf;
746 buf = p + 1;
747 print = 1;
749 return 0;
753 * '--color-words' algorithm can be described as:
755 * 1. collect a the minus/plus lines of a diff hunk, divided into
756 * minus-lines and plus-lines;
758 * 2. break both minus-lines and plus-lines into words and
759 * place them into two mmfile_t with one word for each line;
761 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
763 * And for the common parts of the both file, we output the plus side text.
764 * diff_words->current_plus is used to trace the current position of the plus file
765 * which printed. diff_words->last_minus is used to trace the last minus word
766 * printed.
768 * For '--graph' to work with '--color-words', we need to output the graph prefix
769 * on each line of color words output. Generally, there are two conditions on
770 * which we should output the prefix.
772 * 1. diff_words->last_minus == 0 &&
773 * diff_words->current_plus == diff_words->plus.text.ptr
775 * that is: the plus text must start as a new line, and if there is no minus
776 * word printed, a graph prefix must be printed.
778 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
779 * *(diff_words->current_plus - 1) == '\n'
781 * that is: a graph prefix must be printed following a '\n'
783 static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
785 if ((diff_words->last_minus == 0 &&
786 diff_words->current_plus == diff_words->plus.text.ptr) ||
787 (diff_words->current_plus > diff_words->plus.text.ptr &&
788 *(diff_words->current_plus - 1) == '\n')) {
789 return 1;
790 } else {
791 return 0;
795 static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
797 struct diff_words_data *diff_words = priv;
798 struct diff_words_style *style = diff_words->style;
799 int minus_first, minus_len, plus_first, plus_len;
800 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
801 struct diff_options *opt = diff_words->opt;
802 struct strbuf *msgbuf;
803 char *line_prefix = "";
805 if (line[0] != '@' || parse_hunk_header(line, len,
806 &minus_first, &minus_len, &plus_first, &plus_len))
807 return;
809 assert(opt);
810 if (opt->output_prefix) {
811 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
812 line_prefix = msgbuf->buf;
815 /* POSIX requires that first be decremented by one if len == 0... */
816 if (minus_len) {
817 minus_begin = diff_words->minus.orig[minus_first].begin;
818 minus_end =
819 diff_words->minus.orig[minus_first + minus_len - 1].end;
820 } else
821 minus_begin = minus_end =
822 diff_words->minus.orig[minus_first].end;
824 if (plus_len) {
825 plus_begin = diff_words->plus.orig[plus_first].begin;
826 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
827 } else
828 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
830 if (color_words_output_graph_prefix(diff_words)) {
831 fputs(line_prefix, diff_words->opt->file);
833 if (diff_words->current_plus != plus_begin) {
834 fn_out_diff_words_write_helper(diff_words->opt->file,
835 &style->ctx, style->newline,
836 plus_begin - diff_words->current_plus,
837 diff_words->current_plus, line_prefix);
838 if (*(plus_begin - 1) == '\n')
839 fputs(line_prefix, diff_words->opt->file);
841 if (minus_begin != minus_end) {
842 fn_out_diff_words_write_helper(diff_words->opt->file,
843 &style->old, style->newline,
844 minus_end - minus_begin, minus_begin,
845 line_prefix);
847 if (plus_begin != plus_end) {
848 fn_out_diff_words_write_helper(diff_words->opt->file,
849 &style->new, style->newline,
850 plus_end - plus_begin, plus_begin,
851 line_prefix);
854 diff_words->current_plus = plus_end;
855 diff_words->last_minus = minus_first;
858 /* This function starts looking at *begin, and returns 0 iff a word was found. */
859 static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
860 int *begin, int *end)
862 if (word_regex && *begin < buffer->size) {
863 regmatch_t match[1];
864 if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) {
865 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
866 '\n', match[0].rm_eo - match[0].rm_so);
867 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
868 *begin += match[0].rm_so;
869 return *begin >= *end;
871 return -1;
874 /* find the next word */
875 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
876 (*begin)++;
877 if (*begin >= buffer->size)
878 return -1;
880 /* find the end of the word */
881 *end = *begin + 1;
882 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
883 (*end)++;
885 return 0;
889 * This function splits the words in buffer->text, stores the list with
890 * newline separator into out, and saves the offsets of the original words
891 * in buffer->orig.
893 static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
894 regex_t *word_regex)
896 int i, j;
897 long alloc = 0;
899 out->size = 0;
900 out->ptr = NULL;
902 /* fake an empty "0th" word */
903 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
904 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
905 buffer->orig_nr = 1;
907 for (i = 0; i < buffer->text.size; i++) {
908 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
909 return;
911 /* store original boundaries */
912 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
913 buffer->orig_alloc);
914 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
915 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
916 buffer->orig_nr++;
918 /* store one word */
919 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
920 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
921 out->ptr[out->size + j - i] = '\n';
922 out->size += j - i + 1;
924 i = j - 1;
928 /* this executes the word diff on the accumulated buffers */
929 static void diff_words_show(struct diff_words_data *diff_words)
931 xpparam_t xpp;
932 xdemitconf_t xecfg;
933 mmfile_t minus, plus;
934 struct diff_words_style *style = diff_words->style;
936 struct diff_options *opt = diff_words->opt;
937 struct strbuf *msgbuf;
938 char *line_prefix = "";
940 assert(opt);
941 if (opt->output_prefix) {
942 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
943 line_prefix = msgbuf->buf;
946 /* special case: only removal */
947 if (!diff_words->plus.text.size) {
948 fputs(line_prefix, diff_words->opt->file);
949 fn_out_diff_words_write_helper(diff_words->opt->file,
950 &style->old, style->newline,
951 diff_words->minus.text.size,
952 diff_words->minus.text.ptr, line_prefix);
953 diff_words->minus.text.size = 0;
954 return;
957 diff_words->current_plus = diff_words->plus.text.ptr;
958 diff_words->last_minus = 0;
960 memset(&xpp, 0, sizeof(xpp));
961 memset(&xecfg, 0, sizeof(xecfg));
962 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
963 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
964 xpp.flags = 0;
965 /* as only the hunk header will be parsed, we need a 0-context */
966 xecfg.ctxlen = 0;
967 xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
968 &xpp, &xecfg);
969 free(minus.ptr);
970 free(plus.ptr);
971 if (diff_words->current_plus != diff_words->plus.text.ptr +
972 diff_words->plus.text.size) {
973 if (color_words_output_graph_prefix(diff_words))
974 fputs(line_prefix, diff_words->opt->file);
975 fn_out_diff_words_write_helper(diff_words->opt->file,
976 &style->ctx, style->newline,
977 diff_words->plus.text.ptr + diff_words->plus.text.size
978 - diff_words->current_plus, diff_words->current_plus,
979 line_prefix);
981 diff_words->minus.text.size = diff_words->plus.text.size = 0;
984 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
985 static void diff_words_flush(struct emit_callback *ecbdata)
987 if (ecbdata->diff_words->minus.text.size ||
988 ecbdata->diff_words->plus.text.size)
989 diff_words_show(ecbdata->diff_words);
992 static void diff_filespec_load_driver(struct diff_filespec *one)
994 /* Use already-loaded driver */
995 if (one->driver)
996 return;
998 if (S_ISREG(one->mode))
999 one->driver = userdiff_find_by_path(one->path);
1001 /* Fallback to default settings */
1002 if (!one->driver)
1003 one->driver = userdiff_find_by_name("default");
1006 static const char *userdiff_word_regex(struct diff_filespec *one)
1008 diff_filespec_load_driver(one);
1009 return one->driver->word_regex;
1012 static void init_diff_words_data(struct emit_callback *ecbdata,
1013 struct diff_options *orig_opts,
1014 struct diff_filespec *one,
1015 struct diff_filespec *two)
1017 int i;
1018 struct diff_options *o = xmalloc(sizeof(struct diff_options));
1019 memcpy(o, orig_opts, sizeof(struct diff_options));
1021 ecbdata->diff_words =
1022 xcalloc(1, sizeof(struct diff_words_data));
1023 ecbdata->diff_words->type = o->word_diff;
1024 ecbdata->diff_words->opt = o;
1025 if (!o->word_regex)
1026 o->word_regex = userdiff_word_regex(one);
1027 if (!o->word_regex)
1028 o->word_regex = userdiff_word_regex(two);
1029 if (!o->word_regex)
1030 o->word_regex = diff_word_regex_cfg;
1031 if (o->word_regex) {
1032 ecbdata->diff_words->word_regex = (regex_t *)
1033 xmalloc(sizeof(regex_t));
1034 if (regcomp(ecbdata->diff_words->word_regex,
1035 o->word_regex,
1036 REG_EXTENDED | REG_NEWLINE))
1037 die ("Invalid regular expression: %s",
1038 o->word_regex);
1040 for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
1041 if (o->word_diff == diff_words_styles[i].type) {
1042 ecbdata->diff_words->style =
1043 &diff_words_styles[i];
1044 break;
1047 if (want_color(o->use_color)) {
1048 struct diff_words_style *st = ecbdata->diff_words->style;
1049 st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
1050 st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
1051 st->ctx.color = diff_get_color_opt(o, DIFF_PLAIN);
1055 static void free_diff_words_data(struct emit_callback *ecbdata)
1057 if (ecbdata->diff_words) {
1058 diff_words_flush(ecbdata);
1059 free (ecbdata->diff_words->opt);
1060 free (ecbdata->diff_words->minus.text.ptr);
1061 free (ecbdata->diff_words->minus.orig);
1062 free (ecbdata->diff_words->plus.text.ptr);
1063 free (ecbdata->diff_words->plus.orig);
1064 if (ecbdata->diff_words->word_regex) {
1065 regfree(ecbdata->diff_words->word_regex);
1066 free(ecbdata->diff_words->word_regex);
1068 free(ecbdata->diff_words);
1069 ecbdata->diff_words = NULL;
1073 const char *diff_get_color(int diff_use_color, enum color_diff ix)
1075 if (want_color(diff_use_color))
1076 return diff_colors[ix];
1077 return "";
1080 static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
1082 const char *cp;
1083 unsigned long allot;
1084 size_t l = len;
1086 if (ecb->truncate)
1087 return ecb->truncate(line, len);
1088 cp = line;
1089 allot = l;
1090 while (0 < l) {
1091 (void) utf8_width(&cp, &l);
1092 if (!cp)
1093 break; /* truncated in the middle? */
1095 return allot - l;
1098 static void find_lno(const char *line, struct emit_callback *ecbdata)
1100 const char *p;
1101 ecbdata->lno_in_preimage = 0;
1102 ecbdata->lno_in_postimage = 0;
1103 p = strchr(line, '-');
1104 if (!p)
1105 return; /* cannot happen */
1106 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
1107 p = strchr(p, '+');
1108 if (!p)
1109 return; /* cannot happen */
1110 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
1113 static void fn_out_consume(void *priv, char *line, unsigned long len)
1115 struct emit_callback *ecbdata = priv;
1116 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
1117 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
1118 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
1119 struct diff_options *o = ecbdata->opt;
1120 char *line_prefix = "";
1121 struct strbuf *msgbuf;
1123 if (o && o->output_prefix) {
1124 msgbuf = o->output_prefix(o, o->output_prefix_data);
1125 line_prefix = msgbuf->buf;
1128 if (ecbdata->header) {
1129 fprintf(ecbdata->opt->file, "%s", ecbdata->header->buf);
1130 strbuf_reset(ecbdata->header);
1131 ecbdata->header = NULL;
1133 *(ecbdata->found_changesp) = 1;
1135 if (ecbdata->label_path[0]) {
1136 const char *name_a_tab, *name_b_tab;
1138 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
1139 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
1141 fprintf(ecbdata->opt->file, "%s%s--- %s%s%s\n",
1142 line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
1143 fprintf(ecbdata->opt->file, "%s%s+++ %s%s%s\n",
1144 line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
1145 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
1148 if (diff_suppress_blank_empty
1149 && len == 2 && line[0] == ' ' && line[1] == '\n') {
1150 line[0] = '\n';
1151 len = 1;
1154 if (line[0] == '@') {
1155 if (ecbdata->diff_words)
1156 diff_words_flush(ecbdata);
1157 len = sane_truncate_line(ecbdata, line, len);
1158 find_lno(line, ecbdata);
1159 emit_hunk_header(ecbdata, line, len);
1160 if (line[len-1] != '\n')
1161 putc('\n', ecbdata->opt->file);
1162 return;
1165 if (len < 1) {
1166 emit_line(ecbdata->opt, reset, reset, line, len);
1167 if (ecbdata->diff_words
1168 && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
1169 fputs("~\n", ecbdata->opt->file);
1170 return;
1173 if (ecbdata->diff_words) {
1174 if (line[0] == '-') {
1175 diff_words_append(line, len,
1176 &ecbdata->diff_words->minus);
1177 return;
1178 } else if (line[0] == '+') {
1179 diff_words_append(line, len,
1180 &ecbdata->diff_words->plus);
1181 return;
1182 } else if (!prefixcmp(line, "\\ ")) {
1184 * Eat the "no newline at eof" marker as if we
1185 * saw a "+" or "-" line with nothing on it,
1186 * and return without diff_words_flush() to
1187 * defer processing. If this is the end of
1188 * preimage, more "+" lines may come after it.
1190 return;
1192 diff_words_flush(ecbdata);
1193 if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
1194 emit_line(ecbdata->opt, plain, reset, line, len);
1195 fputs("~\n", ecbdata->opt->file);
1196 } else {
1198 * Skip the prefix character, if any. With
1199 * diff_suppress_blank_empty, there may be
1200 * none.
1202 if (line[0] != '\n') {
1203 line++;
1204 len--;
1206 emit_line(ecbdata->opt, plain, reset, line, len);
1208 return;
1211 if (line[0] != '+') {
1212 const char *color =
1213 diff_get_color(ecbdata->color_diff,
1214 line[0] == '-' ? DIFF_FILE_OLD : DIFF_PLAIN);
1215 ecbdata->lno_in_preimage++;
1216 if (line[0] == ' ')
1217 ecbdata->lno_in_postimage++;
1218 emit_line(ecbdata->opt, color, reset, line, len);
1219 } else {
1220 ecbdata->lno_in_postimage++;
1221 emit_add_line(reset, ecbdata, line + 1, len - 1);
1225 static char *pprint_rename(const char *a, const char *b)
1227 const char *old = a;
1228 const char *new = b;
1229 struct strbuf name = STRBUF_INIT;
1230 int pfx_length, sfx_length;
1231 int len_a = strlen(a);
1232 int len_b = strlen(b);
1233 int a_midlen, b_midlen;
1234 int qlen_a = quote_c_style(a, NULL, NULL, 0);
1235 int qlen_b = quote_c_style(b, NULL, NULL, 0);
1237 if (qlen_a || qlen_b) {
1238 quote_c_style(a, &name, NULL, 0);
1239 strbuf_addstr(&name, " => ");
1240 quote_c_style(b, &name, NULL, 0);
1241 return strbuf_detach(&name, NULL);
1244 /* Find common prefix */
1245 pfx_length = 0;
1246 while (*old && *new && *old == *new) {
1247 if (*old == '/')
1248 pfx_length = old - a + 1;
1249 old++;
1250 new++;
1253 /* Find common suffix */
1254 old = a + len_a;
1255 new = b + len_b;
1256 sfx_length = 0;
1257 while (a <= old && b <= new && *old == *new) {
1258 if (*old == '/')
1259 sfx_length = len_a - (old - a);
1260 old--;
1261 new--;
1265 * pfx{mid-a => mid-b}sfx
1266 * {pfx-a => pfx-b}sfx
1267 * pfx{sfx-a => sfx-b}
1268 * name-a => name-b
1270 a_midlen = len_a - pfx_length - sfx_length;
1271 b_midlen = len_b - pfx_length - sfx_length;
1272 if (a_midlen < 0)
1273 a_midlen = 0;
1274 if (b_midlen < 0)
1275 b_midlen = 0;
1277 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
1278 if (pfx_length + sfx_length) {
1279 strbuf_add(&name, a, pfx_length);
1280 strbuf_addch(&name, '{');
1282 strbuf_add(&name, a + pfx_length, a_midlen);
1283 strbuf_addstr(&name, " => ");
1284 strbuf_add(&name, b + pfx_length, b_midlen);
1285 if (pfx_length + sfx_length) {
1286 strbuf_addch(&name, '}');
1287 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
1289 return strbuf_detach(&name, NULL);
1292 struct diffstat_t {
1293 int nr;
1294 int alloc;
1295 struct diffstat_file {
1296 char *from_name;
1297 char *name;
1298 char *print_name;
1299 unsigned is_unmerged:1;
1300 unsigned is_binary:1;
1301 unsigned is_renamed:1;
1302 uintmax_t added, deleted;
1303 } **files;
1306 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
1307 const char *name_a,
1308 const char *name_b)
1310 struct diffstat_file *x;
1311 x = xcalloc(sizeof (*x), 1);
1312 if (diffstat->nr == diffstat->alloc) {
1313 diffstat->alloc = alloc_nr(diffstat->alloc);
1314 diffstat->files = xrealloc(diffstat->files,
1315 diffstat->alloc * sizeof(x));
1317 diffstat->files[diffstat->nr++] = x;
1318 if (name_b) {
1319 x->from_name = xstrdup(name_a);
1320 x->name = xstrdup(name_b);
1321 x->is_renamed = 1;
1323 else {
1324 x->from_name = NULL;
1325 x->name = xstrdup(name_a);
1327 return x;
1330 static void diffstat_consume(void *priv, char *line, unsigned long len)
1332 struct diffstat_t *diffstat = priv;
1333 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
1335 if (line[0] == '+')
1336 x->added++;
1337 else if (line[0] == '-')
1338 x->deleted++;
1341 const char mime_boundary_leader[] = "------------";
1343 static int scale_linear(int it, int width, int max_change)
1345 if (!it)
1346 return 0;
1348 * make sure that at least one '-' or '+' is printed if
1349 * there is any change to this path. The easiest way is to
1350 * scale linearly as if the alloted width is one column shorter
1351 * than it is, and then add 1 to the result.
1353 return 1 + (it * (width - 1) / max_change);
1356 static void show_name(FILE *file,
1357 const char *prefix, const char *name, int len)
1359 fprintf(file, " %s%-*s |", prefix, len, name);
1362 static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
1364 if (cnt <= 0)
1365 return;
1366 fprintf(file, "%s", set);
1367 while (cnt--)
1368 putc(ch, file);
1369 fprintf(file, "%s", reset);
1372 static void fill_print_name(struct diffstat_file *file)
1374 char *pname;
1376 if (file->print_name)
1377 return;
1379 if (!file->is_renamed) {
1380 struct strbuf buf = STRBUF_INIT;
1381 if (quote_c_style(file->name, &buf, NULL, 0)) {
1382 pname = strbuf_detach(&buf, NULL);
1383 } else {
1384 pname = file->name;
1385 strbuf_release(&buf);
1387 } else {
1388 pname = pprint_rename(file->from_name, file->name);
1390 file->print_name = pname;
1393 int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
1395 struct strbuf sb = STRBUF_INIT;
1396 int ret;
1398 if (!files) {
1399 assert(insertions == 0 && deletions == 0);
1400 return fprintf(fp, "%s\n", _(" 0 files changed"));
1403 strbuf_addf(&sb,
1404 Q_(" %d file changed", " %d files changed", files),
1405 files);
1408 * For binary diff, the caller may want to print "x files
1409 * changed" with insertions == 0 && deletions == 0.
1411 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1412 * is probably less confusing (i.e skip over "2 files changed
1413 * but nothing about added/removed lines? Is this a bug in Git?").
1415 if (insertions || deletions == 0) {
1417 * TRANSLATORS: "+" in (+) is a line addition marker;
1418 * do not translate it.
1420 strbuf_addf(&sb,
1421 Q_(", %d insertion(+)", ", %d insertions(+)",
1422 insertions),
1423 insertions);
1426 if (deletions || insertions == 0) {
1428 * TRANSLATORS: "-" in (-) is a line removal marker;
1429 * do not translate it.
1431 strbuf_addf(&sb,
1432 Q_(", %d deletion(-)", ", %d deletions(-)",
1433 deletions),
1434 deletions);
1436 strbuf_addch(&sb, '\n');
1437 ret = fputs(sb.buf, fp);
1438 strbuf_release(&sb);
1439 return ret;
1442 static void show_stats(struct diffstat_t *data, struct diff_options *options)
1444 int i, len, add, del, adds = 0, dels = 0;
1445 uintmax_t max_change = 0, max_len = 0;
1446 int total_files = data->nr, count;
1447 int width, name_width, graph_width, number_width = 0, bin_width = 0;
1448 const char *reset, *add_c, *del_c;
1449 const char *line_prefix = "";
1450 int extra_shown = 0;
1451 struct strbuf *msg = NULL;
1453 if (data->nr == 0)
1454 return;
1456 if (options->output_prefix) {
1457 msg = options->output_prefix(options, options->output_prefix_data);
1458 line_prefix = msg->buf;
1461 count = options->stat_count ? options->stat_count : data->nr;
1463 reset = diff_get_color_opt(options, DIFF_RESET);
1464 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1465 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1468 * Find the longest filename and max number of changes
1470 for (i = 0; (i < count) && (i < data->nr); i++) {
1471 struct diffstat_file *file = data->files[i];
1472 uintmax_t change = file->added + file->deleted;
1473 if (!data->files[i]->is_renamed &&
1474 (change == 0)) {
1475 count++; /* not shown == room for one more */
1476 continue;
1478 fill_print_name(file);
1479 len = strlen(file->print_name);
1480 if (max_len < len)
1481 max_len = len;
1483 if (file->is_unmerged) {
1484 /* "Unmerged" is 8 characters */
1485 bin_width = bin_width < 8 ? 8 : bin_width;
1486 continue;
1488 if (file->is_binary) {
1489 /* "Bin XXX -> YYY bytes" */
1490 int w = 14 + decimal_width(file->added)
1491 + decimal_width(file->deleted);
1492 bin_width = bin_width < w ? w : bin_width;
1493 /* Display change counts aligned with "Bin" */
1494 number_width = 3;
1495 continue;
1498 if (max_change < change)
1499 max_change = change;
1501 count = i; /* min(count, data->nr) */
1504 * We have width = stat_width or term_columns() columns total.
1505 * We want a maximum of min(max_len, stat_name_width) for the name part.
1506 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1507 * We also need 1 for " " and 4 + decimal_width(max_change)
1508 * for " | NNNN " and one the empty column at the end, altogether
1509 * 6 + decimal_width(max_change).
1511 * If there's not enough space, we will use the smaller of
1512 * stat_name_width (if set) and 5/8*width for the filename,
1513 * and the rest for constant elements + graph part, but no more
1514 * than stat_graph_width for the graph part.
1515 * (5/8 gives 50 for filename and 30 for the constant parts + graph
1516 * for the standard terminal size).
1518 * In other words: stat_width limits the maximum width, and
1519 * stat_name_width fixes the maximum width of the filename,
1520 * and is also used to divide available columns if there
1521 * aren't enough.
1523 * Binary files are displayed with "Bin XXX -> YYY bytes"
1524 * instead of the change count and graph. This part is treated
1525 * similarly to the graph part, except that it is not
1526 * "scaled". If total width is too small to accomodate the
1527 * guaranteed minimum width of the filename part and the
1528 * separators and this message, this message will "overflow"
1529 * making the line longer than the maximum width.
1532 if (options->stat_width == -1)
1533 width = term_columns() - options->output_prefix_length;
1534 else
1535 width = options->stat_width ? options->stat_width : 80;
1536 number_width = decimal_width(max_change) > number_width ?
1537 decimal_width(max_change) : number_width;
1539 if (options->stat_graph_width == -1)
1540 options->stat_graph_width = diff_stat_graph_width;
1543 * Guarantee 3/8*16==6 for the graph part
1544 * and 5/8*16==10 for the filename part
1546 if (width < 16 + 6 + number_width)
1547 width = 16 + 6 + number_width;
1550 * First assign sizes that are wanted, ignoring available width.
1551 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1552 * starting from "XXX" should fit in graph_width.
1554 graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
1555 if (options->stat_graph_width &&
1556 options->stat_graph_width < graph_width)
1557 graph_width = options->stat_graph_width;
1559 name_width = (options->stat_name_width > 0 &&
1560 options->stat_name_width < max_len) ?
1561 options->stat_name_width : max_len;
1564 * Adjust adjustable widths not to exceed maximum width
1566 if (name_width + number_width + 6 + graph_width > width) {
1567 if (graph_width > width * 3/8 - number_width - 6) {
1568 graph_width = width * 3/8 - number_width - 6;
1569 if (graph_width < 6)
1570 graph_width = 6;
1573 if (options->stat_graph_width &&
1574 graph_width > options->stat_graph_width)
1575 graph_width = options->stat_graph_width;
1576 if (name_width > width - number_width - 6 - graph_width)
1577 name_width = width - number_width - 6 - graph_width;
1578 else
1579 graph_width = width - number_width - 6 - name_width;
1583 * From here name_width is the width of the name area,
1584 * and graph_width is the width of the graph area.
1585 * max_change is used to scale graph properly.
1587 for (i = 0; i < count; i++) {
1588 const char *prefix = "";
1589 char *name = data->files[i]->print_name;
1590 uintmax_t added = data->files[i]->added;
1591 uintmax_t deleted = data->files[i]->deleted;
1592 int name_len;
1594 if (!data->files[i]->is_renamed &&
1595 (added + deleted == 0)) {
1596 total_files--;
1597 continue;
1600 * "scale" the filename
1602 len = name_width;
1603 name_len = strlen(name);
1604 if (name_width < name_len) {
1605 char *slash;
1606 prefix = "...";
1607 len -= 3;
1608 name += name_len - len;
1609 slash = strchr(name, '/');
1610 if (slash)
1611 name = slash;
1614 if (data->files[i]->is_binary) {
1615 fprintf(options->file, "%s", line_prefix);
1616 show_name(options->file, prefix, name, len);
1617 fprintf(options->file, " %*s", number_width, "Bin");
1618 if (!added && !deleted) {
1619 putc('\n', options->file);
1620 continue;
1622 fprintf(options->file, " %s%"PRIuMAX"%s",
1623 del_c, deleted, reset);
1624 fprintf(options->file, " -> ");
1625 fprintf(options->file, "%s%"PRIuMAX"%s",
1626 add_c, added, reset);
1627 fprintf(options->file, " bytes");
1628 fprintf(options->file, "\n");
1629 continue;
1631 else if (data->files[i]->is_unmerged) {
1632 fprintf(options->file, "%s", line_prefix);
1633 show_name(options->file, prefix, name, len);
1634 fprintf(options->file, " Unmerged\n");
1635 continue;
1639 * scale the add/delete
1641 add = added;
1642 del = deleted;
1643 adds += add;
1644 dels += del;
1646 if (graph_width <= max_change) {
1647 int total = add + del;
1649 total = scale_linear(add + del, graph_width, max_change);
1650 if (total < 2 && add && del)
1651 /* width >= 2 due to the sanity check */
1652 total = 2;
1653 if (add < del) {
1654 add = scale_linear(add, graph_width, max_change);
1655 del = total - add;
1656 } else {
1657 del = scale_linear(del, graph_width, max_change);
1658 add = total - del;
1661 fprintf(options->file, "%s", line_prefix);
1662 show_name(options->file, prefix, name, len);
1663 fprintf(options->file, " %*"PRIuMAX"%s",
1664 number_width, added + deleted,
1665 added + deleted ? " " : "");
1666 show_graph(options->file, '+', add, add_c, reset);
1667 show_graph(options->file, '-', del, del_c, reset);
1668 fprintf(options->file, "\n");
1670 for (i = count; i < data->nr; i++) {
1671 uintmax_t added = data->files[i]->added;
1672 uintmax_t deleted = data->files[i]->deleted;
1673 if (!data->files[i]->is_renamed &&
1674 (added + deleted == 0)) {
1675 total_files--;
1676 continue;
1678 adds += added;
1679 dels += deleted;
1680 if (!extra_shown)
1681 fprintf(options->file, "%s ...\n", line_prefix);
1682 extra_shown = 1;
1684 fprintf(options->file, "%s", line_prefix);
1685 print_stat_summary(options->file, total_files, adds, dels);
1688 static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1690 int i, adds = 0, dels = 0, total_files = data->nr;
1692 if (data->nr == 0)
1693 return;
1695 for (i = 0; i < data->nr; i++) {
1696 int added = data->files[i]->added;
1697 int deleted= data->files[i]->deleted;
1699 if (data->files[i]->is_unmerged)
1700 continue;
1701 if (!data->files[i]->is_renamed && (added + deleted == 0)) {
1702 total_files--;
1703 } else if (!data->files[i]->is_binary) { /* don't count bytes */
1704 adds += added;
1705 dels += deleted;
1708 if (options->output_prefix) {
1709 struct strbuf *msg = NULL;
1710 msg = options->output_prefix(options,
1711 options->output_prefix_data);
1712 fprintf(options->file, "%s", msg->buf);
1714 print_stat_summary(options->file, total_files, adds, dels);
1717 static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1719 int i;
1721 if (data->nr == 0)
1722 return;
1724 for (i = 0; i < data->nr; i++) {
1725 struct diffstat_file *file = data->files[i];
1727 if (options->output_prefix) {
1728 struct strbuf *msg = NULL;
1729 msg = options->output_prefix(options,
1730 options->output_prefix_data);
1731 fprintf(options->file, "%s", msg->buf);
1734 if (file->is_binary)
1735 fprintf(options->file, "-\t-\t");
1736 else
1737 fprintf(options->file,
1738 "%"PRIuMAX"\t%"PRIuMAX"\t",
1739 file->added, file->deleted);
1740 if (options->line_termination) {
1741 fill_print_name(file);
1742 if (!file->is_renamed)
1743 write_name_quoted(file->name, options->file,
1744 options->line_termination);
1745 else {
1746 fputs(file->print_name, options->file);
1747 putc(options->line_termination, options->file);
1749 } else {
1750 if (file->is_renamed) {
1751 putc('\0', options->file);
1752 write_name_quoted(file->from_name, options->file, '\0');
1754 write_name_quoted(file->name, options->file, '\0');
1759 struct dirstat_file {
1760 const char *name;
1761 unsigned long changed;
1764 struct dirstat_dir {
1765 struct dirstat_file *files;
1766 int alloc, nr, permille, cumulative;
1769 static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
1770 unsigned long changed, const char *base, int baselen)
1772 unsigned long this_dir = 0;
1773 unsigned int sources = 0;
1774 const char *line_prefix = "";
1775 struct strbuf *msg = NULL;
1777 if (opt->output_prefix) {
1778 msg = opt->output_prefix(opt, opt->output_prefix_data);
1779 line_prefix = msg->buf;
1782 while (dir->nr) {
1783 struct dirstat_file *f = dir->files;
1784 int namelen = strlen(f->name);
1785 unsigned long this;
1786 char *slash;
1788 if (namelen < baselen)
1789 break;
1790 if (memcmp(f->name, base, baselen))
1791 break;
1792 slash = strchr(f->name + baselen, '/');
1793 if (slash) {
1794 int newbaselen = slash + 1 - f->name;
1795 this = gather_dirstat(opt, dir, changed, f->name, newbaselen);
1796 sources++;
1797 } else {
1798 this = f->changed;
1799 dir->files++;
1800 dir->nr--;
1801 sources += 2;
1803 this_dir += this;
1807 * We don't report dirstat's for
1808 * - the top level
1809 * - or cases where everything came from a single directory
1810 * under this directory (sources == 1).
1812 if (baselen && sources != 1) {
1813 if (this_dir) {
1814 int permille = this_dir * 1000 / changed;
1815 if (permille >= dir->permille) {
1816 fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
1817 permille / 10, permille % 10, baselen, base);
1818 if (!dir->cumulative)
1819 return 0;
1823 return this_dir;
1826 static int dirstat_compare(const void *_a, const void *_b)
1828 const struct dirstat_file *a = _a;
1829 const struct dirstat_file *b = _b;
1830 return strcmp(a->name, b->name);
1833 static void show_dirstat(struct diff_options *options)
1835 int i;
1836 unsigned long changed;
1837 struct dirstat_dir dir;
1838 struct diff_queue_struct *q = &diff_queued_diff;
1840 dir.files = NULL;
1841 dir.alloc = 0;
1842 dir.nr = 0;
1843 dir.permille = options->dirstat_permille;
1844 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1846 changed = 0;
1847 for (i = 0; i < q->nr; i++) {
1848 struct diff_filepair *p = q->queue[i];
1849 const char *name;
1850 unsigned long copied, added, damage;
1851 int content_changed;
1853 name = p->two->path ? p->two->path : p->one->path;
1855 if (p->one->sha1_valid && p->two->sha1_valid)
1856 content_changed = hashcmp(p->one->sha1, p->two->sha1);
1857 else
1858 content_changed = 1;
1860 if (!content_changed) {
1862 * The SHA1 has not changed, so pre-/post-content is
1863 * identical. We can therefore skip looking at the
1864 * file contents altogether.
1866 damage = 0;
1867 goto found_damage;
1870 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) {
1872 * In --dirstat-by-file mode, we don't really need to
1873 * look at the actual file contents at all.
1874 * The fact that the SHA1 changed is enough for us to
1875 * add this file to the list of results
1876 * (with each file contributing equal damage).
1878 damage = 1;
1879 goto found_damage;
1882 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1883 diff_populate_filespec(p->one, 0);
1884 diff_populate_filespec(p->two, 0);
1885 diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1886 &copied, &added);
1887 diff_free_filespec_data(p->one);
1888 diff_free_filespec_data(p->two);
1889 } else if (DIFF_FILE_VALID(p->one)) {
1890 diff_populate_filespec(p->one, 1);
1891 copied = added = 0;
1892 diff_free_filespec_data(p->one);
1893 } else if (DIFF_FILE_VALID(p->two)) {
1894 diff_populate_filespec(p->two, 1);
1895 copied = 0;
1896 added = p->two->size;
1897 diff_free_filespec_data(p->two);
1898 } else
1899 continue;
1902 * Original minus copied is the removed material,
1903 * added is the new material. They are both damages
1904 * made to the preimage.
1905 * If the resulting damage is zero, we know that
1906 * diffcore_count_changes() considers the two entries to
1907 * be identical, but since content_changed is true, we
1908 * know that there must have been _some_ kind of change,
1909 * so we force all entries to have damage > 0.
1911 damage = (p->one->size - copied) + added;
1912 if (!damage)
1913 damage = 1;
1915 found_damage:
1916 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1917 dir.files[dir.nr].name = name;
1918 dir.files[dir.nr].changed = damage;
1919 changed += damage;
1920 dir.nr++;
1923 /* This can happen even with many files, if everything was renames */
1924 if (!changed)
1925 return;
1927 /* Show all directories with more than x% of the changes */
1928 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1929 gather_dirstat(options, &dir, changed, "", 0);
1932 static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
1934 int i;
1935 unsigned long changed;
1936 struct dirstat_dir dir;
1938 if (data->nr == 0)
1939 return;
1941 dir.files = NULL;
1942 dir.alloc = 0;
1943 dir.nr = 0;
1944 dir.permille = options->dirstat_permille;
1945 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1947 changed = 0;
1948 for (i = 0; i < data->nr; i++) {
1949 struct diffstat_file *file = data->files[i];
1950 unsigned long damage = file->added + file->deleted;
1951 if (file->is_binary)
1953 * binary files counts bytes, not lines. Must find some
1954 * way to normalize binary bytes vs. textual lines.
1955 * The following heuristic assumes that there are 64
1956 * bytes per "line".
1957 * This is stupid and ugly, but very cheap...
1959 damage = (damage + 63) / 64;
1960 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1961 dir.files[dir.nr].name = file->name;
1962 dir.files[dir.nr].changed = damage;
1963 changed += damage;
1964 dir.nr++;
1967 /* This can happen even with many files, if everything was renames */
1968 if (!changed)
1969 return;
1971 /* Show all directories with more than x% of the changes */
1972 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1973 gather_dirstat(options, &dir, changed, "", 0);
1976 static void free_diffstat_info(struct diffstat_t *diffstat)
1978 int i;
1979 for (i = 0; i < diffstat->nr; i++) {
1980 struct diffstat_file *f = diffstat->files[i];
1981 if (f->name != f->print_name)
1982 free(f->print_name);
1983 free(f->name);
1984 free(f->from_name);
1985 free(f);
1987 free(diffstat->files);
1990 struct checkdiff_t {
1991 const char *filename;
1992 int lineno;
1993 int conflict_marker_size;
1994 struct diff_options *o;
1995 unsigned ws_rule;
1996 unsigned status;
1999 static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
2001 char firstchar;
2002 int cnt;
2004 if (len < marker_size + 1)
2005 return 0;
2006 firstchar = line[0];
2007 switch (firstchar) {
2008 case '=': case '>': case '<': case '|':
2009 break;
2010 default:
2011 return 0;
2013 for (cnt = 1; cnt < marker_size; cnt++)
2014 if (line[cnt] != firstchar)
2015 return 0;
2016 /* line[1] thru line[marker_size-1] are same as firstchar */
2017 if (len < marker_size + 1 || !isspace(line[marker_size]))
2018 return 0;
2019 return 1;
2022 static void checkdiff_consume(void *priv, char *line, unsigned long len)
2024 struct checkdiff_t *data = priv;
2025 int marker_size = data->conflict_marker_size;
2026 const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
2027 const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
2028 const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
2029 char *err;
2030 char *line_prefix = "";
2031 struct strbuf *msgbuf;
2033 assert(data->o);
2034 if (data->o->output_prefix) {
2035 msgbuf = data->o->output_prefix(data->o,
2036 data->o->output_prefix_data);
2037 line_prefix = msgbuf->buf;
2040 if (line[0] == '+') {
2041 unsigned bad;
2042 data->lineno++;
2043 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
2044 data->status |= 1;
2045 fprintf(data->o->file,
2046 "%s%s:%d: leftover conflict marker\n",
2047 line_prefix, data->filename, data->lineno);
2049 bad = ws_check(line + 1, len - 1, data->ws_rule);
2050 if (!bad)
2051 return;
2052 data->status |= bad;
2053 err = whitespace_error_string(bad);
2054 fprintf(data->o->file, "%s%s:%d: %s.\n",
2055 line_prefix, data->filename, data->lineno, err);
2056 free(err);
2057 emit_line(data->o, set, reset, line, 1);
2058 ws_check_emit(line + 1, len - 1, data->ws_rule,
2059 data->o->file, set, reset, ws);
2060 } else if (line[0] == ' ') {
2061 data->lineno++;
2062 } else if (line[0] == '@') {
2063 char *plus = strchr(line, '+');
2064 if (plus)
2065 data->lineno = strtol(plus, NULL, 10) - 1;
2066 else
2067 die("invalid diff");
2071 static unsigned char *deflate_it(char *data,
2072 unsigned long size,
2073 unsigned long *result_size)
2075 int bound;
2076 unsigned char *deflated;
2077 git_zstream stream;
2079 memset(&stream, 0, sizeof(stream));
2080 git_deflate_init(&stream, zlib_compression_level);
2081 bound = git_deflate_bound(&stream, size);
2082 deflated = xmalloc(bound);
2083 stream.next_out = deflated;
2084 stream.avail_out = bound;
2086 stream.next_in = (unsigned char *)data;
2087 stream.avail_in = size;
2088 while (git_deflate(&stream, Z_FINISH) == Z_OK)
2089 ; /* nothing */
2090 git_deflate_end(&stream);
2091 *result_size = stream.total_out;
2092 return deflated;
2095 static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two, char *prefix)
2097 void *cp;
2098 void *delta;
2099 void *deflated;
2100 void *data;
2101 unsigned long orig_size;
2102 unsigned long delta_size;
2103 unsigned long deflate_size;
2104 unsigned long data_size;
2106 /* We could do deflated delta, or we could do just deflated two,
2107 * whichever is smaller.
2109 delta = NULL;
2110 deflated = deflate_it(two->ptr, two->size, &deflate_size);
2111 if (one->size && two->size) {
2112 delta = diff_delta(one->ptr, one->size,
2113 two->ptr, two->size,
2114 &delta_size, deflate_size);
2115 if (delta) {
2116 void *to_free = delta;
2117 orig_size = delta_size;
2118 delta = deflate_it(delta, delta_size, &delta_size);
2119 free(to_free);
2123 if (delta && delta_size < deflate_size) {
2124 fprintf(file, "%sdelta %lu\n", prefix, orig_size);
2125 free(deflated);
2126 data = delta;
2127 data_size = delta_size;
2129 else {
2130 fprintf(file, "%sliteral %lu\n", prefix, two->size);
2131 free(delta);
2132 data = deflated;
2133 data_size = deflate_size;
2136 /* emit data encoded in base85 */
2137 cp = data;
2138 while (data_size) {
2139 int bytes = (52 < data_size) ? 52 : data_size;
2140 char line[70];
2141 data_size -= bytes;
2142 if (bytes <= 26)
2143 line[0] = bytes + 'A' - 1;
2144 else
2145 line[0] = bytes - 26 + 'a' - 1;
2146 encode_85(line + 1, cp, bytes);
2147 cp = (char *) cp + bytes;
2148 fprintf(file, "%s", prefix);
2149 fputs(line, file);
2150 fputc('\n', file);
2152 fprintf(file, "%s\n", prefix);
2153 free(data);
2156 static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two, char *prefix)
2158 fprintf(file, "%sGIT binary patch\n", prefix);
2159 emit_binary_diff_body(file, one, two, prefix);
2160 emit_binary_diff_body(file, two, one, prefix);
2163 int diff_filespec_is_binary(struct diff_filespec *one)
2165 if (one->is_binary == -1) {
2166 diff_filespec_load_driver(one);
2167 if (one->driver->binary != -1)
2168 one->is_binary = one->driver->binary;
2169 else {
2170 if (!one->data && DIFF_FILE_VALID(one))
2171 diff_populate_filespec(one, 0);
2172 if (one->data)
2173 one->is_binary = buffer_is_binary(one->data,
2174 one->size);
2175 if (one->is_binary == -1)
2176 one->is_binary = 0;
2179 return one->is_binary;
2182 static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
2184 diff_filespec_load_driver(one);
2185 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
2188 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
2190 if (!options->a_prefix)
2191 options->a_prefix = a;
2192 if (!options->b_prefix)
2193 options->b_prefix = b;
2196 struct userdiff_driver *get_textconv(struct diff_filespec *one)
2198 if (!DIFF_FILE_VALID(one))
2199 return NULL;
2201 diff_filespec_load_driver(one);
2202 return userdiff_get_textconv(one->driver);
2205 static void builtin_diff(const char *name_a,
2206 const char *name_b,
2207 struct diff_filespec *one,
2208 struct diff_filespec *two,
2209 const char *xfrm_msg,
2210 int must_show_header,
2211 struct diff_options *o,
2212 int complete_rewrite)
2214 mmfile_t mf1, mf2;
2215 const char *lbl[2];
2216 char *a_one, *b_two;
2217 const char *set = diff_get_color_opt(o, DIFF_METAINFO);
2218 const char *reset = diff_get_color_opt(o, DIFF_RESET);
2219 const char *a_prefix, *b_prefix;
2220 struct userdiff_driver *textconv_one = NULL;
2221 struct userdiff_driver *textconv_two = NULL;
2222 struct strbuf header = STRBUF_INIT;
2223 struct strbuf *msgbuf;
2224 char *line_prefix = "";
2226 if (o->output_prefix) {
2227 msgbuf = o->output_prefix(o, o->output_prefix_data);
2228 line_prefix = msgbuf->buf;
2231 if (DIFF_OPT_TST(o, SUBMODULE_LOG) &&
2232 (!one->mode || S_ISGITLINK(one->mode)) &&
2233 (!two->mode || S_ISGITLINK(two->mode))) {
2234 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
2235 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2236 show_submodule_summary(o->file, one ? one->path : two->path,
2237 one->sha1, two->sha1, two->dirty_submodule,
2238 del, add, reset);
2239 return;
2242 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
2243 textconv_one = get_textconv(one);
2244 textconv_two = get_textconv(two);
2247 diff_set_mnemonic_prefix(o, "a/", "b/");
2248 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
2249 a_prefix = o->b_prefix;
2250 b_prefix = o->a_prefix;
2251 } else {
2252 a_prefix = o->a_prefix;
2253 b_prefix = o->b_prefix;
2256 /* Never use a non-valid filename anywhere if at all possible */
2257 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
2258 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
2260 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
2261 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
2262 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
2263 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
2264 strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, set, a_one, b_two, reset);
2265 if (lbl[0][0] == '/') {
2266 /* /dev/null */
2267 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, set, two->mode, reset);
2268 if (xfrm_msg)
2269 strbuf_addstr(&header, xfrm_msg);
2270 must_show_header = 1;
2272 else if (lbl[1][0] == '/') {
2273 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, set, one->mode, reset);
2274 if (xfrm_msg)
2275 strbuf_addstr(&header, xfrm_msg);
2276 must_show_header = 1;
2278 else {
2279 if (one->mode != two->mode) {
2280 strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, set, one->mode, reset);
2281 strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, set, two->mode, reset);
2282 must_show_header = 1;
2284 if (xfrm_msg)
2285 strbuf_addstr(&header, xfrm_msg);
2288 * we do not run diff between different kind
2289 * of objects.
2291 if ((one->mode ^ two->mode) & S_IFMT)
2292 goto free_ab_and_return;
2293 if (complete_rewrite &&
2294 (textconv_one || !diff_filespec_is_binary(one)) &&
2295 (textconv_two || !diff_filespec_is_binary(two))) {
2296 fprintf(o->file, "%s", header.buf);
2297 strbuf_reset(&header);
2298 emit_rewrite_diff(name_a, name_b, one, two,
2299 textconv_one, textconv_two, o);
2300 o->found_changes = 1;
2301 goto free_ab_and_return;
2305 if (o->irreversible_delete && lbl[1][0] == '/') {
2306 fprintf(o->file, "%s", header.buf);
2307 strbuf_reset(&header);
2308 goto free_ab_and_return;
2309 } else if (!DIFF_OPT_TST(o, TEXT) &&
2310 ( (!textconv_one && diff_filespec_is_binary(one)) ||
2311 (!textconv_two && diff_filespec_is_binary(two)) )) {
2312 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2313 die("unable to read files to diff");
2314 /* Quite common confusing case */
2315 if (mf1.size == mf2.size &&
2316 !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
2317 if (must_show_header)
2318 fprintf(o->file, "%s", header.buf);
2319 goto free_ab_and_return;
2321 fprintf(o->file, "%s", header.buf);
2322 strbuf_reset(&header);
2323 if (DIFF_OPT_TST(o, BINARY))
2324 emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
2325 else
2326 fprintf(o->file, "%sBinary files %s and %s differ\n",
2327 line_prefix, lbl[0], lbl[1]);
2328 o->found_changes = 1;
2329 } else {
2330 /* Crazy xdl interfaces.. */
2331 const char *diffopts = getenv("GIT_DIFF_OPTS");
2332 xpparam_t xpp;
2333 xdemitconf_t xecfg;
2334 struct emit_callback ecbdata;
2335 const struct userdiff_funcname *pe;
2337 if (must_show_header) {
2338 fprintf(o->file, "%s", header.buf);
2339 strbuf_reset(&header);
2342 mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
2343 mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
2345 pe = diff_funcname_pattern(one);
2346 if (!pe)
2347 pe = diff_funcname_pattern(two);
2349 memset(&xpp, 0, sizeof(xpp));
2350 memset(&xecfg, 0, sizeof(xecfg));
2351 memset(&ecbdata, 0, sizeof(ecbdata));
2352 ecbdata.label_path = lbl;
2353 ecbdata.color_diff = want_color(o->use_color);
2354 ecbdata.found_changesp = &o->found_changes;
2355 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
2356 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
2357 check_blank_at_eof(&mf1, &mf2, &ecbdata);
2358 ecbdata.opt = o;
2359 ecbdata.header = header.len ? &header : NULL;
2360 xpp.flags = o->xdl_opts;
2361 xecfg.ctxlen = o->context;
2362 xecfg.interhunkctxlen = o->interhunkcontext;
2363 xecfg.flags = XDL_EMIT_FUNCNAMES;
2364 if (DIFF_OPT_TST(o, FUNCCONTEXT))
2365 xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
2366 if (pe)
2367 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
2368 if (!diffopts)
2370 else if (!prefixcmp(diffopts, "--unified="))
2371 xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
2372 else if (!prefixcmp(diffopts, "-u"))
2373 xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
2374 if (o->word_diff)
2375 init_diff_words_data(&ecbdata, o, one, two);
2376 xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
2377 &xpp, &xecfg);
2378 if (o->word_diff)
2379 free_diff_words_data(&ecbdata);
2380 if (textconv_one)
2381 free(mf1.ptr);
2382 if (textconv_two)
2383 free(mf2.ptr);
2384 xdiff_clear_find_func(&xecfg);
2387 free_ab_and_return:
2388 strbuf_release(&header);
2389 diff_free_filespec_data(one);
2390 diff_free_filespec_data(two);
2391 free(a_one);
2392 free(b_two);
2393 return;
2396 static void builtin_diffstat(const char *name_a, const char *name_b,
2397 struct diff_filespec *one,
2398 struct diff_filespec *two,
2399 struct diffstat_t *diffstat,
2400 struct diff_options *o,
2401 int complete_rewrite)
2403 mmfile_t mf1, mf2;
2404 struct diffstat_file *data;
2405 int same_contents;
2407 data = diffstat_add(diffstat, name_a, name_b);
2409 if (!one || !two) {
2410 data->is_unmerged = 1;
2411 return;
2414 same_contents = !hashcmp(one->sha1, two->sha1);
2416 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
2417 data->is_binary = 1;
2418 if (same_contents) {
2419 data->added = 0;
2420 data->deleted = 0;
2421 } else {
2422 data->added = diff_filespec_size(two);
2423 data->deleted = diff_filespec_size(one);
2427 else if (complete_rewrite) {
2428 diff_populate_filespec(one, 0);
2429 diff_populate_filespec(two, 0);
2430 data->deleted = count_lines(one->data, one->size);
2431 data->added = count_lines(two->data, two->size);
2434 else if (!same_contents) {
2435 /* Crazy xdl interfaces.. */
2436 xpparam_t xpp;
2437 xdemitconf_t xecfg;
2439 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2440 die("unable to read files to diff");
2442 memset(&xpp, 0, sizeof(xpp));
2443 memset(&xecfg, 0, sizeof(xecfg));
2444 xpp.flags = o->xdl_opts;
2445 xecfg.ctxlen = o->context;
2446 xecfg.interhunkctxlen = o->interhunkcontext;
2447 xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
2448 &xpp, &xecfg);
2451 diff_free_filespec_data(one);
2452 diff_free_filespec_data(two);
2455 static void builtin_checkdiff(const char *name_a, const char *name_b,
2456 const char *attr_path,
2457 struct diff_filespec *one,
2458 struct diff_filespec *two,
2459 struct diff_options *o)
2461 mmfile_t mf1, mf2;
2462 struct checkdiff_t data;
2464 if (!two)
2465 return;
2467 memset(&data, 0, sizeof(data));
2468 data.filename = name_b ? name_b : name_a;
2469 data.lineno = 0;
2470 data.o = o;
2471 data.ws_rule = whitespace_rule(attr_path);
2472 data.conflict_marker_size = ll_merge_marker_size(attr_path);
2474 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2475 die("unable to read files to diff");
2478 * All the other codepaths check both sides, but not checking
2479 * the "old" side here is deliberate. We are checking the newly
2480 * introduced changes, and as long as the "new" side is text, we
2481 * can and should check what it introduces.
2483 if (diff_filespec_is_binary(two))
2484 goto free_and_return;
2485 else {
2486 /* Crazy xdl interfaces.. */
2487 xpparam_t xpp;
2488 xdemitconf_t xecfg;
2490 memset(&xpp, 0, sizeof(xpp));
2491 memset(&xecfg, 0, sizeof(xecfg));
2492 xecfg.ctxlen = 1; /* at least one context line */
2493 xpp.flags = 0;
2494 xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
2495 &xpp, &xecfg);
2497 if (data.ws_rule & WS_BLANK_AT_EOF) {
2498 struct emit_callback ecbdata;
2499 int blank_at_eof;
2501 ecbdata.ws_rule = data.ws_rule;
2502 check_blank_at_eof(&mf1, &mf2, &ecbdata);
2503 blank_at_eof = ecbdata.blank_at_eof_in_postimage;
2505 if (blank_at_eof) {
2506 static char *err;
2507 if (!err)
2508 err = whitespace_error_string(WS_BLANK_AT_EOF);
2509 fprintf(o->file, "%s:%d: %s.\n",
2510 data.filename, blank_at_eof, err);
2511 data.status = 1; /* report errors */
2515 free_and_return:
2516 diff_free_filespec_data(one);
2517 diff_free_filespec_data(two);
2518 if (data.status)
2519 DIFF_OPT_SET(o, CHECK_FAILED);
2522 struct diff_filespec *alloc_filespec(const char *path)
2524 int namelen = strlen(path);
2525 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
2527 memset(spec, 0, sizeof(*spec));
2528 spec->path = (char *)(spec + 1);
2529 memcpy(spec->path, path, namelen+1);
2530 spec->count = 1;
2531 spec->is_binary = -1;
2532 return spec;
2535 void free_filespec(struct diff_filespec *spec)
2537 if (!--spec->count) {
2538 diff_free_filespec_data(spec);
2539 free(spec);
2543 void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
2544 unsigned short mode)
2546 if (mode) {
2547 spec->mode = canon_mode(mode);
2548 hashcpy(spec->sha1, sha1);
2549 spec->sha1_valid = !is_null_sha1(sha1);
2554 * Given a name and sha1 pair, if the index tells us the file in
2555 * the work tree has that object contents, return true, so that
2556 * prepare_temp_file() does not have to inflate and extract.
2558 static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
2560 struct cache_entry *ce;
2561 struct stat st;
2562 int pos, len;
2565 * We do not read the cache ourselves here, because the
2566 * benchmark with my previous version that always reads cache
2567 * shows that it makes things worse for diff-tree comparing
2568 * two linux-2.6 kernel trees in an already checked out work
2569 * tree. This is because most diff-tree comparisons deal with
2570 * only a small number of files, while reading the cache is
2571 * expensive for a large project, and its cost outweighs the
2572 * savings we get by not inflating the object to a temporary
2573 * file. Practically, this code only helps when we are used
2574 * by diff-cache --cached, which does read the cache before
2575 * calling us.
2577 if (!active_cache)
2578 return 0;
2580 /* We want to avoid the working directory if our caller
2581 * doesn't need the data in a normal file, this system
2582 * is rather slow with its stat/open/mmap/close syscalls,
2583 * and the object is contained in a pack file. The pack
2584 * is probably already open and will be faster to obtain
2585 * the data through than the working directory. Loose
2586 * objects however would tend to be slower as they need
2587 * to be individually opened and inflated.
2589 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
2590 return 0;
2592 len = strlen(name);
2593 pos = cache_name_pos(name, len);
2594 if (pos < 0)
2595 return 0;
2596 ce = active_cache[pos];
2599 * This is not the sha1 we are looking for, or
2600 * unreusable because it is not a regular file.
2602 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
2603 return 0;
2606 * If ce is marked as "assume unchanged", there is no
2607 * guarantee that work tree matches what we are looking for.
2609 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
2610 return 0;
2613 * If ce matches the file in the work tree, we can reuse it.
2615 if (ce_uptodate(ce) ||
2616 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
2617 return 1;
2619 return 0;
2622 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2624 int len;
2625 char *data = xmalloc(100), *dirty = "";
2627 /* Are we looking at the work tree? */
2628 if (s->dirty_submodule)
2629 dirty = "-dirty";
2631 len = snprintf(data, 100,
2632 "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty);
2633 s->data = data;
2634 s->size = len;
2635 s->should_free = 1;
2636 if (size_only) {
2637 s->data = NULL;
2638 free(data);
2640 return 0;
2644 * While doing rename detection and pickaxe operation, we may need to
2645 * grab the data for the blob (or file) for our own in-core comparison.
2646 * diff_filespec has data and size fields for this purpose.
2648 int diff_populate_filespec(struct diff_filespec *s, int size_only)
2650 int err = 0;
2651 if (!DIFF_FILE_VALID(s))
2652 die("internal error: asking to populate invalid file.");
2653 if (S_ISDIR(s->mode))
2654 return -1;
2656 if (s->data)
2657 return 0;
2659 if (size_only && 0 < s->size)
2660 return 0;
2662 if (S_ISGITLINK(s->mode))
2663 return diff_populate_gitlink(s, size_only);
2665 if (!s->sha1_valid ||
2666 reuse_worktree_file(s->path, s->sha1, 0)) {
2667 struct strbuf buf = STRBUF_INIT;
2668 struct stat st;
2669 int fd;
2671 if (lstat(s->path, &st) < 0) {
2672 if (errno == ENOENT) {
2673 err_empty:
2674 err = -1;
2675 empty:
2676 s->data = (char *)"";
2677 s->size = 0;
2678 return err;
2681 s->size = xsize_t(st.st_size);
2682 if (!s->size)
2683 goto empty;
2684 if (S_ISLNK(st.st_mode)) {
2685 struct strbuf sb = STRBUF_INIT;
2687 if (strbuf_readlink(&sb, s->path, s->size))
2688 goto err_empty;
2689 s->size = sb.len;
2690 s->data = strbuf_detach(&sb, NULL);
2691 s->should_free = 1;
2692 return 0;
2694 if (size_only)
2695 return 0;
2696 fd = open(s->path, O_RDONLY);
2697 if (fd < 0)
2698 goto err_empty;
2699 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2700 close(fd);
2701 s->should_munmap = 1;
2704 * Convert from working tree format to canonical git format
2706 if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
2707 size_t size = 0;
2708 munmap(s->data, s->size);
2709 s->should_munmap = 0;
2710 s->data = strbuf_detach(&buf, &size);
2711 s->size = size;
2712 s->should_free = 1;
2715 else {
2716 enum object_type type;
2717 if (size_only) {
2718 type = sha1_object_info(s->sha1, &s->size);
2719 if (type < 0)
2720 die("unable to read %s", sha1_to_hex(s->sha1));
2721 } else {
2722 s->data = read_sha1_file(s->sha1, &type, &s->size);
2723 if (!s->data)
2724 die("unable to read %s", sha1_to_hex(s->sha1));
2725 s->should_free = 1;
2728 return 0;
2731 void diff_free_filespec_blob(struct diff_filespec *s)
2733 if (s->should_free)
2734 free(s->data);
2735 else if (s->should_munmap)
2736 munmap(s->data, s->size);
2738 if (s->should_free || s->should_munmap) {
2739 s->should_free = s->should_munmap = 0;
2740 s->data = NULL;
2744 void diff_free_filespec_data(struct diff_filespec *s)
2746 diff_free_filespec_blob(s);
2747 free(s->cnt_data);
2748 s->cnt_data = NULL;
2751 static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2752 void *blob,
2753 unsigned long size,
2754 const unsigned char *sha1,
2755 int mode)
2757 int fd;
2758 struct strbuf buf = STRBUF_INIT;
2759 struct strbuf template = STRBUF_INIT;
2760 char *path_dup = xstrdup(path);
2761 const char *base = basename(path_dup);
2763 /* Generate "XXXXXX_basename.ext" */
2764 strbuf_addstr(&template, "XXXXXX_");
2765 strbuf_addstr(&template, base);
2767 fd = git_mkstemps(temp->tmp_path, PATH_MAX, template.buf,
2768 strlen(base) + 1);
2769 if (fd < 0)
2770 die_errno("unable to create temp-file");
2771 if (convert_to_working_tree(path,
2772 (const char *)blob, (size_t)size, &buf)) {
2773 blob = buf.buf;
2774 size = buf.len;
2776 if (write_in_full(fd, blob, size) != size)
2777 die_errno("unable to write temp-file");
2778 close(fd);
2779 temp->name = temp->tmp_path;
2780 strcpy(temp->hex, sha1_to_hex(sha1));
2781 temp->hex[40] = 0;
2782 sprintf(temp->mode, "%06o", mode);
2783 strbuf_release(&buf);
2784 strbuf_release(&template);
2785 free(path_dup);
2788 static struct diff_tempfile *prepare_temp_file(const char *name,
2789 struct diff_filespec *one)
2791 struct diff_tempfile *temp = claim_diff_tempfile();
2793 if (!DIFF_FILE_VALID(one)) {
2794 not_a_valid_file:
2795 /* A '-' entry produces this for file-2, and
2796 * a '+' entry produces this for file-1.
2798 temp->name = "/dev/null";
2799 strcpy(temp->hex, ".");
2800 strcpy(temp->mode, ".");
2801 return temp;
2804 if (!remove_tempfile_installed) {
2805 atexit(remove_tempfile);
2806 sigchain_push_common(remove_tempfile_on_signal);
2807 remove_tempfile_installed = 1;
2810 if (!one->sha1_valid ||
2811 reuse_worktree_file(name, one->sha1, 1)) {
2812 struct stat st;
2813 if (lstat(name, &st) < 0) {
2814 if (errno == ENOENT)
2815 goto not_a_valid_file;
2816 die_errno("stat(%s)", name);
2818 if (S_ISLNK(st.st_mode)) {
2819 struct strbuf sb = STRBUF_INIT;
2820 if (strbuf_readlink(&sb, name, st.st_size) < 0)
2821 die_errno("readlink(%s)", name);
2822 prep_temp_blob(name, temp, sb.buf, sb.len,
2823 (one->sha1_valid ?
2824 one->sha1 : null_sha1),
2825 (one->sha1_valid ?
2826 one->mode : S_IFLNK));
2827 strbuf_release(&sb);
2829 else {
2830 /* we can borrow from the file in the work tree */
2831 temp->name = name;
2832 if (!one->sha1_valid)
2833 strcpy(temp->hex, sha1_to_hex(null_sha1));
2834 else
2835 strcpy(temp->hex, sha1_to_hex(one->sha1));
2836 /* Even though we may sometimes borrow the
2837 * contents from the work tree, we always want
2838 * one->mode. mode is trustworthy even when
2839 * !(one->sha1_valid), as long as
2840 * DIFF_FILE_VALID(one).
2842 sprintf(temp->mode, "%06o", one->mode);
2844 return temp;
2846 else {
2847 if (diff_populate_filespec(one, 0))
2848 die("cannot read data blob for %s", one->path);
2849 prep_temp_blob(name, temp, one->data, one->size,
2850 one->sha1, one->mode);
2852 return temp;
2855 /* An external diff command takes:
2857 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2858 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2861 static void run_external_diff(const char *pgm,
2862 const char *name,
2863 const char *other,
2864 struct diff_filespec *one,
2865 struct diff_filespec *two,
2866 const char *xfrm_msg,
2867 int complete_rewrite)
2869 const char *spawn_arg[10];
2870 int retval;
2871 const char **arg = &spawn_arg[0];
2873 if (one && two) {
2874 struct diff_tempfile *temp_one, *temp_two;
2875 const char *othername = (other ? other : name);
2876 temp_one = prepare_temp_file(name, one);
2877 temp_two = prepare_temp_file(othername, two);
2878 *arg++ = pgm;
2879 *arg++ = name;
2880 *arg++ = temp_one->name;
2881 *arg++ = temp_one->hex;
2882 *arg++ = temp_one->mode;
2883 *arg++ = temp_two->name;
2884 *arg++ = temp_two->hex;
2885 *arg++ = temp_two->mode;
2886 if (other) {
2887 *arg++ = other;
2888 *arg++ = xfrm_msg;
2890 } else {
2891 *arg++ = pgm;
2892 *arg++ = name;
2894 *arg = NULL;
2895 fflush(NULL);
2896 retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL);
2897 remove_tempfile();
2898 if (retval) {
2899 fprintf(stderr, "external diff died, stopping at %s.\n", name);
2900 exit(1);
2904 static int similarity_index(struct diff_filepair *p)
2906 return p->score * 100 / MAX_SCORE;
2909 static void fill_metainfo(struct strbuf *msg,
2910 const char *name,
2911 const char *other,
2912 struct diff_filespec *one,
2913 struct diff_filespec *two,
2914 struct diff_options *o,
2915 struct diff_filepair *p,
2916 int *must_show_header,
2917 int use_color)
2919 const char *set = diff_get_color(use_color, DIFF_METAINFO);
2920 const char *reset = diff_get_color(use_color, DIFF_RESET);
2921 struct strbuf *msgbuf;
2922 char *line_prefix = "";
2924 *must_show_header = 1;
2925 if (o->output_prefix) {
2926 msgbuf = o->output_prefix(o, o->output_prefix_data);
2927 line_prefix = msgbuf->buf;
2929 strbuf_init(msg, PATH_MAX * 2 + 300);
2930 switch (p->status) {
2931 case DIFF_STATUS_COPIED:
2932 strbuf_addf(msg, "%s%ssimilarity index %d%%",
2933 line_prefix, set, similarity_index(p));
2934 strbuf_addf(msg, "%s\n%s%scopy from ",
2935 reset, line_prefix, set);
2936 quote_c_style(name, msg, NULL, 0);
2937 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
2938 quote_c_style(other, msg, NULL, 0);
2939 strbuf_addf(msg, "%s\n", reset);
2940 break;
2941 case DIFF_STATUS_RENAMED:
2942 strbuf_addf(msg, "%s%ssimilarity index %d%%",
2943 line_prefix, set, similarity_index(p));
2944 strbuf_addf(msg, "%s\n%s%srename from ",
2945 reset, line_prefix, set);
2946 quote_c_style(name, msg, NULL, 0);
2947 strbuf_addf(msg, "%s\n%s%srename to ",
2948 reset, line_prefix, set);
2949 quote_c_style(other, msg, NULL, 0);
2950 strbuf_addf(msg, "%s\n", reset);
2951 break;
2952 case DIFF_STATUS_MODIFIED:
2953 if (p->score) {
2954 strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
2955 line_prefix,
2956 set, similarity_index(p), reset);
2957 break;
2959 /* fallthru */
2960 default:
2961 *must_show_header = 0;
2963 if (one && two && hashcmp(one->sha1, two->sha1)) {
2964 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
2966 if (DIFF_OPT_TST(o, BINARY)) {
2967 mmfile_t mf;
2968 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2969 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2970 abbrev = 40;
2972 strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
2973 find_unique_abbrev(one->sha1, abbrev));
2974 strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
2975 if (one->mode == two->mode)
2976 strbuf_addf(msg, " %06o", one->mode);
2977 strbuf_addf(msg, "%s\n", reset);
2981 static void run_diff_cmd(const char *pgm,
2982 const char *name,
2983 const char *other,
2984 const char *attr_path,
2985 struct diff_filespec *one,
2986 struct diff_filespec *two,
2987 struct strbuf *msg,
2988 struct diff_options *o,
2989 struct diff_filepair *p)
2991 const char *xfrm_msg = NULL;
2992 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
2993 int must_show_header = 0;
2996 if (DIFF_OPT_TST(o, ALLOW_EXTERNAL)) {
2997 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
2998 if (drv && drv->external)
2999 pgm = drv->external;
3002 if (msg) {
3004 * don't use colors when the header is intended for an
3005 * external diff driver
3007 fill_metainfo(msg, name, other, one, two, o, p,
3008 &must_show_header,
3009 want_color(o->use_color) && !pgm);
3010 xfrm_msg = msg->len ? msg->buf : NULL;
3013 if (pgm) {
3014 run_external_diff(pgm, name, other, one, two, xfrm_msg,
3015 complete_rewrite);
3016 return;
3018 if (one && two)
3019 builtin_diff(name, other ? other : name,
3020 one, two, xfrm_msg, must_show_header,
3021 o, complete_rewrite);
3022 else
3023 fprintf(o->file, "* Unmerged path %s\n", name);
3026 static void diff_fill_sha1_info(struct diff_filespec *one)
3028 if (DIFF_FILE_VALID(one)) {
3029 if (!one->sha1_valid) {
3030 struct stat st;
3031 if (one->is_stdin) {
3032 hashcpy(one->sha1, null_sha1);
3033 return;
3035 if (lstat(one->path, &st) < 0)
3036 die_errno("stat '%s'", one->path);
3037 if (index_path(one->sha1, one->path, &st, 0))
3038 die("cannot hash %s", one->path);
3041 else
3042 hashclr(one->sha1);
3045 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
3047 /* Strip the prefix but do not molest /dev/null and absolute paths */
3048 if (*namep && **namep != '/') {
3049 *namep += prefix_length;
3050 if (**namep == '/')
3051 ++*namep;
3053 if (*otherp && **otherp != '/') {
3054 *otherp += prefix_length;
3055 if (**otherp == '/')
3056 ++*otherp;
3060 static void run_diff(struct diff_filepair *p, struct diff_options *o)
3062 const char *pgm = external_diff();
3063 struct strbuf msg;
3064 struct diff_filespec *one = p->one;
3065 struct diff_filespec *two = p->two;
3066 const char *name;
3067 const char *other;
3068 const char *attr_path;
3070 name = p->one->path;
3071 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3072 attr_path = name;
3073 if (o->prefix_length)
3074 strip_prefix(o->prefix_length, &name, &other);
3076 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
3077 pgm = NULL;
3079 if (DIFF_PAIR_UNMERGED(p)) {
3080 run_diff_cmd(pgm, name, NULL, attr_path,
3081 NULL, NULL, NULL, o, p);
3082 return;
3085 diff_fill_sha1_info(one);
3086 diff_fill_sha1_info(two);
3088 if (!pgm &&
3089 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
3090 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
3092 * a filepair that changes between file and symlink
3093 * needs to be split into deletion and creation.
3095 struct diff_filespec *null = alloc_filespec(two->path);
3096 run_diff_cmd(NULL, name, other, attr_path,
3097 one, null, &msg, o, p);
3098 free(null);
3099 strbuf_release(&msg);
3101 null = alloc_filespec(one->path);
3102 run_diff_cmd(NULL, name, other, attr_path,
3103 null, two, &msg, o, p);
3104 free(null);
3106 else
3107 run_diff_cmd(pgm, name, other, attr_path,
3108 one, two, &msg, o, p);
3110 strbuf_release(&msg);
3113 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
3114 struct diffstat_t *diffstat)
3116 const char *name;
3117 const char *other;
3118 int complete_rewrite = 0;
3120 if (DIFF_PAIR_UNMERGED(p)) {
3121 /* unmerged */
3122 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
3123 return;
3126 name = p->one->path;
3127 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3129 if (o->prefix_length)
3130 strip_prefix(o->prefix_length, &name, &other);
3132 diff_fill_sha1_info(p->one);
3133 diff_fill_sha1_info(p->two);
3135 if (p->status == DIFF_STATUS_MODIFIED && p->score)
3136 complete_rewrite = 1;
3137 builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
3140 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
3142 const char *name;
3143 const char *other;
3144 const char *attr_path;
3146 if (DIFF_PAIR_UNMERGED(p)) {
3147 /* unmerged */
3148 return;
3151 name = p->one->path;
3152 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3153 attr_path = other ? other : name;
3155 if (o->prefix_length)
3156 strip_prefix(o->prefix_length, &name, &other);
3158 diff_fill_sha1_info(p->one);
3159 diff_fill_sha1_info(p->two);
3161 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
3164 void diff_setup(struct diff_options *options)
3166 memcpy(options, &default_diff_options, sizeof(*options));
3168 options->file = stdout;
3170 options->line_termination = '\n';
3171 options->break_opt = -1;
3172 options->rename_limit = -1;
3173 options->dirstat_permille = diff_dirstat_permille_default;
3174 options->context = 3;
3175 DIFF_OPT_SET(options, RENAME_EMPTY);
3177 options->change = diff_change;
3178 options->add_remove = diff_addremove;
3179 options->use_color = diff_use_color_default;
3180 options->detect_rename = diff_detect_rename_default;
3182 if (diff_no_prefix) {
3183 options->a_prefix = options->b_prefix = "";
3184 } else if (!diff_mnemonic_prefix) {
3185 options->a_prefix = "a/";
3186 options->b_prefix = "b/";
3190 int diff_setup_done(struct diff_options *options)
3192 int count = 0;
3194 if (options->output_format & DIFF_FORMAT_NAME)
3195 count++;
3196 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
3197 count++;
3198 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
3199 count++;
3200 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
3201 count++;
3202 if (count > 1)
3203 die("--name-only, --name-status, --check and -s are mutually exclusive");
3206 * Most of the time we can say "there are changes"
3207 * only by checking if there are changed paths, but
3208 * --ignore-whitespace* options force us to look
3209 * inside contents.
3212 if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
3213 DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
3214 DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
3215 DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
3216 else
3217 DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
3219 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
3220 options->detect_rename = DIFF_DETECT_COPY;
3222 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
3223 options->prefix = NULL;
3224 if (options->prefix)
3225 options->prefix_length = strlen(options->prefix);
3226 else
3227 options->prefix_length = 0;
3229 if (options->output_format & (DIFF_FORMAT_NAME |
3230 DIFF_FORMAT_NAME_STATUS |
3231 DIFF_FORMAT_CHECKDIFF |
3232 DIFF_FORMAT_NO_OUTPUT))
3233 options->output_format &= ~(DIFF_FORMAT_RAW |
3234 DIFF_FORMAT_NUMSTAT |
3235 DIFF_FORMAT_DIFFSTAT |
3236 DIFF_FORMAT_SHORTSTAT |
3237 DIFF_FORMAT_DIRSTAT |
3238 DIFF_FORMAT_SUMMARY |
3239 DIFF_FORMAT_PATCH);
3242 * These cases always need recursive; we do not drop caller-supplied
3243 * recursive bits for other formats here.
3245 if (options->output_format & (DIFF_FORMAT_PATCH |
3246 DIFF_FORMAT_NUMSTAT |
3247 DIFF_FORMAT_DIFFSTAT |
3248 DIFF_FORMAT_SHORTSTAT |
3249 DIFF_FORMAT_DIRSTAT |
3250 DIFF_FORMAT_SUMMARY |
3251 DIFF_FORMAT_CHECKDIFF))
3252 DIFF_OPT_SET(options, RECURSIVE);
3254 * Also pickaxe would not work very well if you do not say recursive
3256 if (options->pickaxe)
3257 DIFF_OPT_SET(options, RECURSIVE);
3259 * When patches are generated, submodules diffed against the work tree
3260 * must be checked for dirtiness too so it can be shown in the output
3262 if (options->output_format & DIFF_FORMAT_PATCH)
3263 DIFF_OPT_SET(options, DIRTY_SUBMODULES);
3265 if (options->detect_rename && options->rename_limit < 0)
3266 options->rename_limit = diff_rename_limit_default;
3267 if (options->setup & DIFF_SETUP_USE_CACHE) {
3268 if (!active_cache)
3269 /* read-cache does not die even when it fails
3270 * so it is safe for us to do this here. Also
3271 * it does not smudge active_cache or active_nr
3272 * when it fails, so we do not have to worry about
3273 * cleaning it up ourselves either.
3275 read_cache();
3277 if (options->abbrev <= 0 || 40 < options->abbrev)
3278 options->abbrev = 40; /* full */
3281 * It does not make sense to show the first hit we happened
3282 * to have found. It does not make sense not to return with
3283 * exit code in such a case either.
3285 if (DIFF_OPT_TST(options, QUICK)) {
3286 options->output_format = DIFF_FORMAT_NO_OUTPUT;
3287 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3290 return 0;
3293 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
3295 char c, *eq;
3296 int len;
3298 if (*arg != '-')
3299 return 0;
3300 c = *++arg;
3301 if (!c)
3302 return 0;
3303 if (c == arg_short) {
3304 c = *++arg;
3305 if (!c)
3306 return 1;
3307 if (val && isdigit(c)) {
3308 char *end;
3309 int n = strtoul(arg, &end, 10);
3310 if (*end)
3311 return 0;
3312 *val = n;
3313 return 1;
3315 return 0;
3317 if (c != '-')
3318 return 0;
3319 arg++;
3320 eq = strchr(arg, '=');
3321 if (eq)
3322 len = eq - arg;
3323 else
3324 len = strlen(arg);
3325 if (!len || strncmp(arg, arg_long, len))
3326 return 0;
3327 if (eq) {
3328 int n;
3329 char *end;
3330 if (!isdigit(*++eq))
3331 return 0;
3332 n = strtoul(eq, &end, 10);
3333 if (*end)
3334 return 0;
3335 *val = n;
3337 return 1;
3340 static int diff_scoreopt_parse(const char *opt);
3342 static inline int short_opt(char opt, const char **argv,
3343 const char **optarg)
3345 const char *arg = argv[0];
3346 if (arg[0] != '-' || arg[1] != opt)
3347 return 0;
3348 if (arg[2] != '\0') {
3349 *optarg = arg + 2;
3350 return 1;
3352 if (!argv[1])
3353 die("Option '%c' requires a value", opt);
3354 *optarg = argv[1];
3355 return 2;
3358 int parse_long_opt(const char *opt, const char **argv,
3359 const char **optarg)
3361 const char *arg = argv[0];
3362 if (arg[0] != '-' || arg[1] != '-')
3363 return 0;
3364 arg += strlen("--");
3365 if (prefixcmp(arg, opt))
3366 return 0;
3367 arg += strlen(opt);
3368 if (*arg == '=') { /* sticked form: --option=value */
3369 *optarg = arg + 1;
3370 return 1;
3372 if (*arg != '\0')
3373 return 0;
3374 /* separate form: --option value */
3375 if (!argv[1])
3376 die("Option '--%s' requires a value", opt);
3377 *optarg = argv[1];
3378 return 2;
3381 static int stat_opt(struct diff_options *options, const char **av)
3383 const char *arg = av[0];
3384 char *end;
3385 int width = options->stat_width;
3386 int name_width = options->stat_name_width;
3387 int graph_width = options->stat_graph_width;
3388 int count = options->stat_count;
3389 int argcount = 1;
3391 arg += strlen("--stat");
3392 end = (char *)arg;
3394 switch (*arg) {
3395 case '-':
3396 if (!prefixcmp(arg, "-width")) {
3397 arg += strlen("-width");
3398 if (*arg == '=')
3399 width = strtoul(arg + 1, &end, 10);
3400 else if (!*arg && !av[1])
3401 die("Option '--stat-width' requires a value");
3402 else if (!*arg) {
3403 width = strtoul(av[1], &end, 10);
3404 argcount = 2;
3406 } else if (!prefixcmp(arg, "-name-width")) {
3407 arg += strlen("-name-width");
3408 if (*arg == '=')
3409 name_width = strtoul(arg + 1, &end, 10);
3410 else if (!*arg && !av[1])
3411 die("Option '--stat-name-width' requires a value");
3412 else if (!*arg) {
3413 name_width = strtoul(av[1], &end, 10);
3414 argcount = 2;
3416 } else if (!prefixcmp(arg, "-graph-width")) {
3417 arg += strlen("-graph-width");
3418 if (*arg == '=')
3419 graph_width = strtoul(arg + 1, &end, 10);
3420 else if (!*arg && !av[1])
3421 die("Option '--stat-graph-width' requires a value");
3422 else if (!*arg) {
3423 graph_width = strtoul(av[1], &end, 10);
3424 argcount = 2;
3426 } else if (!prefixcmp(arg, "-count")) {
3427 arg += strlen("-count");
3428 if (*arg == '=')
3429 count = strtoul(arg + 1, &end, 10);
3430 else if (!*arg && !av[1])
3431 die("Option '--stat-count' requires a value");
3432 else if (!*arg) {
3433 count = strtoul(av[1], &end, 10);
3434 argcount = 2;
3437 break;
3438 case '=':
3439 width = strtoul(arg+1, &end, 10);
3440 if (*end == ',')
3441 name_width = strtoul(end+1, &end, 10);
3442 if (*end == ',')
3443 count = strtoul(end+1, &end, 10);
3446 /* Important! This checks all the error cases! */
3447 if (*end)
3448 return 0;
3449 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3450 options->stat_name_width = name_width;
3451 options->stat_graph_width = graph_width;
3452 options->stat_width = width;
3453 options->stat_count = count;
3454 return argcount;
3457 static int parse_dirstat_opt(struct diff_options *options, const char *params)
3459 struct strbuf errmsg = STRBUF_INIT;
3460 if (parse_dirstat_params(options, params, &errmsg))
3461 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3462 errmsg.buf);
3463 strbuf_release(&errmsg);
3465 * The caller knows a dirstat-related option is given from the command
3466 * line; allow it to say "return this_function();"
3468 options->output_format |= DIFF_FORMAT_DIRSTAT;
3469 return 1;
3472 int diff_opt_parse(struct diff_options *options, const char **av, int ac)
3474 const char *arg = av[0];
3475 const char *optarg;
3476 int argcount;
3478 /* Output format options */
3479 if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch"))
3480 options->output_format |= DIFF_FORMAT_PATCH;
3481 else if (opt_arg(arg, 'U', "unified", &options->context))
3482 options->output_format |= DIFF_FORMAT_PATCH;
3483 else if (!strcmp(arg, "--raw"))
3484 options->output_format |= DIFF_FORMAT_RAW;
3485 else if (!strcmp(arg, "--patch-with-raw"))
3486 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
3487 else if (!strcmp(arg, "--numstat"))
3488 options->output_format |= DIFF_FORMAT_NUMSTAT;
3489 else if (!strcmp(arg, "--shortstat"))
3490 options->output_format |= DIFF_FORMAT_SHORTSTAT;
3491 else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat"))
3492 return parse_dirstat_opt(options, "");
3493 else if (!prefixcmp(arg, "-X"))
3494 return parse_dirstat_opt(options, arg + 2);
3495 else if (!prefixcmp(arg, "--dirstat="))
3496 return parse_dirstat_opt(options, arg + 10);
3497 else if (!strcmp(arg, "--cumulative"))
3498 return parse_dirstat_opt(options, "cumulative");
3499 else if (!strcmp(arg, "--dirstat-by-file"))
3500 return parse_dirstat_opt(options, "files");
3501 else if (!prefixcmp(arg, "--dirstat-by-file=")) {
3502 parse_dirstat_opt(options, "files");
3503 return parse_dirstat_opt(options, arg + 18);
3505 else if (!strcmp(arg, "--check"))
3506 options->output_format |= DIFF_FORMAT_CHECKDIFF;
3507 else if (!strcmp(arg, "--summary"))
3508 options->output_format |= DIFF_FORMAT_SUMMARY;
3509 else if (!strcmp(arg, "--patch-with-stat"))
3510 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
3511 else if (!strcmp(arg, "--name-only"))
3512 options->output_format |= DIFF_FORMAT_NAME;
3513 else if (!strcmp(arg, "--name-status"))
3514 options->output_format |= DIFF_FORMAT_NAME_STATUS;
3515 else if (!strcmp(arg, "-s"))
3516 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
3517 else if (!prefixcmp(arg, "--stat"))
3518 /* --stat, --stat-width, --stat-name-width, or --stat-count */
3519 return stat_opt(options, av);
3521 /* renames options */
3522 else if (!prefixcmp(arg, "-B") || !prefixcmp(arg, "--break-rewrites=") ||
3523 !strcmp(arg, "--break-rewrites")) {
3524 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
3525 return error("invalid argument to -B: %s", arg+2);
3527 else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--find-renames=") ||
3528 !strcmp(arg, "--find-renames")) {
3529 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3530 return error("invalid argument to -M: %s", arg+2);
3531 options->detect_rename = DIFF_DETECT_RENAME;
3533 else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
3534 options->irreversible_delete = 1;
3536 else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--find-copies=") ||
3537 !strcmp(arg, "--find-copies")) {
3538 if (options->detect_rename == DIFF_DETECT_COPY)
3539 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3540 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3541 return error("invalid argument to -C: %s", arg+2);
3542 options->detect_rename = DIFF_DETECT_COPY;
3544 else if (!strcmp(arg, "--no-renames"))
3545 options->detect_rename = 0;
3546 else if (!strcmp(arg, "--rename-empty"))
3547 DIFF_OPT_SET(options, RENAME_EMPTY);
3548 else if (!strcmp(arg, "--no-rename-empty"))
3549 DIFF_OPT_CLR(options, RENAME_EMPTY);
3550 else if (!strcmp(arg, "--relative"))
3551 DIFF_OPT_SET(options, RELATIVE_NAME);
3552 else if (!prefixcmp(arg, "--relative=")) {
3553 DIFF_OPT_SET(options, RELATIVE_NAME);
3554 options->prefix = arg + 11;
3557 /* xdiff options */
3558 else if (!strcmp(arg, "--minimal"))
3559 DIFF_XDL_SET(options, NEED_MINIMAL);
3560 else if (!strcmp(arg, "--no-minimal"))
3561 DIFF_XDL_CLR(options, NEED_MINIMAL);
3562 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
3563 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
3564 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
3565 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
3566 else if (!strcmp(arg, "--ignore-space-at-eol"))
3567 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
3568 else if (!strcmp(arg, "--patience"))
3569 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
3570 else if (!strcmp(arg, "--histogram"))
3571 options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
3573 /* flags options */
3574 else if (!strcmp(arg, "--binary")) {
3575 options->output_format |= DIFF_FORMAT_PATCH;
3576 DIFF_OPT_SET(options, BINARY);
3578 else if (!strcmp(arg, "--full-index"))
3579 DIFF_OPT_SET(options, FULL_INDEX);
3580 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
3581 DIFF_OPT_SET(options, TEXT);
3582 else if (!strcmp(arg, "-R"))
3583 DIFF_OPT_SET(options, REVERSE_DIFF);
3584 else if (!strcmp(arg, "--find-copies-harder"))
3585 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3586 else if (!strcmp(arg, "--follow"))
3587 DIFF_OPT_SET(options, FOLLOW_RENAMES);
3588 else if (!strcmp(arg, "--color"))
3589 options->use_color = 1;
3590 else if (!prefixcmp(arg, "--color=")) {
3591 int value = git_config_colorbool(NULL, arg+8);
3592 if (value < 0)
3593 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3594 options->use_color = value;
3596 else if (!strcmp(arg, "--no-color"))
3597 options->use_color = 0;
3598 else if (!strcmp(arg, "--color-words")) {
3599 options->use_color = 1;
3600 options->word_diff = DIFF_WORDS_COLOR;
3602 else if (!prefixcmp(arg, "--color-words=")) {
3603 options->use_color = 1;
3604 options->word_diff = DIFF_WORDS_COLOR;
3605 options->word_regex = arg + 14;
3607 else if (!strcmp(arg, "--word-diff")) {
3608 if (options->word_diff == DIFF_WORDS_NONE)
3609 options->word_diff = DIFF_WORDS_PLAIN;
3611 else if (!prefixcmp(arg, "--word-diff=")) {
3612 const char *type = arg + 12;
3613 if (!strcmp(type, "plain"))
3614 options->word_diff = DIFF_WORDS_PLAIN;
3615 else if (!strcmp(type, "color")) {
3616 options->use_color = 1;
3617 options->word_diff = DIFF_WORDS_COLOR;
3619 else if (!strcmp(type, "porcelain"))
3620 options->word_diff = DIFF_WORDS_PORCELAIN;
3621 else if (!strcmp(type, "none"))
3622 options->word_diff = DIFF_WORDS_NONE;
3623 else
3624 die("bad --word-diff argument: %s", type);
3626 else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) {
3627 if (options->word_diff == DIFF_WORDS_NONE)
3628 options->word_diff = DIFF_WORDS_PLAIN;
3629 options->wor