2 * Copyright (C) 2005 Junio C Hamano
10 #include "xdiff-interface.h"
13 #include "run-command.h"
16 #include "submodule-config.h"
17 #include "submodule.h"
19 #include "string-list.h"
20 #include "argv-array.h"
22 #ifdef NO_FAST_WORKING_DIRECTORY
23 #define FAST_WORKING_DIRECTORY 0
25 #define FAST_WORKING_DIRECTORY 1
28 static int diff_detect_rename_default
;
29 static int diff_compaction_heuristic
; /* experimental */
30 static int diff_rename_limit_default
= 400;
31 static int diff_suppress_blank_empty
;
32 static int diff_use_color_default
= -1;
33 static int diff_context_default
= 3;
34 static const char *diff_word_regex_cfg
;
35 static const char *external_diff_cmd_cfg
;
36 static const char *diff_order_file_cfg
;
37 int diff_auto_refresh_index
= 1;
38 static int diff_mnemonic_prefix
;
39 static int diff_no_prefix
;
40 static int diff_stat_graph_width
;
41 static int diff_dirstat_permille_default
= 30;
42 static struct diff_options default_diff_options
;
43 static long diff_algorithm
;
45 static char diff_colors
[][COLOR_MAXLEN
] = {
47 GIT_COLOR_NORMAL
, /* CONTEXT */
48 GIT_COLOR_BOLD
, /* METAINFO */
49 GIT_COLOR_CYAN
, /* FRAGINFO */
50 GIT_COLOR_RED
, /* OLD */
51 GIT_COLOR_GREEN
, /* NEW */
52 GIT_COLOR_YELLOW
, /* COMMIT */
53 GIT_COLOR_BG_RED
, /* WHITESPACE */
54 GIT_COLOR_NORMAL
, /* FUNCINFO */
57 static NORETURN
void die_want_option(const char *option_name
)
59 die(_("option '%s' requires a value"), option_name
);
62 static int parse_diff_color_slot(const char *var
)
64 if (!strcasecmp(var
, "context") || !strcasecmp(var
, "plain"))
66 if (!strcasecmp(var
, "meta"))
68 if (!strcasecmp(var
, "frag"))
70 if (!strcasecmp(var
, "old"))
72 if (!strcasecmp(var
, "new"))
74 if (!strcasecmp(var
, "commit"))
76 if (!strcasecmp(var
, "whitespace"))
77 return DIFF_WHITESPACE
;
78 if (!strcasecmp(var
, "func"))
83 static int parse_dirstat_params(struct diff_options
*options
, const char *params_string
,
84 struct strbuf
*errmsg
)
86 char *params_copy
= xstrdup(params_string
);
87 struct string_list params
= STRING_LIST_INIT_NODUP
;
92 string_list_split_in_place(¶ms
, params_copy
, ',', -1);
93 for (i
= 0; i
< params
.nr
; i
++) {
94 const char *p
= params
.items
[i
].string
;
95 if (!strcmp(p
, "changes")) {
96 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
97 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
98 } else if (!strcmp(p
, "lines")) {
99 DIFF_OPT_SET(options
, DIRSTAT_BY_LINE
);
100 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
101 } else if (!strcmp(p
, "files")) {
102 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
103 DIFF_OPT_SET(options
, DIRSTAT_BY_FILE
);
104 } else if (!strcmp(p
, "noncumulative")) {
105 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
106 } else if (!strcmp(p
, "cumulative")) {
107 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
108 } else if (isdigit(*p
)) {
110 int permille
= strtoul(p
, &end
, 10) * 10;
111 if (*end
== '.' && isdigit(*++end
)) {
112 /* only use first digit */
113 permille
+= *end
- '0';
114 /* .. and ignore any further digits */
115 while (isdigit(*++end
))
119 options
->dirstat_permille
= permille
;
121 strbuf_addf(errmsg
, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
126 strbuf_addf(errmsg
, _(" Unknown dirstat parameter '%s'\n"), p
);
131 string_list_clear(¶ms
, 0);
136 static int parse_submodule_params(struct diff_options
*options
, const char *value
)
138 if (!strcmp(value
, "log"))
139 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
140 else if (!strcmp(value
, "short"))
141 DIFF_OPT_CLR(options
, SUBMODULE_LOG
);
147 static int git_config_rename(const char *var
, const char *value
)
150 return DIFF_DETECT_RENAME
;
151 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
152 return DIFF_DETECT_COPY
;
153 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
156 long parse_algorithm_value(const char *value
)
160 else if (!strcasecmp(value
, "myers") || !strcasecmp(value
, "default"))
162 else if (!strcasecmp(value
, "minimal"))
163 return XDF_NEED_MINIMAL
;
164 else if (!strcasecmp(value
, "patience"))
165 return XDF_PATIENCE_DIFF
;
166 else if (!strcasecmp(value
, "histogram"))
167 return XDF_HISTOGRAM_DIFF
;
172 * These are to give UI layer defaults.
173 * The core-level commands such as git-diff-files should
174 * never be affected by the setting of diff.renames
175 * the user happens to have in the configuration file.
177 void init_diff_ui_defaults(void)
179 diff_detect_rename_default
= 1;
182 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
184 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
185 diff_use_color_default
= git_config_colorbool(var
, value
);
188 if (!strcmp(var
, "diff.context")) {
189 diff_context_default
= git_config_int(var
, value
);
190 if (diff_context_default
< 0)
194 if (!strcmp(var
, "diff.renames")) {
195 diff_detect_rename_default
= git_config_rename(var
, value
);
198 if (!strcmp(var
, "diff.compactionheuristic")) {
199 diff_compaction_heuristic
= git_config_bool(var
, value
);
202 if (!strcmp(var
, "diff.autorefreshindex")) {
203 diff_auto_refresh_index
= git_config_bool(var
, value
);
206 if (!strcmp(var
, "diff.mnemonicprefix")) {
207 diff_mnemonic_prefix
= git_config_bool(var
, value
);
210 if (!strcmp(var
, "diff.noprefix")) {
211 diff_no_prefix
= git_config_bool(var
, value
);
214 if (!strcmp(var
, "diff.statgraphwidth")) {
215 diff_stat_graph_width
= git_config_int(var
, value
);
218 if (!strcmp(var
, "diff.external"))
219 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
220 if (!strcmp(var
, "diff.wordregex"))
221 return git_config_string(&diff_word_regex_cfg
, var
, value
);
222 if (!strcmp(var
, "diff.orderfile"))
223 return git_config_pathname(&diff_order_file_cfg
, var
, value
);
225 if (!strcmp(var
, "diff.ignoresubmodules"))
226 handle_ignore_submodules_arg(&default_diff_options
, value
);
228 if (!strcmp(var
, "diff.submodule")) {
229 if (parse_submodule_params(&default_diff_options
, value
))
230 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
235 if (!strcmp(var
, "diff.algorithm")) {
236 diff_algorithm
= parse_algorithm_value(value
);
237 if (diff_algorithm
< 0)
242 if (git_color_config(var
, value
, cb
) < 0)
245 return git_diff_basic_config(var
, value
, cb
);
248 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
252 if (!strcmp(var
, "diff.renamelimit")) {
253 diff_rename_limit_default
= git_config_int(var
, value
);
257 if (userdiff_config(var
, value
) < 0)
260 if (skip_prefix(var
, "diff.color.", &name
) ||
261 skip_prefix(var
, "color.diff.", &name
)) {
262 int slot
= parse_diff_color_slot(name
);
266 return config_error_nonbool(var
);
267 return color_parse(value
, diff_colors
[slot
]);
270 /* like GNU diff's --suppress-blank-empty option */
271 if (!strcmp(var
, "diff.suppressblankempty") ||
272 /* for backwards compatibility */
273 !strcmp(var
, "diff.suppress-blank-empty")) {
274 diff_suppress_blank_empty
= git_config_bool(var
, value
);
278 if (!strcmp(var
, "diff.dirstat")) {
279 struct strbuf errmsg
= STRBUF_INIT
;
280 default_diff_options
.dirstat_permille
= diff_dirstat_permille_default
;
281 if (parse_dirstat_params(&default_diff_options
, value
, &errmsg
))
282 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
284 strbuf_release(&errmsg
);
285 diff_dirstat_permille_default
= default_diff_options
.dirstat_permille
;
289 if (starts_with(var
, "submodule."))
290 return parse_submodule_config_option(var
, value
);
292 return git_default_config(var
, value
, cb
);
295 static char *quote_two(const char *one
, const char *two
)
297 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
298 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
299 struct strbuf res
= STRBUF_INIT
;
301 if (need_one
+ need_two
) {
302 strbuf_addch(&res
, '"');
303 quote_c_style(one
, &res
, NULL
, 1);
304 quote_c_style(two
, &res
, NULL
, 1);
305 strbuf_addch(&res
, '"');
307 strbuf_addstr(&res
, one
);
308 strbuf_addstr(&res
, two
);
310 return strbuf_detach(&res
, NULL
);
313 static const char *external_diff(void)
315 static const char *external_diff_cmd
= NULL
;
316 static int done_preparing
= 0;
319 return external_diff_cmd
;
320 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
321 if (!external_diff_cmd
)
322 external_diff_cmd
= external_diff_cmd_cfg
;
324 return external_diff_cmd
;
328 * Keep track of files used for diffing. Sometimes such an entry
329 * refers to a temporary file, sometimes to an existing file, and
330 * sometimes to "/dev/null".
332 static struct diff_tempfile
{
334 * filename external diff should read from, or NULL if this
335 * entry is currently not in use:
339 char hex
[GIT_SHA1_HEXSZ
+ 1];
343 * If this diff_tempfile instance refers to a temporary file,
344 * this tempfile object is used to manage its lifetime.
346 struct tempfile tempfile
;
349 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
351 struct emit_callback
{
354 int blank_at_eof_in_preimage
;
355 int blank_at_eof_in_postimage
;
357 int lno_in_postimage
;
358 sane_truncate_fn truncate
;
359 const char **label_path
;
360 struct diff_words_data
*diff_words
;
361 struct diff_options
*opt
;
363 struct strbuf
*header
;
366 static int count_lines(const char *data
, int size
)
368 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
375 completely_empty
= 0;
379 completely_empty
= 0;
382 if (completely_empty
)
385 count
++; /* no trailing newline */
389 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
391 if (!DIFF_FILE_VALID(one
)) {
392 mf
->ptr
= (char *)""; /* does not matter */
396 else if (diff_populate_filespec(one
, 0))
400 mf
->size
= one
->size
;
404 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
405 static unsigned long diff_filespec_size(struct diff_filespec
*one
)
407 if (!DIFF_FILE_VALID(one
))
409 diff_populate_filespec(one
, CHECK_SIZE_ONLY
);
413 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
416 long size
= mf
->size
;
421 ptr
+= size
- 1; /* pointing at the very end */
423 ; /* incomplete line */
425 ptr
--; /* skip the last LF */
426 while (mf
->ptr
< ptr
) {
428 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
429 if (*prev_eol
== '\n')
431 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
439 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
440 struct emit_callback
*ecbdata
)
443 unsigned ws_rule
= ecbdata
->ws_rule
;
444 l1
= count_trailing_blank(mf1
, ws_rule
);
445 l2
= count_trailing_blank(mf2
, ws_rule
);
447 ecbdata
->blank_at_eof_in_preimage
= 0;
448 ecbdata
->blank_at_eof_in_postimage
= 0;
451 at
= count_lines(mf1
->ptr
, mf1
->size
);
452 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
454 at
= count_lines(mf2
->ptr
, mf2
->size
);
455 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
458 static void emit_line_0(struct diff_options
*o
, const char *set
, const char *reset
,
459 int first
, const char *line
, int len
)
461 int has_trailing_newline
, has_trailing_carriage_return
;
463 FILE *file
= o
->file
;
465 fputs(diff_line_prefix(o
), file
);
468 has_trailing_newline
= (first
== '\n');
469 has_trailing_carriage_return
= (!has_trailing_newline
&&
471 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
473 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
474 if (has_trailing_newline
)
476 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
477 if (has_trailing_carriage_return
)
482 if (len
|| !nofirst
) {
486 fwrite(line
, len
, 1, file
);
489 if (has_trailing_carriage_return
)
491 if (has_trailing_newline
)
495 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
496 const char *line
, int len
)
498 emit_line_0(o
, set
, reset
, line
[0], line
+1, len
-1);
501 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
503 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
504 ecbdata
->blank_at_eof_in_preimage
&&
505 ecbdata
->blank_at_eof_in_postimage
&&
506 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
507 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
509 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
512 static void emit_line_checked(const char *reset
,
513 struct emit_callback
*ecbdata
,
514 const char *line
, int len
,
515 enum color_diff color
,
516 unsigned ws_error_highlight
,
519 const char *set
= diff_get_color(ecbdata
->color_diff
, color
);
520 const char *ws
= NULL
;
522 if (ecbdata
->opt
->ws_error_highlight
& ws_error_highlight
) {
523 ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
529 emit_line_0(ecbdata
->opt
, set
, reset
, sign
, line
, len
);
530 else if (sign
== '+' && new_blank_line_at_eof(ecbdata
, line
, len
))
531 /* Blank line at EOF - paint '+' as well */
532 emit_line_0(ecbdata
->opt
, ws
, reset
, sign
, line
, len
);
534 /* Emit just the prefix, then the rest. */
535 emit_line_0(ecbdata
->opt
, set
, reset
, sign
, "", 0);
536 ws_check_emit(line
, len
, ecbdata
->ws_rule
,
537 ecbdata
->opt
->file
, set
, reset
, ws
);
541 static void emit_add_line(const char *reset
,
542 struct emit_callback
*ecbdata
,
543 const char *line
, int len
)
545 emit_line_checked(reset
, ecbdata
, line
, len
,
546 DIFF_FILE_NEW
, WSEH_NEW
, '+');
549 static void emit_del_line(const char *reset
,
550 struct emit_callback
*ecbdata
,
551 const char *line
, int len
)
553 emit_line_checked(reset
, ecbdata
, line
, len
,
554 DIFF_FILE_OLD
, WSEH_OLD
, '-');
557 static void emit_context_line(const char *reset
,
558 struct emit_callback
*ecbdata
,
559 const char *line
, int len
)
561 emit_line_checked(reset
, ecbdata
, line
, len
,
562 DIFF_CONTEXT
, WSEH_CONTEXT
, ' ');
565 static void emit_hunk_header(struct emit_callback
*ecbdata
,
566 const char *line
, int len
)
568 const char *context
= diff_get_color(ecbdata
->color_diff
, DIFF_CONTEXT
);
569 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
570 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
571 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
572 static const char atat
[2] = { '@', '@' };
574 struct strbuf msgbuf
= STRBUF_INIT
;
579 * As a hunk header must begin with "@@ -<old>, +<new> @@",
580 * it always is at least 10 bytes long.
583 memcmp(line
, atat
, 2) ||
584 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
585 emit_line(ecbdata
->opt
, context
, reset
, line
, len
);
588 ep
+= 2; /* skip over @@ */
590 /* The hunk header in fraginfo color */
591 strbuf_addstr(&msgbuf
, frag
);
592 strbuf_add(&msgbuf
, line
, ep
- line
);
593 strbuf_addstr(&msgbuf
, reset
);
599 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
602 /* blank before the func header */
603 for (cp
= ep
; ep
- line
< len
; ep
++)
604 if (*ep
!= ' ' && *ep
!= '\t')
607 strbuf_addstr(&msgbuf
, context
);
608 strbuf_add(&msgbuf
, cp
, ep
- cp
);
609 strbuf_addstr(&msgbuf
, reset
);
612 if (ep
< line
+ len
) {
613 strbuf_addstr(&msgbuf
, func
);
614 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
615 strbuf_addstr(&msgbuf
, reset
);
618 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
619 emit_line(ecbdata
->opt
, "", "", msgbuf
.buf
, msgbuf
.len
);
620 strbuf_release(&msgbuf
);
623 static struct diff_tempfile
*claim_diff_tempfile(void) {
625 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
626 if (!diff_temp
[i
].name
)
627 return diff_temp
+ i
;
628 die("BUG: diff is failing to clean up its tempfiles");
631 static void remove_tempfile(void)
634 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
635 if (is_tempfile_active(&diff_temp
[i
].tempfile
))
636 delete_tempfile(&diff_temp
[i
].tempfile
);
637 diff_temp
[i
].name
= NULL
;
641 static void print_line_count(FILE *file
, int count
)
645 fprintf(file
, "0,0");
651 fprintf(file
, "1,%d", count
);
656 static void emit_rewrite_lines(struct emit_callback
*ecb
,
657 int prefix
, const char *data
, int size
)
659 const char *endp
= NULL
;
660 static const char *nneof
= " No newline at end of file\n";
661 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
666 endp
= memchr(data
, '\n', size
);
667 len
= endp
? (endp
- data
+ 1) : size
;
669 ecb
->lno_in_preimage
++;
670 emit_del_line(reset
, ecb
, data
, len
);
672 ecb
->lno_in_postimage
++;
673 emit_add_line(reset
, ecb
, data
, len
);
679 const char *context
= diff_get_color(ecb
->color_diff
,
681 putc('\n', ecb
->opt
->file
);
682 emit_line_0(ecb
->opt
, context
, reset
, '\\',
683 nneof
, strlen(nneof
));
687 static void emit_rewrite_diff(const char *name_a
,
689 struct diff_filespec
*one
,
690 struct diff_filespec
*two
,
691 struct userdiff_driver
*textconv_one
,
692 struct userdiff_driver
*textconv_two
,
693 struct diff_options
*o
)
696 const char *name_a_tab
, *name_b_tab
;
697 const char *metainfo
= diff_get_color(o
->use_color
, DIFF_METAINFO
);
698 const char *fraginfo
= diff_get_color(o
->use_color
, DIFF_FRAGINFO
);
699 const char *reset
= diff_get_color(o
->use_color
, DIFF_RESET
);
700 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
701 const char *a_prefix
, *b_prefix
;
702 char *data_one
, *data_two
;
703 size_t size_one
, size_two
;
704 struct emit_callback ecbdata
;
705 const char *line_prefix
= diff_line_prefix(o
);
707 if (diff_mnemonic_prefix
&& DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
708 a_prefix
= o
->b_prefix
;
709 b_prefix
= o
->a_prefix
;
711 a_prefix
= o
->a_prefix
;
712 b_prefix
= o
->b_prefix
;
715 name_a
+= (*name_a
== '/');
716 name_b
+= (*name_b
== '/');
717 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
718 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
720 strbuf_reset(&a_name
);
721 strbuf_reset(&b_name
);
722 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
723 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
725 size_one
= fill_textconv(textconv_one
, one
, &data_one
);
726 size_two
= fill_textconv(textconv_two
, two
, &data_two
);
728 memset(&ecbdata
, 0, sizeof(ecbdata
));
729 ecbdata
.color_diff
= want_color(o
->use_color
);
730 ecbdata
.found_changesp
= &o
->found_changes
;
731 ecbdata
.ws_rule
= whitespace_rule(name_b
);
733 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
735 mf1
.ptr
= (char *)data_one
;
736 mf2
.ptr
= (char *)data_two
;
739 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
741 ecbdata
.lno_in_preimage
= 1;
742 ecbdata
.lno_in_postimage
= 1;
744 lc_a
= count_lines(data_one
, size_one
);
745 lc_b
= count_lines(data_two
, size_two
);
747 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
748 line_prefix
, metainfo
, a_name
.buf
, name_a_tab
, reset
,
749 line_prefix
, metainfo
, b_name
.buf
, name_b_tab
, reset
,
750 line_prefix
, fraginfo
);
751 if (!o
->irreversible_delete
)
752 print_line_count(o
->file
, lc_a
);
754 fprintf(o
->file
, "?,?");
755 fprintf(o
->file
, " +");
756 print_line_count(o
->file
, lc_b
);
757 fprintf(o
->file
, " @@%s\n", reset
);
758 if (lc_a
&& !o
->irreversible_delete
)
759 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
761 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
763 free((char *)data_one
);
765 free((char *)data_two
);
768 struct diff_words_buffer
{
771 struct diff_words_orig
{
772 const char *begin
, *end
;
774 int orig_nr
, orig_alloc
;
777 static void diff_words_append(char *line
, unsigned long len
,
778 struct diff_words_buffer
*buffer
)
780 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
783 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
784 buffer
->text
.size
+= len
;
785 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
788 struct diff_words_style_elem
{
791 const char *color
; /* NULL; filled in by the setup code if
792 * color is enabled */
795 struct diff_words_style
{
796 enum diff_words_type type
;
797 struct diff_words_style_elem
new, old
, ctx
;
801 static struct diff_words_style diff_words_styles
[] = {
802 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
803 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
804 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
807 struct diff_words_data
{
808 struct diff_words_buffer minus
, plus
;
809 const char *current_plus
;
811 struct diff_options
*opt
;
813 enum diff_words_type type
;
814 struct diff_words_style
*style
;
817 static int fn_out_diff_words_write_helper(FILE *fp
,
818 struct diff_words_style_elem
*st_el
,
820 size_t count
, const char *buf
,
821 const char *line_prefix
)
826 char *p
= memchr(buf
, '\n', count
);
828 fputs(line_prefix
, fp
);
830 if (st_el
->color
&& fputs(st_el
->color
, fp
) < 0)
832 if (fputs(st_el
->prefix
, fp
) < 0 ||
833 fwrite(buf
, p
? p
- buf
: count
, 1, fp
) != 1 ||
834 fputs(st_el
->suffix
, fp
) < 0)
836 if (st_el
->color
&& *st_el
->color
837 && fputs(GIT_COLOR_RESET
, fp
) < 0)
842 if (fputs(newline
, fp
) < 0)
844 count
-= p
+ 1 - buf
;
852 * '--color-words' algorithm can be described as:
854 * 1. collect a the minus/plus lines of a diff hunk, divided into
855 * minus-lines and plus-lines;
857 * 2. break both minus-lines and plus-lines into words and
858 * place them into two mmfile_t with one word for each line;
860 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
862 * And for the common parts of the both file, we output the plus side text.
863 * diff_words->current_plus is used to trace the current position of the plus file
864 * which printed. diff_words->last_minus is used to trace the last minus word
867 * For '--graph' to work with '--color-words', we need to output the graph prefix
868 * on each line of color words output. Generally, there are two conditions on
869 * which we should output the prefix.
871 * 1. diff_words->last_minus == 0 &&
872 * diff_words->current_plus == diff_words->plus.text.ptr
874 * that is: the plus text must start as a new line, and if there is no minus
875 * word printed, a graph prefix must be printed.
877 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
878 * *(diff_words->current_plus - 1) == '\n'
880 * that is: a graph prefix must be printed following a '\n'
882 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
884 if ((diff_words
->last_minus
== 0 &&
885 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
886 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
887 *(diff_words
->current_plus
- 1) == '\n')) {
894 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
896 struct diff_words_data
*diff_words
= priv
;
897 struct diff_words_style
*style
= diff_words
->style
;
898 int minus_first
, minus_len
, plus_first
, plus_len
;
899 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
900 struct diff_options
*opt
= diff_words
->opt
;
901 const char *line_prefix
;
903 if (line
[0] != '@' || parse_hunk_header(line
, len
,
904 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
908 line_prefix
= diff_line_prefix(opt
);
910 /* POSIX requires that first be decremented by one if len == 0... */
912 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
914 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
916 minus_begin
= minus_end
=
917 diff_words
->minus
.orig
[minus_first
].end
;
920 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
921 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
923 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
925 if (color_words_output_graph_prefix(diff_words
)) {
926 fputs(line_prefix
, diff_words
->opt
->file
);
928 if (diff_words
->current_plus
!= plus_begin
) {
929 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
930 &style
->ctx
, style
->newline
,
931 plus_begin
- diff_words
->current_plus
,
932 diff_words
->current_plus
, line_prefix
);
933 if (*(plus_begin
- 1) == '\n')
934 fputs(line_prefix
, diff_words
->opt
->file
);
936 if (minus_begin
!= minus_end
) {
937 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
938 &style
->old
, style
->newline
,
939 minus_end
- minus_begin
, minus_begin
,
942 if (plus_begin
!= plus_end
) {
943 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
944 &style
->new, style
->newline
,
945 plus_end
- plus_begin
, plus_begin
,
949 diff_words
->current_plus
= plus_end
;
950 diff_words
->last_minus
= minus_first
;
953 /* This function starts looking at *begin, and returns 0 iff a word was found. */
954 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
955 int *begin
, int *end
)
957 if (word_regex
&& *begin
< buffer
->size
) {
959 if (!regexec(word_regex
, buffer
->ptr
+ *begin
, 1, match
, 0)) {
960 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
961 '\n', match
[0].rm_eo
- match
[0].rm_so
);
962 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
963 *begin
+= match
[0].rm_so
;
964 return *begin
>= *end
;
969 /* find the next word */
970 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
972 if (*begin
>= buffer
->size
)
975 /* find the end of the word */
977 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
984 * This function splits the words in buffer->text, stores the list with
985 * newline separator into out, and saves the offsets of the original words
988 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
997 /* fake an empty "0th" word */
998 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
999 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
1000 buffer
->orig_nr
= 1;
1002 for (i
= 0; i
< buffer
->text
.size
; i
++) {
1003 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
1006 /* store original boundaries */
1007 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
1008 buffer
->orig_alloc
);
1009 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
1010 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
1013 /* store one word */
1014 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
1015 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
1016 out
->ptr
[out
->size
+ j
- i
] = '\n';
1017 out
->size
+= j
- i
+ 1;
1023 /* this executes the word diff on the accumulated buffers */
1024 static void diff_words_show(struct diff_words_data
*diff_words
)
1028 mmfile_t minus
, plus
;
1029 struct diff_words_style
*style
= diff_words
->style
;
1031 struct diff_options
*opt
= diff_words
->opt
;
1032 const char *line_prefix
;
1035 line_prefix
= diff_line_prefix(opt
);
1037 /* special case: only removal */
1038 if (!diff_words
->plus
.text
.size
) {
1039 fputs(line_prefix
, diff_words
->opt
->file
);
1040 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
1041 &style
->old
, style
->newline
,
1042 diff_words
->minus
.text
.size
,
1043 diff_words
->minus
.text
.ptr
, line_prefix
);
1044 diff_words
->minus
.text
.size
= 0;
1048 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
1049 diff_words
->last_minus
= 0;
1051 memset(&xpp
, 0, sizeof(xpp
));
1052 memset(&xecfg
, 0, sizeof(xecfg
));
1053 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
1054 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
1056 /* as only the hunk header will be parsed, we need a 0-context */
1058 if (xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
1060 die("unable to generate word diff");
1063 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
1064 diff_words
->plus
.text
.size
) {
1065 if (color_words_output_graph_prefix(diff_words
))
1066 fputs(line_prefix
, diff_words
->opt
->file
);
1067 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
1068 &style
->ctx
, style
->newline
,
1069 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
1070 - diff_words
->current_plus
, diff_words
->current_plus
,
1073 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
1076 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
1077 static void diff_words_flush(struct emit_callback
*ecbdata
)
1079 if (ecbdata
->diff_words
->minus
.text
.size
||
1080 ecbdata
->diff_words
->plus
.text
.size
)
1081 diff_words_show(ecbdata
->diff_words
);
1084 static void diff_filespec_load_driver(struct diff_filespec
*one
)
1086 /* Use already-loaded driver */
1090 if (S_ISREG(one
->mode
))
1091 one
->driver
= userdiff_find_by_path(one
->path
);
1093 /* Fallback to default settings */
1095 one
->driver
= userdiff_find_by_name("default");
1098 static const char *userdiff_word_regex(struct diff_filespec
*one
)
1100 diff_filespec_load_driver(one
);
1101 return one
->driver
->word_regex
;
1104 static void init_diff_words_data(struct emit_callback
*ecbdata
,
1105 struct diff_options
*orig_opts
,
1106 struct diff_filespec
*one
,
1107 struct diff_filespec
*two
)
1110 struct diff_options
*o
= xmalloc(sizeof(struct diff_options
));
1111 memcpy(o
, orig_opts
, sizeof(struct diff_options
));
1113 ecbdata
->diff_words
=
1114 xcalloc(1, sizeof(struct diff_words_data
));
1115 ecbdata
->diff_words
->type
= o
->word_diff
;
1116 ecbdata
->diff_words
->opt
= o
;
1118 o
->word_regex
= userdiff_word_regex(one
);
1120 o
->word_regex
= userdiff_word_regex(two
);
1122 o
->word_regex
= diff_word_regex_cfg
;
1123 if (o
->word_regex
) {
1124 ecbdata
->diff_words
->word_regex
= (regex_t
*)
1125 xmalloc(sizeof(regex_t
));
1126 if (regcomp(ecbdata
->diff_words
->word_regex
,
1128 REG_EXTENDED
| REG_NEWLINE
))
1129 die ("Invalid regular expression: %s",
1132 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
1133 if (o
->word_diff
== diff_words_styles
[i
].type
) {
1134 ecbdata
->diff_words
->style
=
1135 &diff_words_styles
[i
];
1139 if (want_color(o
->use_color
)) {
1140 struct diff_words_style
*st
= ecbdata
->diff_words
->style
;
1141 st
->old
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1142 st
->new.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1143 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1147 static void free_diff_words_data(struct emit_callback
*ecbdata
)
1149 if (ecbdata
->diff_words
) {
1150 diff_words_flush(ecbdata
);
1151 free (ecbdata
->diff_words
->opt
);
1152 free (ecbdata
->diff_words
->minus
.text
.ptr
);
1153 free (ecbdata
->diff_words
->minus
.orig
);
1154 free (ecbdata
->diff_words
->plus
.text
.ptr
);
1155 free (ecbdata
->diff_words
->plus
.orig
);
1156 if (ecbdata
->diff_words
->word_regex
) {
1157 regfree(ecbdata
->diff_words
->word_regex
);
1158 free(ecbdata
->diff_words
->word_regex
);
1160 free(ecbdata
->diff_words
);
1161 ecbdata
->diff_words
= NULL
;
1165 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
1167 if (want_color(diff_use_color
))
1168 return diff_colors
[ix
];
1172 const char *diff_line_prefix(struct diff_options
*opt
)
1174 struct strbuf
*msgbuf
;
1175 if (!opt
->output_prefix
)
1178 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
1182 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
1185 unsigned long allot
;
1189 return ecb
->truncate(line
, len
);
1193 (void) utf8_width(&cp
, &l
);
1195 break; /* truncated in the middle? */
1200 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
1203 ecbdata
->lno_in_preimage
= 0;
1204 ecbdata
->lno_in_postimage
= 0;
1205 p
= strchr(line
, '-');
1207 return; /* cannot happen */
1208 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
1211 return; /* cannot happen */
1212 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
1215 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
1217 struct emit_callback
*ecbdata
= priv
;
1218 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
1219 const char *context
= diff_get_color(ecbdata
->color_diff
, DIFF_CONTEXT
);
1220 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1221 struct diff_options
*o
= ecbdata
->opt
;
1222 const char *line_prefix
= diff_line_prefix(o
);
1224 if (ecbdata
->header
) {
1225 fprintf(ecbdata
->opt
->file
, "%s", ecbdata
->header
->buf
);
1226 strbuf_reset(ecbdata
->header
);
1227 ecbdata
->header
= NULL
;
1229 *(ecbdata
->found_changesp
) = 1;
1231 if (ecbdata
->label_path
[0]) {
1232 const char *name_a_tab
, *name_b_tab
;
1234 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
1235 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
1237 fprintf(ecbdata
->opt
->file
, "%s%s--- %s%s%s\n",
1238 line_prefix
, meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
1239 fprintf(ecbdata
->opt
->file
, "%s%s+++ %s%s%s\n",
1240 line_prefix
, meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
1241 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
1244 if (diff_suppress_blank_empty
1245 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
1250 if (line
[0] == '@') {
1251 if (ecbdata
->diff_words
)
1252 diff_words_flush(ecbdata
);
1253 len
= sane_truncate_line(ecbdata
, line
, len
);
1254 find_lno(line
, ecbdata
);
1255 emit_hunk_header(ecbdata
, line
, len
);
1256 if (line
[len
-1] != '\n')
1257 putc('\n', ecbdata
->opt
->file
);
1262 emit_line(ecbdata
->opt
, reset
, reset
, line
, len
);
1263 if (ecbdata
->diff_words
1264 && ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
)
1265 fputs("~\n", ecbdata
->opt
->file
);
1269 if (ecbdata
->diff_words
) {
1270 if (line
[0] == '-') {
1271 diff_words_append(line
, len
,
1272 &ecbdata
->diff_words
->minus
);
1274 } else if (line
[0] == '+') {
1275 diff_words_append(line
, len
,
1276 &ecbdata
->diff_words
->plus
);
1278 } else if (starts_with(line
, "\\ ")) {
1280 * Eat the "no newline at eof" marker as if we
1281 * saw a "+" or "-" line with nothing on it,
1282 * and return without diff_words_flush() to
1283 * defer processing. If this is the end of
1284 * preimage, more "+" lines may come after it.
1288 diff_words_flush(ecbdata
);
1289 if (ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
) {
1290 emit_line(ecbdata
->opt
, context
, reset
, line
, len
);
1291 fputs("~\n", ecbdata
->opt
->file
);
1294 * Skip the prefix character, if any. With
1295 * diff_suppress_blank_empty, there may be
1298 if (line
[0] != '\n') {
1302 emit_line(ecbdata
->opt
, context
, reset
, line
, len
);
1309 ecbdata
->lno_in_postimage
++;
1310 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
1313 ecbdata
->lno_in_preimage
++;
1314 emit_del_line(reset
, ecbdata
, line
+ 1, len
- 1);
1317 ecbdata
->lno_in_postimage
++;
1318 ecbdata
->lno_in_preimage
++;
1319 emit_context_line(reset
, ecbdata
, line
+ 1, len
- 1);
1322 /* incomplete line at the end */
1323 ecbdata
->lno_in_preimage
++;
1324 emit_line(ecbdata
->opt
,
1325 diff_get_color(ecbdata
->color_diff
, DIFF_CONTEXT
),
1331 static char *pprint_rename(const char *a
, const char *b
)
1333 const char *old
= a
;
1334 const char *new = b
;
1335 struct strbuf name
= STRBUF_INIT
;
1336 int pfx_length
, sfx_length
;
1337 int pfx_adjust_for_slash
;
1338 int len_a
= strlen(a
);
1339 int len_b
= strlen(b
);
1340 int a_midlen
, b_midlen
;
1341 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
1342 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
1344 if (qlen_a
|| qlen_b
) {
1345 quote_c_style(a
, &name
, NULL
, 0);
1346 strbuf_addstr(&name
, " => ");
1347 quote_c_style(b
, &name
, NULL
, 0);
1348 return strbuf_detach(&name
, NULL
);
1351 /* Find common prefix */
1353 while (*old
&& *new && *old
== *new) {
1355 pfx_length
= old
- a
+ 1;
1360 /* Find common suffix */
1365 * If there is a common prefix, it must end in a slash. In
1366 * that case we let this loop run 1 into the prefix to see the
1369 * If there is no common prefix, we cannot do this as it would
1370 * underrun the input strings.
1372 pfx_adjust_for_slash
= (pfx_length
? 1 : 0);
1373 while (a
+ pfx_length
- pfx_adjust_for_slash
<= old
&&
1374 b
+ pfx_length
- pfx_adjust_for_slash
<= new &&
1377 sfx_length
= len_a
- (old
- a
);
1383 * pfx{mid-a => mid-b}sfx
1384 * {pfx-a => pfx-b}sfx
1385 * pfx{sfx-a => sfx-b}
1388 a_midlen
= len_a
- pfx_length
- sfx_length
;
1389 b_midlen
= len_b
- pfx_length
- sfx_length
;
1395 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
1396 if (pfx_length
+ sfx_length
) {
1397 strbuf_add(&name
, a
, pfx_length
);
1398 strbuf_addch(&name
, '{');
1400 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
1401 strbuf_addstr(&name
, " => ");
1402 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
1403 if (pfx_length
+ sfx_length
) {
1404 strbuf_addch(&name
, '}');
1405 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
1407 return strbuf_detach(&name
, NULL
);
1413 struct diffstat_file
{
1417 unsigned is_unmerged
:1;
1418 unsigned is_binary
:1;
1419 unsigned is_renamed
:1;
1420 unsigned is_interesting
:1;
1421 uintmax_t added
, deleted
;
1425 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
1429 struct diffstat_file
*x
;
1430 x
= xcalloc(1, sizeof(*x
));
1431 ALLOC_GROW(diffstat
->files
, diffstat
->nr
+ 1, diffstat
->alloc
);
1432 diffstat
->files
[diffstat
->nr
++] = x
;
1434 x
->from_name
= xstrdup(name_a
);
1435 x
->name
= xstrdup(name_b
);
1439 x
->from_name
= NULL
;
1440 x
->name
= xstrdup(name_a
);
1445 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
1447 struct diffstat_t
*diffstat
= priv
;
1448 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
1452 else if (line
[0] == '-')
1456 const char mime_boundary_leader
[] = "------------";
1458 static int scale_linear(int it
, int width
, int max_change
)
1463 * make sure that at least one '-' or '+' is printed if
1464 * there is any change to this path. The easiest way is to
1465 * scale linearly as if the alloted width is one column shorter
1466 * than it is, and then add 1 to the result.
1468 return 1 + (it
* (width
- 1) / max_change
);
1471 static void show_name(FILE *file
,
1472 const char *prefix
, const char *name
, int len
)
1474 fprintf(file
, " %s%-*s |", prefix
, len
, name
);
1477 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
1481 fprintf(file
, "%s", set
);
1484 fprintf(file
, "%s", reset
);
1487 static void fill_print_name(struct diffstat_file
*file
)
1491 if (file
->print_name
)
1494 if (!file
->is_renamed
) {
1495 struct strbuf buf
= STRBUF_INIT
;
1496 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
1497 pname
= strbuf_detach(&buf
, NULL
);
1500 strbuf_release(&buf
);
1503 pname
= pprint_rename(file
->from_name
, file
->name
);
1505 file
->print_name
= pname
;
1508 int print_stat_summary(FILE *fp
, int files
, int insertions
, int deletions
)
1510 struct strbuf sb
= STRBUF_INIT
;
1514 assert(insertions
== 0 && deletions
== 0);
1515 return fprintf(fp
, "%s\n", " 0 files changed");
1519 (files
== 1) ? " %d file changed" : " %d files changed",
1523 * For binary diff, the caller may want to print "x files
1524 * changed" with insertions == 0 && deletions == 0.
1526 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1527 * is probably less confusing (i.e skip over "2 files changed
1528 * but nothing about added/removed lines? Is this a bug in Git?").
1530 if (insertions
|| deletions
== 0) {
1532 (insertions
== 1) ? ", %d insertion(+)" : ", %d insertions(+)",
1536 if (deletions
|| insertions
== 0) {
1538 (deletions
== 1) ? ", %d deletion(-)" : ", %d deletions(-)",
1541 strbuf_addch(&sb
, '\n');
1542 ret
= fputs(sb
.buf
, fp
);
1543 strbuf_release(&sb
);
1547 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
1549 int i
, len
, add
, del
, adds
= 0, dels
= 0;
1550 uintmax_t max_change
= 0, max_len
= 0;
1551 int total_files
= data
->nr
, count
;
1552 int width
, name_width
, graph_width
, number_width
= 0, bin_width
= 0;
1553 const char *reset
, *add_c
, *del_c
;
1554 const char *line_prefix
= "";
1555 int extra_shown
= 0;
1560 line_prefix
= diff_line_prefix(options
);
1561 count
= options
->stat_count
? options
->stat_count
: data
->nr
;
1563 reset
= diff_get_color_opt(options
, DIFF_RESET
);
1564 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
1565 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
1568 * Find the longest filename and max number of changes
1570 for (i
= 0; (i
< count
) && (i
< data
->nr
); i
++) {
1571 struct diffstat_file
*file
= data
->files
[i
];
1572 uintmax_t change
= file
->added
+ file
->deleted
;
1574 if (!file
->is_interesting
&& (change
== 0)) {
1575 count
++; /* not shown == room for one more */
1578 fill_print_name(file
);
1579 len
= strlen(file
->print_name
);
1583 if (file
->is_unmerged
) {
1584 /* "Unmerged" is 8 characters */
1585 bin_width
= bin_width
< 8 ? 8 : bin_width
;
1588 if (file
->is_binary
) {
1589 /* "Bin XXX -> YYY bytes" */
1590 int w
= 14 + decimal_width(file
->added
)
1591 + decimal_width(file
->deleted
);
1592 bin_width
= bin_width
< w
? w
: bin_width
;
1593 /* Display change counts aligned with "Bin" */
1598 if (max_change
< change
)
1599 max_change
= change
;
1601 count
= i
; /* where we can stop scanning in data->files[] */
1604 * We have width = stat_width or term_columns() columns total.
1605 * We want a maximum of min(max_len, stat_name_width) for the name part.
1606 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1607 * We also need 1 for " " and 4 + decimal_width(max_change)
1608 * for " | NNNN " and one the empty column at the end, altogether
1609 * 6 + decimal_width(max_change).
1611 * If there's not enough space, we will use the smaller of
1612 * stat_name_width (if set) and 5/8*width for the filename,
1613 * and the rest for constant elements + graph part, but no more
1614 * than stat_graph_width for the graph part.
1615 * (5/8 gives 50 for filename and 30 for the constant parts + graph
1616 * for the standard terminal size).
1618 * In other words: stat_width limits the maximum width, and
1619 * stat_name_width fixes the maximum width of the filename,
1620 * and is also used to divide available columns if there
1623 * Binary files are displayed with "Bin XXX -> YYY bytes"
1624 * instead of the change count and graph. This part is treated
1625 * similarly to the graph part, except that it is not
1626 * "scaled". If total width is too small to accommodate the
1627 * guaranteed minimum width of the filename part and the
1628 * separators and this message, this message will "overflow"
1629 * making the line longer than the maximum width.
1632 if (options
->stat_width
== -1)
1633 width
= term_columns() - options
->output_prefix_length
;
1635 width
= options
->stat_width
? options
->stat_width
: 80;
1636 number_width
= decimal_width(max_change
) > number_width
?
1637 decimal_width(max_change
) : number_width
;
1639 if (options
->stat_graph_width
== -1)
1640 options
->stat_graph_width
= diff_stat_graph_width
;
1643 * Guarantee 3/8*16==6 for the graph part
1644 * and 5/8*16==10 for the filename part
1646 if (width
< 16 + 6 + number_width
)
1647 width
= 16 + 6 + number_width
;
1650 * First assign sizes that are wanted, ignoring available width.
1651 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1652 * starting from "XXX" should fit in graph_width.
1654 graph_width
= max_change
+ 4 > bin_width
? max_change
: bin_width
- 4;
1655 if (options
->stat_graph_width
&&
1656 options
->stat_graph_width
< graph_width
)
1657 graph_width
= options
->stat_graph_width
;
1659 name_width
= (options
->stat_name_width
> 0 &&
1660 options
->stat_name_width
< max_len
) ?
1661 options
->stat_name_width
: max_len
;
1664 * Adjust adjustable widths not to exceed maximum width
1666 if (name_width
+ number_width
+ 6 + graph_width
> width
) {
1667 if (graph_width
> width
* 3/8 - number_width
- 6) {
1668 graph_width
= width
* 3/8 - number_width
- 6;
1669 if (graph_width
< 6)
1673 if (options
->stat_graph_width
&&
1674 graph_width
> options
->stat_graph_width
)
1675 graph_width
= options
->stat_graph_width
;
1676 if (name_width
> width
- number_width
- 6 - graph_width
)
1677 name_width
= width
- number_width
- 6 - graph_width
;
1679 graph_width
= width
- number_width
- 6 - name_width
;
1683 * From here name_width is the width of the name area,
1684 * and graph_width is the width of the graph area.
1685 * max_change is used to scale graph properly.
1687 for (i
= 0; i
< count
; i
++) {
1688 const char *prefix
= "";
1689 struct diffstat_file
*file
= data
->files
[i
];
1690 char *name
= file
->print_name
;
1691 uintmax_t added
= file
->added
;
1692 uintmax_t deleted
= file
->deleted
;
1695 if (!file
->is_interesting
&& (added
+ deleted
== 0))
1699 * "scale" the filename
1702 name_len
= strlen(name
);
1703 if (name_width
< name_len
) {
1707 name
+= name_len
- len
;
1708 slash
= strchr(name
, '/');
1713 if (file
->is_binary
) {
1714 fprintf(options
->file
, "%s", line_prefix
);
1715 show_name(options
->file
, prefix
, name
, len
);
1716 fprintf(options
->file
, " %*s", number_width
, "Bin");
1717 if (!added
&& !deleted
) {
1718 putc('\n', options
->file
);
1721 fprintf(options
->file
, " %s%"PRIuMAX
"%s",
1722 del_c
, deleted
, reset
);
1723 fprintf(options
->file
, " -> ");
1724 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1725 add_c
, added
, reset
);
1726 fprintf(options
->file
, " bytes");
1727 fprintf(options
->file
, "\n");
1730 else if (file
->is_unmerged
) {
1731 fprintf(options
->file
, "%s", line_prefix
);
1732 show_name(options
->file
, prefix
, name
, len
);
1733 fprintf(options
->file
, " Unmerged\n");
1738 * scale the add/delete
1743 if (graph_width
<= max_change
) {
1744 int total
= scale_linear(add
+ del
, graph_width
, max_change
);
1745 if (total
< 2 && add
&& del
)
1746 /* width >= 2 due to the sanity check */
1749 add
= scale_linear(add
, graph_width
, max_change
);
1752 del
= scale_linear(del
, graph_width
, max_change
);
1756 fprintf(options
->file
, "%s", line_prefix
);
1757 show_name(options
->file
, prefix
, name
, len
);
1758 fprintf(options
->file
, " %*"PRIuMAX
"%s",
1759 number_width
, added
+ deleted
,
1760 added
+ deleted
? " " : "");
1761 show_graph(options
->file
, '+', add
, add_c
, reset
);
1762 show_graph(options
->file
, '-', del
, del_c
, reset
);
1763 fprintf(options
->file
, "\n");
1766 for (i
= 0; i
< data
->nr
; i
++) {
1767 struct diffstat_file
*file
= data
->files
[i
];
1768 uintmax_t added
= file
->added
;
1769 uintmax_t deleted
= file
->deleted
;
1771 if (file
->is_unmerged
||
1772 (!file
->is_interesting
&& (added
+ deleted
== 0))) {
1777 if (!file
->is_binary
) {
1784 fprintf(options
->file
, "%s ...\n", line_prefix
);
1787 fprintf(options
->file
, "%s", line_prefix
);
1788 print_stat_summary(options
->file
, total_files
, adds
, dels
);
1791 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
1793 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
1798 for (i
= 0; i
< data
->nr
; i
++) {
1799 int added
= data
->files
[i
]->added
;
1800 int deleted
= data
->files
[i
]->deleted
;
1802 if (data
->files
[i
]->is_unmerged
||
1803 (!data
->files
[i
]->is_interesting
&& (added
+ deleted
== 0))) {
1805 } else if (!data
->files
[i
]->is_binary
) { /* don't count bytes */
1810 fprintf(options
->file
, "%s", diff_line_prefix(options
));
1811 print_stat_summary(options
->file
, total_files
, adds
, dels
);
1814 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
1821 for (i
= 0; i
< data
->nr
; i
++) {
1822 struct diffstat_file
*file
= data
->files
[i
];
1824 fprintf(options
->file
, "%s", diff_line_prefix(options
));
1826 if (file
->is_binary
)
1827 fprintf(options
->file
, "-\t-\t");
1829 fprintf(options
->file
,
1830 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
1831 file
->added
, file
->deleted
);
1832 if (options
->line_termination
) {
1833 fill_print_name(file
);
1834 if (!file
->is_renamed
)
1835 write_name_quoted(file
->name
, options
->file
,
1836 options
->line_termination
);
1838 fputs(file
->print_name
, options
->file
);
1839 putc(options
->line_termination
, options
->file
);
1842 if (file
->is_renamed
) {
1843 putc('\0', options
->file
);
1844 write_name_quoted(file
->from_name
, options
->file
, '\0');
1846 write_name_quoted(file
->name
, options
->file
, '\0');
1851 struct dirstat_file
{
1853 unsigned long changed
;
1856 struct dirstat_dir
{
1857 struct dirstat_file
*files
;
1858 int alloc
, nr
, permille
, cumulative
;
1861 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
1862 unsigned long changed
, const char *base
, int baselen
)
1864 unsigned long this_dir
= 0;
1865 unsigned int sources
= 0;
1866 const char *line_prefix
= diff_line_prefix(opt
);
1869 struct dirstat_file
*f
= dir
->files
;
1870 int namelen
= strlen(f
->name
);
1874 if (namelen
< baselen
)
1876 if (memcmp(f
->name
, base
, baselen
))
1878 slash
= strchr(f
->name
+ baselen
, '/');
1880 int newbaselen
= slash
+ 1 - f
->name
;
1881 this = gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
1893 * We don't report dirstat's for
1895 * - or cases where everything came from a single directory
1896 * under this directory (sources == 1).
1898 if (baselen
&& sources
!= 1) {
1900 int permille
= this_dir
* 1000 / changed
;
1901 if (permille
>= dir
->permille
) {
1902 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
1903 permille
/ 10, permille
% 10, baselen
, base
);
1904 if (!dir
->cumulative
)
1912 static int dirstat_compare(const void *_a
, const void *_b
)
1914 const struct dirstat_file
*a
= _a
;
1915 const struct dirstat_file
*b
= _b
;
1916 return strcmp(a
->name
, b
->name
);
1919 static void show_dirstat(struct diff_options
*options
)
1922 unsigned long changed
;
1923 struct dirstat_dir dir
;
1924 struct diff_queue_struct
*q
= &diff_queued_diff
;
1929 dir
.permille
= options
->dirstat_permille
;
1930 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1933 for (i
= 0; i
< q
->nr
; i
++) {
1934 struct diff_filepair
*p
= q
->queue
[i
];
1936 unsigned long copied
, added
, damage
;
1937 int content_changed
;
1939 name
= p
->two
->path
? p
->two
->path
: p
->one
->path
;
1941 if (p
->one
->oid_valid
&& p
->two
->oid_valid
)
1942 content_changed
= oidcmp(&p
->one
->oid
, &p
->two
->oid
);
1944 content_changed
= 1;
1946 if (!content_changed
) {
1948 * The SHA1 has not changed, so pre-/post-content is
1949 * identical. We can therefore skip looking at the
1950 * file contents altogether.
1956 if (DIFF_OPT_TST(options
, DIRSTAT_BY_FILE
)) {
1958 * In --dirstat-by-file mode, we don't really need to
1959 * look at the actual file contents at all.
1960 * The fact that the SHA1 changed is enough for us to
1961 * add this file to the list of results
1962 * (with each file contributing equal damage).
1968 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1969 diff_populate_filespec(p
->one
, 0);
1970 diff_populate_filespec(p
->two
, 0);
1971 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1973 diff_free_filespec_data(p
->one
);
1974 diff_free_filespec_data(p
->two
);
1975 } else if (DIFF_FILE_VALID(p
->one
)) {
1976 diff_populate_filespec(p
->one
, CHECK_SIZE_ONLY
);
1978 diff_free_filespec_data(p
->one
);
1979 } else if (DIFF_FILE_VALID(p
->two
)) {
1980 diff_populate_filespec(p
->two
, CHECK_SIZE_ONLY
);
1982 added
= p
->two
->size
;
1983 diff_free_filespec_data(p
->two
);
1988 * Original minus copied is the removed material,
1989 * added is the new material. They are both damages
1990 * made to the preimage.
1991 * If the resulting damage is zero, we know that
1992 * diffcore_count_changes() considers the two entries to
1993 * be identical, but since content_changed is true, we
1994 * know that there must have been _some_ kind of change,
1995 * so we force all entries to have damage > 0.
1997 damage
= (p
->one
->size
- copied
) + added
;
2002 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
2003 dir
.files
[dir
.nr
].name
= name
;
2004 dir
.files
[dir
.nr
].changed
= damage
;
2009 /* This can happen even with many files, if everything was renames */
2013 /* Show all directories with more than x% of the changes */
2014 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
2015 gather_dirstat(options
, &dir
, changed
, "", 0);
2018 static void show_dirstat_by_line(struct diffstat_t
*data
, struct diff_options
*options
)
2021 unsigned long changed
;
2022 struct dirstat_dir dir
;
2030 dir
.permille
= options
->dirstat_permille
;
2031 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
2034 for (i
= 0; i
< data
->nr
; i
++) {
2035 struct diffstat_file
*file
= data
->files
[i
];
2036 unsigned long damage
= file
->added
+ file
->deleted
;
2037 if (file
->is_binary
)
2039 * binary files counts bytes, not lines. Must find some
2040 * way to normalize binary bytes vs. textual lines.
2041 * The following heuristic assumes that there are 64
2043 * This is stupid and ugly, but very cheap...
2045 damage
= (damage
+ 63) / 64;
2046 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
2047 dir
.files
[dir
.nr
].name
= file
->name
;
2048 dir
.files
[dir
.nr
].changed
= damage
;
2053 /* This can happen even with many files, if everything was renames */
2057 /* Show all directories with more than x% of the changes */
2058 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
2059 gather_dirstat(options
, &dir
, changed
, "", 0);
2062 static void free_diffstat_info(struct diffstat_t
*diffstat
)
2065 for (i
= 0; i
< diffstat
->nr
; i
++) {
2066 struct diffstat_file
*f
= diffstat
->files
[i
];
2067 if (f
->name
!= f
->print_name
)
2068 free(f
->print_name
);
2073 free(diffstat
->files
);
2076 struct checkdiff_t
{
2077 const char *filename
;
2079 int conflict_marker_size
;
2080 struct diff_options
*o
;
2085 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
2090 if (len
< marker_size
+ 1)
2092 firstchar
= line
[0];
2093 switch (firstchar
) {
2094 case '=': case '>': case '<': case '|':
2099 for (cnt
= 1; cnt
< marker_size
; cnt
++)
2100 if (line
[cnt
] != firstchar
)
2102 /* line[1] thru line[marker_size-1] are same as firstchar */
2103 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
2108 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
2110 struct checkdiff_t
*data
= priv
;
2111 int marker_size
= data
->conflict_marker_size
;
2112 const char *ws
= diff_get_color(data
->o
->use_color
, DIFF_WHITESPACE
);
2113 const char *reset
= diff_get_color(data
->o
->use_color
, DIFF_RESET
);
2114 const char *set
= diff_get_color(data
->o
->use_color
, DIFF_FILE_NEW
);
2116 const char *line_prefix
;
2119 line_prefix
= diff_line_prefix(data
->o
);
2121 if (line
[0] == '+') {
2124 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
2126 fprintf(data
->o
->file
,
2127 "%s%s:%d: leftover conflict marker\n",
2128 line_prefix
, data
->filename
, data
->lineno
);
2130 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
2133 data
->status
|= bad
;
2134 err
= whitespace_error_string(bad
);
2135 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
2136 line_prefix
, data
->filename
, data
->lineno
, err
);
2138 emit_line(data
->o
, set
, reset
, line
, 1);
2139 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
2140 data
->o
->file
, set
, reset
, ws
);
2141 } else if (line
[0] == ' ') {
2143 } else if (line
[0] == '@') {
2144 char *plus
= strchr(line
, '+');
2146 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
2148 die("invalid diff");
2152 static unsigned char *deflate_it(char *data
,
2154 unsigned long *result_size
)
2157 unsigned char *deflated
;
2160 git_deflate_init(&stream
, zlib_compression_level
);
2161 bound
= git_deflate_bound(&stream
, size
);
2162 deflated
= xmalloc(bound
);
2163 stream
.next_out
= deflated
;
2164 stream
.avail_out
= bound
;
2166 stream
.next_in
= (unsigned char *)data
;
2167 stream
.avail_in
= size
;
2168 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
2170 git_deflate_end(&stream
);
2171 *result_size
= stream
.total_out
;
2175 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
,
2182 unsigned long orig_size
;
2183 unsigned long delta_size
;
2184 unsigned long deflate_size
;
2185 unsigned long data_size
;
2187 /* We could do deflated delta, or we could do just deflated two,
2188 * whichever is smaller.
2191 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
2192 if (one
->size
&& two
->size
) {
2193 delta
= diff_delta(one
->ptr
, one
->size
,
2194 two
->ptr
, two
->size
,
2195 &delta_size
, deflate_size
);
2197 void *to_free
= delta
;
2198 orig_size
= delta_size
;
2199 delta
= deflate_it(delta
, delta_size
, &delta_size
);
2204 if (delta
&& delta_size
< deflate_size
) {
2205 fprintf(file
, "%sdelta %lu\n", prefix
, orig_size
);
2208 data_size
= delta_size
;
2211 fprintf(file
, "%sliteral %lu\n", prefix
, two
->size
);
2214 data_size
= deflate_size
;
2217 /* emit data encoded in base85 */
2220 int bytes
= (52 < data_size
) ? 52 : data_size
;
2224 line
[0] = bytes
+ 'A' - 1;
2226 line
[0] = bytes
- 26 + 'a' - 1;
2227 encode_85(line
+ 1, cp
, bytes
);
2228 cp
= (char *) cp
+ bytes
;
2229 fprintf(file
, "%s", prefix
);
2233 fprintf(file
, "%s\n", prefix
);
2237 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
,
2240 fprintf(file
, "%sGIT binary patch\n", prefix
);
2241 emit_binary_diff_body(file
, one
, two
, prefix
);
2242 emit_binary_diff_body(file
, two
, one
, prefix
);
2245 int diff_filespec_is_binary(struct diff_filespec
*one
)
2247 if (one
->is_binary
== -1) {
2248 diff_filespec_load_driver(one
);
2249 if (one
->driver
->binary
!= -1)
2250 one
->is_binary
= one
->driver
->binary
;
2252 if (!one
->data
&& DIFF_FILE_VALID(one
))
2253 diff_populate_filespec(one
, CHECK_BINARY
);
2254 if (one
->is_binary
== -1 && one
->data
)
2255 one
->is_binary
= buffer_is_binary(one
->data
,
2257 if (one
->is_binary
== -1)
2261 return one
->is_binary
;
2264 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
2266 diff_filespec_load_driver(one
);
2267 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
2270 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
2272 if (!options
->a_prefix
)
2273 options
->a_prefix
= a
;
2274 if (!options
->b_prefix
)
2275 options
->b_prefix
= b
;
2278 struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
2280 if (!DIFF_FILE_VALID(one
))
2283 diff_filespec_load_driver(one
);
2284 return userdiff_get_textconv(one
->driver
);
2287 static void builtin_diff(const char *name_a
,
2289 struct diff_filespec
*one
,
2290 struct diff_filespec
*two
,
2291 const char *xfrm_msg
,
2292 int must_show_header
,
2293 struct diff_options
*o
,
2294 int complete_rewrite
)
2298 char *a_one
, *b_two
;
2299 const char *meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
2300 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
2301 const char *a_prefix
, *b_prefix
;
2302 struct userdiff_driver
*textconv_one
= NULL
;
2303 struct userdiff_driver
*textconv_two
= NULL
;
2304 struct strbuf header
= STRBUF_INIT
;
2305 const char *line_prefix
= diff_line_prefix(o
);
2307 if (DIFF_OPT_TST(o
, SUBMODULE_LOG
) &&
2308 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
2309 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
2310 const char *del
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2311 const char *add
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2312 show_submodule_summary(o
->file
, one
->path
? one
->path
: two
->path
,
2314 one
->oid
.hash
, two
->oid
.hash
,
2315 two
->dirty_submodule
,
2316 meta
, del
, add
, reset
);
2320 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
2321 textconv_one
= get_textconv(one
);
2322 textconv_two
= get_textconv(two
);
2325 diff_set_mnemonic_prefix(o
, "a/", "b/");
2326 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
2327 a_prefix
= o
->b_prefix
;
2328 b_prefix
= o
->a_prefix
;
2330 a_prefix
= o
->a_prefix
;
2331 b_prefix
= o
->b_prefix
;
2334 /* Never use a non-valid filename anywhere if at all possible */
2335 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
2336 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
2338 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
2339 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
2340 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
2341 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
2342 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, meta
, a_one
, b_two
, reset
);
2343 if (lbl
[0][0] == '/') {
2345 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
2347 strbuf_addstr(&header
, xfrm_msg
);
2348 must_show_header
= 1;
2350 else if (lbl
[1][0] == '/') {
2351 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
2353 strbuf_addstr(&header
, xfrm_msg
);
2354 must_show_header
= 1;
2357 if (one
->mode
!= two
->mode
) {
2358 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
2359 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
2360 must_show_header
= 1;
2363 strbuf_addstr(&header
, xfrm_msg
);
2366 * we do not run diff between different kind
2369 if ((one
->mode
^ two
->mode
) & S_IFMT
)
2370 goto free_ab_and_return
;
2371 if (complete_rewrite
&&
2372 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
2373 (textconv_two
|| !diff_filespec_is_binary(two
))) {
2374 fprintf(o
->file
, "%s", header
.buf
);
2375 strbuf_reset(&header
);
2376 emit_rewrite_diff(name_a
, name_b
, one
, two
,
2377 textconv_one
, textconv_two
, o
);
2378 o
->found_changes
= 1;
2379 goto free_ab_and_return
;
2383 if (o
->irreversible_delete
&& lbl
[1][0] == '/') {
2384 fprintf(o
->file
, "%s", header
.buf
);
2385 strbuf_reset(&header
);
2386 goto free_ab_and_return
;
2387 } else if (!DIFF_OPT_TST(o
, TEXT
) &&
2388 ( (!textconv_one
&& diff_filespec_is_binary(one
)) ||
2389 (!textconv_two
&& diff_filespec_is_binary(two
)) )) {
2390 if (!one
->data
&& !two
->data
&&
2391 S_ISREG(one
->mode
) && S_ISREG(two
->mode
) &&
2392 !DIFF_OPT_TST(o
, BINARY
)) {
2393 if (!oidcmp(&one
->oid
, &two
->oid
)) {
2394 if (must_show_header
)
2395 fprintf(o
->file
, "%s", header
.buf
);
2396 goto free_ab_and_return
;
2398 fprintf(o
->file
, "%s", header
.buf
);
2399 fprintf(o
->file
, "%sBinary files %s and %s differ\n",
2400 line_prefix
, lbl
[0], lbl
[1]);
2401 goto free_ab_and_return
;
2403 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2404 die("unable to read files to diff");
2405 /* Quite common confusing case */
2406 if (mf1
.size
== mf2
.size
&&
2407 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
2408 if (must_show_header
)
2409 fprintf(o
->file
, "%s", header
.buf
);
2410 goto free_ab_and_return
;
2412 fprintf(o
->file
, "%s", header
.buf
);
2413 strbuf_reset(&header
);
2414 if (DIFF_OPT_TST(o
, BINARY
))
2415 emit_binary_diff(o
->file
, &mf1
, &mf2
, line_prefix
);
2417 fprintf(o
->file
, "%sBinary files %s and %s differ\n",
2418 line_prefix
, lbl
[0], lbl
[1]);
2419 o
->found_changes
= 1;
2421 /* Crazy xdl interfaces.. */
2422 const char *diffopts
= getenv("GIT_DIFF_OPTS");
2426 struct emit_callback ecbdata
;
2427 const struct userdiff_funcname
*pe
;
2429 if (must_show_header
) {
2430 fprintf(o
->file
, "%s", header
.buf
);
2431 strbuf_reset(&header
);
2434 mf1
.size
= fill_textconv(textconv_one
, one
, &mf1
.ptr
);
2435 mf2
.size
= fill_textconv(textconv_two
, two
, &mf2
.ptr
);
2437 pe
= diff_funcname_pattern(one
);
2439 pe
= diff_funcname_pattern(two
);
2441 memset(&xpp
, 0, sizeof(xpp
));
2442 memset(&xecfg
, 0, sizeof(xecfg
));
2443 memset(&ecbdata
, 0, sizeof(ecbdata
));
2444 ecbdata
.label_path
= lbl
;
2445 ecbdata
.color_diff
= want_color(o
->use_color
);
2446 ecbdata
.found_changesp
= &o
->found_changes
;
2447 ecbdata
.ws_rule
= whitespace_rule(name_b
);
2448 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
2449 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2451 ecbdata
.header
= header
.len
? &header
: NULL
;
2452 xpp
.flags
= o
->xdl_opts
;
2453 xecfg
.ctxlen
= o
->context
;
2454 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2455 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2456 if (DIFF_OPT_TST(o
, FUNCCONTEXT
))
2457 xecfg
.flags
|= XDL_EMIT_FUNCCONTEXT
;
2459 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
2462 else if (skip_prefix(diffopts
, "--unified=", &v
))
2463 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
2464 else if (skip_prefix(diffopts
, "-u", &v
))
2465 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
2467 init_diff_words_data(&ecbdata
, o
, one
, two
);
2468 if (xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
2470 die("unable to generate diff for %s", one
->path
);
2472 free_diff_words_data(&ecbdata
);
2477 xdiff_clear_find_func(&xecfg
);
2481 strbuf_release(&header
);
2482 diff_free_filespec_data(one
);
2483 diff_free_filespec_data(two
);
2489 static void builtin_diffstat(const char *name_a
, const char *name_b
,
2490 struct diff_filespec
*one
,
2491 struct diff_filespec
*two
,
2492 struct diffstat_t
*diffstat
,
2493 struct diff_options
*o
,
2494 struct diff_filepair
*p
)
2497 struct diffstat_file
*data
;
2499 int complete_rewrite
= 0;
2501 if (!DIFF_PAIR_UNMERGED(p
)) {
2502 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2503 complete_rewrite
= 1;
2506 data
= diffstat_add(diffstat
, name_a
, name_b
);
2507 data
->is_interesting
= p
->status
!= DIFF_STATUS_UNKNOWN
;
2510 data
->is_unmerged
= 1;
2514 same_contents
= !oidcmp(&one
->oid
, &two
->oid
);
2516 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
2517 data
->is_binary
= 1;
2518 if (same_contents
) {
2522 data
->added
= diff_filespec_size(two
);
2523 data
->deleted
= diff_filespec_size(one
);
2527 else if (complete_rewrite
) {
2528 diff_populate_filespec(one
, 0);
2529 diff_populate_filespec(two
, 0);
2530 data
->deleted
= count_lines(one
->data
, one
->size
);
2531 data
->added
= count_lines(two
->data
, two
->size
);
2534 else if (!same_contents
) {
2535 /* Crazy xdl interfaces.. */
2539 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2540 die("unable to read files to diff");
2542 memset(&xpp
, 0, sizeof(xpp
));
2543 memset(&xecfg
, 0, sizeof(xecfg
));
2544 xpp
.flags
= o
->xdl_opts
;
2545 xecfg
.ctxlen
= o
->context
;
2546 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2547 if (xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
2549 die("unable to generate diffstat for %s", one
->path
);
2552 diff_free_filespec_data(one
);
2553 diff_free_filespec_data(two
);
2556 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
2557 const char *attr_path
,
2558 struct diff_filespec
*one
,
2559 struct diff_filespec
*two
,
2560 struct diff_options
*o
)
2563 struct checkdiff_t data
;
2568 memset(&data
, 0, sizeof(data
));
2569 data
.filename
= name_b
? name_b
: name_a
;
2572 data
.ws_rule
= whitespace_rule(attr_path
);
2573 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
2575 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2576 die("unable to read files to diff");
2579 * All the other codepaths check both sides, but not checking
2580 * the "old" side here is deliberate. We are checking the newly
2581 * introduced changes, and as long as the "new" side is text, we
2582 * can and should check what it introduces.
2584 if (diff_filespec_is_binary(two
))
2585 goto free_and_return
;
2587 /* Crazy xdl interfaces.. */
2591 memset(&xpp
, 0, sizeof(xpp
));
2592 memset(&xecfg
, 0, sizeof(xecfg
));
2593 xecfg
.ctxlen
= 1; /* at least one context line */
2595 if (xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
2597 die("unable to generate checkdiff for %s", one
->path
);
2599 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
2600 struct emit_callback ecbdata
;
2603 ecbdata
.ws_rule
= data
.ws_rule
;
2604 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2605 blank_at_eof
= ecbdata
.blank_at_eof_in_postimage
;
2610 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
2611 fprintf(o
->file
, "%s:%d: %s.\n",
2612 data
.filename
, blank_at_eof
, err
);
2613 data
.status
= 1; /* report errors */
2618 diff_free_filespec_data(one
);
2619 diff_free_filespec_data(two
);
2621 DIFF_OPT_SET(o
, CHECK_FAILED
);
2624 struct diff_filespec
*alloc_filespec(const char *path
)
2626 struct diff_filespec
*spec
;
2628 FLEXPTR_ALLOC_STR(spec
, path
, path
);
2630 spec
->is_binary
= -1;
2634 void free_filespec(struct diff_filespec
*spec
)
2636 if (!--spec
->count
) {
2637 diff_free_filespec_data(spec
);
2642 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
2643 int sha1_valid
, unsigned short mode
)
2646 spec
->mode
= canon_mode(mode
);
2647 hashcpy(spec
->oid
.hash
, sha1
);
2648 spec
->oid_valid
= sha1_valid
;
2653 * Given a name and sha1 pair, if the index tells us the file in
2654 * the work tree has that object contents, return true, so that
2655 * prepare_temp_file() does not have to inflate and extract.
2657 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
2659 const struct cache_entry
*ce
;
2664 * We do not read the cache ourselves here, because the
2665 * benchmark with my previous version that always reads cache
2666 * shows that it makes things worse for diff-tree comparing
2667 * two linux-2.6 kernel trees in an already checked out work
2668 * tree. This is because most diff-tree comparisons deal with
2669 * only a small number of files, while reading the cache is
2670 * expensive for a large project, and its cost outweighs the
2671 * savings we get by not inflating the object to a temporary
2672 * file. Practically, this code only helps when we are used
2673 * by diff-cache --cached, which does read the cache before
2679 /* We want to avoid the working directory if our caller
2680 * doesn't need the data in a normal file, this system
2681 * is rather slow with its stat/open/mmap/close syscalls,
2682 * and the object is contained in a pack file. The pack
2683 * is probably already open and will be faster to obtain
2684 * the data through than the working directory. Loose
2685 * objects however would tend to be slower as they need
2686 * to be individually opened and inflated.
2688 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
))
2692 * Similarly, if we'd have to convert the file contents anyway, that
2693 * makes the optimization not worthwhile.
2695 if (!want_file
&& would_convert_to_git(name
))
2699 pos
= cache_name_pos(name
, len
);
2702 ce
= active_cache
[pos
];
2705 * This is not the sha1 we are looking for, or
2706 * unreusable because it is not a regular file.
2708 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
2712 * If ce is marked as "assume unchanged", there is no
2713 * guarantee that work tree matches what we are looking for.
2715 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
2719 * If ce matches the file in the work tree, we can reuse it.
2721 if (ce_uptodate(ce
) ||
2722 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
2728 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
2730 struct strbuf buf
= STRBUF_INIT
;
2733 /* Are we looking at the work tree? */
2734 if (s
->dirty_submodule
)
2737 strbuf_addf(&buf
, "Subproject commit %s%s\n",
2738 oid_to_hex(&s
->oid
), dirty
);
2742 strbuf_release(&buf
);
2744 s
->data
= strbuf_detach(&buf
, NULL
);
2751 * While doing rename detection and pickaxe operation, we may need to
2752 * grab the data for the blob (or file) for our own in-core comparison.
2753 * diff_filespec has data and size fields for this purpose.
2755 int diff_populate_filespec(struct diff_filespec
*s
, unsigned int flags
)
2757 int size_only
= flags
& CHECK_SIZE_ONLY
;
2760 * demote FAIL to WARN to allow inspecting the situation
2761 * instead of refusing.
2763 enum safe_crlf crlf_warn
= (safe_crlf
== SAFE_CRLF_FAIL
2767 if (!DIFF_FILE_VALID(s
))
2768 die("internal error: asking to populate invalid file.");
2769 if (S_ISDIR(s
->mode
))
2775 if (size_only
&& 0 < s
->size
)
2778 if (S_ISGITLINK(s
->mode
))
2779 return diff_populate_gitlink(s
, size_only
);
2781 if (!s
->oid_valid
||
2782 reuse_worktree_file(s
->path
, s
->oid
.hash
, 0)) {
2783 struct strbuf buf
= STRBUF_INIT
;
2787 if (lstat(s
->path
, &st
) < 0) {
2788 if (errno
== ENOENT
) {
2792 s
->data
= (char *)"";
2797 s
->size
= xsize_t(st
.st_size
);
2800 if (S_ISLNK(st
.st_mode
)) {
2801 struct strbuf sb
= STRBUF_INIT
;
2803 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
2806 s
->data
= strbuf_detach(&sb
, NULL
);
2812 if ((flags
& CHECK_BINARY
) &&
2813 s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
2817 fd
= open(s
->path
, O_RDONLY
);
2820 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2822 s
->should_munmap
= 1;
2825 * Convert from working tree format to canonical git format
2827 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, crlf_warn
)) {
2829 munmap(s
->data
, s
->size
);
2830 s
->should_munmap
= 0;
2831 s
->data
= strbuf_detach(&buf
, &size
);
2837 enum object_type type
;
2838 if (size_only
|| (flags
& CHECK_BINARY
)) {
2839 type
= sha1_object_info(s
->oid
.hash
, &s
->size
);
2841 die("unable to read %s",
2842 oid_to_hex(&s
->oid
));
2845 if (s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
2850 s
->data
= read_sha1_file(s
->oid
.hash
, &type
, &s
->size
);
2852 die("unable to read %s", oid_to_hex(&s
->oid
));
2858 void diff_free_filespec_blob(struct diff_filespec
*s
)
2862 else if (s
->should_munmap
)
2863 munmap(s
->data
, s
->size
);
2865 if (s
->should_free
|| s
->should_munmap
) {
2866 s
->should_free
= s
->should_munmap
= 0;
2871 void diff_free_filespec_data(struct diff_filespec
*s
)
2873 diff_free_filespec_blob(s
);
2878 static void prep_temp_blob(const char *path
, struct diff_tempfile
*temp
,
2881 const struct object_id
*oid
,
2885 struct strbuf buf
= STRBUF_INIT
;
2886 struct strbuf
template = STRBUF_INIT
;
2887 char *path_dup
= xstrdup(path
);
2888 const char *base
= basename(path_dup
);
2890 /* Generate "XXXXXX_basename.ext" */
2891 strbuf_addstr(&template, "XXXXXX_");
2892 strbuf_addstr(&template, base
);
2894 fd
= mks_tempfile_ts(&temp
->tempfile
, template.buf
, strlen(base
) + 1);
2896 die_errno("unable to create temp-file");
2897 if (convert_to_working_tree(path
,
2898 (const char *)blob
, (size_t)size
, &buf
)) {
2902 if (write_in_full(fd
, blob
, size
) != size
)
2903 die_errno("unable to write temp-file");
2904 close_tempfile(&temp
->tempfile
);
2905 temp
->name
= get_tempfile_path(&temp
->tempfile
);
2906 oid_to_hex_r(temp
->hex
, oid
);
2907 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", mode
);
2908 strbuf_release(&buf
);
2909 strbuf_release(&template);
2913 static struct diff_tempfile
*prepare_temp_file(const char *name
,
2914 struct diff_filespec
*one
)
2916 struct diff_tempfile
*temp
= claim_diff_tempfile();
2918 if (!DIFF_FILE_VALID(one
)) {
2920 /* A '-' entry produces this for file-2, and
2921 * a '+' entry produces this for file-1.
2923 temp
->name
= "/dev/null";
2924 xsnprintf(temp
->hex
, sizeof(temp
->hex
), ".");
2925 xsnprintf(temp
->mode
, sizeof(temp
->mode
), ".");
2929 if (!S_ISGITLINK(one
->mode
) &&
2931 reuse_worktree_file(name
, one
->oid
.hash
, 1))) {
2933 if (lstat(name
, &st
) < 0) {
2934 if (errno
== ENOENT
)
2935 goto not_a_valid_file
;
2936 die_errno("stat(%s)", name
);
2938 if (S_ISLNK(st
.st_mode
)) {
2939 struct strbuf sb
= STRBUF_INIT
;
2940 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
2941 die_errno("readlink(%s)", name
);
2942 prep_temp_blob(name
, temp
, sb
.buf
, sb
.len
,
2944 &one
->oid
: &null_oid
),
2946 one
->mode
: S_IFLNK
));
2947 strbuf_release(&sb
);
2950 /* we can borrow from the file in the work tree */
2952 if (!one
->oid_valid
)
2953 sha1_to_hex_r(temp
->hex
, null_sha1
);
2955 sha1_to_hex_r(temp
->hex
, one
->oid
.hash
);
2956 /* Even though we may sometimes borrow the
2957 * contents from the work tree, we always want
2958 * one->mode. mode is trustworthy even when
2959 * !(one->sha1_valid), as long as
2960 * DIFF_FILE_VALID(one).
2962 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", one
->mode
);
2967 if (diff_populate_filespec(one
, 0))
2968 die("cannot read data blob for %s", one
->path
);
2969 prep_temp_blob(name
, temp
, one
->data
, one
->size
,
2970 &one
->oid
, one
->mode
);
2975 static void add_external_diff_name(struct argv_array
*argv
,
2977 struct diff_filespec
*df
)
2979 struct diff_tempfile
*temp
= prepare_temp_file(name
, df
);
2980 argv_array_push(argv
, temp
->name
);
2981 argv_array_push(argv
, temp
->hex
);
2982 argv_array_push(argv
, temp
->mode
);
2985 /* An external diff command takes:
2987 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2988 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2991 static void run_external_diff(const char *pgm
,
2994 struct diff_filespec
*one
,
2995 struct diff_filespec
*two
,
2996 const char *xfrm_msg
,
2997 int complete_rewrite
,
2998 struct diff_options
*o
)
3000 struct argv_array argv
= ARGV_ARRAY_INIT
;
3001 struct argv_array env
= ARGV_ARRAY_INIT
;
3002 struct diff_queue_struct
*q
= &diff_queued_diff
;
3004 argv_array_push(&argv
, pgm
);
3005 argv_array_push(&argv
, name
);
3008 add_external_diff_name(&argv
, name
, one
);
3010 add_external_diff_name(&argv
, name
, two
);
3012 add_external_diff_name(&argv
, other
, two
);
3013 argv_array_push(&argv
, other
);
3014 argv_array_push(&argv
, xfrm_msg
);
3018 argv_array_pushf(&env
, "GIT_DIFF_PATH_COUNTER=%d", ++o
->diff_path_counter
);
3019 argv_array_pushf(&env
, "GIT_DIFF_PATH_TOTAL=%d", q
->nr
);
3021 if (run_command_v_opt_cd_env(argv
.argv
, RUN_USING_SHELL
, NULL
, env
.argv
))
3022 die(_("external diff died, stopping at %s"), name
);
3025 argv_array_clear(&argv
);
3026 argv_array_clear(&env
);
3029 static int similarity_index(struct diff_filepair
*p
)
3031 return p
->score
* 100 / MAX_SCORE
;
3034 static void fill_metainfo(struct strbuf
*msg
,
3037 struct diff_filespec
*one
,
3038 struct diff_filespec
*two
,
3039 struct diff_options
*o
,
3040 struct diff_filepair
*p
,
3041 int *must_show_header
,
3044 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
3045 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
3046 const char *line_prefix
= diff_line_prefix(o
);
3048 *must_show_header
= 1;
3049 strbuf_init(msg
, PATH_MAX
* 2 + 300);
3050 switch (p
->status
) {
3051 case DIFF_STATUS_COPIED
:
3052 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
3053 line_prefix
, set
, similarity_index(p
));
3054 strbuf_addf(msg
, "%s\n%s%scopy from ",
3055 reset
, line_prefix
, set
);
3056 quote_c_style(name
, msg
, NULL
, 0);
3057 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
3058 quote_c_style(other
, msg
, NULL
, 0);
3059 strbuf_addf(msg
, "%s\n", reset
);
3061 case DIFF_STATUS_RENAMED
:
3062 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
3063 line_prefix
, set
, similarity_index(p
));
3064 strbuf_addf(msg
, "%s\n%s%srename from ",
3065 reset
, line_prefix
, set
);
3066 quote_c_style(name
, msg
, NULL
, 0);
3067 strbuf_addf(msg
, "%s\n%s%srename to ",
3068 reset
, line_prefix
, set
);
3069 quote_c_style(other
, msg
, NULL
, 0);
3070 strbuf_addf(msg
, "%s\n", reset
);
3072 case DIFF_STATUS_MODIFIED
:
3074 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
3076 set
, similarity_index(p
), reset
);
3081 *must_show_header
= 0;
3083 if (one
&& two
&& oidcmp(&one
->oid
, &two
->oid
)) {
3084 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
3086 if (DIFF_OPT_TST(o
, BINARY
)) {
3088 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
3089 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
3092 strbuf_addf(msg
, "%s%sindex %s..", line_prefix
, set
,
3093 find_unique_abbrev(one
->oid
.hash
, abbrev
));
3094 strbuf_addstr(msg
, find_unique_abbrev(two
->oid
.hash
, abbrev
));
3095 if (one
->mode
== two
->mode
)
3096 strbuf_addf(msg
, " %06o", one
->mode
);
3097 strbuf_addf(msg
, "%s\n", reset
);
3101 static void run_diff_cmd(const char *pgm
,
3104 const char *attr_path
,
3105 struct diff_filespec
*one
,
3106 struct diff_filespec
*two
,
3108 struct diff_options
*o
,
3109 struct diff_filepair
*p
)
3111 const char *xfrm_msg
= NULL
;
3112 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
3113 int must_show_header
= 0;
3116 if (DIFF_OPT_TST(o
, ALLOW_EXTERNAL
)) {
3117 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
3118 if (drv
&& drv
->external
)
3119 pgm
= drv
->external
;
3124 * don't use colors when the header is intended for an
3125 * external diff driver
3127 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
3129 want_color(o
->use_color
) && !pgm
);
3130 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
3134 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
3135 complete_rewrite
, o
);
3139 builtin_diff(name
, other
? other
: name
,
3140 one
, two
, xfrm_msg
, must_show_header
,
3141 o
, complete_rewrite
);
3143 fprintf(o
->file
, "* Unmerged path %s\n", name
);
3146 static void diff_fill_sha1_info(struct diff_filespec
*one
)
3148 if (DIFF_FILE_VALID(one
)) {
3149 if (!one
->oid_valid
) {
3151 if (one
->is_stdin
) {
3155 if (lstat(one
->path
, &st
) < 0)
3156 die_errno("stat '%s'", one
->path
);
3157 if (index_path(one
->oid
.hash
, one
->path
, &st
, 0))
3158 die("cannot hash %s", one
->path
);
3165 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
3167 /* Strip the prefix but do not molest /dev/null and absolute paths */
3168 if (*namep
&& **namep
!= '/') {
3169 *namep
+= prefix_length
;
3173 if (*otherp
&& **otherp
!= '/') {
3174 *otherp
+= prefix_length
;
3175 if (**otherp
== '/')
3180 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
3182 const char *pgm
= external_diff();
3184 struct diff_filespec
*one
= p
->one
;
3185 struct diff_filespec
*two
= p
->two
;
3188 const char *attr_path
;
3190 name
= p
->one
->path
;
3191 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3193 if (o
->prefix_length
)
3194 strip_prefix(o
->prefix_length
, &name
, &other
);
3196 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
3199 if (DIFF_PAIR_UNMERGED(p
)) {
3200 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
3201 NULL
, NULL
, NULL
, o
, p
);
3205 diff_fill_sha1_info(one
);
3206 diff_fill_sha1_info(two
);
3209 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
3210 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
3212 * a filepair that changes between file and symlink
3213 * needs to be split into deletion and creation.
3215 struct diff_filespec
*null
= alloc_filespec(two
->path
);
3216 run_diff_cmd(NULL
, name
, other
, attr_path
,
3217 one
, null
, &msg
, o
, p
);
3219 strbuf_release(&msg
);
3221 null
= alloc_filespec(one
->path
);
3222 run_diff_cmd(NULL
, name
, other
, attr_path
,
3223 null
, two
, &msg
, o
, p
);
3227 run_diff_cmd(pgm
, name
, other
, attr_path
,
3228 one
, two
, &msg
, o
, p
);
3230 strbuf_release(&msg
);
3233 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
3234 struct diffstat_t
*diffstat
)
3239 if (DIFF_PAIR_UNMERGED(p
)) {
3241 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, p
);
3245 name
= p
->one
->path
;
3246 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3248 if (o
->prefix_length
)
3249 strip_prefix(o
->prefix_length
, &name
, &other
);
3251 diff_fill_sha1_info(p
->one
);
3252 diff_fill_sha1_info(p
->two
);
3254 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, p
);
3257 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
3261 const char *attr_path
;
3263 if (DIFF_PAIR_UNMERGED(p
)) {
3268 name
= p
->one
->path
;
3269 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3270 attr_path
= other
? other
: name
;
3272 if (o
->prefix_length
)
3273 strip_prefix(o
->prefix_length
, &name
, &other
);
3275 diff_fill_sha1_info(p
->one
);
3276 diff_fill_sha1_info(p
->two
);
3278 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
3281 void diff_setup(struct diff_options
*options
)
3283 memcpy(options
, &default_diff_options
, sizeof(*options
));
3285 options
->file
= stdout
;
3287 options
->line_termination
= '\n';
3288 options
->break_opt
= -1;
3289 options
->rename_limit
= -1;
3290 options
->dirstat_permille
= diff_dirstat_permille_default
;
3291 options
->context
= diff_context_default
;
3292 options
->ws_error_highlight
= WSEH_NEW
;
3293 DIFF_OPT_SET(options
, RENAME_EMPTY
);
3295 /* pathchange left =NULL by default */
3296 options
->change
= diff_change
;
3297 options
->add_remove
= diff_addremove
;
3298 options
->use_color
= diff_use_color_default
;
3299 options
->detect_rename
= diff_detect_rename_default
;
3300 options
->xdl_opts
|= diff_algorithm
;
3301 if (diff_compaction_heuristic
)
3302 DIFF_XDL_SET(options
, COMPACTION_HEURISTIC
);
3304 options
->orderfile
= diff_order_file_cfg
;
3306 if (diff_no_prefix
) {
3307 options
->a_prefix
= options
->b_prefix
= "";
3308 } else if (!diff_mnemonic_prefix
) {
3309 options
->a_prefix
= "a/";
3310 options
->b_prefix
= "b/";
3314 void diff_setup_done(struct diff_options
*options
)
3318 if (options
->set_default
)
3319 options
->set_default(options
);
3321 if (options
->output_format
& DIFF_FORMAT_NAME
)
3323 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
3325 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
3327 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
3330 die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
3333 * Most of the time we can say "there are changes"
3334 * only by checking if there are changed paths, but
3335 * --ignore-whitespace* options force us to look
3339 if (DIFF_XDL_TST(options
, IGNORE_WHITESPACE
) ||
3340 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_CHANGE
) ||
3341 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_AT_EOL
))
3342 DIFF_OPT_SET(options
, DIFF_FROM_CONTENTS
);
3344 DIFF_OPT_CLR(options
, DIFF_FROM_CONTENTS
);
3346 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3347 options
->detect_rename
= DIFF_DETECT_COPY
;
3349 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
3350 options
->prefix
= NULL
;
3351 if (options
->prefix
)
3352 options
->prefix_length
= strlen(options
->prefix
);
3354 options
->prefix_length
= 0;
3356 if (options
->output_format
& (DIFF_FORMAT_NAME
|
3357 DIFF_FORMAT_NAME_STATUS
|
3358 DIFF_FORMAT_CHECKDIFF
|
3359 DIFF_FORMAT_NO_OUTPUT
))
3360 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
3361 DIFF_FORMAT_NUMSTAT
|
3362 DIFF_FORMAT_DIFFSTAT
|
3363 DIFF_FORMAT_SHORTSTAT
|
3364 DIFF_FORMAT_DIRSTAT
|
3365 DIFF_FORMAT_SUMMARY
|
3369 * These cases always need recursive; we do not drop caller-supplied
3370 * recursive bits for other formats here.
3372 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
3373 DIFF_FORMAT_NUMSTAT
|
3374 DIFF_FORMAT_DIFFSTAT
|
3375 DIFF_FORMAT_SHORTSTAT
|
3376 DIFF_FORMAT_DIRSTAT
|
3377 DIFF_FORMAT_SUMMARY
|
3378 DIFF_FORMAT_CHECKDIFF
))
3379 DIFF_OPT_SET(options
, RECURSIVE
);
3381 * Also pickaxe would not work very well if you do not say recursive
3383 if (options
->pickaxe
)
3384 DIFF_OPT_SET(options
, RECURSIVE
);
3386 * When patches are generated, submodules diffed against the work tree
3387 * must be checked for dirtiness too so it can be shown in the output
3389 if (options
->output_format
& DIFF_FORMAT_PATCH
)
3390 DIFF_OPT_SET(options
, DIRTY_SUBMODULES
);
3392 if (options
->detect_rename
&& options
->rename_limit
< 0)
3393 options
->rename_limit
= diff_rename_limit_default
;
3394 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
3396 /* read-cache does not die even when it fails
3397 * so it is safe for us to do this here. Also
3398 * it does not smudge active_cache or active_nr
3399 * when it fails, so we do not have to worry about
3400 * cleaning it up ourselves either.
3404 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
3405 options
->abbrev
= 40; /* full */
3408 * It does not make sense to show the first hit we happened
3409 * to have found. It does not make sense not to return with
3410 * exit code in such a case either.
3412 if (DIFF_OPT_TST(options
, QUICK
)) {
3413 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
3414 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3417 options
->diff_path_counter
= 0;
3419 if (DIFF_OPT_TST(options
, FOLLOW_RENAMES
) && options
->pathspec
.nr
!= 1)
3420 die(_("--follow requires exactly one pathspec"));
3423 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
3433 if (c
== arg_short
) {
3437 if (val
&& isdigit(c
)) {
3439 int n
= strtoul(arg
, &end
, 10);
3450 eq
= strchrnul(arg
, '=');
3452 if (!len
|| strncmp(arg
, arg_long
, len
))
3457 if (!isdigit(*++eq
))
3459 n
= strtoul(eq
, &end
, 10);
3467 static int diff_scoreopt_parse(const char *opt
);
3469 static inline int short_opt(char opt
, const char **argv
,
3470 const char **optarg
)
3472 const char *arg
= argv
[0];
3473 if (arg
[0] != '-' || arg
[1] != opt
)
3475 if (arg
[2] != '\0') {
3480 die("Option '%c' requires a value", opt
);
3485 int parse_long_opt(const char *opt
, const char **argv
,
3486 const char **optarg
)
3488 const char *arg
= argv
[0];
3489 if (!skip_prefix(arg
, "--", &arg
))
3491 if (!skip_prefix(arg
, opt
, &arg
))
3493 if (*arg
== '=') { /* stuck form: --option=value */
3499 /* separate form: --option value */
3501 die("Option '--%s' requires a value", opt
);
3506 static int stat_opt(struct diff_options
*options
, const char **av
)
3508 const char *arg
= av
[0];
3510 int width
= options
->stat_width
;
3511 int name_width
= options
->stat_name_width
;
3512 int graph_width
= options
->stat_graph_width
;
3513 int count
= options
->stat_count
;
3516 if (!skip_prefix(arg
, "--stat", &arg
))
3517 die("BUG: stat option does not begin with --stat: %s", arg
);
3522 if (skip_prefix(arg
, "-width", &arg
)) {
3524 width
= strtoul(arg
+ 1, &end
, 10);
3525 else if (!*arg
&& !av
[1])
3526 die_want_option("--stat-width");
3528 width
= strtoul(av
[1], &end
, 10);
3531 } else if (skip_prefix(arg
, "-name-width", &arg
)) {
3533 name_width
= strtoul(arg
+ 1, &end
, 10);
3534 else if (!*arg
&& !av
[1])
3535 die_want_option("--stat-name-width");
3537 name_width
= strtoul(av
[1], &end
, 10);
3540 } else if (skip_prefix(arg
, "-graph-width", &arg
)) {
3542 graph_width
= strtoul(arg
+ 1, &end
, 10);
3543 else if (!*arg
&& !av
[1])
3544 die_want_option("--stat-graph-width");
3546 graph_width
= strtoul(av
[1], &end
, 10);
3549 } else if (skip_prefix(arg
, "-count", &arg
)) {
3551 count
= strtoul(arg
+ 1, &end
, 10);
3552 else if (!*arg
&& !av
[1])
3553 die_want_option("--stat-count");
3555 count
= strtoul(av
[1], &end
, 10);
3561 width
= strtoul(arg
+1, &end
, 10);
3563 name_width
= strtoul(end
+1, &end
, 10);
3565 count
= strtoul(end
+1, &end
, 10);
3568 /* Important! This checks all the error cases! */
3571 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
3572 options
->stat_name_width
= name_width
;
3573 options
->stat_graph_width
= graph_width
;
3574 options
->stat_width
= width
;
3575 options
->stat_count
= count
;
3579 static int parse_dirstat_opt(struct diff_options
*options
, const char *params
)
3581 struct strbuf errmsg
= STRBUF_INIT
;
3582 if (parse_dirstat_params(options
, params
, &errmsg
))
3583 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3585 strbuf_release(&errmsg
);
3587 * The caller knows a dirstat-related option is given from the command
3588 * line; allow it to say "return this_function();"
3590 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
3594 static int parse_submodule_opt(struct diff_options
*options
, const char *value
)
3596 if (parse_submodule_params(options
, value
))
3597 die(_("Failed to parse --submodule option parameter: '%s'"),
3602 static const char diff_status_letters
[] = {
3605 DIFF_STATUS_DELETED
,
3606 DIFF_STATUS_MODIFIED
,
3607 DIFF_STATUS_RENAMED
,
3608 DIFF_STATUS_TYPE_CHANGED
,
3609 DIFF_STATUS_UNKNOWN
,
3610 DIFF_STATUS_UNMERGED
,
3611 DIFF_STATUS_FILTER_AON
,
3612 DIFF_STATUS_FILTER_BROKEN
,
3616 static unsigned int filter_bit
['Z' + 1];
3618 static void prepare_filter_bits(void)
3622 if (!filter_bit
[DIFF_STATUS_ADDED
]) {
3623 for (i
= 0; diff_status_letters
[i
]; i
++)
3624 filter_bit
[(int) diff_status_letters
[i
]] = (1 << i
);
3628 static unsigned filter_bit_tst(char status
, const struct diff_options
*opt
)
3630 return opt
->filter
& filter_bit
[(int) status
];
3633 static int parse_diff_filter_opt(const char *optarg
, struct diff_options
*opt
)
3637 prepare_filter_bits();
3640 * If there is a negation e.g. 'd' in the input, and we haven't
3641 * initialized the filter field with another --diff-filter, start
3642 * from full set of bits, except for AON.
3645 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
3646 if (optch
< 'a' || 'z' < optch
)
3648 opt
->filter
= (1 << (ARRAY_SIZE(diff_status_letters
) - 1)) - 1;
3649 opt
->filter
&= ~filter_bit
[DIFF_STATUS_FILTER_AON
];
3654 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
3658 if ('a' <= optch
&& optch
<= 'z') {
3660 optch
= toupper(optch
);
3665 bit
= (0 <= optch
&& optch
<= 'Z') ? filter_bit
[optch
] : 0;
3669 opt
->filter
&= ~bit
;
3676 static void enable_patch_output(int *fmt
) {
3677 *fmt
&= ~DIFF_FORMAT_NO_OUTPUT
;
3678 *fmt
|= DIFF_FORMAT_PATCH
;
3681 static int parse_one_token(const char **arg
, const char *token
)
3684 if (skip_prefix(*arg
, token
, &rest
) && (!*rest
|| *rest
== ',')) {
3691 static int parse_ws_error_highlight(struct diff_options
*opt
, const char *arg
)
3693 const char *orig_arg
= arg
;
3696 if (parse_one_token(&arg
, "none"))
3698 else if (parse_one_token(&arg
, "default"))
3700 else if (parse_one_token(&arg
, "all"))
3701 val
= WSEH_NEW
| WSEH_OLD
| WSEH_CONTEXT
;
3702 else if (parse_one_token(&arg
, "new"))
3704 else if (parse_one_token(&arg
, "old"))
3706 else if (parse_one_token(&arg
, "context"))
3707 val
|= WSEH_CONTEXT
;
3709 error("unknown value after ws-error-highlight=%.*s",
3710 (int)(arg
- orig_arg
), orig_arg
);
3716 opt
->ws_error_highlight
= val
;
3720 int diff_opt_parse(struct diff_options
*options
,
3721 const char **av
, int ac
, const char *prefix
)
3723 const char *arg
= av
[0];
3730 /* Output format options */
3731 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch")
3732 || opt_arg(arg
, 'U', "unified", &options
->context
))
3733 enable_patch_output(&options
->output_format
);
3734 else if (!strcmp(arg
, "--raw"))
3735 options
->output_format
|= DIFF_FORMAT_RAW
;
3736 else if (!strcmp(arg
, "--patch-with-raw")) {
3737 enable_patch_output(&options
->output_format
);
3738 options
->output_format
|= DIFF_FORMAT_RAW
;
3739 } else if (!strcmp(arg
, "--numstat"))
3740 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
3741 else if (!strcmp(arg
, "--shortstat"))
3742 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
3743 else if (!strcmp(arg
, "-X") || !strcmp(arg
, "--dirstat"))
3744 return parse_dirstat_opt(options
, "");
3745 else if (skip_prefix(arg
, "-X", &arg
))
3746 return parse_dirstat_opt(options
, arg
);
3747 else if (skip_prefix(arg
, "--dirstat=", &arg
))
3748 return parse_dirstat_opt(options
, arg
);
3749 else if (!strcmp(arg
, "--cumulative"))
3750 return parse_dirstat_opt(options
, "cumulative");
3751 else if (!strcmp(arg
, "--dirstat-by-file"))
3752 return parse_dirstat_opt(options
, "files");
3753 else if (skip_prefix(arg
, "--dirstat-by-file=", &arg
)) {
3754 parse_dirstat_opt(options
, "files");
3755 return parse_dirstat_opt(options
, arg
);
3757 else if (!strcmp(arg
, "--check"))
3758 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
3759 else if (!strcmp(arg
, "--summary"))
3760 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
3761 else if (!strcmp(arg
, "--patch-with-stat")) {
3762 enable_patch_output(&options
->output_format
);
3763 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
3764 } else if (!strcmp(arg
, "--name-only"))
3765 options
->output_format
|= DIFF_FORMAT_NAME
;
3766 else if (!strcmp(arg
, "--name-status"))
3767 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
3768 else if (!strcmp(arg
, "-s") || !strcmp(arg
, "--no-patch"))
3769 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
3770 else if (starts_with(arg
, "--stat"))
3771 /* --stat, --stat-width, --stat-name-width, or --stat-count */
3772 return stat_opt(options
, av
);
3774 /* renames options */
3775 else if (starts_with(arg
, "-B") || starts_with(arg
, "--break-rewrites=") ||
3776 !strcmp(arg
, "--break-rewrites")) {
3777 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
3778 return error("invalid argument to -B: %s", arg
+2);
3780 else if (starts_with(arg
, "-M") || starts_with(arg
, "--find-renames=") ||
3781 !strcmp(arg
, "--find-renames")) {
3782 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3783 return error("invalid argument to -M: %s", arg
+2);
3784 options
->detect_rename
= DIFF_DETECT_RENAME
;
3786 else if (!strcmp(arg
, "-D") || !strcmp(arg
, "--irreversible-delete")) {
3787 options
->irreversible_delete
= 1;
3789 else if (starts_with(arg
, "-C") || starts_with(arg
, "--find-copies=") ||
3790 !strcmp(arg
, "--find-copies")) {
3791 if (options
->detect_rename
== DIFF_DETECT_COPY
)
3792 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3793 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3794 return error("invalid argument to -C: %s", arg
+2);
3795 options
->detect_rename
= DIFF_DETECT_COPY
;
3797 else if (!strcmp(arg
, "--no-renames"))
3798 options
->detect_rename
= 0;
3799 else if (!strcmp(arg
, "--rename-empty"))
3800 DIFF_OPT_SET(options
, RENAME_EMPTY
);
3801 else if (!strcmp(arg
, "--no-rename-empty"))
3802 DIFF_OPT_CLR(options
, RENAME_EMPTY
);
3803 else if (!strcmp(arg
, "--relative"))
3804 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3805 else if (skip_prefix(arg
, "--relative=", &arg
)) {
3806 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3807 options
->prefix
= arg
;
3811 else if (!strcmp(arg
, "--minimal"))
3812 DIFF_XDL_SET(options
, NEED_MINIMAL
);
3813 else if (!strcmp(arg
, "--no-minimal"))
3814 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
3815 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
3816 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
3817 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
3818 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
3819 else if (!strcmp(arg
, "--ignore-space-at-eol"))
3820 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
3821 else if (!strcmp(arg
, "--ignore-blank-lines"))
3822 DIFF_XDL_SET(options
, IGNORE_BLANK_LINES
);
3823 else if (!strcmp(arg
, "--compaction-heuristic"))
3824 DIFF_XDL_SET(options
, COMPACTION_HEURISTIC
);
3825 else if (!strcmp(arg
, "--no-compaction-heuristic"))
3826 DIFF_XDL_CLR(options
, COMPACTION_HEURISTIC
);
3827 else if (!strcmp(arg
, "--patience"))
3828 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
3829 else if (!strcmp(arg
, "--histogram"))
3830 options
->xdl_opts
= DIFF_WITH_ALG(options
, HISTOGRAM_DIFF
);
3831 else if ((argcount
= parse_long_opt("diff-algorithm", av
, &optarg
))) {
3832 long value
= parse_algorithm_value(optarg
);
3834 return error("option diff-algorithm accepts \"myers\", "
3835 "\"minimal\", \"patience\" and \"histogram\"");
3836 /* clear out previous settings */
3837 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
3838 options
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
3839 options
->xdl_opts
|= value
;
3844 else if (!strcmp(arg
, "--binary")) {
3845 enable_patch_output(&options
->output_format
);
3846 DIFF_OPT_SET(options
, BINARY
);
3848 else if (!strcmp(arg
, "--full-index"))
3849 DIFF_OPT_SET(options
, FULL_INDEX
);
3850 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
3851 DIFF_OPT_SET(options
, TEXT
);
3852 else if (!strcmp(arg
, "-R"))
3853 DIFF_OPT_SET(options
, REVERSE_DIFF
);
3854 else if (!strcmp(arg
, "--find-copies-harder"))
3855 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3856 else if (!strcmp(arg
, "--follow"))
3857 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
3858 else if (!strcmp(arg
, "--no-follow")) {
3859 DIFF_OPT_CLR(options
, FOLLOW_RENAMES
);
3860 DIFF_OPT_CLR(options
, DEFAULT_FOLLOW_RENAMES
);
3861 } else if (!strcmp(arg
, "--color"))
3862 options
->use_color
= 1;
3863 else if (skip_prefix(arg
, "--color=", &arg
)) {
3864 int value
= git_config_colorbool(NULL
, arg
);
3866 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3867 options
->use_color
= value
;
3869 else if (!strcmp(arg
, "--no-color"))
3870 options
->use_color
= 0;
3871 else if (!strcmp(arg
, "--color-words")) {
3872 options
->use_color
= 1;
3873 options
->word_diff
= DIFF_WORDS_COLOR
;
3875 else if (skip_prefix(arg
, "--color-words=", &arg
)) {
3876 options
->use_color
= 1;
3877 options
->word_diff
= DIFF_WORDS_COLOR
;
3878 options
->word_regex
= arg
;
3880 else if (!strcmp(arg
, "--word-diff")) {
3881 if (options
->word_diff
== DIFF_WORDS_NONE
)
3882 options
->word_diff
= DIFF_WORDS_PLAIN
;
3884 else if (skip_prefix(arg
, "--word-diff=", &arg
)) {
3885 if (!strcmp(arg
, "plain"))
3886 options
->word_diff
= DIFF_WORDS_PLAIN
;
3887 else if (!strcmp(arg
, "color")) {
3888 options
->use_color
= 1;
3889 options
->word_diff
= DIFF_WORDS_COLOR
;
3891 else if (!strcmp(arg
, "porcelain"))
3892 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
3893 else if (!strcmp(arg
, "none"))
3894 options
->word_diff
= DIFF_WORDS_NONE
;
3896 die("bad --word-diff argument: %s", arg
);
3898 else if ((argcount
= parse_long_opt("word-diff-regex", av
, &optarg
))) {
3899 if (options
->word_diff
== DIFF_WORDS_NONE
)
3900 options
->word_diff
= DIFF_WORDS_PLAIN
;
3901 options
->word_regex
= optarg
;
3904 else if (!strcmp(arg
, "--exit-code"))
3905 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3906 else if (!strcmp(arg
, "--quiet"))
3907 DIFF_OPT_SET(options
, QUICK
);
3908 else if (!strcmp(arg
, "--ext-diff"))
3909 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
3910 else if (!strcmp(arg
, "--no-ext-diff"))
3911 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
3912 else if (!strcmp(arg
, "--textconv"))
3913 DIFF_OPT_SET(options
, ALLOW_TEXTCONV
);
3914 else if (!strcmp(arg
, "--no-textconv"))
3915 DIFF_OPT_CLR(options
, ALLOW_TEXTCONV
);
3916 else if (!strcmp(arg
, "--ignore-submodules")) {
3917 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3918 handle_ignore_submodules_arg(options
, "all");
3919 } else if (skip_prefix(arg
, "--ignore-submodules=", &arg
)) {
3920 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3921 handle_ignore_submodules_arg(options
, arg
);
3922 } else if (!strcmp(arg
, "--submodule"))
3923 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
3924 else if (skip_prefix(arg
, "--submodule=", &arg
))
3925 return parse_submodule_opt(options
, arg
);
3926 else if (skip_prefix(arg
, "--ws-error-highlight=", &arg
))
3927 return parse_ws_error_highlight(options
, arg
);
3930 else if (!strcmp(arg
, "-z"))
3931 options
->line_termination
= 0;
3932 else if ((argcount
= short_opt('l', av
, &optarg
))) {
3933 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
3936 else if ((argcount
= short_opt('S', av
, &optarg
))) {
3937 options
->pickaxe
= optarg
;
3938 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_S
;
3940 } else if ((argcount
= short_opt('G', av
, &optarg
))) {
3941 options
->pickaxe
= optarg
;
3942 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_G
;
3945 else if (!strcmp(arg
, "--pickaxe-all"))
3946 options
->pickaxe_opts
|= DIFF_PICKAXE_ALL
;
3947 else if (!strcmp(arg
, "--pickaxe-regex"))
3948 options
->pickaxe_opts
|= DIFF_PICKAXE_REGEX
;
3949 else if ((argcount
= short_opt('O', av
, &optarg
))) {
3950 const char *path
= prefix_filename(prefix
, strlen(prefix
), optarg
);
3951 options
->orderfile
= xstrdup(path
);
3954 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
3955 int offending
= parse_diff_filter_opt(optarg
, options
);
3957 die("unknown change class '%c' in --diff-filter=%s",
3961 else if (!strcmp(arg
, "--abbrev"))
3962 options
->abbrev
= DEFAULT_ABBREV
;
3963 else if (skip_prefix(arg
, "--abbrev=", &arg
)) {
3964 options
->abbrev
= strtoul(arg
, NULL
, 10);
3965 if (options
->abbrev
< MINIMUM_ABBREV
)
3966 options
->abbrev
= MINIMUM_ABBREV
;
3967 else if (40 < options
->abbrev
)
3968 options
->abbrev
= 40;
3970 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
3971 options
->a_prefix
= optarg
;
3974 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
3975 options
->b_prefix
= optarg
;
3978 else if (!strcmp(arg
, "--no-prefix"))
3979 options
->a_prefix
= options
->b_prefix
= "";
3980 else if (opt_arg(arg
, '\0', "inter-hunk-context",
3981 &options
->interhunkcontext
))
3983 else if (!strcmp(arg
, "-W"))
3984 DIFF_OPT_SET(options
, FUNCCONTEXT
);
3985 else if (!strcmp(arg
, "--function-context"))
3986 DIFF_OPT_SET(options
, FUNCCONTEXT
);
3987 else if (!strcmp(arg
, "--no-function-context"))
3988 DIFF_OPT_CLR(options
, FUNCCONTEXT
);
3989 else if ((argcount
= parse_long_opt("output", av
, &optarg
))) {
3990 const char *path
= prefix_filename(prefix
, strlen(prefix
), optarg
);
3991 options
->file
= fopen(path
, "w");
3993 die_errno("Could not open '%s'", path
);
3994 options
->close_file
= 1;
3995 if (options
->use_color
!= GIT_COLOR_ALWAYS
)
3996 options
->use_color
= GIT_COLOR_NEVER
;
4003 int parse_rename_score(const char **cp_p
)
4005 unsigned long num
, scale
;
4007 const char *cp
= *cp_p
;
4014 if ( !dot
&& ch
== '.' ) {
4017 } else if ( ch
== '%' ) {
4018 scale
= dot
? scale
*100 : 100;
4019 cp
++; /* % is always at the end */
4021 } else if ( ch
>= '0' && ch
<= '9' ) {
4022 if ( scale
< 100000 ) {
4024 num
= (num
*10) + (ch
-'0');
4033 /* user says num divided by scale and we say internally that
4034 * is MAX_SCORE * num / scale.
4036 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
4039 static int diff_scoreopt_parse(const char *opt
)
4041 int opt1
, opt2
, cmd
;
4047 /* convert the long-form arguments into short-form versions */
4048 if (skip_prefix(opt
, "break-rewrites", &opt
)) {
4049 if (*opt
== 0 || *opt
++ == '=')
4051 } else if (skip_prefix(opt
, "find-copies", &opt
)) {
4052 if (*opt
== 0 || *opt
++ == '=')
4054 } else if (skip_prefix(opt
, "find-renames", &opt
)) {
4055 if (*opt
== 0 || *opt
++ == '=')
4059 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
4060 return -1; /* that is not a -M, -C, or -B option */
4062 opt1
= parse_rename_score(&opt
);
4068 else if (*opt
!= '/')
4069 return -1; /* we expect -B80/99 or -B80 */
4072 opt2
= parse_rename_score(&opt
);
4077 return opt1
| (opt2
<< 16);
4080 struct diff_queue_struct diff_queued_diff
;
4082 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
4084 ALLOC_GROW(queue
->queue
, queue
->nr
+ 1, queue
->alloc
);
4085 queue
->queue
[queue
->nr
++] = dp
;
4088 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
4089 struct diff_filespec
*one
,
4090 struct diff_filespec
*two
)
4092 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
4100 void diff_free_filepair(struct diff_filepair
*p
)
4102 free_filespec(p
->one
);
4103 free_filespec(p
->two
);
4107 /* This is different from find_unique_abbrev() in that
4108 * it stuffs the result with dots for alignment.
4110 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
4115 return sha1_to_hex(sha1
);
4117 abbrev
= find_unique_abbrev(sha1
, len
);
4118 abblen
= strlen(abbrev
);
4120 static char hex
[41];
4121 if (len
< abblen
&& abblen
<= len
+ 2)
4122 xsnprintf(hex
, sizeof(hex
), "%s%.*s", abbrev
, len
+3-abblen
, "..");
4124 xsnprintf(hex
, sizeof(hex
), "%s...", abbrev
);
4127 return sha1_to_hex(sha1
);
4130 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
4132 int line_termination
= opt
->line_termination
;
4133 int inter_name_termination
= line_termination
? '\t' : '\0';
4135 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
4136 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
4137 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
4138 diff_unique_abbrev(p
->one
->oid
.hash
, opt
->abbrev
));
4139 fprintf(opt
->file
, "%s ",
4140 diff_unique_abbrev(p
->two
->oid
.hash
, opt
->abbrev
));
4143 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
4144 inter_name_termination
);
4146 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
4149 if (p
->status
== DIFF_STATUS_COPIED
||
4150 p
->status
== DIFF_STATUS_RENAMED
) {
4151 const char *name_a
, *name_b
;
4152 name_a
= p
->one
->path
;
4153 name_b
= p
->two
->path
;
4154 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4155 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
4156 write_name_quoted(name_b
, opt
->file
, line_termination
);
4158 const char *name_a
, *name_b
;
4159 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
4161 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4162 write_name_quoted(name_a
, opt
->file
, line_termination
);
4166 int diff_unmodified_pair(struct diff_filepair
*p
)
4168 /* This function is written stricter than necessary to support
4169 * the currently implemented transformers, but the idea is to
4170 * let transformers to produce diff_filepairs any way they want,
4171 * and filter and clean them up here before producing the output.
4173 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
4175 if (DIFF_PAIR_UNMERGED(p
))
4176 return 0; /* unmerged is interesting */
4178 /* deletion, addition, mode or type change
4179 * and rename are all interesting.
4181 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
4182 DIFF_PAIR_MODE_CHANGED(p
) ||
4183 strcmp(one
->path
, two
->path
))
4186 /* both are valid and point at the same path. that is, we are
4187 * dealing with a change.
4189 if (one
->oid_valid
&& two
->oid_valid
&&
4190 !oidcmp(&one
->oid
, &two
->oid
) &&
4191 !one
->dirty_submodule
&& !two
->dirty_submodule
)
4192 return 1; /* no change */
4193 if (!one
->oid_valid
&& !two
->oid_valid
)
4194 return 1; /* both look at the same file on the filesystem. */
4198 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
4200 if (diff_unmodified_pair(p
))
4203 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4204 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4205 return; /* no tree diffs in patch format */
4210 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
4211 struct diffstat_t
*diffstat
)
4213 if (diff_unmodified_pair(p
))
4216 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4217 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4218 return; /* no useful stat for tree diffs */
4220 run_diffstat(p
, o
, diffstat
);
4223 static void diff_flush_checkdiff(struct diff_filepair
*p
,
4224 struct diff_options
*o
)
4226 if (diff_unmodified_pair(p
))
4229 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4230 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4231 return; /* nothing to check in tree diffs */
4233 run_checkdiff(p
, o
);
4236 int diff_queue_is_empty(void)
4238 struct diff_queue_struct
*q
= &diff_queued_diff
;
4240 for (i
= 0; i
< q
->nr
; i
++)
4241 if (!diff_unmodified_pair(q
->queue
[i
]))
4247 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
4249 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
4252 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
4254 s
->oid_valid
? oid_to_hex(&s
->oid
) : "");
4255 fprintf(stderr
, "queue[%d] %s size %lu\n",
4260 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
4262 diff_debug_filespec(p
->one
, i
, "one");
4263 diff_debug_filespec(p
->two
, i
, "two");
4264 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
4265 p
->score
, p
->status
? p
->status
: '?',
4266 p
->one
->rename_used
, p
->broken_pair
);
4269 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
4273 fprintf(stderr
, "%s\n", msg
);
4274 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
4275 for (i
= 0; i
< q
->nr
; i
++) {
4276 struct diff_filepair
*p
= q
->queue
[i
];
4277 diff_debug_filepair(p
, i
);
4282 static void diff_resolve_rename_copy(void)
4285 struct diff_filepair
*p
;
4286 struct diff_queue_struct
*q
= &diff_queued_diff
;
4288 diff_debug_queue("resolve-rename-copy", q
);
4290 for (i
= 0; i
< q
->nr
; i
++) {
4292 p
->status
= 0; /* undecided */
4293 if (DIFF_PAIR_UNMERGED(p
))
4294 p
->status
= DIFF_STATUS_UNMERGED
;
4295 else if (!DIFF_FILE_VALID(p
->one
))
4296 p
->status
= DIFF_STATUS_ADDED
;
4297 else if (!DIFF_FILE_VALID(p
->two
))
4298 p
->status
= DIFF_STATUS_DELETED
;
4299 else if (DIFF_PAIR_TYPE_CHANGED(p
))
4300 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
4302 /* from this point on, we are dealing with a pair
4303 * whose both sides are valid and of the same type, i.e.
4304 * either in-place edit or rename/copy edit.
4306 else if (DIFF_PAIR_RENAME(p
)) {
4308 * A rename might have re-connected a broken
4309 * pair up, causing the pathnames to be the
4310 * same again. If so, that's not a rename at
4311 * all, just a modification..
4313 * Otherwise, see if this source was used for
4314 * multiple renames, in which case we decrement
4315 * the count, and call it a copy.
4317 if (!strcmp(p
->one
->path
, p
->two
->path
))
4318 p
->status
= DIFF_STATUS_MODIFIED
;
4319 else if (--p
->one
->rename_used
> 0)
4320 p
->status
= DIFF_STATUS_COPIED
;
4322 p
->status
= DIFF_STATUS_RENAMED
;
4324 else if (oidcmp(&p
->one
->oid
, &p
->two
->oid
) ||
4325 p
->one
->mode
!= p
->two
->mode
||
4326 p
->one
->dirty_submodule
||
4327 p
->two
->dirty_submodule
||
4328 is_null_oid(&p
->one
->oid
))
4329 p
->status
= DIFF_STATUS_MODIFIED
;
4331 /* This is a "no-change" entry and should not
4332 * happen anymore, but prepare for broken callers.
4334 error("feeding unmodified %s to diffcore",
4336 p
->status
= DIFF_STATUS_UNKNOWN
;
4339 diff_debug_queue("resolve-rename-copy done", q
);
4342 static int check_pair_status(struct diff_filepair
*p
)
4344 switch (p
->status
) {
4345 case DIFF_STATUS_UNKNOWN
:
4348 die("internal error in diff-resolve-rename-copy");
4354 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
4356 int fmt
= opt
->output_format
;
4358 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
4359 diff_flush_checkdiff(p
, opt
);
4360 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
4361 diff_flush_raw(p
, opt
);
4362 else if (fmt
& DIFF_FORMAT_NAME
) {
4363 const char *name_a
, *name_b
;
4364 name_a
= p
->two
->path
;
4366 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4367 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
4371 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
4374 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
4376 fprintf(file
, " %s ", newdelete
);
4377 write_name_quoted(fs
->path
, file
, '\n');
4381 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
,
4382 const char *line_prefix
)
4384 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
4385 fprintf(file
, "%s mode change %06o => %06o%c", line_prefix
, p
->one
->mode
,
4386 p
->two
->mode
, show_name
? ' ' : '\n');
4388 write_name_quoted(p
->two
->path
, file
, '\n');
4393 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
,
4394 const char *line_prefix
)
4396 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
4398 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
4400 show_mode_change(file
, p
, 0, line_prefix
);
4403 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
4405 FILE *file
= opt
->file
;
4406 const char *line_prefix
= diff_line_prefix(opt
);
4409 case DIFF_STATUS_DELETED
:
4410 fputs(line_prefix
, file
);
4411 show_file_mode_name(file
, "delete", p
->one
);
4413 case DIFF_STATUS_ADDED
:
4414 fputs(line_prefix
, file
);
4415 show_file_mode_name(file
, "create", p
->two
);
4417 case DIFF_STATUS_COPIED
:
4418 fputs(line_prefix
, file
);
4419 show_rename_copy(file
, "copy", p
, line_prefix
);
4421 case DIFF_STATUS_RENAMED
:
4422 fputs(line_prefix
, file
);
4423 show_rename_copy(file
, "rename", p
, line_prefix
);
4427 fprintf(file
, "%s rewrite ", line_prefix
);
4428 write_name_quoted(p
->two
->path
, file
, ' ');
4429 fprintf(file
, "(%d%%)\n", similarity_index(p
));
4431 show_mode_change(file
, p
, !p
->score
, line_prefix
);
4441 static int remove_space(char *line
, int len
)
4447 for (i
= 0; i
< len
; i
++)
4448 if (!isspace((c
= line
[i
])))
4454 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
4456 struct patch_id_t
*data
= priv
;
4459 /* Ignore line numbers when computing the SHA1 of the patch */
4460 if (starts_with(line
, "@@ -"))
4463 new_len
= remove_space(line
, len
);
4465 git_SHA1_Update(data
->ctx
, line
, new_len
);
4466 data
->patchlen
+= new_len
;
4469 /* returns 0 upon success, and writes result into sha1 */
4470 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
, int diff_header_only
)
4472 struct diff_queue_struct
*q
= &diff_queued_diff
;
4475 struct patch_id_t data
;
4476 char buffer
[PATH_MAX
* 4 + 20];
4478 git_SHA1_Init(&ctx
);
4479 memset(&data
, 0, sizeof(struct patch_id_t
));
4482 for (i
= 0; i
< q
->nr
; i
++) {
4486 struct diff_filepair
*p
= q
->queue
[i
];
4489 memset(&xpp
, 0, sizeof(xpp
));
4490 memset(&xecfg
, 0, sizeof(xecfg
));
4492 return error("internal diff status error");
4493 if (p
->status
== DIFF_STATUS_UNKNOWN
)
4495 if (diff_unmodified_pair(p
))
4497 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4498 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4500 if (DIFF_PAIR_UNMERGED(p
))
4503 diff_fill_sha1_info(p
->one
);
4504 diff_fill_sha1_info(p
->two
);
4506 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
4507 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
4508 if (p
->one
->mode
== 0)
4509 len1
= snprintf(buffer
, sizeof(buffer
),
4510 "diff--gita/%.*sb/%.*s"
4517 len2
, p
->two
->path
);
4518 else if (p
->two
->mode
== 0)
4519 len1
= snprintf(buffer
, sizeof(buffer
),
4520 "diff--gita/%.*sb/%.*s"
4521 "deletedfilemode%06o"
4527 len1
, p
->one
->path
);
4529 len1
= snprintf(buffer
, sizeof(buffer
),
4530 "diff--gita/%.*sb/%.*s"
4536 len2
, p
->two
->path
);
4537 git_SHA1_Update(&ctx
, buffer
, len1
);
4539 if (diff_header_only
)
4542 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
4543 fill_mmfile(&mf2
, p
->two
) < 0)
4544 return error("unable to read files to diff");
4546 if (diff_filespec_is_binary(p
->one
) ||
4547 diff_filespec_is_binary(p
->two
)) {
4548 git_SHA1_Update(&ctx
, oid_to_hex(&p
->one
->oid
),
4550 git_SHA1_Update(&ctx
, oid_to_hex(&p
->two
->oid
),
4558 if (xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
4560 return error("unable to generate patch-id diff for %s",
4564 git_SHA1_Final(sha1
, &ctx
);
4568 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
, int diff_header_only
)
4570 struct diff_queue_struct
*q
= &diff_queued_diff
;
4572 int result
= diff_get_patch_id(options
, sha1
, diff_header_only
);
4574 for (i
= 0; i
< q
->nr
; i
++)
4575 diff_free_filepair(q
->queue
[i
]);
4578 DIFF_QUEUE_CLEAR(q
);
4583 static int is_summary_empty(const struct diff_queue_struct
*q
)
4587 for (i
= 0; i
< q
->nr
; i
++) {
4588 const struct diff_filepair
*p
= q
->queue
[i
];
4590 switch (p
->status
) {
4591 case DIFF_STATUS_DELETED
:
4592 case DIFF_STATUS_ADDED
:
4593 case DIFF_STATUS_COPIED
:
4594 case DIFF_STATUS_RENAMED
:
4599 if (p
->one
->mode
&& p
->two
->mode
&&
4600 p
->one
->mode
!= p
->two
->mode
)
4608 static const char rename_limit_warning
[] =
4609 "inexact rename detection was skipped due to too many files.";
4611 static const char degrade_cc_to_c_warning
[] =
4612 "only found copies from modified paths due to too many files.";
4614 static const char rename_limit_advice
[] =
4615 "you may want to set your %s variable to at least "
4616 "%d and retry the command.";
4618 void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
)
4621 warning(degrade_cc_to_c_warning
);
4623 warning(rename_limit_warning
);
4626 if (0 < needed
&& needed
< 32767)
4627 warning(rename_limit_advice
, varname
, needed
);
4630 void diff_flush(struct diff_options
*options
)
4632 struct diff_queue_struct
*q
= &diff_queued_diff
;
4633 int i
, output_format
= options
->output_format
;
4635 int dirstat_by_line
= 0;
4638 * Order: raw, stat, summary, patch
4639 * or: name/name-status/checkdiff (other bits clear)
4644 if (output_format
& (DIFF_FORMAT_RAW
|
4646 DIFF_FORMAT_NAME_STATUS
|
4647 DIFF_FORMAT_CHECKDIFF
)) {
4648 for (i
= 0; i
< q
->nr
; i
++) {
4649 struct diff_filepair
*p
= q
->queue
[i
];
4650 if (check_pair_status(p
))
4651 flush_one_pair(p
, options
);
4656 if (output_format
& DIFF_FORMAT_DIRSTAT
&& DIFF_OPT_TST(options
, DIRSTAT_BY_LINE
))
4657 dirstat_by_line
= 1;
4659 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
) ||
4661 struct diffstat_t diffstat
;
4663 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
4664 for (i
= 0; i
< q
->nr
; i
++) {
4665 struct diff_filepair
*p
= q
->queue
[i
];
4666 if (check_pair_status(p
))
4667 diff_flush_stat(p
, options
, &diffstat
);
4669 if (output_format
& DIFF_FORMAT_NUMSTAT
)
4670 show_numstat(&diffstat
, options
);
4671 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
4672 show_stats(&diffstat
, options
);
4673 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
4674 show_shortstats(&diffstat
, options
);
4675 if (output_format
& DIFF_FORMAT_DIRSTAT
&& dirstat_by_line
)
4676 show_dirstat_by_line(&diffstat
, options
);
4677 free_diffstat_info(&diffstat
);
4680 if ((output_format
& DIFF_FORMAT_DIRSTAT
) && !dirstat_by_line
)
4681 show_dirstat(options
);
4683 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
4684 for (i
= 0; i
< q
->nr
; i
++) {
4685 diff_summary(options
, q
->queue
[i
]);
4690 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
4691 DIFF_OPT_TST(options
, EXIT_WITH_STATUS
) &&
4692 DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4694 * run diff_flush_patch for the exit status. setting
4695 * options->file to /dev/null should be safe, because we
4696 * aren't supposed to produce any output anyway.
4698 if (options
->close_file
)
4699 fclose(options
->file
);
4700 options
->file
= fopen("/dev/null", "w");
4702 die_errno("Could not open /dev/null");
4703 options
->close_file
= 1;
4704 for (i
= 0; i
< q
->nr
; i
++) {
4705 struct diff_filepair
*p
= q
->queue
[i
];
4706 if (check_pair_status(p
))
4707 diff_flush_patch(p
, options
);
4708 if (options
->found_changes
)
4713 if (output_format
& DIFF_FORMAT_PATCH
) {
4715 fprintf(options
->file
, "%s%c",
4716 diff_line_prefix(options
),
4717 options
->line_termination
);
4718 if (options
->stat_sep
) {
4719 /* attach patch instead of inline */
4720 fputs(options
->stat_sep
, options
->file
);
4724 for (i
= 0; i
< q
->nr
; i
++) {
4725 struct diff_filepair
*p
= q
->queue
[i
];
4726 if (check_pair_status(p
))
4727 diff_flush_patch(p
, options
);
4731 if (output_format
& DIFF_FORMAT_CALLBACK
)
4732 options
->format_callback(q
, options
, options
->format_callback_data
);
4734 for (i
= 0; i
< q
->nr
; i
++)
4735 diff_free_filepair(q
->queue
[i
]);
4738 DIFF_QUEUE_CLEAR(q
);
4739 if (options
->close_file
)
4740 fclose(options
->file
);
4743 * Report the content-level differences with HAS_CHANGES;
4744 * diff_addremove/diff_change does not set the bit when
4745 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4747 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4748 if (options
->found_changes
)
4749 DIFF_OPT_SET(options
, HAS_CHANGES
);
4751 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4755 static int match_filter(const struct diff_options
*options
, const struct diff_filepair
*p
)
4757 return (((p
->status
== DIFF_STATUS_MODIFIED
) &&
4759 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN
, options
)) ||
4761 filter_bit_tst(DIFF_STATUS_MODIFIED
, options
)))) ||
4762 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
4763 filter_bit_tst(p
->status
, options
)));
4766 static void diffcore_apply_filter(struct diff_options
*options
)
4769 struct diff_queue_struct
*q
= &diff_queued_diff
;
4770 struct diff_queue_struct outq
;
4772 DIFF_QUEUE_CLEAR(&outq
);
4774 if (!options
->filter
)
4777 if (filter_bit_tst(DIFF_STATUS_FILTER_AON
, options
)) {
4779 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
4780 if (match_filter(options
, q
->queue
[i
]))
4786 /* otherwise we will clear the whole queue
4787 * by copying the empty outq at the end of this
4788 * function, but first clear the current entries
4791 for (i
= 0; i
< q
->nr
; i
++)
4792 diff_free_filepair(q
->queue
[i
]);
4795 /* Only the matching ones */
4796 for (i
= 0; i
< q
->nr
; i
++) {
4797 struct diff_filepair
*p
= q
->queue
[i
];
4798 if (match_filter(options
, p
))
4801 diff_free_filepair(p
);
4808 /* Check whether two filespecs with the same mode and size are identical */
4809 static int diff_filespec_is_identical(struct diff_filespec
*one
,
4810 struct diff_filespec
*two
)
4812 if (S_ISGITLINK(one
->mode
))
4814 if (diff_populate_filespec(one
, 0))
4816 if (diff_populate_filespec(two
, 0))
4818 return !memcmp(one
->data
, two
->data
, one
->size
);
4821 static int diff_filespec_check_stat_unmatch(struct diff_filepair
*p
)
4823 if (p
->done_skip_stat_unmatch
)
4824 return p
->skip_stat_unmatch_result
;
4826 p
->done_skip_stat_unmatch
= 1;
4827 p
->skip_stat_unmatch_result
= 0;
4829 * 1. Entries that come from stat info dirtiness
4830 * always have both sides (iow, not create/delete),
4831 * one side of the object name is unknown, with
4832 * the same mode and size. Keep the ones that
4833 * do not match these criteria. They have real
4836 * 2. At this point, the file is known to be modified,
4837 * with the same mode and size, and the object
4838 * name of one side is unknown. Need to inspect
4839 * the identical contents.
4841 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
4842 !DIFF_FILE_VALID(p
->two
) ||
4843 (p
->one
->oid_valid
&& p
->two
->oid_valid
) ||
4844 (p
->one
->mode
!= p
->two
->mode
) ||
4845 diff_populate_filespec(p
->one
, CHECK_SIZE_ONLY
) ||
4846 diff_populate_filespec(p
->two
, CHECK_SIZE_ONLY
) ||
4847 (p
->one
->size
!= p
->two
->size
) ||
4848 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
4849 p
->skip_stat_unmatch_result
= 1;
4850 return p
->skip_stat_unmatch_result
;
4853 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
4856 struct diff_queue_struct
*q
= &diff_queued_diff
;
4857 struct diff_queue_struct outq
;
4858 DIFF_QUEUE_CLEAR(&outq
);
4860 for (i
= 0; i
< q
->nr
; i
++) {
4861 struct diff_filepair
*p
= q
->queue
[i
];
4863 if (diff_filespec_check_stat_unmatch(p
))
4867 * The caller can subtract 1 from skip_stat_unmatch
4868 * to determine how many paths were dirty only
4869 * due to stat info mismatch.
4871 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
4872 diffopt
->skip_stat_unmatch
++;
4873 diff_free_filepair(p
);
4880 static int diffnamecmp(const void *a_
, const void *b_
)
4882 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
4883 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
4884 const char *name_a
, *name_b
;
4886 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
4887 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
4888 return strcmp(name_a
, name_b
);
4891 void diffcore_fix_diff_index(struct diff_options
*options
)
4893 struct diff_queue_struct
*q
= &diff_queued_diff
;
4894 qsort(q
->queue
, q
->nr
, sizeof(q
->queue
[0]), diffnamecmp
);
4897 void diffcore_std(struct diff_options
*options
)
4899 /* NOTE please keep the following in sync with diff_tree_combined() */
4900 if (options
->skip_stat_unmatch
)
4901 diffcore_skip_stat_unmatch(options
);
4902 if (!options
->found_follow
) {
4903 /* See try_to_follow_renames() in tree-diff.c */
4904 if (options
->break_opt
!= -1)
4905 diffcore_break(options
->break_opt
);
4906 if (options
->detect_rename
)
4907 diffcore_rename(options
);
4908 if (options
->break_opt
!= -1)
4909 diffcore_merge_broken();
4911 if (options
->pickaxe
)
4912 diffcore_pickaxe(options
);
4913 if (options
->orderfile
)
4914 diffcore_order(options
->orderfile
);
4915 if (!options
->found_follow
)
4916 /* See try_to_follow_renames() in tree-diff.c */
4917 diff_resolve_rename_copy();
4918 diffcore_apply_filter(options
);
4920 if (diff_queued_diff
.nr
&& !DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4921 DIFF_OPT_SET(options
, HAS_CHANGES
);
4923 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4925 options
->found_follow
= 0;
4928 int diff_result_code(struct diff_options
*opt
, int status
)
4932 diff_warn_rename_limit("diff.renameLimit",
4933 opt
->needed_rename_limit
,
4934 opt
->degraded_cc_to_c
);
4935 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4936 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
4938 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4939 DIFF_OPT_TST(opt
, HAS_CHANGES
))
4941 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
4942 DIFF_OPT_TST(opt
, CHECK_FAILED
))
4947 int diff_can_quit_early(struct diff_options
*opt
)
4949 return (DIFF_OPT_TST(opt
, QUICK
) &&
4951 DIFF_OPT_TST(opt
, HAS_CHANGES
));
4955 * Shall changes to this submodule be ignored?
4957 * Submodule changes can be configured to be ignored separately for each path,
4958 * but that configuration can be overridden from the command line.
4960 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
4963 unsigned orig_flags
= options
->flags
;
4964 if (!DIFF_OPT_TST(options
, OVERRIDE_SUBMODULE_CONFIG
))
4965 set_diffopt_flags_from_submodule_config(options
, path
);
4966 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
))
4968 options
->flags
= orig_flags
;
4972 void diff_addremove(struct diff_options
*options
,
4973 int addremove
, unsigned mode
,
4974 const unsigned char *sha1
,
4976 const char *concatpath
, unsigned dirty_submodule
)
4978 struct diff_filespec
*one
, *two
;
4980 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
4983 /* This may look odd, but it is a preparation for
4984 * feeding "there are unchanged files which should
4985 * not produce diffs, but when you are doing copy
4986 * detection you would need them, so here they are"
4987 * entries to the diff-core. They will be prefixed
4988 * with something like '=' or '*' (I haven't decided
4989 * which but should not make any difference).
4990 * Feeding the same new and old to diff_change()
4991 * also has the same effect.
4992 * Before the final output happens, they are pruned after
4993 * merged into rename/copy pairs as appropriate.
4995 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
4996 addremove
= (addremove
== '+' ? '-' :
4997 addremove
== '-' ? '+' : addremove
);
4999 if (options
->prefix
&&
5000 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
5003 one
= alloc_filespec(concatpath
);
5004 two
= alloc_filespec(concatpath
);
5006 if (addremove
!= '+')
5007 fill_filespec(one
, sha1
, sha1_valid
, mode
);
5008 if (addremove
!= '-') {
5009 fill_filespec(two
, sha1
, sha1_valid
, mode
);
5010 two
->dirty_submodule
= dirty_submodule
;
5013 diff_queue(&diff_queued_diff
, one
, two
);
5014 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
5015 DIFF_OPT_SET(options
, HAS_CHANGES
);
5018 void diff_change(struct diff_options
*options
,
5019 unsigned old_mode
, unsigned new_mode
,
5020 const unsigned char *old_sha1
,
5021 const unsigned char *new_sha1
,
5022 int old_sha1_valid
, int new_sha1_valid
,
5023 const char *concatpath
,
5024 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
5026 struct diff_filespec
*one
, *two
;
5027 struct diff_filepair
*p
;
5029 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
5030 is_submodule_ignored(concatpath
, options
))
5033 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
5035 const unsigned char *tmp_c
;
5036 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
5037 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
5038 tmp
= old_sha1_valid
; old_sha1_valid
= new_sha1_valid
;
5039 new_sha1_valid
= tmp
;
5040 tmp
= old_dirty_submodule
; old_dirty_submodule
= new_dirty_submodule
;
5041 new_dirty_submodule
= tmp
;
5044 if (options
->prefix
&&
5045 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
5048 one
= alloc_filespec(concatpath
);
5049 two
= alloc_filespec(concatpath
);
5050 fill_filespec(one
, old_sha1
, old_sha1_valid
, old_mode
);
5051 fill_filespec(two
, new_sha1
, new_sha1_valid
, new_mode
);
5052 one
->dirty_submodule
= old_dirty_submodule
;
5053 two
->dirty_submodule
= new_dirty_submodule
;
5054 p
= diff_queue(&diff_queued_diff
, one
, two
);
5056 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
5059 if (DIFF_OPT_TST(options
, QUICK
) && options
->skip_stat_unmatch
&&
5060 !diff_filespec_check_stat_unmatch(p
))
5063 DIFF_OPT_SET(options
, HAS_CHANGES
);
5066 struct diff_filepair
*diff_unmerge(struct diff_options
*options
, const char *path
)
5068 struct diff_filepair
*pair
;
5069 struct diff_filespec
*one
, *two
;
5071 if (options
->prefix
&&
5072 strncmp(path
, options
->prefix
, options
->prefix_length
))
5075 one
= alloc_filespec(path
);
5076 two
= alloc_filespec(path
);
5077 pair
= diff_queue(&diff_queued_diff
, one
, two
);
5078 pair
->is_unmerged
= 1;
5082 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
5085 struct diff_tempfile
*temp
;
5086 const char *argv
[3];
5087 const char **arg
= argv
;
5088 struct child_process child
= CHILD_PROCESS_INIT
;
5089 struct strbuf buf
= STRBUF_INIT
;
5092 temp
= prepare_temp_file(spec
->path
, spec
);
5094 *arg
++ = temp
->name
;
5097 child
.use_shell
= 1;
5100 if (start_command(&child
)) {
5105 if (strbuf_read(&buf
, child
.out
, 0) < 0)
5106 err
= error("error reading from textconv command '%s'", pgm
);
5109 if (finish_command(&child
) || err
) {
5110 strbuf_release(&buf
);
5116 return strbuf_detach(&buf
, outsize
);
5119 size_t fill_textconv(struct userdiff_driver
*driver
,
5120 struct diff_filespec
*df
,
5126 if (!DIFF_FILE_VALID(df
)) {
5130 if (diff_populate_filespec(df
, 0))
5131 die("unable to read files to diff");
5136 if (!driver
->textconv
)
5137 die("BUG: fill_textconv called with non-textconv driver");
5139 if (driver
->textconv_cache
&& df
->oid_valid
) {
5140 *outbuf
= notes_cache_get(driver
->textconv_cache
,
5147 *outbuf
= run_textconv(driver
->textconv
, df
, &size
);
5149 die("unable to read files to diff");
5151 if (driver
->textconv_cache
&& df
->oid_valid
) {
5152 /* ignore errors, as we might be in a readonly repository */
5153 notes_cache_put(driver
->textconv_cache
, df
->oid
.hash
, *outbuf
,
5156 * we could save up changes and flush them all at the end,
5157 * but we would need an extra call after all diffing is done.
5158 * Since generating a cache entry is the slow path anyway,
5159 * this extra overhead probably isn't a big deal.
5161 notes_cache_write(driver
->textconv_cache
);
5167 void setup_diff_pager(struct diff_options
*opt
)
5170 * If the user asked for our exit code, then either they want --quiet
5171 * or --exit-code. We should definitely not bother with a pager in the
5172 * former case, as we will generate no output. Since we still properly
5173 * report our exit code even when a pager is run, we _could_ run a
5174 * pager with --exit-code. But since we have not done so historically,
5175 * and because it is easy to find people oneline advising "git diff
5176 * --exit-code" in hooks and other scripts, we do not do so.
5178 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
5179 check_pager_config("diff") != 0)