2 * Copyright (C) 2005 Junio C Hamano
11 #include "xdiff-interface.h"
14 #include "run-command.h"
16 #include "object-store.h"
18 #include "submodule-config.h"
19 #include "submodule.h"
22 #include "string-list.h"
23 #include "argv-array.h"
28 #ifdef NO_FAST_WORKING_DIRECTORY
29 #define FAST_WORKING_DIRECTORY 0
31 #define FAST_WORKING_DIRECTORY 1
34 static int diff_detect_rename_default
;
35 static int diff_indent_heuristic
= 1;
36 static int diff_rename_limit_default
= 400;
37 static int diff_suppress_blank_empty
;
38 static int diff_use_color_default
= -1;
39 static int diff_color_moved_default
;
40 static int diff_color_moved_ws_default
;
41 static int diff_context_default
= 3;
42 static int diff_interhunk_context_default
;
43 static const char *diff_word_regex_cfg
;
44 static const char *external_diff_cmd_cfg
;
45 static const char *diff_order_file_cfg
;
46 int diff_auto_refresh_index
= 1;
47 static int diff_mnemonic_prefix
;
48 static int diff_no_prefix
;
49 static int diff_stat_graph_width
;
50 static int diff_dirstat_permille_default
= 30;
51 static struct diff_options default_diff_options
;
52 static long diff_algorithm
;
53 static unsigned ws_error_highlight_default
= WSEH_NEW
;
55 static char diff_colors
[][COLOR_MAXLEN
] = {
57 GIT_COLOR_NORMAL
, /* CONTEXT */
58 GIT_COLOR_BOLD
, /* METAINFO */
59 GIT_COLOR_CYAN
, /* FRAGINFO */
60 GIT_COLOR_RED
, /* OLD */
61 GIT_COLOR_GREEN
, /* NEW */
62 GIT_COLOR_YELLOW
, /* COMMIT */
63 GIT_COLOR_BG_RED
, /* WHITESPACE */
64 GIT_COLOR_NORMAL
, /* FUNCINFO */
65 GIT_COLOR_BOLD_MAGENTA
, /* OLD_MOVED */
66 GIT_COLOR_BOLD_BLUE
, /* OLD_MOVED ALTERNATIVE */
67 GIT_COLOR_FAINT
, /* OLD_MOVED_DIM */
68 GIT_COLOR_FAINT_ITALIC
, /* OLD_MOVED_ALTERNATIVE_DIM */
69 GIT_COLOR_BOLD_CYAN
, /* NEW_MOVED */
70 GIT_COLOR_BOLD_YELLOW
, /* NEW_MOVED ALTERNATIVE */
71 GIT_COLOR_FAINT
, /* NEW_MOVED_DIM */
72 GIT_COLOR_FAINT_ITALIC
, /* NEW_MOVED_ALTERNATIVE_DIM */
73 GIT_COLOR_FAINT
, /* CONTEXT_DIM */
74 GIT_COLOR_FAINT_RED
, /* OLD_DIM */
75 GIT_COLOR_FAINT_GREEN
, /* NEW_DIM */
76 GIT_COLOR_BOLD
, /* CONTEXT_BOLD */
77 GIT_COLOR_BOLD_RED
, /* OLD_BOLD */
78 GIT_COLOR_BOLD_GREEN
, /* NEW_BOLD */
81 static const char *color_diff_slots
[] = {
82 [DIFF_CONTEXT
] = "context",
83 [DIFF_METAINFO
] = "meta",
84 [DIFF_FRAGINFO
] = "frag",
85 [DIFF_FILE_OLD
] = "old",
86 [DIFF_FILE_NEW
] = "new",
87 [DIFF_COMMIT
] = "commit",
88 [DIFF_WHITESPACE
] = "whitespace",
89 [DIFF_FUNCINFO
] = "func",
90 [DIFF_FILE_OLD_MOVED
] = "oldMoved",
91 [DIFF_FILE_OLD_MOVED_ALT
] = "oldMovedAlternative",
92 [DIFF_FILE_OLD_MOVED_DIM
] = "oldMovedDimmed",
93 [DIFF_FILE_OLD_MOVED_ALT_DIM
] = "oldMovedAlternativeDimmed",
94 [DIFF_FILE_NEW_MOVED
] = "newMoved",
95 [DIFF_FILE_NEW_MOVED_ALT
] = "newMovedAlternative",
96 [DIFF_FILE_NEW_MOVED_DIM
] = "newMovedDimmed",
97 [DIFF_FILE_NEW_MOVED_ALT_DIM
] = "newMovedAlternativeDimmed",
98 [DIFF_CONTEXT_DIM
] = "contextDimmed",
99 [DIFF_FILE_OLD_DIM
] = "oldDimmed",
100 [DIFF_FILE_NEW_DIM
] = "newDimmed",
101 [DIFF_CONTEXT_BOLD
] = "contextBold",
102 [DIFF_FILE_OLD_BOLD
] = "oldBold",
103 [DIFF_FILE_NEW_BOLD
] = "newBold",
106 static NORETURN
void die_want_option(const char *option_name
)
108 die(_("option '%s' requires a value"), option_name
);
111 define_list_config_array_extra(color_diff_slots
, {"plain"});
113 static int parse_diff_color_slot(const char *var
)
115 if (!strcasecmp(var
, "plain"))
117 return LOOKUP_CONFIG(color_diff_slots
, var
);
120 static int parse_dirstat_params(struct diff_options
*options
, const char *params_string
,
121 struct strbuf
*errmsg
)
123 char *params_copy
= xstrdup(params_string
);
124 struct string_list params
= STRING_LIST_INIT_NODUP
;
129 string_list_split_in_place(¶ms
, params_copy
, ',', -1);
130 for (i
= 0; i
< params
.nr
; i
++) {
131 const char *p
= params
.items
[i
].string
;
132 if (!strcmp(p
, "changes")) {
133 options
->flags
.dirstat_by_line
= 0;
134 options
->flags
.dirstat_by_file
= 0;
135 } else if (!strcmp(p
, "lines")) {
136 options
->flags
.dirstat_by_line
= 1;
137 options
->flags
.dirstat_by_file
= 0;
138 } else if (!strcmp(p
, "files")) {
139 options
->flags
.dirstat_by_line
= 0;
140 options
->flags
.dirstat_by_file
= 1;
141 } else if (!strcmp(p
, "noncumulative")) {
142 options
->flags
.dirstat_cumulative
= 0;
143 } else if (!strcmp(p
, "cumulative")) {
144 options
->flags
.dirstat_cumulative
= 1;
145 } else if (isdigit(*p
)) {
147 int permille
= strtoul(p
, &end
, 10) * 10;
148 if (*end
== '.' && isdigit(*++end
)) {
149 /* only use first digit */
150 permille
+= *end
- '0';
151 /* .. and ignore any further digits */
152 while (isdigit(*++end
))
156 options
->dirstat_permille
= permille
;
158 strbuf_addf(errmsg
, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
163 strbuf_addf(errmsg
, _(" Unknown dirstat parameter '%s'\n"), p
);
168 string_list_clear(¶ms
, 0);
173 static int parse_submodule_params(struct diff_options
*options
, const char *value
)
175 if (!strcmp(value
, "log"))
176 options
->submodule_format
= DIFF_SUBMODULE_LOG
;
177 else if (!strcmp(value
, "short"))
178 options
->submodule_format
= DIFF_SUBMODULE_SHORT
;
179 else if (!strcmp(value
, "diff"))
180 options
->submodule_format
= DIFF_SUBMODULE_INLINE_DIFF
;
186 int git_config_rename(const char *var
, const char *value
)
189 return DIFF_DETECT_RENAME
;
190 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
191 return DIFF_DETECT_COPY
;
192 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
195 long parse_algorithm_value(const char *value
)
199 else if (!strcasecmp(value
, "myers") || !strcasecmp(value
, "default"))
201 else if (!strcasecmp(value
, "minimal"))
202 return XDF_NEED_MINIMAL
;
203 else if (!strcasecmp(value
, "patience"))
204 return XDF_PATIENCE_DIFF
;
205 else if (!strcasecmp(value
, "histogram"))
206 return XDF_HISTOGRAM_DIFF
;
210 static int parse_one_token(const char **arg
, const char *token
)
213 if (skip_prefix(*arg
, token
, &rest
) && (!*rest
|| *rest
== ',')) {
220 static int parse_ws_error_highlight(const char *arg
)
222 const char *orig_arg
= arg
;
226 if (parse_one_token(&arg
, "none"))
228 else if (parse_one_token(&arg
, "default"))
230 else if (parse_one_token(&arg
, "all"))
231 val
= WSEH_NEW
| WSEH_OLD
| WSEH_CONTEXT
;
232 else if (parse_one_token(&arg
, "new"))
234 else if (parse_one_token(&arg
, "old"))
236 else if (parse_one_token(&arg
, "context"))
239 return -1 - (int)(arg
- orig_arg
);
248 * These are to give UI layer defaults.
249 * The core-level commands such as git-diff-files should
250 * never be affected by the setting of diff.renames
251 * the user happens to have in the configuration file.
253 void init_diff_ui_defaults(void)
255 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
258 int git_diff_heuristic_config(const char *var
, const char *value
, void *cb
)
260 if (!strcmp(var
, "diff.indentheuristic"))
261 diff_indent_heuristic
= git_config_bool(var
, value
);
265 static int parse_color_moved(const char *arg
)
267 switch (git_parse_maybe_bool(arg
)) {
269 return COLOR_MOVED_NO
;
271 return COLOR_MOVED_DEFAULT
;
276 if (!strcmp(arg
, "no"))
277 return COLOR_MOVED_NO
;
278 else if (!strcmp(arg
, "plain"))
279 return COLOR_MOVED_PLAIN
;
280 else if (!strcmp(arg
, "blocks"))
281 return COLOR_MOVED_BLOCKS
;
282 else if (!strcmp(arg
, "zebra"))
283 return COLOR_MOVED_ZEBRA
;
284 else if (!strcmp(arg
, "default"))
285 return COLOR_MOVED_DEFAULT
;
286 else if (!strcmp(arg
, "dimmed-zebra"))
287 return COLOR_MOVED_ZEBRA_DIM
;
288 else if (!strcmp(arg
, "dimmed_zebra"))
289 return COLOR_MOVED_ZEBRA_DIM
;
291 return error(_("color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"));
294 static int parse_color_moved_ws(const char *arg
)
297 struct string_list l
= STRING_LIST_INIT_DUP
;
298 struct string_list_item
*i
;
300 string_list_split(&l
, arg
, ',', -1);
302 for_each_string_list_item(i
, &l
) {
303 struct strbuf sb
= STRBUF_INIT
;
304 strbuf_addstr(&sb
, i
->string
);
307 if (!strcmp(sb
.buf
, "ignore-space-change"))
308 ret
|= XDF_IGNORE_WHITESPACE_CHANGE
;
309 else if (!strcmp(sb
.buf
, "ignore-space-at-eol"))
310 ret
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
311 else if (!strcmp(sb
.buf
, "ignore-all-space"))
312 ret
|= XDF_IGNORE_WHITESPACE
;
313 else if (!strcmp(sb
.buf
, "allow-indentation-change"))
314 ret
|= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
;
316 error(_("ignoring unknown color-moved-ws mode '%s'"), sb
.buf
);
321 if ((ret
& COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
) &&
322 (ret
& XDF_WHITESPACE_FLAGS
))
323 die(_("color-moved-ws: allow-indentation-change cannot be combined with other white space modes"));
325 string_list_clear(&l
, 0);
330 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
332 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
333 diff_use_color_default
= git_config_colorbool(var
, value
);
336 if (!strcmp(var
, "diff.colormoved")) {
337 int cm
= parse_color_moved(value
);
340 diff_color_moved_default
= cm
;
343 if (!strcmp(var
, "diff.colormovedws")) {
344 int cm
= parse_color_moved_ws(value
);
347 diff_color_moved_ws_default
= cm
;
350 if (!strcmp(var
, "diff.context")) {
351 diff_context_default
= git_config_int(var
, value
);
352 if (diff_context_default
< 0)
356 if (!strcmp(var
, "diff.interhunkcontext")) {
357 diff_interhunk_context_default
= git_config_int(var
, value
);
358 if (diff_interhunk_context_default
< 0)
362 if (!strcmp(var
, "diff.renames")) {
363 diff_detect_rename_default
= git_config_rename(var
, value
);
366 if (!strcmp(var
, "diff.autorefreshindex")) {
367 diff_auto_refresh_index
= git_config_bool(var
, value
);
370 if (!strcmp(var
, "diff.mnemonicprefix")) {
371 diff_mnemonic_prefix
= git_config_bool(var
, value
);
374 if (!strcmp(var
, "diff.noprefix")) {
375 diff_no_prefix
= git_config_bool(var
, value
);
378 if (!strcmp(var
, "diff.statgraphwidth")) {
379 diff_stat_graph_width
= git_config_int(var
, value
);
382 if (!strcmp(var
, "diff.external"))
383 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
384 if (!strcmp(var
, "diff.wordregex"))
385 return git_config_string(&diff_word_regex_cfg
, var
, value
);
386 if (!strcmp(var
, "diff.orderfile"))
387 return git_config_pathname(&diff_order_file_cfg
, var
, value
);
389 if (!strcmp(var
, "diff.ignoresubmodules"))
390 handle_ignore_submodules_arg(&default_diff_options
, value
);
392 if (!strcmp(var
, "diff.submodule")) {
393 if (parse_submodule_params(&default_diff_options
, value
))
394 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
399 if (!strcmp(var
, "diff.algorithm")) {
400 diff_algorithm
= parse_algorithm_value(value
);
401 if (diff_algorithm
< 0)
406 if (!strcmp(var
, "diff.wserrorhighlight")) {
407 int val
= parse_ws_error_highlight(value
);
410 ws_error_highlight_default
= val
;
414 if (git_color_config(var
, value
, cb
) < 0)
417 return git_diff_basic_config(var
, value
, cb
);
420 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
424 if (!strcmp(var
, "diff.renamelimit")) {
425 diff_rename_limit_default
= git_config_int(var
, value
);
429 if (userdiff_config(var
, value
) < 0)
432 if (skip_prefix(var
, "diff.color.", &name
) ||
433 skip_prefix(var
, "color.diff.", &name
)) {
434 int slot
= parse_diff_color_slot(name
);
438 return config_error_nonbool(var
);
439 return color_parse(value
, diff_colors
[slot
]);
442 /* like GNU diff's --suppress-blank-empty option */
443 if (!strcmp(var
, "diff.suppressblankempty") ||
444 /* for backwards compatibility */
445 !strcmp(var
, "diff.suppress-blank-empty")) {
446 diff_suppress_blank_empty
= git_config_bool(var
, value
);
450 if (!strcmp(var
, "diff.dirstat")) {
451 struct strbuf errmsg
= STRBUF_INIT
;
452 default_diff_options
.dirstat_permille
= diff_dirstat_permille_default
;
453 if (parse_dirstat_params(&default_diff_options
, value
, &errmsg
))
454 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
456 strbuf_release(&errmsg
);
457 diff_dirstat_permille_default
= default_diff_options
.dirstat_permille
;
461 if (git_diff_heuristic_config(var
, value
, cb
) < 0)
464 return git_default_config(var
, value
, cb
);
467 static char *quote_two(const char *one
, const char *two
)
469 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
470 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
471 struct strbuf res
= STRBUF_INIT
;
473 if (need_one
+ need_two
) {
474 strbuf_addch(&res
, '"');
475 quote_c_style(one
, &res
, NULL
, 1);
476 quote_c_style(two
, &res
, NULL
, 1);
477 strbuf_addch(&res
, '"');
479 strbuf_addstr(&res
, one
);
480 strbuf_addstr(&res
, two
);
482 return strbuf_detach(&res
, NULL
);
485 static const char *external_diff(void)
487 static const char *external_diff_cmd
= NULL
;
488 static int done_preparing
= 0;
491 return external_diff_cmd
;
492 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
493 if (!external_diff_cmd
)
494 external_diff_cmd
= external_diff_cmd_cfg
;
496 return external_diff_cmd
;
500 * Keep track of files used for diffing. Sometimes such an entry
501 * refers to a temporary file, sometimes to an existing file, and
502 * sometimes to "/dev/null".
504 static struct diff_tempfile
{
506 * filename external diff should read from, or NULL if this
507 * entry is currently not in use:
511 char hex
[GIT_MAX_HEXSZ
+ 1];
515 * If this diff_tempfile instance refers to a temporary file,
516 * this tempfile object is used to manage its lifetime.
518 struct tempfile
*tempfile
;
521 struct emit_callback
{
524 int blank_at_eof_in_preimage
;
525 int blank_at_eof_in_postimage
;
527 int lno_in_postimage
;
528 const char **label_path
;
529 struct diff_words_data
*diff_words
;
530 struct diff_options
*opt
;
531 struct strbuf
*header
;
534 static int count_lines(const char *data
, int size
)
536 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
543 completely_empty
= 0;
547 completely_empty
= 0;
550 if (completely_empty
)
553 count
++; /* no trailing newline */
557 static int fill_mmfile(struct repository
*r
, mmfile_t
*mf
,
558 struct diff_filespec
*one
)
560 if (!DIFF_FILE_VALID(one
)) {
561 mf
->ptr
= (char *)""; /* does not matter */
565 else if (diff_populate_filespec(r
, one
, 0))
569 mf
->size
= one
->size
;
573 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
574 static unsigned long diff_filespec_size(struct repository
*r
,
575 struct diff_filespec
*one
)
577 if (!DIFF_FILE_VALID(one
))
579 diff_populate_filespec(r
, one
, CHECK_SIZE_ONLY
);
583 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
586 long size
= mf
->size
;
591 ptr
+= size
- 1; /* pointing at the very end */
593 ; /* incomplete line */
595 ptr
--; /* skip the last LF */
596 while (mf
->ptr
< ptr
) {
598 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
599 if (*prev_eol
== '\n')
601 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
609 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
610 struct emit_callback
*ecbdata
)
613 unsigned ws_rule
= ecbdata
->ws_rule
;
614 l1
= count_trailing_blank(mf1
, ws_rule
);
615 l2
= count_trailing_blank(mf2
, ws_rule
);
617 ecbdata
->blank_at_eof_in_preimage
= 0;
618 ecbdata
->blank_at_eof_in_postimage
= 0;
621 at
= count_lines(mf1
->ptr
, mf1
->size
);
622 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
624 at
= count_lines(mf2
->ptr
, mf2
->size
);
625 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
628 static void emit_line_0(struct diff_options
*o
,
629 const char *set
, unsigned reverse
, const char *reset
,
630 int first
, const char *line
, int len
)
632 int has_trailing_newline
, has_trailing_carriage_return
;
634 FILE *file
= o
->file
;
637 fputs(diff_line_prefix(o
), file
);
642 has_trailing_newline
= (first
== '\n');
643 has_trailing_carriage_return
= (!has_trailing_newline
&&
645 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
647 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
648 if (has_trailing_newline
)
650 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
651 if (has_trailing_carriage_return
)
656 if (len
|| !nofirst
) {
657 if (reverse
&& want_color(o
->use_color
))
658 fputs(GIT_COLOR_REVERSE
, file
);
660 if (first
&& !nofirst
)
662 fwrite(line
, len
, 1, file
);
665 if (has_trailing_carriage_return
)
667 if (has_trailing_newline
)
671 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
672 const char *line
, int len
)
674 emit_line_0(o
, set
, 0, reset
, line
[0], line
+1, len
-1);
678 DIFF_SYMBOL_BINARY_DIFF_HEADER
,
679 DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
,
680 DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
,
681 DIFF_SYMBOL_BINARY_DIFF_BODY
,
682 DIFF_SYMBOL_BINARY_DIFF_FOOTER
,
683 DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
,
684 DIFF_SYMBOL_STATS_SUMMARY_ABBREV
,
685 DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
,
686 DIFF_SYMBOL_STATS_LINE
,
687 DIFF_SYMBOL_WORD_DIFF
,
688 DIFF_SYMBOL_STAT_SEP
,
690 DIFF_SYMBOL_SUBMODULE_ADD
,
691 DIFF_SYMBOL_SUBMODULE_DEL
,
692 DIFF_SYMBOL_SUBMODULE_UNTRACKED
,
693 DIFF_SYMBOL_SUBMODULE_MODIFIED
,
694 DIFF_SYMBOL_SUBMODULE_HEADER
,
695 DIFF_SYMBOL_SUBMODULE_ERROR
,
696 DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
,
697 DIFF_SYMBOL_REWRITE_DIFF
,
698 DIFF_SYMBOL_BINARY_FILES
,
700 DIFF_SYMBOL_FILEPAIR_PLUS
,
701 DIFF_SYMBOL_FILEPAIR_MINUS
,
702 DIFF_SYMBOL_WORDS_PORCELAIN
,
705 DIFF_SYMBOL_CONTEXT_INCOMPLETE
,
708 DIFF_SYMBOL_NO_LF_EOF
,
709 DIFF_SYMBOL_CONTEXT_FRAGINFO
,
710 DIFF_SYMBOL_CONTEXT_MARKER
,
711 DIFF_SYMBOL_SEPARATOR
714 * Flags for content lines:
715 * 0..12 are whitespace rules
716 * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
717 * 16 is marking if the line is blank at EOF
719 #define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF (1<<16)
720 #define DIFF_SYMBOL_MOVED_LINE (1<<17)
721 #define DIFF_SYMBOL_MOVED_LINE_ALT (1<<18)
722 #define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING (1<<19)
723 #define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)
726 * This struct is used when we need to buffer the output of the diff output.
728 * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
729 * into the pre/post image file. This pointer could be a union with the
730 * line pointer. By storing an offset into the file instead of the literal line,
731 * we can decrease the memory footprint for the buffered output. At first we
732 * may want to only have indirection for the content lines, but we could also
733 * enhance the state for emitting prefabricated lines, e.g. the similarity
734 * score line or hunk/file headers would only need to store a number or path
735 * and then the output can be constructed later on depending on state.
737 struct emitted_diff_symbol
{
743 #define EMITTED_DIFF_SYMBOL_INIT {NULL}
745 struct emitted_diff_symbols
{
746 struct emitted_diff_symbol
*buf
;
749 #define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
751 static void append_emitted_diff_symbol(struct diff_options
*o
,
752 struct emitted_diff_symbol
*e
)
754 struct emitted_diff_symbol
*f
;
756 ALLOC_GROW(o
->emitted_symbols
->buf
,
757 o
->emitted_symbols
->nr
+ 1,
758 o
->emitted_symbols
->alloc
);
759 f
= &o
->emitted_symbols
->buf
[o
->emitted_symbols
->nr
++];
761 memcpy(f
, e
, sizeof(struct emitted_diff_symbol
));
762 f
->line
= e
->line
? xmemdupz(e
->line
, e
->len
) : NULL
;
766 struct hashmap_entry ent
;
767 const struct emitted_diff_symbol
*es
;
768 struct moved_entry
*next_line
;
769 struct ws_delta
*wsd
;
773 * The struct ws_delta holds white space differences between moved lines, i.e.
774 * between '+' and '-' lines that have been detected to be a move.
775 * The string contains the difference in leading white spaces, before the
776 * rest of the line is compared using the white space config for move
777 * coloring. The current_longer indicates if the first string in the
778 * comparision is longer than the second.
782 unsigned int current_longer
: 1;
784 #define WS_DELTA_INIT { NULL, 0 }
786 static int compute_ws_delta(const struct emitted_diff_symbol
*a
,
787 const struct emitted_diff_symbol
*b
,
788 struct ws_delta
*out
)
790 const struct emitted_diff_symbol
*longer
= a
->len
> b
->len
? a
: b
;
791 const struct emitted_diff_symbol
*shorter
= a
->len
> b
->len
? b
: a
;
792 int d
= longer
->len
- shorter
->len
;
794 out
->string
= xmemdupz(longer
->line
, d
);
795 out
->current_longer
= (a
== longer
);
797 return !strncmp(longer
->line
+ d
, shorter
->line
, shorter
->len
);
800 static int cmp_in_block_with_wsd(const struct diff_options
*o
,
801 const struct moved_entry
*cur
,
802 const struct moved_entry
*match
,
803 struct moved_entry
*pmb
,
806 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
807 int al
= cur
->es
->len
, cl
= l
->len
;
808 const char *a
= cur
->es
->line
,
809 *b
= match
->es
->line
,
815 * We need to check if 'cur' is equal to 'match'.
816 * As those are from the same (+/-) side, we do not need to adjust for
817 * indent changes. However these were found using fuzzy matching
818 * so we do have to check if they are equal.
825 * No white space delta was carried forward? This can happen
826 * when we exit early in this function and do not carry
832 * The indent changes of the block are known and carried forward in
833 * pmb->wsd; however we need to check if the indent changes of the
834 * current line are still the same as before.
836 * To do so we need to compare 'l' to 'cur', adjusting the
837 * one of them for the white spaces, depending which was longer.
840 wslen
= strlen(pmb
->wsd
->string
);
841 if (pmb
->wsd
->current_longer
) {
855 static int moved_entry_cmp(const void *hashmap_cmp_fn_data
,
857 const void *entry_or_key
,
860 const struct diff_options
*diffopt
= hashmap_cmp_fn_data
;
861 const struct moved_entry
*a
= entry
;
862 const struct moved_entry
*b
= entry_or_key
;
863 unsigned flags
= diffopt
->color_moved_ws_handling
864 & XDF_WHITESPACE_FLAGS
;
866 if (diffopt
->color_moved_ws_handling
&
867 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
)
869 * As there is not specific white space config given,
870 * we'd need to check for a new block, so ignore all
871 * white space. The setup of the white space
872 * configuration for the next block is done else where
874 flags
|= XDF_IGNORE_WHITESPACE
;
876 return !xdiff_compare_lines(a
->es
->line
, a
->es
->len
,
877 b
->es
->line
, b
->es
->len
,
881 static struct moved_entry
*prepare_entry(struct diff_options
*o
,
884 struct moved_entry
*ret
= xmalloc(sizeof(*ret
));
885 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[line_no
];
886 unsigned flags
= o
->color_moved_ws_handling
& XDF_WHITESPACE_FLAGS
;
888 ret
->ent
.hash
= xdiff_hash_string(l
->line
, l
->len
, flags
);
890 ret
->next_line
= NULL
;
896 static void add_lines_to_move_detection(struct diff_options
*o
,
897 struct hashmap
*add_lines
,
898 struct hashmap
*del_lines
)
900 struct moved_entry
*prev_line
= NULL
;
903 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
905 struct moved_entry
*key
;
907 switch (o
->emitted_symbols
->buf
[n
].s
) {
908 case DIFF_SYMBOL_PLUS
:
911 case DIFF_SYMBOL_MINUS
:
919 key
= prepare_entry(o
, n
);
920 if (prev_line
&& prev_line
->es
->s
== o
->emitted_symbols
->buf
[n
].s
)
921 prev_line
->next_line
= key
;
923 hashmap_add(hm
, key
);
928 static void pmb_advance_or_null(struct diff_options
*o
,
929 struct moved_entry
*match
,
931 struct moved_entry
**pmb
,
935 for (i
= 0; i
< pmb_nr
; i
++) {
936 struct moved_entry
*prev
= pmb
[i
];
937 struct moved_entry
*cur
= (prev
&& prev
->next_line
) ?
938 prev
->next_line
: NULL
;
939 if (cur
&& !hm
->cmpfn(o
, cur
, match
, NULL
)) {
947 static void pmb_advance_or_null_multi_match(struct diff_options
*o
,
948 struct moved_entry
*match
,
950 struct moved_entry
**pmb
,
954 char *got_match
= xcalloc(1, pmb_nr
);
956 for (; match
; match
= hashmap_get_next(hm
, match
)) {
957 for (i
= 0; i
< pmb_nr
; i
++) {
958 struct moved_entry
*prev
= pmb
[i
];
959 struct moved_entry
*cur
= (prev
&& prev
->next_line
) ?
960 prev
->next_line
: NULL
;
963 if (!cmp_in_block_with_wsd(o
, cur
, match
, pmb
[i
], n
))
968 for (i
= 0; i
< pmb_nr
; i
++) {
970 /* Carry the white space delta forward */
971 pmb
[i
]->next_line
->wsd
= pmb
[i
]->wsd
;
972 pmb
[i
] = pmb
[i
]->next_line
;
978 static int shrink_potential_moved_blocks(struct moved_entry
**pmb
,
983 /* Shrink the set of potential block to the remaining running */
984 for (lp
= 0, rp
= pmb_nr
- 1; lp
<= rp
;) {
985 while (lp
< pmb_nr
&& pmb
[lp
])
987 /* lp points at the first NULL now */
989 while (rp
> -1 && !pmb
[rp
])
991 /* rp points at the last non-NULL */
993 if (lp
< pmb_nr
&& rp
> -1 && lp
< rp
) {
996 free(pmb
[rp
]->wsd
->string
);
997 FREE_AND_NULL(pmb
[rp
]->wsd
);
1005 /* Remember the number of running sets */
1010 * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
1012 * Otherwise, if the last block has fewer alphanumeric characters than
1013 * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
1016 * The last block consists of the (n - block_length)'th line up to but not
1017 * including the nth line.
1019 * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
1020 * Think of a way to unify them.
1022 static void adjust_last_block(struct diff_options
*o
, int n
, int block_length
)
1024 int i
, alnum_count
= 0;
1025 if (o
->color_moved
== COLOR_MOVED_PLAIN
)
1027 for (i
= 1; i
< block_length
+ 1; i
++) {
1028 const char *c
= o
->emitted_symbols
->buf
[n
- i
].line
;
1033 if (alnum_count
>= COLOR_MOVED_MIN_ALNUM_COUNT
)
1037 for (i
= 1; i
< block_length
+ 1; i
++)
1038 o
->emitted_symbols
->buf
[n
- i
].flags
&= ~DIFF_SYMBOL_MOVED_LINE
;
1041 /* Find blocks of moved code, delegate actual coloring decision to helper */
1042 static void mark_color_as_moved(struct diff_options
*o
,
1043 struct hashmap
*add_lines
,
1044 struct hashmap
*del_lines
)
1046 struct moved_entry
**pmb
= NULL
; /* potentially moved blocks */
1047 int pmb_nr
= 0, pmb_alloc
= 0;
1048 int n
, flipped_block
= 1, block_length
= 0;
1051 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
1052 struct hashmap
*hm
= NULL
;
1053 struct moved_entry
*key
;
1054 struct moved_entry
*match
= NULL
;
1055 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
1058 case DIFF_SYMBOL_PLUS
:
1060 key
= prepare_entry(o
, n
);
1061 match
= hashmap_get(hm
, key
, NULL
);
1064 case DIFF_SYMBOL_MINUS
:
1066 key
= prepare_entry(o
, n
);
1067 match
= hashmap_get(hm
, key
, NULL
);
1075 adjust_last_block(o
, n
, block_length
);
1081 l
->flags
|= DIFF_SYMBOL_MOVED_LINE
;
1083 if (o
->color_moved
== COLOR_MOVED_PLAIN
)
1086 if (o
->color_moved_ws_handling
&
1087 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
)
1088 pmb_advance_or_null_multi_match(o
, match
, hm
, pmb
, pmb_nr
, n
);
1090 pmb_advance_or_null(o
, match
, hm
, pmb
, pmb_nr
);
1092 pmb_nr
= shrink_potential_moved_blocks(pmb
, pmb_nr
);
1096 * The current line is the start of a new block.
1097 * Setup the set of potential blocks.
1099 for (; match
; match
= hashmap_get_next(hm
, match
)) {
1100 ALLOC_GROW(pmb
, pmb_nr
+ 1, pmb_alloc
);
1101 if (o
->color_moved_ws_handling
&
1102 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
) {
1103 struct ws_delta
*wsd
= xmalloc(sizeof(*match
->wsd
));
1104 if (compute_ws_delta(l
, match
->es
, wsd
)) {
1106 pmb
[pmb_nr
++] = match
;
1110 pmb
[pmb_nr
++] = match
;
1114 flipped_block
= (flipped_block
+ 1) % 2;
1116 adjust_last_block(o
, n
, block_length
);
1122 if (flipped_block
&& o
->color_moved
!= COLOR_MOVED_BLOCKS
)
1123 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_ALT
;
1125 adjust_last_block(o
, n
, block_length
);
1130 #define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
1131 (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
1132 static void dim_moved_lines(struct diff_options
*o
)
1135 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
1136 struct emitted_diff_symbol
*prev
= (n
!= 0) ?
1137 &o
->emitted_symbols
->buf
[n
- 1] : NULL
;
1138 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
1139 struct emitted_diff_symbol
*next
=
1140 (n
< o
->emitted_symbols
->nr
- 1) ?
1141 &o
->emitted_symbols
->buf
[n
+ 1] : NULL
;
1143 /* Not a plus or minus line? */
1144 if (l
->s
!= DIFF_SYMBOL_PLUS
&& l
->s
!= DIFF_SYMBOL_MINUS
)
1147 /* Not a moved line? */
1148 if (!(l
->flags
& DIFF_SYMBOL_MOVED_LINE
))
1152 * If prev or next are not a plus or minus line,
1153 * pretend they don't exist
1155 if (prev
&& prev
->s
!= DIFF_SYMBOL_PLUS
&&
1156 prev
->s
!= DIFF_SYMBOL_MINUS
)
1158 if (next
&& next
->s
!= DIFF_SYMBOL_PLUS
&&
1159 next
->s
!= DIFF_SYMBOL_MINUS
)
1162 /* Inside a block? */
1164 (prev
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
) ==
1165 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
)) &&
1167 (next
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
) ==
1168 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
))) {
1169 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
;
1173 /* Check if we are at an interesting bound: */
1174 if (prev
&& (prev
->flags
& DIFF_SYMBOL_MOVED_LINE
) &&
1175 (prev
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
) !=
1176 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
))
1178 if (next
&& (next
->flags
& DIFF_SYMBOL_MOVED_LINE
) &&
1179 (next
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
) !=
1180 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
))
1184 * The boundary to prev and next are not interesting,
1185 * so this line is not interesting as a whole
1187 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
;
1191 static void emit_line_ws_markup(struct diff_options
*o
,
1192 const char *set
, const char *reset
,
1193 const char *line
, int len
,
1194 const char *set_sign
, char sign
,
1195 unsigned ws_rule
, int blank_at_eof
)
1197 const char *ws
= NULL
;
1199 if (o
->ws_error_highlight
& ws_rule
) {
1200 ws
= diff_get_color_opt(o
, DIFF_WHITESPACE
);
1205 if (!ws
&& !set_sign
)
1206 emit_line_0(o
, set
, 0, reset
, sign
, line
, len
);
1208 /* Emit just the prefix, then the rest. */
1209 emit_line_0(o
, set_sign
? set_sign
: set
, !!set_sign
, reset
,
1211 emit_line_0(o
, set
, 0, reset
, 0, line
, len
);
1212 } else if (blank_at_eof
)
1213 /* Blank line at EOF - paint '+' as well */
1214 emit_line_0(o
, ws
, 0, reset
, sign
, line
, len
);
1216 /* Emit just the prefix, then the rest. */
1217 emit_line_0(o
, set_sign
? set_sign
: set
, !!set_sign
, reset
,
1219 ws_check_emit(line
, len
, ws_rule
,
1220 o
->file
, set
, reset
, ws
);
1224 static void emit_diff_symbol_from_struct(struct diff_options
*o
,
1225 struct emitted_diff_symbol
*eds
)
1227 static const char *nneof
= " No newline at end of file\n";
1228 const char *context
, *reset
, *set
, *set_sign
, *meta
, *fraginfo
;
1229 struct strbuf sb
= STRBUF_INIT
;
1231 enum diff_symbol s
= eds
->s
;
1232 const char *line
= eds
->line
;
1234 unsigned flags
= eds
->flags
;
1237 case DIFF_SYMBOL_NO_LF_EOF
:
1238 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1239 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1240 putc('\n', o
->file
);
1241 emit_line_0(o
, context
, 0, reset
, '\\',
1242 nneof
, strlen(nneof
));
1244 case DIFF_SYMBOL_SUBMODULE_HEADER
:
1245 case DIFF_SYMBOL_SUBMODULE_ERROR
:
1246 case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
:
1247 case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
:
1248 case DIFF_SYMBOL_SUMMARY
:
1249 case DIFF_SYMBOL_STATS_LINE
:
1250 case DIFF_SYMBOL_BINARY_DIFF_BODY
:
1251 case DIFF_SYMBOL_CONTEXT_FRAGINFO
:
1252 emit_line(o
, "", "", line
, len
);
1254 case DIFF_SYMBOL_CONTEXT_INCOMPLETE
:
1255 case DIFF_SYMBOL_CONTEXT_MARKER
:
1256 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1257 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1258 emit_line(o
, context
, reset
, line
, len
);
1260 case DIFF_SYMBOL_SEPARATOR
:
1261 fprintf(o
->file
, "%s%c",
1262 diff_line_prefix(o
),
1263 o
->line_termination
);
1265 case DIFF_SYMBOL_CONTEXT
:
1266 set
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1267 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1269 if (o
->flags
.dual_color_diffed_diffs
) {
1270 char c
= !len
? 0 : line
[0];
1273 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1275 set
= diff_get_color_opt(o
, DIFF_FRAGINFO
);
1277 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1279 emit_line_ws_markup(o
, set
, reset
, line
, len
, set_sign
, ' ',
1280 flags
& (DIFF_SYMBOL_CONTENT_WS_MASK
), 0);
1282 case DIFF_SYMBOL_PLUS
:
1283 switch (flags
& (DIFF_SYMBOL_MOVED_LINE
|
1284 DIFF_SYMBOL_MOVED_LINE_ALT
|
1285 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
)) {
1286 case DIFF_SYMBOL_MOVED_LINE
|
1287 DIFF_SYMBOL_MOVED_LINE_ALT
|
1288 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1289 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_ALT_DIM
);
1291 case DIFF_SYMBOL_MOVED_LINE
|
1292 DIFF_SYMBOL_MOVED_LINE_ALT
:
1293 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_ALT
);
1295 case DIFF_SYMBOL_MOVED_LINE
|
1296 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1297 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_DIM
);
1299 case DIFF_SYMBOL_MOVED_LINE
:
1300 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED
);
1303 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1305 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1306 if (!o
->flags
.dual_color_diffed_diffs
)
1309 char c
= !len
? 0 : line
[0];
1313 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_BOLD
);
1315 set
= diff_get_color_opt(o
, DIFF_FRAGINFO
);
1317 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_BOLD
);
1319 set
= diff_get_color_opt(o
, DIFF_CONTEXT_BOLD
);
1320 flags
&= ~DIFF_SYMBOL_CONTENT_WS_MASK
;
1322 emit_line_ws_markup(o
, set
, reset
, line
, len
, set_sign
, '+',
1323 flags
& DIFF_SYMBOL_CONTENT_WS_MASK
,
1324 flags
& DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF
);
1326 case DIFF_SYMBOL_MINUS
:
1327 switch (flags
& (DIFF_SYMBOL_MOVED_LINE
|
1328 DIFF_SYMBOL_MOVED_LINE_ALT
|
1329 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
)) {
1330 case DIFF_SYMBOL_MOVED_LINE
|
1331 DIFF_SYMBOL_MOVED_LINE_ALT
|
1332 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1333 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_ALT_DIM
);
1335 case DIFF_SYMBOL_MOVED_LINE
|
1336 DIFF_SYMBOL_MOVED_LINE_ALT
:
1337 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_ALT
);
1339 case DIFF_SYMBOL_MOVED_LINE
|
1340 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1341 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_DIM
);
1343 case DIFF_SYMBOL_MOVED_LINE
:
1344 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED
);
1347 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1349 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1350 if (!o
->flags
.dual_color_diffed_diffs
)
1353 char c
= !len
? 0 : line
[0];
1357 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_DIM
);
1359 set
= diff_get_color_opt(o
, DIFF_FRAGINFO
);
1361 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_DIM
);
1363 set
= diff_get_color_opt(o
, DIFF_CONTEXT_DIM
);
1365 emit_line_ws_markup(o
, set
, reset
, line
, len
, set_sign
, '-',
1366 flags
& DIFF_SYMBOL_CONTENT_WS_MASK
, 0);
1368 case DIFF_SYMBOL_WORDS_PORCELAIN
:
1369 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1370 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1371 emit_line(o
, context
, reset
, line
, len
);
1372 fputs("~\n", o
->file
);
1374 case DIFF_SYMBOL_WORDS
:
1375 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1376 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1378 * Skip the prefix character, if any. With
1379 * diff_suppress_blank_empty, there may be
1382 if (line
[0] != '\n') {
1386 emit_line(o
, context
, reset
, line
, len
);
1388 case DIFF_SYMBOL_FILEPAIR_PLUS
:
1389 meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
1390 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1391 fprintf(o
->file
, "%s%s+++ %s%s%s\n", diff_line_prefix(o
), meta
,
1393 strchr(line
, ' ') ? "\t" : "");
1395 case DIFF_SYMBOL_FILEPAIR_MINUS
:
1396 meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
1397 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1398 fprintf(o
->file
, "%s%s--- %s%s%s\n", diff_line_prefix(o
), meta
,
1400 strchr(line
, ' ') ? "\t" : "");
1402 case DIFF_SYMBOL_BINARY_FILES
:
1403 case DIFF_SYMBOL_HEADER
:
1404 fprintf(o
->file
, "%s", line
);
1406 case DIFF_SYMBOL_BINARY_DIFF_HEADER
:
1407 fprintf(o
->file
, "%sGIT binary patch\n", diff_line_prefix(o
));
1409 case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
:
1410 fprintf(o
->file
, "%sdelta %s\n", diff_line_prefix(o
), line
);
1412 case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
:
1413 fprintf(o
->file
, "%sliteral %s\n", diff_line_prefix(o
), line
);
1415 case DIFF_SYMBOL_BINARY_DIFF_FOOTER
:
1416 fputs(diff_line_prefix(o
), o
->file
);
1417 fputc('\n', o
->file
);
1419 case DIFF_SYMBOL_REWRITE_DIFF
:
1420 fraginfo
= diff_get_color(o
->use_color
, DIFF_FRAGINFO
);
1421 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1422 emit_line(o
, fraginfo
, reset
, line
, len
);
1424 case DIFF_SYMBOL_SUBMODULE_ADD
:
1425 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1426 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1427 emit_line(o
, set
, reset
, line
, len
);
1429 case DIFF_SYMBOL_SUBMODULE_DEL
:
1430 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1431 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1432 emit_line(o
, set
, reset
, line
, len
);
1434 case DIFF_SYMBOL_SUBMODULE_UNTRACKED
:
1435 fprintf(o
->file
, "%sSubmodule %s contains untracked content\n",
1436 diff_line_prefix(o
), line
);
1438 case DIFF_SYMBOL_SUBMODULE_MODIFIED
:
1439 fprintf(o
->file
, "%sSubmodule %s contains modified content\n",
1440 diff_line_prefix(o
), line
);
1442 case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
:
1443 emit_line(o
, "", "", " 0 files changed\n",
1444 strlen(" 0 files changed\n"));
1446 case DIFF_SYMBOL_STATS_SUMMARY_ABBREV
:
1447 emit_line(o
, "", "", " ...\n", strlen(" ...\n"));
1449 case DIFF_SYMBOL_WORD_DIFF
:
1450 fprintf(o
->file
, "%.*s", len
, line
);
1452 case DIFF_SYMBOL_STAT_SEP
:
1453 fputs(o
->stat_sep
, o
->file
);
1456 BUG("unknown diff symbol");
1458 strbuf_release(&sb
);
1461 static void emit_diff_symbol(struct diff_options
*o
, enum diff_symbol s
,
1462 const char *line
, int len
, unsigned flags
)
1464 struct emitted_diff_symbol e
= {line
, len
, flags
, s
};
1466 if (o
->emitted_symbols
)
1467 append_emitted_diff_symbol(o
, &e
);
1469 emit_diff_symbol_from_struct(o
, &e
);
1472 void diff_emit_submodule_del(struct diff_options
*o
, const char *line
)
1474 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_DEL
, line
, strlen(line
), 0);
1477 void diff_emit_submodule_add(struct diff_options
*o
, const char *line
)
1479 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_ADD
, line
, strlen(line
), 0);
1482 void diff_emit_submodule_untracked(struct diff_options
*o
, const char *path
)
1484 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_UNTRACKED
,
1485 path
, strlen(path
), 0);
1488 void diff_emit_submodule_modified(struct diff_options
*o
, const char *path
)
1490 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_MODIFIED
,
1491 path
, strlen(path
), 0);
1494 void diff_emit_submodule_header(struct diff_options
*o
, const char *header
)
1496 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_HEADER
,
1497 header
, strlen(header
), 0);
1500 void diff_emit_submodule_error(struct diff_options
*o
, const char *err
)
1502 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_ERROR
, err
, strlen(err
), 0);
1505 void diff_emit_submodule_pipethrough(struct diff_options
*o
,
1506 const char *line
, int len
)
1508 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
, line
, len
, 0);
1511 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
1513 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
1514 ecbdata
->blank_at_eof_in_preimage
&&
1515 ecbdata
->blank_at_eof_in_postimage
&&
1516 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
1517 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
1519 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
1522 static void emit_add_line(const char *reset
,
1523 struct emit_callback
*ecbdata
,
1524 const char *line
, int len
)
1526 unsigned flags
= WSEH_NEW
| ecbdata
->ws_rule
;
1527 if (new_blank_line_at_eof(ecbdata
, line
, len
))
1528 flags
|= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF
;
1530 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_PLUS
, line
, len
, flags
);
1533 static void emit_del_line(const char *reset
,
1534 struct emit_callback
*ecbdata
,
1535 const char *line
, int len
)
1537 unsigned flags
= WSEH_OLD
| ecbdata
->ws_rule
;
1538 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_MINUS
, line
, len
, flags
);
1541 static void emit_context_line(const char *reset
,
1542 struct emit_callback
*ecbdata
,
1543 const char *line
, int len
)
1545 unsigned flags
= WSEH_CONTEXT
| ecbdata
->ws_rule
;
1546 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_CONTEXT
, line
, len
, flags
);
1549 static void emit_hunk_header(struct emit_callback
*ecbdata
,
1550 const char *line
, int len
)
1552 const char *context
= diff_get_color(ecbdata
->color_diff
, DIFF_CONTEXT
);
1553 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
1554 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
1555 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1556 const char *reverse
= ecbdata
->color_diff
? GIT_COLOR_REVERSE
: "";
1557 static const char atat
[2] = { '@', '@' };
1558 const char *cp
, *ep
;
1559 struct strbuf msgbuf
= STRBUF_INIT
;
1564 * As a hunk header must begin with "@@ -<old>, +<new> @@",
1565 * it always is at least 10 bytes long.
1568 memcmp(line
, atat
, 2) ||
1569 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
1570 emit_diff_symbol(ecbdata
->opt
,
1571 DIFF_SYMBOL_CONTEXT_MARKER
, line
, len
, 0);
1574 ep
+= 2; /* skip over @@ */
1576 /* The hunk header in fraginfo color */
1577 if (ecbdata
->opt
->flags
.dual_color_diffed_diffs
)
1578 strbuf_addstr(&msgbuf
, reverse
);
1579 strbuf_addstr(&msgbuf
, frag
);
1580 strbuf_add(&msgbuf
, line
, ep
- line
);
1581 strbuf_addstr(&msgbuf
, reset
);
1587 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
1590 /* blank before the func header */
1591 for (cp
= ep
; ep
- line
< len
; ep
++)
1592 if (*ep
!= ' ' && *ep
!= '\t')
1595 strbuf_addstr(&msgbuf
, context
);
1596 strbuf_add(&msgbuf
, cp
, ep
- cp
);
1597 strbuf_addstr(&msgbuf
, reset
);
1600 if (ep
< line
+ len
) {
1601 strbuf_addstr(&msgbuf
, func
);
1602 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
1603 strbuf_addstr(&msgbuf
, reset
);
1606 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
1607 strbuf_complete_line(&msgbuf
);
1608 emit_diff_symbol(ecbdata
->opt
,
1609 DIFF_SYMBOL_CONTEXT_FRAGINFO
, msgbuf
.buf
, msgbuf
.len
, 0);
1610 strbuf_release(&msgbuf
);
1613 static struct diff_tempfile
*claim_diff_tempfile(void) {
1615 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
1616 if (!diff_temp
[i
].name
)
1617 return diff_temp
+ i
;
1618 BUG("diff is failing to clean up its tempfiles");
1621 static void remove_tempfile(void)
1624 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
1625 if (is_tempfile_active(diff_temp
[i
].tempfile
))
1626 delete_tempfile(&diff_temp
[i
].tempfile
);
1627 diff_temp
[i
].name
= NULL
;
1631 static void add_line_count(struct strbuf
*out
, int count
)
1635 strbuf_addstr(out
, "0,0");
1638 strbuf_addstr(out
, "1");
1641 strbuf_addf(out
, "1,%d", count
);
1646 static void emit_rewrite_lines(struct emit_callback
*ecb
,
1647 int prefix
, const char *data
, int size
)
1649 const char *endp
= NULL
;
1650 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
1655 endp
= memchr(data
, '\n', size
);
1656 len
= endp
? (endp
- data
+ 1) : size
;
1657 if (prefix
!= '+') {
1658 ecb
->lno_in_preimage
++;
1659 emit_del_line(reset
, ecb
, data
, len
);
1661 ecb
->lno_in_postimage
++;
1662 emit_add_line(reset
, ecb
, data
, len
);
1668 emit_diff_symbol(ecb
->opt
, DIFF_SYMBOL_NO_LF_EOF
, NULL
, 0, 0);
1671 static void emit_rewrite_diff(const char *name_a
,
1673 struct diff_filespec
*one
,
1674 struct diff_filespec
*two
,
1675 struct userdiff_driver
*textconv_one
,
1676 struct userdiff_driver
*textconv_two
,
1677 struct diff_options
*o
)
1680 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
1681 const char *a_prefix
, *b_prefix
;
1682 char *data_one
, *data_two
;
1683 size_t size_one
, size_two
;
1684 struct emit_callback ecbdata
;
1685 struct strbuf out
= STRBUF_INIT
;
1687 if (diff_mnemonic_prefix
&& o
->flags
.reverse_diff
) {
1688 a_prefix
= o
->b_prefix
;
1689 b_prefix
= o
->a_prefix
;
1691 a_prefix
= o
->a_prefix
;
1692 b_prefix
= o
->b_prefix
;
1695 name_a
+= (*name_a
== '/');
1696 name_b
+= (*name_b
== '/');
1698 strbuf_reset(&a_name
);
1699 strbuf_reset(&b_name
);
1700 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
1701 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
1703 size_one
= fill_textconv(o
->repo
, textconv_one
, one
, &data_one
);
1704 size_two
= fill_textconv(o
->repo
, textconv_two
, two
, &data_two
);
1706 memset(&ecbdata
, 0, sizeof(ecbdata
));
1707 ecbdata
.color_diff
= want_color(o
->use_color
);
1708 ecbdata
.ws_rule
= whitespace_rule(name_b
);
1710 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
1712 mf1
.ptr
= (char *)data_one
;
1713 mf2
.ptr
= (char *)data_two
;
1714 mf1
.size
= size_one
;
1715 mf2
.size
= size_two
;
1716 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1718 ecbdata
.lno_in_preimage
= 1;
1719 ecbdata
.lno_in_postimage
= 1;
1721 lc_a
= count_lines(data_one
, size_one
);
1722 lc_b
= count_lines(data_two
, size_two
);
1724 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_MINUS
,
1725 a_name
.buf
, a_name
.len
, 0);
1726 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_PLUS
,
1727 b_name
.buf
, b_name
.len
, 0);
1729 strbuf_addstr(&out
, "@@ -");
1730 if (!o
->irreversible_delete
)
1731 add_line_count(&out
, lc_a
);
1733 strbuf_addstr(&out
, "?,?");
1734 strbuf_addstr(&out
, " +");
1735 add_line_count(&out
, lc_b
);
1736 strbuf_addstr(&out
, " @@\n");
1737 emit_diff_symbol(o
, DIFF_SYMBOL_REWRITE_DIFF
, out
.buf
, out
.len
, 0);
1738 strbuf_release(&out
);
1740 if (lc_a
&& !o
->irreversible_delete
)
1741 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
1743 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
1745 free((char *)data_one
);
1747 free((char *)data_two
);
1750 struct diff_words_buffer
{
1752 unsigned long alloc
;
1753 struct diff_words_orig
{
1754 const char *begin
, *end
;
1756 int orig_nr
, orig_alloc
;
1759 static void diff_words_append(char *line
, unsigned long len
,
1760 struct diff_words_buffer
*buffer
)
1762 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
1765 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
1766 buffer
->text
.size
+= len
;
1767 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
1770 struct diff_words_style_elem
{
1773 const char *color
; /* NULL; filled in by the setup code if
1774 * color is enabled */
1777 struct diff_words_style
{
1778 enum diff_words_type type
;
1779 struct diff_words_style_elem new_word
, old_word
, ctx
;
1780 const char *newline
;
1783 static struct diff_words_style diff_words_styles
[] = {
1784 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
1785 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
1786 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
1789 struct diff_words_data
{
1790 struct diff_words_buffer minus
, plus
;
1791 const char *current_plus
;
1793 struct diff_options
*opt
;
1794 regex_t
*word_regex
;
1795 enum diff_words_type type
;
1796 struct diff_words_style
*style
;
1799 static int fn_out_diff_words_write_helper(struct diff_options
*o
,
1800 struct diff_words_style_elem
*st_el
,
1801 const char *newline
,
1802 size_t count
, const char *buf
)
1805 struct strbuf sb
= STRBUF_INIT
;
1808 char *p
= memchr(buf
, '\n', count
);
1810 strbuf_addstr(&sb
, diff_line_prefix(o
));
1813 const char *reset
= st_el
->color
&& *st_el
->color
?
1814 GIT_COLOR_RESET
: NULL
;
1815 if (st_el
->color
&& *st_el
->color
)
1816 strbuf_addstr(&sb
, st_el
->color
);
1817 strbuf_addstr(&sb
, st_el
->prefix
);
1818 strbuf_add(&sb
, buf
, p
? p
- buf
: count
);
1819 strbuf_addstr(&sb
, st_el
->suffix
);
1821 strbuf_addstr(&sb
, reset
);
1826 strbuf_addstr(&sb
, newline
);
1827 count
-= p
+ 1 - buf
;
1831 emit_diff_symbol(o
, DIFF_SYMBOL_WORD_DIFF
,
1839 emit_diff_symbol(o
, DIFF_SYMBOL_WORD_DIFF
,
1841 strbuf_release(&sb
);
1846 * '--color-words' algorithm can be described as:
1848 * 1. collect the minus/plus lines of a diff hunk, divided into
1849 * minus-lines and plus-lines;
1851 * 2. break both minus-lines and plus-lines into words and
1852 * place them into two mmfile_t with one word for each line;
1854 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
1856 * And for the common parts of the both file, we output the plus side text.
1857 * diff_words->current_plus is used to trace the current position of the plus file
1858 * which printed. diff_words->last_minus is used to trace the last minus word
1861 * For '--graph' to work with '--color-words', we need to output the graph prefix
1862 * on each line of color words output. Generally, there are two conditions on
1863 * which we should output the prefix.
1865 * 1. diff_words->last_minus == 0 &&
1866 * diff_words->current_plus == diff_words->plus.text.ptr
1868 * that is: the plus text must start as a new line, and if there is no minus
1869 * word printed, a graph prefix must be printed.
1871 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
1872 * *(diff_words->current_plus - 1) == '\n'
1874 * that is: a graph prefix must be printed following a '\n'
1876 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
1878 if ((diff_words
->last_minus
== 0 &&
1879 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
1880 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
1881 *(diff_words
->current_plus
- 1) == '\n')) {
1888 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
1890 struct diff_words_data
*diff_words
= priv
;
1891 struct diff_words_style
*style
= diff_words
->style
;
1892 int minus_first
, minus_len
, plus_first
, plus_len
;
1893 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
1894 struct diff_options
*opt
= diff_words
->opt
;
1895 const char *line_prefix
;
1897 if (line
[0] != '@' || parse_hunk_header(line
, len
,
1898 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
1902 line_prefix
= diff_line_prefix(opt
);
1904 /* POSIX requires that first be decremented by one if len == 0... */
1906 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
1908 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
1910 minus_begin
= minus_end
=
1911 diff_words
->minus
.orig
[minus_first
].end
;
1914 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
1915 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
1917 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
1919 if (color_words_output_graph_prefix(diff_words
)) {
1920 fputs(line_prefix
, diff_words
->opt
->file
);
1922 if (diff_words
->current_plus
!= plus_begin
) {
1923 fn_out_diff_words_write_helper(diff_words
->opt
,
1924 &style
->ctx
, style
->newline
,
1925 plus_begin
- diff_words
->current_plus
,
1926 diff_words
->current_plus
);
1928 if (minus_begin
!= minus_end
) {
1929 fn_out_diff_words_write_helper(diff_words
->opt
,
1930 &style
->old_word
, style
->newline
,
1931 minus_end
- minus_begin
, minus_begin
);
1933 if (plus_begin
!= plus_end
) {
1934 fn_out_diff_words_write_helper(diff_words
->opt
,
1935 &style
->new_word
, style
->newline
,
1936 plus_end
- plus_begin
, plus_begin
);
1939 diff_words
->current_plus
= plus_end
;
1940 diff_words
->last_minus
= minus_first
;
1943 /* This function starts looking at *begin, and returns 0 iff a word was found. */
1944 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
1945 int *begin
, int *end
)
1947 if (word_regex
&& *begin
< buffer
->size
) {
1948 regmatch_t match
[1];
1949 if (!regexec_buf(word_regex
, buffer
->ptr
+ *begin
,
1950 buffer
->size
- *begin
, 1, match
, 0)) {
1951 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
1952 '\n', match
[0].rm_eo
- match
[0].rm_so
);
1953 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
1954 *begin
+= match
[0].rm_so
;
1955 return *begin
>= *end
;
1960 /* find the next word */
1961 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
1963 if (*begin
>= buffer
->size
)
1966 /* find the end of the word */
1968 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
1975 * This function splits the words in buffer->text, stores the list with
1976 * newline separator into out, and saves the offsets of the original words
1979 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
1980 regex_t
*word_regex
)
1988 /* fake an empty "0th" word */
1989 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
1990 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
1991 buffer
->orig_nr
= 1;
1993 for (i
= 0; i
< buffer
->text
.size
; i
++) {
1994 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
1997 /* store original boundaries */
1998 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
1999 buffer
->orig_alloc
);
2000 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
2001 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
2004 /* store one word */
2005 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
2006 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
2007 out
->ptr
[out
->size
+ j
- i
] = '\n';
2008 out
->size
+= j
- i
+ 1;
2014 /* this executes the word diff on the accumulated buffers */
2015 static void diff_words_show(struct diff_words_data
*diff_words
)
2019 mmfile_t minus
, plus
;
2020 struct diff_words_style
*style
= diff_words
->style
;
2022 struct diff_options
*opt
= diff_words
->opt
;
2023 const char *line_prefix
;
2026 line_prefix
= diff_line_prefix(opt
);
2028 /* special case: only removal */
2029 if (!diff_words
->plus
.text
.size
) {
2030 emit_diff_symbol(diff_words
->opt
, DIFF_SYMBOL_WORD_DIFF
,
2031 line_prefix
, strlen(line_prefix
), 0);
2032 fn_out_diff_words_write_helper(diff_words
->opt
,
2033 &style
->old_word
, style
->newline
,
2034 diff_words
->minus
.text
.size
,
2035 diff_words
->minus
.text
.ptr
);
2036 diff_words
->minus
.text
.size
= 0;
2040 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
2041 diff_words
->last_minus
= 0;
2043 memset(&xpp
, 0, sizeof(xpp
));
2044 memset(&xecfg
, 0, sizeof(xecfg
));
2045 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
2046 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
2048 /* as only the hunk header will be parsed, we need a 0-context */
2050 if (xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
2052 die("unable to generate word diff");
2055 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
2056 diff_words
->plus
.text
.size
) {
2057 if (color_words_output_graph_prefix(diff_words
))
2058 emit_diff_symbol(diff_words
->opt
, DIFF_SYMBOL_WORD_DIFF
,
2059 line_prefix
, strlen(line_prefix
), 0);
2060 fn_out_diff_words_write_helper(diff_words
->opt
,
2061 &style
->ctx
, style
->newline
,
2062 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
2063 - diff_words
->current_plus
, diff_words
->current_plus
);
2065 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
2068 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
2069 static void diff_words_flush(struct emit_callback
*ecbdata
)
2071 struct diff_options
*wo
= ecbdata
->diff_words
->opt
;
2073 if (ecbdata
->diff_words
->minus
.text
.size
||
2074 ecbdata
->diff_words
->plus
.text
.size
)
2075 diff_words_show(ecbdata
->diff_words
);
2077 if (wo
->emitted_symbols
) {
2078 struct diff_options
*o
= ecbdata
->opt
;
2079 struct emitted_diff_symbols
*wol
= wo
->emitted_symbols
;
2084 * Instead of appending each, concat all words to a line?
2086 for (i
= 0; i
< wol
->nr
; i
++)
2087 append_emitted_diff_symbol(o
, &wol
->buf
[i
]);
2089 for (i
= 0; i
< wol
->nr
; i
++)
2090 free((void *)wol
->buf
[i
].line
);
2096 static void diff_filespec_load_driver(struct diff_filespec
*one
)
2098 /* Use already-loaded driver */
2102 if (S_ISREG(one
->mode
))
2103 one
->driver
= userdiff_find_by_path(one
->path
);
2105 /* Fallback to default settings */
2107 one
->driver
= userdiff_find_by_name("default");
2110 static const char *userdiff_word_regex(struct diff_filespec
*one
)
2112 diff_filespec_load_driver(one
);
2113 return one
->driver
->word_regex
;
2116 static void init_diff_words_data(struct emit_callback
*ecbdata
,
2117 struct diff_options
*orig_opts
,
2118 struct diff_filespec
*one
,
2119 struct diff_filespec
*two
)
2122 struct diff_options
*o
= xmalloc(sizeof(struct diff_options
));
2123 memcpy(o
, orig_opts
, sizeof(struct diff_options
));
2125 ecbdata
->diff_words
=
2126 xcalloc(1, sizeof(struct diff_words_data
));
2127 ecbdata
->diff_words
->type
= o
->word_diff
;
2128 ecbdata
->diff_words
->opt
= o
;
2130 if (orig_opts
->emitted_symbols
)
2131 o
->emitted_symbols
=
2132 xcalloc(1, sizeof(struct emitted_diff_symbols
));
2135 o
->word_regex
= userdiff_word_regex(one
);
2137 o
->word_regex
= userdiff_word_regex(two
);
2139 o
->word_regex
= diff_word_regex_cfg
;
2140 if (o
->word_regex
) {
2141 ecbdata
->diff_words
->word_regex
= (regex_t
*)
2142 xmalloc(sizeof(regex_t
));
2143 if (regcomp(ecbdata
->diff_words
->word_regex
,
2145 REG_EXTENDED
| REG_NEWLINE
))
2146 die("invalid regular expression: %s",
2149 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
2150 if (o
->word_diff
== diff_words_styles
[i
].type
) {
2151 ecbdata
->diff_words
->style
=
2152 &diff_words_styles
[i
];
2156 if (want_color(o
->use_color
)) {
2157 struct diff_words_style
*st
= ecbdata
->diff_words
->style
;
2158 st
->old_word
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2159 st
->new_word
.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2160 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_CONTEXT
);
2164 static void free_diff_words_data(struct emit_callback
*ecbdata
)
2166 if (ecbdata
->diff_words
) {
2167 diff_words_flush(ecbdata
);
2168 free (ecbdata
->diff_words
->opt
->emitted_symbols
);
2169 free (ecbdata
->diff_words
->opt
);
2170 free (ecbdata
->diff_words
->minus
.text
.ptr
);
2171 free (ecbdata
->diff_words
->minus
.orig
);
2172 free (ecbdata
->diff_words
->plus
.text
.ptr
);
2173 free (ecbdata
->diff_words
->plus
.orig
);
2174 if (ecbdata
->diff_words
->word_regex
) {
2175 regfree(ecbdata
->diff_words
->word_regex
);
2176 free(ecbdata
->diff_words
->word_regex
);
2178 FREE_AND_NULL(ecbdata
->diff_words
);
2182 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
2184 if (want_color(diff_use_color
))
2185 return diff_colors
[ix
];
2189 const char *diff_line_prefix(struct diff_options
*opt
)
2191 struct strbuf
*msgbuf
;
2192 if (!opt
->output_prefix
)
2195 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
2199 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
2202 unsigned long allot
;
2208 (void) utf8_width(&cp
, &l
);
2210 break; /* truncated in the middle? */
2215 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
2218 ecbdata
->lno_in_preimage
= 0;
2219 ecbdata
->lno_in_postimage
= 0;
2220 p
= strchr(line
, '-');
2222 return; /* cannot happen */
2223 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
2226 return; /* cannot happen */
2227 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
2230 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
2232 struct emit_callback
*ecbdata
= priv
;
2233 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
2234 struct diff_options
*o
= ecbdata
->opt
;
2236 o
->found_changes
= 1;
2238 if (ecbdata
->header
) {
2239 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
2240 ecbdata
->header
->buf
, ecbdata
->header
->len
, 0);
2241 strbuf_reset(ecbdata
->header
);
2242 ecbdata
->header
= NULL
;
2245 if (ecbdata
->label_path
[0]) {
2246 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_MINUS
,
2247 ecbdata
->label_path
[0],
2248 strlen(ecbdata
->label_path
[0]), 0);
2249 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_PLUS
,
2250 ecbdata
->label_path
[1],
2251 strlen(ecbdata
->label_path
[1]), 0);
2252 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
2255 if (diff_suppress_blank_empty
2256 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
2261 if (line
[0] == '@') {
2262 if (ecbdata
->diff_words
)
2263 diff_words_flush(ecbdata
);
2264 len
= sane_truncate_line(ecbdata
, line
, len
);
2265 find_lno(line
, ecbdata
);
2266 emit_hunk_header(ecbdata
, line
, len
);
2270 if (ecbdata
->diff_words
) {
2271 enum diff_symbol s
=
2272 ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
?
2273 DIFF_SYMBOL_WORDS_PORCELAIN
: DIFF_SYMBOL_WORDS
;
2274 if (line
[0] == '-') {
2275 diff_words_append(line
, len
,
2276 &ecbdata
->diff_words
->minus
);
2278 } else if (line
[0] == '+') {
2279 diff_words_append(line
, len
,
2280 &ecbdata
->diff_words
->plus
);
2282 } else if (starts_with(line
, "\\ ")) {
2284 * Eat the "no newline at eof" marker as if we
2285 * saw a "+" or "-" line with nothing on it,
2286 * and return without diff_words_flush() to
2287 * defer processing. If this is the end of
2288 * preimage, more "+" lines may come after it.
2292 diff_words_flush(ecbdata
);
2293 emit_diff_symbol(o
, s
, line
, len
, 0);
2299 ecbdata
->lno_in_postimage
++;
2300 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
2303 ecbdata
->lno_in_preimage
++;
2304 emit_del_line(reset
, ecbdata
, line
+ 1, len
- 1);
2307 ecbdata
->lno_in_postimage
++;
2308 ecbdata
->lno_in_preimage
++;
2309 emit_context_line(reset
, ecbdata
, line
+ 1, len
- 1);
2312 /* incomplete line at the end */
2313 ecbdata
->lno_in_preimage
++;
2314 emit_diff_symbol(o
, DIFF_SYMBOL_CONTEXT_INCOMPLETE
,
2320 static void pprint_rename(struct strbuf
*name
, const char *a
, const char *b
)
2322 const char *old_name
= a
;
2323 const char *new_name
= b
;
2324 int pfx_length
, sfx_length
;
2325 int pfx_adjust_for_slash
;
2326 int len_a
= strlen(a
);
2327 int len_b
= strlen(b
);
2328 int a_midlen
, b_midlen
;
2329 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
2330 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
2332 if (qlen_a
|| qlen_b
) {
2333 quote_c_style(a
, name
, NULL
, 0);
2334 strbuf_addstr(name
, " => ");
2335 quote_c_style(b
, name
, NULL
, 0);
2339 /* Find common prefix */
2341 while (*old_name
&& *new_name
&& *old_name
== *new_name
) {
2342 if (*old_name
== '/')
2343 pfx_length
= old_name
- a
+ 1;
2348 /* Find common suffix */
2349 old_name
= a
+ len_a
;
2350 new_name
= b
+ len_b
;
2353 * If there is a common prefix, it must end in a slash. In
2354 * that case we let this loop run 1 into the prefix to see the
2357 * If there is no common prefix, we cannot do this as it would
2358 * underrun the input strings.
2360 pfx_adjust_for_slash
= (pfx_length
? 1 : 0);
2361 while (a
+ pfx_length
- pfx_adjust_for_slash
<= old_name
&&
2362 b
+ pfx_length
- pfx_adjust_for_slash
<= new_name
&&
2363 *old_name
== *new_name
) {
2364 if (*old_name
== '/')
2365 sfx_length
= len_a
- (old_name
- a
);
2371 * pfx{mid-a => mid-b}sfx
2372 * {pfx-a => pfx-b}sfx
2373 * pfx{sfx-a => sfx-b}
2376 a_midlen
= len_a
- pfx_length
- sfx_length
;
2377 b_midlen
= len_b
- pfx_length
- sfx_length
;
2383 strbuf_grow(name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
2384 if (pfx_length
+ sfx_length
) {
2385 strbuf_add(name
, a
, pfx_length
);
2386 strbuf_addch(name
, '{');
2388 strbuf_add(name
, a
+ pfx_length
, a_midlen
);
2389 strbuf_addstr(name
, " => ");
2390 strbuf_add(name
, b
+ pfx_length
, b_midlen
);
2391 if (pfx_length
+ sfx_length
) {
2392 strbuf_addch(name
, '}');
2393 strbuf_add(name
, a
+ len_a
- sfx_length
, sfx_length
);
2400 struct diffstat_file
{
2404 const char *comments
;
2405 unsigned is_unmerged
:1;
2406 unsigned is_binary
:1;
2407 unsigned is_renamed
:1;
2408 unsigned is_interesting
:1;
2409 uintmax_t added
, deleted
;
2413 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
2417 struct diffstat_file
*x
;
2418 x
= xcalloc(1, sizeof(*x
));
2419 ALLOC_GROW(diffstat
->files
, diffstat
->nr
+ 1, diffstat
->alloc
);
2420 diffstat
->files
[diffstat
->nr
++] = x
;
2422 x
->from_name
= xstrdup(name_a
);
2423 x
->name
= xstrdup(name_b
);
2427 x
->from_name
= NULL
;
2428 x
->name
= xstrdup(name_a
);
2433 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
2435 struct diffstat_t
*diffstat
= priv
;
2436 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
2440 else if (line
[0] == '-')
2444 const char mime_boundary_leader
[] = "------------";
2446 static int scale_linear(int it
, int width
, int max_change
)
2451 * make sure that at least one '-' or '+' is printed if
2452 * there is any change to this path. The easiest way is to
2453 * scale linearly as if the alloted width is one column shorter
2454 * than it is, and then add 1 to the result.
2456 return 1 + (it
* (width
- 1) / max_change
);
2459 static void show_graph(struct strbuf
*out
, char ch
, int cnt
,
2460 const char *set
, const char *reset
)
2464 strbuf_addstr(out
, set
);
2465 strbuf_addchars(out
, ch
, cnt
);
2466 strbuf_addstr(out
, reset
);
2469 static void fill_print_name(struct diffstat_file
*file
)
2471 struct strbuf pname
= STRBUF_INIT
;
2473 if (file
->print_name
)
2476 if (file
->is_renamed
)
2477 pprint_rename(&pname
, file
->from_name
, file
->name
);
2479 quote_c_style(file
->name
, &pname
, NULL
, 0);
2482 strbuf_addf(&pname
, " (%s)", file
->comments
);
2484 file
->print_name
= strbuf_detach(&pname
, NULL
);
2487 static void print_stat_summary_inserts_deletes(struct diff_options
*options
,
2488 int files
, int insertions
, int deletions
)
2490 struct strbuf sb
= STRBUF_INIT
;
2493 assert(insertions
== 0 && deletions
== 0);
2494 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
,
2500 (files
== 1) ? " %d file changed" : " %d files changed",
2504 * For binary diff, the caller may want to print "x files
2505 * changed" with insertions == 0 && deletions == 0.
2507 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
2508 * is probably less confusing (i.e skip over "2 files changed
2509 * but nothing about added/removed lines? Is this a bug in Git?").
2511 if (insertions
|| deletions
== 0) {
2513 (insertions
== 1) ? ", %d insertion(+)" : ", %d insertions(+)",
2517 if (deletions
|| insertions
== 0) {
2519 (deletions
== 1) ? ", %d deletion(-)" : ", %d deletions(-)",
2522 strbuf_addch(&sb
, '\n');
2523 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
,
2525 strbuf_release(&sb
);
2528 void print_stat_summary(FILE *fp
, int files
,
2529 int insertions
, int deletions
)
2531 struct diff_options o
;
2532 memset(&o
, 0, sizeof(o
));
2535 print_stat_summary_inserts_deletes(&o
, files
, insertions
, deletions
);
2538 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
2540 int i
, len
, add
, del
, adds
= 0, dels
= 0;
2541 uintmax_t max_change
= 0, max_len
= 0;
2542 int total_files
= data
->nr
, count
;
2543 int width
, name_width
, graph_width
, number_width
= 0, bin_width
= 0;
2544 const char *reset
, *add_c
, *del_c
;
2545 int extra_shown
= 0;
2546 const char *line_prefix
= diff_line_prefix(options
);
2547 struct strbuf out
= STRBUF_INIT
;
2552 count
= options
->stat_count
? options
->stat_count
: data
->nr
;
2554 reset
= diff_get_color_opt(options
, DIFF_RESET
);
2555 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
2556 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
2559 * Find the longest filename and max number of changes
2561 for (i
= 0; (i
< count
) && (i
< data
->nr
); i
++) {
2562 struct diffstat_file
*file
= data
->files
[i
];
2563 uintmax_t change
= file
->added
+ file
->deleted
;
2565 if (!file
->is_interesting
&& (change
== 0)) {
2566 count
++; /* not shown == room for one more */
2569 fill_print_name(file
);
2570 len
= strlen(file
->print_name
);
2574 if (file
->is_unmerged
) {
2575 /* "Unmerged" is 8 characters */
2576 bin_width
= bin_width
< 8 ? 8 : bin_width
;
2579 if (file
->is_binary
) {
2580 /* "Bin XXX -> YYY bytes" */
2581 int w
= 14 + decimal_width(file
->added
)
2582 + decimal_width(file
->deleted
);
2583 bin_width
= bin_width
< w
? w
: bin_width
;
2584 /* Display change counts aligned with "Bin" */
2589 if (max_change
< change
)
2590 max_change
= change
;
2592 count
= i
; /* where we can stop scanning in data->files[] */
2595 * We have width = stat_width or term_columns() columns total.
2596 * We want a maximum of min(max_len, stat_name_width) for the name part.
2597 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
2598 * We also need 1 for " " and 4 + decimal_width(max_change)
2599 * for " | NNNN " and one the empty column at the end, altogether
2600 * 6 + decimal_width(max_change).
2602 * If there's not enough space, we will use the smaller of
2603 * stat_name_width (if set) and 5/8*width for the filename,
2604 * and the rest for constant elements + graph part, but no more
2605 * than stat_graph_width for the graph part.
2606 * (5/8 gives 50 for filename and 30 for the constant parts + graph
2607 * for the standard terminal size).
2609 * In other words: stat_width limits the maximum width, and
2610 * stat_name_width fixes the maximum width of the filename,
2611 * and is also used to divide available columns if there
2614 * Binary files are displayed with "Bin XXX -> YYY bytes"
2615 * instead of the change count and graph. This part is treated
2616 * similarly to the graph part, except that it is not
2617 * "scaled". If total width is too small to accommodate the
2618 * guaranteed minimum width of the filename part and the
2619 * separators and this message, this message will "overflow"
2620 * making the line longer than the maximum width.
2623 if (options
->stat_width
== -1)
2624 width
= term_columns() - strlen(line_prefix
);
2626 width
= options
->stat_width
? options
->stat_width
: 80;
2627 number_width
= decimal_width(max_change
) > number_width
?
2628 decimal_width(max_change
) : number_width
;
2630 if (options
->stat_graph_width
== -1)
2631 options
->stat_graph_width
= diff_stat_graph_width
;
2634 * Guarantee 3/8*16==6 for the graph part
2635 * and 5/8*16==10 for the filename part
2637 if (width
< 16 + 6 + number_width
)
2638 width
= 16 + 6 + number_width
;
2641 * First assign sizes that are wanted, ignoring available width.
2642 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
2643 * starting from "XXX" should fit in graph_width.
2645 graph_width
= max_change
+ 4 > bin_width
? max_change
: bin_width
- 4;
2646 if (options
->stat_graph_width
&&
2647 options
->stat_graph_width
< graph_width
)
2648 graph_width
= options
->stat_graph_width
;
2650 name_width
= (options
->stat_name_width
> 0 &&
2651 options
->stat_name_width
< max_len
) ?
2652 options
->stat_name_width
: max_len
;
2655 * Adjust adjustable widths not to exceed maximum width
2657 if (name_width
+ number_width
+ 6 + graph_width
> width
) {
2658 if (graph_width
> width
* 3/8 - number_width
- 6) {
2659 graph_width
= width
* 3/8 - number_width
- 6;
2660 if (graph_width
< 6)
2664 if (options
->stat_graph_width
&&
2665 graph_width
> options
->stat_graph_width
)
2666 graph_width
= options
->stat_graph_width
;
2667 if (name_width
> width
- number_width
- 6 - graph_width
)
2668 name_width
= width
- number_width
- 6 - graph_width
;
2670 graph_width
= width
- number_width
- 6 - name_width
;
2674 * From here name_width is the width of the name area,
2675 * and graph_width is the width of the graph area.
2676 * max_change is used to scale graph properly.
2678 for (i
= 0; i
< count
; i
++) {
2679 const char *prefix
= "";
2680 struct diffstat_file
*file
= data
->files
[i
];
2681 char *name
= file
->print_name
;
2682 uintmax_t added
= file
->added
;
2683 uintmax_t deleted
= file
->deleted
;
2686 if (!file
->is_interesting
&& (added
+ deleted
== 0))
2690 * "scale" the filename
2693 name_len
= strlen(name
);
2694 if (name_width
< name_len
) {
2698 name
+= name_len
- len
;
2699 slash
= strchr(name
, '/');
2704 if (file
->is_binary
) {
2705 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2706 strbuf_addf(&out
, " %*s", number_width
, "Bin");
2707 if (!added
&& !deleted
) {
2708 strbuf_addch(&out
, '\n');
2709 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2710 out
.buf
, out
.len
, 0);
2714 strbuf_addf(&out
, " %s%"PRIuMAX
"%s",
2715 del_c
, deleted
, reset
);
2716 strbuf_addstr(&out
, " -> ");
2717 strbuf_addf(&out
, "%s%"PRIuMAX
"%s",
2718 add_c
, added
, reset
);
2719 strbuf_addstr(&out
, " bytes\n");
2720 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2721 out
.buf
, out
.len
, 0);
2725 else if (file
->is_unmerged
) {
2726 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2727 strbuf_addstr(&out
, " Unmerged\n");
2728 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2729 out
.buf
, out
.len
, 0);
2735 * scale the add/delete
2740 if (graph_width
<= max_change
) {
2741 int total
= scale_linear(add
+ del
, graph_width
, max_change
);
2742 if (total
< 2 && add
&& del
)
2743 /* width >= 2 due to the sanity check */
2746 add
= scale_linear(add
, graph_width
, max_change
);
2749 del
= scale_linear(del
, graph_width
, max_change
);
2753 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2754 strbuf_addf(&out
, " %*"PRIuMAX
"%s",
2755 number_width
, added
+ deleted
,
2756 added
+ deleted
? " " : "");
2757 show_graph(&out
, '+', add
, add_c
, reset
);
2758 show_graph(&out
, '-', del
, del_c
, reset
);
2759 strbuf_addch(&out
, '\n');
2760 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2761 out
.buf
, out
.len
, 0);
2765 for (i
= 0; i
< data
->nr
; i
++) {
2766 struct diffstat_file
*file
= data
->files
[i
];
2767 uintmax_t added
= file
->added
;
2768 uintmax_t deleted
= file
->deleted
;
2770 if (file
->is_unmerged
||
2771 (!file
->is_interesting
&& (added
+ deleted
== 0))) {
2776 if (!file
->is_binary
) {
2783 emit_diff_symbol(options
,
2784 DIFF_SYMBOL_STATS_SUMMARY_ABBREV
,
2789 print_stat_summary_inserts_deletes(options
, total_files
, adds
, dels
);
2790 strbuf_release(&out
);
2793 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
2795 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
2800 for (i
= 0; i
< data
->nr
; i
++) {
2801 int added
= data
->files
[i
]->added
;
2802 int deleted
= data
->files
[i
]->deleted
;
2804 if (data
->files
[i
]->is_unmerged
||
2805 (!data
->files
[i
]->is_interesting
&& (added
+ deleted
== 0))) {
2807 } else if (!data
->files
[i
]->is_binary
) { /* don't count bytes */
2812 print_stat_summary_inserts_deletes(options
, total_files
, adds
, dels
);
2815 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
2822 for (i
= 0; i
< data
->nr
; i
++) {
2823 struct diffstat_file
*file
= data
->files
[i
];
2825 fprintf(options
->file
, "%s", diff_line_prefix(options
));
2827 if (file
->is_binary
)
2828 fprintf(options
->file
, "-\t-\t");
2830 fprintf(options
->file
,
2831 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
2832 file
->added
, file
->deleted
);
2833 if (options
->line_termination
) {
2834 fill_print_name(file
);
2835 if (!file
->is_renamed
)
2836 write_name_quoted(file
->name
, options
->file
,
2837 options
->line_termination
);
2839 fputs(file
->print_name
, options
->file
);
2840 putc(options
->line_termination
, options
->file
);
2843 if (file
->is_renamed
) {
2844 putc('\0', options
->file
);
2845 write_name_quoted(file
->from_name
, options
->file
, '\0');
2847 write_name_quoted(file
->name
, options
->file
, '\0');
2852 struct dirstat_file
{
2854 unsigned long changed
;
2857 struct dirstat_dir
{
2858 struct dirstat_file
*files
;
2859 int alloc
, nr
, permille
, cumulative
;
2862 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
2863 unsigned long changed
, const char *base
, int baselen
)
2865 unsigned long sum_changes
= 0;
2866 unsigned int sources
= 0;
2867 const char *line_prefix
= diff_line_prefix(opt
);
2870 struct dirstat_file
*f
= dir
->files
;
2871 int namelen
= strlen(f
->name
);
2872 unsigned long changes
;
2875 if (namelen
< baselen
)
2877 if (memcmp(f
->name
, base
, baselen
))
2879 slash
= strchr(f
->name
+ baselen
, '/');
2881 int newbaselen
= slash
+ 1 - f
->name
;
2882 changes
= gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
2885 changes
= f
->changed
;
2890 sum_changes
+= changes
;
2894 * We don't report dirstat's for
2896 * - or cases where everything came from a single directory
2897 * under this directory (sources == 1).
2899 if (baselen
&& sources
!= 1) {
2901 int permille
= sum_changes
* 1000 / changed
;
2902 if (permille
>= dir
->permille
) {
2903 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
2904 permille
/ 10, permille
% 10, baselen
, base
);
2905 if (!dir
->cumulative
)
2913 static int dirstat_compare(const void *_a
, const void *_b
)
2915 const struct dirstat_file
*a
= _a
;
2916 const struct dirstat_file
*b
= _b
;
2917 return strcmp(a
->name
, b
->name
);
2920 static void show_dirstat(struct diff_options
*options
)
2923 unsigned long changed
;
2924 struct dirstat_dir dir
;
2925 struct diff_queue_struct
*q
= &diff_queued_diff
;
2930 dir
.permille
= options
->dirstat_permille
;
2931 dir
.cumulative
= options
->flags
.dirstat_cumulative
;
2934 for (i
= 0; i
< q
->nr
; i
++) {
2935 struct diff_filepair
*p
= q
->queue
[i
];
2937 unsigned long copied
, added
, damage
;
2938 int content_changed
;
2940 name
= p
->two
->path
? p
->two
->path
: p
->one
->path
;
2942 if (p
->one
->oid_valid
&& p
->two
->oid_valid
)
2943 content_changed
= oidcmp(&p
->one
->oid
, &p
->two
->oid
);
2945 content_changed
= 1;
2947 if (!content_changed
) {
2949 * The SHA1 has not changed, so pre-/post-content is
2950 * identical. We can therefore skip looking at the
2951 * file contents altogether.
2957 if (options
->flags
.dirstat_by_file
) {
2959 * In --dirstat-by-file mode, we don't really need to
2960 * look at the actual file contents at all.
2961 * The fact that the SHA1 changed is enough for us to
2962 * add this file to the list of results
2963 * (with each file contributing equal damage).
2969 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
2970 diff_populate_filespec(options
->repo
, p
->one
, 0);
2971 diff_populate_filespec(options
->repo
, p
->two
, 0);
2972 diffcore_count_changes(options
->repo
,
2973 p
->one
, p
->two
, NULL
, NULL
,
2975 diff_free_filespec_data(p
->one
);
2976 diff_free_filespec_data(p
->two
);
2977 } else if (DIFF_FILE_VALID(p
->one
)) {
2978 diff_populate_filespec(options
->repo
, p
->one
, CHECK_SIZE_ONLY
);
2980 diff_free_filespec_data(p
->one
);
2981 } else if (DIFF_FILE_VALID(p
->two
)) {
2982 diff_populate_filespec(options
->repo
, p
->two
, CHECK_SIZE_ONLY
);
2984 added
= p
->two
->size
;
2985 diff_free_filespec_data(p
->two
);
2990 * Original minus copied is the removed material,
2991 * added is the new material. They are both damages
2992 * made to the preimage.
2993 * If the resulting damage is zero, we know that
2994 * diffcore_count_changes() considers the two entries to
2995 * be identical, but since content_changed is true, we
2996 * know that there must have been _some_ kind of change,
2997 * so we force all entries to have damage > 0.
2999 damage
= (p
->one
->size
- copied
) + added
;
3004 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
3005 dir
.files
[dir
.nr
].name
= name
;
3006 dir
.files
[dir
.nr
].changed
= damage
;
3011 /* This can happen even with many files, if everything was renames */
3015 /* Show all directories with more than x% of the changes */
3016 QSORT(dir
.files
, dir
.nr
, dirstat_compare
);
3017 gather_dirstat(options
, &dir
, changed
, "", 0);
3020 static void show_dirstat_by_line(struct diffstat_t
*data
, struct diff_options
*options
)
3023 unsigned long changed
;
3024 struct dirstat_dir dir
;
3032 dir
.permille
= options
->dirstat_permille
;
3033 dir
.cumulative
= options
->flags
.dirstat_cumulative
;
3036 for (i
= 0; i
< data
->nr
; i
++) {
3037 struct diffstat_file
*file
= data
->files
[i
];
3038 unsigned long damage
= file
->added
+ file
->deleted
;
3039 if (file
->is_binary
)
3041 * binary files counts bytes, not lines. Must find some
3042 * way to normalize binary bytes vs. textual lines.
3043 * The following heuristic assumes that there are 64
3045 * This is stupid and ugly, but very cheap...
3047 damage
= DIV_ROUND_UP(damage
, 64);
3048 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
3049 dir
.files
[dir
.nr
].name
= file
->name
;
3050 dir
.files
[dir
.nr
].changed
= damage
;
3055 /* This can happen even with many files, if everything was renames */
3059 /* Show all directories with more than x% of the changes */
3060 QSORT(dir
.files
, dir
.nr
, dirstat_compare
);
3061 gather_dirstat(options
, &dir
, changed
, "", 0);
3064 static void free_diffstat_info(struct diffstat_t
*diffstat
)
3067 for (i
= 0; i
< diffstat
->nr
; i
++) {
3068 struct diffstat_file
*f
= diffstat
->files
[i
];
3069 free(f
->print_name
);
3074 free(diffstat
->files
);
3077 struct checkdiff_t
{
3078 const char *filename
;
3080 int conflict_marker_size
;
3081 struct diff_options
*o
;
3086 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
3091 if (len
< marker_size
+ 1)
3093 firstchar
= line
[0];
3094 switch (firstchar
) {
3095 case '=': case '>': case '<': case '|':
3100 for (cnt
= 1; cnt
< marker_size
; cnt
++)
3101 if (line
[cnt
] != firstchar
)
3103 /* line[1] thru line[marker_size-1] are same as firstchar */
3104 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
3109 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
3111 struct checkdiff_t
*data
= priv
;
3112 int marker_size
= data
->conflict_marker_size
;
3113 const char *ws
= diff_get_color(data
->o
->use_color
, DIFF_WHITESPACE
);
3114 const char *reset
= diff_get_color(data
->o
->use_color
, DIFF_RESET
);
3115 const char *set
= diff_get_color(data
->o
->use_color
, DIFF_FILE_NEW
);
3117 const char *line_prefix
;
3120 line_prefix
= diff_line_prefix(data
->o
);
3122 if (line
[0] == '+') {
3125 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
3127 fprintf(data
->o
->file
,
3128 "%s%s:%d: leftover conflict marker\n",
3129 line_prefix
, data
->filename
, data
->lineno
);
3131 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
3134 data
->status
|= bad
;
3135 err
= whitespace_error_string(bad
);
3136 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
3137 line_prefix
, data
->filename
, data
->lineno
, err
);
3139 emit_line(data
->o
, set
, reset
, line
, 1);
3140 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
3141 data
->o
->file
, set
, reset
, ws
);
3142 } else if (line
[0] == ' ') {
3144 } else if (line
[0] == '@') {
3145 char *plus
= strchr(line
, '+');
3147 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
3149 die("invalid diff");
3153 static unsigned char *deflate_it(char *data
,
3155 unsigned long *result_size
)
3158 unsigned char *deflated
;
3161 git_deflate_init(&stream
, zlib_compression_level
);
3162 bound
= git_deflate_bound(&stream
, size
);
3163 deflated
= xmalloc(bound
);
3164 stream
.next_out
= deflated
;
3165 stream
.avail_out
= bound
;
3167 stream
.next_in
= (unsigned char *)data
;
3168 stream
.avail_in
= size
;
3169 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
3171 git_deflate_end(&stream
);
3172 *result_size
= stream
.total_out
;
3176 static void emit_binary_diff_body(struct diff_options
*o
,
3177 mmfile_t
*one
, mmfile_t
*two
)
3183 unsigned long orig_size
;
3184 unsigned long delta_size
;
3185 unsigned long deflate_size
;
3186 unsigned long data_size
;
3188 /* We could do deflated delta, or we could do just deflated two,
3189 * whichever is smaller.
3192 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
3193 if (one
->size
&& two
->size
) {
3194 delta
= diff_delta(one
->ptr
, one
->size
,
3195 two
->ptr
, two
->size
,
3196 &delta_size
, deflate_size
);
3198 void *to_free
= delta
;
3199 orig_size
= delta_size
;
3200 delta
= deflate_it(delta
, delta_size
, &delta_size
);
3205 if (delta
&& delta_size
< deflate_size
) {
3206 char *s
= xstrfmt("%lu", orig_size
);
3207 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
,
3212 data_size
= delta_size
;
3214 char *s
= xstrfmt("%lu", two
->size
);
3215 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
,
3220 data_size
= deflate_size
;
3223 /* emit data encoded in base85 */
3227 int bytes
= (52 < data_size
) ? 52 : data_size
;
3231 line
[0] = bytes
+ 'A' - 1;
3233 line
[0] = bytes
- 26 + 'a' - 1;
3234 encode_85(line
+ 1, cp
, bytes
);
3235 cp
= (char *) cp
+ bytes
;
3241 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_BODY
,
3244 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_FOOTER
, NULL
, 0, 0);
3248 static void emit_binary_diff(struct diff_options
*o
,
3249 mmfile_t
*one
, mmfile_t
*two
)
3251 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER
, NULL
, 0, 0);
3252 emit_binary_diff_body(o
, one
, two
);
3253 emit_binary_diff_body(o
, two
, one
);
3256 int diff_filespec_is_binary(struct repository
*r
,
3257 struct diff_filespec
*one
)
3259 if (one
->is_binary
== -1) {
3260 diff_filespec_load_driver(one
);
3261 if (one
->driver
->binary
!= -1)
3262 one
->is_binary
= one
->driver
->binary
;
3264 if (!one
->data
&& DIFF_FILE_VALID(one
))
3265 diff_populate_filespec(r
, one
, CHECK_BINARY
);
3266 if (one
->is_binary
== -1 && one
->data
)
3267 one
->is_binary
= buffer_is_binary(one
->data
,
3269 if (one
->is_binary
== -1)
3273 return one
->is_binary
;
3276 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
3278 diff_filespec_load_driver(one
);
3279 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
3282 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
3284 if (!options
->a_prefix
)
3285 options
->a_prefix
= a
;
3286 if (!options
->b_prefix
)
3287 options
->b_prefix
= b
;
3290 struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
3292 if (!DIFF_FILE_VALID(one
))
3295 diff_filespec_load_driver(one
);
3296 return userdiff_get_textconv(one
->driver
);
3299 static void builtin_diff(const char *name_a
,
3301 struct diff_filespec
*one
,
3302 struct diff_filespec
*two
,
3303 const char *xfrm_msg
,
3304 int must_show_header
,
3305 struct diff_options
*o
,
3306 int complete_rewrite
)
3310 char *a_one
, *b_two
;
3311 const char *meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
3312 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
3313 const char *a_prefix
, *b_prefix
;
3314 struct userdiff_driver
*textconv_one
= NULL
;
3315 struct userdiff_driver
*textconv_two
= NULL
;
3316 struct strbuf header
= STRBUF_INIT
;
3317 const char *line_prefix
= diff_line_prefix(o
);
3319 diff_set_mnemonic_prefix(o
, "a/", "b/");
3320 if (o
->flags
.reverse_diff
) {
3321 a_prefix
= o
->b_prefix
;
3322 b_prefix
= o
->a_prefix
;
3324 a_prefix
= o
->a_prefix
;
3325 b_prefix
= o
->b_prefix
;
3328 if (o
->submodule_format
== DIFF_SUBMODULE_LOG
&&
3329 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
3330 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
3331 show_submodule_summary(o
, one
->path
? one
->path
: two
->path
,
3332 &one
->oid
, &two
->oid
,
3333 two
->dirty_submodule
);
3335 } else if (o
->submodule_format
== DIFF_SUBMODULE_INLINE_DIFF
&&
3336 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
3337 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
3338 show_submodule_inline_diff(o
, one
->path
? one
->path
: two
->path
,
3339 &one
->oid
, &two
->oid
,
3340 two
->dirty_submodule
);
3344 if (o
->flags
.allow_textconv
) {
3345 textconv_one
= get_textconv(one
);
3346 textconv_two
= get_textconv(two
);
3349 /* Never use a non-valid filename anywhere if at all possible */
3350 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
3351 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
3353 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
3354 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
3355 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
3356 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
3357 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, meta
, a_one
, b_two
, reset
);
3358 if (lbl
[0][0] == '/') {
3360 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
3362 strbuf_addstr(&header
, xfrm_msg
);
3363 must_show_header
= 1;
3365 else if (lbl
[1][0] == '/') {
3366 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
3368 strbuf_addstr(&header
, xfrm_msg
);
3369 must_show_header
= 1;
3372 if (one
->mode
!= two
->mode
) {
3373 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
3374 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
3375 must_show_header
= 1;
3378 strbuf_addstr(&header
, xfrm_msg
);
3381 * we do not run diff between different kind
3384 if ((one
->mode
^ two
->mode
) & S_IFMT
)
3385 goto free_ab_and_return
;
3386 if (complete_rewrite
&&
3387 (textconv_one
|| !diff_filespec_is_binary(o
->repo
, one
)) &&
3388 (textconv_two
|| !diff_filespec_is_binary(o
->repo
, two
))) {
3389 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3390 header
.buf
, header
.len
, 0);
3391 strbuf_reset(&header
);
3392 emit_rewrite_diff(name_a
, name_b
, one
, two
,
3393 textconv_one
, textconv_two
, o
);
3394 o
->found_changes
= 1;
3395 goto free_ab_and_return
;
3399 if (o
->irreversible_delete
&& lbl
[1][0] == '/') {
3400 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
, header
.buf
,
3402 strbuf_reset(&header
);
3403 goto free_ab_and_return
;
3404 } else if (!o
->flags
.text
&&
3405 ( (!textconv_one
&& diff_filespec_is_binary(o
->repo
, one
)) ||
3406 (!textconv_two
&& diff_filespec_is_binary(o
->repo
, two
)) )) {
3407 struct strbuf sb
= STRBUF_INIT
;
3408 if (!one
->data
&& !two
->data
&&
3409 S_ISREG(one
->mode
) && S_ISREG(two
->mode
) &&
3411 if (!oidcmp(&one
->oid
, &two
->oid
)) {
3412 if (must_show_header
)
3413 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3414 header
.buf
, header
.len
,
3416 goto free_ab_and_return
;
3418 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3419 header
.buf
, header
.len
, 0);
3420 strbuf_addf(&sb
, "%sBinary files %s and %s differ\n",
3421 diff_line_prefix(o
), lbl
[0], lbl
[1]);
3422 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_FILES
,
3424 strbuf_release(&sb
);
3425 goto free_ab_and_return
;
3427 if (fill_mmfile(o
->repo
, &mf1
, one
) < 0 ||
3428 fill_mmfile(o
->repo
, &mf2
, two
) < 0)
3429 die("unable to read files to diff");
3430 /* Quite common confusing case */
3431 if (mf1
.size
== mf2
.size
&&
3432 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
3433 if (must_show_header
)
3434 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3435 header
.buf
, header
.len
, 0);
3436 goto free_ab_and_return
;
3438 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
, header
.buf
, header
.len
, 0);
3439 strbuf_reset(&header
);
3440 if (o
->flags
.binary
)
3441 emit_binary_diff(o
, &mf1
, &mf2
);
3443 strbuf_addf(&sb
, "%sBinary files %s and %s differ\n",
3444 diff_line_prefix(o
), lbl
[0], lbl
[1]);
3445 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_FILES
,
3447 strbuf_release(&sb
);
3449 o
->found_changes
= 1;
3451 /* Crazy xdl interfaces.. */
3452 const char *diffopts
= getenv("GIT_DIFF_OPTS");
3456 struct emit_callback ecbdata
;
3457 const struct userdiff_funcname
*pe
;
3459 if (must_show_header
) {
3460 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3461 header
.buf
, header
.len
, 0);
3462 strbuf_reset(&header
);
3465 mf1
.size
= fill_textconv(o
->repo
, textconv_one
, one
, &mf1
.ptr
);
3466 mf2
.size
= fill_textconv(o
->repo
, textconv_two
, two
, &mf2
.ptr
);
3468 pe
= diff_funcname_pattern(one
);
3470 pe
= diff_funcname_pattern(two
);
3472 memset(&xpp
, 0, sizeof(xpp
));
3473 memset(&xecfg
, 0, sizeof(xecfg
));
3474 memset(&ecbdata
, 0, sizeof(ecbdata
));
3475 if (o
->flags
.suppress_diff_headers
)
3477 ecbdata
.label_path
= lbl
;
3478 ecbdata
.color_diff
= want_color(o
->use_color
);
3479 ecbdata
.ws_rule
= whitespace_rule(name_b
);
3480 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
3481 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
3483 if (header
.len
&& !o
->flags
.suppress_diff_headers
)
3484 ecbdata
.header
= &header
;
3485 xpp
.flags
= o
->xdl_opts
;
3486 xpp
.anchors
= o
->anchors
;
3487 xpp
.anchors_nr
= o
->anchors_nr
;
3488 xecfg
.ctxlen
= o
->context
;
3489 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
3490 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3491 if (o
->flags
.funccontext
)
3492 xecfg
.flags
|= XDL_EMIT_FUNCCONTEXT
;
3494 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
3497 else if (skip_prefix(diffopts
, "--unified=", &v
))
3498 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
3499 else if (skip_prefix(diffopts
, "-u", &v
))
3500 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
3502 init_diff_words_data(&ecbdata
, o
, one
, two
);
3503 if (xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
3505 die("unable to generate diff for %s", one
->path
);
3507 free_diff_words_data(&ecbdata
);
3512 xdiff_clear_find_func(&xecfg
);
3516 strbuf_release(&header
);
3517 diff_free_filespec_data(one
);
3518 diff_free_filespec_data(two
);
3524 static char *get_compact_summary(const struct diff_filepair
*p
, int is_renamed
)
3527 if (p
->status
== DIFF_STATUS_ADDED
) {
3528 if (S_ISLNK(p
->two
->mode
))
3530 else if ((p
->two
->mode
& 0777) == 0755)
3534 } else if (p
->status
== DIFF_STATUS_DELETED
)
3537 if (S_ISLNK(p
->one
->mode
) && !S_ISLNK(p
->two
->mode
))
3539 else if (!S_ISLNK(p
->one
->mode
) && S_ISLNK(p
->two
->mode
))
3541 else if ((p
->one
->mode
& 0777) == 0644 &&
3542 (p
->two
->mode
& 0777) == 0755)
3544 else if ((p
->one
->mode
& 0777) == 0755 &&
3545 (p
->two
->mode
& 0777) == 0644)
3550 static void builtin_diffstat(const char *name_a
, const char *name_b
,
3551 struct diff_filespec
*one
,
3552 struct diff_filespec
*two
,
3553 struct diffstat_t
*diffstat
,
3554 struct diff_options
*o
,
3555 struct diff_filepair
*p
)
3558 struct diffstat_file
*data
;
3560 int complete_rewrite
= 0;
3562 if (!DIFF_PAIR_UNMERGED(p
)) {
3563 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
3564 complete_rewrite
= 1;
3567 data
= diffstat_add(diffstat
, name_a
, name_b
);
3568 data
->is_interesting
= p
->status
!= DIFF_STATUS_UNKNOWN
;
3569 if (o
->flags
.stat_with_summary
)
3570 data
->comments
= get_compact_summary(p
, data
->is_renamed
);
3573 data
->is_unmerged
= 1;
3577 same_contents
= !oidcmp(&one
->oid
, &two
->oid
);
3579 if (diff_filespec_is_binary(o
->repo
, one
) ||
3580 diff_filespec_is_binary(o
->repo
, two
)) {
3581 data
->is_binary
= 1;
3582 if (same_contents
) {
3586 data
->added
= diff_filespec_size(o
->repo
, two
);
3587 data
->deleted
= diff_filespec_size(o
->repo
, one
);
3591 else if (complete_rewrite
) {
3592 diff_populate_filespec(o
->repo
, one
, 0);
3593 diff_populate_filespec(o
->repo
, two
, 0);
3594 data
->deleted
= count_lines(one
->data
, one
->size
);
3595 data
->added
= count_lines(two
->data
, two
->size
);
3598 else if (!same_contents
) {
3599 /* Crazy xdl interfaces.. */
3603 if (fill_mmfile(o
->repo
, &mf1
, one
) < 0 ||
3604 fill_mmfile(o
->repo
, &mf2
, two
) < 0)
3605 die("unable to read files to diff");
3607 memset(&xpp
, 0, sizeof(xpp
));
3608 memset(&xecfg
, 0, sizeof(xecfg
));
3609 xpp
.flags
= o
->xdl_opts
;
3610 xpp
.anchors
= o
->anchors
;
3611 xpp
.anchors_nr
= o
->anchors_nr
;
3612 xecfg
.ctxlen
= o
->context
;
3613 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
3614 if (xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
3616 die("unable to generate diffstat for %s", one
->path
);
3619 diff_free_filespec_data(one
);
3620 diff_free_filespec_data(two
);
3623 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
3624 const char *attr_path
,
3625 struct diff_filespec
*one
,
3626 struct diff_filespec
*two
,
3627 struct diff_options
*o
)
3630 struct checkdiff_t data
;
3635 memset(&data
, 0, sizeof(data
));
3636 data
.filename
= name_b
? name_b
: name_a
;
3639 data
.ws_rule
= whitespace_rule(attr_path
);
3640 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
3642 if (fill_mmfile(o
->repo
, &mf1
, one
) < 0 ||
3643 fill_mmfile(o
->repo
, &mf2
, two
) < 0)
3644 die("unable to read files to diff");
3647 * All the other codepaths check both sides, but not checking
3648 * the "old" side here is deliberate. We are checking the newly
3649 * introduced changes, and as long as the "new" side is text, we
3650 * can and should check what it introduces.
3652 if (diff_filespec_is_binary(o
->repo
, two
))
3653 goto free_and_return
;
3655 /* Crazy xdl interfaces.. */
3659 memset(&xpp
, 0, sizeof(xpp
));
3660 memset(&xecfg
, 0, sizeof(xecfg
));
3661 xecfg
.ctxlen
= 1; /* at least one context line */
3663 if (xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
3665 die("unable to generate checkdiff for %s", one
->path
);
3667 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
3668 struct emit_callback ecbdata
;
3671 ecbdata
.ws_rule
= data
.ws_rule
;
3672 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
3673 blank_at_eof
= ecbdata
.blank_at_eof_in_postimage
;
3678 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
3679 fprintf(o
->file
, "%s:%d: %s.\n",
3680 data
.filename
, blank_at_eof
, err
);
3681 data
.status
= 1; /* report errors */
3686 diff_free_filespec_data(one
);
3687 diff_free_filespec_data(two
);
3689 o
->flags
.check_failed
= 1;
3692 struct diff_filespec
*alloc_filespec(const char *path
)
3694 struct diff_filespec
*spec
;
3696 FLEXPTR_ALLOC_STR(spec
, path
, path
);
3698 spec
->is_binary
= -1;
3702 void free_filespec(struct diff_filespec
*spec
)
3704 if (!--spec
->count
) {
3705 diff_free_filespec_data(spec
);
3710 void fill_filespec(struct diff_filespec
*spec
, const struct object_id
*oid
,
3711 int oid_valid
, unsigned short mode
)
3714 spec
->mode
= canon_mode(mode
);
3715 oidcpy(&spec
->oid
, oid
);
3716 spec
->oid_valid
= oid_valid
;
3721 * Given a name and sha1 pair, if the index tells us the file in
3722 * the work tree has that object contents, return true, so that
3723 * prepare_temp_file() does not have to inflate and extract.
3725 static int reuse_worktree_file(struct index_state
*istate
,
3727 const struct object_id
*oid
,
3730 const struct cache_entry
*ce
;
3735 * We do not read the cache ourselves here, because the
3736 * benchmark with my previous version that always reads cache
3737 * shows that it makes things worse for diff-tree comparing
3738 * two linux-2.6 kernel trees in an already checked out work
3739 * tree. This is because most diff-tree comparisons deal with
3740 * only a small number of files, while reading the cache is
3741 * expensive for a large project, and its cost outweighs the
3742 * savings we get by not inflating the object to a temporary
3743 * file. Practically, this code only helps when we are used
3744 * by diff-cache --cached, which does read the cache before
3750 /* We want to avoid the working directory if our caller
3751 * doesn't need the data in a normal file, this system
3752 * is rather slow with its stat/open/mmap/close syscalls,
3753 * and the object is contained in a pack file. The pack
3754 * is probably already open and will be faster to obtain
3755 * the data through than the working directory. Loose
3756 * objects however would tend to be slower as they need
3757 * to be individually opened and inflated.
3759 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_object_pack(oid
))
3763 * Similarly, if we'd have to convert the file contents anyway, that
3764 * makes the optimization not worthwhile.
3766 if (!want_file
&& would_convert_to_git(istate
, name
))
3770 pos
= index_name_pos(istate
, name
, len
);
3773 ce
= istate
->cache
[pos
];
3776 * This is not the sha1 we are looking for, or
3777 * unreusable because it is not a regular file.
3779 if (oidcmp(oid
, &ce
->oid
) || !S_ISREG(ce
->ce_mode
))
3783 * If ce is marked as "assume unchanged", there is no
3784 * guarantee that work tree matches what we are looking for.
3786 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
3790 * If ce matches the file in the work tree, we can reuse it.
3792 if (ce_uptodate(ce
) ||
3793 (!lstat(name
, &st
) && !ie_match_stat(istate
, ce
, &st
, 0)))
3799 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
3801 struct strbuf buf
= STRBUF_INIT
;
3804 /* Are we looking at the work tree? */
3805 if (s
->dirty_submodule
)
3808 strbuf_addf(&buf
, "Subproject commit %s%s\n",
3809 oid_to_hex(&s
->oid
), dirty
);
3813 strbuf_release(&buf
);
3815 s
->data
= strbuf_detach(&buf
, NULL
);
3822 * While doing rename detection and pickaxe operation, we may need to
3823 * grab the data for the blob (or file) for our own in-core comparison.
3824 * diff_filespec has data and size fields for this purpose.
3826 int diff_populate_filespec(struct repository
*r
,
3827 struct diff_filespec
*s
,
3830 int size_only
= flags
& CHECK_SIZE_ONLY
;
3832 int conv_flags
= global_conv_flags_eol
;
3834 * demote FAIL to WARN to allow inspecting the situation
3835 * instead of refusing.
3837 if (conv_flags
& CONV_EOL_RNDTRP_DIE
)
3838 conv_flags
= CONV_EOL_RNDTRP_WARN
;
3840 if (!DIFF_FILE_VALID(s
))
3841 die("internal error: asking to populate invalid file.");
3842 if (S_ISDIR(s
->mode
))
3848 if (size_only
&& 0 < s
->size
)
3851 if (S_ISGITLINK(s
->mode
))
3852 return diff_populate_gitlink(s
, size_only
);
3854 if (!s
->oid_valid
||
3855 reuse_worktree_file(r
->index
, s
->path
, &s
->oid
, 0)) {
3856 struct strbuf buf
= STRBUF_INIT
;
3860 if (lstat(s
->path
, &st
) < 0) {
3864 s
->data
= (char *)"";
3868 s
->size
= xsize_t(st
.st_size
);
3871 if (S_ISLNK(st
.st_mode
)) {
3872 struct strbuf sb
= STRBUF_INIT
;
3874 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
3877 s
->data
= strbuf_detach(&sb
, NULL
);
3883 * Even if the caller would be happy with getting
3884 * only the size, we cannot return early at this
3885 * point if the path requires us to run the content
3888 if (size_only
&& !would_convert_to_git(r
->index
, s
->path
))
3892 * Note: this check uses xsize_t(st.st_size) that may
3893 * not be the true size of the blob after it goes
3894 * through convert_to_git(). This may not strictly be
3895 * correct, but the whole point of big_file_threshold
3896 * and is_binary check being that we want to avoid
3897 * opening the file and inspecting the contents, this
3900 if ((flags
& CHECK_BINARY
) &&
3901 s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
3905 fd
= open(s
->path
, O_RDONLY
);
3908 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
3910 s
->should_munmap
= 1;
3913 * Convert from working tree format to canonical git format
3915 if (convert_to_git(r
->index
, s
->path
, s
->data
, s
->size
, &buf
, conv_flags
)) {
3917 munmap(s
->data
, s
->size
);
3918 s
->should_munmap
= 0;
3919 s
->data
= strbuf_detach(&buf
, &size
);
3925 enum object_type type
;
3926 if (size_only
|| (flags
& CHECK_BINARY
)) {
3927 type
= oid_object_info(r
, &s
->oid
, &s
->size
);
3929 die("unable to read %s",
3930 oid_to_hex(&s
->oid
));
3933 if (s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
3938 s
->data
= read_object_file(&s
->oid
, &type
, &s
->size
);
3940 die("unable to read %s", oid_to_hex(&s
->oid
));
3946 void diff_free_filespec_blob(struct diff_filespec
*s
)
3950 else if (s
->should_munmap
)
3951 munmap(s
->data
, s
->size
);
3953 if (s
->should_free
|| s
->should_munmap
) {
3954 s
->should_free
= s
->should_munmap
= 0;
3959 void diff_free_filespec_data(struct diff_filespec
*s
)
3961 diff_free_filespec_blob(s
);
3962 FREE_AND_NULL(s
->cnt_data
);
3965 static void prep_temp_blob(struct index_state
*istate
,
3966 const char *path
, struct diff_tempfile
*temp
,
3969 const struct object_id
*oid
,
3972 struct strbuf buf
= STRBUF_INIT
;
3973 struct strbuf tempfile
= STRBUF_INIT
;
3974 char *path_dup
= xstrdup(path
);
3975 const char *base
= basename(path_dup
);
3977 /* Generate "XXXXXX_basename.ext" */
3978 strbuf_addstr(&tempfile
, "XXXXXX_");
3979 strbuf_addstr(&tempfile
, base
);
3981 temp
->tempfile
= mks_tempfile_ts(tempfile
.buf
, strlen(base
) + 1);
3982 if (!temp
->tempfile
)
3983 die_errno("unable to create temp-file");
3984 if (convert_to_working_tree(istate
, path
,
3985 (const char *)blob
, (size_t)size
, &buf
)) {
3989 if (write_in_full(temp
->tempfile
->fd
, blob
, size
) < 0 ||
3990 close_tempfile_gently(temp
->tempfile
))
3991 die_errno("unable to write temp-file");
3992 temp
->name
= get_tempfile_path(temp
->tempfile
);
3993 oid_to_hex_r(temp
->hex
, oid
);
3994 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", mode
);
3995 strbuf_release(&buf
);
3996 strbuf_release(&tempfile
);
4000 static struct diff_tempfile
*prepare_temp_file(struct repository
*r
,
4002 struct diff_filespec
*one
)
4004 struct diff_tempfile
*temp
= claim_diff_tempfile();
4006 if (!DIFF_FILE_VALID(one
)) {
4008 /* A '-' entry produces this for file-2, and
4009 * a '+' entry produces this for file-1.
4011 temp
->name
= "/dev/null";
4012 xsnprintf(temp
->hex
, sizeof(temp
->hex
), ".");
4013 xsnprintf(temp
->mode
, sizeof(temp
->mode
), ".");
4017 if (!S_ISGITLINK(one
->mode
) &&
4019 reuse_worktree_file(r
->index
, name
, &one
->oid
, 1))) {
4021 if (lstat(name
, &st
) < 0) {
4022 if (errno
== ENOENT
)
4023 goto not_a_valid_file
;
4024 die_errno("stat(%s)", name
);
4026 if (S_ISLNK(st
.st_mode
)) {
4027 struct strbuf sb
= STRBUF_INIT
;
4028 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
4029 die_errno("readlink(%s)", name
);
4030 prep_temp_blob(r
->index
, name
, temp
, sb
.buf
, sb
.len
,
4032 &one
->oid
: &null_oid
),
4034 one
->mode
: S_IFLNK
));
4035 strbuf_release(&sb
);
4038 /* we can borrow from the file in the work tree */
4040 if (!one
->oid_valid
)
4041 oid_to_hex_r(temp
->hex
, &null_oid
);
4043 oid_to_hex_r(temp
->hex
, &one
->oid
);
4044 /* Even though we may sometimes borrow the
4045 * contents from the work tree, we always want
4046 * one->mode. mode is trustworthy even when
4047 * !(one->oid_valid), as long as
4048 * DIFF_FILE_VALID(one).
4050 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", one
->mode
);
4055 if (diff_populate_filespec(r
, one
, 0))
4056 die("cannot read data blob for %s", one
->path
);
4057 prep_temp_blob(r
->index
, name
, temp
,
4058 one
->data
, one
->size
,
4059 &one
->oid
, one
->mode
);
4064 static void add_external_diff_name(struct repository
*r
,
4065 struct argv_array
*argv
,
4067 struct diff_filespec
*df
)
4069 struct diff_tempfile
*temp
= prepare_temp_file(r
, name
, df
);
4070 argv_array_push(argv
, temp
->name
);
4071 argv_array_push(argv
, temp
->hex
);
4072 argv_array_push(argv
, temp
->mode
);
4075 /* An external diff command takes:
4077 * diff-cmd name infile1 infile1-sha1 infile1-mode \
4078 * infile2 infile2-sha1 infile2-mode [ rename-to ]
4081 static void run_external_diff(const char *pgm
,
4084 struct diff_filespec
*one
,
4085 struct diff_filespec
*two
,
4086 const char *xfrm_msg
,
4087 int complete_rewrite
,
4088 struct diff_options
*o
)
4090 struct argv_array argv
= ARGV_ARRAY_INIT
;
4091 struct argv_array env
= ARGV_ARRAY_INIT
;
4092 struct diff_queue_struct
*q
= &diff_queued_diff
;
4094 argv_array_push(&argv
, pgm
);
4095 argv_array_push(&argv
, name
);
4098 add_external_diff_name(o
->repo
, &argv
, name
, one
);
4100 add_external_diff_name(o
->repo
, &argv
, name
, two
);
4102 add_external_diff_name(o
->repo
, &argv
, other
, two
);
4103 argv_array_push(&argv
, other
);
4104 argv_array_push(&argv
, xfrm_msg
);
4108 argv_array_pushf(&env
, "GIT_DIFF_PATH_COUNTER=%d", ++o
->diff_path_counter
);
4109 argv_array_pushf(&env
, "GIT_DIFF_PATH_TOTAL=%d", q
->nr
);
4111 if (run_command_v_opt_cd_env(argv
.argv
, RUN_USING_SHELL
, NULL
, env
.argv
))
4112 die(_("external diff died, stopping at %s"), name
);
4115 argv_array_clear(&argv
);
4116 argv_array_clear(&env
);
4119 static int similarity_index(struct diff_filepair
*p
)
4121 return p
->score
* 100 / MAX_SCORE
;
4124 static const char *diff_abbrev_oid(const struct object_id
*oid
, int abbrev
)
4126 if (startup_info
->have_repository
)
4127 return find_unique_abbrev(oid
, abbrev
);
4129 char *hex
= oid_to_hex(oid
);
4131 abbrev
= FALLBACK_DEFAULT_ABBREV
;
4132 if (abbrev
> the_hash_algo
->hexsz
)
4133 BUG("oid abbreviation out of range: %d", abbrev
);
4140 static void fill_metainfo(struct strbuf
*msg
,
4143 struct diff_filespec
*one
,
4144 struct diff_filespec
*two
,
4145 struct diff_options
*o
,
4146 struct diff_filepair
*p
,
4147 int *must_show_header
,
4150 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
4151 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
4152 const char *line_prefix
= diff_line_prefix(o
);
4154 *must_show_header
= 1;
4155 strbuf_init(msg
, PATH_MAX
* 2 + 300);
4156 switch (p
->status
) {
4157 case DIFF_STATUS_COPIED
:
4158 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
4159 line_prefix
, set
, similarity_index(p
));
4160 strbuf_addf(msg
, "%s\n%s%scopy from ",
4161 reset
, line_prefix
, set
);
4162 quote_c_style(name
, msg
, NULL
, 0);
4163 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
4164 quote_c_style(other
, msg
, NULL
, 0);
4165 strbuf_addf(msg
, "%s\n", reset
);
4167 case DIFF_STATUS_RENAMED
:
4168 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
4169 line_prefix
, set
, similarity_index(p
));
4170 strbuf_addf(msg
, "%s\n%s%srename from ",
4171 reset
, line_prefix
, set
);
4172 quote_c_style(name
, msg
, NULL
, 0);
4173 strbuf_addf(msg
, "%s\n%s%srename to ",
4174 reset
, line_prefix
, set
);
4175 quote_c_style(other
, msg
, NULL
, 0);
4176 strbuf_addf(msg
, "%s\n", reset
);
4178 case DIFF_STATUS_MODIFIED
:
4180 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
4182 set
, similarity_index(p
), reset
);
4187 *must_show_header
= 0;
4189 if (one
&& two
&& oidcmp(&one
->oid
, &two
->oid
)) {
4190 const unsigned hexsz
= the_hash_algo
->hexsz
;
4191 int abbrev
= o
->flags
.full_index
? hexsz
: DEFAULT_ABBREV
;
4193 if (o
->flags
.binary
) {
4195 if ((!fill_mmfile(o
->repo
, &mf
, one
) &&
4196 diff_filespec_is_binary(o
->repo
, one
)) ||
4197 (!fill_mmfile(o
->repo
, &mf
, two
) &&
4198 diff_filespec_is_binary(o
->repo
, two
)))
4201 strbuf_addf(msg
, "%s%sindex %s..%s", line_prefix
, set
,
4202 diff_abbrev_oid(&one
->oid
, abbrev
),
4203 diff_abbrev_oid(&two
->oid
, abbrev
));
4204 if (one
->mode
== two
->mode
)
4205 strbuf_addf(msg
, " %06o", one
->mode
);
4206 strbuf_addf(msg
, "%s\n", reset
);
4210 static void run_diff_cmd(const char *pgm
,
4213 const char *attr_path
,
4214 struct diff_filespec
*one
,
4215 struct diff_filespec
*two
,
4217 struct diff_options
*o
,
4218 struct diff_filepair
*p
)
4220 const char *xfrm_msg
= NULL
;
4221 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
4222 int must_show_header
= 0;
4225 if (o
->flags
.allow_external
) {
4226 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
4227 if (drv
&& drv
->external
)
4228 pgm
= drv
->external
;
4233 * don't use colors when the header is intended for an
4234 * external diff driver
4236 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
4238 want_color(o
->use_color
) && !pgm
);
4239 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
4243 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
4244 complete_rewrite
, o
);
4248 builtin_diff(name
, other
? other
: name
,
4249 one
, two
, xfrm_msg
, must_show_header
,
4250 o
, complete_rewrite
);
4252 fprintf(o
->file
, "* Unmerged path %s\n", name
);
4255 static void diff_fill_oid_info(struct diff_filespec
*one
)
4257 if (DIFF_FILE_VALID(one
)) {
4258 if (!one
->oid_valid
) {
4260 if (one
->is_stdin
) {
4264 if (lstat(one
->path
, &st
) < 0)
4265 die_errno("stat '%s'", one
->path
);
4266 if (index_path(&one
->oid
, one
->path
, &st
, 0))
4267 die("cannot hash %s", one
->path
);
4274 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
4276 /* Strip the prefix but do not molest /dev/null and absolute paths */
4277 if (*namep
&& **namep
!= '/') {
4278 *namep
+= prefix_length
;
4282 if (*otherp
&& **otherp
!= '/') {
4283 *otherp
+= prefix_length
;
4284 if (**otherp
== '/')
4289 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
4291 const char *pgm
= external_diff();
4293 struct diff_filespec
*one
= p
->one
;
4294 struct diff_filespec
*two
= p
->two
;
4297 const char *attr_path
;
4300 other
= (strcmp(name
, two
->path
) ? two
->path
: NULL
);
4302 if (o
->prefix_length
)
4303 strip_prefix(o
->prefix_length
, &name
, &other
);
4305 if (!o
->flags
.allow_external
)
4308 if (DIFF_PAIR_UNMERGED(p
)) {
4309 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
4310 NULL
, NULL
, NULL
, o
, p
);
4314 diff_fill_oid_info(one
);
4315 diff_fill_oid_info(two
);
4318 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
4319 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
4321 * a filepair that changes between file and symlink
4322 * needs to be split into deletion and creation.
4324 struct diff_filespec
*null
= alloc_filespec(two
->path
);
4325 run_diff_cmd(NULL
, name
, other
, attr_path
,
4329 strbuf_release(&msg
);
4331 null
= alloc_filespec(one
->path
);
4332 run_diff_cmd(NULL
, name
, other
, attr_path
,
4333 null
, two
, &msg
, o
, p
);
4337 run_diff_cmd(pgm
, name
, other
, attr_path
,
4338 one
, two
, &msg
, o
, p
);
4340 strbuf_release(&msg
);
4343 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
4344 struct diffstat_t
*diffstat
)
4349 if (DIFF_PAIR_UNMERGED(p
)) {
4351 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
,
4356 name
= p
->one
->path
;
4357 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
4359 if (o
->prefix_length
)
4360 strip_prefix(o
->prefix_length
, &name
, &other
);
4362 diff_fill_oid_info(p
->one
);
4363 diff_fill_oid_info(p
->two
);
4365 builtin_diffstat(name
, other
, p
->one
, p
->two
,
4369 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
4373 const char *attr_path
;
4375 if (DIFF_PAIR_UNMERGED(p
)) {
4380 name
= p
->one
->path
;
4381 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
4382 attr_path
= other
? other
: name
;
4384 if (o
->prefix_length
)
4385 strip_prefix(o
->prefix_length
, &name
, &other
);
4387 diff_fill_oid_info(p
->one
);
4388 diff_fill_oid_info(p
->two
);
4390 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
4393 void diff_setup(struct diff_options
*options
)
4395 memcpy(options
, &default_diff_options
, sizeof(*options
));
4397 options
->file
= stdout
;
4398 options
->repo
->index
= &the_index
;
4400 options
->abbrev
= DEFAULT_ABBREV
;
4401 options
->line_termination
= '\n';
4402 options
->break_opt
= -1;
4403 options
->rename_limit
= -1;
4404 options
->dirstat_permille
= diff_dirstat_permille_default
;
4405 options
->context
= diff_context_default
;
4406 options
->interhunkcontext
= diff_interhunk_context_default
;
4407 options
->ws_error_highlight
= ws_error_highlight_default
;
4408 options
->flags
.rename_empty
= 1;
4409 options
->objfind
= NULL
;
4411 /* pathchange left =NULL by default */
4412 options
->change
= diff_change
;
4413 options
->add_remove
= diff_addremove
;
4414 options
->use_color
= diff_use_color_default
;
4415 options
->detect_rename
= diff_detect_rename_default
;
4416 options
->xdl_opts
|= diff_algorithm
;
4417 if (diff_indent_heuristic
)
4418 DIFF_XDL_SET(options
, INDENT_HEURISTIC
);
4420 options
->orderfile
= diff_order_file_cfg
;
4422 if (diff_no_prefix
) {
4423 options
->a_prefix
= options
->b_prefix
= "";
4424 } else if (!diff_mnemonic_prefix
) {
4425 options
->a_prefix
= "a/";
4426 options
->b_prefix
= "b/";
4429 options
->color_moved
= diff_color_moved_default
;
4430 options
->color_moved_ws_handling
= diff_color_moved_ws_default
;
4433 void diff_setup_done(struct diff_options
*options
)
4435 unsigned check_mask
= DIFF_FORMAT_NAME
|
4436 DIFF_FORMAT_NAME_STATUS
|
4437 DIFF_FORMAT_CHECKDIFF
|
4438 DIFF_FORMAT_NO_OUTPUT
;
4440 * This must be signed because we're comparing against a potentially
4443 const int hexsz
= the_hash_algo
->hexsz
;
4445 if (options
->set_default
)
4446 options
->set_default(options
);
4448 if (HAS_MULTI_BITS(options
->output_format
& check_mask
))
4449 die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
4451 if (HAS_MULTI_BITS(options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
))
4452 die(_("-G, -S and --find-object are mutually exclusive"));
4455 * Most of the time we can say "there are changes"
4456 * only by checking if there are changed paths, but
4457 * --ignore-whitespace* options force us to look
4461 if ((options
->xdl_opts
& XDF_WHITESPACE_FLAGS
))
4462 options
->flags
.diff_from_contents
= 1;
4464 options
->flags
.diff_from_contents
= 0;
4466 if (options
->flags
.find_copies_harder
)
4467 options
->detect_rename
= DIFF_DETECT_COPY
;
4469 if (!options
->flags
.relative_name
)
4470 options
->prefix
= NULL
;
4471 if (options
->prefix
)
4472 options
->prefix_length
= strlen(options
->prefix
);
4474 options
->prefix_length
= 0;
4476 if (options
->output_format
& (DIFF_FORMAT_NAME
|
4477 DIFF_FORMAT_NAME_STATUS
|
4478 DIFF_FORMAT_CHECKDIFF
|
4479 DIFF_FORMAT_NO_OUTPUT
))
4480 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
4481 DIFF_FORMAT_NUMSTAT
|
4482 DIFF_FORMAT_DIFFSTAT
|
4483 DIFF_FORMAT_SHORTSTAT
|
4484 DIFF_FORMAT_DIRSTAT
|
4485 DIFF_FORMAT_SUMMARY
|
4489 * These cases always need recursive; we do not drop caller-supplied
4490 * recursive bits for other formats here.
4492 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
4493 DIFF_FORMAT_NUMSTAT
|
4494 DIFF_FORMAT_DIFFSTAT
|
4495 DIFF_FORMAT_SHORTSTAT
|
4496 DIFF_FORMAT_DIRSTAT
|
4497 DIFF_FORMAT_SUMMARY
|
4498 DIFF_FORMAT_CHECKDIFF
))
4499 options
->flags
.recursive
= 1;
4501 * Also pickaxe would not work very well if you do not say recursive
4503 if (options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
)
4504 options
->flags
.recursive
= 1;
4506 * When patches are generated, submodules diffed against the work tree
4507 * must be checked for dirtiness too so it can be shown in the output
4509 if (options
->output_format
& DIFF_FORMAT_PATCH
)
4510 options
->flags
.dirty_submodules
= 1;
4512 if (options
->detect_rename
&& options
->rename_limit
< 0)
4513 options
->rename_limit
= diff_rename_limit_default
;
4514 if (hexsz
< options
->abbrev
)
4515 options
->abbrev
= hexsz
; /* full */
4518 * It does not make sense to show the first hit we happened
4519 * to have found. It does not make sense not to return with
4520 * exit code in such a case either.
4522 if (options
->flags
.quick
) {
4523 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
4524 options
->flags
.exit_with_status
= 1;
4527 options
->diff_path_counter
= 0;
4529 if (options
->flags
.follow_renames
&& options
->pathspec
.nr
!= 1)
4530 die(_("--follow requires exactly one pathspec"));
4532 if (!options
->use_color
|| external_diff())
4533 options
->color_moved
= 0;
4536 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
4546 if (c
== arg_short
) {
4550 if (val
&& isdigit(c
)) {
4552 int n
= strtoul(arg
, &end
, 10);
4563 eq
= strchrnul(arg
, '=');
4565 if (!len
|| strncmp(arg
, arg_long
, len
))
4570 if (!isdigit(*++eq
))
4572 n
= strtoul(eq
, &end
, 10);
4580 static int diff_scoreopt_parse(const char *opt
);
4582 static inline int short_opt(char opt
, const char **argv
,
4583 const char **optarg
)
4585 const char *arg
= argv
[0];
4586 if (arg
[0] != '-' || arg
[1] != opt
)
4588 if (arg
[2] != '\0') {
4593 die("Option '%c' requires a value", opt
);
4598 int parse_long_opt(const char *opt
, const char **argv
,
4599 const char **optarg
)
4601 const char *arg
= argv
[0];
4602 if (!skip_prefix(arg
, "--", &arg
))
4604 if (!skip_prefix(arg
, opt
, &arg
))
4606 if (*arg
== '=') { /* stuck form: --option=value */
4612 /* separate form: --option value */
4614 die("Option '--%s' requires a value", opt
);
4619 static int stat_opt(struct diff_options
*options
, const char **av
)
4621 const char *arg
= av
[0];
4623 int width
= options
->stat_width
;
4624 int name_width
= options
->stat_name_width
;
4625 int graph_width
= options
->stat_graph_width
;
4626 int count
= options
->stat_count
;
4629 if (!skip_prefix(arg
, "--stat", &arg
))
4630 BUG("stat option does not begin with --stat: %s", arg
);
4635 if (skip_prefix(arg
, "-width", &arg
)) {
4637 width
= strtoul(arg
+ 1, &end
, 10);
4638 else if (!*arg
&& !av
[1])
4639 die_want_option("--stat-width");
4641 width
= strtoul(av
[1], &end
, 10);
4644 } else if (skip_prefix(arg
, "-name-width", &arg
)) {
4646 name_width
= strtoul(arg
+ 1, &end
, 10);
4647 else if (!*arg
&& !av
[1])
4648 die_want_option("--stat-name-width");
4650 name_width
= strtoul(av
[1], &end
, 10);
4653 } else if (skip_prefix(arg
, "-graph-width", &arg
)) {
4655 graph_width
= strtoul(arg
+ 1, &end
, 10);
4656 else if (!*arg
&& !av
[1])
4657 die_want_option("--stat-graph-width");
4659 graph_width
= strtoul(av
[1], &end
, 10);
4662 } else if (skip_prefix(arg
, "-count", &arg
)) {
4664 count
= strtoul(arg
+ 1, &end
, 10);
4665 else if (!*arg
&& !av
[1])
4666 die_want_option("--stat-count");
4668 count
= strtoul(av
[1], &end
, 10);
4674 width
= strtoul(arg
+1, &end
, 10);
4676 name_width
= strtoul(end
+1, &end
, 10);
4678 count
= strtoul(end
+1, &end
, 10);
4681 /* Important! This checks all the error cases! */
4684 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4685 options
->stat_name_width
= name_width
;
4686 options
->stat_graph_width
= graph_width
;
4687 options
->stat_width
= width
;
4688 options
->stat_count
= count
;
4692 static int parse_dirstat_opt(struct diff_options
*options
, const char *params
)
4694 struct strbuf errmsg
= STRBUF_INIT
;
4695 if (parse_dirstat_params(options
, params
, &errmsg
))
4696 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
4698 strbuf_release(&errmsg
);
4700 * The caller knows a dirstat-related option is given from the command
4701 * line; allow it to say "return this_function();"
4703 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
4707 static int parse_submodule_opt(struct diff_options
*options
, const char *value
)
4709 if (parse_submodule_params(options
, value
))
4710 die(_("Failed to parse --submodule option parameter: '%s'"),
4715 static const char diff_status_letters
[] = {
4718 DIFF_STATUS_DELETED
,
4719 DIFF_STATUS_MODIFIED
,
4720 DIFF_STATUS_RENAMED
,
4721 DIFF_STATUS_TYPE_CHANGED
,
4722 DIFF_STATUS_UNKNOWN
,
4723 DIFF_STATUS_UNMERGED
,
4724 DIFF_STATUS_FILTER_AON
,
4725 DIFF_STATUS_FILTER_BROKEN
,
4729 static unsigned int filter_bit
['Z' + 1];
4731 static void prepare_filter_bits(void)
4735 if (!filter_bit
[DIFF_STATUS_ADDED
]) {
4736 for (i
= 0; diff_status_letters
[i
]; i
++)
4737 filter_bit
[(int) diff_status_letters
[i
]] = (1 << i
);
4741 static unsigned filter_bit_tst(char status
, const struct diff_options
*opt
)
4743 return opt
->filter
& filter_bit
[(int) status
];
4746 static int parse_diff_filter_opt(const char *optarg
, struct diff_options
*opt
)
4750 prepare_filter_bits();
4753 * If there is a negation e.g. 'd' in the input, and we haven't
4754 * initialized the filter field with another --diff-filter, start
4755 * from full set of bits, except for AON.
4758 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
4759 if (optch
< 'a' || 'z' < optch
)
4761 opt
->filter
= (1 << (ARRAY_SIZE(diff_status_letters
) - 1)) - 1;
4762 opt
->filter
&= ~filter_bit
[DIFF_STATUS_FILTER_AON
];
4767 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
4771 if ('a' <= optch
&& optch
<= 'z') {
4773 optch
= toupper(optch
);
4778 bit
= (0 <= optch
&& optch
<= 'Z') ? filter_bit
[optch
] : 0;
4782 opt
->filter
&= ~bit
;
4789 static void enable_patch_output(int *fmt
) {
4790 *fmt
&= ~DIFF_FORMAT_NO_OUTPUT
;
4791 *fmt
|= DIFF_FORMAT_PATCH
;
4794 static int parse_ws_error_highlight_opt(struct diff_options
*opt
, const char *arg
)
4796 int val
= parse_ws_error_highlight(arg
);
4799 error("unknown value after ws-error-highlight=%.*s",
4803 opt
->ws_error_highlight
= val
;
4807 static int parse_objfind_opt(struct diff_options
*opt
, const char *arg
)
4809 struct object_id oid
;
4811 if (get_oid(arg
, &oid
))
4812 return error("unable to resolve '%s'", arg
);
4815 opt
->objfind
= xcalloc(1, sizeof(*opt
->objfind
));
4817 opt
->pickaxe_opts
|= DIFF_PICKAXE_KIND_OBJFIND
;
4818 opt
->flags
.recursive
= 1;
4819 opt
->flags
.tree_in_recursive
= 1;
4820 oidset_insert(opt
->objfind
, &oid
);
4824 int diff_opt_parse(struct diff_options
*options
,
4825 const char **av
, int ac
, const char *prefix
)
4827 const char *arg
= av
[0];
4834 /* Output format options */
4835 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch")
4836 || opt_arg(arg
, 'U', "unified", &options
->context
))
4837 enable_patch_output(&options
->output_format
);
4838 else if (!strcmp(arg
, "--raw"))
4839 options
->output_format
|= DIFF_FORMAT_RAW
;
4840 else if (!strcmp(arg
, "--patch-with-raw")) {
4841 enable_patch_output(&options
->output_format
);
4842 options
->output_format
|= DIFF_FORMAT_RAW
;
4843 } else if (!strcmp(arg
, "--numstat"))
4844 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
4845 else if (!strcmp(arg
, "--shortstat"))
4846 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
4847 else if (skip_prefix(arg
, "-X", &arg
) ||
4848 skip_to_optional_arg(arg
, "--dirstat", &arg
))
4849 return parse_dirstat_opt(options
, arg
);
4850 else if (!strcmp(arg
, "--cumulative"))
4851 return parse_dirstat_opt(options
, "cumulative");
4852 else if (skip_to_optional_arg(arg
, "--dirstat-by-file", &arg
)) {
4853 parse_dirstat_opt(options
, "files");
4854 return parse_dirstat_opt(options
, arg
);
4856 else if (!strcmp(arg
, "--check"))
4857 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
4858 else if (!strcmp(arg
, "--summary"))
4859 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
4860 else if (!strcmp(arg
, "--patch-with-stat")) {
4861 enable_patch_output(&options
->output_format
);
4862 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4863 } else if (!strcmp(arg
, "--name-only"))
4864 options
->output_format
|= DIFF_FORMAT_NAME
;
4865 else if (!strcmp(arg
, "--name-status"))
4866 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
4867 else if (!strcmp(arg
, "-s") || !strcmp(arg
, "--no-patch"))
4868 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
4869 else if (starts_with(arg
, "--stat"))
4870 /* --stat, --stat-width, --stat-name-width, or --stat-count */
4871 return stat_opt(options
, av
);
4872 else if (!strcmp(arg
, "--compact-summary")) {
4873 options
->flags
.stat_with_summary
= 1;
4874 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4875 } else if (!strcmp(arg
, "--no-compact-summary"))
4876 options
->flags
.stat_with_summary
= 0;
4878 /* renames options */
4879 else if (starts_with(arg
, "-B") ||
4880 skip_to_optional_arg(arg
, "--break-rewrites", NULL
)) {
4881 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
4882 return error("invalid argument to -B: %s", arg
+2);
4884 else if (starts_with(arg
, "-M") ||
4885 skip_to_optional_arg(arg
, "--find-renames", NULL
)) {
4886 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
4887 return error("invalid argument to -M: %s", arg
+2);
4888 options
->detect_rename
= DIFF_DETECT_RENAME
;
4890 else if (!strcmp(arg
, "-D") || !strcmp(arg
, "--irreversible-delete")) {
4891 options
->irreversible_delete
= 1;
4893 else if (starts_with(arg
, "-C") ||
4894 skip_to_optional_arg(arg
, "--find-copies", NULL
)) {
4895 if (options
->detect_rename
== DIFF_DETECT_COPY
)
4896 options
->flags
.find_copies_harder
= 1;
4897 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
4898 return error("invalid argument to -C: %s", arg
+2);
4899 options
->detect_rename
= DIFF_DETECT_COPY
;
4901 else if (!strcmp(arg
, "--no-renames"))
4902 options
->detect_rename
= 0;
4903 else if (!strcmp(arg
, "--rename-empty"))
4904 options
->flags
.rename_empty
= 1;
4905 else if (!strcmp(arg
, "--no-rename-empty"))
4906 options
->flags
.rename_empty
= 0;
4907 else if (skip_to_optional_arg_default(arg
, "--relative", &arg
, NULL
)) {
4908 options
->flags
.relative_name
= 1;
4910 options
->prefix
= arg
;
4914 else if (!strcmp(arg
, "--minimal"))
4915 DIFF_XDL_SET(options
, NEED_MINIMAL
);
4916 else if (!strcmp(arg
, "--no-minimal"))
4917 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
4918 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
4919 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
4920 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
4921 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
4922 else if (!strcmp(arg
, "--ignore-space-at-eol"))
4923 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
4924 else if (!strcmp(arg
, "--ignore-cr-at-eol"))
4925 DIFF_XDL_SET(options
, IGNORE_CR_AT_EOL
);
4926 else if (!strcmp(arg
, "--ignore-blank-lines"))
4927 DIFF_XDL_SET(options
, IGNORE_BLANK_LINES
);
4928 else if (!strcmp(arg
, "--indent-heuristic"))
4929 DIFF_XDL_SET(options
, INDENT_HEURISTIC
);
4930 else if (!strcmp(arg
, "--no-indent-heuristic"))
4931 DIFF_XDL_CLR(options
, INDENT_HEURISTIC
);
4932 else if (!strcmp(arg
, "--patience")) {
4934 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
4936 * Both --patience and --anchored use PATIENCE_DIFF
4937 * internally, so remove any anchors previously
4940 for (i
= 0; i
< options
->anchors_nr
; i
++)
4941 free(options
->anchors
[i
]);
4942 options
->anchors_nr
= 0;
4943 } else if (!strcmp(arg
, "--histogram"))
4944 options
->xdl_opts
= DIFF_WITH_ALG(options
, HISTOGRAM_DIFF
);
4945 else if ((argcount
= parse_long_opt("diff-algorithm", av
, &optarg
))) {
4946 long value
= parse_algorithm_value(optarg
);
4948 return error("option diff-algorithm accepts \"myers\", "
4949 "\"minimal\", \"patience\" and \"histogram\"");
4950 /* clear out previous settings */
4951 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
4952 options
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
4953 options
->xdl_opts
|= value
;
4955 } else if (skip_prefix(arg
, "--anchored=", &arg
)) {
4956 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
4957 ALLOC_GROW(options
->anchors
, options
->anchors_nr
+ 1,
4958 options
->anchors_alloc
);
4959 options
->anchors
[options
->anchors_nr
++] = xstrdup(arg
);
4963 else if (!strcmp(arg
, "--binary")) {
4964 enable_patch_output(&options
->output_format
);
4965 options
->flags
.binary
= 1;
4967 else if (!strcmp(arg
, "--full-index"))
4968 options
->flags
.full_index
= 1;
4969 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
4970 options
->flags
.text
= 1;
4971 else if (!strcmp(arg
, "-R"))
4972 options
->flags
.reverse_diff
= 1;
4973 else if (!strcmp(arg
, "--find-copies-harder"))
4974 options
->flags
.find_copies_harder
= 1;
4975 else if (!strcmp(arg
, "--follow"))
4976 options
->flags
.follow_renames
= 1;
4977 else if (!strcmp(arg
, "--no-follow")) {
4978 options
->flags
.follow_renames
= 0;
4979 options
->flags
.default_follow_renames
= 0;
4980 } else if (skip_to_optional_arg_default(arg
, "--color", &arg
, "always")) {
4981 int value
= git_config_colorbool(NULL
, arg
);
4983 return error("option `color' expects \"always\", \"auto\", or \"never\"");
4984 options
->use_color
= value
;
4986 else if (!strcmp(arg
, "--no-color"))
4987 options
->use_color
= 0;
4988 else if (!strcmp(arg
, "--color-moved")) {
4989 if (diff_color_moved_default
)
4990 options
->color_moved
= diff_color_moved_default
;
4991 if (options
->color_moved
== COLOR_MOVED_NO
)
4992 options
->color_moved
= COLOR_MOVED_DEFAULT
;
4993 } else if (!strcmp(arg
, "--no-color-moved"))
4994 options
->color_moved
= COLOR_MOVED_NO
;
4995 else if (skip_prefix(arg
, "--color-moved=", &arg
)) {
4996 int cm
= parse_color_moved(arg
);
4998 die("bad --color-moved argument: %s", arg
);
4999 options
->color_moved
= cm
;
5000 } else if (skip_prefix(arg
, "--color-moved-ws=", &arg
)) {
5001 options
->color_moved_ws_handling
= parse_color_moved_ws(arg
);
5002 } else if (skip_to_optional_arg_default(arg
, "--color-words", &options
->word_regex
, NULL
)) {
5003 options
->use_color
= 1;
5004 options
->word_diff
= DIFF_WORDS_COLOR
;
5006 else if (!strcmp(arg
, "--word-diff")) {
5007 if (options
->word_diff
== DIFF_WORDS_NONE
)
5008 options
->word_diff
= DIFF_WORDS_PLAIN
;
5010 else if (skip_prefix(arg
, "--word-diff=", &arg
)) {
5011 if (!strcmp(arg
, "plain"))
5012 options
->word_diff
= DIFF_WORDS_PLAIN
;
5013 else if (!strcmp(arg
, "color")) {
5014 options
->use_color
= 1;
5015 options
->word_diff
= DIFF_WORDS_COLOR
;
5017 else if (!strcmp(arg
, "porcelain"))
5018 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
5019 else if (!strcmp(arg
, "none"))
5020 options
->word_diff
= DIFF_WORDS_NONE
;
5022 die("bad --word-diff argument: %s", arg
);
5024 else if ((argcount
= parse_long_opt("word-diff-regex", av
, &optarg
))) {
5025 if (options
->word_diff
== DIFF_WORDS_NONE
)
5026 options
->word_diff
= DIFF_WORDS_PLAIN
;
5027 options
->word_regex
= optarg
;
5030 else if (!strcmp(arg
, "--exit-code"))
5031 options
->flags
.exit_with_status
= 1;
5032 else if (!strcmp(arg
, "--quiet"))
5033 options
->flags
.quick
= 1;
5034 else if (!strcmp(arg
, "--ext-diff"))
5035 options
->flags
.allow_external
= 1;
5036 else if (!strcmp(arg
, "--no-ext-diff"))
5037 options
->flags
.allow_external
= 0;
5038 else if (!strcmp(arg
, "--textconv")) {
5039 options
->flags
.allow_textconv
= 1;
5040 options
->flags
.textconv_set_via_cmdline
= 1;
5041 } else if (!strcmp(arg
, "--no-textconv"))
5042 options
->flags
.allow_textconv
= 0;
5043 else if (skip_to_optional_arg_default(arg
, "--ignore-submodules", &arg
, "all")) {
5044 options
->flags
.override_submodule_config
= 1;
5045 handle_ignore_submodules_arg(options
, arg
);
5046 } else if (skip_to_optional_arg_default(arg
, "--submodule", &arg
, "log"))
5047 return parse_submodule_opt(options
, arg
);
5048 else if (skip_prefix(arg
, "--ws-error-highlight=", &arg
))
5049 return parse_ws_error_highlight_opt(options
, arg
);
5050 else if (!strcmp(arg
, "--ita-invisible-in-index"))
5051 options
->ita_invisible_in_index
= 1;
5052 else if (!strcmp(arg
, "--ita-visible-in-index"))
5053 options
->ita_invisible_in_index
= 0;
5056 else if (!strcmp(arg
, "-z"))
5057 options
->line_termination
= 0;
5058 else if ((argcount
= short_opt('l', av
, &optarg
))) {
5059 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
5062 else if ((argcount
= short_opt('S', av
, &optarg
))) {
5063 options
->pickaxe
= optarg
;
5064 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_S
;
5066 } else if ((argcount
= short_opt('G', av
, &optarg
))) {
5067 options
->pickaxe
= optarg
;
5068 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_G
;
5071 else if (!strcmp(arg
, "--pickaxe-all"))
5072 options
->pickaxe_opts
|= DIFF_PICKAXE_ALL
;
5073 else if (!strcmp(arg
, "--pickaxe-regex"))
5074 options
->pickaxe_opts
|= DIFF_PICKAXE_REGEX
;
5075 else if ((argcount
= short_opt('O', av
, &optarg
))) {
5076 options
->orderfile
= prefix_filename(prefix
, optarg
);
5078 } else if (skip_prefix(arg
, "--find-object=", &arg
))
5079 return parse_objfind_opt(options
, arg
);
5080 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
5081 int offending
= parse_diff_filter_opt(optarg
, options
);
5083 die("unknown change class '%c' in --diff-filter=%s",
5087 else if (!strcmp(arg
, "--no-abbrev"))
5088 options
->abbrev
= 0;
5089 else if (!strcmp(arg
, "--abbrev"))
5090 options
->abbrev
= DEFAULT_ABBREV
;
5091 else if (skip_prefix(arg
, "--abbrev=", &arg
)) {
5092 options
->abbrev
= strtoul(arg
, NULL
, 10);
5093 if (options
->abbrev
< MINIMUM_ABBREV
)
5094 options
->abbrev
= MINIMUM_ABBREV
;
5095 else if (the_hash_algo
->hexsz
< options
->abbrev
)
5096 options
->abbrev
= the_hash_algo
->hexsz
;
5098 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
5099 options
->a_prefix
= optarg
;
5102 else if ((argcount
= parse_long_opt("line-prefix", av
, &optarg
))) {
5103 options
->line_prefix
= optarg
;
5104 options
->line_prefix_length
= strlen(options
->line_prefix
);
5105 graph_setup_line_prefix(options
);
5108 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
5109 options
->b_prefix
= optarg
;
5112 else if (!strcmp(arg
, "--no-prefix"))
5113 options
->a_prefix
= options
->b_prefix
= "";
5114 else if (opt_arg(arg
, '\0', "inter-hunk-context",
5115 &options
->interhunkcontext
))
5117 else if (!strcmp(arg
, "-W"))
5118 options
->flags
.funccontext
= 1;
5119 else if (!strcmp(arg
, "--function-context"))
5120 options
->flags
.funccontext
= 1;
5121 else if (!strcmp(arg
, "--no-function-context"))
5122 options
->flags
.funccontext
= 0;
5123 else if ((argcount
= parse_long_opt("output", av
, &optarg
))) {
5124 char *path
= prefix_filename(prefix
, optarg
);
5125 options
->file
= xfopen(path
, "w");
5126 options
->close_file
= 1;
5127 if (options
->use_color
!= GIT_COLOR_ALWAYS
)
5128 options
->use_color
= GIT_COLOR_NEVER
;
5136 int parse_rename_score(const char **cp_p
)
5138 unsigned long num
, scale
;
5140 const char *cp
= *cp_p
;
5147 if ( !dot
&& ch
== '.' ) {
5150 } else if ( ch
== '%' ) {
5151 scale
= dot
? scale
*100 : 100;
5152 cp
++; /* % is always at the end */
5154 } else if ( ch
>= '0' && ch
<= '9' ) {
5155 if ( scale
< 100000 ) {
5157 num
= (num
*10) + (ch
-'0');
5166 /* user says num divided by scale and we say internally that
5167 * is MAX_SCORE * num / scale.
5169 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
5172 static int diff_scoreopt_parse(const char *opt
)
5174 int opt1
, opt2
, cmd
;
5180 /* convert the long-form arguments into short-form versions */
5181 if (skip_prefix(opt
, "break-rewrites", &opt
)) {
5182 if (*opt
== 0 || *opt
++ == '=')
5184 } else if (skip_prefix(opt
, "find-copies", &opt
)) {
5185 if (*opt
== 0 || *opt
++ == '=')
5187 } else if (skip_prefix(opt
, "find-renames", &opt
)) {
5188 if (*opt
== 0 || *opt
++ == '=')
5192 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
5193 return -1; /* that is not a -M, -C, or -B option */
5195 opt1
= parse_rename_score(&opt
);
5201 else if (*opt
!= '/')
5202 return -1; /* we expect -B80/99 or -B80 */
5205 opt2
= parse_rename_score(&opt
);
5210 return opt1
| (opt2
<< 16);
5213 struct diff_queue_struct diff_queued_diff
;
5215 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
5217 ALLOC_GROW(queue
->queue
, queue
->nr
+ 1, queue
->alloc
);
5218 queue
->queue
[queue
->nr
++] = dp
;
5221 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
5222 struct diff_filespec
*one
,
5223 struct diff_filespec
*two
)
5225 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
5233 void diff_free_filepair(struct diff_filepair
*p
)
5235 free_filespec(p
->one
);
5236 free_filespec(p
->two
);
5240 const char *diff_aligned_abbrev(const struct object_id
*oid
, int len
)
5245 /* Do we want all 40 hex characters? */
5246 if (len
== the_hash_algo
->hexsz
)
5247 return oid_to_hex(oid
);
5249 /* An abbreviated value is fine, possibly followed by an ellipsis. */
5250 abbrev
= diff_abbrev_oid(oid
, len
);
5252 if (!print_sha1_ellipsis())
5255 abblen
= strlen(abbrev
);
5258 * In well-behaved cases, where the abbreviated result is the
5259 * same as the requested length, append three dots after the
5260 * abbreviation (hence the whole logic is limited to the case
5261 * where abblen < 37); when the actual abbreviated result is a
5262 * bit longer than the requested length, we reduce the number
5263 * of dots so that they match the well-behaved ones. However,
5264 * if the actual abbreviation is longer than the requested
5265 * length by more than three, we give up on aligning, and add
5266 * three dots anyway, to indicate that the output is not the
5267 * full object name. Yes, this may be suboptimal, but this
5268 * appears only in "diff --raw --abbrev" output and it is not
5269 * worth the effort to change it now. Note that this would
5270 * likely to work fine when the automatic sizing of default
5271 * abbreviation length is used--we would be fed -1 in "len" in
5272 * that case, and will end up always appending three-dots, but
5273 * the automatic sizing is supposed to give abblen that ensures
5274 * uniqueness across all objects (statistically speaking).
5276 if (abblen
< the_hash_algo
->hexsz
- 3) {
5277 static char hex
[GIT_MAX_HEXSZ
+ 1];
5278 if (len
< abblen
&& abblen
<= len
+ 2)
5279 xsnprintf(hex
, sizeof(hex
), "%s%.*s", abbrev
, len
+3-abblen
, "..");
5281 xsnprintf(hex
, sizeof(hex
), "%s...", abbrev
);
5285 return oid_to_hex(oid
);
5288 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
5290 int line_termination
= opt
->line_termination
;
5291 int inter_name_termination
= line_termination
? '\t' : '\0';
5293 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
5294 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
5295 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
5296 diff_aligned_abbrev(&p
->one
->oid
, opt
->abbrev
));
5297 fprintf(opt
->file
, "%s ",
5298 diff_aligned_abbrev(&p
->two
->oid
, opt
->abbrev
));
5301 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
5302 inter_name_termination
);
5304 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
5307 if (p
->status
== DIFF_STATUS_COPIED
||
5308 p
->status
== DIFF_STATUS_RENAMED
) {
5309 const char *name_a
, *name_b
;
5310 name_a
= p
->one
->path
;
5311 name_b
= p
->two
->path
;
5312 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5313 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
5314 write_name_quoted(name_b
, opt
->file
, line_termination
);
5316 const char *name_a
, *name_b
;
5317 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
5319 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5320 write_name_quoted(name_a
, opt
->file
, line_termination
);
5324 int diff_unmodified_pair(struct diff_filepair
*p
)
5326 /* This function is written stricter than necessary to support
5327 * the currently implemented transformers, but the idea is to
5328 * let transformers to produce diff_filepairs any way they want,
5329 * and filter and clean them up here before producing the output.
5331 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
5333 if (DIFF_PAIR_UNMERGED(p
))
5334 return 0; /* unmerged is interesting */
5336 /* deletion, addition, mode or type change
5337 * and rename are all interesting.
5339 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
5340 DIFF_PAIR_MODE_CHANGED(p
) ||
5341 strcmp(one
->path
, two
->path
))
5344 /* both are valid and point at the same path. that is, we are
5345 * dealing with a change.
5347 if (one
->oid_valid
&& two
->oid_valid
&&
5348 !oidcmp(&one
->oid
, &two
->oid
) &&
5349 !one
->dirty_submodule
&& !two
->dirty_submodule
)
5350 return 1; /* no change */
5351 if (!one
->oid_valid
&& !two
->oid_valid
)
5352 return 1; /* both look at the same file on the filesystem. */
5356 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
5358 if (diff_unmodified_pair(p
))
5361 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5362 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5363 return; /* no tree diffs in patch format */
5368 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
5369 struct diffstat_t
*diffstat
)
5371 if (diff_unmodified_pair(p
))
5374 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5375 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5376 return; /* no useful stat for tree diffs */
5378 run_diffstat(p
, o
, diffstat
);
5381 static void diff_flush_checkdiff(struct diff_filepair
*p
,
5382 struct diff_options
*o
)
5384 if (diff_unmodified_pair(p
))
5387 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5388 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5389 return; /* nothing to check in tree diffs */
5391 run_checkdiff(p
, o
);
5394 int diff_queue_is_empty(void)
5396 struct diff_queue_struct
*q
= &diff_queued_diff
;
5398 for (i
= 0; i
< q
->nr
; i
++)
5399 if (!diff_unmodified_pair(q
->queue
[i
]))
5405 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
5407 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
5410 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
5412 s
->oid_valid
? oid_to_hex(&s
->oid
) : "");
5413 fprintf(stderr
, "queue[%d] %s size %lu\n",
5418 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
5420 diff_debug_filespec(p
->one
, i
, "one");
5421 diff_debug_filespec(p
->two
, i
, "two");
5422 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
5423 p
->score
, p
->status
? p
->status
: '?',
5424 p
->one
->rename_used
, p
->broken_pair
);
5427 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
5431 fprintf(stderr
, "%s\n", msg
);
5432 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
5433 for (i
= 0; i
< q
->nr
; i
++) {
5434 struct diff_filepair
*p
= q
->queue
[i
];
5435 diff_debug_filepair(p
, i
);
5440 static void diff_resolve_rename_copy(void)
5443 struct diff_filepair
*p
;
5444 struct diff_queue_struct
*q
= &diff_queued_diff
;
5446 diff_debug_queue("resolve-rename-copy", q
);
5448 for (i
= 0; i
< q
->nr
; i
++) {
5450 p
->status
= 0; /* undecided */
5451 if (DIFF_PAIR_UNMERGED(p
))
5452 p
->status
= DIFF_STATUS_UNMERGED
;
5453 else if (!DIFF_FILE_VALID(p
->one
))
5454 p
->status
= DIFF_STATUS_ADDED
;
5455 else if (!DIFF_FILE_VALID(p
->two
))
5456 p
->status
= DIFF_STATUS_DELETED
;
5457 else if (DIFF_PAIR_TYPE_CHANGED(p
))
5458 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
5460 /* from this point on, we are dealing with a pair
5461 * whose both sides are valid and of the same type, i.e.
5462 * either in-place edit or rename/copy edit.
5464 else if (DIFF_PAIR_RENAME(p
)) {
5466 * A rename might have re-connected a broken
5467 * pair up, causing the pathnames to be the
5468 * same again. If so, that's not a rename at
5469 * all, just a modification..
5471 * Otherwise, see if this source was used for
5472 * multiple renames, in which case we decrement
5473 * the count, and call it a copy.
5475 if (!strcmp(p
->one
->path
, p
->two
->path
))
5476 p
->status
= DIFF_STATUS_MODIFIED
;
5477 else if (--p
->one
->rename_used
> 0)
5478 p
->status
= DIFF_STATUS_COPIED
;
5480 p
->status
= DIFF_STATUS_RENAMED
;
5482 else if (oidcmp(&p
->one
->oid
, &p
->two
->oid
) ||
5483 p
->one
->mode
!= p
->two
->mode
||
5484 p
->one
->dirty_submodule
||
5485 p
->two
->dirty_submodule
||
5486 is_null_oid(&p
->one
->oid
))
5487 p
->status
= DIFF_STATUS_MODIFIED
;
5489 /* This is a "no-change" entry and should not
5490 * happen anymore, but prepare for broken callers.
5492 error("feeding unmodified %s to diffcore",
5494 p
->status
= DIFF_STATUS_UNKNOWN
;
5497 diff_debug_queue("resolve-rename-copy done", q
);
5500 static int check_pair_status(struct diff_filepair
*p
)
5502 switch (p
->status
) {
5503 case DIFF_STATUS_UNKNOWN
:
5506 die("internal error in diff-resolve-rename-copy");
5512 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
5514 int fmt
= opt
->output_format
;
5516 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
5517 diff_flush_checkdiff(p
, opt
);
5518 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
5519 diff_flush_raw(p
, opt
);
5520 else if (fmt
& DIFF_FORMAT_NAME
) {
5521 const char *name_a
, *name_b
;
5522 name_a
= p
->two
->path
;
5524 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5525 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
5526 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
5530 static void show_file_mode_name(struct diff_options
*opt
, const char *newdelete
, struct diff_filespec
*fs
)
5532 struct strbuf sb
= STRBUF_INIT
;
5534 strbuf_addf(&sb
, " %s mode %06o ", newdelete
, fs
->mode
);
5536 strbuf_addf(&sb
, " %s ", newdelete
);
5538 quote_c_style(fs
->path
, &sb
, NULL
, 0);
5539 strbuf_addch(&sb
, '\n');
5540 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5542 strbuf_release(&sb
);
5545 static void show_mode_change(struct diff_options
*opt
, struct diff_filepair
*p
,
5548 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
5549 struct strbuf sb
= STRBUF_INIT
;
5550 strbuf_addf(&sb
, " mode change %06o => %06o",
5551 p
->one
->mode
, p
->two
->mode
);
5553 strbuf_addch(&sb
, ' ');
5554 quote_c_style(p
->two
->path
, &sb
, NULL
, 0);
5556 strbuf_addch(&sb
, '\n');
5557 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5559 strbuf_release(&sb
);
5563 static void show_rename_copy(struct diff_options
*opt
, const char *renamecopy
,
5564 struct diff_filepair
*p
)
5566 struct strbuf sb
= STRBUF_INIT
;
5567 struct strbuf names
= STRBUF_INIT
;
5569 pprint_rename(&names
, p
->one
->path
, p
->two
->path
);
5570 strbuf_addf(&sb
, " %s %s (%d%%)\n",
5571 renamecopy
, names
.buf
, similarity_index(p
));
5572 strbuf_release(&names
);
5573 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5575 show_mode_change(opt
, p
, 0);
5576 strbuf_release(&sb
);
5579 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
5582 case DIFF_STATUS_DELETED
:
5583 show_file_mode_name(opt
, "delete", p
->one
);
5585 case DIFF_STATUS_ADDED
:
5586 show_file_mode_name(opt
, "create", p
->two
);
5588 case DIFF_STATUS_COPIED
:
5589 show_rename_copy(opt
, "copy", p
);
5591 case DIFF_STATUS_RENAMED
:
5592 show_rename_copy(opt
, "rename", p
);
5596 struct strbuf sb
= STRBUF_INIT
;
5597 strbuf_addstr(&sb
, " rewrite ");
5598 quote_c_style(p
->two
->path
, &sb
, NULL
, 0);
5599 strbuf_addf(&sb
, " (%d%%)\n", similarity_index(p
));
5600 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5602 strbuf_release(&sb
);
5604 show_mode_change(opt
, p
, !p
->score
);
5614 static int remove_space(char *line
, int len
)
5620 for (i
= 0; i
< len
; i
++)
5621 if (!isspace((c
= line
[i
])))
5627 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
5629 struct patch_id_t
*data
= priv
;
5632 /* Ignore line numbers when computing the SHA1 of the patch */
5633 if (starts_with(line
, "@@ -"))
5636 new_len
= remove_space(line
, len
);
5638 git_SHA1_Update(data
->ctx
, line
, new_len
);
5639 data
->patchlen
+= new_len
;
5642 static void patch_id_add_string(git_SHA_CTX
*ctx
, const char *str
)
5644 git_SHA1_Update(ctx
, str
, strlen(str
));
5647 static void patch_id_add_mode(git_SHA_CTX
*ctx
, unsigned mode
)
5649 /* large enough for 2^32 in octal */
5651 int len
= xsnprintf(buf
, sizeof(buf
), "%06o", mode
);
5652 git_SHA1_Update(ctx
, buf
, len
);
5655 /* returns 0 upon success, and writes result into sha1 */
5656 static int diff_get_patch_id(struct diff_options
*options
, struct object_id
*oid
, int diff_header_only
)
5658 struct diff_queue_struct
*q
= &diff_queued_diff
;
5661 struct patch_id_t data
;
5663 git_SHA1_Init(&ctx
);
5664 memset(&data
, 0, sizeof(struct patch_id_t
));
5667 for (i
= 0; i
< q
->nr
; i
++) {
5671 struct diff_filepair
*p
= q
->queue
[i
];
5674 memset(&xpp
, 0, sizeof(xpp
));
5675 memset(&xecfg
, 0, sizeof(xecfg
));
5677 return error("internal diff status error");
5678 if (p
->status
== DIFF_STATUS_UNKNOWN
)
5680 if (diff_unmodified_pair(p
))
5682 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5683 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5685 if (DIFF_PAIR_UNMERGED(p
))
5688 diff_fill_oid_info(p
->one
);
5689 diff_fill_oid_info(p
->two
);
5691 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
5692 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
5693 patch_id_add_string(&ctx
, "diff--git");
5694 patch_id_add_string(&ctx
, "a/");
5695 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5696 patch_id_add_string(&ctx
, "b/");
5697 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5699 if (p
->one
->mode
== 0) {
5700 patch_id_add_string(&ctx
, "newfilemode");
5701 patch_id_add_mode(&ctx
, p
->two
->mode
);
5702 patch_id_add_string(&ctx
, "---/dev/null");
5703 patch_id_add_string(&ctx
, "+++b/");
5704 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5705 } else if (p
->two
->mode
== 0) {
5706 patch_id_add_string(&ctx
, "deletedfilemode");
5707 patch_id_add_mode(&ctx
, p
->one
->mode
);
5708 patch_id_add_string(&ctx
, "---a/");
5709 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5710 patch_id_add_string(&ctx
, "+++/dev/null");
5712 patch_id_add_string(&ctx
, "---a/");
5713 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5714 patch_id_add_string(&ctx
, "+++b/");
5715 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5718 if (diff_header_only
)
5721 if (fill_mmfile(options
->repo
, &mf1
, p
->one
) < 0 ||
5722 fill_mmfile(options
->repo
, &mf2
, p
->two
) < 0)
5723 return error("unable to read files to diff");
5725 if (diff_filespec_is_binary(options
->repo
, p
->one
) ||
5726 diff_filespec_is_binary(options
->repo
, p
->two
)) {
5727 git_SHA1_Update(&ctx
, oid_to_hex(&p
->one
->oid
),
5729 git_SHA1_Update(&ctx
, oid_to_hex(&p
->two
->oid
),
5737 if (xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
5739 return error("unable to generate patch-id diff for %s",
5743 git_SHA1_Final(oid
->hash
, &ctx
);
5747 int diff_flush_patch_id(struct diff_options
*options
, struct object_id
*oid
, int diff_header_only
)
5749 struct diff_queue_struct
*q
= &diff_queued_diff
;
5751 int result
= diff_get_patch_id(options
, oid
, diff_header_only
);
5753 for (i
= 0; i
< q
->nr
; i
++)
5754 diff_free_filepair(q
->queue
[i
]);
5757 DIFF_QUEUE_CLEAR(q
);
5762 static int is_summary_empty(const struct diff_queue_struct
*q
)
5766 for (i
= 0; i
< q
->nr
; i
++) {
5767 const struct diff_filepair
*p
= q
->queue
[i
];
5769 switch (p
->status
) {
5770 case DIFF_STATUS_DELETED
:
5771 case DIFF_STATUS_ADDED
:
5772 case DIFF_STATUS_COPIED
:
5773 case DIFF_STATUS_RENAMED
:
5778 if (p
->one
->mode
&& p
->two
->mode
&&
5779 p
->one
->mode
!= p
->two
->mode
)
5787 static const char rename_limit_warning
[] =
5788 N_("inexact rename detection was skipped due to too many files.");
5790 static const char degrade_cc_to_c_warning
[] =
5791 N_("only found copies from modified paths due to too many files.");
5793 static const char rename_limit_advice
[] =
5794 N_("you may want to set your %s variable to at least "
5795 "%d and retry the command.");
5797 void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
)
5801 warning(_(degrade_cc_to_c_warning
));
5803 warning(_(rename_limit_warning
));
5807 warning(_(rename_limit_advice
), varname
, needed
);
5810 static void diff_flush_patch_all_file_pairs(struct diff_options
*o
)
5813 static struct emitted_diff_symbols esm
= EMITTED_DIFF_SYMBOLS_INIT
;
5814 struct diff_queue_struct
*q
= &diff_queued_diff
;
5816 if (WSEH_NEW
& WS_RULE_MASK
)
5817 BUG("WS rules bit mask overlaps with diff symbol flags");
5820 o
->emitted_symbols
= &esm
;
5822 for (i
= 0; i
< q
->nr
; i
++) {
5823 struct diff_filepair
*p
= q
->queue
[i
];
5824 if (check_pair_status(p
))
5825 diff_flush_patch(p
, o
);
5828 if (o
->emitted_symbols
) {
5829 if (o
->color_moved
) {
5830 struct hashmap add_lines
, del_lines
;
5832 if (o
->color_moved_ws_handling
&
5833 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
)
5834 o
->color_moved_ws_handling
|= XDF_IGNORE_WHITESPACE
;
5836 hashmap_init(&del_lines
, moved_entry_cmp
, o
, 0);
5837 hashmap_init(&add_lines
, moved_entry_cmp
, o
, 0);
5839 add_lines_to_move_detection(o
, &add_lines
, &del_lines
);
5840 mark_color_as_moved(o
, &add_lines
, &del_lines
);
5841 if (o
->color_moved
== COLOR_MOVED_ZEBRA_DIM
)
5844 hashmap_free(&add_lines
, 0);
5845 hashmap_free(&del_lines
, 0);
5848 for (i
= 0; i
< esm
.nr
; i
++)
5849 emit_diff_symbol_from_struct(o
, &esm
.buf
[i
]);
5851 for (i
= 0; i
< esm
.nr
; i
++)
5852 free((void *)esm
.buf
[i
].line
);
5857 void diff_flush(struct diff_options
*options
)
5859 struct diff_queue_struct
*q
= &diff_queued_diff
;
5860 int i
, output_format
= options
->output_format
;
5862 int dirstat_by_line
= 0;
5865 * Order: raw, stat, summary, patch
5866 * or: name/name-status/checkdiff (other bits clear)
5871 if (output_format
& (DIFF_FORMAT_RAW
|
5873 DIFF_FORMAT_NAME_STATUS
|
5874 DIFF_FORMAT_CHECKDIFF
)) {
5875 for (i
= 0; i
< q
->nr
; i
++) {
5876 struct diff_filepair
*p
= q
->queue
[i
];
5877 if (check_pair_status(p
))
5878 flush_one_pair(p
, options
);
5883 if (output_format
& DIFF_FORMAT_DIRSTAT
&& options
->flags
.dirstat_by_line
)
5884 dirstat_by_line
= 1;
5886 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
) ||
5888 struct diffstat_t diffstat
;
5890 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
5891 for (i
= 0; i
< q
->nr
; i
++) {
5892 struct diff_filepair
*p
= q
->queue
[i
];
5893 if (check_pair_status(p
))
5894 diff_flush_stat(p
, options
, &diffstat
);
5896 if (output_format
& DIFF_FORMAT_NUMSTAT
)
5897 show_numstat(&diffstat
, options
);
5898 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
5899 show_stats(&diffstat
, options
);
5900 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
5901 show_shortstats(&diffstat
, options
);
5902 if (output_format
& DIFF_FORMAT_DIRSTAT
&& dirstat_by_line
)
5903 show_dirstat_by_line(&diffstat
, options
);
5904 free_diffstat_info(&diffstat
);
5907 if ((output_format
& DIFF_FORMAT_DIRSTAT
) && !dirstat_by_line
)
5908 show_dirstat(options
);
5910 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
5911 for (i
= 0; i
< q
->nr
; i
++) {
5912 diff_summary(options
, q
->queue
[i
]);
5917 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
5918 options
->flags
.exit_with_status
&&
5919 options
->flags
.diff_from_contents
) {
5921 * run diff_flush_patch for the exit status. setting
5922 * options->file to /dev/null should be safe, because we
5923 * aren't supposed to produce any output anyway.
5925 if (options
->close_file
)
5926 fclose(options
->file
);
5927 options
->file
= xfopen("/dev/null", "w");
5928 options
->close_file
= 1;
5929 options
->color_moved
= 0;
5930 for (i
= 0; i
< q
->nr
; i
++) {
5931 struct diff_filepair
*p
= q
->queue
[i
];
5932 if (check_pair_status(p
))
5933 diff_flush_patch(p
, options
);
5934 if (options
->found_changes
)
5939 if (output_format
& DIFF_FORMAT_PATCH
) {
5941 emit_diff_symbol(options
, DIFF_SYMBOL_SEPARATOR
, NULL
, 0, 0);
5942 if (options
->stat_sep
)
5943 /* attach patch instead of inline */
5944 emit_diff_symbol(options
, DIFF_SYMBOL_STAT_SEP
,
5948 diff_flush_patch_all_file_pairs(options
);
5951 if (output_format
& DIFF_FORMAT_CALLBACK
)
5952 options
->format_callback(q
, options
, options
->format_callback_data
);
5954 for (i
= 0; i
< q
->nr
; i
++)
5955 diff_free_filepair(q
->queue
[i
]);
5958 DIFF_QUEUE_CLEAR(q
);
5959 if (options
->close_file
)
5960 fclose(options
->file
);
5963 * Report the content-level differences with HAS_CHANGES;
5964 * diff_addremove/diff_change does not set the bit when
5965 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
5967 if (options
->flags
.diff_from_contents
) {
5968 if (options
->found_changes
)
5969 options
->flags
.has_changes
= 1;
5971 options
->flags
.has_changes
= 0;
5975 static int match_filter(const struct diff_options
*options
, const struct diff_filepair
*p
)
5977 return (((p
->status
== DIFF_STATUS_MODIFIED
) &&
5979 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN
, options
)) ||
5981 filter_bit_tst(DIFF_STATUS_MODIFIED
, options
)))) ||
5982 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
5983 filter_bit_tst(p
->status
, options
)));
5986 static void diffcore_apply_filter(struct diff_options
*options
)
5989 struct diff_queue_struct
*q
= &diff_queued_diff
;
5990 struct diff_queue_struct outq
;
5992 DIFF_QUEUE_CLEAR(&outq
);
5994 if (!options
->filter
)
5997 if (filter_bit_tst(DIFF_STATUS_FILTER_AON
, options
)) {
5999 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
6000 if (match_filter(options
, q
->queue
[i
]))
6006 /* otherwise we will clear the whole queue
6007 * by copying the empty outq at the end of this
6008 * function, but first clear the current entries
6011 for (i
= 0; i
< q
->nr
; i
++)
6012 diff_free_filepair(q
->queue
[i
]);
6015 /* Only the matching ones */
6016 for (i
= 0; i
< q
->nr
; i
++) {
6017 struct diff_filepair
*p
= q
->queue
[i
];
6018 if (match_filter(options
, p
))
6021 diff_free_filepair(p
);
6028 /* Check whether two filespecs with the same mode and size are identical */
6029 static int diff_filespec_is_identical(struct repository
*r
,
6030 struct diff_filespec
*one
,
6031 struct diff_filespec
*two
)
6033 if (S_ISGITLINK(one
->mode
))
6035 if (diff_populate_filespec(r
, one
, 0))
6037 if (diff_populate_filespec(r
, two
, 0))
6039 return !memcmp(one
->data
, two
->data
, one
->size
);
6042 static int diff_filespec_check_stat_unmatch(struct repository
*r
,
6043 struct diff_filepair
*p
)
6045 if (p
->done_skip_stat_unmatch
)
6046 return p
->skip_stat_unmatch_result
;
6048 p
->done_skip_stat_unmatch
= 1;
6049 p
->skip_stat_unmatch_result
= 0;
6051 * 1. Entries that come from stat info dirtiness
6052 * always have both sides (iow, not create/delete),
6053 * one side of the object name is unknown, with
6054 * the same mode and size. Keep the ones that
6055 * do not match these criteria. They have real
6058 * 2. At this point, the file is known to be modified,
6059 * with the same mode and size, and the object
6060 * name of one side is unknown. Need to inspect
6061 * the identical contents.
6063 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
6064 !DIFF_FILE_VALID(p
->two
) ||
6065 (p
->one
->oid_valid
&& p
->two
->oid_valid
) ||
6066 (p
->one
->mode
!= p
->two
->mode
) ||
6067 diff_populate_filespec(r
, p
->one
, CHECK_SIZE_ONLY
) ||
6068 diff_populate_filespec(r
, p
->two
, CHECK_SIZE_ONLY
) ||
6069 (p
->one
->size
!= p
->two
->size
) ||
6070 !diff_filespec_is_identical(r
, p
->one
, p
->two
)) /* (2) */
6071 p
->skip_stat_unmatch_result
= 1;
6072 return p
->skip_stat_unmatch_result
;
6075 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
6078 struct diff_queue_struct
*q
= &diff_queued_diff
;
6079 struct diff_queue_struct outq
;
6080 DIFF_QUEUE_CLEAR(&outq
);
6082 for (i
= 0; i
< q
->nr
; i
++) {
6083 struct diff_filepair
*p
= q
->queue
[i
];
6085 if (diff_filespec_check_stat_unmatch(diffopt
->repo
, p
))
6089 * The caller can subtract 1 from skip_stat_unmatch
6090 * to determine how many paths were dirty only
6091 * due to stat info mismatch.
6093 if (!diffopt
->flags
.no_index
)
6094 diffopt
->skip_stat_unmatch
++;
6095 diff_free_filepair(p
);
6102 static int diffnamecmp(const void *a_
, const void *b_
)
6104 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
6105 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
6106 const char *name_a
, *name_b
;
6108 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
6109 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
6110 return strcmp(name_a
, name_b
);
6113 void diffcore_fix_diff_index(struct diff_options
*options
)
6115 struct diff_queue_struct
*q
= &diff_queued_diff
;
6116 QSORT(q
->queue
, q
->nr
, diffnamecmp
);
6119 void diffcore_std(struct diff_options
*options
)
6121 /* NOTE please keep the following in sync with diff_tree_combined() */
6122 if (options
->skip_stat_unmatch
)
6123 diffcore_skip_stat_unmatch(options
);
6124 if (!options
->found_follow
) {
6125 /* See try_to_follow_renames() in tree-diff.c */
6126 if (options
->break_opt
!= -1)
6127 diffcore_break(options
->repo
,
6128 options
->break_opt
);
6129 if (options
->detect_rename
)
6130 diffcore_rename(options
);
6131 if (options
->break_opt
!= -1)
6132 diffcore_merge_broken();
6134 if (options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
)
6135 diffcore_pickaxe(options
);
6136 if (options
->orderfile
)
6137 diffcore_order(options
->orderfile
);
6138 if (!options
->found_follow
)
6139 /* See try_to_follow_renames() in tree-diff.c */
6140 diff_resolve_rename_copy();
6141 diffcore_apply_filter(options
);
6143 if (diff_queued_diff
.nr
&& !options
->flags
.diff_from_contents
)
6144 options
->flags
.has_changes
= 1;
6146 options
->flags
.has_changes
= 0;
6148 options
->found_follow
= 0;
6151 int diff_result_code(struct diff_options
*opt
, int status
)
6155 diff_warn_rename_limit("diff.renameLimit",
6156 opt
->needed_rename_limit
,
6157 opt
->degraded_cc_to_c
);
6158 if (!opt
->flags
.exit_with_status
&&
6159 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
6161 if (opt
->flags
.exit_with_status
&&
6162 opt
->flags
.has_changes
)
6164 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
6165 opt
->flags
.check_failed
)
6170 int diff_can_quit_early(struct diff_options
*opt
)
6172 return (opt
->flags
.quick
&&
6174 opt
->flags
.has_changes
);
6178 * Shall changes to this submodule be ignored?
6180 * Submodule changes can be configured to be ignored separately for each path,
6181 * but that configuration can be overridden from the command line.
6183 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
6186 struct diff_flags orig_flags
= options
->flags
;
6187 if (!options
->flags
.override_submodule_config
)
6188 set_diffopt_flags_from_submodule_config(options
, path
);
6189 if (options
->flags
.ignore_submodules
)
6191 options
->flags
= orig_flags
;
6195 void diff_addremove(struct diff_options
*options
,
6196 int addremove
, unsigned mode
,
6197 const struct object_id
*oid
,
6199 const char *concatpath
, unsigned dirty_submodule
)
6201 struct diff_filespec
*one
, *two
;
6203 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
6206 /* This may look odd, but it is a preparation for
6207 * feeding "there are unchanged files which should
6208 * not produce diffs, but when you are doing copy
6209 * detection you would need them, so here they are"
6210 * entries to the diff-core. They will be prefixed
6211 * with something like '=' or '*' (I haven't decided
6212 * which but should not make any difference).
6213 * Feeding the same new and old to diff_change()
6214 * also has the same effect.
6215 * Before the final output happens, they are pruned after
6216 * merged into rename/copy pairs as appropriate.
6218 if (options
->flags
.reverse_diff
)
6219 addremove
= (addremove
== '+' ? '-' :
6220 addremove
== '-' ? '+' : addremove
);
6222 if (options
->prefix
&&
6223 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
6226 one
= alloc_filespec(concatpath
);
6227 two
= alloc_filespec(concatpath
);
6229 if (addremove
!= '+')
6230 fill_filespec(one
, oid
, oid_valid
, mode
);
6231 if (addremove
!= '-') {
6232 fill_filespec(two
, oid
, oid_valid
, mode
);
6233 two
->dirty_submodule
= dirty_submodule
;
6236 diff_queue(&diff_queued_diff
, one
, two
);
6237 if (!options
->flags
.diff_from_contents
)
6238 options
->flags
.has_changes
= 1;
6241 void diff_change(struct diff_options
*options
,
6242 unsigned old_mode
, unsigned new_mode
,
6243 const struct object_id
*old_oid
,
6244 const struct object_id
*new_oid
,
6245 int old_oid_valid
, int new_oid_valid
,
6246 const char *concatpath
,
6247 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
6249 struct diff_filespec
*one
, *two
;
6250 struct diff_filepair
*p
;
6252 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
6253 is_submodule_ignored(concatpath
, options
))
6256 if (options
->flags
.reverse_diff
) {
6257 SWAP(old_mode
, new_mode
);
6258 SWAP(old_oid
, new_oid
);
6259 SWAP(old_oid_valid
, new_oid_valid
);
6260 SWAP(old_dirty_submodule
, new_dirty_submodule
);
6263 if (options
->prefix
&&
6264 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
6267 one
= alloc_filespec(concatpath
);
6268 two
= alloc_filespec(concatpath
);
6269 fill_filespec(one
, old_oid
, old_oid_valid
, old_mode
);
6270 fill_filespec(two
, new_oid
, new_oid_valid
, new_mode
);
6271 one
->dirty_submodule
= old_dirty_submodule
;
6272 two
->dirty_submodule
= new_dirty_submodule
;
6273 p
= diff_queue(&diff_queued_diff
, one
, two
);
6275 if (options
->flags
.diff_from_contents
)
6278 if (options
->flags
.quick
&& options
->skip_stat_unmatch
&&
6279 !diff_filespec_check_stat_unmatch(options
->repo
, p
))
6282 options
->flags
.has_changes
= 1;
6285 struct diff_filepair
*diff_unmerge(struct diff_options
*options
, const char *path
)
6287 struct diff_filepair
*pair
;
6288 struct diff_filespec
*one
, *two
;
6290 if (options
->prefix
&&
6291 strncmp(path
, options
->prefix
, options
->prefix_length
))
6294 one
= alloc_filespec(path
);
6295 two
= alloc_filespec(path
);
6296 pair
= diff_queue(&diff_queued_diff
, one
, two
);
6297 pair
->is_unmerged
= 1;
6301 static char *run_textconv(struct repository
*r
,
6303 struct diff_filespec
*spec
,
6306 struct diff_tempfile
*temp
;
6307 const char *argv
[3];
6308 const char **arg
= argv
;
6309 struct child_process child
= CHILD_PROCESS_INIT
;
6310 struct strbuf buf
= STRBUF_INIT
;
6313 temp
= prepare_temp_file(r
, spec
->path
, spec
);
6315 *arg
++ = temp
->name
;
6318 child
.use_shell
= 1;
6321 if (start_command(&child
)) {
6326 if (strbuf_read(&buf
, child
.out
, 0) < 0)
6327 err
= error("error reading from textconv command '%s'", pgm
);
6330 if (finish_command(&child
) || err
) {
6331 strbuf_release(&buf
);
6337 return strbuf_detach(&buf
, outsize
);
6340 size_t fill_textconv(struct repository
*r
,
6341 struct userdiff_driver
*driver
,
6342 struct diff_filespec
*df
,
6348 if (!DIFF_FILE_VALID(df
)) {
6352 if (diff_populate_filespec(r
, df
, 0))
6353 die("unable to read files to diff");
6358 if (!driver
->textconv
)
6359 BUG("fill_textconv called with non-textconv driver");
6361 if (driver
->textconv_cache
&& df
->oid_valid
) {
6362 *outbuf
= notes_cache_get(driver
->textconv_cache
,
6369 *outbuf
= run_textconv(r
, driver
->textconv
, df
, &size
);
6371 die("unable to read files to diff");
6373 if (driver
->textconv_cache
&& df
->oid_valid
) {
6374 /* ignore errors, as we might be in a readonly repository */
6375 notes_cache_put(driver
->textconv_cache
, &df
->oid
, *outbuf
,
6378 * we could save up changes and flush them all at the end,
6379 * but we would need an extra call after all diffing is done.
6380 * Since generating a cache entry is the slow path anyway,
6381 * this extra overhead probably isn't a big deal.
6383 notes_cache_write(driver
->textconv_cache
);
6389 int textconv_object(struct repository
*r
,
6392 const struct object_id
*oid
,
6395 unsigned long *buf_size
)
6397 struct diff_filespec
*df
;
6398 struct userdiff_driver
*textconv
;
6400 df
= alloc_filespec(path
);
6401 fill_filespec(df
, oid
, oid_valid
, mode
);
6402 textconv
= get_textconv(df
);
6408 *buf_size
= fill_textconv(r
, textconv
, df
, buf
);
6413 void setup_diff_pager(struct diff_options
*opt
)
6416 * If the user asked for our exit code, then either they want --quiet
6417 * or --exit-code. We should definitely not bother with a pager in the
6418 * former case, as we will generate no output. Since we still properly
6419 * report our exit code even when a pager is run, we _could_ run a
6420 * pager with --exit-code. But since we have not done so historically,
6421 * and because it is easy to find people oneline advising "git diff
6422 * --exit-code" in hooks and other scripts, we do not do so.
6424 if (!opt
->flags
.exit_with_status
&&
6425 check_pager_config("diff") != 0)