Merge tag 'v2.14.1'
[git/raj.git] / diff.c
blob85e714f6c68d24e11228b69d2511c49811c979b4
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #include "cache.h"
5 #include "config.h"
6 #include "tempfile.h"
7 #include "quote.h"
8 #include "diff.h"
9 #include "diffcore.h"
10 #include "delta.h"
11 #include "xdiff-interface.h"
12 #include "color.h"
13 #include "attr.h"
14 #include "run-command.h"
15 #include "utf8.h"
16 #include "userdiff.h"
17 #include "submodule-config.h"
18 #include "submodule.h"
19 #include "ll-merge.h"
20 #include "string-list.h"
21 #include "argv-array.h"
22 #include "graph.h"
24 #ifdef NO_FAST_WORKING_DIRECTORY
25 #define FAST_WORKING_DIRECTORY 0
26 #else
27 #define FAST_WORKING_DIRECTORY 1
28 #endif
30 static int diff_detect_rename_default;
31 static int diff_indent_heuristic = 1;
32 static int diff_rename_limit_default = 400;
33 static int diff_suppress_blank_empty;
34 static int diff_use_color_default = -1;
35 static int diff_context_default = 3;
36 static int diff_interhunk_context_default;
37 static const char *diff_word_regex_cfg;
38 static const char *external_diff_cmd_cfg;
39 static const char *diff_order_file_cfg;
40 int diff_auto_refresh_index = 1;
41 static int diff_mnemonic_prefix;
42 static int diff_no_prefix;
43 static int diff_stat_graph_width;
44 static int diff_dirstat_permille_default = 30;
45 static struct diff_options default_diff_options;
46 static long diff_algorithm;
47 static unsigned ws_error_highlight_default = WSEH_NEW;
49 static char diff_colors[][COLOR_MAXLEN] = {
50 GIT_COLOR_RESET,
51 GIT_COLOR_NORMAL, /* CONTEXT */
52 GIT_COLOR_BOLD, /* METAINFO */
53 GIT_COLOR_CYAN, /* FRAGINFO */
54 GIT_COLOR_RED, /* OLD */
55 GIT_COLOR_GREEN, /* NEW */
56 GIT_COLOR_YELLOW, /* COMMIT */
57 GIT_COLOR_BG_RED, /* WHITESPACE */
58 GIT_COLOR_NORMAL, /* FUNCINFO */
61 static NORETURN void die_want_option(const char *option_name)
63 die(_("option '%s' requires a value"), option_name);
66 static int parse_diff_color_slot(const char *var)
68 if (!strcasecmp(var, "context") || !strcasecmp(var, "plain"))
69 return DIFF_CONTEXT;
70 if (!strcasecmp(var, "meta"))
71 return DIFF_METAINFO;
72 if (!strcasecmp(var, "frag"))
73 return DIFF_FRAGINFO;
74 if (!strcasecmp(var, "old"))
75 return DIFF_FILE_OLD;
76 if (!strcasecmp(var, "new"))
77 return DIFF_FILE_NEW;
78 if (!strcasecmp(var, "commit"))
79 return DIFF_COMMIT;
80 if (!strcasecmp(var, "whitespace"))
81 return DIFF_WHITESPACE;
82 if (!strcasecmp(var, "func"))
83 return DIFF_FUNCINFO;
84 return -1;
87 static int parse_dirstat_params(struct diff_options *options, const char *params_string,
88 struct strbuf *errmsg)
90 char *params_copy = xstrdup(params_string);
91 struct string_list params = STRING_LIST_INIT_NODUP;
92 int ret = 0;
93 int i;
95 if (*params_copy)
96 string_list_split_in_place(&params, params_copy, ',', -1);
97 for (i = 0; i < params.nr; i++) {
98 const char *p = params.items[i].string;
99 if (!strcmp(p, "changes")) {
100 DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
101 DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
102 } else if (!strcmp(p, "lines")) {
103 DIFF_OPT_SET(options, DIRSTAT_BY_LINE);
104 DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
105 } else if (!strcmp(p, "files")) {
106 DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
107 DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
108 } else if (!strcmp(p, "noncumulative")) {
109 DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
110 } else if (!strcmp(p, "cumulative")) {
111 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
112 } else if (isdigit(*p)) {
113 char *end;
114 int permille = strtoul(p, &end, 10) * 10;
115 if (*end == '.' && isdigit(*++end)) {
116 /* only use first digit */
117 permille += *end - '0';
118 /* .. and ignore any further digits */
119 while (isdigit(*++end))
120 ; /* nothing */
122 if (!*end)
123 options->dirstat_permille = permille;
124 else {
125 strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
127 ret++;
129 } else {
130 strbuf_addf(errmsg, _(" Unknown dirstat parameter '%s'\n"), p);
131 ret++;
135 string_list_clear(&params, 0);
136 free(params_copy);
137 return ret;
140 static int parse_submodule_params(struct diff_options *options, const char *value)
142 if (!strcmp(value, "log"))
143 options->submodule_format = DIFF_SUBMODULE_LOG;
144 else if (!strcmp(value, "short"))
145 options->submodule_format = DIFF_SUBMODULE_SHORT;
146 else if (!strcmp(value, "diff"))
147 options->submodule_format = DIFF_SUBMODULE_INLINE_DIFF;
148 else
149 return -1;
150 return 0;
153 static int git_config_rename(const char *var, const char *value)
155 if (!value)
156 return DIFF_DETECT_RENAME;
157 if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
158 return DIFF_DETECT_COPY;
159 return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
162 long parse_algorithm_value(const char *value)
164 if (!value)
165 return -1;
166 else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default"))
167 return 0;
168 else if (!strcasecmp(value, "minimal"))
169 return XDF_NEED_MINIMAL;
170 else if (!strcasecmp(value, "patience"))
171 return XDF_PATIENCE_DIFF;
172 else if (!strcasecmp(value, "histogram"))
173 return XDF_HISTOGRAM_DIFF;
174 return -1;
177 static int parse_one_token(const char **arg, const char *token)
179 const char *rest;
180 if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) {
181 *arg = rest;
182 return 1;
184 return 0;
187 static int parse_ws_error_highlight(const char *arg)
189 const char *orig_arg = arg;
190 unsigned val = 0;
192 while (*arg) {
193 if (parse_one_token(&arg, "none"))
194 val = 0;
195 else if (parse_one_token(&arg, "default"))
196 val = WSEH_NEW;
197 else if (parse_one_token(&arg, "all"))
198 val = WSEH_NEW | WSEH_OLD | WSEH_CONTEXT;
199 else if (parse_one_token(&arg, "new"))
200 val |= WSEH_NEW;
201 else if (parse_one_token(&arg, "old"))
202 val |= WSEH_OLD;
203 else if (parse_one_token(&arg, "context"))
204 val |= WSEH_CONTEXT;
205 else {
206 return -1 - (int)(arg - orig_arg);
208 if (*arg)
209 arg++;
211 return val;
215 * These are to give UI layer defaults.
216 * The core-level commands such as git-diff-files should
217 * never be affected by the setting of diff.renames
218 * the user happens to have in the configuration file.
220 void init_diff_ui_defaults(void)
222 diff_detect_rename_default = 1;
225 int git_diff_heuristic_config(const char *var, const char *value, void *cb)
227 if (!strcmp(var, "diff.indentheuristic"))
228 diff_indent_heuristic = git_config_bool(var, value);
229 return 0;
232 int git_diff_ui_config(const char *var, const char *value, void *cb)
234 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
235 diff_use_color_default = git_config_colorbool(var, value);
236 return 0;
238 if (!strcmp(var, "diff.context")) {
239 diff_context_default = git_config_int(var, value);
240 if (diff_context_default < 0)
241 return -1;
242 return 0;
244 if (!strcmp(var, "diff.interhunkcontext")) {
245 diff_interhunk_context_default = git_config_int(var, value);
246 if (diff_interhunk_context_default < 0)
247 return -1;
248 return 0;
250 if (!strcmp(var, "diff.renames")) {
251 diff_detect_rename_default = git_config_rename(var, value);
252 return 0;
254 if (!strcmp(var, "diff.autorefreshindex")) {
255 diff_auto_refresh_index = git_config_bool(var, value);
256 return 0;
258 if (!strcmp(var, "diff.mnemonicprefix")) {
259 diff_mnemonic_prefix = git_config_bool(var, value);
260 return 0;
262 if (!strcmp(var, "diff.noprefix")) {
263 diff_no_prefix = git_config_bool(var, value);
264 return 0;
266 if (!strcmp(var, "diff.statgraphwidth")) {
267 diff_stat_graph_width = git_config_int(var, value);
268 return 0;
270 if (!strcmp(var, "diff.external"))
271 return git_config_string(&external_diff_cmd_cfg, var, value);
272 if (!strcmp(var, "diff.wordregex"))
273 return git_config_string(&diff_word_regex_cfg, var, value);
274 if (!strcmp(var, "diff.orderfile"))
275 return git_config_pathname(&diff_order_file_cfg, var, value);
277 if (!strcmp(var, "diff.ignoresubmodules"))
278 handle_ignore_submodules_arg(&default_diff_options, value);
280 if (!strcmp(var, "diff.submodule")) {
281 if (parse_submodule_params(&default_diff_options, value))
282 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
283 value);
284 return 0;
287 if (!strcmp(var, "diff.algorithm")) {
288 diff_algorithm = parse_algorithm_value(value);
289 if (diff_algorithm < 0)
290 return -1;
291 return 0;
294 if (!strcmp(var, "diff.wserrorhighlight")) {
295 int val = parse_ws_error_highlight(value);
296 if (val < 0)
297 return -1;
298 ws_error_highlight_default = val;
299 return 0;
302 if (git_color_config(var, value, cb) < 0)
303 return -1;
305 return git_diff_basic_config(var, value, cb);
308 int git_diff_basic_config(const char *var, const char *value, void *cb)
310 const char *name;
312 if (!strcmp(var, "diff.renamelimit")) {
313 diff_rename_limit_default = git_config_int(var, value);
314 return 0;
317 if (userdiff_config(var, value) < 0)
318 return -1;
320 if (skip_prefix(var, "diff.color.", &name) ||
321 skip_prefix(var, "color.diff.", &name)) {
322 int slot = parse_diff_color_slot(name);
323 if (slot < 0)
324 return 0;
325 if (!value)
326 return config_error_nonbool(var);
327 return color_parse(value, diff_colors[slot]);
330 /* like GNU diff's --suppress-blank-empty option */
331 if (!strcmp(var, "diff.suppressblankempty") ||
332 /* for backwards compatibility */
333 !strcmp(var, "diff.suppress-blank-empty")) {
334 diff_suppress_blank_empty = git_config_bool(var, value);
335 return 0;
338 if (!strcmp(var, "diff.dirstat")) {
339 struct strbuf errmsg = STRBUF_INIT;
340 default_diff_options.dirstat_permille = diff_dirstat_permille_default;
341 if (parse_dirstat_params(&default_diff_options, value, &errmsg))
342 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
343 errmsg.buf);
344 strbuf_release(&errmsg);
345 diff_dirstat_permille_default = default_diff_options.dirstat_permille;
346 return 0;
349 if (starts_with(var, "submodule."))
350 return parse_submodule_config_option(var, value);
352 if (git_diff_heuristic_config(var, value, cb) < 0)
353 return -1;
355 return git_default_config(var, value, cb);
358 static char *quote_two(const char *one, const char *two)
360 int need_one = quote_c_style(one, NULL, NULL, 1);
361 int need_two = quote_c_style(two, NULL, NULL, 1);
362 struct strbuf res = STRBUF_INIT;
364 if (need_one + need_two) {
365 strbuf_addch(&res, '"');
366 quote_c_style(one, &res, NULL, 1);
367 quote_c_style(two, &res, NULL, 1);
368 strbuf_addch(&res, '"');
369 } else {
370 strbuf_addstr(&res, one);
371 strbuf_addstr(&res, two);
373 return strbuf_detach(&res, NULL);
376 static const char *external_diff(void)
378 static const char *external_diff_cmd = NULL;
379 static int done_preparing = 0;
381 if (done_preparing)
382 return external_diff_cmd;
383 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
384 if (!external_diff_cmd)
385 external_diff_cmd = external_diff_cmd_cfg;
386 done_preparing = 1;
387 return external_diff_cmd;
391 * Keep track of files used for diffing. Sometimes such an entry
392 * refers to a temporary file, sometimes to an existing file, and
393 * sometimes to "/dev/null".
395 static struct diff_tempfile {
397 * filename external diff should read from, or NULL if this
398 * entry is currently not in use:
400 const char *name;
402 char hex[GIT_MAX_HEXSZ + 1];
403 char mode[10];
406 * If this diff_tempfile instance refers to a temporary file,
407 * this tempfile object is used to manage its lifetime.
409 struct tempfile tempfile;
410 } diff_temp[2];
412 typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
414 struct emit_callback {
415 int color_diff;
416 unsigned ws_rule;
417 int blank_at_eof_in_preimage;
418 int blank_at_eof_in_postimage;
419 int lno_in_preimage;
420 int lno_in_postimage;
421 sane_truncate_fn truncate;
422 const char **label_path;
423 struct diff_words_data *diff_words;
424 struct diff_options *opt;
425 struct strbuf *header;
428 static int count_lines(const char *data, int size)
430 int count, ch, completely_empty = 1, nl_just_seen = 0;
431 count = 0;
432 while (0 < size--) {
433 ch = *data++;
434 if (ch == '\n') {
435 count++;
436 nl_just_seen = 1;
437 completely_empty = 0;
439 else {
440 nl_just_seen = 0;
441 completely_empty = 0;
444 if (completely_empty)
445 return 0;
446 if (!nl_just_seen)
447 count++; /* no trailing newline */
448 return count;
451 static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
453 if (!DIFF_FILE_VALID(one)) {
454 mf->ptr = (char *)""; /* does not matter */
455 mf->size = 0;
456 return 0;
458 else if (diff_populate_filespec(one, 0))
459 return -1;
461 mf->ptr = one->data;
462 mf->size = one->size;
463 return 0;
466 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
467 static unsigned long diff_filespec_size(struct diff_filespec *one)
469 if (!DIFF_FILE_VALID(one))
470 return 0;
471 diff_populate_filespec(one, CHECK_SIZE_ONLY);
472 return one->size;
475 static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
477 char *ptr = mf->ptr;
478 long size = mf->size;
479 int cnt = 0;
481 if (!size)
482 return cnt;
483 ptr += size - 1; /* pointing at the very end */
484 if (*ptr != '\n')
485 ; /* incomplete line */
486 else
487 ptr--; /* skip the last LF */
488 while (mf->ptr < ptr) {
489 char *prev_eol;
490 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
491 if (*prev_eol == '\n')
492 break;
493 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
494 break;
495 cnt++;
496 ptr = prev_eol - 1;
498 return cnt;
501 static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
502 struct emit_callback *ecbdata)
504 int l1, l2, at;
505 unsigned ws_rule = ecbdata->ws_rule;
506 l1 = count_trailing_blank(mf1, ws_rule);
507 l2 = count_trailing_blank(mf2, ws_rule);
508 if (l2 <= l1) {
509 ecbdata->blank_at_eof_in_preimage = 0;
510 ecbdata->blank_at_eof_in_postimage = 0;
511 return;
513 at = count_lines(mf1->ptr, mf1->size);
514 ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
516 at = count_lines(mf2->ptr, mf2->size);
517 ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
520 static void emit_line_0(struct diff_options *o, const char *set, const char *reset,
521 int first, const char *line, int len)
523 int has_trailing_newline, has_trailing_carriage_return;
524 int nofirst;
525 FILE *file = o->file;
527 fputs(diff_line_prefix(o), file);
529 if (len == 0) {
530 has_trailing_newline = (first == '\n');
531 has_trailing_carriage_return = (!has_trailing_newline &&
532 (first == '\r'));
533 nofirst = has_trailing_newline || has_trailing_carriage_return;
534 } else {
535 has_trailing_newline = (len > 0 && line[len-1] == '\n');
536 if (has_trailing_newline)
537 len--;
538 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
539 if (has_trailing_carriage_return)
540 len--;
541 nofirst = 0;
544 if (len || !nofirst) {
545 fputs(set, file);
546 if (!nofirst)
547 fputc(first, file);
548 fwrite(line, len, 1, file);
549 fputs(reset, file);
551 if (has_trailing_carriage_return)
552 fputc('\r', file);
553 if (has_trailing_newline)
554 fputc('\n', file);
557 static void emit_line(struct diff_options *o, const char *set, const char *reset,
558 const char *line, int len)
560 emit_line_0(o, set, reset, line[0], line+1, len-1);
563 static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
565 if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
566 ecbdata->blank_at_eof_in_preimage &&
567 ecbdata->blank_at_eof_in_postimage &&
568 ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
569 ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
570 return 0;
571 return ws_blank_line(line, len, ecbdata->ws_rule);
574 static void emit_line_checked(const char *reset,
575 struct emit_callback *ecbdata,
576 const char *line, int len,
577 enum color_diff color,
578 unsigned ws_error_highlight,
579 char sign)
581 const char *set = diff_get_color(ecbdata->color_diff, color);
582 const char *ws = NULL;
584 if (ecbdata->opt->ws_error_highlight & ws_error_highlight) {
585 ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
586 if (!*ws)
587 ws = NULL;
590 if (!ws)
591 emit_line_0(ecbdata->opt, set, reset, sign, line, len);
592 else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len))
593 /* Blank line at EOF - paint '+' as well */
594 emit_line_0(ecbdata->opt, ws, reset, sign, line, len);
595 else {
596 /* Emit just the prefix, then the rest. */
597 emit_line_0(ecbdata->opt, set, reset, sign, "", 0);
598 ws_check_emit(line, len, ecbdata->ws_rule,
599 ecbdata->opt->file, set, reset, ws);
603 static void emit_add_line(const char *reset,
604 struct emit_callback *ecbdata,
605 const char *line, int len)
607 emit_line_checked(reset, ecbdata, line, len,
608 DIFF_FILE_NEW, WSEH_NEW, '+');
611 static void emit_del_line(const char *reset,
612 struct emit_callback *ecbdata,
613 const char *line, int len)
615 emit_line_checked(reset, ecbdata, line, len,
616 DIFF_FILE_OLD, WSEH_OLD, '-');
619 static void emit_context_line(const char *reset,
620 struct emit_callback *ecbdata,
621 const char *line, int len)
623 emit_line_checked(reset, ecbdata, line, len,
624 DIFF_CONTEXT, WSEH_CONTEXT, ' ');
627 static void emit_hunk_header(struct emit_callback *ecbdata,
628 const char *line, int len)
630 const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
631 const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
632 const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
633 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
634 static const char atat[2] = { '@', '@' };
635 const char *cp, *ep;
636 struct strbuf msgbuf = STRBUF_INIT;
637 int org_len = len;
638 int i = 1;
641 * As a hunk header must begin with "@@ -<old>, +<new> @@",
642 * it always is at least 10 bytes long.
644 if (len < 10 ||
645 memcmp(line, atat, 2) ||
646 !(ep = memmem(line + 2, len - 2, atat, 2))) {
647 emit_line(ecbdata->opt, context, reset, line, len);
648 return;
650 ep += 2; /* skip over @@ */
652 /* The hunk header in fraginfo color */
653 strbuf_addstr(&msgbuf, frag);
654 strbuf_add(&msgbuf, line, ep - line);
655 strbuf_addstr(&msgbuf, reset);
658 * trailing "\r\n"
660 for ( ; i < 3; i++)
661 if (line[len - i] == '\r' || line[len - i] == '\n')
662 len--;
664 /* blank before the func header */
665 for (cp = ep; ep - line < len; ep++)
666 if (*ep != ' ' && *ep != '\t')
667 break;
668 if (ep != cp) {
669 strbuf_addstr(&msgbuf, context);
670 strbuf_add(&msgbuf, cp, ep - cp);
671 strbuf_addstr(&msgbuf, reset);
674 if (ep < line + len) {
675 strbuf_addstr(&msgbuf, func);
676 strbuf_add(&msgbuf, ep, line + len - ep);
677 strbuf_addstr(&msgbuf, reset);
680 strbuf_add(&msgbuf, line + len, org_len - len);
681 emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
682 strbuf_release(&msgbuf);
685 static struct diff_tempfile *claim_diff_tempfile(void) {
686 int i;
687 for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
688 if (!diff_temp[i].name)
689 return diff_temp + i;
690 die("BUG: diff is failing to clean up its tempfiles");
693 static void remove_tempfile(void)
695 int i;
696 for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
697 if (is_tempfile_active(&diff_temp[i].tempfile))
698 delete_tempfile(&diff_temp[i].tempfile);
699 diff_temp[i].name = NULL;
703 static void print_line_count(FILE *file, int count)
705 switch (count) {
706 case 0:
707 fprintf(file, "0,0");
708 break;
709 case 1:
710 fprintf(file, "1");
711 break;
712 default:
713 fprintf(file, "1,%d", count);
714 break;
718 static void emit_rewrite_lines(struct emit_callback *ecb,
719 int prefix, const char *data, int size)
721 const char *endp = NULL;
722 static const char *nneof = " No newline at end of file\n";
723 const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
725 while (0 < size) {
726 int len;
728 endp = memchr(data, '\n', size);
729 len = endp ? (endp - data + 1) : size;
730 if (prefix != '+') {
731 ecb->lno_in_preimage++;
732 emit_del_line(reset, ecb, data, len);
733 } else {
734 ecb->lno_in_postimage++;
735 emit_add_line(reset, ecb, data, len);
737 size -= len;
738 data += len;
740 if (!endp) {
741 const char *context = diff_get_color(ecb->color_diff,
742 DIFF_CONTEXT);
743 putc('\n', ecb->opt->file);
744 emit_line_0(ecb->opt, context, reset, '\\',
745 nneof, strlen(nneof));
749 static void emit_rewrite_diff(const char *name_a,
750 const char *name_b,
751 struct diff_filespec *one,
752 struct diff_filespec *two,
753 struct userdiff_driver *textconv_one,
754 struct userdiff_driver *textconv_two,
755 struct diff_options *o)
757 int lc_a, lc_b;
758 const char *name_a_tab, *name_b_tab;
759 const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO);
760 const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
761 const char *reset = diff_get_color(o->use_color, DIFF_RESET);
762 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
763 const char *a_prefix, *b_prefix;
764 char *data_one, *data_two;
765 size_t size_one, size_two;
766 struct emit_callback ecbdata;
767 const char *line_prefix = diff_line_prefix(o);
769 if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
770 a_prefix = o->b_prefix;
771 b_prefix = o->a_prefix;
772 } else {
773 a_prefix = o->a_prefix;
774 b_prefix = o->b_prefix;
777 name_a += (*name_a == '/');
778 name_b += (*name_b == '/');
779 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
780 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
782 strbuf_reset(&a_name);
783 strbuf_reset(&b_name);
784 quote_two_c_style(&a_name, a_prefix, name_a, 0);
785 quote_two_c_style(&b_name, b_prefix, name_b, 0);
787 size_one = fill_textconv(textconv_one, one, &data_one);
788 size_two = fill_textconv(textconv_two, two, &data_two);
790 memset(&ecbdata, 0, sizeof(ecbdata));
791 ecbdata.color_diff = want_color(o->use_color);
792 ecbdata.ws_rule = whitespace_rule(name_b);
793 ecbdata.opt = o;
794 if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
795 mmfile_t mf1, mf2;
796 mf1.ptr = (char *)data_one;
797 mf2.ptr = (char *)data_two;
798 mf1.size = size_one;
799 mf2.size = size_two;
800 check_blank_at_eof(&mf1, &mf2, &ecbdata);
802 ecbdata.lno_in_preimage = 1;
803 ecbdata.lno_in_postimage = 1;
805 lc_a = count_lines(data_one, size_one);
806 lc_b = count_lines(data_two, size_two);
807 fprintf(o->file,
808 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
809 line_prefix, metainfo, a_name.buf, name_a_tab, reset,
810 line_prefix, metainfo, b_name.buf, name_b_tab, reset,
811 line_prefix, fraginfo);
812 if (!o->irreversible_delete)
813 print_line_count(o->file, lc_a);
814 else
815 fprintf(o->file, "?,?");
816 fprintf(o->file, " +");
817 print_line_count(o->file, lc_b);
818 fprintf(o->file, " @@%s\n", reset);
819 if (lc_a && !o->irreversible_delete)
820 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
821 if (lc_b)
822 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
823 if (textconv_one)
824 free((char *)data_one);
825 if (textconv_two)
826 free((char *)data_two);
829 struct diff_words_buffer {
830 mmfile_t text;
831 long alloc;
832 struct diff_words_orig {
833 const char *begin, *end;
834 } *orig;
835 int orig_nr, orig_alloc;
838 static void diff_words_append(char *line, unsigned long len,
839 struct diff_words_buffer *buffer)
841 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
842 line++;
843 len--;
844 memcpy(buffer->text.ptr + buffer->text.size, line, len);
845 buffer->text.size += len;
846 buffer->text.ptr[buffer->text.size] = '\0';
849 struct diff_words_style_elem {
850 const char *prefix;
851 const char *suffix;
852 const char *color; /* NULL; filled in by the setup code if
853 * color is enabled */
856 struct diff_words_style {
857 enum diff_words_type type;
858 struct diff_words_style_elem new, old, ctx;
859 const char *newline;
862 static struct diff_words_style diff_words_styles[] = {
863 { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
864 { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
865 { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
868 struct diff_words_data {
869 struct diff_words_buffer minus, plus;
870 const char *current_plus;
871 int last_minus;
872 struct diff_options *opt;
873 regex_t *word_regex;
874 enum diff_words_type type;
875 struct diff_words_style *style;
878 static int fn_out_diff_words_write_helper(FILE *fp,
879 struct diff_words_style_elem *st_el,
880 const char *newline,
881 size_t count, const char *buf,
882 const char *line_prefix)
884 int print = 0;
886 while (count) {
887 char *p = memchr(buf, '\n', count);
888 if (print)
889 fputs(line_prefix, fp);
890 if (p != buf) {
891 if (st_el->color && fputs(st_el->color, fp) < 0)
892 return -1;
893 if (fputs(st_el->prefix, fp) < 0 ||
894 fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
895 fputs(st_el->suffix, fp) < 0)
896 return -1;
897 if (st_el->color && *st_el->color
898 && fputs(GIT_COLOR_RESET, fp) < 0)
899 return -1;
901 if (!p)
902 return 0;
903 if (fputs(newline, fp) < 0)
904 return -1;
905 count -= p + 1 - buf;
906 buf = p + 1;
907 print = 1;
909 return 0;
913 * '--color-words' algorithm can be described as:
915 * 1. collect the minus/plus lines of a diff hunk, divided into
916 * minus-lines and plus-lines;
918 * 2. break both minus-lines and plus-lines into words and
919 * place them into two mmfile_t with one word for each line;
921 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
923 * And for the common parts of the both file, we output the plus side text.
924 * diff_words->current_plus is used to trace the current position of the plus file
925 * which printed. diff_words->last_minus is used to trace the last minus word
926 * printed.
928 * For '--graph' to work with '--color-words', we need to output the graph prefix
929 * on each line of color words output. Generally, there are two conditions on
930 * which we should output the prefix.
932 * 1. diff_words->last_minus == 0 &&
933 * diff_words->current_plus == diff_words->plus.text.ptr
935 * that is: the plus text must start as a new line, and if there is no minus
936 * word printed, a graph prefix must be printed.
938 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
939 * *(diff_words->current_plus - 1) == '\n'
941 * that is: a graph prefix must be printed following a '\n'
943 static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
945 if ((diff_words->last_minus == 0 &&
946 diff_words->current_plus == diff_words->plus.text.ptr) ||
947 (diff_words->current_plus > diff_words->plus.text.ptr &&
948 *(diff_words->current_plus - 1) == '\n')) {
949 return 1;
950 } else {
951 return 0;
955 static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
957 struct diff_words_data *diff_words = priv;
958 struct diff_words_style *style = diff_words->style;
959 int minus_first, minus_len, plus_first, plus_len;
960 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
961 struct diff_options *opt = diff_words->opt;
962 const char *line_prefix;
964 if (line[0] != '@' || parse_hunk_header(line, len,
965 &minus_first, &minus_len, &plus_first, &plus_len))
966 return;
968 assert(opt);
969 line_prefix = diff_line_prefix(opt);
971 /* POSIX requires that first be decremented by one if len == 0... */
972 if (minus_len) {
973 minus_begin = diff_words->minus.orig[minus_first].begin;
974 minus_end =
975 diff_words->minus.orig[minus_first + minus_len - 1].end;
976 } else
977 minus_begin = minus_end =
978 diff_words->minus.orig[minus_first].end;
980 if (plus_len) {
981 plus_begin = diff_words->plus.orig[plus_first].begin;
982 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
983 } else
984 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
986 if (color_words_output_graph_prefix(diff_words)) {
987 fputs(line_prefix, diff_words->opt->file);
989 if (diff_words->current_plus != plus_begin) {
990 fn_out_diff_words_write_helper(diff_words->opt->file,
991 &style->ctx, style->newline,
992 plus_begin - diff_words->current_plus,
993 diff_words->current_plus, line_prefix);
994 if (*(plus_begin - 1) == '\n')
995 fputs(line_prefix, diff_words->opt->file);
997 if (minus_begin != minus_end) {
998 fn_out_diff_words_write_helper(diff_words->opt->file,
999 &style->old, style->newline,
1000 minus_end - minus_begin, minus_begin,
1001 line_prefix);
1003 if (plus_begin != plus_end) {
1004 fn_out_diff_words_write_helper(diff_words->opt->file,
1005 &style->new, style->newline,
1006 plus_end - plus_begin, plus_begin,
1007 line_prefix);
1010 diff_words->current_plus = plus_end;
1011 diff_words->last_minus = minus_first;
1014 /* This function starts looking at *begin, and returns 0 iff a word was found. */
1015 static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
1016 int *begin, int *end)
1018 if (word_regex && *begin < buffer->size) {
1019 regmatch_t match[1];
1020 if (!regexec_buf(word_regex, buffer->ptr + *begin,
1021 buffer->size - *begin, 1, match, 0)) {
1022 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
1023 '\n', match[0].rm_eo - match[0].rm_so);
1024 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
1025 *begin += match[0].rm_so;
1026 return *begin >= *end;
1028 return -1;
1031 /* find the next word */
1032 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
1033 (*begin)++;
1034 if (*begin >= buffer->size)
1035 return -1;
1037 /* find the end of the word */
1038 *end = *begin + 1;
1039 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
1040 (*end)++;
1042 return 0;
1046 * This function splits the words in buffer->text, stores the list with
1047 * newline separator into out, and saves the offsets of the original words
1048 * in buffer->orig.
1050 static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
1051 regex_t *word_regex)
1053 int i, j;
1054 long alloc = 0;
1056 out->size = 0;
1057 out->ptr = NULL;
1059 /* fake an empty "0th" word */
1060 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
1061 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
1062 buffer->orig_nr = 1;
1064 for (i = 0; i < buffer->text.size; i++) {
1065 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
1066 return;
1068 /* store original boundaries */
1069 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
1070 buffer->orig_alloc);
1071 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
1072 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
1073 buffer->orig_nr++;
1075 /* store one word */
1076 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
1077 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
1078 out->ptr[out->size + j - i] = '\n';
1079 out->size += j - i + 1;
1081 i = j - 1;
1085 /* this executes the word diff on the accumulated buffers */
1086 static void diff_words_show(struct diff_words_data *diff_words)
1088 xpparam_t xpp;
1089 xdemitconf_t xecfg;
1090 mmfile_t minus, plus;
1091 struct diff_words_style *style = diff_words->style;
1093 struct diff_options *opt = diff_words->opt;
1094 const char *line_prefix;
1096 assert(opt);
1097 line_prefix = diff_line_prefix(opt);
1099 /* special case: only removal */
1100 if (!diff_words->plus.text.size) {
1101 fputs(line_prefix, diff_words->opt->file);
1102 fn_out_diff_words_write_helper(diff_words->opt->file,
1103 &style->old, style->newline,
1104 diff_words->minus.text.size,
1105 diff_words->minus.text.ptr, line_prefix);
1106 diff_words->minus.text.size = 0;
1107 return;
1110 diff_words->current_plus = diff_words->plus.text.ptr;
1111 diff_words->last_minus = 0;
1113 memset(&xpp, 0, sizeof(xpp));
1114 memset(&xecfg, 0, sizeof(xecfg));
1115 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
1116 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
1117 xpp.flags = 0;
1118 /* as only the hunk header will be parsed, we need a 0-context */
1119 xecfg.ctxlen = 0;
1120 if (xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
1121 &xpp, &xecfg))
1122 die("unable to generate word diff");
1123 free(minus.ptr);
1124 free(plus.ptr);
1125 if (diff_words->current_plus != diff_words->plus.text.ptr +
1126 diff_words->plus.text.size) {
1127 if (color_words_output_graph_prefix(diff_words))
1128 fputs(line_prefix, diff_words->opt->file);
1129 fn_out_diff_words_write_helper(diff_words->opt->file,
1130 &style->ctx, style->newline,
1131 diff_words->plus.text.ptr + diff_words->plus.text.size
1132 - diff_words->current_plus, diff_words->current_plus,
1133 line_prefix);
1135 diff_words->minus.text.size = diff_words->plus.text.size = 0;
1138 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
1139 static void diff_words_flush(struct emit_callback *ecbdata)
1141 if (ecbdata->diff_words->minus.text.size ||
1142 ecbdata->diff_words->plus.text.size)
1143 diff_words_show(ecbdata->diff_words);
1146 static void diff_filespec_load_driver(struct diff_filespec *one)
1148 /* Use already-loaded driver */
1149 if (one->driver)
1150 return;
1152 if (S_ISREG(one->mode))
1153 one->driver = userdiff_find_by_path(one->path);
1155 /* Fallback to default settings */
1156 if (!one->driver)
1157 one->driver = userdiff_find_by_name("default");
1160 static const char *userdiff_word_regex(struct diff_filespec *one)
1162 diff_filespec_load_driver(one);
1163 return one->driver->word_regex;
1166 static void init_diff_words_data(struct emit_callback *ecbdata,
1167 struct diff_options *orig_opts,
1168 struct diff_filespec *one,
1169 struct diff_filespec *two)
1171 int i;
1172 struct diff_options *o = xmalloc(sizeof(struct diff_options));
1173 memcpy(o, orig_opts, sizeof(struct diff_options));
1175 ecbdata->diff_words =
1176 xcalloc(1, sizeof(struct diff_words_data));
1177 ecbdata->diff_words->type = o->word_diff;
1178 ecbdata->diff_words->opt = o;
1179 if (!o->word_regex)
1180 o->word_regex = userdiff_word_regex(one);
1181 if (!o->word_regex)
1182 o->word_regex = userdiff_word_regex(two);
1183 if (!o->word_regex)
1184 o->word_regex = diff_word_regex_cfg;
1185 if (o->word_regex) {
1186 ecbdata->diff_words->word_regex = (regex_t *)
1187 xmalloc(sizeof(regex_t));
1188 if (regcomp(ecbdata->diff_words->word_regex,
1189 o->word_regex,
1190 REG_EXTENDED | REG_NEWLINE))
1191 die ("Invalid regular expression: %s",
1192 o->word_regex);
1194 for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
1195 if (o->word_diff == diff_words_styles[i].type) {
1196 ecbdata->diff_words->style =
1197 &diff_words_styles[i];
1198 break;
1201 if (want_color(o->use_color)) {
1202 struct diff_words_style *st = ecbdata->diff_words->style;
1203 st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
1204 st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
1205 st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
1209 static void free_diff_words_data(struct emit_callback *ecbdata)
1211 if (ecbdata->diff_words) {
1212 diff_words_flush(ecbdata);
1213 free (ecbdata->diff_words->opt);
1214 free (ecbdata->diff_words->minus.text.ptr);
1215 free (ecbdata->diff_words->minus.orig);
1216 free (ecbdata->diff_words->plus.text.ptr);
1217 free (ecbdata->diff_words->plus.orig);
1218 if (ecbdata->diff_words->word_regex) {
1219 regfree(ecbdata->diff_words->word_regex);
1220 free(ecbdata->diff_words->word_regex);
1222 FREE_AND_NULL(ecbdata->diff_words);
1226 const char *diff_get_color(int diff_use_color, enum color_diff ix)
1228 if (want_color(diff_use_color))
1229 return diff_colors[ix];
1230 return "";
1233 const char *diff_line_prefix(struct diff_options *opt)
1235 struct strbuf *msgbuf;
1236 if (!opt->output_prefix)
1237 return "";
1239 msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
1240 return msgbuf->buf;
1243 static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
1245 const char *cp;
1246 unsigned long allot;
1247 size_t l = len;
1249 if (ecb->truncate)
1250 return ecb->truncate(line, len);
1251 cp = line;
1252 allot = l;
1253 while (0 < l) {
1254 (void) utf8_width(&cp, &l);
1255 if (!cp)
1256 break; /* truncated in the middle? */
1258 return allot - l;
1261 static void find_lno(const char *line, struct emit_callback *ecbdata)
1263 const char *p;
1264 ecbdata->lno_in_preimage = 0;
1265 ecbdata->lno_in_postimage = 0;
1266 p = strchr(line, '-');
1267 if (!p)
1268 return; /* cannot happen */
1269 ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
1270 p = strchr(p, '+');
1271 if (!p)
1272 return; /* cannot happen */
1273 ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
1276 static void fn_out_consume(void *priv, char *line, unsigned long len)
1278 struct emit_callback *ecbdata = priv;
1279 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
1280 const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
1281 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
1282 struct diff_options *o = ecbdata->opt;
1283 const char *line_prefix = diff_line_prefix(o);
1285 o->found_changes = 1;
1287 if (ecbdata->header) {
1288 fprintf(o->file, "%s", ecbdata->header->buf);
1289 strbuf_reset(ecbdata->header);
1290 ecbdata->header = NULL;
1293 if (ecbdata->label_path[0]) {
1294 const char *name_a_tab, *name_b_tab;
1296 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
1297 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
1299 fprintf(o->file, "%s%s--- %s%s%s\n",
1300 line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
1301 fprintf(o->file, "%s%s+++ %s%s%s\n",
1302 line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
1303 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
1306 if (diff_suppress_blank_empty
1307 && len == 2 && line[0] == ' ' && line[1] == '\n') {
1308 line[0] = '\n';
1309 len = 1;
1312 if (line[0] == '@') {
1313 if (ecbdata->diff_words)
1314 diff_words_flush(ecbdata);
1315 len = sane_truncate_line(ecbdata, line, len);
1316 find_lno(line, ecbdata);
1317 emit_hunk_header(ecbdata, line, len);
1318 if (line[len-1] != '\n')
1319 putc('\n', o->file);
1320 return;
1323 if (ecbdata->diff_words) {
1324 if (line[0] == '-') {
1325 diff_words_append(line, len,
1326 &ecbdata->diff_words->minus);
1327 return;
1328 } else if (line[0] == '+') {
1329 diff_words_append(line, len,
1330 &ecbdata->diff_words->plus);
1331 return;
1332 } else if (starts_with(line, "\\ ")) {
1334 * Eat the "no newline at eof" marker as if we
1335 * saw a "+" or "-" line with nothing on it,
1336 * and return without diff_words_flush() to
1337 * defer processing. If this is the end of
1338 * preimage, more "+" lines may come after it.
1340 return;
1342 diff_words_flush(ecbdata);
1343 if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
1344 emit_line(o, context, reset, line, len);
1345 fputs("~\n", o->file);
1346 } else {
1348 * Skip the prefix character, if any. With
1349 * diff_suppress_blank_empty, there may be
1350 * none.
1352 if (line[0] != '\n') {
1353 line++;
1354 len--;
1356 emit_line(o, context, reset, line, len);
1358 return;
1361 switch (line[0]) {
1362 case '+':
1363 ecbdata->lno_in_postimage++;
1364 emit_add_line(reset, ecbdata, line + 1, len - 1);
1365 break;
1366 case '-':
1367 ecbdata->lno_in_preimage++;
1368 emit_del_line(reset, ecbdata, line + 1, len - 1);
1369 break;
1370 case ' ':
1371 ecbdata->lno_in_postimage++;
1372 ecbdata->lno_in_preimage++;
1373 emit_context_line(reset, ecbdata, line + 1, len - 1);
1374 break;
1375 default:
1376 /* incomplete line at the end */
1377 ecbdata->lno_in_preimage++;
1378 emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
1379 reset, line, len);
1380 break;
1384 static char *pprint_rename(const char *a, const char *b)
1386 const char *old = a;
1387 const char *new = b;
1388 struct strbuf name = STRBUF_INIT;
1389 int pfx_length, sfx_length;
1390 int pfx_adjust_for_slash;
1391 int len_a = strlen(a);
1392 int len_b = strlen(b);
1393 int a_midlen, b_midlen;
1394 int qlen_a = quote_c_style(a, NULL, NULL, 0);
1395 int qlen_b = quote_c_style(b, NULL, NULL, 0);
1397 if (qlen_a || qlen_b) {
1398 quote_c_style(a, &name, NULL, 0);
1399 strbuf_addstr(&name, " => ");
1400 quote_c_style(b, &name, NULL, 0);
1401 return strbuf_detach(&name, NULL);
1404 /* Find common prefix */
1405 pfx_length = 0;
1406 while (*old && *new && *old == *new) {
1407 if (*old == '/')
1408 pfx_length = old - a + 1;
1409 old++;
1410 new++;
1413 /* Find common suffix */
1414 old = a + len_a;
1415 new = b + len_b;
1416 sfx_length = 0;
1418 * If there is a common prefix, it must end in a slash. In
1419 * that case we let this loop run 1 into the prefix to see the
1420 * same slash.
1422 * If there is no common prefix, we cannot do this as it would
1423 * underrun the input strings.
1425 pfx_adjust_for_slash = (pfx_length ? 1 : 0);
1426 while (a + pfx_length - pfx_adjust_for_slash <= old &&
1427 b + pfx_length - pfx_adjust_for_slash <= new &&
1428 *old == *new) {
1429 if (*old == '/')
1430 sfx_length = len_a - (old - a);
1431 old--;
1432 new--;
1436 * pfx{mid-a => mid-b}sfx
1437 * {pfx-a => pfx-b}sfx
1438 * pfx{sfx-a => sfx-b}
1439 * name-a => name-b
1441 a_midlen = len_a - pfx_length - sfx_length;
1442 b_midlen = len_b - pfx_length - sfx_length;
1443 if (a_midlen < 0)
1444 a_midlen = 0;
1445 if (b_midlen < 0)
1446 b_midlen = 0;
1448 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
1449 if (pfx_length + sfx_length) {
1450 strbuf_add(&name, a, pfx_length);
1451 strbuf_addch(&name, '{');
1453 strbuf_add(&name, a + pfx_length, a_midlen);
1454 strbuf_addstr(&name, " => ");
1455 strbuf_add(&name, b + pfx_length, b_midlen);
1456 if (pfx_length + sfx_length) {
1457 strbuf_addch(&name, '}');
1458 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
1460 return strbuf_detach(&name, NULL);
1463 struct diffstat_t {
1464 int nr;
1465 int alloc;
1466 struct diffstat_file {
1467 char *from_name;
1468 char *name;
1469 char *print_name;
1470 unsigned is_unmerged:1;
1471 unsigned is_binary:1;
1472 unsigned is_renamed:1;
1473 unsigned is_interesting:1;
1474 uintmax_t added, deleted;
1475 } **files;
1478 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
1479 const char *name_a,
1480 const char *name_b)
1482 struct diffstat_file *x;
1483 x = xcalloc(1, sizeof(*x));
1484 ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
1485 diffstat->files[diffstat->nr++] = x;
1486 if (name_b) {
1487 x->from_name = xstrdup(name_a);
1488 x->name = xstrdup(name_b);
1489 x->is_renamed = 1;
1491 else {
1492 x->from_name = NULL;
1493 x->name = xstrdup(name_a);
1495 return x;
1498 static void diffstat_consume(void *priv, char *line, unsigned long len)
1500 struct diffstat_t *diffstat = priv;
1501 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
1503 if (line[0] == '+')
1504 x->added++;
1505 else if (line[0] == '-')
1506 x->deleted++;
1509 const char mime_boundary_leader[] = "------------";
1511 static int scale_linear(int it, int width, int max_change)
1513 if (!it)
1514 return 0;
1516 * make sure that at least one '-' or '+' is printed if
1517 * there is any change to this path. The easiest way is to
1518 * scale linearly as if the alloted width is one column shorter
1519 * than it is, and then add 1 to the result.
1521 return 1 + (it * (width - 1) / max_change);
1524 static void show_name(FILE *file,
1525 const char *prefix, const char *name, int len)
1527 fprintf(file, " %s%-*s |", prefix, len, name);
1530 static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
1532 if (cnt <= 0)
1533 return;
1534 fprintf(file, "%s", set);
1535 while (cnt--)
1536 putc(ch, file);
1537 fprintf(file, "%s", reset);
1540 static void fill_print_name(struct diffstat_file *file)
1542 char *pname;
1544 if (file->print_name)
1545 return;
1547 if (!file->is_renamed) {
1548 struct strbuf buf = STRBUF_INIT;
1549 if (quote_c_style(file->name, &buf, NULL, 0)) {
1550 pname = strbuf_detach(&buf, NULL);
1551 } else {
1552 pname = file->name;
1553 strbuf_release(&buf);
1555 } else {
1556 pname = pprint_rename(file->from_name, file->name);
1558 file->print_name = pname;
1561 int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
1563 struct strbuf sb = STRBUF_INIT;
1564 int ret;
1566 if (!files) {
1567 assert(insertions == 0 && deletions == 0);
1568 return fprintf(fp, "%s\n", " 0 files changed");
1571 strbuf_addf(&sb,
1572 (files == 1) ? " %d file changed" : " %d files changed",
1573 files);
1576 * For binary diff, the caller may want to print "x files
1577 * changed" with insertions == 0 && deletions == 0.
1579 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1580 * is probably less confusing (i.e skip over "2 files changed
1581 * but nothing about added/removed lines? Is this a bug in Git?").
1583 if (insertions || deletions == 0) {
1584 strbuf_addf(&sb,
1585 (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
1586 insertions);
1589 if (deletions || insertions == 0) {
1590 strbuf_addf(&sb,
1591 (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
1592 deletions);
1594 strbuf_addch(&sb, '\n');
1595 ret = fputs(sb.buf, fp);
1596 strbuf_release(&sb);
1597 return ret;
1600 static void show_stats(struct diffstat_t *data, struct diff_options *options)
1602 int i, len, add, del, adds = 0, dels = 0;
1603 uintmax_t max_change = 0, max_len = 0;
1604 int total_files = data->nr, count;
1605 int width, name_width, graph_width, number_width = 0, bin_width = 0;
1606 const char *reset, *add_c, *del_c;
1607 const char *line_prefix = "";
1608 int extra_shown = 0;
1610 if (data->nr == 0)
1611 return;
1613 line_prefix = diff_line_prefix(options);
1614 count = options->stat_count ? options->stat_count : data->nr;
1616 reset = diff_get_color_opt(options, DIFF_RESET);
1617 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1618 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1621 * Find the longest filename and max number of changes
1623 for (i = 0; (i < count) && (i < data->nr); i++) {
1624 struct diffstat_file *file = data->files[i];
1625 uintmax_t change = file->added + file->deleted;
1627 if (!file->is_interesting && (change == 0)) {
1628 count++; /* not shown == room for one more */
1629 continue;
1631 fill_print_name(file);
1632 len = strlen(file->print_name);
1633 if (max_len < len)
1634 max_len = len;
1636 if (file->is_unmerged) {
1637 /* "Unmerged" is 8 characters */
1638 bin_width = bin_width < 8 ? 8 : bin_width;
1639 continue;
1641 if (file->is_binary) {
1642 /* "Bin XXX -> YYY bytes" */
1643 int w = 14 + decimal_width(file->added)
1644 + decimal_width(file->deleted);
1645 bin_width = bin_width < w ? w : bin_width;
1646 /* Display change counts aligned with "Bin" */
1647 number_width = 3;
1648 continue;
1651 if (max_change < change)
1652 max_change = change;
1654 count = i; /* where we can stop scanning in data->files[] */
1657 * We have width = stat_width or term_columns() columns total.
1658 * We want a maximum of min(max_len, stat_name_width) for the name part.
1659 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1660 * We also need 1 for " " and 4 + decimal_width(max_change)
1661 * for " | NNNN " and one the empty column at the end, altogether
1662 * 6 + decimal_width(max_change).
1664 * If there's not enough space, we will use the smaller of
1665 * stat_name_width (if set) and 5/8*width for the filename,
1666 * and the rest for constant elements + graph part, but no more
1667 * than stat_graph_width for the graph part.
1668 * (5/8 gives 50 for filename and 30 for the constant parts + graph
1669 * for the standard terminal size).
1671 * In other words: stat_width limits the maximum width, and
1672 * stat_name_width fixes the maximum width of the filename,
1673 * and is also used to divide available columns if there
1674 * aren't enough.
1676 * Binary files are displayed with "Bin XXX -> YYY bytes"
1677 * instead of the change count and graph. This part is treated
1678 * similarly to the graph part, except that it is not
1679 * "scaled". If total width is too small to accommodate the
1680 * guaranteed minimum width of the filename part and the
1681 * separators and this message, this message will "overflow"
1682 * making the line longer than the maximum width.
1685 if (options->stat_width == -1)
1686 width = term_columns() - strlen(line_prefix);
1687 else
1688 width = options->stat_width ? options->stat_width : 80;
1689 number_width = decimal_width(max_change) > number_width ?
1690 decimal_width(max_change) : number_width;
1692 if (options->stat_graph_width == -1)
1693 options->stat_graph_width = diff_stat_graph_width;
1696 * Guarantee 3/8*16==6 for the graph part
1697 * and 5/8*16==10 for the filename part
1699 if (width < 16 + 6 + number_width)
1700 width = 16 + 6 + number_width;
1703 * First assign sizes that are wanted, ignoring available width.
1704 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1705 * starting from "XXX" should fit in graph_width.
1707 graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
1708 if (options->stat_graph_width &&
1709 options->stat_graph_width < graph_width)
1710 graph_width = options->stat_graph_width;
1712 name_width = (options->stat_name_width > 0 &&
1713 options->stat_name_width < max_len) ?
1714 options->stat_name_width : max_len;
1717 * Adjust adjustable widths not to exceed maximum width
1719 if (name_width + number_width + 6 + graph_width > width) {
1720 if (graph_width > width * 3/8 - number_width - 6) {
1721 graph_width = width * 3/8 - number_width - 6;
1722 if (graph_width < 6)
1723 graph_width = 6;
1726 if (options->stat_graph_width &&
1727 graph_width > options->stat_graph_width)
1728 graph_width = options->stat_graph_width;
1729 if (name_width > width - number_width - 6 - graph_width)
1730 name_width = width - number_width - 6 - graph_width;
1731 else
1732 graph_width = width - number_width - 6 - name_width;
1736 * From here name_width is the width of the name area,
1737 * and graph_width is the width of the graph area.
1738 * max_change is used to scale graph properly.
1740 for (i = 0; i < count; i++) {
1741 const char *prefix = "";
1742 struct diffstat_file *file = data->files[i];
1743 char *name = file->print_name;
1744 uintmax_t added = file->added;
1745 uintmax_t deleted = file->deleted;
1746 int name_len;
1748 if (!file->is_interesting && (added + deleted == 0))
1749 continue;
1752 * "scale" the filename
1754 len = name_width;
1755 name_len = strlen(name);
1756 if (name_width < name_len) {
1757 char *slash;
1758 prefix = "...";
1759 len -= 3;
1760 name += name_len - len;
1761 slash = strchr(name, '/');
1762 if (slash)
1763 name = slash;
1766 if (file->is_binary) {
1767 fprintf(options->file, "%s", line_prefix);
1768 show_name(options->file, prefix, name, len);
1769 fprintf(options->file, " %*s", number_width, "Bin");
1770 if (!added && !deleted) {
1771 putc('\n', options->file);
1772 continue;
1774 fprintf(options->file, " %s%"PRIuMAX"%s",
1775 del_c, deleted, reset);
1776 fprintf(options->file, " -> ");
1777 fprintf(options->file, "%s%"PRIuMAX"%s",
1778 add_c, added, reset);
1779 fprintf(options->file, " bytes");
1780 fprintf(options->file, "\n");
1781 continue;
1783 else if (file->is_unmerged) {
1784 fprintf(options->file, "%s", line_prefix);
1785 show_name(options->file, prefix, name, len);
1786 fprintf(options->file, " Unmerged\n");
1787 continue;
1791 * scale the add/delete
1793 add = added;
1794 del = deleted;
1796 if (graph_width <= max_change) {
1797 int total = scale_linear(add + del, graph_width, max_change);
1798 if (total < 2 && add && del)
1799 /* width >= 2 due to the sanity check */
1800 total = 2;
1801 if (add < del) {
1802 add = scale_linear(add, graph_width, max_change);
1803 del = total - add;
1804 } else {
1805 del = scale_linear(del, graph_width, max_change);
1806 add = total - del;
1809 fprintf(options->file, "%s", line_prefix);
1810 show_name(options->file, prefix, name, len);
1811 fprintf(options->file, " %*"PRIuMAX"%s",
1812 number_width, added + deleted,
1813 added + deleted ? " " : "");
1814 show_graph(options->file, '+', add, add_c, reset);
1815 show_graph(options->file, '-', del, del_c, reset);
1816 fprintf(options->file, "\n");
1819 for (i = 0; i < data->nr; i++) {
1820 struct diffstat_file *file = data->files[i];
1821 uintmax_t added = file->added;
1822 uintmax_t deleted = file->deleted;
1824 if (file->is_unmerged ||
1825 (!file->is_interesting && (added + deleted == 0))) {
1826 total_files--;
1827 continue;
1830 if (!file->is_binary) {
1831 adds += added;
1832 dels += deleted;
1834 if (i < count)
1835 continue;
1836 if (!extra_shown)
1837 fprintf(options->file, "%s ...\n", line_prefix);
1838 extra_shown = 1;
1840 fprintf(options->file, "%s", line_prefix);
1841 print_stat_summary(options->file, total_files, adds, dels);
1844 static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1846 int i, adds = 0, dels = 0, total_files = data->nr;
1848 if (data->nr == 0)
1849 return;
1851 for (i = 0; i < data->nr; i++) {
1852 int added = data->files[i]->added;
1853 int deleted= data->files[i]->deleted;
1855 if (data->files[i]->is_unmerged ||
1856 (!data->files[i]->is_interesting && (added + deleted == 0))) {
1857 total_files--;
1858 } else if (!data->files[i]->is_binary) { /* don't count bytes */
1859 adds += added;
1860 dels += deleted;
1863 fprintf(options->file, "%s", diff_line_prefix(options));
1864 print_stat_summary(options->file, total_files, adds, dels);
1867 static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1869 int i;
1871 if (data->nr == 0)
1872 return;
1874 for (i = 0; i < data->nr; i++) {
1875 struct diffstat_file *file = data->files[i];
1877 fprintf(options->file, "%s", diff_line_prefix(options));
1879 if (file->is_binary)
1880 fprintf(options->file, "-\t-\t");
1881 else
1882 fprintf(options->file,
1883 "%"PRIuMAX"\t%"PRIuMAX"\t",
1884 file->added, file->deleted);
1885 if (options->line_termination) {
1886 fill_print_name(file);
1887 if (!file->is_renamed)
1888 write_name_quoted(file->name, options->file,
1889 options->line_termination);
1890 else {
1891 fputs(file->print_name, options->file);
1892 putc(options->line_termination, options->file);
1894 } else {
1895 if (file->is_renamed) {
1896 putc('\0', options->file);
1897 write_name_quoted(file->from_name, options->file, '\0');
1899 write_name_quoted(file->name, options->file, '\0');
1904 struct dirstat_file {
1905 const char *name;
1906 unsigned long changed;
1909 struct dirstat_dir {
1910 struct dirstat_file *files;
1911 int alloc, nr, permille, cumulative;
1914 static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
1915 unsigned long changed, const char *base, int baselen)
1917 unsigned long this_dir = 0;
1918 unsigned int sources = 0;
1919 const char *line_prefix = diff_line_prefix(opt);
1921 while (dir->nr) {
1922 struct dirstat_file *f = dir->files;
1923 int namelen = strlen(f->name);
1924 unsigned long this;
1925 char *slash;
1927 if (namelen < baselen)
1928 break;
1929 if (memcmp(f->name, base, baselen))
1930 break;
1931 slash = strchr(f->name + baselen, '/');
1932 if (slash) {
1933 int newbaselen = slash + 1 - f->name;
1934 this = gather_dirstat(opt, dir, changed, f->name, newbaselen);
1935 sources++;
1936 } else {
1937 this = f->changed;
1938 dir->files++;
1939 dir->nr--;
1940 sources += 2;
1942 this_dir += this;
1946 * We don't report dirstat's for
1947 * - the top level
1948 * - or cases where everything came from a single directory
1949 * under this directory (sources == 1).
1951 if (baselen && sources != 1) {
1952 if (this_dir) {
1953 int permille = this_dir * 1000 / changed;
1954 if (permille >= dir->permille) {
1955 fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
1956 permille / 10, permille % 10, baselen, base);
1957 if (!dir->cumulative)
1958 return 0;
1962 return this_dir;
1965 static int dirstat_compare(const void *_a, const void *_b)
1967 const struct dirstat_file *a = _a;
1968 const struct dirstat_file *b = _b;
1969 return strcmp(a->name, b->name);
1972 static void show_dirstat(struct diff_options *options)
1974 int i;
1975 unsigned long changed;
1976 struct dirstat_dir dir;
1977 struct diff_queue_struct *q = &diff_queued_diff;
1979 dir.files = NULL;
1980 dir.alloc = 0;
1981 dir.nr = 0;
1982 dir.permille = options->dirstat_permille;
1983 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1985 changed = 0;
1986 for (i = 0; i < q->nr; i++) {
1987 struct diff_filepair *p = q->queue[i];
1988 const char *name;
1989 unsigned long copied, added, damage;
1990 int content_changed;
1992 name = p->two->path ? p->two->path : p->one->path;
1994 if (p->one->oid_valid && p->two->oid_valid)
1995 content_changed = oidcmp(&p->one->oid, &p->two->oid);
1996 else
1997 content_changed = 1;
1999 if (!content_changed) {
2001 * The SHA1 has not changed, so pre-/post-content is
2002 * identical. We can therefore skip looking at the
2003 * file contents altogether.
2005 damage = 0;
2006 goto found_damage;
2009 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) {
2011 * In --dirstat-by-file mode, we don't really need to
2012 * look at the actual file contents at all.
2013 * The fact that the SHA1 changed is enough for us to
2014 * add this file to the list of results
2015 * (with each file contributing equal damage).
2017 damage = 1;
2018 goto found_damage;
2021 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
2022 diff_populate_filespec(p->one, 0);
2023 diff_populate_filespec(p->two, 0);
2024 diffcore_count_changes(p->one, p->two, NULL, NULL,
2025 &copied, &added);
2026 diff_free_filespec_data(p->one);
2027 diff_free_filespec_data(p->two);
2028 } else if (DIFF_FILE_VALID(p->one)) {
2029 diff_populate_filespec(p->one, CHECK_SIZE_ONLY);
2030 copied = added = 0;
2031 diff_free_filespec_data(p->one);
2032 } else if (DIFF_FILE_VALID(p->two)) {
2033 diff_populate_filespec(p->two, CHECK_SIZE_ONLY);
2034 copied = 0;
2035 added = p->two->size;
2036 diff_free_filespec_data(p->two);
2037 } else
2038 continue;
2041 * Original minus copied is the removed material,
2042 * added is the new material. They are both damages
2043 * made to the preimage.
2044 * If the resulting damage is zero, we know that
2045 * diffcore_count_changes() considers the two entries to
2046 * be identical, but since content_changed is true, we
2047 * know that there must have been _some_ kind of change,
2048 * so we force all entries to have damage > 0.
2050 damage = (p->one->size - copied) + added;
2051 if (!damage)
2052 damage = 1;
2054 found_damage:
2055 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
2056 dir.files[dir.nr].name = name;
2057 dir.files[dir.nr].changed = damage;
2058 changed += damage;
2059 dir.nr++;
2062 /* This can happen even with many files, if everything was renames */
2063 if (!changed)
2064 return;
2066 /* Show all directories with more than x% of the changes */
2067 QSORT(dir.files, dir.nr, dirstat_compare);
2068 gather_dirstat(options, &dir, changed, "", 0);
2071 static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
2073 int i;
2074 unsigned long changed;
2075 struct dirstat_dir dir;
2077 if (data->nr == 0)
2078 return;
2080 dir.files = NULL;
2081 dir.alloc = 0;
2082 dir.nr = 0;
2083 dir.permille = options->dirstat_permille;
2084 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
2086 changed = 0;
2087 for (i = 0; i < data->nr; i++) {
2088 struct diffstat_file *file = data->files[i];
2089 unsigned long damage = file->added + file->deleted;
2090 if (file->is_binary)
2092 * binary files counts bytes, not lines. Must find some
2093 * way to normalize binary bytes vs. textual lines.
2094 * The following heuristic assumes that there are 64
2095 * bytes per "line".
2096 * This is stupid and ugly, but very cheap...
2098 damage = DIV_ROUND_UP(damage, 64);
2099 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
2100 dir.files[dir.nr].name = file->name;
2101 dir.files[dir.nr].changed = damage;
2102 changed += damage;
2103 dir.nr++;
2106 /* This can happen even with many files, if everything was renames */
2107 if (!changed)
2108 return;
2110 /* Show all directories with more than x% of the changes */
2111 QSORT(dir.files, dir.nr, dirstat_compare);
2112 gather_dirstat(options, &dir, changed, "", 0);
2115 static void free_diffstat_info(struct diffstat_t *diffstat)
2117 int i;
2118 for (i = 0; i < diffstat->nr; i++) {
2119 struct diffstat_file *f = diffstat->files[i];
2120 if (f->name != f->print_name)
2121 free(f->print_name);
2122 free(f->name);
2123 free(f->from_name);
2124 free(f);
2126 free(diffstat->files);
2129 struct checkdiff_t {
2130 const char *filename;
2131 int lineno;
2132 int conflict_marker_size;
2133 struct diff_options *o;
2134 unsigned ws_rule;
2135 unsigned status;
2138 static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
2140 char firstchar;
2141 int cnt;
2143 if (len < marker_size + 1)
2144 return 0;
2145 firstchar = line[0];
2146 switch (firstchar) {
2147 case '=': case '>': case '<': case '|':
2148 break;
2149 default:
2150 return 0;
2152 for (cnt = 1; cnt < marker_size; cnt++)
2153 if (line[cnt] != firstchar)
2154 return 0;
2155 /* line[1] thru line[marker_size-1] are same as firstchar */
2156 if (len < marker_size + 1 || !isspace(line[marker_size]))
2157 return 0;
2158 return 1;
2161 static void checkdiff_consume(void *priv, char *line, unsigned long len)
2163 struct checkdiff_t *data = priv;
2164 int marker_size = data->conflict_marker_size;
2165 const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
2166 const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
2167 const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
2168 char *err;
2169 const char *line_prefix;
2171 assert(data->o);
2172 line_prefix = diff_line_prefix(data->o);
2174 if (line[0] == '+') {
2175 unsigned bad;
2176 data->lineno++;
2177 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
2178 data->status |= 1;
2179 fprintf(data->o->file,
2180 "%s%s:%d: leftover conflict marker\n",
2181 line_prefix, data->filename, data->lineno);
2183 bad = ws_check(line + 1, len - 1, data->ws_rule);
2184 if (!bad)
2185 return;
2186 data->status |= bad;
2187 err = whitespace_error_string(bad);
2188 fprintf(data->o->file, "%s%s:%d: %s.\n",
2189 line_prefix, data->filename, data->lineno, err);
2190 free(err);
2191 emit_line(data->o, set, reset, line, 1);
2192 ws_check_emit(line + 1, len - 1, data->ws_rule,
2193 data->o->file, set, reset, ws);
2194 } else if (line[0] == ' ') {
2195 data->lineno++;
2196 } else if (line[0] == '@') {
2197 char *plus = strchr(line, '+');
2198 if (plus)
2199 data->lineno = strtol(plus, NULL, 10) - 1;
2200 else
2201 die("invalid diff");
2205 static unsigned char *deflate_it(char *data,
2206 unsigned long size,
2207 unsigned long *result_size)
2209 int bound;
2210 unsigned char *deflated;
2211 git_zstream stream;
2213 git_deflate_init(&stream, zlib_compression_level);
2214 bound = git_deflate_bound(&stream, size);
2215 deflated = xmalloc(bound);
2216 stream.next_out = deflated;
2217 stream.avail_out = bound;
2219 stream.next_in = (unsigned char *)data;
2220 stream.avail_in = size;
2221 while (git_deflate(&stream, Z_FINISH) == Z_OK)
2222 ; /* nothing */
2223 git_deflate_end(&stream);
2224 *result_size = stream.total_out;
2225 return deflated;
2228 static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
2229 const char *prefix)
2231 void *cp;
2232 void *delta;
2233 void *deflated;
2234 void *data;
2235 unsigned long orig_size;
2236 unsigned long delta_size;
2237 unsigned long deflate_size;
2238 unsigned long data_size;
2240 /* We could do deflated delta, or we could do just deflated two,
2241 * whichever is smaller.
2243 delta = NULL;
2244 deflated = deflate_it(two->ptr, two->size, &deflate_size);
2245 if (one->size && two->size) {
2246 delta = diff_delta(one->ptr, one->size,
2247 two->ptr, two->size,
2248 &delta_size, deflate_size);
2249 if (delta) {
2250 void *to_free = delta;
2251 orig_size = delta_size;
2252 delta = deflate_it(delta, delta_size, &delta_size);
2253 free(to_free);
2257 if (delta && delta_size < deflate_size) {
2258 fprintf(file, "%sdelta %lu\n", prefix, orig_size);
2259 free(deflated);
2260 data = delta;
2261 data_size = delta_size;
2263 else {
2264 fprintf(file, "%sliteral %lu\n", prefix, two->size);
2265 free(delta);
2266 data = deflated;
2267 data_size = deflate_size;
2270 /* emit data encoded in base85 */
2271 cp = data;
2272 while (data_size) {
2273 int bytes = (52 < data_size) ? 52 : data_size;
2274 char line[70];
2275 data_size -= bytes;
2276 if (bytes <= 26)
2277 line[0] = bytes + 'A' - 1;
2278 else
2279 line[0] = bytes - 26 + 'a' - 1;
2280 encode_85(line + 1, cp, bytes);
2281 cp = (char *) cp + bytes;
2282 fprintf(file, "%s", prefix);
2283 fputs(line, file);
2284 fputc('\n', file);
2286 fprintf(file, "%s\n", prefix);
2287 free(data);
2290 static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two,
2291 const char *prefix)
2293 fprintf(file, "%sGIT binary patch\n", prefix);
2294 emit_binary_diff_body(file, one, two, prefix);
2295 emit_binary_diff_body(file, two, one, prefix);
2298 int diff_filespec_is_binary(struct diff_filespec *one)
2300 if (one->is_binary == -1) {
2301 diff_filespec_load_driver(one);
2302 if (one->driver->binary != -1)
2303 one->is_binary = one->driver->binary;
2304 else {
2305 if (!one->data && DIFF_FILE_VALID(one))
2306 diff_populate_filespec(one, CHECK_BINARY);
2307 if (one->is_binary == -1 && one->data)
2308 one->is_binary = buffer_is_binary(one->data,
2309 one->size);
2310 if (one->is_binary == -1)
2311 one->is_binary = 0;
2314 return one->is_binary;
2317 static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
2319 diff_filespec_load_driver(one);
2320 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
2323 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
2325 if (!options->a_prefix)
2326 options->a_prefix = a;
2327 if (!options->b_prefix)
2328 options->b_prefix = b;
2331 struct userdiff_driver *get_textconv(struct diff_filespec *one)
2333 if (!DIFF_FILE_VALID(one))
2334 return NULL;
2336 diff_filespec_load_driver(one);
2337 return userdiff_get_textconv(one->driver);
2340 static void builtin_diff(const char *name_a,
2341 const char *name_b,
2342 struct diff_filespec *one,
2343 struct diff_filespec *two,
2344 const char *xfrm_msg,
2345 int must_show_header,
2346 struct diff_options *o,
2347 int complete_rewrite)
2349 mmfile_t mf1, mf2;
2350 const char *lbl[2];
2351 char *a_one, *b_two;
2352 const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
2353 const char *reset = diff_get_color_opt(o, DIFF_RESET);
2354 const char *a_prefix, *b_prefix;
2355 struct userdiff_driver *textconv_one = NULL;
2356 struct userdiff_driver *textconv_two = NULL;
2357 struct strbuf header = STRBUF_INIT;
2358 const char *line_prefix = diff_line_prefix(o);
2360 diff_set_mnemonic_prefix(o, "a/", "b/");
2361 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
2362 a_prefix = o->b_prefix;
2363 b_prefix = o->a_prefix;
2364 } else {
2365 a_prefix = o->a_prefix;
2366 b_prefix = o->b_prefix;
2369 if (o->submodule_format == DIFF_SUBMODULE_LOG &&
2370 (!one->mode || S_ISGITLINK(one->mode)) &&
2371 (!two->mode || S_ISGITLINK(two->mode))) {
2372 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
2373 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2374 show_submodule_summary(o->file, one->path ? one->path : two->path,
2375 line_prefix,
2376 &one->oid, &two->oid,
2377 two->dirty_submodule,
2378 meta, del, add, reset);
2379 return;
2380 } else if (o->submodule_format == DIFF_SUBMODULE_INLINE_DIFF &&
2381 (!one->mode || S_ISGITLINK(one->mode)) &&
2382 (!two->mode || S_ISGITLINK(two->mode))) {
2383 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
2384 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2385 show_submodule_inline_diff(o->file, one->path ? one->path : two->path,
2386 line_prefix,
2387 &one->oid, &two->oid,
2388 two->dirty_submodule,
2389 meta, del, add, reset, o);
2390 return;
2393 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
2394 textconv_one = get_textconv(one);
2395 textconv_two = get_textconv(two);
2398 /* Never use a non-valid filename anywhere if at all possible */
2399 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
2400 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
2402 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
2403 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
2404 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
2405 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
2406 strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
2407 if (lbl[0][0] == '/') {
2408 /* /dev/null */
2409 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
2410 if (xfrm_msg)
2411 strbuf_addstr(&header, xfrm_msg);
2412 must_show_header = 1;
2414 else if (lbl[1][0] == '/') {
2415 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
2416 if (xfrm_msg)
2417 strbuf_addstr(&header, xfrm_msg);
2418 must_show_header = 1;
2420 else {
2421 if (one->mode != two->mode) {
2422 strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
2423 strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
2424 must_show_header = 1;
2426 if (xfrm_msg)
2427 strbuf_addstr(&header, xfrm_msg);
2430 * we do not run diff between different kind
2431 * of objects.
2433 if ((one->mode ^ two->mode) & S_IFMT)
2434 goto free_ab_and_return;
2435 if (complete_rewrite &&
2436 (textconv_one || !diff_filespec_is_binary(one)) &&
2437 (textconv_two || !diff_filespec_is_binary(two))) {
2438 fprintf(o->file, "%s", header.buf);
2439 strbuf_reset(&header);
2440 emit_rewrite_diff(name_a, name_b, one, two,
2441 textconv_one, textconv_two, o);
2442 o->found_changes = 1;
2443 goto free_ab_and_return;
2447 if (o->irreversible_delete && lbl[1][0] == '/') {
2448 fprintf(o->file, "%s", header.buf);
2449 strbuf_reset(&header);
2450 goto free_ab_and_return;
2451 } else if (!DIFF_OPT_TST(o, TEXT) &&
2452 ( (!textconv_one && diff_filespec_is_binary(one)) ||
2453 (!textconv_two && diff_filespec_is_binary(two)) )) {
2454 if (!one->data && !two->data &&
2455 S_ISREG(one->mode) && S_ISREG(two->mode) &&
2456 !DIFF_OPT_TST(o, BINARY)) {
2457 if (!oidcmp(&one->oid, &two->oid)) {
2458 if (must_show_header)
2459 fprintf(o->file, "%s", header.buf);
2460 goto free_ab_and_return;
2462 fprintf(o->file, "%s", header.buf);
2463 fprintf(o->file, "%sBinary files %s and %s differ\n",
2464 line_prefix, lbl[0], lbl[1]);
2465 goto free_ab_and_return;
2467 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2468 die("unable to read files to diff");
2469 /* Quite common confusing case */
2470 if (mf1.size == mf2.size &&
2471 !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
2472 if (must_show_header)
2473 fprintf(o->file, "%s", header.buf);
2474 goto free_ab_and_return;
2476 fprintf(o->file, "%s", header.buf);
2477 strbuf_reset(&header);
2478 if (DIFF_OPT_TST(o, BINARY))
2479 emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
2480 else
2481 fprintf(o->file, "%sBinary files %s and %s differ\n",
2482 line_prefix, lbl[0], lbl[1]);
2483 o->found_changes = 1;
2484 } else {
2485 /* Crazy xdl interfaces.. */
2486 const char *diffopts = getenv("GIT_DIFF_OPTS");
2487 const char *v;
2488 xpparam_t xpp;
2489 xdemitconf_t xecfg;
2490 struct emit_callback ecbdata;
2491 const struct userdiff_funcname *pe;
2493 if (must_show_header) {
2494 fprintf(o->file, "%s", header.buf);
2495 strbuf_reset(&header);
2498 mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
2499 mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
2501 pe = diff_funcname_pattern(one);
2502 if (!pe)
2503 pe = diff_funcname_pattern(two);
2505 memset(&xpp, 0, sizeof(xpp));
2506 memset(&xecfg, 0, sizeof(xecfg));
2507 memset(&ecbdata, 0, sizeof(ecbdata));
2508 ecbdata.label_path = lbl;
2509 ecbdata.color_diff = want_color(o->use_color);
2510 ecbdata.ws_rule = whitespace_rule(name_b);
2511 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
2512 check_blank_at_eof(&mf1, &mf2, &ecbdata);
2513 ecbdata.opt = o;
2514 ecbdata.header = header.len ? &header : NULL;
2515 xpp.flags = o->xdl_opts;
2516 xecfg.ctxlen = o->context;
2517 xecfg.interhunkctxlen = o->interhunkcontext;
2518 xecfg.flags = XDL_EMIT_FUNCNAMES;
2519 if (DIFF_OPT_TST(o, FUNCCONTEXT))
2520 xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
2521 if (pe)
2522 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
2523 if (!diffopts)
2525 else if (skip_prefix(diffopts, "--unified=", &v))
2526 xecfg.ctxlen = strtoul(v, NULL, 10);
2527 else if (skip_prefix(diffopts, "-u", &v))
2528 xecfg.ctxlen = strtoul(v, NULL, 10);
2529 if (o->word_diff)
2530 init_diff_words_data(&ecbdata, o, one, two);
2531 if (xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
2532 &xpp, &xecfg))
2533 die("unable to generate diff for %s", one->path);
2534 if (o->word_diff)
2535 free_diff_words_data(&ecbdata);
2536 if (textconv_one)
2537 free(mf1.ptr);
2538 if (textconv_two)
2539 free(mf2.ptr);
2540 xdiff_clear_find_func(&xecfg);
2543 free_ab_and_return:
2544 strbuf_release(&header);
2545 diff_free_filespec_data(one);
2546 diff_free_filespec_data(two);
2547 free(a_one);
2548 free(b_two);
2549 return;
2552 static void builtin_diffstat(const char *name_a, const char *name_b,
2553 struct diff_filespec *one,
2554 struct diff_filespec *two,
2555 struct diffstat_t *diffstat,
2556 struct diff_options *o,
2557 struct diff_filepair *p)
2559 mmfile_t mf1, mf2;
2560 struct diffstat_file *data;
2561 int same_contents;
2562 int complete_rewrite = 0;
2564 if (!DIFF_PAIR_UNMERGED(p)) {
2565 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2566 complete_rewrite = 1;
2569 data = diffstat_add(diffstat, name_a, name_b);
2570 data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;
2572 if (!one || !two) {
2573 data->is_unmerged = 1;
2574 return;
2577 same_contents = !oidcmp(&one->oid, &two->oid);
2579 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
2580 data->is_binary = 1;
2581 if (same_contents) {
2582 data->added = 0;
2583 data->deleted = 0;
2584 } else {
2585 data->added = diff_filespec_size(two);
2586 data->deleted = diff_filespec_size(one);
2590 else if (complete_rewrite) {
2591 diff_populate_filespec(one, 0);
2592 diff_populate_filespec(two, 0);
2593 data->deleted = count_lines(one->data, one->size);
2594 data->added = count_lines(two->data, two->size);
2597 else if (!same_contents) {
2598 /* Crazy xdl interfaces.. */
2599 xpparam_t xpp;
2600 xdemitconf_t xecfg;
2602 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2603 die("unable to read files to diff");
2605 memset(&xpp, 0, sizeof(xpp));
2606 memset(&xecfg, 0, sizeof(xecfg));
2607 xpp.flags = o->xdl_opts;
2608 xecfg.ctxlen = o->context;
2609 xecfg.interhunkctxlen = o->interhunkcontext;
2610 if (xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
2611 &xpp, &xecfg))
2612 die("unable to generate diffstat for %s", one->path);
2615 diff_free_filespec_data(one);
2616 diff_free_filespec_data(two);
2619 static void builtin_checkdiff(const char *name_a, const char *name_b,
2620 const char *attr_path,
2621 struct diff_filespec *one,
2622 struct diff_filespec *two,
2623 struct diff_options *o)
2625 mmfile_t mf1, mf2;
2626 struct checkdiff_t data;
2628 if (!two)
2629 return;
2631 memset(&data, 0, sizeof(data));
2632 data.filename = name_b ? name_b : name_a;
2633 data.lineno = 0;
2634 data.o = o;
2635 data.ws_rule = whitespace_rule(attr_path);
2636 data.conflict_marker_size = ll_merge_marker_size(attr_path);
2638 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2639 die("unable to read files to diff");
2642 * All the other codepaths check both sides, but not checking
2643 * the "old" side here is deliberate. We are checking the newly
2644 * introduced changes, and as long as the "new" side is text, we
2645 * can and should check what it introduces.
2647 if (diff_filespec_is_binary(two))
2648 goto free_and_return;
2649 else {
2650 /* Crazy xdl interfaces.. */
2651 xpparam_t xpp;
2652 xdemitconf_t xecfg;
2654 memset(&xpp, 0, sizeof(xpp));
2655 memset(&xecfg, 0, sizeof(xecfg));
2656 xecfg.ctxlen = 1; /* at least one context line */
2657 xpp.flags = 0;
2658 if (xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
2659 &xpp, &xecfg))
2660 die("unable to generate checkdiff for %s", one->path);
2662 if (data.ws_rule & WS_BLANK_AT_EOF) {
2663 struct emit_callback ecbdata;
2664 int blank_at_eof;
2666 ecbdata.ws_rule = data.ws_rule;
2667 check_blank_at_eof(&mf1, &mf2, &ecbdata);
2668 blank_at_eof = ecbdata.blank_at_eof_in_postimage;
2670 if (blank_at_eof) {
2671 static char *err;
2672 if (!err)
2673 err = whitespace_error_string(WS_BLANK_AT_EOF);
2674 fprintf(o->file, "%s:%d: %s.\n",
2675 data.filename, blank_at_eof, err);
2676 data.status = 1; /* report errors */
2680 free_and_return:
2681 diff_free_filespec_data(one);
2682 diff_free_filespec_data(two);
2683 if (data.status)
2684 DIFF_OPT_SET(o, CHECK_FAILED);
2687 struct diff_filespec *alloc_filespec(const char *path)
2689 struct diff_filespec *spec;
2691 FLEXPTR_ALLOC_STR(spec, path, path);
2692 spec->count = 1;
2693 spec->is_binary = -1;
2694 return spec;
2697 void free_filespec(struct diff_filespec *spec)
2699 if (!--spec->count) {
2700 diff_free_filespec_data(spec);
2701 free(spec);
2705 void fill_filespec(struct diff_filespec *spec, const struct object_id *oid,
2706 int oid_valid, unsigned short mode)
2708 if (mode) {
2709 spec->mode = canon_mode(mode);
2710 oidcpy(&spec->oid, oid);
2711 spec->oid_valid = oid_valid;
2716 * Given a name and sha1 pair, if the index tells us the file in
2717 * the work tree has that object contents, return true, so that
2718 * prepare_temp_file() does not have to inflate and extract.
2720 static int reuse_worktree_file(const char *name, const struct object_id *oid, int want_file)
2722 const struct cache_entry *ce;
2723 struct stat st;
2724 int pos, len;
2727 * We do not read the cache ourselves here, because the
2728 * benchmark with my previous version that always reads cache
2729 * shows that it makes things worse for diff-tree comparing
2730 * two linux-2.6 kernel trees in an already checked out work
2731 * tree. This is because most diff-tree comparisons deal with
2732 * only a small number of files, while reading the cache is
2733 * expensive for a large project, and its cost outweighs the
2734 * savings we get by not inflating the object to a temporary
2735 * file. Practically, this code only helps when we are used
2736 * by diff-cache --cached, which does read the cache before
2737 * calling us.
2739 if (!active_cache)
2740 return 0;
2742 /* We want to avoid the working directory if our caller
2743 * doesn't need the data in a normal file, this system
2744 * is rather slow with its stat/open/mmap/close syscalls,
2745 * and the object is contained in a pack file. The pack
2746 * is probably already open and will be faster to obtain
2747 * the data through than the working directory. Loose
2748 * objects however would tend to be slower as they need
2749 * to be individually opened and inflated.
2751 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(oid->hash))
2752 return 0;
2755 * Similarly, if we'd have to convert the file contents anyway, that
2756 * makes the optimization not worthwhile.
2758 if (!want_file && would_convert_to_git(&the_index, name))
2759 return 0;
2761 len = strlen(name);
2762 pos = cache_name_pos(name, len);
2763 if (pos < 0)
2764 return 0;
2765 ce = active_cache[pos];
2768 * This is not the sha1 we are looking for, or
2769 * unreusable because it is not a regular file.
2771 if (oidcmp(oid, &ce->oid) || !S_ISREG(ce->ce_mode))
2772 return 0;
2775 * If ce is marked as "assume unchanged", there is no
2776 * guarantee that work tree matches what we are looking for.
2778 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
2779 return 0;
2782 * If ce matches the file in the work tree, we can reuse it.
2784 if (ce_uptodate(ce) ||
2785 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
2786 return 1;
2788 return 0;
2791 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2793 struct strbuf buf = STRBUF_INIT;
2794 char *dirty = "";
2796 /* Are we looking at the work tree? */
2797 if (s->dirty_submodule)
2798 dirty = "-dirty";
2800 strbuf_addf(&buf, "Subproject commit %s%s\n",
2801 oid_to_hex(&s->oid), dirty);
2802 s->size = buf.len;
2803 if (size_only) {
2804 s->data = NULL;
2805 strbuf_release(&buf);
2806 } else {
2807 s->data = strbuf_detach(&buf, NULL);
2808 s->should_free = 1;
2810 return 0;
2814 * While doing rename detection and pickaxe operation, we may need to
2815 * grab the data for the blob (or file) for our own in-core comparison.
2816 * diff_filespec has data and size fields for this purpose.
2818 int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
2820 int size_only = flags & CHECK_SIZE_ONLY;
2821 int err = 0;
2823 * demote FAIL to WARN to allow inspecting the situation
2824 * instead of refusing.
2826 enum safe_crlf crlf_warn = (safe_crlf == SAFE_CRLF_FAIL
2827 ? SAFE_CRLF_WARN
2828 : safe_crlf);
2830 if (!DIFF_FILE_VALID(s))
2831 die("internal error: asking to populate invalid file.");
2832 if (S_ISDIR(s->mode))
2833 return -1;
2835 if (s->data)
2836 return 0;
2838 if (size_only && 0 < s->size)
2839 return 0;
2841 if (S_ISGITLINK(s->mode))
2842 return diff_populate_gitlink(s, size_only);
2844 if (!s->oid_valid ||
2845 reuse_worktree_file(s->path, &s->oid, 0)) {
2846 struct strbuf buf = STRBUF_INIT;
2847 struct stat st;
2848 int fd;
2850 if (lstat(s->path, &st) < 0) {
2851 if (errno == ENOENT) {
2852 err_empty:
2853 err = -1;
2854 empty:
2855 s->data = (char *)"";
2856 s->size = 0;
2857 return err;
2860 s->size = xsize_t(st.st_size);
2861 if (!s->size)
2862 goto empty;
2863 if (S_ISLNK(st.st_mode)) {
2864 struct strbuf sb = STRBUF_INIT;
2866 if (strbuf_readlink(&sb, s->path, s->size))
2867 goto err_empty;
2868 s->size = sb.len;
2869 s->data = strbuf_detach(&sb, NULL);
2870 s->should_free = 1;
2871 return 0;
2875 * Even if the caller would be happy with getting
2876 * only the size, we cannot return early at this
2877 * point if the path requires us to run the content
2878 * conversion.
2880 if (size_only && !would_convert_to_git(&the_index, s->path))
2881 return 0;
2884 * Note: this check uses xsize_t(st.st_size) that may
2885 * not be the true size of the blob after it goes
2886 * through convert_to_git(). This may not strictly be
2887 * correct, but the whole point of big_file_threshold
2888 * and is_binary check being that we want to avoid
2889 * opening the file and inspecting the contents, this
2890 * is probably fine.
2892 if ((flags & CHECK_BINARY) &&
2893 s->size > big_file_threshold && s->is_binary == -1) {
2894 s->is_binary = 1;
2895 return 0;
2897 fd = open(s->path, O_RDONLY);
2898 if (fd < 0)
2899 goto err_empty;
2900 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2901 close(fd);
2902 s->should_munmap = 1;
2905 * Convert from working tree format to canonical git format
2907 if (convert_to_git(&the_index, s->path, s->data, s->size, &buf, crlf_warn)) {
2908 size_t size = 0;
2909 munmap(s->data, s->size);
2910 s->should_munmap = 0;
2911 s->data = strbuf_detach(&buf, &size);
2912 s->size = size;
2913 s->should_free = 1;
2916 else {
2917 enum object_type type;
2918 if (size_only || (flags & CHECK_BINARY)) {
2919 type = sha1_object_info(s->oid.hash, &s->size);
2920 if (type < 0)
2921 die("unable to read %s",
2922 oid_to_hex(&s->oid));
2923 if (size_only)
2924 return 0;
2925 if (s->size > big_file_threshold && s->is_binary == -1) {
2926 s->is_binary = 1;
2927 return 0;
2930 s->data = read_sha1_file(s->oid.hash, &type, &s->size);
2931 if (!s->data)
2932 die("unable to read %s", oid_to_hex(&s->oid));
2933 s->should_free = 1;
2935 return 0;
2938 void diff_free_filespec_blob(struct diff_filespec *s)
2940 if (s->should_free)
2941 free(s->data);
2942 else if (s->should_munmap)
2943 munmap(s->data, s->size);
2945 if (s->should_free || s->should_munmap) {
2946 s->should_free = s->should_munmap = 0;
2947 s->data = NULL;
2951 void diff_free_filespec_data(struct diff_filespec *s)
2953 diff_free_filespec_blob(s);
2954 FREE_AND_NULL(s->cnt_data);
2957 static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2958 void *blob,
2959 unsigned long size,
2960 const struct object_id *oid,
2961 int mode)
2963 int fd;
2964 struct strbuf buf = STRBUF_INIT;
2965 struct strbuf template = STRBUF_INIT;
2966 char *path_dup = xstrdup(path);
2967 const char *base = basename(path_dup);
2969 /* Generate "XXXXXX_basename.ext" */
2970 strbuf_addstr(&template, "XXXXXX_");
2971 strbuf_addstr(&template, base);
2973 fd = mks_tempfile_ts(&temp->tempfile, template.buf, strlen(base) + 1);
2974 if (fd < 0)
2975 die_errno("unable to create temp-file");
2976 if (convert_to_working_tree(path,
2977 (const char *)blob, (size_t)size, &buf)) {
2978 blob = buf.buf;
2979 size = buf.len;
2981 if (write_in_full(fd, blob, size) != size)
2982 die_errno("unable to write temp-file");
2983 close_tempfile(&temp->tempfile);
2984 temp->name = get_tempfile_path(&temp->tempfile);
2985 oid_to_hex_r(temp->hex, oid);
2986 xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
2987 strbuf_release(&buf);
2988 strbuf_release(&template);
2989 free(path_dup);
2992 static struct diff_tempfile *prepare_temp_file(const char *name,
2993 struct diff_filespec *one)
2995 struct diff_tempfile *temp = claim_diff_tempfile();
2997 if (!DIFF_FILE_VALID(one)) {
2998 not_a_valid_file:
2999 /* A '-' entry produces this for file-2, and
3000 * a '+' entry produces this for file-1.
3002 temp->name = "/dev/null";
3003 xsnprintf(temp->hex, sizeof(temp->hex), ".");
3004 xsnprintf(temp->mode, sizeof(temp->mode), ".");
3005 return temp;
3008 if (!S_ISGITLINK(one->mode) &&
3009 (!one->oid_valid ||
3010 reuse_worktree_file(name, &one->oid, 1))) {
3011 struct stat st;
3012 if (lstat(name, &st) < 0) {
3013 if (errno == ENOENT)
3014 goto not_a_valid_file;
3015 die_errno("stat(%s)", name);
3017 if (S_ISLNK(st.st_mode)) {
3018 struct strbuf sb = STRBUF_INIT;
3019 if (strbuf_readlink(&sb, name, st.st_size) < 0)
3020 die_errno("readlink(%s)", name);
3021 prep_temp_blob(name, temp, sb.buf, sb.len,
3022 (one->oid_valid ?
3023 &one->oid : &null_oid),
3024 (one->oid_valid ?
3025 one->mode : S_IFLNK));
3026 strbuf_release(&sb);
3028 else {
3029 /* we can borrow from the file in the work tree */
3030 temp->name = name;
3031 if (!one->oid_valid)
3032 oid_to_hex_r(temp->hex, &null_oid);
3033 else
3034 oid_to_hex_r(temp->hex, &one->oid);
3035 /* Even though we may sometimes borrow the
3036 * contents from the work tree, we always want
3037 * one->mode. mode is trustworthy even when
3038 * !(one->oid_valid), as long as
3039 * DIFF_FILE_VALID(one).
3041 xsnprintf(temp->mode, sizeof(temp->mode), "%06o", one->mode);
3043 return temp;
3045 else {
3046 if (diff_populate_filespec(one, 0))
3047 die("cannot read data blob for %s", one->path);
3048 prep_temp_blob(name, temp, one->data, one->size,
3049 &one->oid, one->mode);
3051 return temp;
3054 static void add_external_diff_name(struct argv_array *argv,
3055 const char *name,
3056 struct diff_filespec *df)
3058 struct diff_tempfile *temp = prepare_temp_file(name, df);
3059 argv_array_push(argv, temp->name);
3060 argv_array_push(argv, temp->hex);
3061 argv_array_push(argv, temp->mode);
3064 /* An external diff command takes:
3066 * diff-cmd name infile1 infile1-sha1 infile1-mode \
3067 * infile2 infile2-sha1 infile2-mode [ rename-to ]
3070 static void run_external_diff(const char *pgm,
3071 const char *name,
3072 const char *other,
3073 struct diff_filespec *one,
3074 struct diff_filespec *two,
3075 const char *xfrm_msg,
3076 int complete_rewrite,
3077 struct diff_options *o)
3079 struct argv_array argv = ARGV_ARRAY_INIT;
3080 struct argv_array env = ARGV_ARRAY_INIT;
3081 struct diff_queue_struct *q = &diff_queued_diff;
3083 argv_array_push(&argv, pgm);
3084 argv_array_push(&argv, name);
3086 if (one && two) {
3087 add_external_diff_name(&argv, name, one);
3088 if (!other)
3089 add_external_diff_name(&argv, name, two);
3090 else {
3091 add_external_diff_name(&argv, other, two);
3092 argv_array_push(&argv, other);
3093 argv_array_push(&argv, xfrm_msg);
3097 argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
3098 argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
3100 if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
3101 die(_("external diff died, stopping at %s"), name);
3103 remove_tempfile();
3104 argv_array_clear(&argv);
3105 argv_array_clear(&env);
3108 static int similarity_index(struct diff_filepair *p)
3110 return p->score * 100 / MAX_SCORE;
3113 static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)
3115 if (startup_info->have_repository)
3116 return find_unique_abbrev(oid->hash, abbrev);
3117 else {
3118 char *hex = oid_to_hex(oid);
3119 if (abbrev < 0)
3120 abbrev = FALLBACK_DEFAULT_ABBREV;
3121 if (abbrev > GIT_SHA1_HEXSZ)
3122 die("BUG: oid abbreviation out of range: %d", abbrev);
3123 if (abbrev)
3124 hex[abbrev] = '\0';
3125 return hex;
3129 static void fill_metainfo(struct strbuf *msg,
3130 const char *name,
3131 const char *other,
3132 struct diff_filespec *one,
3133 struct diff_filespec *two,
3134 struct diff_options *o,
3135 struct diff_filepair *p,
3136 int *must_show_header,
3137 int use_color)
3139 const char *set = diff_get_color(use_color, DIFF_METAINFO);
3140 const char *reset = diff_get_color(use_color, DIFF_RESET);
3141 const char *line_prefix = diff_line_prefix(o);
3143 *must_show_header = 1;
3144 strbuf_init(msg, PATH_MAX * 2 + 300);
3145 switch (p->status) {
3146 case DIFF_STATUS_COPIED:
3147 strbuf_addf(msg, "%s%ssimilarity index %d%%",
3148 line_prefix, set, similarity_index(p));
3149 strbuf_addf(msg, "%s\n%s%scopy from ",
3150 reset, line_prefix, set);
3151 quote_c_style(name, msg, NULL, 0);
3152 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
3153 quote_c_style(other, msg, NULL, 0);
3154 strbuf_addf(msg, "%s\n", reset);
3155 break;
3156 case DIFF_STATUS_RENAMED:
3157 strbuf_addf(msg, "%s%ssimilarity index %d%%",
3158 line_prefix, set, similarity_index(p));
3159 strbuf_addf(msg, "%s\n%s%srename from ",
3160 reset, line_prefix, set);
3161 quote_c_style(name, msg, NULL, 0);
3162 strbuf_addf(msg, "%s\n%s%srename to ",
3163 reset, line_prefix, set);
3164 quote_c_style(other, msg, NULL, 0);
3165 strbuf_addf(msg, "%s\n", reset);
3166 break;
3167 case DIFF_STATUS_MODIFIED:
3168 if (p->score) {
3169 strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
3170 line_prefix,
3171 set, similarity_index(p), reset);
3172 break;
3174 /* fallthru */
3175 default:
3176 *must_show_header = 0;
3178 if (one && two && oidcmp(&one->oid, &two->oid)) {
3179 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
3181 if (DIFF_OPT_TST(o, BINARY)) {
3182 mmfile_t mf;
3183 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
3184 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
3185 abbrev = 40;
3187 strbuf_addf(msg, "%s%sindex %s..%s", line_prefix, set,
3188 diff_abbrev_oid(&one->oid, abbrev),
3189 diff_abbrev_oid(&two->oid, abbrev));
3190 if (one->mode == two->mode)
3191 strbuf_addf(msg, " %06o", one->mode);
3192 strbuf_addf(msg, "%s\n", reset);
3196 static void run_diff_cmd(const char *pgm,
3197 const char *name,
3198 const char *other,
3199 const char *attr_path,
3200 struct diff_filespec *one,
3201 struct diff_filespec *two,
3202 struct strbuf *msg,
3203 struct diff_options *o,
3204 struct diff_filepair *p)
3206 const char *xfrm_msg = NULL;
3207 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
3208 int must_show_header = 0;
3211 if (DIFF_OPT_TST(o, ALLOW_EXTERNAL)) {
3212 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
3213 if (drv && drv->external)
3214 pgm = drv->external;
3217 if (msg) {
3219 * don't use colors when the header is intended for an
3220 * external diff driver
3222 fill_metainfo(msg, name, other, one, two, o, p,
3223 &must_show_header,
3224 want_color(o->use_color) && !pgm);
3225 xfrm_msg = msg->len ? msg->buf : NULL;
3228 if (pgm) {
3229 run_external_diff(pgm, name, other, one, two, xfrm_msg,
3230 complete_rewrite, o);
3231 return;
3233 if (one && two)
3234 builtin_diff(name, other ? other : name,
3235 one, two, xfrm_msg, must_show_header,
3236 o, complete_rewrite);
3237 else
3238 fprintf(o->file, "* Unmerged path %s\n", name);
3241 static void diff_fill_oid_info(struct diff_filespec *one)
3243 if (DIFF_FILE_VALID(one)) {
3244 if (!one->oid_valid) {
3245 struct stat st;
3246 if (one->is_stdin) {
3247 oidclr(&one->oid);
3248 return;
3250 if (lstat(one->path, &st) < 0)
3251 die_errno("stat '%s'", one->path);
3252 if (index_path(one->oid.hash, one->path, &st, 0))
3253 die("cannot hash %s", one->path);
3256 else
3257 oidclr(&one->oid);
3260 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
3262 /* Strip the prefix but do not molest /dev/null and absolute paths */
3263 if (*namep && **namep != '/') {
3264 *namep += prefix_length;
3265 if (**namep == '/')
3266 ++*namep;
3268 if (*otherp && **otherp != '/') {
3269 *otherp += prefix_length;
3270 if (**otherp == '/')
3271 ++*otherp;
3275 static void run_diff(struct diff_filepair *p, struct diff_options *o)
3277 const char *pgm = external_diff();
3278 struct strbuf msg;
3279 struct diff_filespec *one = p->one;
3280 struct diff_filespec *two = p->two;
3281 const char *name;
3282 const char *other;
3283 const char *attr_path;
3285 name = p->one->path;
3286 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3287 attr_path = name;
3288 if (o->prefix_length)
3289 strip_prefix(o->prefix_length, &name, &other);
3291 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
3292 pgm = NULL;
3294 if (DIFF_PAIR_UNMERGED(p)) {
3295 run_diff_cmd(pgm, name, NULL, attr_path,
3296 NULL, NULL, NULL, o, p);
3297 return;
3300 diff_fill_oid_info(one);
3301 diff_fill_oid_info(two);
3303 if (!pgm &&
3304 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
3305 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
3307 * a filepair that changes between file and symlink
3308 * needs to be split into deletion and creation.
3310 struct diff_filespec *null = alloc_filespec(two->path);
3311 run_diff_cmd(NULL, name, other, attr_path,
3312 one, null, &msg, o, p);
3313 free(null);
3314 strbuf_release(&msg);
3316 null = alloc_filespec(one->path);
3317 run_diff_cmd(NULL, name, other, attr_path,
3318 null, two, &msg, o, p);
3319 free(null);
3321 else
3322 run_diff_cmd(pgm, name, other, attr_path,
3323 one, two, &msg, o, p);
3325 strbuf_release(&msg);
3328 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
3329 struct diffstat_t *diffstat)
3331 const char *name;
3332 const char *other;
3334 if (DIFF_PAIR_UNMERGED(p)) {
3335 /* unmerged */
3336 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, p);
3337 return;
3340 name = p->one->path;
3341 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3343 if (o->prefix_length)
3344 strip_prefix(o->prefix_length, &name, &other);
3346 diff_fill_oid_info(p->one);
3347 diff_fill_oid_info(p->two);
3349 builtin_diffstat(name, other, p->one, p->two, diffstat, o, p);
3352 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
3354 const char *name;
3355 const char *other;
3356 const char *attr_path;
3358 if (DIFF_PAIR_UNMERGED(p)) {
3359 /* unmerged */
3360 return;
3363 name = p->one->path;
3364 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3365 attr_path = other ? other : name;
3367 if (o->prefix_length)
3368 strip_prefix(o->prefix_length, &name, &other);
3370 diff_fill_oid_info(p->one);
3371 diff_fill_oid_info(p->two);
3373 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
3376 void diff_setup(struct diff_options *options)
3378 memcpy(options, &default_diff_options, sizeof(*options));
3380 options->file = stdout;
3382 options->abbrev = DEFAULT_ABBREV;
3383 options->line_termination = '\n';
3384 options->break_opt = -1;
3385 options->rename_limit = -1;
3386 options->dirstat_permille = diff_dirstat_permille_default;
3387 options->context = diff_context_default;
3388 options->interhunkcontext = diff_interhunk_context_default;
3389 options->ws_error_highlight = ws_error_highlight_default;
3390 DIFF_OPT_SET(options, RENAME_EMPTY);
3392 /* pathchange left =NULL by default */
3393 options->change = diff_change;
3394 options->add_remove = diff_addremove;
3395 options->use_color = diff_use_color_default;
3396 options->detect_rename = diff_detect_rename_default;
3397 options->xdl_opts |= diff_algorithm;
3398 if (diff_indent_heuristic)
3399 DIFF_XDL_SET(options, INDENT_HEURISTIC);
3401 options->orderfile = diff_order_file_cfg;
3403 if (diff_no_prefix) {
3404 options->a_prefix = options->b_prefix = "";
3405 } else if (!diff_mnemonic_prefix) {
3406 options->a_prefix = "a/";
3407 options->b_prefix = "b/";
3411 void diff_setup_done(struct diff_options *options)
3413 int count = 0;
3415 if (options->set_default)
3416 options->set_default(options);
3418 if (options->output_format & DIFF_FORMAT_NAME)
3419 count++;
3420 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
3421 count++;
3422 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
3423 count++;
3424 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
3425 count++;
3426 if (count > 1)
3427 die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
3430 * Most of the time we can say "there are changes"
3431 * only by checking if there are changed paths, but
3432 * --ignore-whitespace* options force us to look
3433 * inside contents.
3436 if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
3437 DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
3438 DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
3439 DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
3440 else
3441 DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
3443 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
3444 options->detect_rename = DIFF_DETECT_COPY;
3446 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
3447 options->prefix = NULL;
3448 if (options->prefix)
3449 options->prefix_length = strlen(options->prefix);
3450 else
3451 options->prefix_length = 0;
3453 if (options->output_format & (DIFF_FORMAT_NAME |
3454 DIFF_FORMAT_NAME_STATUS |
3455 DIFF_FORMAT_CHECKDIFF |
3456 DIFF_FORMAT_NO_OUTPUT))
3457 options->output_format &= ~(DIFF_FORMAT_RAW |
3458 DIFF_FORMAT_NUMSTAT |
3459 DIFF_FORMAT_DIFFSTAT |
3460 DIFF_FORMAT_SHORTSTAT |
3461 DIFF_FORMAT_DIRSTAT |
3462 DIFF_FORMAT_SUMMARY |
3463 DIFF_FORMAT_PATCH);
3466 * These cases always need recursive; we do not drop caller-supplied
3467 * recursive bits for other formats here.
3469 if (options->output_format & (DIFF_FORMAT_PATCH |
3470 DIFF_FORMAT_NUMSTAT |
3471 DIFF_FORMAT_DIFFSTAT |
3472 DIFF_FORMAT_SHORTSTAT |
3473 DIFF_FORMAT_DIRSTAT |
3474 DIFF_FORMAT_SUMMARY |
3475 DIFF_FORMAT_CHECKDIFF))
3476 DIFF_OPT_SET(options, RECURSIVE);
3478 * Also pickaxe would not work very well if you do not say recursive
3480 if (options->pickaxe)
3481 DIFF_OPT_SET(options, RECURSIVE);
3483 * When patches are generated, submodules diffed against the work tree
3484 * must be checked for dirtiness too so it can be shown in the output
3486 if (options->output_format & DIFF_FORMAT_PATCH)
3487 DIFF_OPT_SET(options, DIRTY_SUBMODULES);
3489 if (options->detect_rename && options->rename_limit < 0)
3490 options->rename_limit = diff_rename_limit_default;
3491 if (options->setup & DIFF_SETUP_USE_CACHE) {
3492 if (!active_cache)
3493 /* read-cache does not die even when it fails
3494 * so it is safe for us to do this here. Also
3495 * it does not smudge active_cache or active_nr
3496 * when it fails, so we do not have to worry about
3497 * cleaning it up ourselves either.
3499 read_cache();
3501 if (40 < options->abbrev)
3502 options->abbrev = 40; /* full */
3505 * It does not make sense to show the first hit we happened
3506 * to have found. It does not make sense not to return with
3507 * exit code in such a case either.
3509 if (DIFF_OPT_TST(options, QUICK)) {
3510 options->output_format = DIFF_FORMAT_NO_OUTPUT;
3511 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3514 options->diff_path_counter = 0;
3516 if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
3517 die(_("--follow requires exactly one pathspec"));
3520 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
3522 char c, *eq;
3523 int len;
3525 if (*arg != '-')
3526 return 0;
3527 c = *++arg;
3528 if (!c)
3529 return 0;
3530 if (c == arg_short) {
3531 c = *++arg;
3532 if (!c)
3533 return 1;
3534 if (val && isdigit(c)) {
3535 char *end;
3536 int n = strtoul(arg, &end, 10);
3537 if (*end)
3538 return 0;
3539 *val = n;
3540 return 1;
3542 return 0;
3544 if (c != '-')
3545 return 0;
3546 arg++;
3547 eq = strchrnul(arg, '=');
3548 len = eq - arg;
3549 if (!len || strncmp(arg, arg_long, len))
3550 return 0;
3551 if (*eq) {
3552 int n;
3553 char *end;
3554 if (!isdigit(*++eq))
3555 return 0;
3556 n = strtoul(eq, &end, 10);
3557 if (*end)
3558 return 0;
3559 *val = n;
3561 return 1;
3564 static int diff_scoreopt_parse(const char *opt);
3566 static inline int short_opt(char opt, const char **argv,
3567 const char **optarg)
3569 const char *arg = argv[0];
3570 if (arg[0] != '-' || arg[1] != opt)
3571 return 0;
3572 if (arg[2] != '\0') {
3573 *optarg = arg + 2;
3574 return 1;
3576 if (!argv[1])
3577 die("Option '%c' requires a value", opt);
3578 *optarg = argv[1];
3579 return 2;
3582 int parse_long_opt(const char *opt, const char **argv,
3583 const char **optarg)
3585 const char *arg = argv[0];
3586 if (!skip_prefix(arg, "--", &arg))
3587 return 0;
3588 if (!skip_prefix(arg, opt, &arg))
3589 return 0;
3590 if (*arg == '=') { /* stuck form: --option=value */
3591 *optarg = arg + 1;
3592 return 1;
3594 if (*arg != '\0')
3595 return 0;
3596 /* separate form: --option value */
3597 if (!argv[1])
3598 die("Option '--%s' requires a value", opt);
3599 *optarg = argv[1];
3600 return 2;
3603 static int stat_opt(struct diff_options *options, const char **av)
3605 const char *arg = av[0];
3606 char *end;
3607 int width = options->stat_width;
3608 int name_width = options->stat_name_width;
3609 int graph_width = options->stat_graph_width;
3610 int count = options->stat_count;
3611 int argcount = 1;
3613 if (!skip_prefix(arg, "--stat", &arg))
3614 die("BUG: stat option does not begin with --stat: %s", arg);
3615 end = (char *)arg;
3617 switch (*arg) {
3618 case '-':
3619 if (skip_prefix(arg, "-width", &arg)) {
3620 if (*arg == '=')
3621 width = strtoul(arg + 1, &end, 10);
3622 else if (!*arg && !av[1])
3623 die_want_option("--stat-width");
3624 else if (!*arg) {
3625 width = strtoul(av[1], &end, 10);
3626 argcount = 2;
3628 } else if (skip_prefix(arg, "-name-width", &arg)) {
3629 if (*arg == '=')
3630 name_width = strtoul(arg + 1, &end, 10);
3631 else if (!*arg && !av[1])
3632 die_want_option("--stat-name-width");
3633 else if (!*arg) {
3634 name_width = strtoul(av[1], &end, 10);
3635 argcount = 2;
3637 } else if (skip_prefix(arg, "-graph-width", &arg)) {
3638 if (*arg == '=')
3639 graph_width = strtoul(arg + 1, &end, 10);
3640 else if (!*arg && !av[1])
3641 die_want_option("--stat-graph-width");
3642 else if (!*arg) {
3643 graph_width = strtoul(av[1], &end, 10);
3644 argcount = 2;
3646 } else if (skip_prefix(arg, "-count", &arg)) {
3647 if (*arg == '=')
3648 count = strtoul(arg + 1, &end, 10);
3649 else if (!*arg && !av[1])
3650 die_want_option("--stat-count");
3651 else if (!*arg) {
3652 count = strtoul(av[1], &end, 10);
3653 argcount = 2;
3656 break;
3657 case '=':
3658 width = strtoul(arg+1, &end, 10);
3659 if (*end == ',')
3660 name_width = strtoul(end+1, &end, 10);
3661 if (*end == ',')
3662 count = strtoul(end+1, &end, 10);
3665 /* Important! This checks all the error cases! */
3666 if (*end)
3667 return 0;
3668 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3669 options->stat_name_width = name_width;
3670 options->stat_graph_width = graph_width;
3671 options->stat_width = width;
3672 options->stat_count = count;
3673 return argcount;
3676 static int parse_dirstat_opt(struct diff_options *options, const char *params)
3678 struct strbuf errmsg = STRBUF_INIT;
3679 if (parse_dirstat_params(options, params, &errmsg))
3680 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3681 errmsg.buf);
3682 strbuf_release(&errmsg);
3684 * The caller knows a dirstat-related option is given from the command
3685 * line; allow it to say "return this_function();"
3687 options->output_format |= DIFF_FORMAT_DIRSTAT;
3688 return 1;
3691 static int parse_submodule_opt(struct diff_options *options, const char *value)
3693 if (parse_submodule_params(options, value))
3694 die(_("Failed to parse --submodule option parameter: '%s'"),
3695 value);
3696 return 1;
3699 static const char diff_status_letters[] = {
3700 DIFF_STATUS_ADDED,
3701 DIFF_STATUS_COPIED,
3702 DIFF_STATUS_DELETED,
3703 DIFF_STATUS_MODIFIED,
3704 DIFF_STATUS_RENAMED,
3705 DIFF_STATUS_TYPE_CHANGED,
3706 DIFF_STATUS_UNKNOWN,
3707 DIFF_STATUS_UNMERGED,
3708 DIFF_STATUS_FILTER_AON,
3709 DIFF_STATUS_FILTER_BROKEN,
3710 '\0',
3713 static unsigned int filter_bit['Z' + 1];
3715 static void prepare_filter_bits(void)
3717 int i;
3719 if (!filter_bit[DIFF_STATUS_ADDED]) {
3720 for (i = 0; diff_status_letters[i]; i++)
3721 filter_bit[(int) diff_status_letters[i]] = (1 << i);
3725 static unsigned filter_bit_tst(char status, const struct diff_options *opt)
3727 return opt->filter & filter_bit[(int) status];
3730 static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
3732 int i, optch;
3734 prepare_filter_bits();
3737 * If there is a negation e.g. 'd' in the input, and we haven't
3738 * initialized the filter field with another --diff-filter, start
3739 * from full set of bits, except for AON.
3741 if (!opt->filter) {
3742 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3743 if (optch < 'a' || 'z' < optch)
3744 continue;
3745 opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
3746 opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
3747 break;
3751 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3752 unsigned int bit;
3753 int negate;
3755 if ('a' <= optch && optch <= 'z') {
3756 negate = 1;
3757 optch = toupper(optch);
3758 } else {
3759 negate = 0;
3762 bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
3763 if (!bit)
3764 return optarg[i];
3765 if (negate)
3766 opt->filter &= ~bit;
3767 else
3768 opt->filter |= bit;
3770 return 0;
3773 static void enable_patch_output(int *fmt) {
3774 *fmt &= ~DIFF_FORMAT_NO_OUTPUT;
3775 *fmt |= DIFF_FORMAT_PATCH;
3778 static int parse_ws_error_highlight_opt(struct diff_options *opt, const char *arg)
3780 int val = parse_ws_error_highlight(arg);
3782 if (val < 0) {
3783 error("unknown value after ws-error-highlight=%.*s",
3784 -1 - val, arg);
3785 return 0;
3787 opt->ws_error_highlight = val;
3788 return 1;
3791 int diff_opt_parse(struct diff_options *options,
3792 const char **av, int ac, const char *prefix)
3794 const char *arg = av[0];
3795 const char *optarg;
3796 int argcount;
3798 if (!prefix)
3799 prefix = "";
3801 /* Output format options */
3802 if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")
3803 || opt_arg(arg, 'U', "unified", &options->context))
3804 enable_patch_output(&options->output_format);
3805 else if (!strcmp(arg, "--raw"))
3806 options->output_format |= DIFF_FORMAT_RAW;
3807 else if (!strcmp(arg, "--patch-with-raw")) {
3808 enable_patch_output(&options->output_format);
3809 options->output_format |= DIFF_FORMAT_RAW;
3810 } else if (!strcmp(arg, "--numstat"))
3811 options->output_format |= DIFF_FORMAT_NUMSTAT;
3812 else if (!strcmp(arg, "--shortstat"))
3813 options->output_format |= DIFF_FORMAT_SHORTSTAT;
3814 else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat"))
3815 return parse_dirstat_opt(options, "");
3816 else if (skip_prefix(arg, "-X", &arg))
3817 return parse_dirstat_opt(options, arg);
3818 else if (skip_prefix(arg, "--dirstat=", &arg))
3819 return parse_dirstat_opt(options, arg);
3820 else if (!strcmp(arg, "--cumulative"))
3821 return parse_dirstat_opt(options, "cumulative");
3822 else if (!strcmp(arg, "--dirstat-by-file"))
3823 return parse_dirstat_opt(options, "files");
3824 else if (skip_prefix(arg, "--dirstat-by-file=", &arg)) {
3825 parse_dirstat_opt(options, "files");
3826 return parse_dirstat_opt(options, arg);
3828 else if (!strcmp(arg, "--check"))
3829 options->output_format |= DIFF_FORMAT_CHECKDIFF;
3830 else if (!strcmp(arg, "--summary"))
3831 options->output_format |= DIFF_FORMAT_SUMMARY;
3832 else if (!strcmp(arg, "--patch-with-stat")) {
3833 enable_patch_output(&options->output_format);
3834 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3835 } else if (!strcmp(arg, "--name-only"))
3836 options->output_format |= DIFF_FORMAT_NAME;
3837 else if (!strcmp(arg, "--name-status"))
3838 options->output_format |= DIFF_FORMAT_NAME_STATUS;
3839 else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
3840 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
3841 else if (starts_with(arg, "--stat"))
3842 /* --stat, --stat-width, --stat-name-width, or --stat-count */
3843 return stat_opt(options, av);
3845 /* renames options */
3846 else if (starts_with(arg, "-B") || starts_with(arg, "--break-rewrites=") ||
3847 !strcmp(arg, "--break-rewrites")) {
3848 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
3849 return error("invalid argument to -B: %s", arg+2);
3851 else if (starts_with(arg, "-M") || starts_with(arg, "--find-renames=") ||
3852 !strcmp(arg, "--find-renames")) {
3853 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3854 return error("invalid argument to -M: %s", arg+2);
3855 options->detect_rename = DIFF_DETECT_RENAME;
3857 else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
3858 options->irreversible_delete = 1;
3860 else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") ||
3861 !strcmp(arg, "--find-copies")) {
3862 if (options->detect_rename == DIFF_DETECT_COPY)
3863 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3864 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3865 return error("invalid argument to -C: %s", arg+2);
3866 options->detect_rename = DIFF_DETECT_COPY;
3868 else if (!strcmp(arg, "--no-renames"))
3869 options->detect_rename = 0;
3870 else if (!strcmp(arg, "--rename-empty"))
3871 DIFF_OPT_SET(options, RENAME_EMPTY);
3872 else if (!strcmp(arg, "--no-rename-empty"))
3873 DIFF_OPT_CLR(options, RENAME_EMPTY);
3874 else if (!strcmp(arg, "--relative"))
3875 DIFF_OPT_SET(options, RELATIVE_NAME);
3876 else if (skip_prefix(arg, "--relative=", &arg)) {
3877 DIFF_OPT_SET(options, RELATIVE_NAME);
3878 options->prefix = arg;
3881 /* xdiff options */
3882 else if (!strcmp(arg, "--minimal"))
3883 DIFF_XDL_SET(options, NEED_MINIMAL);
3884 else if (!strcmp(arg, "--no-minimal"))
3885 DIFF_XDL_CLR(options, NEED_MINIMAL);
3886 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
3887 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
3888 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
3889 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
3890 else if (!strcmp(arg, "--ignore-space-at-eol"))
3891 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
3892 else if (!strcmp(arg, "--ignore-blank-lines"))
3893 DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
3894 else if (!strcmp(arg, "--indent-heuristic"))
3895 DIFF_XDL_SET(options, INDENT_HEURISTIC);
3896 else if (!strcmp(arg, "--no-indent-heuristic"))
3897 DIFF_XDL_CLR(options, INDENT_HEURISTIC);
3898 else if (!strcmp(arg, "--patience"))
3899 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
3900 else if (!strcmp(arg, "--histogram"))
3901 options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
3902 else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) {
3903 long value = parse_algorithm_value(optarg);
3904 if (value < 0)
3905 return error("option diff-algorithm accepts \"myers\", "
3906 "\"minimal\", \"patience\" and \"histogram\"");
3907 /* clear out previous settings */
3908 DIFF_XDL_CLR(options, NEED_MINIMAL);
3909 options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
3910 options->xdl_opts |= value;
3911 return argcount;
3914 /* flags options */
3915 else if (!strcmp(arg, "--binary")) {
3916 enable_patch_output(&options->output_format);
3917 DIFF_OPT_SET(options, BINARY);
3919 else if (!strcmp(arg, "--full-index"))
3920 DIFF_OPT_SET(options, FULL_INDEX);
3921 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
3922 DIFF_OPT_SET(options, TEXT);
3923 else if (!strcmp(arg, "-R"))
3924 DIFF_OPT_SET(options, REVERSE_DIFF);
3925 else if (!strcmp(arg, "--find-copies-harder"))
3926 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3927 else if (!strcmp(arg, "--follow"))
3928 DIFF_OPT_SET(options, FOLLOW_RENAMES);
3929 else if (!strcmp(arg, "--no-follow")) {
3930 DIFF_OPT_CLR(options, FOLLOW_RENAMES);
3931 DIFF_OPT_CLR(options, DEFAULT_FOLLOW_RENAMES);
3932 } else if (!strcmp(arg, "--color"))
3933 options->use_color = 1;
3934 else if (skip_prefix(arg, "--color=", &arg)) {
3935 int value = git_config_colorbool(NULL, arg);
3936 if (value < 0)
3937 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3938 options->use_color = value;
3940 else if (!strcmp(arg, "--no-color"))
3941 options->use_color = 0;
3942 else if (!strcmp(arg, "--color-words")) {
3943 options->use_color = 1;
3944 options->word_diff = DIFF_WORDS_COLOR;
3946 else if (skip_prefix(arg, "--color-words=", &arg)) {
3947 options->use_color = 1;
3948 options->word_diff = DIFF_WORDS_COLOR;
3949 options->word_regex = arg;
3951 else if (!strcmp(arg, "--word-diff")) {
3952 if (options->word_diff == DIFF_WORDS_NONE)
3953 options->word_diff = DIFF_WORDS_PLAIN;
3955 else if (skip_prefix(arg, "--word-diff=", &arg)) {
3956 if (!strcmp(arg, "plain"))
3957 options->word_diff = DIFF_WORDS_PLAIN;
3958 else if (!strcmp(arg, "color")) {
3959 options->use_color = 1;
3960 options->word_diff = DIFF_WORDS_COLOR;
3962 else if (!strcmp(arg, "porcelain"))
3963 options->word_diff = DIFF_WORDS_PORCELAIN;
3964 else if (!strcmp(arg, "none"))
3965 options->word_diff = DIFF_WORDS_NONE;
3966 else
3967 die("bad --word-diff argument: %s", arg);
3969 else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) {
3970 if (options->word_diff == DIFF_WORDS_NONE)
3971 options->word_diff = DIFF_WORDS_PLAIN;
3972 options->word_regex = optarg;
3973 return argcount;
3975 else if (!strcmp(arg, "--exit-code"))
3976 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3977 else if (!strcmp(arg, "--quiet"))
3978 DIFF_OPT_SET(options, QUICK);
3979 else if (!strcmp(arg, "--ext-diff"))
3980 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
3981 else if (!strcmp(arg, "--no-ext-diff"))
3982 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
3983 else if (!strcmp(arg, "--textconv"))
3984 DIFF_OPT_SET(options, ALLOW_TEXTCONV);
3985 else if (!strcmp(arg, "--no-textconv"))
3986 DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
3987 else if (!strcmp(arg, "--ignore-submodules")) {
3988 DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3989 handle_ignore_submodules_arg(options, "all");
3990 } else if (skip_prefix(arg, "--ignore-submodules=", &arg)) {
3991 DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3992 handle_ignore_submodules_arg(options, arg);
3993 } else if (!strcmp(arg, "--submodule"))
3994 options->submodule_format = DIFF_SUBMODULE_LOG;
3995 else if (skip_prefix(arg, "--submodule=", &arg))
3996 return parse_submodule_opt(options, arg);
3997 else if (skip_prefix(arg, "--ws-error-highlight=", &arg))
3998 return parse_ws_error_highlight_opt(options, arg);
3999 else if (!strcmp(arg, "--ita-invisible-in-index"))
4000 options->ita_invisible_in_index = 1;
4001 else if (!strcmp(arg, "--ita-visible-in-index"))
4002 options->ita_invisible_in_index = 0;
4004 /* misc options */
4005 else if (!strcmp(arg, "-z"))
4006 options->line_termination = 0;
4007 else if ((argcount = short_opt('l', av, &optarg))) {
4008 options->rename_limit = strtoul(optarg, NULL, 10);
4009 return argcount;
4011 else if ((argcount = short_opt('S', av, &optarg))) {
4012 options->pickaxe = optarg;
4013 options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
4014 return argcount;
4015 } else if ((argcount = short_opt('G', av, &optarg))) {
4016 options->pickaxe = optarg;
4017 options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
4018 return argcount;
4020 else if (!strcmp(arg, "--pickaxe-all"))
4021 options->pickaxe_opts |= DIFF_PICKAXE_ALL;
4022 else if (!strcmp(arg, "--pickaxe-regex"))
4023 options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
4024 else if ((argcount = short_opt('O', av, &optarg))) {
4025 options->orderfile = prefix_filename(prefix, optarg);
4026 return argcount;
4028 else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
4029 int offending = parse_diff_filter_opt(optarg, options);
4030 if (offending)
4031 die("unknown change class '%c' in --diff-filter=%s",
4032 offending, optarg);
4033 return argcount;
4035 else if (!strcmp(arg, "--no-abbrev"))
4036 options->abbrev = 0;
4037 else if (!strcmp(arg, "--abbrev"))
4038 options->abbrev = DEFAULT_ABBREV;
4039 else if (skip_prefix(arg, "--abbrev=", &arg)) {
4040 options->abbrev = strtoul(arg, NULL, 10);
4041 if (options->abbrev < MINIMUM_ABBREV)
4042 options->abbrev = MINIMUM_ABBREV;
4043 else if (40 < options->abbrev)
4044 options->abbrev = 40;
4046 else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
4047 options->a_prefix = optarg;
4048 return argcount;
4050 else if ((argcount = parse_long_opt("line-prefix", av, &optarg))) {
4051 options->line_prefix = optarg;
4052 options->line_prefix_length = strlen(options->line_prefix);
4053 graph_setup_line_prefix(options);
4054 return argcount;
4056 else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) {
4057 options->b_prefix = optarg;
4058 return argcount;
4060 else if (!strcmp(arg, "--no-prefix"))
4061 options->a_prefix = options->b_prefix = "";
4062 else if (opt_arg(arg, '\0', "inter-hunk-context",
4063 &options->interhunkcontext))
4065 else if (!strcmp(arg, "-W"))
4066 DIFF_OPT_SET(options, FUNCCONTEXT);
4067 else if (!strcmp(arg, "--function-context"))
4068 DIFF_OPT_SET(options, FUNCCONTEXT);
4069 else if (!strcmp(arg, "--no-function-context"))
4070 DIFF_OPT_CLR(options, FUNCCONTEXT);
4071 else if ((argcount = parse_long_opt("output", av, &optarg))) {
4072 char *path = prefix_filename(prefix, optarg);
4073 options->file = xfopen(path, "w");
4074 options->close_file = 1;
4075 if (options->use_color != GIT_COLOR_ALWAYS)
4076 options->use_color = GIT_COLOR_NEVER;
4077 free(path);
4078 return argcount;
4079 } else
4080 return 0;
4081 return 1;
4084 int parse_rename_score(const char **cp_p)
4086 unsigned long num, scale;
4087 int ch, dot;
4088 const char *cp = *cp_p;
4090 num = 0;
4091 scale = 1;
4092 dot = 0;
4093 for (;;) {
4094 ch = *cp;
4095 if ( !dot && ch == '.' ) {
4096 scale = 1;
4097 dot = 1;
4098 } else if ( ch == '%' ) {
4099 scale = dot ? scale*100 : 100;
4100 cp++; /* % is always at the end */
4101 break;
4102 } else if ( ch >= '0' && ch <= '9' ) {
4103 if ( scale < 100000 ) {
4104 scale *= 10;
4105 num = (num*10) + (ch-'0');
4107 } else {
4108 break;
4110 cp++;
4112 *cp_p = cp;
4114 /* user says num divided by scale and we say internally that
4115 * is MAX_SCORE * num / scale.
4117 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
4120 static int diff_scoreopt_parse(const char *opt)
4122 int opt1, opt2, cmd;
4124 if (*opt++ != '-')
4125 return -1;
4126 cmd = *opt++;
4127 if (cmd == '-') {
4128 /* convert the long-form arguments into short-form versions */
4129 if (skip_prefix(opt, "break-rewrites", &opt)) {
4130 if (*opt == 0 || *opt++ == '=')
4131 cmd = 'B';
4132 } else if (skip_prefix(opt, "find-copies", &opt)) {
4133 if (*opt == 0 || *opt++ == '=')
4134 cmd = 'C';
4135 } else if (skip_prefix(opt, "find-renames", &opt)) {
4136 if (*opt == 0 || *opt++ == '=')
4137 cmd = 'M';
4140 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
4141 return -1; /* that is not a -M, -C, or -B option */
4143 opt1 = parse_rename_score(&opt);
4144 if (cmd != 'B')
4145 opt2 = 0;
4146 else {
4147 if (*opt == 0)
4148 opt2 = 0;
4149 else if (*opt != '/')
4150 return -1; /* we expect -B80/99 or -B80 */
4151 else {
4152 opt++;
4153 opt2 = parse_rename_score(&opt);
4156 if (*opt != 0)
4157 return -1;
4158 return opt1 | (opt2 << 16);
4161 struct diff_queue_struct diff_queued_diff;
4163 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
4165 ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc);
4166 queue->queue[queue->nr++] = dp;
4169 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
4170 struct diff_filespec *one,
4171 struct diff_filespec *two)
4173 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
4174 dp->one = one;
4175 dp->two = two;
4176 if (queue)
4177 diff_q(queue, dp);
4178 return dp;
4181 void diff_free_filepair(struct diff_filepair *p)
4183 free_filespec(p->one);
4184 free_filespec(p->two);
4185 free(p);
4188 const char *diff_aligned_abbrev(const struct object_id *oid, int len)
4190 int abblen;
4191 const char *abbrev;
4193 if (len == GIT_SHA1_HEXSZ)
4194 return oid_to_hex(oid);
4196 abbrev = diff_abbrev_oid(oid, len);
4197 abblen = strlen(abbrev);
4200 * In well-behaved cases, where the abbbreviated result is the
4201 * same as the requested length, append three dots after the
4202 * abbreviation (hence the whole logic is limited to the case
4203 * where abblen < 37); when the actual abbreviated result is a
4204 * bit longer than the requested length, we reduce the number
4205 * of dots so that they match the well-behaved ones. However,
4206 * if the actual abbreviation is longer than the requested
4207 * length by more than three, we give up on aligning, and add
4208 * three dots anyway, to indicate that the output is not the
4209 * full object name. Yes, this may be suboptimal, but this
4210 * appears only in "diff --raw --abbrev" output and it is not
4211 * worth the effort to change it now. Note that this would
4212 * likely to work fine when the automatic sizing of default
4213 * abbreviation length is used--we would be fed -1 in "len" in
4214 * that case, and will end up always appending three-dots, but
4215 * the automatic sizing is supposed to give abblen that ensures
4216 * uniqueness across all objects (statistically speaking).
4218 if (abblen < GIT_SHA1_HEXSZ - 3) {
4219 static char hex[GIT_MAX_HEXSZ + 1];
4220 if (len < abblen && abblen <= len + 2)
4221 xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, "..");
4222 else
4223 xsnprintf(hex, sizeof(hex), "%s...", abbrev);
4224 return hex;
4227 return oid_to_hex(oid);
4230 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
4232 int line_termination = opt->line_termination;
4233 int inter_name_termination = line_termination ? '\t' : '\0';
4235 fprintf(opt->file, "%s", diff_line_prefix(opt));
4236 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
4237 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
4238 diff_aligned_abbrev(&p->one->oid, opt->abbrev));
4239 fprintf(opt->file, "%s ",
4240 diff_aligned_abbrev(&p->two->oid, opt->abbrev));
4242 if (p->score) {
4243 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
4244 inter_name_termination);
4245 } else {
4246 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
4249 if (p->status == DIFF_STATUS_COPIED ||
4250 p->status == DIFF_STATUS_RENAMED) {
4251 const char *name_a, *name_b;
4252 name_a = p->one->path;
4253 name_b = p->two->path;
4254 strip_prefix(opt->prefix_length, &name_a, &name_b);
4255 write_name_quoted(name_a, opt->file, inter_name_termination);
4256 write_name_quoted(name_b, opt->file, line_termination);
4257 } else {
4258 const char *name_a, *name_b;
4259 name_a = p->one->mode ? p->one->path : p->two->path;
4260 name_b = NULL;
4261 strip_prefix(opt->prefix_length, &name_a, &name_b);
4262 write_name_quoted(name_a, opt->file, line_termination);
4266 int diff_unmodified_pair(struct diff_filepair *p)
4268 /* This function is written stricter than necessary to support
4269 * the currently implemented transformers, but the idea is to
4270 * let transformers to produce diff_filepairs any way they want,
4271 * and filter and clean them up here before producing the output.
4273 struct diff_filespec *one = p->one, *two = p->two;
4275 if (DIFF_PAIR_UNMERGED(p))
4276 return 0; /* unmerged is interesting */