34012b4b6340d6b53d465d66aeb64a5d479baecc
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"
18#include "string-list.h"
19#include "argv-array.h"
20#ifdef NO_FAST_WORKING_DIRECTORY
22#define FAST_WORKING_DIRECTORY 0
23#else
24#define FAST_WORKING_DIRECTORY 1
25#endif
26static int diff_detect_rename_default;
28static int diff_rename_limit_default = 400;
29static int diff_suppress_blank_empty;
30static int diff_use_color_default = -1;
31static int diff_context_default = 3;
32static const char *diff_word_regex_cfg;
33static const char *external_diff_cmd_cfg;
34static const char *diff_order_file_cfg;
35int diff_auto_refresh_index = 1;
36static int diff_mnemonic_prefix;
37static int diff_no_prefix;
38static int diff_stat_graph_width;
39static int diff_dirstat_permille_default = 30;
40static struct diff_options default_diff_options;
41static long diff_algorithm;
42static char diff_colors[][COLOR_MAXLEN] = {
44 GIT_COLOR_RESET,
45 GIT_COLOR_NORMAL, /* PLAIN */
46 GIT_COLOR_BOLD, /* METAINFO */
47 GIT_COLOR_CYAN, /* FRAGINFO */
48 GIT_COLOR_RED, /* OLD */
49 GIT_COLOR_GREEN, /* NEW */
50 GIT_COLOR_YELLOW, /* COMMIT */
51 GIT_COLOR_BG_RED, /* WHITESPACE */
52 GIT_COLOR_NORMAL, /* FUNCINFO */
53};
54static int parse_diff_color_slot(const char *var)
56{
57 if (!strcasecmp(var, "plain"))
58 return DIFF_PLAIN;
59 if (!strcasecmp(var, "meta"))
60 return DIFF_METAINFO;
61 if (!strcasecmp(var, "frag"))
62 return DIFF_FRAGINFO;
63 if (!strcasecmp(var, "old"))
64 return DIFF_FILE_OLD;
65 if (!strcasecmp(var, "new"))
66 return DIFF_FILE_NEW;
67 if (!strcasecmp(var, "commit"))
68 return DIFF_COMMIT;
69 if (!strcasecmp(var, "whitespace"))
70 return DIFF_WHITESPACE;
71 if (!strcasecmp(var, "func"))
72 return DIFF_FUNCINFO;
73 return -1;
74}
75static int parse_dirstat_params(struct diff_options *options, const char *params_string,
77 struct strbuf *errmsg)
78{
79 char *params_copy = xstrdup(params_string);
80 struct string_list params = STRING_LIST_INIT_NODUP;
81 int ret = 0;
82 int i;
83 if (*params_copy)
85 string_list_split_in_place(¶ms, params_copy, ',', -1);
86 for (i = 0; i < params.nr; i++) {
87 const char *p = params.items[i].string;
88 if (!strcmp(p, "changes")) {
89 DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
90 DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
91 } else if (!strcmp(p, "lines")) {
92 DIFF_OPT_SET(options, DIRSTAT_BY_LINE);
93 DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
94 } else if (!strcmp(p, "files")) {
95 DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
96 DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
97 } else if (!strcmp(p, "noncumulative")) {
98 DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
99 } else if (!strcmp(p, "cumulative")) {
100 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
101 } else if (isdigit(*p)) {
102 char *end;
103 int permille = strtoul(p, &end, 10) * 10;
104 if (*end == '.' && isdigit(*++end)) {
105 /* only use first digit */
106 permille += *end - '0';
107 /* .. and ignore any further digits */
108 while (isdigit(*++end))
109 ; /* nothing */
110 }
111 if (!*end)
112 options->dirstat_permille = permille;
113 else {
114 strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
115 p);
116 ret++;
117 }
118 } else {
119 strbuf_addf(errmsg, _(" Unknown dirstat parameter '%s'\n"), p);
120 ret++;
121 }
122 }
124 string_list_clear(¶ms, 0);
125 free(params_copy);
126 return ret;
127}
128static int parse_submodule_params(struct diff_options *options, const char *value)
130{
131 if (!strcmp(value, "log"))
132 DIFF_OPT_SET(options, SUBMODULE_LOG);
133 else if (!strcmp(value, "short"))
134 DIFF_OPT_CLR(options, SUBMODULE_LOG);
135 else
136 return -1;
137 return 0;
138}
139static int git_config_rename(const char *var, const char *value)
141{
142 if (!value)
143 return DIFF_DETECT_RENAME;
144 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
145 return DIFF_DETECT_COPY;
146 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
147}
148long parse_algorithm_value(const char *value)
150{
151 if (!value)
152 return -1;
153 else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default"))
154 return 0;
155 else if (!strcasecmp(value, "minimal"))
156 return XDF_NEED_MINIMAL;
157 else if (!strcasecmp(value, "patience"))
158 return XDF_PATIENCE_DIFF;
159 else if (!strcasecmp(value, "histogram"))
160 return XDF_HISTOGRAM_DIFF;
161 return -1;
162}
163/*
165 * These are to give UI layer defaults.
166 * The core-level commands such as git-diff-files should
167 * never be affected by the setting of diff.renames
168 * the user happens to have in the configuration file.
169 */
170int git_diff_ui_config(const char *var, const char *value, void *cb)
171{
172 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
173 diff_use_color_default = git_config_colorbool(var, value);
174 return 0;
175 }
176 if (!strcmp(var, "diff.context")) {
177 diff_context_default = git_config_int(var, value);
178 if (diff_context_default < 0)
179 return -1;
180 return 0;
181 }
182 if (!strcmp(var, "diff.renames")) {
183 diff_detect_rename_default = git_config_rename(var, value);
184 return 0;
185 }
186 if (!strcmp(var, "diff.autorefreshindex")) {
187 diff_auto_refresh_index = git_config_bool(var, value);
188 return 0;
189 }
190 if (!strcmp(var, "diff.mnemonicprefix")) {
191 diff_mnemonic_prefix = git_config_bool(var, value);
192 return 0;
193 }
194 if (!strcmp(var, "diff.noprefix")) {
195 diff_no_prefix = git_config_bool(var, value);
196 return 0;
197 }
198 if (!strcmp(var, "diff.statgraphwidth")) {
199 diff_stat_graph_width = git_config_int(var, value);
200 return 0;
201 }
202 if (!strcmp(var, "diff.external"))
203 return git_config_string(&external_diff_cmd_cfg, var, value);
204 if (!strcmp(var, "diff.wordregex"))
205 return git_config_string(&diff_word_regex_cfg, var, value);
206 if (!strcmp(var, "diff.orderfile"))
207 return git_config_pathname(&diff_order_file_cfg, var, value);
208 if (!strcmp(var, "diff.ignoresubmodules"))
210 handle_ignore_submodules_arg(&default_diff_options, value);
211 if (!strcmp(var, "diff.submodule")) {
213 if (parse_submodule_params(&default_diff_options, value))
214 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
215 value);
216 return 0;
217 }
218 if (!strcmp(var, "diff.algorithm")) {
220 diff_algorithm = parse_algorithm_value(value);
221 if (diff_algorithm < 0)
222 return -1;
223 return 0;
224 }
225 if (git_color_config(var, value, cb) < 0)
227 return -1;
228 return git_diff_basic_config(var, value, cb);
230}
231int git_diff_basic_config(const char *var, const char *value, void *cb)
233{
234 const char *name;
235 if (!strcmp(var, "diff.renamelimit")) {
237 diff_rename_limit_default = git_config_int(var, value);
238 return 0;
239 }
240 if (userdiff_config(var, value) < 0)
242 return -1;
243 if (skip_prefix(var, "diff.color.", &name) ||
245 skip_prefix(var, "color.diff.", &name)) {
246 int slot = parse_diff_color_slot(name);
247 if (slot < 0)
248 return 0;
249 if (!value)
250 return config_error_nonbool(var);
251 return color_parse(value, diff_colors[slot]);
252 }
253 /* like GNU diff's --suppress-blank-empty option */
255 if (!strcmp(var, "diff.suppressblankempty") ||
256 /* for backwards compatibility */
257 !strcmp(var, "diff.suppress-blank-empty")) {
258 diff_suppress_blank_empty = git_config_bool(var, value);
259 return 0;
260 }
261 if (!strcmp(var, "diff.dirstat")) {
263 struct strbuf errmsg = STRBUF_INIT;
264 default_diff_options.dirstat_permille = diff_dirstat_permille_default;
265 if (parse_dirstat_params(&default_diff_options, value, &errmsg))
266 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
267 errmsg.buf);
268 strbuf_release(&errmsg);
269 diff_dirstat_permille_default = default_diff_options.dirstat_permille;
270 return 0;
271 }
272 if (starts_with(var, "submodule."))
274 return parse_submodule_config_option(var, value);
275 return git_default_config(var, value, cb);
277}
278static char *quote_two(const char *one, const char *two)
280{
281 int need_one = quote_c_style(one, NULL, NULL, 1);
282 int need_two = quote_c_style(two, NULL, NULL, 1);
283 struct strbuf res = STRBUF_INIT;
284 if (need_one + need_two) {
286 strbuf_addch(&res, '"');
287 quote_c_style(one, &res, NULL, 1);
288 quote_c_style(two, &res, NULL, 1);
289 strbuf_addch(&res, '"');
290 } else {
291 strbuf_addstr(&res, one);
292 strbuf_addstr(&res, two);
293 }
294 return strbuf_detach(&res, NULL);
295}
296static const char *external_diff(void)
298{
299 static const char *external_diff_cmd = NULL;
300 static int done_preparing = 0;
301 if (done_preparing)
303 return external_diff_cmd;
304 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
305 if (!external_diff_cmd)
306 external_diff_cmd = external_diff_cmd_cfg;
307 done_preparing = 1;
308 return external_diff_cmd;
309}
310static struct diff_tempfile {
312 const char *name; /* filename external diff should read from */
313 char hex[41];
314 char mode[10];
315 char tmp_path[PATH_MAX];
316} diff_temp[2];
317typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
319struct emit_callback {
321 int color_diff;
322 unsigned ws_rule;
323 int blank_at_eof_in_preimage;
324 int blank_at_eof_in_postimage;
325 int lno_in_preimage;
326 int lno_in_postimage;
327 sane_truncate_fn truncate;
328 const char **label_path;
329 struct diff_words_data *diff_words;
330 struct diff_options *opt;
331 int *found_changesp;
332 struct strbuf *header;
333};
334static int count_lines(const char *data, int size)
336{
337 int count, ch, completely_empty = 1, nl_just_seen = 0;
338 count = 0;
339 while (0 < size--) {
340 ch = *data++;
341 if (ch == '\n') {
342 count++;
343 nl_just_seen = 1;
344 completely_empty = 0;
345 }
346 else {
347 nl_just_seen = 0;
348 completely_empty = 0;
349 }
350 }
351 if (completely_empty)
352 return 0;
353 if (!nl_just_seen)
354 count++; /* no trailing newline */
355 return count;
356}
357static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
359{
360 if (!DIFF_FILE_VALID(one)) {
361 mf->ptr = (char *)""; /* does not matter */
362 mf->size = 0;
363 return 0;
364 }
365 else if (diff_populate_filespec(one, 0))
366 return -1;
367 mf->ptr = one->data;
369 mf->size = one->size;
370 return 0;
371}
372/* like fill_mmfile, but only for size, so we can avoid retrieving blob */
374static unsigned long diff_filespec_size(struct diff_filespec *one)
375{
376 if (!DIFF_FILE_VALID(one))
377 return 0;
378 diff_populate_filespec(one, CHECK_SIZE_ONLY);
379 return one->size;
380}
381static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
383{
384 char *ptr = mf->ptr;
385 long size = mf->size;
386 int cnt = 0;
387 if (!size)
389 return cnt;
390 ptr += size - 1; /* pointing at the very end */
391 if (*ptr != '\n')
392 ; /* incomplete line */
393 else
394 ptr--; /* skip the last LF */
395 while (mf->ptr < ptr) {
396 char *prev_eol;
397 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
398 if (*prev_eol == '\n')
399 break;
400 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
401 break;
402 cnt++;
403 ptr = prev_eol - 1;
404 }
405 return cnt;
406}
407static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
409 struct emit_callback *ecbdata)
410{
411 int l1, l2, at;
412 unsigned ws_rule = ecbdata->ws_rule;
413 l1 = count_trailing_blank(mf1, ws_rule);
414 l2 = count_trailing_blank(mf2, ws_rule);
415 if (l2 <= l1) {
416 ecbdata->blank_at_eof_in_preimage = 0;
417 ecbdata->blank_at_eof_in_postimage = 0;
418 return;
419 }
420 at = count_lines(mf1->ptr, mf1->size);
421 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
422 at = count_lines(mf2->ptr, mf2->size);
424 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
425}
426static void emit_line_0(struct diff_options *o, const char *set, const char *reset,
428 int first, const char *line, int len)
429{
430 int has_trailing_newline, has_trailing_carriage_return;
431 int nofirst;
432 FILE *file = o->file;
433 fputs(diff_line_prefix(o), file);
435 if (len == 0) {
437 has_trailing_newline = (first == '\n');
438 has_trailing_carriage_return = (!has_trailing_newline &&
439 (first == '\r'));
440 nofirst = has_trailing_newline || has_trailing_carriage_return;
441 } else {
442 has_trailing_newline = (len > 0 && line[len-1] == '\n');
443 if (has_trailing_newline)
444 len--;
445 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
446 if (has_trailing_carriage_return)
447 len--;
448 nofirst = 0;
449 }
450 if (len || !nofirst) {
452 fputs(set, file);
453 if (!nofirst)
454 fputc(first, file);
455 fwrite(line, len, 1, file);
456 fputs(reset, file);
457 }
458 if (has_trailing_carriage_return)
459 fputc('\r', file);
460 if (has_trailing_newline)
461 fputc('\n', file);
462}
463static void emit_line(struct diff_options *o, const char *set, const char *reset,
465 const char *line, int len)
466{
467 emit_line_0(o, set, reset, line[0], line+1, len-1);
468}
469static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
471{
472 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
473 ecbdata->blank_at_eof_in_preimage &&
474 ecbdata->blank_at_eof_in_postimage &&
475 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
476 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
477 return 0;
478 return ws_blank_line(line, len, ecbdata->ws_rule);
479}
480static void emit_line_checked(const char *reset,
482 struct emit_callback *ecbdata,
483 const char *line, int len,
484 enum color_diff color,
485 unsigned ws_error_highlight,
486 char sign)
487{
488 const char *set = diff_get_color(ecbdata->color_diff, color);
489 const char *ws = NULL;
490 if (ecbdata->opt->ws_error_highlight & ws_error_highlight) {
492 ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
493 if (!*ws)
494 ws = NULL;
495 }
496 if (!ws)
498 emit_line_0(ecbdata->opt, set, reset, sign, line, len);
499 else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len))
500 /* Blank line at EOF - paint '+' as well */
501 emit_line_0(ecbdata->opt, ws, reset, sign, line, len);
502 else {
503 /* Emit just the prefix, then the rest. */
504 emit_line_0(ecbdata->opt, set, reset, sign, "", 0);
505 ws_check_emit(line, len, ecbdata->ws_rule,
506 ecbdata->opt->file, set, reset, ws);
507 }
508}
509static void emit_add_line(const char *reset,
511 struct emit_callback *ecbdata,
512 const char *line, int len)
513{
514 emit_line_checked(reset, ecbdata, line, len,
515 DIFF_FILE_NEW, WSEH_NEW, '+');
516}
517static void emit_del_line(const char *reset,
519 struct emit_callback *ecbdata,
520 const char *line, int len)
521{
522 emit_line_checked(reset, ecbdata, line, len,
523 DIFF_FILE_OLD, WSEH_OLD, '-');
524}
525static void emit_context_line(const char *reset,
527 struct emit_callback *ecbdata,
528 const char *line, int len)
529{
530 emit_line_checked(reset, ecbdata, line, len,
531 DIFF_PLAIN, WSEH_CONTEXT, ' ');
532}
533static void emit_hunk_header(struct emit_callback *ecbdata,
535 const char *line, int len)
536{
537 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
538 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
539 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
540 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
541 static const char atat[2] = { '@', '@' };
542 const char *cp, *ep;
543 struct strbuf msgbuf = STRBUF_INIT;
544 int org_len = len;
545 int i = 1;
546 /*
548 * As a hunk header must begin with "@@ -<old>, +<new> @@",
549 * it always is at least 10 bytes long.
550 */
551 if (len < 10 ||
552 memcmp(line, atat, 2) ||
553 !(ep = memmem(line + 2, len - 2, atat, 2))) {
554 emit_line(ecbdata->opt, plain, reset, line, len);
555 return;
556 }
557 ep += 2; /* skip over @@ */
558 /* The hunk header in fraginfo color */
560 strbuf_addstr(&msgbuf, frag);
561 strbuf_add(&msgbuf, line, ep - line);
562 strbuf_addstr(&msgbuf, reset);
563 /*
565 * trailing "\r\n"
566 */
567 for ( ; i < 3; i++)
568 if (line[len - i] == '\r' || line[len - i] == '\n')
569 len--;
570 /* blank before the func header */
572 for (cp = ep; ep - line < len; ep++)
573 if (*ep != ' ' && *ep != '\t')
574 break;
575 if (ep != cp) {
576 strbuf_addstr(&msgbuf, plain);
577 strbuf_add(&msgbuf, cp, ep - cp);
578 strbuf_addstr(&msgbuf, reset);
579 }
580 if (ep < line + len) {
582 strbuf_addstr(&msgbuf, func);
583 strbuf_add(&msgbuf, ep, line + len - ep);
584 strbuf_addstr(&msgbuf, reset);
585 }
586 strbuf_add(&msgbuf, line + len, org_len - len);
588 emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
589 strbuf_release(&msgbuf);
590}
591static struct diff_tempfile *claim_diff_tempfile(void) {
593 int i;
594 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
595 if (!diff_temp[i].name)
596 return diff_temp + i;
597 die("BUG: diff is failing to clean up its tempfiles");
598}
599static int remove_tempfile_installed;
601static void remove_tempfile(void)
603{
604 int i;
605 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
606 if (diff_temp[i].name == diff_temp[i].tmp_path)
607 unlink_or_warn(diff_temp[i].name);
608 diff_temp[i].name = NULL;
609 }
610}
611static void remove_tempfile_on_signal(int signo)
613{
614 remove_tempfile();
615 sigchain_pop(signo);
616 raise(signo);
617}
618static void print_line_count(FILE *file, int count)
620{
621 switch (count) {
622 case 0:
623 fprintf(file, "0,0");
624 break;
625 case 1:
626 fprintf(file, "1");
627 break;
628 default:
629 fprintf(file, "1,%d", count);
630 break;
631 }
632}
633static void emit_rewrite_lines(struct emit_callback *ecb,
635 int prefix, const char *data, int size)
636{
637 const char *endp = NULL;
638 static const char *nneof = " No newline at end of file\n";
639 const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
640 while (0 < size) {
642 int len;
643 endp = memchr(data, '\n', size);
645 len = endp ? (endp - data + 1) : size;
646 if (prefix != '+') {
647 ecb->lno_in_preimage++;
648 emit_del_line(reset, ecb, data, len);
649 } else {
650 ecb->lno_in_postimage++;
651 emit_add_line(reset, ecb, data, len);
652 }
653 size -= len;
654 data += len;
655 }
656 if (!endp) {
657 const char *plain = diff_get_color(ecb->color_diff,
658 DIFF_PLAIN);
659 putc('\n', ecb->opt->file);
660 emit_line_0(ecb->opt, plain, reset, '\\',
661 nneof, strlen(nneof));
662 }
663}
664static void emit_rewrite_diff(const char *name_a,
666 const char *name_b,
667 struct diff_filespec *one,
668 struct diff_filespec *two,
669 struct userdiff_driver *textconv_one,
670 struct userdiff_driver *textconv_two,
671 struct diff_options *o)
672{
673 int lc_a, lc_b;
674 const char *name_a_tab, *name_b_tab;
675 const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO);
676 const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
677 const char *reset = diff_get_color(o->use_color, DIFF_RESET);
678 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
679 const char *a_prefix, *b_prefix;
680 char *data_one, *data_two;
681 size_t size_one, size_two;
682 struct emit_callback ecbdata;
683 const char *line_prefix = diff_line_prefix(o);
684 if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
686 a_prefix = o->b_prefix;
687 b_prefix = o->a_prefix;
688 } else {
689 a_prefix = o->a_prefix;
690 b_prefix = o->b_prefix;
691 }
692 name_a += (*name_a == '/');
694 name_b += (*name_b == '/');
695 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
696 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
697 strbuf_reset(&a_name);
699 strbuf_reset(&b_name);
700 quote_two_c_style(&a_name, a_prefix, name_a, 0);
701 quote_two_c_style(&b_name, b_prefix, name_b, 0);
702 size_one = fill_textconv(textconv_one, one, &data_one);
704 size_two = fill_textconv(textconv_two, two, &data_two);
705 memset(&ecbdata, 0, sizeof(ecbdata));
707 ecbdata.color_diff = want_color(o->use_color);
708 ecbdata.found_changesp = &o->found_changes;
709 ecbdata.ws_rule = whitespace_rule(name_b);
710 ecbdata.opt = o;
711 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
712 mmfile_t mf1, mf2;
713 mf1.ptr = (char *)data_one;
714 mf2.ptr = (char *)data_two;
715 mf1.size = size_one;
716 mf2.size = size_two;
717 check_blank_at_eof(&mf1, &mf2, &ecbdata);
718 }
719 ecbdata.lno_in_preimage = 1;
720 ecbdata.lno_in_postimage = 1;
721 lc_a = count_lines(data_one, size_one);
723 lc_b = count_lines(data_two, size_two);
724 fprintf(o->file,
725 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
726 line_prefix, metainfo, a_name.buf, name_a_tab, reset,
727 line_prefix, metainfo, b_name.buf, name_b_tab, reset,
728 line_prefix, fraginfo);
729 if (!o->irreversible_delete)
730 print_line_count(o->file, lc_a);
731 else
732 fprintf(o->file, "?,?");
733 fprintf(o->file, " +");
734 print_line_count(o->file, lc_b);
735 fprintf(o->file, " @@%s\n", reset);
736 if (lc_a && !o->irreversible_delete)
737 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
738 if (lc_b)
739 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
740 if (textconv_one)
741 free((char *)data_one);
742 if (textconv_two)
743 free((char *)data_two);
744}
745struct diff_words_buffer {
747 mmfile_t text;
748 long alloc;
749 struct diff_words_orig {
750 const char *begin, *end;
751 } *orig;
752 int orig_nr, orig_alloc;
753};
754static void diff_words_append(char *line, unsigned long len,
756 struct diff_words_buffer *buffer)
757{
758 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
759 line++;
760 len--;
761 memcpy(buffer->text.ptr + buffer->text.size, line, len);
762 buffer->text.size += len;
763 buffer->text.ptr[buffer->text.size] = '\0';
764}
765struct diff_words_style_elem {
767 const char *prefix;
768 const char *suffix;
769 const char *color; /* NULL; filled in by the setup code if
770 * color is enabled */
771};
772struct diff_words_style {
774 enum diff_words_type type;
775 struct diff_words_style_elem new, old, ctx;
776 const char *newline;
777};
778static struct diff_words_style diff_words_styles[] = {
780 { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
781 { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
782 { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
783};
784struct diff_words_data {
786 struct diff_words_buffer minus, plus;
787 const char *current_plus;
788 int last_minus;
789 struct diff_options *opt;
790 regex_t *word_regex;
791 enum diff_words_type type;
792 struct diff_words_style *style;
793};
794static int fn_out_diff_words_write_helper(FILE *fp,
796 struct diff_words_style_elem *st_el,
797 const char *newline,
798 size_t count, const char *buf,
799 const char *line_prefix)
800{
801 int print = 0;
802 while (count) {
804 char *p = memchr(buf, '\n', count);
805 if (print)
806 fputs(line_prefix, fp);
807 if (p != buf) {
808 if (st_el->color && fputs(st_el->color, fp) < 0)
809 return -1;
810 if (fputs(st_el->prefix, fp) < 0 ||
811 fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
812 fputs(st_el->suffix, fp) < 0)
813 return -1;
814 if (st_el->color && *st_el->color
815 && fputs(GIT_COLOR_RESET, fp) < 0)
816 return -1;
817 }
818 if (!p)
819 return 0;
820 if (fputs(newline, fp) < 0)
821 return -1;
822 count -= p + 1 - buf;
823 buf = p + 1;
824 print = 1;
825 }
826 return 0;
827}
828/*
830 * '--color-words' algorithm can be described as:
831 *
832 * 1. collect a the minus/plus lines of a diff hunk, divided into
833 * minus-lines and plus-lines;
834 *
835 * 2. break both minus-lines and plus-lines into words and
836 * place them into two mmfile_t with one word for each line;
837 *
838 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
839 *
840 * And for the common parts of the both file, we output the plus side text.
841 * diff_words->current_plus is used to trace the current position of the plus file
842 * which printed. diff_words->last_minus is used to trace the last minus word
843 * printed.
844 *
845 * For '--graph' to work with '--color-words', we need to output the graph prefix
846 * on each line of color words output. Generally, there are two conditions on
847 * which we should output the prefix.
848 *
849 * 1. diff_words->last_minus == 0 &&
850 * diff_words->current_plus == diff_words->plus.text.ptr
851 *
852 * that is: the plus text must start as a new line, and if there is no minus
853 * word printed, a graph prefix must be printed.
854 *
855 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
856 * *(diff_words->current_plus - 1) == '\n'
857 *
858 * that is: a graph prefix must be printed following a '\n'
859 */
860static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
861{
862 if ((diff_words->last_minus == 0 &&
863 diff_words->current_plus == diff_words->plus.text.ptr) ||
864 (diff_words->current_plus > diff_words->plus.text.ptr &&
865 *(diff_words->current_plus - 1) == '\n')) {
866 return 1;
867 } else {
868 return 0;
869 }
870}
871static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
873{
874 struct diff_words_data *diff_words = priv;
875 struct diff_words_style *style = diff_words->style;
876 int minus_first, minus_len, plus_first, plus_len;
877 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
878 struct diff_options *opt = diff_words->opt;
879 const char *line_prefix;
880 if (line[0] != '@' || parse_hunk_header(line, len,
882 &minus_first, &minus_len, &plus_first, &plus_len))
883 return;
884 assert(opt);
886 line_prefix = diff_line_prefix(opt);
887 /* POSIX requires that first be decremented by one if len == 0... */
889 if (minus_len) {
890 minus_begin = diff_words->minus.orig[minus_first].begin;
891 minus_end =
892 diff_words->minus.orig[minus_first + minus_len - 1].end;
893 } else
894 minus_begin = minus_end =
895 diff_words->minus.orig[minus_first].end;
896 if (plus_len) {
898 plus_begin = diff_words->plus.orig[plus_first].begin;
899 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
900 } else
901 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
902 if (color_words_output_graph_prefix(diff_words)) {
904 fputs(line_prefix, diff_words->opt->file);
905 }
906 if (diff_words->current_plus != plus_begin) {
907 fn_out_diff_words_write_helper(diff_words->opt->file,
908 &style->ctx, style->newline,
909 plus_begin - diff_words->current_plus,
910 diff_words->current_plus, line_prefix);
911 if (*(plus_begin - 1) == '\n')
912 fputs(line_prefix, diff_words->opt->file);
913 }
914 if (minus_begin != minus_end) {
915 fn_out_diff_words_write_helper(diff_words->opt->file,
916 &style->old, style->newline,
917 minus_end - minus_begin, minus_begin,
918 line_prefix);
919 }
920 if (plus_begin != plus_end) {
921 fn_out_diff_words_write_helper(diff_words->opt->file,
922 &style->new, style->newline,
923 plus_end - plus_begin, plus_begin,
924 line_prefix);
925 }
926 diff_words->current_plus = plus_end;
928 diff_words->last_minus = minus_first;
929}
930/* This function starts looking at *begin, and returns 0 iff a word was found. */
932static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
933 int *begin, int *end)
934{
935 if (word_regex && *begin < buffer->size) {
936 regmatch_t match[1];
937 if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) {
938 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
939 '\n', match[0].rm_eo - match[0].rm_so);
940 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
941 *begin += match[0].rm_so;
942 return *begin >= *end;
943 }
944 return -1;
945 }
946 /* find the next word */
948 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
949 (*begin)++;
950 if (*begin >= buffer->size)
951 return -1;
952 /* find the end of the word */
954 *end = *begin + 1;
955 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
956 (*end)++;
957 return 0;
959}
960/*
962 * This function splits the words in buffer->text, stores the list with
963 * newline separator into out, and saves the offsets of the original words
964 * in buffer->orig.
965 */
966static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
967 regex_t *word_regex)
968{
969 int i, j;
970 long alloc = 0;
971 out->size = 0;
973 out->ptr = NULL;
974 /* fake an empty "0th" word */
976 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
977 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
978 buffer->orig_nr = 1;
979 for (i = 0; i < buffer->text.size; i++) {
981 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
982 return;
983 /* store original boundaries */
985 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
986 buffer->orig_alloc);
987 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
988 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
989 buffer->orig_nr++;
990 /* store one word */
992 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
993 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
994 out->ptr[out->size + j - i] = '\n';
995 out->size += j - i + 1;
996 i = j - 1;
998 }
999}
1000/* this executes the word diff on the accumulated buffers */
1002static void diff_words_show(struct diff_words_data *diff_words)
1003{
1004 xpparam_t xpp;
1005 xdemitconf_t xecfg;
1006 mmfile_t minus, plus;
1007 struct diff_words_style *style = diff_words->style;
1008 struct diff_options *opt = diff_words->opt;
1010 const char *line_prefix;
1011 assert(opt);
1013 line_prefix = diff_line_prefix(opt);
1014 /* special case: only removal */
1016 if (!diff_words->plus.text.size) {
1017 fputs(line_prefix, diff_words->opt->file);
1018 fn_out_diff_words_write_helper(diff_words->opt->file,
1019 &style->old, style->newline,
1020 diff_words->minus.text.size,
1021 diff_words->minus.text.ptr, line_prefix);
1022 diff_words->minus.text.size = 0;
1023 return;
1024 }
1025 diff_words->current_plus = diff_words->plus.text.ptr;
1027 diff_words->last_minus = 0;
1028 memset(&xpp, 0, sizeof(xpp));
1030 memset(&xecfg, 0, sizeof(xecfg));
1031 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
1032 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
1033 xpp.flags = 0;
1034 /* as only the hunk header will be parsed, we need a 0-context */
1035 xecfg.ctxlen = 0;
1036 xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
1037 &xpp, &xecfg);
1038 free(minus.ptr);
1039 free(plus.ptr);
1040 if (diff_words->current_plus != diff_words->plus.text.ptr +
1041 diff_words->plus.text.size) {
1042 if (color_words_output_graph_prefix(diff_words))
1043 fputs(line_prefix, diff_words->opt->file);
1044 fn_out_diff_words_write_helper(diff_words->opt->file,
1045 &style->ctx, style->newline,
1046 diff_words->plus.text.ptr + diff_words->plus.text.size
1047 - diff_words->current_plus, diff_words->current_plus,
1048 line_prefix);
1049 }
1050 diff_words->minus.text.size = diff_words->plus.text.size = 0;
1051}
1052/* In "color-words" mode, show word-diff of words accumulated in the buffer */
1054static void diff_words_flush(struct emit_callback *ecbdata)
1055{
1056 if (ecbdata->diff_words->minus.text.size ||
1057 ecbdata->diff_words->plus.text.size)
1058 diff_words_show(ecbdata->diff_words);
1059}
1060static void diff_filespec_load_driver(struct diff_filespec *one)
1062{
1063 /* Use already-loaded driver */
1064 if (one->driver)
1065 return;
1066 if (S_ISREG(one->mode))
1068 one->driver = userdiff_find_by_path(one->path);
1069 /* Fallback to default settings */
1071 if (!one->driver)
1072 one->driver = userdiff_find_by_name("default");
1073}
1074static const char *userdiff_word_regex(struct diff_filespec *one)
1076{
1077 diff_filespec_load_driver(one);
1078 return one->driver->word_regex;
1079}
1080static void init_diff_words_data(struct emit_callback *ecbdata,
1082 struct diff_options *orig_opts,
1083 struct diff_filespec *one,
1084 struct diff_filespec *two)
1085{
1086 int i;
1087 struct diff_options *o = xmalloc(sizeof(struct diff_options));
1088 memcpy(o, orig_opts, sizeof(struct diff_options));
1089 ecbdata->diff_words =
1091 xcalloc(1, sizeof(struct diff_words_data));
1092 ecbdata->diff_words->type = o->word_diff;
1093 ecbdata->diff_words->opt = o;
1094 if (!o->word_regex)
1095 o->word_regex = userdiff_word_regex(one);
1096 if (!o->word_regex)
1097 o->word_regex = userdiff_word_regex(two);
1098 if (!o->word_regex)
1099 o->word_regex = diff_word_regex_cfg;
1100 if (o->word_regex) {
1101 ecbdata->diff_words->word_regex = (regex_t *)
1102 xmalloc(sizeof(regex_t));
1103 if (regcomp(ecbdata->diff_words->word_regex,
1104 o->word_regex,
1105 REG_EXTENDED | REG_NEWLINE))
1106 die ("Invalid regular expression: %s",
1107 o->word_regex);
1108 }
1109 for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
1110 if (o->word_diff == diff_words_styles[i].type) {
1111 ecbdata->diff_words->style =
1112 &diff_words_styles[i];
1113 break;
1114 }
1115 }
1116 if (want_color(o->use_color)) {
1117 struct diff_words_style *st = ecbdata->diff_words->style;
1118 st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
1119 st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
1120 st->ctx.color = diff_get_color_opt(o, DIFF_PLAIN);
1121 }
1122}
1123static void free_diff_words_data(struct emit_callback *ecbdata)
1125{
1126 if (ecbdata->diff_words) {
1127 diff_words_flush(ecbdata);
1128 free (ecbdata->diff_words->opt);
1129 free (ecbdata->diff_words->minus.text.ptr);
1130 free (ecbdata->diff_words->minus.orig);
1131 free (ecbdata->diff_words->plus.text.ptr);
1132 free (ecbdata->diff_words->plus.orig);
1133 if (ecbdata->diff_words->word_regex) {
1134 regfree(ecbdata->diff_words->word_regex);
1135 free(ecbdata->diff_words->word_regex);
1136 }
1137 free(ecbdata->diff_words);
1138 ecbdata->diff_words = NULL;
1139 }
1140}
1141const char *diff_get_color(int diff_use_color, enum color_diff ix)
1143{
1144 if (want_color(diff_use_color))
1145 return diff_colors[ix];
1146 return "";
1147}
1148const char *diff_line_prefix(struct diff_options *opt)
1150{
1151 struct strbuf *msgbuf;
1152 if (!opt->output_prefix)
1153 return "";
1154 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
1156 return msgbuf->buf;
1157}
1158static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
1160{
1161 const char *cp;
1162 unsigned long allot;
1163 size_t l = len;
1164 if (ecb->truncate)
1166 return ecb->truncate(line, len);
1167 cp = line;
1168 allot = l;
1169 while (0 < l) {
1170 (void) utf8_width(&cp, &l);
1171 if (!cp)
1172 break; /* truncated in the middle? */
1173 }
1174 return allot - l;
1175}
1176static void find_lno(const char *line, struct emit_callback *ecbdata)
1178{
1179 const char *p;
1180 ecbdata->lno_in_preimage = 0;
1181 ecbdata->lno_in_postimage = 0;
1182 p = strchr(line, '-');
1183 if (!p)
1184 return; /* cannot happen */
1185 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
1186 p = strchr(p, '+');
1187 if (!p)
1188 return; /* cannot happen */
1189 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
1190}
1191static void fn_out_consume(void *priv, char *line, unsigned long len)
1193{
1194 struct emit_callback *ecbdata = priv;
1195 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
1196 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
1197 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
1198 struct diff_options *o = ecbdata->opt;
1199 const char *line_prefix = diff_line_prefix(o);
1200 if (ecbdata->header) {
1202 fprintf(ecbdata->opt->file, "%s", ecbdata->header->buf);
1203 strbuf_reset(ecbdata->header);
1204 ecbdata->header = NULL;
1205 }
1206 *(ecbdata->found_changesp) = 1;
1207 if (ecbdata->label_path[0]) {
1209 const char *name_a_tab, *name_b_tab;
1210 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
1212 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
1213 fprintf(ecbdata->opt->file, "%s%s--- %s%s%s\n",
1215 line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
1216 fprintf(ecbdata->opt->file, "%s%s+++ %s%s%s\n",
1217 line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
1218 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
1219 }
1220 if (diff_suppress_blank_empty
1222 && len == 2 && line[0] == ' ' && line[1] == '\n') {
1223 line[0] = '\n';
1224 len = 1;
1225 }
1226 if (line[0] == '@') {
1228 if (ecbdata->diff_words)
1229 diff_words_flush(ecbdata);
1230 len = sane_truncate_line(ecbdata, line, len);
1231 find_lno(line, ecbdata);
1232 emit_hunk_header(ecbdata, line, len);
1233 if (line[len-1] != '\n')
1234 putc('\n', ecbdata->opt->file);
1235 return;
1236 }
1237 if (len < 1) {
1239 emit_line(ecbdata->opt, reset, reset, line, len);
1240 if (ecbdata->diff_words
1241 && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
1242 fputs("~\n", ecbdata->opt->file);
1243 return;
1244 }
1245 if (ecbdata->diff_words) {
1247 if (line[0] == '-') {
1248 diff_words_append(line, len,
1249 &ecbdata->diff_words->minus);
1250 return;
1251 } else if (line[0] == '+') {
1252 diff_words_append(line, len,
1253 &ecbdata->diff_words->plus);
1254 return;
1255 } else if (starts_with(line, "\\ ")) {
1256 /*
1257 * Eat the "no newline at eof" marker as if we
1258 * saw a "+" or "-" line with nothing on it,
1259 * and return without diff_words_flush() to
1260 * defer processing. If this is the end of
1261 * preimage, more "+" lines may come after it.
1262 */
1263 return;
1264 }
1265 diff_words_flush(ecbdata);
1266 if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
1267 emit_line(ecbdata->opt, plain, reset, line, len);
1268 fputs("~\n", ecbdata->opt->file);
1269 } else {
1270 /*
1271 * Skip the prefix character, if any. With
1272 * diff_suppress_blank_empty, there may be
1273 * none.
1274 */
1275 if (line[0] != '\n') {
1276 line++;
1277 len--;
1278 }
1279 emit_line(ecbdata->opt, plain, reset, line, len);
1280 }
1281 return;
1282 }
1283 switch (line[0]) {
1285 case '+':
1286 ecbdata->lno_in_postimage++;
1287 emit_add_line(reset, ecbdata, line + 1, len - 1);
1288 break;
1289 case '-':
1290 ecbdata->lno_in_preimage++;
1291 emit_del_line(reset, ecbdata, line + 1, len - 1);
1292 break;
1293 case ' ':
1294 ecbdata->lno_in_postimage++;
1295 ecbdata->lno_in_preimage++;
1296 emit_context_line(reset, ecbdata, line + 1, len - 1);
1297 break;
1298 default:
1299 /* incomplete line at the end */
1300 ecbdata->lno_in_preimage++;
1301 emit_line(ecbdata->opt,
1302 diff_get_color(ecbdata->color_diff, DIFF_PLAIN),
1303 reset, line, len);
1304 break;
1305 }
1306}
1307static char *pprint_rename(const char *a, const char *b)
1309{
1310 const char *old = a;
1311 const char *new = b;
1312 struct strbuf name = STRBUF_INIT;
1313 int pfx_length, sfx_length;
1314 int pfx_adjust_for_slash;
1315 int len_a = strlen(a);
1316 int len_b = strlen(b);
1317 int a_midlen, b_midlen;
1318 int qlen_a = quote_c_style(a, NULL, NULL, 0);
1319 int qlen_b = quote_c_style(b, NULL, NULL, 0);
1320 if (qlen_a || qlen_b) {
1322 quote_c_style(a, &name, NULL, 0);
1323 strbuf_addstr(&name, " => ");
1324 quote_c_style(b, &name, NULL, 0);
1325 return strbuf_detach(&name, NULL);
1326 }
1327 /* Find common prefix */
1329 pfx_length = 0;
1330 while (*old && *new && *old == *new) {
1331 if (*old == '/')
1332 pfx_length = old - a + 1;
1333 old++;
1334 new++;
1335 }
1336 /* Find common suffix */
1338 old = a + len_a;
1339 new = b + len_b;
1340 sfx_length = 0;
1341 /*
1342 * If there is a common prefix, it must end in a slash. In
1343 * that case we let this loop run 1 into the prefix to see the
1344 * same slash.
1345 *
1346 * If there is no common prefix, we cannot do this as it would
1347 * underrun the input strings.
1348 */
1349 pfx_adjust_for_slash = (pfx_length ? 1 : 0);
1350 while (a + pfx_length - pfx_adjust_for_slash <= old &&
1351 b + pfx_length - pfx_adjust_for_slash <= new &&
1352 *old == *new) {
1353 if (*old == '/')
1354 sfx_length = len_a - (old - a);
1355 old--;
1356 new--;
1357 }
1358 /*
1360 * pfx{mid-a => mid-b}sfx
1361 * {pfx-a => pfx-b}sfx
1362 * pfx{sfx-a => sfx-b}
1363 * name-a => name-b
1364 */
1365 a_midlen = len_a - pfx_length - sfx_length;
1366 b_midlen = len_b - pfx_length - sfx_length;
1367 if (a_midlen < 0)
1368 a_midlen = 0;
1369 if (b_midlen < 0)
1370 b_midlen = 0;
1371 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
1373 if (pfx_length + sfx_length) {
1374 strbuf_add(&name, a, pfx_length);
1375 strbuf_addch(&name, '{');
1376 }
1377 strbuf_add(&name, a + pfx_length, a_midlen);
1378 strbuf_addstr(&name, " => ");
1379 strbuf_add(&name, b + pfx_length, b_midlen);
1380 if (pfx_length + sfx_length) {
1381 strbuf_addch(&name, '}');
1382 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
1383 }
1384 return strbuf_detach(&name, NULL);
1385}
1386struct diffstat_t {
1388 int nr;
1389 int alloc;
1390 struct diffstat_file {
1391 char *from_name;
1392 char *name;
1393 char *print_name;
1394 unsigned is_unmerged:1;
1395 unsigned is_binary:1;
1396 unsigned is_renamed:1;
1397 unsigned is_interesting:1;
1398 uintmax_t added, deleted;
1399 } **files;
1400};
1401static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
1403 const char *name_a,
1404 const char *name_b)
1405{
1406 struct diffstat_file *x;
1407 x = xcalloc(1, sizeof(*x));
1408 ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
1409 diffstat->files[diffstat->nr++] = x;
1410 if (name_b) {
1411 x->from_name = xstrdup(name_a);
1412 x->name = xstrdup(name_b);
1413 x->is_renamed = 1;
1414 }
1415 else {
1416 x->from_name = NULL;
1417 x->name = xstrdup(name_a);
1418 }
1419 return x;
1420}
1421static void diffstat_consume(void *priv, char *line, unsigned long len)
1423{
1424 struct diffstat_t *diffstat = priv;
1425 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
1426 if (line[0] == '+')
1428 x->added++;
1429 else if (line[0] == '-')
1430 x->deleted++;
1431}
1432const char mime_boundary_leader[] = "------------";
1434static int scale_linear(int it, int width, int max_change)
1436{
1437 if (!it)
1438 return 0;
1439 /*
1440 * make sure that at least one '-' or '+' is printed if
1441 * there is any change to this path. The easiest way is to
1442 * scale linearly as if the alloted width is one column shorter
1443 * than it is, and then add 1 to the result.
1444 */
1445 return 1 + (it * (width - 1) / max_change);
1446}
1447static void show_name(FILE *file,
1449 const char *prefix, const char *name, int len)
1450{
1451 fprintf(file, " %s%-*s |", prefix, len, name);
1452}
1453static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
1455{
1456 if (cnt <= 0)
1457 return;
1458 fprintf(file, "%s", set);
1459 while (cnt--)
1460 putc(ch, file);
1461 fprintf(file, "%s", reset);
1462}
1463static void fill_print_name(struct diffstat_file *file)
1465{
1466 char *pname;
1467 if (file->print_name)
1469 return;
1470 if (!file->is_renamed) {
1472 struct strbuf buf = STRBUF_INIT;
1473 if (quote_c_style(file->name, &buf, NULL, 0)) {
1474 pname = strbuf_detach(&buf, NULL);
1475 } else {
1476 pname = file->name;
1477 strbuf_release(&buf);
1478 }
1479 } else {
1480 pname = pprint_rename(file->from_name, file->name);
1481 }
1482 file->print_name = pname;
1483}
1484int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
1486{
1487 struct strbuf sb = STRBUF_INIT;
1488 int ret;
1489 if (!files) {
1491 assert(insertions == 0 && deletions == 0);
1492 return fprintf(fp, "%s\n", " 0 files changed");
1493 }
1494 strbuf_addf(&sb,
1496 (files == 1) ? " %d file changed" : " %d files changed",
1497 files);
1498 /*
1500 * For binary diff, the caller may want to print "x files
1501 * changed" with insertions == 0 && deletions == 0.
1502 *
1503 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1504 * is probably less confusing (i.e skip over "2 files changed
1505 * but nothing about added/removed lines? Is this a bug in Git?").
1506 */
1507 if (insertions || deletions == 0) {
1508 strbuf_addf(&sb,
1509 (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
1510 insertions);
1511 }
1512 if (deletions || insertions == 0) {
1514 strbuf_addf(&sb,
1515 (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
1516 deletions);
1517 }
1518 strbuf_addch(&sb, '\n');
1519 ret = fputs(sb.buf, fp);
1520 strbuf_release(&sb);
1521 return ret;
1522}
1523static void show_stats(struct diffstat_t *data, struct diff_options *options)
1525{
1526 int i, len, add, del, adds = 0, dels = 0;
1527 uintmax_t max_change = 0, max_len = 0;
1528 int total_files = data->nr, count;
1529 int width, name_width, graph_width, number_width = 0, bin_width = 0;
1530 const char *reset, *add_c, *del_c;
1531 const char *line_prefix = "";
1532 int extra_shown = 0;
1533 if (data->nr == 0)
1535 return;
1536 line_prefix = diff_line_prefix(options);
1538 count = options->stat_count ? options->stat_count : data->nr;
1539 reset = diff_get_color_opt(options, DIFF_RESET);
1541 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1542 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1543 /*
1545 * Find the longest filename and max number of changes
1546 */
1547 for (i = 0; (i < count) && (i < data->nr); i++) {
1548 struct diffstat_file *file = data->files[i];
1549 uintmax_t change = file->added + file->deleted;
1550 if (!file->is_interesting && (change == 0)) {
1552 count++; /* not shown == room for one more */
1553 continue;
1554 }
1555 fill_print_name(file);
1556 len = strlen(file->print_name);
1557 if (max_len < len)
1558 max_len = len;
1559 if (file->is_unmerged) {
1561 /* "Unmerged" is 8 characters */
1562 bin_width = bin_width < 8 ? 8 : bin_width;
1563 continue;
1564 }
1565 if (file->is_binary) {
1566 /* "Bin XXX -> YYY bytes" */
1567 int w = 14 + decimal_width(file->added)
1568 + decimal_width(file->deleted);
1569 bin_width = bin_width < w ? w : bin_width;
1570 /* Display change counts aligned with "Bin" */
1571 number_width = 3;
1572 continue;
1573 }
1574 if (max_change < change)
1576 max_change = change;
1577 }
1578 count = i; /* where we can stop scanning in data->files[] */
1579 /*
1581 * We have width = stat_width or term_columns() columns total.
1582 * We want a maximum of min(max_len, stat_name_width) for the name part.
1583 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1584 * We also need 1 for " " and 4 + decimal_width(max_change)
1585 * for " | NNNN " and one the empty column at the end, altogether
1586 * 6 + decimal_width(max_change).
1587 *
1588 * If there's not enough space, we will use the smaller of
1589 * stat_name_width (if set) and 5/8*width for the filename,
1590 * and the rest for constant elements + graph part, but no more
1591 * than stat_graph_width for the graph part.
1592 * (5/8 gives 50 for filename and 30 for the constant parts + graph
1593 * for the standard terminal size).
1594 *
1595 * In other words: stat_width limits the maximum width, and
1596 * stat_name_width fixes the maximum width of the filename,
1597 * and is also used to divide available columns if there
1598 * aren't enough.
1599 *
1600 * Binary files are displayed with "Bin XXX -> YYY bytes"
1601 * instead of the change count and graph. This part is treated
1602 * similarly to the graph part, except that it is not
1603 * "scaled". If total width is too small to accommodate the
1604 * guaranteed minimum width of the filename part and the
1605 * separators and this message, this message will "overflow"
1606 * making the line longer than the maximum width.
1607 */
1608 if (options->stat_width == -1)
1610 width = term_columns() - options->output_prefix_length;
1611 else
1612 width = options->stat_width ? options->stat_width : 80;
1613 number_width = decimal_width(max_change) > number_width ?
1614 decimal_width(max_change) : number_width;
1615 if (options->stat_graph_width == -1)
1617 options->stat_graph_width = diff_stat_graph_width;
1618 /*
1620 * Guarantee 3/8*16==6 for the graph part
1621 * and 5/8*16==10 for the filename part
1622 */
1623 if (width < 16 + 6 + number_width)
1624 width = 16 + 6 + number_width;
1625 /*
1627 * First assign sizes that are wanted, ignoring available width.
1628 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1629 * starting from "XXX" should fit in graph_width.
1630 */
1631 graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
1632 if (options->stat_graph_width &&
1633 options->stat_graph_width < graph_width)
1634 graph_width = options->stat_graph_width;
1635 name_width = (options->stat_name_width > 0 &&
1637 options->stat_name_width < max_len) ?
1638 options->stat_name_width : max_len;
1639 /*
1641 * Adjust adjustable widths not to exceed maximum width
1642 */
1643 if (name_width + number_width + 6 + graph_width > width) {
1644 if (graph_width > width * 3/8 - number_width - 6) {
1645 graph_width = width * 3/8 - number_width - 6;
1646 if (graph_width < 6)
1647 graph_width = 6;
1648 }
1649 if (options->stat_graph_width &&
1651 graph_width > options->stat_graph_width)
1652 graph_width = options->stat_graph_width;
1653 if (name_width > width - number_width - 6 - graph_width)
1654 name_width = width - number_width - 6 - graph_width;
1655 else
1656 graph_width = width - number_width - 6 - name_width;
1657 }
1658 /*
1660 * From here name_width is the width of the name area,
1661 * and graph_width is the width of the graph area.
1662 * max_change is used to scale graph properly.
1663 */
1664 for (i = 0; i < count; i++) {
1665 const char *prefix = "";
1666 struct diffstat_file *file = data->files[i];
1667 char *name = file->print_name;
1668 uintmax_t added = file->added;
1669 uintmax_t deleted = file->deleted;
1670 int name_len;
1671 if (!file->is_interesting && (added + deleted == 0))
1673 continue;
1674 /*
1676 * "scale" the filename
1677 */
1678 len = name_width;
1679 name_len = strlen(name);
1680 if (name_width < name_len) {
1681 char *slash;
1682 prefix = "...";
1683 len -= 3;
1684 name += name_len - len;
1685 slash = strchr(name, '/');
1686 if (slash)
1687 name = slash;
1688 }
1689 if (file->is_binary) {
1691 fprintf(options->file, "%s", line_prefix);
1692 show_name(options->file, prefix, name, len);
1693 fprintf(options->file, " %*s", number_width, "Bin");
1694 if (!added && !deleted) {
1695 putc('\n', options->file);
1696 continue;
1697 }
1698 fprintf(options->file, " %s%"PRIuMAX"%s",
1699 del_c, deleted, reset);
1700 fprintf(options->file, " -> ");
1701 fprintf(options->file, "%s%"PRIuMAX"%s",
1702 add_c, added, reset);
1703 fprintf(options->file, " bytes");
1704 fprintf(options->file, "\n");
1705 continue;
1706 }
1707 else if (file->is_unmerged) {
1708 fprintf(options->file, "%s", line_prefix);
1709 show_name(options->file, prefix, name, len);
1710 fprintf(options->file, " Unmerged\n");
1711 continue;
1712 }
1713 /*
1715 * scale the add/delete
1716 */
1717 add = added;
1718 del = deleted;
1719 if (graph_width <= max_change) {
1721 int total = scale_linear(add + del, graph_width, max_change);
1722 if (total < 2 && add && del)
1723 /* width >= 2 due to the sanity check */
1724 total = 2;
1725 if (add < del) {
1726 add = scale_linear(add, graph_width, max_change);
1727 del = total - add;
1728 } else {
1729 del = scale_linear(del, graph_width, max_change);
1730 add = total - del;
1731 }
1732 }
1733 fprintf(options->file, "%s", line_prefix);
1734 show_name(options->file, prefix, name, len);
1735 fprintf(options->file, " %*"PRIuMAX"%s",
1736 number_width, added + deleted,
1737 added + deleted ? " " : "");
1738 show_graph(options->file, '+', add, add_c, reset);
1739 show_graph(options->file, '-', del, del_c, reset);
1740 fprintf(options->file, "\n");
1741 }
1742 for (i = 0; i < data->nr; i++) {
1744 struct diffstat_file *file = data->files[i];
1745 uintmax_t added = file->added;
1746 uintmax_t deleted = file->deleted;
1747 if (file->is_unmerged ||
1749 (!file->is_interesting && (added + deleted == 0))) {
1750 total_files--;
1751 continue;
1752 }
1753 if (!file->is_binary) {
1755 adds += added;
1756 dels += deleted;
1757 }
1758 if (i < count)
1759 continue;
1760 if (!extra_shown)
1761 fprintf(options->file, "%s ...\n", line_prefix);
1762 extra_shown = 1;
1763 }
1764 fprintf(options->file, "%s", line_prefix);
1765 print_stat_summary(options->file, total_files, adds, dels);
1766}
1767static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1769{
1770 int i, adds = 0, dels = 0, total_files = data->nr;
1771 if (data->nr == 0)
1773 return;
1774 for (i = 0; i < data->nr; i++) {
1776 int added = data->files[i]->added;
1777 int deleted= data->files[i]->deleted;
1778 if (data->files[i]->is_unmerged ||
1780 (!data->files[i]->is_interesting && (added + deleted == 0))) {
1781 total_files--;
1782 } else if (!data->files[i]->is_binary) { /* don't count bytes */
1783 adds += added;
1784 dels += deleted;
1785 }
1786 }
1787 fprintf(options->file, "%s", diff_line_prefix(options));
1788 print_stat_summary(options->file, total_files, adds, dels);
1789}
1790static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1792{
1793 int i;
1794 if (data->nr == 0)
1796 return;
1797 for (i = 0; i < data->nr; i++) {
1799 struct diffstat_file *file = data->files[i];
1800 fprintf(options->file, "%s", diff_line_prefix(options));
1802 if (file->is_binary)
1804 fprintf(options->file, "-\t-\t");
1805 else
1806 fprintf(options->file,
1807 "%"PRIuMAX"\t%"PRIuMAX"\t",
1808 file->added, file->deleted);
1809 if (options->line_termination) {
1810 fill_print_name(file);
1811 if (!file->is_renamed)
1812 write_name_quoted(file->name, options->file,
1813 options->line_termination);
1814 else {
1815 fputs(file->print_name, options->file);
1816 putc(options->line_termination, options->file);
1817 }
1818 } else {
1819 if (file->is_renamed) {
1820 putc('\0', options->file);
1821 write_name_quoted(file->from_name, options->file, '\0');
1822 }
1823 write_name_quoted(file->name, options->file, '\0');
1824 }
1825 }
1826}
1827struct dirstat_file {
1829 const char *name;
1830 unsigned long changed;
1831};
1832struct dirstat_dir {
1834 struct dirstat_file *files;
1835 int alloc, nr, permille, cumulative;
1836};
1837static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
1839 unsigned long changed, const char *base, int baselen)
1840{
1841 unsigned long this_dir = 0;
1842 unsigned int sources = 0;
1843 const char *line_prefix = diff_line_prefix(opt);
1844 while (dir->nr) {
1846 struct dirstat_file *f = dir->files;
1847 int namelen = strlen(f->name);
1848 unsigned long this;
1849 char *slash;
1850 if (namelen < baselen)
1852 break;
1853 if (memcmp(f->name, base, baselen))
1854 break;
1855 slash = strchr(f->name + baselen, '/');
1856 if (slash) {
1857 int newbaselen = slash + 1 - f->name;
1858 this = gather_dirstat(opt, dir, changed, f->name, newbaselen);
1859 sources++;
1860 } else {
1861 this = f->changed;
1862 dir->files++;
1863 dir->nr--;
1864 sources += 2;
1865 }
1866 this_dir += this;
1867 }
1868 /*
1870 * We don't report dirstat's for
1871 * - the top level
1872 * - or cases where everything came from a single directory
1873 * under this directory (sources == 1).
1874 */
1875 if (baselen && sources != 1) {
1876 if (this_dir) {
1877 int permille = this_dir * 1000 / changed;
1878 if (permille >= dir->permille) {
1879 fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
1880 permille / 10, permille % 10, baselen, base);
1881 if (!dir->cumulative)
1882 return 0;
1883 }
1884 }
1885 }
1886 return this_dir;
1887}
1888static int dirstat_compare(const void *_a, const void *_b)
1890{
1891 const struct dirstat_file *a = _a;
1892 const struct dirstat_file *b = _b;
1893 return strcmp(a->name, b->name);
1894}
1895static void show_dirstat(struct diff_options *options)
1897{
1898 int i;
1899 unsigned long changed;
1900 struct dirstat_dir dir;
1901 struct diff_queue_struct *q = &diff_queued_diff;
1902 dir.files = NULL;
1904 dir.alloc = 0;
1905 dir.nr = 0;
1906 dir.permille = options->dirstat_permille;
1907 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1908 changed = 0;
1910 for (i = 0; i < q->nr; i++) {
1911 struct diff_filepair *p = q->queue[i];
1912 const char *name;
1913 unsigned long copied, added, damage;
1914 int content_changed;
1915 name = p->two->path ? p->two->path : p->one->path;
1917 if (p->one->sha1_valid && p->two->sha1_valid)
1919 content_changed = hashcmp(p->one->sha1, p->two->sha1);
1920 else
1921 content_changed = 1;
1922 if (!content_changed) {
1924 /*
1925 * The SHA1 has not changed, so pre-/post-content is
1926 * identical. We can therefore skip looking at the
1927 * file contents altogether.
1928 */
1929 damage = 0;
1930 goto found_damage;
1931 }
1932 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) {
1934 /*
1935 * In --dirstat-by-file mode, we don't really need to
1936 * look at the actual file contents at all.
1937 * The fact that the SHA1 changed is enough for us to
1938 * add this file to the list of results
1939 * (with each file contributing equal damage).
1940 */
1941 damage = 1;
1942 goto found_damage;
1943 }
1944 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1946 diff_populate_filespec(p->one, 0);
1947 diff_populate_filespec(p->two, 0);
1948 diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1949 &copied, &added);
1950 diff_free_filespec_data(p->one);
1951 diff_free_filespec_data(p->two);
1952 } else if (DIFF_FILE_VALID(p->one)) {
1953 diff_populate_filespec(p->one, CHECK_SIZE_ONLY);
1954 copied = added = 0;
1955 diff_free_filespec_data(p->one);
1956 } else if (DIFF_FILE_VALID(p->two)) {
1957 diff_populate_filespec(p->two, CHECK_SIZE_ONLY);
1958 copied = 0;
1959 added = p->two->size;
1960 diff_free_filespec_data(p->two);
1961 } else
1962 continue;
1963 /*
1965 * Original minus copied is the removed material,
1966 * added is the new material. They are both damages
1967 * made to the preimage.
1968 * If the resulting damage is zero, we know that
1969 * diffcore_count_changes() considers the two entries to
1970 * be identical, but since content_changed is true, we
1971 * know that there must have been _some_ kind of change,
1972 * so we force all entries to have damage > 0.
1973 */
1974 damage = (p->one->size - copied) + added;
1975 if (!damage)
1976 damage = 1;
1977found_damage:
1979 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1980 dir.files[dir.nr].name = name;
1981 dir.files[dir.nr].changed = damage;
1982 changed += damage;
1983 dir.nr++;
1984 }
1985 /* This can happen even with many files, if everything was renames */
1987 if (!changed)
1988 return;
1989 /* Show all directories with more than x% of the changes */
1991 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1992 gather_dirstat(options, &dir, changed, "", 0);
1993}
1994static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
1996{
1997 int i;
1998 unsigned long changed;
1999 struct dirstat_dir dir;
2000 if (data->nr == 0)
2002 return;
2003 dir.files = NULL;
2005 dir.alloc = 0;
2006 dir.nr = 0;
2007 dir.permille = options->dirstat_permille;
2008 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
2009 changed = 0;
2011 for (i = 0; i < data->nr; i++) {
2012 struct diffstat_file *file = data->files[i];
2013 unsigned long damage = file->added + file->deleted;
2014 if (file->is_binary)
2015 /*
2016 * binary files counts bytes, not lines. Must find some
2017 * way to normalize binary bytes vs. textual lines.
2018 * The following heuristic assumes that there are 64
2019 * bytes per "line".
2020 * This is stupid and ugly, but very cheap...
2021 */
2022 damage = (damage + 63) / 64;
2023 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
2024 dir.files[dir.nr].name = file->name;
2025 dir.files[dir.nr].changed = damage;
2026 changed += damage;
2027 dir.nr++;
2028 }
2029 /* This can happen even with many files, if everything was renames */
2031 if (!changed)
2032 return;
2033 /* Show all directories with more than x% of the changes */
2035 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
2036 gather_dirstat(options, &dir, changed, "", 0);
2037}
2038static void free_diffstat_info(struct diffstat_t *diffstat)
2040{
2041 int i;
2042 for (i = 0; i < diffstat->nr; i++) {
2043 struct diffstat_file *f = diffstat->files[i];
2044 if (f->name != f->print_name)
2045 free(f->print_name);
2046 free(f->name);
2047 free(f->from_name);
2048 free(f);
2049 }
2050 free(diffstat->files);
2051}
2052struct checkdiff_t {
2054 const char *filename;
2055 int lineno;
2056 int conflict_marker_size;
2057 struct diff_options *o;
2058 unsigned ws_rule;
2059 unsigned status;
2060};
2061static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
2063{
2064 char firstchar;
2065 int cnt;
2066 if (len < marker_size + 1)
2068 return 0;
2069 firstchar = line[0];
2070 switch (firstchar) {
2071 case '=': case '>': case '<': case '|':
2072 break;
2073 default:
2074 return 0;
2075 }
2076 for (cnt = 1; cnt < marker_size; cnt++)
2077 if (line[cnt] != firstchar)
2078 return 0;
2079 /* line[1] thru line[marker_size-1] are same as firstchar */
2080 if (len < marker_size + 1 || !isspace(line[marker_size]))
2081 return 0;
2082 return 1;
2083}
2084static void checkdiff_consume(void *priv, char *line, unsigned long len)
2086{
2087 struct checkdiff_t *data = priv;
2088 int marker_size = data->conflict_marker_size;
2089 const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
2090 const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
2091 const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
2092 char *err;
2093 const char *line_prefix;
2094 assert(data->o);
2096 line_prefix = diff_line_prefix(data->o);
2097 if (line[0] == '+') {
2099 unsigned bad;
2100 data->lineno++;
2101 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
2102 data->status |= 1;
2103 fprintf(data->o->file,
2104 "%s%s:%d: leftover conflict marker\n",
2105 line_prefix, data->filename, data->lineno);
2106 }
2107 bad = ws_check(line + 1, len - 1, data->ws_rule);
2108 if (!bad)
2109 return;
2110 data->status |= bad;
2111 err = whitespace_error_string(bad);
2112 fprintf(data->o->file, "%s%s:%d: %s.\n",
2113 line_prefix, data->filename, data->lineno, err);
2114 free(err);
2115 emit_line(data->o, set, reset, line, 1);
2116 ws_check_emit(line + 1, len - 1, data->ws_rule,
2117 data->o->file, set, reset, ws);
2118 } else if (line[0] == ' ') {
2119 data->lineno++;
2120 } else if (line[0] == '@') {
2121 char *plus = strchr(line, '+');
2122 if (plus)
2123 data->lineno = strtol(plus, NULL, 10) - 1;
2124 else
2125 die("invalid diff");
2126 }
2127}
2128static unsigned char *deflate_it(char *data,
2130 unsigned long size,
2131 unsigned long *result_size)
2132{
2133 int bound;
2134 unsigned char *deflated;
2135 git_zstream stream;
2136 memset(&stream, 0, sizeof(stream));
2138 git_deflate_init(&stream, zlib_compression_level);
2139 bound = git_deflate_bound(&stream, size);
2140 deflated = xmalloc(bound);
2141 stream.next_out = deflated;
2142 stream.avail_out = bound;
2143 stream.next_in = (unsigned char *)data;
2145 stream.avail_in = size;
2146 while (git_deflate(&stream, Z_FINISH) == Z_OK)
2147 ; /* nothing */
2148 git_deflate_end(&stream);
2149 *result_size = stream.total_out;
2150 return deflated;
2151}
2152static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
2154 const char *prefix)
2155{
2156 void *cp;
2157 void *delta;
2158 void *deflated;
2159 void *data;
2160 unsigned long orig_size;
2161 unsigned long delta_size;
2162 unsigned long deflate_size;
2163 unsigned long data_size;
2164 /* We could do deflated delta, or we could do just deflated two,
2166 * whichever is smaller.
2167 */
2168 delta = NULL;
2169 deflated = deflate_it(two->ptr, two->size, &deflate_size);
2170 if (one->size && two->size) {
2171 delta = diff_delta(one->ptr, one->size,
2172 two->ptr, two->size,
2173 &delta_size, deflate_size);
2174 if (delta) {
2175 void *to_free = delta;
2176 orig_size = delta_size;
2177 delta = deflate_it(delta, delta_size, &delta_size);
2178 free(to_free);
2179 }
2180 }
2181 if (delta && delta_size < deflate_size) {
2183 fprintf(file, "%sdelta %lu\n", prefix, orig_size);
2184 free(deflated);
2185 data = delta;
2186 data_size = delta_size;
2187 }
2188 else {
2189 fprintf(file, "%sliteral %lu\n", prefix, two->size);
2190 free(delta);
2191 data = deflated;
2192 data_size = deflate_size;
2193 }
2194 /* emit data encoded in base85 */
2196 cp = data;
2197 while (data_size) {
2198 int bytes = (52 < data_size) ? 52 : data_size;
2199 char line[70];
2200 data_size -= bytes;
2201 if (bytes <= 26)
2202 line[0] = bytes + 'A' - 1;
2203 else
2204 line[0] = bytes - 26 + 'a' - 1;
2205 encode_85(line + 1, cp, bytes);
2206 cp = (char *) cp + bytes;
2207 fprintf(file, "%s", prefix);
2208 fputs(line, file);
2209 fputc('\n', file);
2210 }
2211 fprintf(file, "%s\n", prefix);
2212 free(data);
2213}
2214static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two,
2216 const char *prefix)
2217{
2218 fprintf(file, "%sGIT binary patch\n", prefix);
2219 emit_binary_diff_body(file, one, two, prefix);
2220 emit_binary_diff_body(file, two, one, prefix);
2221}
2222int diff_filespec_is_binary(struct diff_filespec *one)
2224{
2225 if (one->is_binary == -1) {
2226 diff_filespec_load_driver(one);
2227 if (one->driver->binary != -1)
2228 one->is_binary = one->driver->binary;
2229 else {
2230 if (!one->data && DIFF_FILE_VALID(one))
2231 diff_populate_filespec(one, CHECK_BINARY);
2232 if (one->is_binary == -1 && one->data)
2233 one->is_binary = buffer_is_binary(one->data,
2234 one->size);
2235 if (one->is_binary == -1)
2236 one->is_binary = 0;
2237 }
2238 }
2239 return one->is_binary;
2240}
2241static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
2243{
2244 diff_filespec_load_driver(one);
2245 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
2246}
2247void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
2249{
2250 if (!options->a_prefix)
2251 options->a_prefix = a;
2252 if (!options->b_prefix)
2253 options->b_prefix = b;
2254}
2255struct userdiff_driver *get_textconv(struct diff_filespec *one)
2257{
2258 if (!DIFF_FILE_VALID(one))
2259 return NULL;
2260 diff_filespec_load_driver(one);
2262 return userdiff_get_textconv(one->driver);
2263}
2264static void builtin_diff(const char *name_a,
2266 const char *name_b,
2267 struct diff_filespec *one,
2268 struct diff_filespec *two,
2269 const char *xfrm_msg,
2270 int must_show_header,
2271 struct diff_options *o,
2272 int complete_rewrite)
2273{
2274 mmfile_t mf1, mf2;
2275 const char *lbl[2];
2276 char *a_one, *b_two;
2277 const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
2278 const char *reset = diff_get_color_opt(o, DIFF_RESET);
2279 const char *a_prefix, *b_prefix;
2280 struct userdiff_driver *textconv_one = NULL;
2281 struct userdiff_driver *textconv_two = NULL;
2282 struct strbuf header = STRBUF_INIT;
2283 const char *line_prefix = diff_line_prefix(o);
2284 if (DIFF_OPT_TST(o, SUBMODULE_LOG) &&
2286 (!one->mode || S_ISGITLINK(one->mode)) &&
2287 (!two->mode || S_ISGITLINK(two->mode))) {
2288 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
2289 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2290 show_submodule_summary(o->file, one->path ? one->path : two->path,
2291 line_prefix,
2292 one->sha1, two->sha1, two->dirty_submodule,
2293 meta, del, add, reset);
2294 return;
2295 }
2296 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
2298 textconv_one = get_textconv(one);
2299 textconv_two = get_textconv(two);
2300 }
2301 diff_set_mnemonic_prefix(o, "a/", "b/");
2303 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
2304 a_prefix = o->b_prefix;
2305 b_prefix = o->a_prefix;
2306 } else {
2307 a_prefix = o->a_prefix;
2308 b_prefix = o->b_prefix;
2309 }
2310 /* Never use a non-valid filename anywhere if at all possible */
2312 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
2313 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
2314 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
2316 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
2317 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
2318 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
2319 strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
2320 if (lbl[0][0] == '/') {
2321 /* /dev/null */
2322 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
2323 if (xfrm_msg)
2324 strbuf_addstr(&header, xfrm_msg);
2325 must_show_header = 1;
2326 }
2327 else if (lbl[1][0] == '/') {
2328 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
2329 if (xfrm_msg)
2330 strbuf_addstr(&header, xfrm_msg);
2331 must_show_header = 1;
2332 }
2333 else {
2334 if (one->mode != two->mode) {
2335 strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
2336 strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
2337 must_show_header = 1;
2338 }
2339 if (xfrm_msg)
2340 strbuf_addstr(&header, xfrm_msg);
2341 /*
2343 * we do not run diff between different kind
2344 * of objects.
2345 */
2346 if ((one->mode ^ two->mode) & S_IFMT)
2347 goto free_ab_and_return;
2348 if (complete_rewrite &&
2349 (textconv_one || !diff_filespec_is_binary(one)) &&
2350 (textconv_two || !diff_filespec_is_binary(two))) {
2351 fprintf(o->file, "%s", header.buf);
2352 strbuf_reset(&header);
2353 emit_rewrite_diff(name_a, name_b, one, two,
2354 textconv_one, textconv_two, o);
2355 o->found_changes = 1;
2356 goto free_ab_and_return;
2357 }
2358 }
2359 if (o->irreversible_delete && lbl[1][0] == '/') {
2361 fprintf(o->file, "%s", header.buf);
2362 strbuf_reset(&header);
2363 goto free_ab_and_return;
2364 } else if (!DIFF_OPT_TST(o, TEXT) &&
2365 ( (!textconv_one && diff_filespec_is_binary(one)) ||
2366 (!textconv_two && diff_filespec_is_binary(two)) )) {
2367 if (!one->data && !two->data &&
2368 S_ISREG(one->mode) && S_ISREG(two->mode) &&
2369 !DIFF_OPT_TST(o, BINARY)) {
2370 if (!hashcmp(one->sha1, two->sha1)) {
2371 if (must_show_header)
2372 fprintf(o->file, "%s", header.buf);
2373 goto free_ab_and_return;
2374 }
2375 fprintf(o->file, "%s", header.buf);
2376 fprintf(o->file, "%sBinary files %s and %s differ\n",
2377 line_prefix, lbl[0], lbl[1]);
2378 goto free_ab_and_return;
2379 }
2380 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2381 die("unable to read files to diff");
2382 /* Quite common confusing case */
2383 if (mf1.size == mf2.size &&
2384 !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
2385 if (must_show_header)
2386 fprintf(o->file, "%s", header.buf);
2387 goto free_ab_and_return;
2388 }
2389 fprintf(o->file, "%s", header.buf);
2390 strbuf_reset(&header);
2391 if (DIFF_OPT_TST(o, BINARY))
2392 emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
2393 else
2394 fprintf(o->file, "%sBinary files %s and %s differ\n",
2395 line_prefix, lbl[0], lbl[1]);
2396 o->found_changes = 1;
2397 } else {
2398 /* Crazy xdl interfaces.. */
2399 const char *diffopts = getenv("GIT_DIFF_OPTS");
2400 const char *v;
2401 xpparam_t xpp;
2402 xdemitconf_t xecfg;
2403 struct emit_callback ecbdata;
2404 const struct userdiff_funcname *pe;
2405 if (must_show_header) {
2407 fprintf(o->file, "%s", header.buf);
2408 strbuf_reset(&header);
2409 }
2410 mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
2412 mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
2413 pe = diff_funcname_pattern(one);
2415 if (!pe)
2416 pe = diff_funcname_pattern(two);
2417 memset(&xpp, 0, sizeof(xpp));
2419 memset(&xecfg, 0, sizeof(xecfg));
2420 memset(&ecbdata, 0, sizeof(ecbdata));
2421 ecbdata.label_path = lbl;
2422 ecbdata.color_diff = want_color(o->use_color);
2423 ecbdata.found_changesp = &o->found_changes;
2424 ecbdata.ws_rule = whitespace_rule(name_b);
2425 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
2426 check_blank_at_eof(&mf1, &mf2, &ecbdata);
2427 ecbdata.opt = o;
2428 ecbdata.header = header.len ? &header : NULL;
2429 xpp.flags = o->xdl_opts;
2430 xecfg.ctxlen = o->context;
2431 xecfg.interhunkctxlen = o->interhunkcontext;
2432 xecfg.flags = XDL_EMIT_FUNCNAMES;
2433 if (DIFF_OPT_TST(o, FUNCCONTEXT))
2434 xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
2435 if (pe)
2436 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
2437 if (!diffopts)
2438 ;
2439 else if (skip_prefix(diffopts, "--unified=", &v))
2440 xecfg.ctxlen = strtoul(v, NULL, 10);
2441 else if (skip_prefix(diffopts, "-u", &v))
2442 xecfg.ctxlen = strtoul(v, NULL, 10);
2443 if (o->word_diff)
2444 init_diff_words_data(&ecbdata, o, one, two);
2445 xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
2446 &xpp, &xecfg);
2447 if (o->word_diff)
2448 free_diff_words_data(&ecbdata);
2449 if (textconv_one)
2450 free(mf1.ptr);
2451 if (textconv_two)
2452 free(mf2.ptr);
2453 xdiff_clear_find_func(&xecfg);
2454 }
2455 free_ab_and_return:
2457 strbuf_release(&header);
2458 diff_free_filespec_data(one);
2459 diff_free_filespec_data(two);
2460 free(a_one);
2461 free(b_two);
2462 return;
2463}
2464static void builtin_diffstat(const char *name_a, const char *name_b,
2466 struct diff_filespec *one,
2467 struct diff_filespec *two,
2468 struct diffstat_t *diffstat,
2469 struct diff_options *o,
2470 struct diff_filepair *p)
2471{
2472 mmfile_t mf1, mf2;
2473 struct diffstat_file *data;
2474 int same_contents;
2475 int complete_rewrite = 0;
2476 if (!DIFF_PAIR_UNMERGED(p)) {
2478 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2479 complete_rewrite = 1;
2480 }
2481 data = diffstat_add(diffstat, name_a, name_b);
2483 data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;
2484 if (!one || !two) {
2486 data->is_unmerged = 1;
2487 return;
2488 }
2489 same_contents = !hashcmp(one->sha1, two->sha1);
2491 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
2493 data->is_binary = 1;
2494 if (same_contents) {
2495 data->added = 0;
2496 data->deleted = 0;
2497 } else {
2498 data->added = diff_filespec_size(two);
2499 data->deleted = diff_filespec_size(one);
2500 }
2501 }
2502 else if (complete_rewrite) {
2504 diff_populate_filespec(one, 0);
2505 diff_populate_filespec(two, 0);
2506 data->deleted = count_lines(one->data, one->size);
2507 data->added = count_lines(two->data, two->size);
2508 }
2509 else if (!same_contents) {
2511 /* Crazy xdl interfaces.. */
2512 xpparam_t xpp;
2513 xdemitconf_t xecfg;
2514 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2516 die("unable to read files to diff");
2517 memset(&xpp, 0, sizeof(xpp));
2519 memset(&xecfg, 0, sizeof(xecfg));
2520 xpp.flags = o->xdl_opts;
2521 xecfg.ctxlen = o->context;
2522 xecfg.interhunkctxlen = o->interhunkcontext;
2523 xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
2524 &xpp, &xecfg);
2525 }
2526 diff_free_filespec_data(one);
2528 diff_free_filespec_data(two);
2529}
2530static void builtin_checkdiff(const char *name_a, const char *name_b,
2532 const char *attr_path,
2533 struct diff_filespec *one,
2534 struct diff_filespec *two,
2535 struct diff_options *o)
2536{
2537 mmfile_t mf1, mf2;
2538 struct checkdiff_t data;
2539 if (!two)
2541 return;
2542 memset(&data, 0, sizeof(data));
2544 data.filename = name_b ? name_b : name_a;
2545 data.lineno = 0;
2546 data.o = o;
2547 data.ws_rule = whitespace_rule(attr_path);
2548 data.conflict_marker_size = ll_merge_marker_size(attr_path);
2549 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2551 die("unable to read files to diff");
2552 /*
2554 * All the other codepaths check both sides, but not checking
2555 * the "old" side here is deliberate. We are checking the newly
2556 * introduced changes, and as long as the "new" side is text, we
2557 * can and should check what it introduces.
2558 */
2559 if (diff_filespec_is_binary(two))
2560 goto free_and_return;
2561 else {
2562 /* Crazy xdl interfaces.. */
2563 xpparam_t xpp;
2564 xdemitconf_t xecfg;
2565 memset(&xpp, 0, sizeof(xpp));
2567 memset(&xecfg, 0, sizeof(xecfg));
2568 xecfg.ctxlen = 1; /* at least one context line */
2569 xpp.flags = 0;
2570 xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
2571 &xpp, &xecfg);
2572 if (data.ws_rule & WS_BLANK_AT_EOF) {
2574 struct emit_callback ecbdata;
2575 int blank_at_eof;
2576 ecbdata.ws_rule = data.ws_rule;
2578 check_blank_at_eof(&mf1, &mf2, &ecbdata);
2579 blank_at_eof = ecbdata.blank_at_eof_in_postimage;
2580 if (blank_at_eof) {
2582 static char *err;
2583 if (!err)
2584 err = whitespace_error_string(WS_BLANK_AT_EOF);
2585 fprintf(o->file, "%s:%d: %s.\n",
2586 data.filename, blank_at_eof, err);
2587 data.status = 1; /* report errors */
2588 }
2589 }
2590 }
2591 free_and_return:
2592 diff_free_filespec_data(one);
2593 diff_free_filespec_data(two);
2594 if (data.status)
2595 DIFF_OPT_SET(o, CHECK_FAILED);
2596}
2597struct diff_filespec *alloc_filespec(const char *path)
2599{
2600 int namelen = strlen(path);
2601 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
2602 memset(spec, 0, sizeof(*spec));
2604 spec->path = (char *)(spec + 1);
2605 memcpy(spec->path, path, namelen+1);
2606 spec->count = 1;
2607 spec->is_binary = -1;
2608 return spec;
2609}
2610void free_filespec(struct diff_filespec *spec)
2612{
2613 if (!--spec->count) {
2614 diff_free_filespec_data(spec);
2615 free(spec);
2616 }
2617}
2618void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
2620 int sha1_valid, unsigned short mode)
2621{
2622 if (mode) {
2623 spec->mode = canon_mode(mode);
2624 hashcpy(spec->sha1, sha1);
2625 spec->sha1_valid = sha1_valid;
2626 }
2627}
2628/*
2630 * Given a name and sha1 pair, if the index tells us the file in
2631 * the work tree has that object contents, return true, so that
2632 * prepare_temp_file() does not have to inflate and extract.
2633 */
2634static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
2635{
2636 const struct cache_entry *ce;
2637 struct stat st;
2638 int pos, len;
2639 /*
2641 * We do not read the cache ourselves here, because the
2642 * benchmark with my previous version that always reads cache
2643 * shows that it makes things worse for diff-tree comparing
2644 * two linux-2.6 kernel trees in an already checked out work
2645 * tree. This is because most diff-tree comparisons deal with
2646 * only a small number of files, while reading the cache is
2647 * expensive for a large project, and its cost outweighs the
2648 * savings we get by not inflating the object to a temporary
2649 * file. Practically, this code only helps when we are used
2650 * by diff-cache --cached, which does read the cache before
2651 * calling us.
2652 */
2653 if (!active_cache)
2654 return 0;
2655 /* We want to avoid the working directory if our caller
2657 * doesn't need the data in a normal file, this system
2658 * is rather slow with its stat/open/mmap/close syscalls,
2659 * and the object is contained in a pack file. The pack
2660 * is probably already open and will be faster to obtain
2661 * the data through than the working directory. Loose
2662 * objects however would tend to be slower as they need
2663 * to be individually opened and inflated.
2664 */
2665 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
2666 return 0;
2667 len = strlen(name);
2669 pos = cache_name_pos(name, len);
2670 if (pos < 0)
2671 return 0;
2672 ce = active_cache[pos];
2673 /*
2675 * This is not the sha1 we are looking for, or
2676 * unreusable because it is not a regular file.
2677 */
2678 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
2679 return 0;
2680 /*
2682 * If ce is marked as "assume unchanged", there is no
2683 * guarantee that work tree matches what we are looking for.
2684 */
2685 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
2686 return 0;
2687 /*
2689 * If ce matches the file in the work tree, we can reuse it.
2690 */
2691 if (ce_uptodate(ce) ||
2692 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
2693 return 1;
2694 return 0;
2696}
2697static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2699{
2700 int len;
2701 char *data = xmalloc(100), *dirty = "";
2702 /* Are we looking at the work tree? */
2704 if (s->dirty_submodule)
2705 dirty = "-dirty";
2706 len = snprintf(data, 100,
2708 "Subproject commit %s%s\n", sha1_to_hex(s->sha1), dirty);
2709 s->data = data;
2710 s->size = len;
2711 s->should_free = 1;
2712 if (size_only) {
2713 s->data = NULL;
2714 free(data);
2715 }
2716 return 0;
2717}
2718/*
2720 * While doing rename detection and pickaxe operation, we may need to
2721 * grab the data for the blob (or file) for our own in-core comparison.
2722 * diff_filespec has data and size fields for this purpose.
2723 */
2724int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
2725{
2726 int size_only = flags & CHECK_SIZE_ONLY;
2727 int err = 0;
2728 /*
2729 * demote FAIL to WARN to allow inspecting the situation
2730 * instead of refusing.
2731 */
2732 enum safe_crlf crlf_warn = (safe_crlf == SAFE_CRLF_FAIL
2733 ? SAFE_CRLF_WARN
2734 : safe_crlf);
2735 if (!DIFF_FILE_VALID(s))
2737 die("internal error: asking to populate invalid file.");
2738 if (S_ISDIR(s->mode))
2739 return -1;
2740 if (s->data)
2742 return 0;
2743 if (size_only && 0 < s->size)
2745 return 0;
2746 if (S_ISGITLINK(s->mode))
2748 return diff_populate_gitlink(s, size_only);
2749 if (!s->sha1_valid ||
2751 reuse_worktree_file(s->path, s->sha1, 0)) {
2752 struct strbuf buf = STRBUF_INIT;
2753 struct stat st;
2754 int fd;
2755 if (lstat(s->path, &st) < 0) {
2757 if (errno == ENOENT) {
2758 err_empty:
2759 err = -1;
2760 empty:
2761 s->data = (char *)"";
2762 s->size = 0;
2763 return err;
2764 }
2765 }
2766 s->size = xsize_t(st.st_size);
2767 if (!s->size)
2768 goto empty;
2769 if (S_ISLNK(st.st_mode)) {
2770 struct strbuf sb = STRBUF_INIT;
2771 if (strbuf_readlink(&sb, s->path, s->size))
2773 goto err_empty;
2774 s->size = sb.len;
2775 s->data = strbuf_detach(&sb, NULL);
2776 s->should_free = 1;
2777 return 0;
2778 }
2779 if (size_only)
2780 return 0;
2781 if ((flags & CHECK_BINARY) &&
2782 s->size > big_file_threshold && s->is_binary == -1) {
2783 s->is_binary = 1;
2784 return 0;
2785 }
2786 fd = open(s->path, O_RDONLY);
2787 if (fd < 0)
2788 goto err_empty;
2789 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2790 close(fd);
2791 s->should_munmap = 1;
2792 /*
2794 * Convert from working tree format to canonical git format
2795 */
2796 if (convert_to_git(s->path, s->data, s->size, &buf, crlf_warn)) {
2797 size_t size = 0;
2798 munmap(s->data, s->size);
2799 s->should_munmap = 0;
2800 s->data = strbuf_detach(&buf, &size);
2801 s->size = size;
2802 s->should_free = 1;
2803 }
2804 }
2805 else {
2806 enum object_type type;
2807 if (size_only || (flags & CHECK_BINARY)) {
2808 type = sha1_object_info(s->sha1, &s->size);
2809 if (type < 0)
2810 die("unable to read %s", sha1_to_hex(s->sha1));
2811 if (size_only)
2812 return 0;
2813 if (s->size > big_file_threshold && s->is_binary == -1) {
2814 s->is_binary = 1;
2815 return 0;
2816 }
2817 }
2818 s->data = read_sha1_file(s->sha1, &type, &s->size);
2819 if (!s->data)
2820 die("unable to read %s", sha1_to_hex(s->sha1));
2821 s->should_free = 1;
2822 }
2823 return 0;
2824}
2825void diff_free_filespec_blob(struct diff_filespec *s)
2827{
2828 if (s->should_free)
2829 free(s->data);
2830 else if (s->should_munmap)
2831 munmap(s->data, s->size);
2832 if (s->should_free || s->should_munmap) {
2834 s->should_free = s->should_munmap = 0;
2835 s->data = NULL;
2836 }
2837}
2838void diff_free_filespec_data(struct diff_filespec *s)
2840{
2841 diff_free_filespec_blob(s);
2842 free(s->cnt_data);
2843 s->cnt_data = NULL;
2844}
2845static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2847 void *blob,
2848 unsigned long size,
2849 const unsigned char *sha1,
2850 int mode)
2851{
2852 int fd;
2853 struct strbuf buf = STRBUF_INIT;
2854 struct strbuf template = STRBUF_INIT;
2855 char *path_dup = xstrdup(path);
2856 const char *base = basename(path_dup);
2857 /* Generate "XXXXXX_basename.ext" */
2859 strbuf_addstr(&template, "XXXXXX_");
2860 strbuf_addstr(&template, base);
2861 fd = git_mkstemps(temp->tmp_path, PATH_MAX, template.buf,
2863 strlen(base) + 1);
2864 if (fd < 0)
2865 die_errno("unable to create temp-file");
2866 if (convert_to_working_tree(path,
2867 (const char *)blob, (size_t)size, &buf)) {
2868 blob = buf.buf;
2869 size = buf.len;
2870 }
2871 if (write_in_full(fd, blob, size) != size)
2872 die_errno("unable to write temp-file");
2873 close(fd);
2874 temp->name = temp->tmp_path;
2875 strcpy(temp->hex, sha1_to_hex(sha1));
2876 temp->hex[40] = 0;
2877 sprintf(temp->mode, "%06o", mode);
2878 strbuf_release(&buf);
2879 strbuf_release(&template);
2880 free(path_dup);
2881}
2882static struct diff_tempfile *prepare_temp_file(const char *name,
2884 struct diff_filespec *one)
2885{
2886 struct diff_tempfile *temp = claim_diff_tempfile();
2887 if (!DIFF_FILE_VALID(one)) {
2889 not_a_valid_file:
2890 /* A '-' entry produces this for file-2, and
2891 * a '+' entry produces this for file-1.
2892 */
2893 temp->name = "/dev/null";
2894 strcpy(temp->hex, ".");
2895 strcpy(temp->mode, ".");
2896 return temp;
2897 }
2898 if (!remove_tempfile_installed) {
2900 atexit(remove_tempfile);
2901 sigchain_push_common(remove_tempfile_on_signal);
2902 remove_tempfile_installed = 1;
2903 }
2904 if (!S_ISGITLINK(one->mode) &&
2906 (!one->sha1_valid ||
2907 reuse_worktree_file(name, one->sha1, 1))) {
2908 struct stat st;
2909 if (lstat(name, &st) < 0) {
2910 if (errno == ENOENT)
2911 goto not_a_valid_file;
2912 die_errno("stat(%s)", name);
2913 }
2914 if (S_ISLNK(st.st_mode)) {
2915 struct strbuf sb = STRBUF_INIT;
2916 if (strbuf_readlink(&sb, name, st.st_size) < 0)
2917 die_errno("readlink(%s)", name);
2918 prep_temp_blob(name, temp, sb.buf, sb.len,
2919 (one->sha1_valid ?
2920 one->sha1 : null_sha1),
2921 (one->sha1_valid ?
2922 one->mode : S_IFLNK));
2923 strbuf_release(&sb);
2924 }
2925 else {
2926 /* we can borrow from the file in the work tree */
2927 temp->name = name;
2928 if (!one->sha1_valid)
2929 strcpy(temp->hex, sha1_to_hex(null_sha1));
2930 else
2931 strcpy(temp->hex, sha1_to_hex(one->sha1));
2932 /* Even though we may sometimes borrow the
2933 * contents from the work tree, we always want
2934 * one->mode. mode is trustworthy even when
2935 * !(one->sha1_valid), as long as
2936 * DIFF_FILE_VALID(one).
2937 */
2938 sprintf(temp->mode, "%06o", one->mode);
2939 }
2940 return temp;
2941 }
2942 else {
2943 if (diff_populate_filespec(one, 0))
2944 die("cannot read data blob for %s", one->path);
2945 prep_temp_blob(name, temp, one->data, one->size,
2946 one->sha1, one->mode);
2947 }
2948 return temp;
2949}
2950static void add_external_diff_name(struct argv_array *argv,
2952 const char *name,
2953 struct diff_filespec *df)
2954{
2955 struct diff_tempfile *temp = prepare_temp_file(name, df);
2956 argv_array_push(argv, temp->name);
2957 argv_array_push(argv, temp->hex);
2958 argv_array_push(argv, temp->mode);
2959}
2960/* An external diff command takes:
2962 *
2963 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2964 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2965 *
2966 */
2967static void run_external_diff(const char *pgm,
2968 const char *name,
2969 const char *other,
2970 struct diff_filespec *one,
2971 struct diff_filespec *two,
2972 const char *xfrm_msg,
2973 int complete_rewrite,
2974 struct diff_options *o)
2975{
2976 struct argv_array argv = ARGV_ARRAY_INIT;
2977 struct argv_array env = ARGV_ARRAY_INIT;
2978 struct diff_queue_struct *q = &diff_queued_diff;
2979 argv_array_push(&argv, pgm);
2981 argv_array_push(&argv, name);
2982 if (one && two) {
2984 add_external_diff_name(&argv, name, one);
2985 if (!other)
2986 add_external_diff_name(&argv, name, two);
2987 else {
2988 add_external_diff_name(&argv, other, two);
2989 argv_array_push(&argv, other);
2990 argv_array_push(&argv, xfrm_msg);
2991 }
2992 }
2993 argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
2995 argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
2996 if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
2998 die(_("external diff died, stopping at %s"), name);
2999 remove_tempfile();
3001 argv_array_clear(&argv);
3002 argv_array_clear(&env);
3003}
3004static int similarity_index(struct diff_filepair *p)
3006{
3007 return p->score * 100 / MAX_SCORE;
3008}
3009static void fill_metainfo(struct strbuf *msg,
3011 const char *name,
3012 const char *other,
3013 struct diff_filespec *one,
3014 struct diff_filespec *two,
3015 struct diff_options *o,
3016 struct diff_filepair *p,
3017 int *must_show_header,
3018 int use_color)
3019{
3020 const char *set = diff_get_color(use_color, DIFF_METAINFO);
3021 const char *reset = diff_get_color(use_color, DIFF_RESET);
3022 const char *line_prefix = diff_line_prefix(o);
3023 *must_show_header = 1;
3025 strbuf_init(msg, PATH_MAX * 2 + 300);
3026 switch (p->status) {
3027 case DIFF_STATUS_COPIED:
3028 strbuf_addf(msg, "%s%ssimilarity index %d%%",
3029 line_prefix, set, similarity_index(p));
3030 strbuf_addf(msg, "%s\n%s%scopy from ",
3031 reset, line_prefix, set);
3032 quote_c_style(name, msg, NULL, 0);
3033 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
3034 quote_c_style(other, msg, NULL, 0);
3035 strbuf_addf(msg, "%s\n", reset);
3036 break;
3037 case DIFF_STATUS_RENAMED:
3038 strbuf_addf(msg, "%s%ssimilarity index %d%%",
3039 line_prefix, set, similarity_index(p));
3040 strbuf_addf(msg, "%s\n%s%srename from ",
3041 reset, line_prefix, set);
3042 quote_c_style(name, msg, NULL, 0);
3043 strbuf_addf(msg, "%s\n%s%srename to ",
3044 reset, line_prefix, set);
3045 quote_c_style(other, msg, NULL, 0);
3046 strbuf_addf(msg, "%s\n", reset);
3047 break;
3048 case DIFF_STATUS_MODIFIED:
3049 if (p->score) {
3050 strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
3051 line_prefix,
3052 set, similarity_index(p), reset);
3053 break;
3054 }
3055 /* fallthru */
3056 default:
3057 *must_show_header = 0;
3058 }
3059 if (one && two && hashcmp(one->sha1, two->sha1)) {
3060 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
3061 if (DIFF_OPT_TST(o, BINARY)) {
3063 mmfile_t mf;
3064 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
3065 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
3066 abbrev = 40;
3067 }
3068 strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
3069 find_unique_abbrev(one->sha1, abbrev));
3070 strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
3071 if (one->mode == two->mode)
3072 strbuf_addf(msg, " %06o", one->mode);
3073 strbuf_addf(msg, "%s\n", reset);
3074 }
3075}
3076static void run_diff_cmd(const char *pgm,
3078 const char *name,
3079 const char *other,
3080 const char *attr_path,
3081 struct diff_filespec *one,
3082 struct diff_filespec *two,
3083 struct strbuf *msg,
3084 struct diff_options *o,
3085 struct diff_filepair *p)
3086{
3087 const char *xfrm_msg = NULL;
3088 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
3089 int must_show_header = 0;
3090 if (DIFF_OPT_TST(o, ALLOW_EXTERNAL)) {
3093 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
3094 if (drv && drv->external)
3095 pgm = drv->external;
3096 }
3097 if (msg) {
3099 /*
3100 * don't use colors when the header is intended for an
3101 * external diff driver
3102 */
3103 fill_metainfo(msg, name, other, one, two, o, p,
3104 &must_show_header,
3105 want_color(o->use_color) && !pgm);
3106 xfrm_msg = msg->len ? msg->buf : NULL;
3107 }
3108 if (pgm) {
3110 run_external_diff(pgm, name, other, one, two, xfrm_msg,
3111 complete_rewrite, o);
3112 return;
3113 }
3114 if (one && two)
3115 builtin_diff(name, other ? other : name,
3116 one, two, xfrm_msg, must_show_header,
3117 o, complete_rewrite);
3118 else
3119 fprintf(o->file, "* Unmerged path %s\n", name);
3120}
3121static void diff_fill_sha1_info(struct diff_filespec *one)
3123{
3124 if (DIFF_FILE_VALID(one)) {
3125 if (!one->sha1_valid) {
3126 struct stat st;
3127 if (one->is_stdin) {
3128 hashcpy(one->sha1, null_sha1);
3129 return;
3130 }
3131 if (lstat(one->path, &st) < 0)
3132 die_errno("stat '%s'", one->path);
3133 if (index_path(one->sha1, one->path, &st, 0))
3134 die("cannot hash %s", one->path);
3135 }
3136 }
3137 else
3138 hashclr(one->sha1);
3139}
3140static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
3142{
3143 /* Strip the prefix but do not molest /dev/null and absolute paths */
3144 if (*namep && **namep != '/') {
3145 *namep += prefix_length;
3146 if (**namep == '/')
3147 ++*namep;
3148 }
3149 if (*otherp && **otherp != '/') {
3150 *otherp += prefix_length;
3151 if (**otherp == '/')
3152 ++*otherp;
3153 }
3154}
3155static void run_diff(struct diff_filepair *p, struct diff_options *o)
3157{
3158 const char *pgm = external_diff();
3159 struct strbuf msg;
3160 struct diff_filespec *one = p->one;
3161 struct diff_filespec *two = p->two;
3162 const char *name;
3163 const char *other;
3164 const char *attr_path;
3165 name = p->one->path;
3167 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3168 attr_path = name;
3169 if (o->prefix_length)
3170 strip_prefix(o->prefix_length, &name, &other);
3171 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
3173 pgm = NULL;
3174 if (DIFF_PAIR_UNMERGED(p)) {
3176 run_diff_cmd(pgm, name, NULL, attr_path,
3177 NULL, NULL, NULL, o, p);
3178 return;
3179 }
3180 diff_fill_sha1_info(one);
3182 diff_fill_sha1_info(two);
3183 if (!pgm &&
3185 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
3186 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
3187 /*
3188 * a filepair that changes between file and symlink
3189 * needs to be split into deletion and creation.
3190 */
3191 struct diff_filespec *null = alloc_filespec(two->path);
3192 run_diff_cmd(NULL, name, other, attr_path,
3193 one, null, &msg, o, p);
3194 free(null);
3195 strbuf_release(&msg);
3196 null = alloc_filespec(one->path);
3198 run_diff_cmd(NULL, name, other, attr_path,
3199 null, two, &msg, o, p);
3200 free(null);
3201 }
3202 else
3203 run_diff_cmd(pgm, name, other, attr_path,
3204 one, two, &msg, o, p);
3205 strbuf_release(&msg);
3207}
3208static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
3210 struct diffstat_t *diffstat)
3211{
3212 const char *name;
3213 const char *other;
3214 if (DIFF_PAIR_UNMERGED(p)) {
3216 /* unmerged */
3217 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, p);
3218 return;
3219 }
3220 name = p->one->path;
3222 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3223 if (o->prefix_length)
3225 strip_prefix(o->prefix_length, &name, &other);
3226 diff_fill_sha1_info(p->one);
3228 diff_fill_sha1_info(p->two);
3229 builtin_diffstat(name, other, p->one, p->two, diffstat, o, p);
3231}
3232static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
3234{
3235 const char *name;
3236 const char *other;
3237 const char *attr_path;
3238 if (DIFF_PAIR_UNMERGED(p)) {
3240 /* unmerged */
3241 return;
3242 }
3243 name = p->one->path;
3245 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3246 attr_path = other ? other : name;
3247 if (o->prefix_length)
3249 strip_prefix(o->prefix_length, &name, &other);
3250 diff_fill_sha1_info(p->one);
3252 diff_fill_sha1_info(p->two);
3253 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
3255}
3256void diff_setup(struct diff_options *options)
3258{
3259 memcpy(options, &default_diff_options, sizeof(*options));
3260 options->file = stdout;
3262 options->line_termination = '\n';
3264 options->break_opt = -1;
3265 options->rename_limit = -1;
3266 options->dirstat_permille = diff_dirstat_permille_default;
3267 options->context = diff_context_default;
3268 options->ws_error_highlight = WSEH_NEW;
3269 DIFF_OPT_SET(options, RENAME_EMPTY);
3270 /* pathchange left =NULL by default */
3272 options->change = diff_change;
3273 options->add_remove = diff_addremove;
3274 options->use_color = diff_use_color_default;
3275 options->detect_rename = diff_detect_rename_default;
3276 options->xdl_opts |= diff_algorithm;
3277 options->orderfile = diff_order_file_cfg;
3279 if (diff_no_prefix) {
3281 options->a_prefix = options->b_prefix = "";
3282 } else if (!diff_mnemonic_prefix) {
3283 options->a_prefix = "a/";
3284 options->b_prefix = "b/";
3285 }
3286}
3287void diff_setup_done(struct diff_options *options)
3289{
3290 int count = 0;
3291 if (options->set_default)
3293 options->set_default(options);
3294 if (options->output_format & DIFF_FORMAT_NAME)
3296 count++;
3297 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
3298 count++;
3299 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
3300 count++;
3301 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
3302 count++;
3303 if (count > 1)
3304 die("--name-only, --name-status, --check and -s are mutually exclusive");
3305 /*
3307 * Most of the time we can say "there are changes"
3308 * only by checking if there are changed paths, but
3309 * --ignore-whitespace* options force us to look
3310 * inside contents.
3311 */
3312 if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
3314 DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
3315 DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
3316 DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
3317 else
3318 DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
3319 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
3321 options->detect_rename = DIFF_DETECT_COPY;
3322 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
3324 options->prefix = NULL;
3325 if (options->prefix)
3326 options->prefix_length = strlen(options->prefix);
3327 else
3328 options->prefix_length = 0;
3329 if (options->output_format & (DIFF_FORMAT_NAME |
3331 DIFF_FORMAT_NAME_STATUS |
3332 DIFF_FORMAT_CHECKDIFF |
3333 DIFF_FORMAT_NO_OUTPUT))
3334 options->output_format &= ~(DIFF_FORMAT_RAW |
3335 DIFF_FORMAT_NUMSTAT |
3336 DIFF_FORMAT_DIFFSTAT |
3337 DIFF_FORMAT_SHORTSTAT |
3338 DIFF_FORMAT_DIRSTAT |
3339 DIFF_FORMAT_SUMMARY |
3340 DIFF_FORMAT_PATCH);
3341 /*
3343 * These cases always need recursive; we do not drop caller-supplied
3344 * recursive bits for other formats here.
3345 */
3346 if (options->output_format & (DIFF_FORMAT_PATCH |
3347 DIFF_FORMAT_NUMSTAT |
3348 DIFF_FORMAT_DIFFSTAT |
3349 DIFF_FORMAT_SHORTSTAT |
3350 DIFF_FORMAT_DIRSTAT |
3351 DIFF_FORMAT_SUMMARY |
3352 DIFF_FORMAT_CHECKDIFF))
3353 DIFF_OPT_SET(options, RECURSIVE);
3354 /*
3355 * Also pickaxe would not work very well if you do not say recursive
3356 */
3357 if (options->pickaxe)
3358 DIFF_OPT_SET(options, RECURSIVE);
3359 /*
3360 * When patches are generated, submodules diffed against the work tree
3361 * must be checked for dirtiness too so it can be shown in the output
3362 */
3363 if (options->output_format & DIFF_FORMAT_PATCH)
3364 DIFF_OPT_SET(options, DIRTY_SUBMODULES);
3365 if (options->detect_rename && options->rename_limit < 0)
3367 options->rename_limit = diff_rename_limit_default;
3368 if (options->setup & DIFF_SETUP_USE_CACHE) {
3369 if (!active_cache)
3370 /* read-cache does not die even when it fails
3371 * so it is safe for us to do this here. Also
3372 * it does not smudge active_cache or active_nr
3373 * when it fails, so we do not have to worry about
3374 * cleaning it up ourselves either.
3375 */
3376 read_cache();
3377 }
3378 if (options->abbrev <= 0 || 40 < options->abbrev)
3379 options->abbrev = 40; /* full */
3380 /*
3382 * It does not make sense to show the first hit we happened
3383 * to have found. It does not make sense not to return with
3384 * exit code in such a case either.
3385 */
3386 if (DIFF_OPT_TST(options, QUICK)) {
3387 options->output_format = DIFF_FORMAT_NO_OUTPUT;
3388 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3389 }
3390 options->diff_path_counter = 0;
3392 if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
3394 die(_("--follow requires exactly one pathspec"));
3395}
3396static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
3398{
3399 char c, *eq;
3400 int len;
3401 if (*arg != '-')
3403 return 0;
3404 c = *++arg;
3405 if (!c)
3406 return 0;
3407 if (c == arg_short) {
3408 c = *++arg;
3409 if (!c)
3410 return 1;
3411 if (val && isdigit(c)) {
3412 char *end;
3413 int n = strtoul(arg, &end, 10);
3414 if (*end)
3415 return 0;
3416 *val = n;
3417 return 1;
3418 }
3419 return 0;
3420 }
3421 if (c != '-')
3422 return 0;
3423 arg++;
3424 eq = strchrnul(arg, '=');
3425 len = eq - arg;
3426 if (!len || strncmp(arg, arg_long, len))
3427 return 0;
3428 if (*eq) {
3429 int n;
3430 char *end;
3431 if (!isdigit(*++eq))
3432 return 0;
3433 n = strtoul(eq, &end, 10);
3434 if (*end)
3435 return 0;
3436 *val = n;
3437 }
3438 return 1;
3439}
3440static int diff_scoreopt_parse(const char *opt);
3442static inline int short_opt(char opt, const char **argv,
3444 const char **optarg)
3445{
3446 const char *arg = argv[0];
3447 if (arg[0] != '-' || arg[1] != opt)
3448 return 0;
3449 if (arg[2] != '\0') {
3450 *optarg = arg + 2;
3451 return 1;
3452 }
3453 if (!argv[1])
3454 die("Option '%c' requires a value", opt);
3455 *optarg = argv[1];
3456 return 2;
3457}
3458int parse_long_opt(const char *opt, const char **argv,
3460 const char **optarg)
3461{
3462 const char *arg = argv[0];
3463 if (!skip_prefix(arg, "--", &arg))
3464 return 0;
3465 if (!skip_prefix(arg, opt, &arg))
3466 return 0;
3467 if (*arg == '=') { /* stuck form: --option=value */
3468 *optarg = arg + 1;
3469 return 1;
3470 }
3471 if (*arg != '\0')
3472 return 0;
3473 /* separate form: --option value */
3474 if (!argv[1])
3475 die("Option '--%s' requires a value", opt);
3476 *optarg = argv[1];
3477 return 2;
3478}
3479static int stat_opt(struct diff_options *options, const char **av)
3481{
3482 const char *arg = av[0];
3483 char *end;
3484 int width = options->stat_width;
3485 int name_width = options->stat_name_width;
3486 int graph_width = options->stat_graph_width;
3487 int count = options->stat_count;
3488 int argcount = 1;
3489 if (!skip_prefix(arg, "--stat", &arg))
3491 die("BUG: stat option does not begin with --stat: %s", arg);
3492 end = (char *)arg;
3493 switch (*arg) {
3495 case '-':
3496 if (skip_prefix(arg, "-width", &arg)) {
3497 if (*arg == '=')
3498 width = strtoul(arg + 1, &end, 10);
3499 else if (!*arg && !av[1])
3500 die("Option '--stat-width' requires a value");
3501 else if (!*arg) {
3502 width = strtoul(av[1], &end, 10);
3503 argcount = 2;
3504 }
3505 } else if (skip_prefix(arg, "-name-width", &arg)) {
3506 if (*arg == '=')
3507 name_width = strtoul(arg + 1, &end, 10);
3508 else if (!*arg && !av[1])
3509 die("Option '--stat-name-width' requires a value");
3510 else if (!*arg) {
3511 name_width = strtoul(av[1], &end, 10);
3512 argcount = 2;
3513 }
3514 } else if (skip_prefix(arg, "-graph-width", &arg)) {
3515 if (*arg == '=')
3516 graph_width = strtoul(arg + 1, &end, 10);
3517 else if (!*arg && !av[1])
3518 die("Option '--stat-graph-width' requires a value");
3519 else if (!*arg) {
3520 graph_width = strtoul(av[1], &end, 10);
3521 argcount = 2;
3522 }
3523 } else if (skip_prefix(arg, "-count", &arg)) {
3524 if (*arg == '=')
3525 count = strtoul(arg + 1, &end, 10);
3526 else if (!*arg && !av[1])
3527 die("Option '--stat-count' requires a value");
3528 else if (!*arg) {
3529 count = strtoul(av[1], &end, 10);
3530 argcount = 2;
3531 }
3532 }
3533 break;
3534 case '=':
3535 width = strtoul(arg+1, &end, 10);
3536 if (*end == ',')
3537 name_width = strtoul(end+1, &end, 10);
3538 if (*end == ',')
3539 count = strtoul(end+1, &end, 10);
3540 }
3541 /* Important! This checks all the error cases! */
3543 if (*end)
3544 return 0;
3545 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3546 options->stat_name_width = name_width;
3547 options->stat_graph_width = graph_width;
3548 options->stat_width = width;
3549 options->stat_count = count;
3550 return argcount;
3551}
3552static int parse_dirstat_opt(struct diff_options *options, const char *params)
3554{
3555 struct strbuf errmsg = STRBUF_INIT;
3556 if (parse_dirstat_params(options, params, &errmsg))
3557 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3558 errmsg.buf);
3559 strbuf_release(&errmsg);
3560 /*
3561 * The caller knows a dirstat-related option is given from the command
3562 * line; allow it to say "return this_function();"
3563 */
3564 options->output_format |= DIFF_FORMAT_DIRSTAT;
3565 return 1;
3566}
3567static int parse_submodule_opt(struct diff_options *options, const char *value)
3569{
3570 if (parse_submodule_params(options, value))
3571 die(_("Failed to parse --submodule option parameter: '%s'"),
3572 value);
3573 return 1;
3574}
3575static const char diff_status_letters[] = {
3577 DIFF_STATUS_ADDED,
3578 DIFF_STATUS_COPIED,
3579 DIFF_STATUS_DELETED,
3580 DIFF_STATUS_MODIFIED,
3581 DIFF_STATUS_RENAMED,
3582 DIFF_STATUS_TYPE_CHANGED,
3583 DIFF_STATUS_UNKNOWN,
3584 DIFF_STATUS_UNMERGED,
3585 DIFF_STATUS_FILTER_AON,
3586 DIFF_STATUS_FILTER_BROKEN,
3587 '\0',
3588};
3589static unsigned int filter_bit['Z' + 1];
3591static void prepare_filter_bits(void)
3593{
3594 int i;
3595 if (!filter_bit[DIFF_STATUS_ADDED]) {
3597 for (i = 0; diff_status_letters[i]; i++)
3598 filter_bit[(int) diff_status_letters[i]] = (1 << i);
3599 }
3600}
3601static unsigned filter_bit_tst(char status, const struct diff_options *opt)
3603{
3604 return opt->filter & filter_bit[(int) status];
3605}
3606static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
3608{
3609 int i, optch;
3610 prepare_filter_bits();
3612 /*
3614 * If there is a negation e.g. 'd' in the input, and we haven't
3615 * initialized the filter field with another --diff-filter, start
3616 * from full set of bits, except for AON.
3617 */
3618 if (!opt->filter) {
3619 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3620 if (optch < 'a' || 'z' < optch)
3621 continue;
3622 opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
3623 opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
3624 break;
3625 }
3626 }
3627 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3629 unsigned int bit;
3630 int negate;
3631 if ('a' <= optch && optch <= 'z') {
3633 negate = 1;
3634 optch = toupper(optch);
3635 } else {
3636 negate = 0;
3637 }
3638 bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
3640 if (!bit)
3641 return optarg[i];
3642 if (negate)
3643 opt->filter &= ~bit;
3644 else
3645 opt->filter |= bit;
3646 }
3647 return 0;
3648}
3649static void enable_patch_output(int *fmt) {
3651 *fmt &= ~DIFF_FORMAT_NO_OUTPUT;
3652 *fmt |= DIFF_FORMAT_PATCH;
3653}
3654static int parse_one_token(const char **arg, const char *token)
3656{
3657 return skip_prefix(*arg, token, arg) && (!**arg || **arg == ',');
3658}
3659static int parse_ws_error_highlight(struct diff_options *opt, const char *arg)
3661{
3662 const char *orig_arg = arg;
3663 unsigned val = 0;
3664 while (*arg) {
3665 if (parse_one_token(&arg, "none"))
3666 val = 0;
3667 else if (parse_one_token(&arg, "default"))
3668 val = WSEH_NEW;
3669 else if (parse_one_token(&arg, "all"))
3670 val = WSEH_NEW | WSEH_OLD | WSEH_CONTEXT;
3671 else if (parse_one_token(&arg, "new"))
3672 val |= WSEH_NEW;
3673 else if (parse_one_token(&arg, "old"))
3674 val |= WSEH_OLD;
3675 else if (parse_one_token(&arg, "context"))
3676 val |= WSEH_CONTEXT;
3677 else {
3678 error("unknown value after ws-error-highlight=%.*s",
3679 (int)(arg - orig_arg), orig_arg);
3680 return 0;
3681 }
3682 if (*arg)
3683 arg++;
3684 }
3685 opt->ws_error_highlight = val;
3686 return 1;
3687}
3688int diff_opt_parse(struct diff_options *options, const char **av, int ac)
3690{
3691 const char *arg = av[0];
3692 const char *optarg;
3693 int argcount;
3694 /* Output format options */
3696 if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")
3697 || opt_arg(arg, 'U', "unified", &options->context))
3698 enable_patch_output(&options->output_format);
3699 else if (!strcmp(arg, "--raw"))
3700 options->output_format |= DIFF_FORMAT_RAW;
3701 else if (!strcmp(arg, "--patch-with-raw")) {
3702 enable_patch_output(&options->output_format);
3703 options->output_format |= DIFF_FORMAT_RAW;
3704 } else if (!strcmp(arg, "--numstat"))
3705 options->output_format |= DIFF_FORMAT_NUMSTAT;
3706 else if (!strcmp(arg, "--shortstat"))
3707 options->output_format |= DIFF_FORMAT_SHORTSTAT;
3708 else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat"))
3709 return parse_dirstat_opt(options, "");
3710 else if (skip_prefix(arg, "-X", &arg))
3711 return parse_dirstat_opt(options, arg);
3712 else if (skip_prefix(arg, "--dirstat=", &arg))
3713 return parse_dirstat_opt(options, arg);
3714 else if (!strcmp(arg, "--cumulative"))
3715 return parse_dirstat_opt(options, "cumulative");
3716 else if (!strcmp(arg, "--dirstat-by-file"))
3717 return parse_dirstat_opt(options, "files");
3718 else if (skip_prefix(arg, "--dirstat-by-file=", &arg)) {
3719 parse_dirstat_opt(options, "files");
3720 return parse_dirstat_opt(options, arg);
3721 }
3722 else if (!strcmp(arg, "--check"))
3723 options->output_format |= DIFF_FORMAT_CHECKDIFF;
3724 else if (!strcmp(arg, "--summary"))
3725 options->output_format |= DIFF_FORMAT_SUMMARY;
3726 else if (!strcmp(arg, "--patch-with-stat")) {
3727 enable_patch_output(&options->output_format);
3728 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3729 } else if (!strcmp(arg, "--name-only"))
3730 options->output_format |= DIFF_FORMAT_NAME;
3731 else if (!strcmp(arg, "--name-status"))
3732 options->output_format |= DIFF_FORMAT_NAME_STATUS;
3733 else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
3734 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
3735 else if (starts_with(arg, "--stat"))
3736 /* --stat, --stat-width, --stat-name-width, or --stat-count */
3737 return stat_opt(options, av);
3738 /* renames options */
3740 else if (starts_with(arg, "-B") || starts_with(arg, "--break-rewrites=") ||
3741 !strcmp(arg, "--break-rewrites")) {
3742 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
3743 return error("invalid argument to -B: %s", arg+2);
3744 }
3745 else if (starts_with(arg, "-M") || starts_with(arg, "--find-renames=") ||
3746 !strcmp(arg, "--find-renames")) {
3747 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3748 return error("invalid argument to -M: %s", arg+2);
3749 options->detect_rename = DIFF_DETECT_RENAME;
3750 }
3751 else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
3752 options->irreversible_delete = 1;
3753 }
3754 else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") ||
3755 !strcmp(arg, "--find-copies")) {
3756 if (options->detect_rename == DIFF_DETECT_COPY)
3757 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3758 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3759 return error("invalid argument to -C: %s", arg+2);
3760 options->detect_rename = DIFF_DETECT_COPY;
3761 }
3762 else if (!strcmp(arg, "--no-renames"))
3763 options->detect_rename = 0;
3764 else if (!strcmp(arg, "--rename-empty"))
3765 DIFF_OPT_SET(options, RENAME_EMPTY);
3766 else if (!strcmp(arg, "--no-rename-empty"))
3767 DIFF_OPT_CLR(options, RENAME_EMPTY);
3768 else if (!strcmp(arg, "--relative"))
3769 DIFF_OPT_SET(options, RELATIVE_NAME);
3770 else if (skip_prefix(arg, "--relative=", &arg)) {
3771 DIFF_OPT_SET(options, RELATIVE_NAME);
3772 options->prefix = arg;
3773 }
3774 /* xdiff options */
3776 else if (!strcmp(arg, "--minimal"))
3777 DIFF_XDL_SET(options, NEED_MINIMAL);
3778 else if (!strcmp(arg, "--no-minimal"))
3779 DIFF_XDL_CLR(options, NEED_MINIMAL);
3780 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
3781 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
3782 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
3783 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
3784 else if (!strcmp(arg, "--ignore-space-at-eol"))
3785 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
3786 else if (!strcmp(arg, "--ignore-blank-lines"))
3787 DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
3788 else if (!strcmp(arg, "--patience"))
3789 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
3790 else if (!strcmp(arg, "--histogram"))
3791 options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
3792 else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) {
3793 long value = parse_algorithm_value(optarg);
3794 if (value < 0)
3795 return error("option diff-algorithm accepts \"myers\", "
3796 "\"minimal\", \"patience\" and \"histogram\"");
3797 /* clear out previous settings */
3798 DIFF_XDL_CLR(options, NEED_MINIMAL);
3799 options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
3800 options->xdl_opts |= value;
3801 return argcount;
3802 }
3803 /* flags options */
3805 else if (!strcmp(arg, "--binary")) {
3806 enable_patch_output(&options->output_format);
3807 DIFF_OPT_SET(options, BINARY);
3808 }
3809 else if (!strcmp(arg, "--full-index"))
3810 DIFF_OPT_SET(options, FULL_INDEX);
3811 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
3812 DIFF_OPT_SET(options, TEXT);
3813 else if (!strcmp(arg, "-R"))
3814 DIFF_OPT_SET(options, REVERSE_DIFF);
3815 else if (!strcmp(arg, "--find-copies-harder"))
3816 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3817 else if (!strcmp(arg, "--follow"))
3818 DIFF_OPT_SET(options, FOLLOW_RENAMES);
3819 else if (!strcmp(arg, "--no-follow"))
3820 DIFF_OPT_CLR(options, FOLLOW_RENAMES);
3821 else if (!strcmp(arg, "--color"))
3822 options->use_color = 1;
3823 else if (skip_prefix(arg, "--color=", &arg)) {
3824 int value = git_config_colorbool(NULL, arg);
3825 if (value < 0)
3826 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3827 options->use_color = value;
3828 }
3829 else if (!strcmp(arg, "--no-color"))
3830 options->use_color = 0;
3831 else if (!strcmp(arg, "--color-words")) {
3832 options->use_color = 1;
3833 options->word_diff = DIFF_WORDS_COLOR;
3834 }
3835 else if (skip_prefix(arg, "--color-words=", &arg)) {
3836 options->use_color = 1;
3837 options->word_diff = DIFF_WORDS_COLOR;
3838 options->word_regex = arg;
3839 }
3840 else if (!strcmp(arg, "--word-diff")) {
3841 if (options->word_diff == DIFF_WORDS_NONE)
3842 options->word_diff = DIFF_WORDS_PLAIN;
3843 }
3844 else if (skip_prefix(arg, "--word-diff=", &arg)) {
3845 if (!strcmp(arg, "plain"))
3846 options->word_diff = DIFF_WORDS_PLAIN;
3847 else if (!strcmp(arg, "color")) {
3848 options->use_color = 1;
3849 options->word_diff = DIFF_WORDS_COLOR;
3850 }
3851 else if (!strcmp(arg, "porcelain"))
3852 options->word_diff = DIFF_WORDS_PORCELAIN;
3853 else if (!strcmp(arg, "none"))
3854 options->word_diff = DIFF_WORDS_NONE;
3855 else
3856 die("bad --word-diff argument: %s", arg);
3857 }
3858 else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) {
3859 if (options->word_diff == DIFF_WORDS_NONE)
3860 options->word_diff = DIFF_WORDS_PLAIN;
3861 options->word_regex = optarg;
3862 return argcount;
3863 }
3864 else if (!strcmp(arg, "--exit-code"))
3865 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3866 else if (!strcmp(arg, "--quiet"))
3867 DIFF_OPT_SET(options, QUICK);
3868 else if (!strcmp(arg, "--ext-diff"))
3869 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
3870 else if (!strcmp(arg, "--no-ext-diff"))
3871 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
3872 else if (!strcmp(arg, "--textconv"))
3873 DIFF_OPT_SET(options, ALLOW_TEXTCONV);
3874 else if (!strcmp(arg, "--no-textconv"))
3875 DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
3876 else if (!strcmp(arg, "--ignore-submodules")) {
3877 DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3878 handle_ignore_submodules_arg(options, "all");
3879 } else if (skip_prefix(arg, "--ignore-submodules=", &arg)) {
3880 DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3881 handle_ignore_submodules_arg(options, arg);
3882 } else if (!strcmp(arg, "--submodule"))
3883 DIFF_OPT_SET(options, SUBMODULE_LOG);
3884 else if (skip_prefix(arg, "--submodule=", &arg))
3885 return parse_submodule_opt(options, arg);
3886 else if (skip_prefix(arg, "--ws-error-highlight=", &arg))
3887 return parse_ws_error_highlight(options, arg);
3888 /* misc options */
3890 else if (!strcmp(arg, "-z"))
3891 options->line_termination = 0;
3892 else if ((argcount = short_opt('l', av, &optarg))) {
3893 options->rename_limit = strtoul(optarg, NULL, 10);
3894 return argcount;
3895 }
3896 else if ((argcount = short_opt('S', av, &optarg))) {
3897 options->pickaxe = optarg;
3898 options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
3899 return argcount;
3900 } else if ((argcount = short_opt('G', av, &optarg))) {
3901 options->pickaxe = optarg;
3902 options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
3903 return argcount;
3904 }
3905 else if (!strcmp(arg, "--pickaxe-all"))
3906 options->pickaxe_opts |= DIFF_PICKAXE_ALL;
3907 else if (!strcmp(arg, "--pickaxe-regex"))
3908 options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
3909 else if ((argcount = short_opt('O', av, &optarg))) {
3910 options->orderfile = optarg;
3911 return argcount;
3912 }
3913 else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
3914 int offending = parse_diff_filter_opt(optarg, options);
3915 if (offending)
3916 die("unknown change class '%c' in --diff-filter=%s",
3917 offending, optarg);
3918 return argcount;
3919 }
3920 else if (!strcmp(arg, "--abbrev"))
3921 options->abbrev = DEFAULT_ABBREV;
3922 else if (skip_prefix(arg, "--abbrev=", &arg)) {
3923 options->abbrev = strtoul(arg, NULL, 10);
3924 if (options->abbrev < MINIMUM_ABBREV)
3925 options->abbrev = MINIMUM_ABBREV;
3926 else if (40 < options->abbrev)
3927 options->abbrev = 40;
3928 }
3929 else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
3930 options->a_prefix = optarg;
3931 return argcount;
3932 }
3933 else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) {
3934 options->b_prefix = optarg;
3935 return argcount;
3936 }
3937 else if (!strcmp(arg, "--no-prefix"))
3938 options->a_prefix = options->b_prefix = "";
3939 else if (opt_arg(arg, '\0', "inter-hunk-context",
3940 &options->interhunkcontext))
3941 ;
3942 else if (!strcmp(arg, "-W"))
3943 DIFF_OPT_SET(options, FUNCCONTEXT);
3944 else if (!strcmp(arg, "--function-context"))
3945 DIFF_OPT_SET(options, FUNCCONTEXT);
3946 else if (!strcmp(arg, "--no-function-context"))
3947 DIFF_OPT_CLR(options, FUNCCONTEXT);
3948 else if ((argcount = parse_long_opt("output", av, &optarg))) {
3949 options->file = fopen(optarg, "w");
3950 if (!options->file)
3951 die_errno("Could not open '%s'", optarg);
3952 options->close_file = 1;
3953 return argcount;
3954 } else
3955 return 0;
3956 return 1;
3957}
3958int parse_rename_score(const char **cp_p)
3960{
3961 unsigned long num, scale;
3962 int ch, dot;
3963 const char *cp = *cp_p;
3964 num = 0;
3966 scale = 1;
3967 dot = 0;
3968 for (;;) {
3969 ch = *cp;
3970 if ( !dot && ch == '.' ) {
3971 scale = 1;
3972 dot = 1;
3973 } else if ( ch == '%' ) {
3974 scale = dot ? scale*100 : 100;
3975 cp++; /* % is always at the end */
3976 break;
3977 } else if ( ch >= '0' && ch <= '9' ) {
3978 if ( scale < 100000 ) {
3979 scale *= 10;
3980 num = (num*10) + (ch-'0');
3981 }
3982 } else {
3983 break;
3984 }
3985 cp++;
3986 }
3987 *cp_p = cp;
3988 /* user says num divided by scale and we say internally that
3990 * is MAX_SCORE * num / scale.
3991 */
3992 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
3993}
3994static int diff_scoreopt_parse(const char *opt)
3996{
3997 int opt1, opt2, cmd;
3998 if (*opt++ != '-')
4000 return -1;
4001 cmd = *opt++;
4002 if (cmd == '-') {
4003 /* convert the long-form arguments into short-form versions */
4004 if (skip_prefix(opt, "break-rewrites", &opt)) {
4005 if (*opt == 0 || *opt++ == '=')
4006 cmd = 'B';
4007 } else if (skip_prefix(opt, "find-copies", &opt)) {
4008 if (*opt == 0 || *opt++ == '=')
4009 cmd = 'C';
4010 } else if (skip_prefix(opt, "find-renames", &opt)) {
4011 if (*opt == 0 || *opt++ == '=')
4012 cmd = 'M';
4013 }
4014 }
4015 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
4016 return -1; /* that is not a -M, -C, or -B option */
4017 opt1 = parse_rename_score(&opt);
4019 if (cmd != 'B')
4020 opt2 = 0;
4021 else {
4022 if (*opt == 0)
4023 opt2 = 0;
4024 else if (*opt != '/')
4025 return -1; /* we expect -B80/99 or -B80 */
4026 else {
4027 opt++;
4028 opt2 = parse_rename_score(&opt);
4029 }
4030 }
4031 if (*opt != 0)
4032 return -1;
4033 return opt1 | (opt2 << 16);
4034}
4035struct diff_queue_struct diff_queued_diff;
4037void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
4039{
4040 ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc);
4041 queue->queue[queue->nr++] = dp;
4042}
4043struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
4045 struct diff_filespec *one,
4046 struct diff_filespec *two)
4047{
4048 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
4049 dp->one = one;
4050 dp->two = two;
4051 if (queue)
4052 diff_q(queue, dp);
4053 return dp;
4054}
4055void diff_free_filepair(struct diff_filepair *p)
4057{
4058 free_filespec(p->one);
4059 free_filespec(p->two);
4060 free(p);
4061}
4062/* This is different from find_unique_abbrev() in that
4064 * it stuffs the result with dots for alignment.
4065 */
4066const char *diff_unique_abbrev(const unsigned char *sha1, int len)
4067{
4068 int abblen;
4069 const char *abbrev;
4070 if (len == 40)
4071 return sha1_to_hex(sha1);
4072 abbrev = find_unique_abbrev(sha1, len);
4074 abblen = strlen(abbrev);
4075 if (abblen < 37) {
4076 static char hex[41];
4077 if (len < abblen && abblen <= len + 2)
4078 sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
4079 else
4080 sprintf(hex, "%s...", abbrev);
4081 return hex;
4082 }
4083 return sha1_to_hex(sha1);
4084}
4085static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
4087{
4088 int line_termination = opt->line_termination;
4089 int inter_name_termination = line_termination ? '\t' : '\0';
4090 fprintf(opt->file, "%s", diff_line_prefix(opt));
4092 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
4093 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
4094 diff_unique_abbrev(p->one->sha1, opt->abbrev));
4095 fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
4096 }
4097 if (p->score) {
4098 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
4099 inter_name_termination);
4100 } else {
4101 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
4102 }
4103 if (p->status == DIFF_STATUS_COPIED ||
4105 p->status == DIFF_STATUS_RENAMED) {
4106 const char *name_a, *name_b;
4107 name_a = p->one->path;
4108 name_b = p->two->path;
4109 strip_prefix(opt->prefix_length, &name_a, &name_b);
4110 write_name_quoted(name_a, opt->file, inter_name_termination);
4111 write_name_quoted(name_b, opt->file, line_termination);
4112 } else {
4113 const char *name_a, *name_b;
4114 name_a = p->one->mode ? p->one->path : p->two->path;
4115 name_b = NULL;
4116 strip_prefix(opt->prefix_length, &name_a, &name_b);
4117 write_name_quoted(name_a, opt->file, line_termination);
4118 }
4119}
4120int diff_unmodified_pair(struct diff_filepair *p)
4122{
4123 /* This function is written stricter than necessary to support
4124 * the currently implemented transformers, but the idea is to
4125 * let transformers to produce diff_filepairs any way they want,
4126 * and filter and clean them up here before producing the output.
4127 */
4128 struct diff_filespec *one = p->one, *two = p->two;
4129 if (DIFF_PAIR_UNMERGED(p))
4131 return 0; /* unmerged is interesting */
4132 /* deletion, addition, mode or type change
4134 * and rename are all interesting.
4135 */
4136 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
4137 DIFF_PAIR_MODE_CHANGED(p) ||
4138 strcmp(one->path, two->path))
4139 return 0;
4140 /* both are valid and point at the same path. that is, we are
4142 * dealing with a change.
4143 */
4144 if (one->sha1_valid && two->sha1_valid &&
4145 !hashcmp(one->sha1, two->sha1) &&
4146 !one->dirty_submodule && !two->dirty_submodule)
4147 return 1; /* no change */
4148 if (!one->sha1_valid && !two->sha1_valid)
4149 return 1; /* both look at the same file on the filesystem. */
4150 return 0;
4151}
4152static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
4154{
4155 if (diff_unmodified_pair(p))
4156 return;
4157 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4159 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4160 return; /* no tree diffs in patch format */
4161 run_diff(p, o);
4163}
4164static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
4166 struct diffstat_t *diffstat)
4167{
4168 if (diff_unmodified_pair(p))
4169 return;
4170 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4172 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4173 return; /* no useful stat for tree diffs */
4174 run_diffstat(p, o, diffstat);
4176}
4177static void diff_flush_checkdiff(struct diff_filepair *p,
4179 struct diff_options *o)
4180{
4181 if (diff_unmodified_pair(p))
4182 return;
4183 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4185 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4186 return; /* nothing to check in tree diffs */
4187 run_checkdiff(p, o);
4189}
4190int diff_queue_is_empty(void)
4192{
4193 struct diff_queue_struct *q = &diff_queued_diff;
4194 int i;
4195 for (i = 0; i < q->nr; i++)
4196 if (!diff_unmodified_pair(q->queue[i]))
4197 return 0;
4198 return 1;
4199}
4200#if DIFF_DEBUG
4202void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
4203{
4204 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
4205 x, one ? one : "",
4206 s->path,
4207 DIFF_FILE_VALID(s) ? "valid" : "invalid",
4208 s->mode,
4209 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
4210 fprintf(stderr, "queue[%d] %s size %lu\n",
4211 x, one ? one : "",
4212 s->size);
4213}
4214void diff_debug_filepair(const struct diff_filepair *p, int i)
4216{
4217 diff_debug_filespec(p->one, i, "one");
4218 diff_debug_filespec(p->two, i, "two");
4219 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
4220 p->score, p->status ? p->status : '?',
4221 p->one->rename_used, p->broken_pair);
4222}
4223void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
4225{
4226 int i;
4227 if (msg)
4228 fprintf(stderr, "%s\n", msg);
4229 fprintf(stderr, "q->nr = %d\n", q->nr);
4230 for (i = 0; i < q->nr; i++) {
4231 struct diff_filepair *p = q->queue[i];
4232 diff_debug_filepair(p, i);
4233 }
4234}
4235#endif
4236static void diff_resolve_rename_copy(void)
4238{
4239 int i;
4240 struct diff_filepair *p;
4241 struct diff_queue_struct *q = &diff_queued_diff;
4242 diff_debug_queue("resolve-rename-copy", q);
4244 for (i = 0; i < q->nr; i++) {
4246 p = q->queue[i];
4247 p->status = 0; /* undecided */
4248 if (DIFF_PAIR_UNMERGED(p))
4249 p->status = DIFF_STATUS_UNMERGED;
4250 else if (!DIFF_FILE_VALID(p->one))
4251 p->status = DIFF_STATUS_ADDED;
4252 else if (!DIFF_FILE_VALID(p->two))
4253 p->status = DIFF_STATUS_DELETED;
4254 else if (DIFF_PAIR_TYPE_CHANGED(p))
4255 p->status = DIFF_STATUS_TYPE_CHANGED;
4256 /* from this point on, we are dealing with a pair
4258 * whose both sides are valid and of the same type, i.e.
4259 * either in-place edit or rename/copy edit.
4260 */
4261 else if (DIFF_PAIR_RENAME(p)) {
4262 /*
4263 * A rename might have re-connected a broken
4264 * pair up, causing the pathnames to be the
4265 * same again. If so, that's not a rename at
4266 * all, just a modification..
4267 *
4268 * Otherwise, see if this source was used for
4269 * multiple renames, in which case we decrement
4270 * the count, and call it a copy.
4271 */
4272 if (!strcmp(p->one->path, p->two->path))
4273 p->status = DIFF_STATUS_MODIFIED;
4274 else if (--p->one->rename_used > 0)
4275 p->status = DIFF_STATUS_COPIED;
4276 else
4277 p->status = DIFF_STATUS_RENAMED;
4278 }
4279 else if (hashcmp(p->one->sha1, p->two->sha1) ||
4280 p->one->mode != p->two->mode ||
4281 p->one->dirty_submodule ||
4282 p->two->dirty_submodule ||
4283 is_null_sha1(p->one->sha1))
4284 p->status = DIFF_STATUS_MODIFIED;
4285 else {
4286 /* This is a "no-change" entry and should not
4287 * happen anymore, but prepare for broken callers.
4288 */
4289 error("feeding unmodified %s to diffcore",
4290 p->one->path);
4291 p->status = DIFF_STATUS_UNKNOWN;
4292 }
4293 }
4294 diff_debug_queue("resolve-rename-copy done", q);
4295}
4296static int check_pair_status(struct diff_filepair *p)
4298{
4299 switch (p->status) {
4300 case DIFF_STATUS_UNKNOWN:
4301 return 0;
4302 case 0:
4303 die("internal error in diff-resolve-rename-copy");
4304 default:
4305 return 1;
4306 }
4307}
4308static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
4310{
4311 int fmt = opt->output_format;
4312 if (fmt & DIFF_FORMAT_CHECKDIFF)
4314 diff_flush_checkdiff(p, opt);
4315 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
4316 diff_flush_raw(p, opt);
4317 else if (fmt & DIFF_FORMAT_NAME) {
4318 const char *name_a, *name_b;
4319 name_a = p->two->path;
4320 name_b = NULL;
4321 strip_prefix(opt->prefix_length, &name_a, &name_b);
4322 write_name_quoted(name_a, opt->file, opt->line_termination);
4323 }
4324}
4325static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
4327{
4328 if (fs->mode)
4329 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
4330 else
4331 fprintf(file, " %s ", newdelete);
4332 write_name_quoted(fs->path, file, '\n');
4333}
4334static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name,
4337 const char *line_prefix)
4338{
4339 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
4340 fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode,
4341 p->two->mode, show_name ? ' ' : '\n');
4342 if (show_name) {
4343 write_name_quoted(p->two->path, file, '\n');
4344 }
4345 }
4346}
4347static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p,
4349 const char *line_prefix)
4350{
4351 char *names = pprint_rename(p->one->path, p->two->path);
4352 fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
4354 free(names);
4355 show_mode_change(file, p, 0, line_prefix);
4356}
4357static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
4359{
4360 FILE *file = opt->file;
4361 const char *line_prefix = diff_line_prefix(opt);
4362 switch(p->status) {
4364 case DIFF_STATUS_DELETED:
4365 fputs(line_prefix, file);
4366 show_file_mode_name(file, "delete", p->one);
4367 break;
4368 case DIFF_STATUS_ADDED:
4369 fputs(line_prefix, file);
4370 show_file_mode_name(file, "create", p->two);
4371 break;
4372 case DIFF_STATUS_COPIED:
4373 fputs(line_prefix, file);
4374 show_rename_copy(file, "copy", p, line_prefix);
4375 break;
4376 case DIFF_STATUS_RENAMED:
4377 fputs(line_prefix, file);
4378 show_rename_copy(file, "rename", p, line_prefix);
4379 break;
4380 default:
4381 if (p->score) {
4382 fprintf(file, "%s rewrite ", line_prefix);
4383 write_name_quoted(p->two->path, file, ' ');
4384 fprintf(file, "(%d%%)\n", similarity_index(p));
4385 }
4386 show_mode_change(file, p, !p->score, line_prefix);
4387 break;
4388 }
4389}
4390struct patch_id_t {
4392 git_SHA_CTX *ctx;
4393 int patchlen;
4394};
4395static int remove_space(char *line, int len)
4397{
4398 int i;
4399 char *dst = line;
4400 unsigned char c;
4401 for (i = 0; i < len; i++)
4403 if (!isspace((c = line[i])))
4404 *dst++ = c;
4405 return dst - line;
4407}
4408static void patch_id_consume(void *priv, char *line, unsigned long len)
4410{
4411 struct patch_id_t *data = priv;
4412 int new_len;
4413 /* Ignore line numbers when computing the SHA1 of the patch */
4415 if (starts_with(line, "@@ -"))
4416 return;
4417 new_len = remove_space(line, len);
4419 git_SHA1_Update(data->ctx, line, new_len);
4421 data->patchlen += new_len;
4422}
4423/* returns 0 upon success, and writes result into sha1 */
4425static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
4426{
4427 struct diff_queue_struct *q = &diff_queued_diff;
4428 int i;
4429 git_SHA_CTX ctx;
4430 struct patch_id_t data;
4431 char buffer[PATH_MAX * 4 + 20];
4432 git_SHA1_Init(&ctx);
4434 memset(&data, 0, sizeof(struct patch_id_t));
4435 data.ctx = &ctx;
4436 for (i = 0; i < q->nr; i++) {
4438 xpparam_t xpp;
4439 xdemitconf_t xecfg;
4440 mmfile_t mf1, mf2;
4441 struct diff_filepair *p = q->queue[i];
4442 int len1, len2;
4443 memset(&xpp, 0, sizeof(xpp));
4445 memset(&xecfg, 0, sizeof(xecfg));
4446 if (p->status == 0)
4447 return error("internal diff status error");
4448 if (p->status == DIFF_STATUS_UNKNOWN)
4449 continue;
4450 if (diff_unmodified_pair(p))
4451 continue;
4452 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4453 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4454 continue;
4455 if (DIFF_PAIR_UNMERGED(p))
4456 continue;
4457 diff_fill_sha1_info(p->one);
4459 diff_fill_sha1_info(p->two);
4460 if (fill_mmfile(&mf1, p->one) < 0 ||
4461 fill_mmfile(&mf2, p->two) < 0)
4462 return error("unable to read files to diff");
4463 len1 = remove_space(p->one->path, strlen(p->one->path));
4465 len2 = remove_space(p->two->path, strlen(p->two->path));
4466 if (p->one->mode == 0)
4467 len1 = snprintf(buffer, sizeof(buffer),
4468 "diff--gita/%.*sb/%.*s"
4469 "newfilemode%06o"
4470 "---/dev/null"
4471 "+++b/%.*s",
4472 len1, p->one->path,
4473 len2, p->two->path,
4474 p->two->mode,
4475 len2, p->two->path);
4476 else if (p->two->mode == 0)
4477 len1 = snprintf(buffer, sizeof(buffer),
4478 "diff--gita/%.*sb/%.*s"
4479 "deletedfilemode%06o"
4480 "---a/%.*s"
4481 "+++/dev/null",
4482 len1, p->one->path,
4483 len2, p->two->path,
4484 p->one->mode,
4485 len1, p->one->path);
4486 else
4487 len1 = snprintf(buffer, sizeof(buffer),
4488 "diff--gita/%.*sb/%.*s"
4489 "---a/%.*s"
4490 "+++b/%.*s",
4491 len1, p->one->path,
4492 len2, p->two->path,
4493 len1, p->one->path,
4494 len2, p->two->path);
4495 git_SHA1_Update(&ctx, buffer, len1);
4496 if (diff_filespec_is_binary(p->one) ||
4498 diff_filespec_is_binary(p->two)) {
4499 git_SHA1_Update(&ctx, sha1_to_hex(p->one->sha1), 40);
4500 git_SHA1_Update(&ctx, sha1_to_hex(p->two->sha1), 40);
4501 continue;
4502 }
4503 xpp.flags = 0;
4505 xecfg.ctxlen = 3;
4506 xecfg.flags = 0;
4507 xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
4508 &xpp, &xecfg);
4509 }
4510 git_SHA1_Final(sha1, &ctx);
4512 return 0;
4513}
4514int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
4516{
4517 struct diff_queue_struct *q = &diff_queued_diff;
4518 int i;
4519 int result = diff_get_patch_id(options, sha1);
4520 for (i = 0; i < q->nr; i++)
4522 diff_free_filepair(q->queue[i]);
4523 free(q->queue);
4525 DIFF_QUEUE_CLEAR(q);
4526 return result;
4528}
4529static int is_summary_empty(const struct diff_queue_struct *q)
4531{
4532 int i;
4533 for (i = 0; i < q->nr; i++) {
4535 const struct diff_filepair *p = q->queue[i];
4536 switch (p->status) {
4538 case DIFF_STATUS_DELETED:
4539 case DIFF_STATUS_ADDED:
4540 case DIFF_STATUS_COPIED:
4541 case DIFF_STATUS_RENAMED:
4542 return 0;
4543 default:
4544 if (p->score)
4545 return 0;
4546 if (p->one->mode && p->two->mode &&
4547 p->one->mode != p->two->mode)
4548 return 0;
4549 break;
4550 }
4551 }
4552 return 1;
4553}
4554static const char rename_limit_warning[] =
4556"inexact rename detection was skipped due to too many files.";
4557static const char degrade_cc_to_c_warning[] =
4559"only found copies from modified paths due to too many files.";
4560static const char rename_limit_advice[] =
4562"you may want to set your %s variable to at least "
4563"%d and retry the command.";
4564void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
4566{
4567 if (degraded_cc)
4568 warning(degrade_cc_to_c_warning);
4569 else if (needed)
4570 warning(rename_limit_warning);
4571 else
4572 return;
4573 if (0 < needed && needed < 32767)
4574 warning(rename_limit_advice, varname, needed);
4575}
4576void diff_flush(struct diff_options *options)
4578{
4579 struct diff_queue_struct *q = &diff_queued_diff;
4580 int i, output_format = options->output_format;
4581 int separator = 0;
4582 int dirstat_by_line = 0;
4583 /*
4585 * Order: raw, stat, summary, patch
4586 * or: name/name-status/checkdiff (other bits clear)
4587 */
4588 if (!q->nr)
4589 goto free_queue;
4590 if (output_format & (DIFF_FORMAT_RAW |
4592 DIFF_FORMAT_NAME |
4593 DIFF_FORMAT_NAME_STATUS |
4594 DIFF_FORMAT_CHECKDIFF)) {
4595 for (i = 0; i < q->nr; i++) {
4596 struct diff_filepair *p = q->queue[i];
4597 if (check_pair_status(p))
4598 flush_one_pair(p, options);
4599 }
4600 separator++;
4601 }
4602 if (output_format & DIFF_FORMAT_DIRSTAT && DIFF_OPT_TST(options, DIRSTAT_BY_LINE))
4604 dirstat_by_line = 1;
4605 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
4607 dirstat_by_line) {
4608 struct diffstat_t diffstat;
4609 memset(&diffstat, 0, sizeof(struct diffstat_t));
4611 for (i = 0; i < q->nr; i++) {
4612 struct diff_filepair *p = q->queue[i];
4613 if (check_pair_status(p))
4614 diff_flush_stat(p, options, &diffstat);
4615 }
4616 if (output_format & DIFF_FORMAT_NUMSTAT)
4617 show_numstat(&diffstat, options);
4618 if (output_format & DIFF_FORMAT_DIFFSTAT)
4619 show_stats(&diffstat, options);
4620 if (output_format & DIFF_FORMAT_SHORTSTAT)
4621 show_shortstats(&diffstat, options);
4622 if (output_format & DIFF_FORMAT_DIRSTAT)
4623 show_dirstat_by_line(&diffstat, options);
4624 free_diffstat_info(&diffstat);
4625 separator++;
4626 }
4627 if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line)
4628 show_dirstat(options);
4629 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
4631 for (i = 0; i < q->nr; i++) {
4632 diff_summary(options, q->queue[i]);
4633 }
4634 separator++;
4635 }
4636 if (output_format & DIFF_FORMAT_NO_OUTPUT &&
4638 DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
4639 DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
4640 /*
4641 * run diff_flush_patch for the exit status. setting
4642 * options->file to /dev/null should be safe, because we
4643 * aren't supposed to produce any output anyway.
4644 */
4645 if (options->close_file)
4646 fclose(options->file);
4647 options->file = fopen("/dev/null", "w");
4648 if (!options->file)
4649 die_errno("Could not open /dev/null");
4650 options->close_file = 1;
4651 for (i = 0; i < q->nr; i++) {
4652 struct diff_filepair *p = q->queue[i];
4653 if (check_pair_status(p))
4654 diff_flush_patch(p, options);
4655 if (options->found_changes)
4656 break;
4657 }
4658 }
4659 if (output_format & DIFF_FORMAT_PATCH) {
4661 if (separator) {
4662 fprintf(options->file, "%s%c",
4663 diff_line_prefix(options),
4664 options->line_termination);
4665 if (options->stat_sep) {
4666 /* attach patch instead of inline */
4667 fputs(options->stat_sep, options->file);
4668 }
4669 }
4670 for (i = 0; i < q->nr; i++) {
4672 struct diff_filepair *p = q->queue[i];
4673 if (check_pair_status(p))
4674 diff_flush_patch(p, options);
4675 }
4676 }
4677 if (output_format & DIFF_FORMAT_CALLBACK)
4679 options->format_callback(q, options, options->format_callback_data);
4680 for (i = 0; i < q->nr; i++)
4682 diff_free_filepair(q->queue[i]);
4683free_queue:
4684 free(q->queue);
4685 DIFF_QUEUE_CLEAR(q);
4686 if (options->close_file)
4687 fclose(options->file);
4688 /*
4690 * Report the content-level differences with HAS_CHANGES;
4691 * diff_addremove/diff_change does not set the bit when
4692 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4693 */
4694 if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
4695 if (options->found_changes)
4696 DIFF_OPT_SET(options, HAS_CHANGES);
4697 else
4698 DIFF_OPT_CLR(options, HAS_CHANGES);
4699 }
4700}
4701static int match_filter(const struct diff_options *options, const struct diff_filepair *p)
4703{
4704 return (((p->status == DIFF_STATUS_MODIFIED) &&
4705 ((p->score &&
4706 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) ||
4707 (!p->score &&
4708 filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) ||
4709 ((p->status != DIFF_STATUS_MODIFIED) &&
4710 filter_bit_tst(p->status, options)));
4711}
4712static void diffcore_apply_filter(struct diff_options *options)
4714{
4715 int i;
4716 struct diff_queue_struct *q = &diff_queued_diff;
4717 struct diff_queue_struct outq;
4718 DIFF_QUEUE_CLEAR(&outq);
4720 if (!options->filter)
4722 return;
4723 if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) {
4725 int found;
4726 for (i = found = 0; !found && i < q->nr; i++) {
4727 if (match_filter(options, q->queue[i]))
4728 found++;
4729 }
4730 if (found)
4731 return;
4732 /* otherwise we will clear the whole queue
4734 * by copying the empty outq at the end of this
4735 * function, but first clear the current entries
4736 * in the queue.
4737 */
4738 for (i = 0; i < q->nr; i++)
4739 diff_free_filepair(q->queue[i]);
4740 }
4741 else {
4742 /* Only the matching ones */
4743 for (i = 0; i < q->nr; i++) {
4744 struct diff_filepair *p = q->queue[i];
4745 if (match_filter(options, p))
4746 diff_q(&outq, p);
4747 else
4748 diff_free_filepair(p);
4749 }
4750 }
4751 free(q->queue);
4752 *q = outq;
4753}
4754/* Check whether two filespecs with the same mode and size are identical */
4756static int diff_filespec_is_identical(struct diff_filespec *one,
4757 struct diff_filespec *two)
4758{
4759 if (S_ISGITLINK(one->mode))
4760 return 0;
4761 if (diff_populate_filespec(one, 0))
4762 return 0;
4763 if (diff_populate_filespec(two, 0))
4764 return 0;
4765 return !memcmp(one->data, two->data, one->size);
4766}
4767static int diff_filespec_check_stat_unmatch(struct diff_filepair *p)
4769{
4770 if (p->done_skip_stat_unmatch)
4771 return p->skip_stat_unmatch_result;
4772 p->done_skip_stat_unmatch = 1;
4774 p->skip_stat_unmatch_result = 0;
4775 /*
4776 * 1. Entries that come from stat info dirtiness
4777 * always have both sides (iow, not create/delete),
4778 * one side of the object name is unknown, with
4779 * the same mode and size. Keep the ones that
4780 * do not match these criteria. They have real
4781 * differences.
4782 *
4783 * 2. At this point, the file is known to be modified,
4784 * with the same mode and size, and the object
4785 * name of one side is unknown. Need to inspect
4786 * the identical contents.
4787 */
4788 if (!DIFF_FILE_VALID(p->one) || /* (1) */
4789 !DIFF_FILE_VALID(p->two) ||
4790 (p->one->sha1_valid && p->two->sha1_valid) ||
4791 (p->one->mode != p->two->mode) ||
4792 diff_populate_filespec(p->one, CHECK_SIZE_ONLY) ||
4793 diff_populate_filespec(p->two, CHECK_SIZE_ONLY) ||
4794 (p->one->size != p->two->size) ||
4795 !diff_filespec_is_identical(p->one, p->two)) /* (2) */
4796 p->skip_stat_unmatch_result = 1;
4797 return p->skip_stat_unmatch_result;
4798}
4799static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
4801{
4802 int i;
4803 struct diff_queue_struct *q = &diff_queued_diff;
4804 struct diff_queue_struct outq;
4805 DIFF_QUEUE_CLEAR(&outq);
4806 for (i = 0; i < q->nr; i++) {
4808 struct diff_filepair *p = q->queue[i];
4809 if (diff_filespec_check_stat_unmatch(p))
4811 diff_q(&outq, p);
4812 else {
4813 /*
4814 * The caller can subtract 1 from skip_stat_unmatch
4815 * to determine how many paths were dirty only
4816 * due to stat info mismatch.
4817 */
4818 if (!DIFF_OPT_TST(diffopt, NO_INDEX))
4819 diffopt->skip_stat_unmatch++;
4820 diff_free_filepair(p);
4821 }
4822 }
4823 free(q->queue);
4824 *q = outq;
4825}
4826static int diffnamecmp(const void *a_, const void *b_)
4828{
4829 const struct diff_filepair *a = *((const struct diff_filepair **)a_);
4830 const struct diff_filepair *b = *((const struct diff_filepair **)b_);
4831 const char *name_a, *name_b;
4832 name_a = a->one ? a->one->path : a->two->path;
4834 name_b = b->one ? b->one->path : b->two->path;
4835 return strcmp(name_a, name_b);
4836}
4837void diffcore_fix_diff_index(struct diff_options *options)
4839{
4840 struct diff_queue_struct *q = &diff_queued_diff;
4841 qsort(q->queue, q->nr, sizeof(q->queue[0]), diffnamecmp);
4842}
4843void diffcore_std(struct diff_options *options)
4845{
4846 /* NOTE please keep the following in sync with diff_tree_combined() */
4847 if (options->skip_stat_unmatch)
4848 diffcore_skip_stat_unmatch(options);
4849 if (!options->found_follow) {
4850 /* See try_to_follow_renames() in tree-diff.c */
4851 if (options->break_opt != -1)
4852 diffcore_break(options->break_opt);
4853 if (options->detect_rename)
4854 diffcore_rename(options);
4855 if (options->break_opt != -1)
4856 diffcore_merge_broken();
4857 }
4858 if (options->pickaxe)
4859 diffcore_pickaxe(options);
4860 if (options->orderfile)
4861 diffcore_order(options->orderfile);
4862 if (!options->found_follow)
4863 /* See try_to_follow_renames() in tree-diff.c */
4864 diff_resolve_rename_copy();
4865 diffcore_apply_filter(options);
4866 if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
4868 DIFF_OPT_SET(options, HAS_CHANGES);
4869 else
4870 DIFF_OPT_CLR(options, HAS_CHANGES);
4871 options->found_follow = 0;
4873}
4874int diff_result_code(struct diff_options *opt, int status)
4876{
4877 int result = 0;
4878 diff_warn_rename_limit("diff.renameLimit",
4880 opt->needed_rename_limit,
4881 opt->degraded_cc_to_c);
4882 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
4883 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
4884 return status;
4885 if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
4886 DIFF_OPT_TST(opt, HAS_CHANGES))
4887 result |= 01;
4888 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
4889 DIFF_OPT_TST(opt, CHECK_FAILED))
4890 result |= 02;
4891 return result;
4892}
4893int diff_can_quit_early(struct diff_options *opt)
4895{
4896 return (DIFF_OPT_TST(opt, QUICK) &&
4897 !opt->filter &&
4898 DIFF_OPT_TST(opt, HAS_CHANGES));
4899}
4900/*
4902 * Shall changes to this submodule be ignored?
4903 *
4904 * Submodule changes can be configured to be ignored separately for each path,
4905 * but that configuration can be overridden from the command line.
4906 */
4907static int is_submodule_ignored(const char *path, struct diff_options *options)
4908{
4909 int ignored = 0;
4910 unsigned orig_flags = options->flags;
4911 if (!DIFF_OPT_TST(options, OVERRIDE_SUBMODULE_CONFIG))
4912 set_diffopt_flags_from_submodule_config(options, path);
4913 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES))
4914 ignored = 1;
4915 options->flags = orig_flags;
4916 return ignored;
4917}
4918void diff_addremove(struct diff_options *options,
4920 int addremove, unsigned mode,
4921 const unsigned char *sha1,
4922 int sha1_valid,
4923 const char *concatpath, unsigned dirty_submodule)
4924{
4925 struct diff_filespec *one, *two;
4926 if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options))
4928 return;
4929 /* This may look odd, but it is a preparation for
4931 * feeding "there are unchanged files which should
4932 * not produce diffs, but when you are doing copy
4933 * detection you would need them, so here they are"
4934 * entries to the diff-core. They will be prefixed
4935 * with something like '=' or '*' (I haven't decided
4936 * which but should not make any difference).
4937 * Feeding the same new and old to diff_change()
4938 * also has the same effect.
4939 * Before the final output happens, they are pruned after
4940 * merged into rename/copy pairs as appropriate.
4941 */
4942 if (DIFF_OPT_TST(options, REVERSE_DIFF))
4943 addremove = (addremove == '+' ? '-' :
4944 addremove == '-' ? '+' : addremove);
4945 if (options->prefix &&
4947 strncmp(concatpath, options->prefix, options->prefix_length))
4948 return;
4949 one = alloc_filespec(concatpath);
4951 two = alloc_filespec(concatpath);
4952 if (addremove != '+')
4954 fill_filespec(one, sha1, sha1_valid, mode);
4955 if (addremove != '-') {
4956 fill_filespec(two, sha1, sha1_valid, mode);
4957 two->dirty_submodule = dirty_submodule;
4958 }
4959 diff_queue(&diff_queued_diff, one, two);
4961 if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
4962 DIFF_OPT_SET(options, HAS_CHANGES);
4963}
4964void diff_change(struct diff_options *options,
4966 unsigned old_mode, unsigned new_mode,
4967 const unsigned char *old_sha1,
4968 const unsigned char *new_sha1,
4969 int old_sha1_valid, int new_sha1_valid,
4970 const char *concatpath,
4971 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
4972{
4973 struct diff_filespec *one, *two;
4974 struct diff_filepair *p;
4975 if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) &&
4977 is_submodule_ignored(concatpath, options))
4978 return;
4979 if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
4981 unsigned tmp;
4982 const unsigned char *tmp_c;
4983 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
4984 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
4985 tmp = old_sha1_valid; old_sha1_valid = new_sha1_valid;
4986 new_sha1_valid = tmp;
4987 tmp = old_dirty_submodule; old_dirty_submodule = new_dirty_submodule;
4988 new_dirty_submodule = tmp;
4989 }
4990 if (options->prefix &&
4992 strncmp(concatpath, options->prefix, options->prefix_length))
4993 return;
4994 one = alloc_filespec(concatpath);
4996 two = alloc_filespec(concatpath);
4997 fill_filespec(one, old_sha1, old_sha1_valid, old_mode);
4998 fill_filespec(two, new_sha1, new_sha1_valid, new_mode);
4999 one->dirty_submodule = old_dirty_submodule;
5000 two->dirty_submodule = new_dirty_submodule;
5001 p = diff_queue(&diff_queued_diff, one, two);
5002 if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
5004 return;
5005 if (DIFF_OPT_TST(options, QUICK) && options->skip_stat_unmatch &&
5007 !diff_filespec_check_stat_unmatch(p))
5008 return;
5009 DIFF_OPT_SET(options, HAS_CHANGES);
5011}
5012struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
5014{
5015 struct diff_filepair *pair;
5016 struct diff_filespec *one, *two;
5017 if (options->prefix &&
5019 strncmp(path, options->prefix, options->prefix_length))
5020 return NULL;
5021 one = alloc_filespec(path);
5023 two = alloc_filespec(path);
5024 pair = diff_queue(&diff_queued_diff, one, two);
5025 pair->is_unmerged = 1;
5026 return pair;
5027}
5028static char *run_textconv(const char *pgm, struct diff_filespec *spec,
5030 size_t *outsize)
5031{
5032 struct diff_tempfile *temp;
5033 const char *argv[3];
5034 const char **arg = argv;
5035 struct child_process child = CHILD_PROCESS_INIT;
5036 struct strbuf buf = STRBUF_INIT;
5037 int err = 0;
5038 temp = prepare_temp_file(spec->path, spec);
5040 *arg++ = pgm;
5041 *arg++ = temp->name;
5042 *arg = NULL;
5043 child.use_shell = 1;
5045 child.argv = argv;
5046 child.out = -1;
5047 if (start_command(&child)) {
5048 remove_tempfile();
5049 return NULL;
5050 }
5051 if (strbuf_read(&buf, child.out, 0) < 0)
5053 err = error("error reading from textconv command '%s'", pgm);
5054 close(child.out);
5055 if (finish_command(&child) || err) {
5057 strbuf_release(&buf);
5058 remove_tempfile();
5059 return NULL;
5060 }
5061 remove_tempfile();
5062 return strbuf_detach(&buf, outsize);
5064}
5065size_t fill_textconv(struct userdiff_driver *driver,
5067 struct diff_filespec *df,
5068 char **outbuf)
5069{
5070 size_t size;
5071 if (!driver || !driver->textconv) {
5073 if (!DIFF_FILE_VALID(df)) {
5074 *outbuf = "";
5075 return 0;
5076 }
5077 if (diff_populate_filespec(df, 0))
5078 die("unable to read files to diff");
5079 *outbuf = df->data;
5080 return df->size;
5081 }
5082 if (driver->textconv_cache && df->sha1_valid) {
5084 *outbuf = notes_cache_get(driver->textconv_cache, df->sha1,
5085 &size);
5086 if (*outbuf)
5087 return size;
5088 }
5089 *outbuf = run_textconv(driver->textconv, df, &size);
5091 if (!*outbuf)
5092 die("unable to read files to diff");
5093 if (driver->textconv_cache && df->sha1_valid) {
5095 /* ignore errors, as we might be in a readonly repository */
5096 notes_cache_put(driver->textconv_cache, df->sha1, *outbuf,
5097 size);
5098 /*
5099 * we could save up changes and flush them all at the end,
5100 * but we would need an extra call after all diffing is done.
5101 * Since generating a cache entry is the slow path anyway,
5102 * this extra overhead probably isn't a big deal.
5103 */
5104 notes_cache_write(driver->textconv_cache);
5105 }
5106 return size;
5108}
5109void setup_diff_pager(struct diff_options *opt)
5111{
5112 /*
5113 * If the user asked for our exit code, then either they want --quiet
5114 * or --exit-code. We should definitely not bother with a pager in the
5115 * former case, as we will generate no output. Since we still properly
5116 * report our exit code even when a pager is run, we _could_ run a
5117 * pager with --exit-code. But since we have not done so historically,
5118 * and because it is easy to find people oneline advising "git diff
5119 * --exit-code" in hooks and other scripts, we do not do so.
5120 */
5121 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
5122 check_pager_config("diff") != 0)
5123 setup_pager();
5124}