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"
26 #include "parse-options.h"
29 #ifdef NO_FAST_WORKING_DIRECTORY
30 #define FAST_WORKING_DIRECTORY 0
32 #define FAST_WORKING_DIRECTORY 1
35 static int diff_detect_rename_default
;
36 static int diff_indent_heuristic
= 1;
37 static int diff_rename_limit_default
= 400;
38 static int diff_suppress_blank_empty
;
39 static int diff_use_color_default
= -1;
40 static int diff_color_moved_default
;
41 static int diff_color_moved_ws_default
;
42 static int diff_context_default
= 3;
43 static int diff_interhunk_context_default
;
44 static const char *diff_word_regex_cfg
;
45 static const char *external_diff_cmd_cfg
;
46 static const char *diff_order_file_cfg
;
47 int diff_auto_refresh_index
= 1;
48 static int diff_mnemonic_prefix
;
49 static int diff_no_prefix
;
50 static int diff_stat_graph_width
;
51 static int diff_dirstat_permille_default
= 30;
52 static struct diff_options default_diff_options
;
53 static long diff_algorithm
;
54 static unsigned ws_error_highlight_default
= WSEH_NEW
;
56 static char diff_colors
[][COLOR_MAXLEN
] = {
58 GIT_COLOR_NORMAL
, /* CONTEXT */
59 GIT_COLOR_BOLD
, /* METAINFO */
60 GIT_COLOR_CYAN
, /* FRAGINFO */
61 GIT_COLOR_RED
, /* OLD */
62 GIT_COLOR_GREEN
, /* NEW */
63 GIT_COLOR_YELLOW
, /* COMMIT */
64 GIT_COLOR_BG_RED
, /* WHITESPACE */
65 GIT_COLOR_NORMAL
, /* FUNCINFO */
66 GIT_COLOR_BOLD_MAGENTA
, /* OLD_MOVED */
67 GIT_COLOR_BOLD_BLUE
, /* OLD_MOVED ALTERNATIVE */
68 GIT_COLOR_FAINT
, /* OLD_MOVED_DIM */
69 GIT_COLOR_FAINT_ITALIC
, /* OLD_MOVED_ALTERNATIVE_DIM */
70 GIT_COLOR_BOLD_CYAN
, /* NEW_MOVED */
71 GIT_COLOR_BOLD_YELLOW
, /* NEW_MOVED ALTERNATIVE */
72 GIT_COLOR_FAINT
, /* NEW_MOVED_DIM */
73 GIT_COLOR_FAINT_ITALIC
, /* NEW_MOVED_ALTERNATIVE_DIM */
74 GIT_COLOR_FAINT
, /* CONTEXT_DIM */
75 GIT_COLOR_FAINT_RED
, /* OLD_DIM */
76 GIT_COLOR_FAINT_GREEN
, /* NEW_DIM */
77 GIT_COLOR_BOLD
, /* CONTEXT_BOLD */
78 GIT_COLOR_BOLD_RED
, /* OLD_BOLD */
79 GIT_COLOR_BOLD_GREEN
, /* NEW_BOLD */
82 static const char *color_diff_slots
[] = {
83 [DIFF_CONTEXT
] = "context",
84 [DIFF_METAINFO
] = "meta",
85 [DIFF_FRAGINFO
] = "frag",
86 [DIFF_FILE_OLD
] = "old",
87 [DIFF_FILE_NEW
] = "new",
88 [DIFF_COMMIT
] = "commit",
89 [DIFF_WHITESPACE
] = "whitespace",
90 [DIFF_FUNCINFO
] = "func",
91 [DIFF_FILE_OLD_MOVED
] = "oldMoved",
92 [DIFF_FILE_OLD_MOVED_ALT
] = "oldMovedAlternative",
93 [DIFF_FILE_OLD_MOVED_DIM
] = "oldMovedDimmed",
94 [DIFF_FILE_OLD_MOVED_ALT_DIM
] = "oldMovedAlternativeDimmed",
95 [DIFF_FILE_NEW_MOVED
] = "newMoved",
96 [DIFF_FILE_NEW_MOVED_ALT
] = "newMovedAlternative",
97 [DIFF_FILE_NEW_MOVED_DIM
] = "newMovedDimmed",
98 [DIFF_FILE_NEW_MOVED_ALT_DIM
] = "newMovedAlternativeDimmed",
99 [DIFF_CONTEXT_DIM
] = "contextDimmed",
100 [DIFF_FILE_OLD_DIM
] = "oldDimmed",
101 [DIFF_FILE_NEW_DIM
] = "newDimmed",
102 [DIFF_CONTEXT_BOLD
] = "contextBold",
103 [DIFF_FILE_OLD_BOLD
] = "oldBold",
104 [DIFF_FILE_NEW_BOLD
] = "newBold",
107 define_list_config_array_extra(color_diff_slots
, {"plain"});
109 static int parse_diff_color_slot(const char *var
)
111 if (!strcasecmp(var
, "plain"))
113 return LOOKUP_CONFIG(color_diff_slots
, var
);
116 static int parse_dirstat_params(struct diff_options
*options
, const char *params_string
,
117 struct strbuf
*errmsg
)
119 char *params_copy
= xstrdup(params_string
);
120 struct string_list params
= STRING_LIST_INIT_NODUP
;
125 string_list_split_in_place(¶ms
, params_copy
, ',', -1);
126 for (i
= 0; i
< params
.nr
; i
++) {
127 const char *p
= params
.items
[i
].string
;
128 if (!strcmp(p
, "changes")) {
129 options
->flags
.dirstat_by_line
= 0;
130 options
->flags
.dirstat_by_file
= 0;
131 } else if (!strcmp(p
, "lines")) {
132 options
->flags
.dirstat_by_line
= 1;
133 options
->flags
.dirstat_by_file
= 0;
134 } else if (!strcmp(p
, "files")) {
135 options
->flags
.dirstat_by_line
= 0;
136 options
->flags
.dirstat_by_file
= 1;
137 } else if (!strcmp(p
, "noncumulative")) {
138 options
->flags
.dirstat_cumulative
= 0;
139 } else if (!strcmp(p
, "cumulative")) {
140 options
->flags
.dirstat_cumulative
= 1;
141 } else if (isdigit(*p
)) {
143 int permille
= strtoul(p
, &end
, 10) * 10;
144 if (*end
== '.' && isdigit(*++end
)) {
145 /* only use first digit */
146 permille
+= *end
- '0';
147 /* .. and ignore any further digits */
148 while (isdigit(*++end
))
152 options
->dirstat_permille
= permille
;
154 strbuf_addf(errmsg
, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
159 strbuf_addf(errmsg
, _(" Unknown dirstat parameter '%s'\n"), p
);
164 string_list_clear(¶ms
, 0);
169 static int parse_submodule_params(struct diff_options
*options
, const char *value
)
171 if (!strcmp(value
, "log"))
172 options
->submodule_format
= DIFF_SUBMODULE_LOG
;
173 else if (!strcmp(value
, "short"))
174 options
->submodule_format
= DIFF_SUBMODULE_SHORT
;
175 else if (!strcmp(value
, "diff"))
176 options
->submodule_format
= DIFF_SUBMODULE_INLINE_DIFF
;
182 int git_config_rename(const char *var
, const char *value
)
185 return DIFF_DETECT_RENAME
;
186 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
187 return DIFF_DETECT_COPY
;
188 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
191 long parse_algorithm_value(const char *value
)
195 else if (!strcasecmp(value
, "myers") || !strcasecmp(value
, "default"))
197 else if (!strcasecmp(value
, "minimal"))
198 return XDF_NEED_MINIMAL
;
199 else if (!strcasecmp(value
, "patience"))
200 return XDF_PATIENCE_DIFF
;
201 else if (!strcasecmp(value
, "histogram"))
202 return XDF_HISTOGRAM_DIFF
;
206 static int parse_one_token(const char **arg
, const char *token
)
209 if (skip_prefix(*arg
, token
, &rest
) && (!*rest
|| *rest
== ',')) {
216 static int parse_ws_error_highlight(const char *arg
)
218 const char *orig_arg
= arg
;
222 if (parse_one_token(&arg
, "none"))
224 else if (parse_one_token(&arg
, "default"))
226 else if (parse_one_token(&arg
, "all"))
227 val
= WSEH_NEW
| WSEH_OLD
| WSEH_CONTEXT
;
228 else if (parse_one_token(&arg
, "new"))
230 else if (parse_one_token(&arg
, "old"))
232 else if (parse_one_token(&arg
, "context"))
235 return -1 - (int)(arg
- orig_arg
);
244 * These are to give UI layer defaults.
245 * The core-level commands such as git-diff-files should
246 * never be affected by the setting of diff.renames
247 * the user happens to have in the configuration file.
249 void init_diff_ui_defaults(void)
251 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
254 int git_diff_heuristic_config(const char *var
, const char *value
, void *cb
)
256 if (!strcmp(var
, "diff.indentheuristic"))
257 diff_indent_heuristic
= git_config_bool(var
, value
);
261 static int parse_color_moved(const char *arg
)
263 switch (git_parse_maybe_bool(arg
)) {
265 return COLOR_MOVED_NO
;
267 return COLOR_MOVED_DEFAULT
;
272 if (!strcmp(arg
, "no"))
273 return COLOR_MOVED_NO
;
274 else if (!strcmp(arg
, "plain"))
275 return COLOR_MOVED_PLAIN
;
276 else if (!strcmp(arg
, "blocks"))
277 return COLOR_MOVED_BLOCKS
;
278 else if (!strcmp(arg
, "zebra"))
279 return COLOR_MOVED_ZEBRA
;
280 else if (!strcmp(arg
, "default"))
281 return COLOR_MOVED_DEFAULT
;
282 else if (!strcmp(arg
, "dimmed-zebra"))
283 return COLOR_MOVED_ZEBRA_DIM
;
284 else if (!strcmp(arg
, "dimmed_zebra"))
285 return COLOR_MOVED_ZEBRA_DIM
;
287 return error(_("color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"));
290 static unsigned parse_color_moved_ws(const char *arg
)
293 struct string_list l
= STRING_LIST_INIT_DUP
;
294 struct string_list_item
*i
;
296 string_list_split(&l
, arg
, ',', -1);
298 for_each_string_list_item(i
, &l
) {
299 struct strbuf sb
= STRBUF_INIT
;
300 strbuf_addstr(&sb
, i
->string
);
303 if (!strcmp(sb
.buf
, "ignore-space-change"))
304 ret
|= XDF_IGNORE_WHITESPACE_CHANGE
;
305 else if (!strcmp(sb
.buf
, "ignore-space-at-eol"))
306 ret
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
307 else if (!strcmp(sb
.buf
, "ignore-all-space"))
308 ret
|= XDF_IGNORE_WHITESPACE
;
309 else if (!strcmp(sb
.buf
, "allow-indentation-change"))
310 ret
|= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
;
312 ret
|= COLOR_MOVED_WS_ERROR
;
313 error(_("unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"), sb
.buf
);
319 if ((ret
& COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
) &&
320 (ret
& XDF_WHITESPACE_FLAGS
)) {
321 error(_("color-moved-ws: allow-indentation-change cannot be combined with other white space modes"));
322 ret
|= COLOR_MOVED_WS_ERROR
;
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 unsigned cm
= parse_color_moved_ws(value
);
345 if (cm
& COLOR_MOVED_WS_ERROR
)
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_sign
, 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
;
633 int needs_reset
= 0; /* at the end of the line */
634 FILE *file
= o
->file
;
636 fputs(diff_line_prefix(o
), file
);
638 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
639 if (has_trailing_newline
)
642 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
643 if (has_trailing_carriage_return
)
649 if (reverse
&& want_color(o
->use_color
)) {
650 fputs(GIT_COLOR_REVERSE
, file
);
655 fputs(set_sign
, file
);
666 if (set_sign
&& set
!= set_sign
)
671 fwrite(line
, len
, 1, file
);
672 needs_reset
= 1; /* 'line' may contain color codes. */
677 if (has_trailing_carriage_return
)
679 if (has_trailing_newline
)
683 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
684 const char *line
, int len
)
686 emit_line_0(o
, set
, NULL
, 0, reset
, 0, line
, len
);
690 DIFF_SYMBOL_BINARY_DIFF_HEADER
,
691 DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
,
692 DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
,
693 DIFF_SYMBOL_BINARY_DIFF_BODY
,
694 DIFF_SYMBOL_BINARY_DIFF_FOOTER
,
695 DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
,
696 DIFF_SYMBOL_STATS_SUMMARY_ABBREV
,
697 DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
,
698 DIFF_SYMBOL_STATS_LINE
,
699 DIFF_SYMBOL_WORD_DIFF
,
700 DIFF_SYMBOL_STAT_SEP
,
702 DIFF_SYMBOL_SUBMODULE_ADD
,
703 DIFF_SYMBOL_SUBMODULE_DEL
,
704 DIFF_SYMBOL_SUBMODULE_UNTRACKED
,
705 DIFF_SYMBOL_SUBMODULE_MODIFIED
,
706 DIFF_SYMBOL_SUBMODULE_HEADER
,
707 DIFF_SYMBOL_SUBMODULE_ERROR
,
708 DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
,
709 DIFF_SYMBOL_REWRITE_DIFF
,
710 DIFF_SYMBOL_BINARY_FILES
,
712 DIFF_SYMBOL_FILEPAIR_PLUS
,
713 DIFF_SYMBOL_FILEPAIR_MINUS
,
714 DIFF_SYMBOL_WORDS_PORCELAIN
,
717 DIFF_SYMBOL_CONTEXT_INCOMPLETE
,
720 DIFF_SYMBOL_NO_LF_EOF
,
721 DIFF_SYMBOL_CONTEXT_FRAGINFO
,
722 DIFF_SYMBOL_CONTEXT_MARKER
,
723 DIFF_SYMBOL_SEPARATOR
726 * Flags for content lines:
727 * 0..12 are whitespace rules
728 * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
729 * 16 is marking if the line is blank at EOF
731 #define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF (1<<16)
732 #define DIFF_SYMBOL_MOVED_LINE (1<<17)
733 #define DIFF_SYMBOL_MOVED_LINE_ALT (1<<18)
734 #define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING (1<<19)
735 #define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)
738 * This struct is used when we need to buffer the output of the diff output.
740 * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
741 * into the pre/post image file. This pointer could be a union with the
742 * line pointer. By storing an offset into the file instead of the literal line,
743 * we can decrease the memory footprint for the buffered output. At first we
744 * may want to only have indirection for the content lines, but we could also
745 * enhance the state for emitting prefabricated lines, e.g. the similarity
746 * score line or hunk/file headers would only need to store a number or path
747 * and then the output can be constructed later on depending on state.
749 struct emitted_diff_symbol
{
755 #define EMITTED_DIFF_SYMBOL_INIT {NULL}
757 struct emitted_diff_symbols
{
758 struct emitted_diff_symbol
*buf
;
761 #define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
763 static void append_emitted_diff_symbol(struct diff_options
*o
,
764 struct emitted_diff_symbol
*e
)
766 struct emitted_diff_symbol
*f
;
768 ALLOC_GROW(o
->emitted_symbols
->buf
,
769 o
->emitted_symbols
->nr
+ 1,
770 o
->emitted_symbols
->alloc
);
771 f
= &o
->emitted_symbols
->buf
[o
->emitted_symbols
->nr
++];
773 memcpy(f
, e
, sizeof(struct emitted_diff_symbol
));
774 f
->line
= e
->line
? xmemdupz(e
->line
, e
->len
) : NULL
;
778 struct hashmap_entry ent
;
779 const struct emitted_diff_symbol
*es
;
780 struct moved_entry
*next_line
;
784 * The struct ws_delta holds white space differences between moved lines, i.e.
785 * between '+' and '-' lines that have been detected to be a move.
786 * The string contains the difference in leading white spaces, before the
787 * rest of the line is compared using the white space config for move
788 * coloring. The current_longer indicates if the first string in the
789 * comparision is longer than the second.
793 unsigned int current_longer
: 1;
795 #define WS_DELTA_INIT { NULL, 0 }
798 struct moved_entry
*match
;
802 static void moved_block_clear(struct moved_block
*b
)
804 FREE_AND_NULL(b
->wsd
.string
);
808 static int compute_ws_delta(const struct emitted_diff_symbol
*a
,
809 const struct emitted_diff_symbol
*b
,
810 struct ws_delta
*out
)
812 const struct emitted_diff_symbol
*longer
= a
->len
> b
->len
? a
: b
;
813 const struct emitted_diff_symbol
*shorter
= a
->len
> b
->len
? b
: a
;
814 int d
= longer
->len
- shorter
->len
;
816 if (strncmp(longer
->line
+ d
, shorter
->line
, shorter
->len
))
819 out
->string
= xmemdupz(longer
->line
, d
);
820 out
->current_longer
= (a
== longer
);
825 static int cmp_in_block_with_wsd(const struct diff_options
*o
,
826 const struct moved_entry
*cur
,
827 const struct moved_entry
*match
,
828 struct moved_block
*pmb
,
831 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
832 int al
= cur
->es
->len
, cl
= l
->len
;
833 const char *a
= cur
->es
->line
,
834 *b
= match
->es
->line
,
840 * We need to check if 'cur' is equal to 'match'.
841 * As those are from the same (+/-) side, we do not need to adjust for
842 * indent changes. However these were found using fuzzy matching
843 * so we do have to check if they are equal.
848 if (!pmb
->wsd
.string
)
850 * The white space delta is not active? This can happen
851 * when we exit early in this function.
856 * The indent changes of the block are known and stored in
857 * pmb->wsd; however we need to check if the indent changes of the
858 * current line are still the same as before.
860 * To do so we need to compare 'l' to 'cur', adjusting the
861 * one of them for the white spaces, depending which was longer.
864 wslen
= strlen(pmb
->wsd
.string
);
865 if (pmb
->wsd
.current_longer
) {
873 if (al
!= cl
|| memcmp(a
, c
, al
))
879 static int moved_entry_cmp(const void *hashmap_cmp_fn_data
,
881 const void *entry_or_key
,
884 const struct diff_options
*diffopt
= hashmap_cmp_fn_data
;
885 const struct moved_entry
*a
= entry
;
886 const struct moved_entry
*b
= entry_or_key
;
887 unsigned flags
= diffopt
->color_moved_ws_handling
888 & XDF_WHITESPACE_FLAGS
;
890 if (diffopt
->color_moved_ws_handling
&
891 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
)
893 * As there is not specific white space config given,
894 * we'd need to check for a new block, so ignore all
895 * white space. The setup of the white space
896 * configuration for the next block is done else where
898 flags
|= XDF_IGNORE_WHITESPACE
;
900 return !xdiff_compare_lines(a
->es
->line
, a
->es
->len
,
901 b
->es
->line
, b
->es
->len
,
905 static struct moved_entry
*prepare_entry(struct diff_options
*o
,
908 struct moved_entry
*ret
= xmalloc(sizeof(*ret
));
909 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[line_no
];
910 unsigned flags
= o
->color_moved_ws_handling
& XDF_WHITESPACE_FLAGS
;
912 ret
->ent
.hash
= xdiff_hash_string(l
->line
, l
->len
, flags
);
914 ret
->next_line
= NULL
;
919 static void add_lines_to_move_detection(struct diff_options
*o
,
920 struct hashmap
*add_lines
,
921 struct hashmap
*del_lines
)
923 struct moved_entry
*prev_line
= NULL
;
926 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
928 struct moved_entry
*key
;
930 switch (o
->emitted_symbols
->buf
[n
].s
) {
931 case DIFF_SYMBOL_PLUS
:
934 case DIFF_SYMBOL_MINUS
:
942 key
= prepare_entry(o
, n
);
943 if (prev_line
&& prev_line
->es
->s
== o
->emitted_symbols
->buf
[n
].s
)
944 prev_line
->next_line
= key
;
946 hashmap_add(hm
, key
);
951 static void pmb_advance_or_null(struct diff_options
*o
,
952 struct moved_entry
*match
,
954 struct moved_block
*pmb
,
958 for (i
= 0; i
< pmb_nr
; i
++) {
959 struct moved_entry
*prev
= pmb
[i
].match
;
960 struct moved_entry
*cur
= (prev
&& prev
->next_line
) ?
961 prev
->next_line
: NULL
;
962 if (cur
&& !hm
->cmpfn(o
, cur
, match
, NULL
)) {
970 static void pmb_advance_or_null_multi_match(struct diff_options
*o
,
971 struct moved_entry
*match
,
973 struct moved_block
*pmb
,
977 char *got_match
= xcalloc(1, pmb_nr
);
979 for (; match
; match
= hashmap_get_next(hm
, match
)) {
980 for (i
= 0; i
< pmb_nr
; i
++) {
981 struct moved_entry
*prev
= pmb
[i
].match
;
982 struct moved_entry
*cur
= (prev
&& prev
->next_line
) ?
983 prev
->next_line
: NULL
;
986 if (!cmp_in_block_with_wsd(o
, cur
, match
, &pmb
[i
], n
))
991 for (i
= 0; i
< pmb_nr
; i
++) {
993 /* Advance to the next line */
994 pmb
[i
].match
= pmb
[i
].match
->next_line
;
996 moved_block_clear(&pmb
[i
]);
1003 static int shrink_potential_moved_blocks(struct moved_block
*pmb
,
1008 /* Shrink the set of potential block to the remaining running */
1009 for (lp
= 0, rp
= pmb_nr
- 1; lp
<= rp
;) {
1010 while (lp
< pmb_nr
&& pmb
[lp
].match
)
1012 /* lp points at the first NULL now */
1014 while (rp
> -1 && !pmb
[rp
].match
)
1016 /* rp points at the last non-NULL */
1018 if (lp
< pmb_nr
&& rp
> -1 && lp
< rp
) {
1020 pmb
[rp
].match
= NULL
;
1021 pmb
[rp
].wsd
.string
= NULL
;
1027 /* Remember the number of running sets */
1032 * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
1034 * Otherwise, if the last block has fewer alphanumeric characters than
1035 * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
1038 * The last block consists of the (n - block_length)'th line up to but not
1039 * including the nth line.
1041 * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
1042 * Think of a way to unify them.
1044 static void adjust_last_block(struct diff_options
*o
, int n
, int block_length
)
1046 int i
, alnum_count
= 0;
1047 if (o
->color_moved
== COLOR_MOVED_PLAIN
)
1049 for (i
= 1; i
< block_length
+ 1; i
++) {
1050 const char *c
= o
->emitted_symbols
->buf
[n
- i
].line
;
1055 if (alnum_count
>= COLOR_MOVED_MIN_ALNUM_COUNT
)
1059 for (i
= 1; i
< block_length
+ 1; i
++)
1060 o
->emitted_symbols
->buf
[n
- i
].flags
&= ~DIFF_SYMBOL_MOVED_LINE
;
1063 /* Find blocks of moved code, delegate actual coloring decision to helper */
1064 static void mark_color_as_moved(struct diff_options
*o
,
1065 struct hashmap
*add_lines
,
1066 struct hashmap
*del_lines
)
1068 struct moved_block
*pmb
= NULL
; /* potentially moved blocks */
1069 int pmb_nr
= 0, pmb_alloc
= 0;
1070 int n
, flipped_block
= 1, block_length
= 0;
1073 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
1074 struct hashmap
*hm
= NULL
;
1075 struct moved_entry
*key
;
1076 struct moved_entry
*match
= NULL
;
1077 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
1080 case DIFF_SYMBOL_PLUS
:
1082 key
= prepare_entry(o
, n
);
1083 match
= hashmap_get(hm
, key
, NULL
);
1086 case DIFF_SYMBOL_MINUS
:
1088 key
= prepare_entry(o
, n
);
1089 match
= hashmap_get(hm
, key
, NULL
);
1099 adjust_last_block(o
, n
, block_length
);
1100 for(i
= 0; i
< pmb_nr
; i
++)
1101 moved_block_clear(&pmb
[i
]);
1107 l
->flags
|= DIFF_SYMBOL_MOVED_LINE
;
1109 if (o
->color_moved
== COLOR_MOVED_PLAIN
)
1112 if (o
->color_moved_ws_handling
&
1113 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
)
1114 pmb_advance_or_null_multi_match(o
, match
, hm
, pmb
, pmb_nr
, n
);
1116 pmb_advance_or_null(o
, match
, hm
, pmb
, pmb_nr
);
1118 pmb_nr
= shrink_potential_moved_blocks(pmb
, pmb_nr
);
1122 * The current line is the start of a new block.
1123 * Setup the set of potential blocks.
1125 for (; match
; match
= hashmap_get_next(hm
, match
)) {
1126 ALLOC_GROW(pmb
, pmb_nr
+ 1, pmb_alloc
);
1127 if (o
->color_moved_ws_handling
&
1128 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
) {
1129 if (compute_ws_delta(l
, match
->es
,
1131 pmb
[pmb_nr
++].match
= match
;
1133 pmb
[pmb_nr
].wsd
.string
= NULL
;
1134 pmb
[pmb_nr
++].match
= match
;
1138 flipped_block
= (flipped_block
+ 1) % 2;
1140 adjust_last_block(o
, n
, block_length
);
1146 if (flipped_block
&& o
->color_moved
!= COLOR_MOVED_BLOCKS
)
1147 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_ALT
;
1149 adjust_last_block(o
, n
, block_length
);
1151 for(n
= 0; n
< pmb_nr
; n
++)
1152 moved_block_clear(&pmb
[n
]);
1156 #define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
1157 (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
1158 static void dim_moved_lines(struct diff_options
*o
)
1161 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
1162 struct emitted_diff_symbol
*prev
= (n
!= 0) ?
1163 &o
->emitted_symbols
->buf
[n
- 1] : NULL
;
1164 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
1165 struct emitted_diff_symbol
*next
=
1166 (n
< o
->emitted_symbols
->nr
- 1) ?
1167 &o
->emitted_symbols
->buf
[n
+ 1] : NULL
;
1169 /* Not a plus or minus line? */
1170 if (l
->s
!= DIFF_SYMBOL_PLUS
&& l
->s
!= DIFF_SYMBOL_MINUS
)
1173 /* Not a moved line? */
1174 if (!(l
->flags
& DIFF_SYMBOL_MOVED_LINE
))
1178 * If prev or next are not a plus or minus line,
1179 * pretend they don't exist
1181 if (prev
&& prev
->s
!= DIFF_SYMBOL_PLUS
&&
1182 prev
->s
!= DIFF_SYMBOL_MINUS
)
1184 if (next
&& next
->s
!= DIFF_SYMBOL_PLUS
&&
1185 next
->s
!= DIFF_SYMBOL_MINUS
)
1188 /* Inside a block? */
1190 (prev
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
) ==
1191 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
)) &&
1193 (next
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
) ==
1194 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
))) {
1195 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
;
1199 /* Check if we are at an interesting bound: */
1200 if (prev
&& (prev
->flags
& DIFF_SYMBOL_MOVED_LINE
) &&
1201 (prev
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
) !=
1202 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
))
1204 if (next
&& (next
->flags
& DIFF_SYMBOL_MOVED_LINE
) &&
1205 (next
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
) !=
1206 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
))
1210 * The boundary to prev and next are not interesting,
1211 * so this line is not interesting as a whole
1213 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
;
1217 static void emit_line_ws_markup(struct diff_options
*o
,
1218 const char *set_sign
, const char *set
,
1220 int sign_index
, const char *line
, int len
,
1221 unsigned ws_rule
, int blank_at_eof
)
1223 const char *ws
= NULL
;
1224 int sign
= o
->output_indicators
[sign_index
];
1226 if (o
->ws_error_highlight
& ws_rule
) {
1227 ws
= diff_get_color_opt(o
, DIFF_WHITESPACE
);
1232 if (!ws
&& !set_sign
)
1233 emit_line_0(o
, set
, NULL
, 0, reset
, sign
, line
, len
);
1235 emit_line_0(o
, set_sign
, set
, !!set_sign
, reset
, sign
, line
, len
);
1236 } else if (blank_at_eof
)
1237 /* Blank line at EOF - paint '+' as well */
1238 emit_line_0(o
, ws
, NULL
, 0, reset
, sign
, line
, len
);
1240 /* Emit just the prefix, then the rest. */
1241 emit_line_0(o
, set_sign
? set_sign
: set
, NULL
, !!set_sign
, reset
,
1243 ws_check_emit(line
, len
, ws_rule
,
1244 o
->file
, set
, reset
, ws
);
1248 static void emit_diff_symbol_from_struct(struct diff_options
*o
,
1249 struct emitted_diff_symbol
*eds
)
1251 static const char *nneof
= " No newline at end of file\n";
1252 const char *context
, *reset
, *set
, *set_sign
, *meta
, *fraginfo
;
1253 struct strbuf sb
= STRBUF_INIT
;
1255 enum diff_symbol s
= eds
->s
;
1256 const char *line
= eds
->line
;
1258 unsigned flags
= eds
->flags
;
1261 case DIFF_SYMBOL_NO_LF_EOF
:
1262 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1263 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1264 putc('\n', o
->file
);
1265 emit_line_0(o
, context
, NULL
, 0, reset
, '\\',
1266 nneof
, strlen(nneof
));
1268 case DIFF_SYMBOL_SUBMODULE_HEADER
:
1269 case DIFF_SYMBOL_SUBMODULE_ERROR
:
1270 case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
:
1271 case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
:
1272 case DIFF_SYMBOL_SUMMARY
:
1273 case DIFF_SYMBOL_STATS_LINE
:
1274 case DIFF_SYMBOL_BINARY_DIFF_BODY
:
1275 case DIFF_SYMBOL_CONTEXT_FRAGINFO
:
1276 emit_line(o
, "", "", line
, len
);
1278 case DIFF_SYMBOL_CONTEXT_INCOMPLETE
:
1279 case DIFF_SYMBOL_CONTEXT_MARKER
:
1280 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1281 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1282 emit_line(o
, context
, reset
, line
, len
);
1284 case DIFF_SYMBOL_SEPARATOR
:
1285 fprintf(o
->file
, "%s%c",
1286 diff_line_prefix(o
),
1287 o
->line_termination
);
1289 case DIFF_SYMBOL_CONTEXT
:
1290 set
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1291 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1293 if (o
->flags
.dual_color_diffed_diffs
) {
1294 char c
= !len
? 0 : line
[0];
1297 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1299 set
= diff_get_color_opt(o
, DIFF_FRAGINFO
);
1301 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1303 emit_line_ws_markup(o
, set_sign
, set
, reset
,
1304 OUTPUT_INDICATOR_CONTEXT
, line
, len
,
1305 flags
& (DIFF_SYMBOL_CONTENT_WS_MASK
), 0);
1307 case DIFF_SYMBOL_PLUS
:
1308 switch (flags
& (DIFF_SYMBOL_MOVED_LINE
|
1309 DIFF_SYMBOL_MOVED_LINE_ALT
|
1310 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
)) {
1311 case DIFF_SYMBOL_MOVED_LINE
|
1312 DIFF_SYMBOL_MOVED_LINE_ALT
|
1313 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1314 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_ALT_DIM
);
1316 case DIFF_SYMBOL_MOVED_LINE
|
1317 DIFF_SYMBOL_MOVED_LINE_ALT
:
1318 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_ALT
);
1320 case DIFF_SYMBOL_MOVED_LINE
|
1321 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1322 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_DIM
);
1324 case DIFF_SYMBOL_MOVED_LINE
:
1325 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED
);
1328 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1330 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1331 if (!o
->flags
.dual_color_diffed_diffs
)
1334 char c
= !len
? 0 : line
[0];
1338 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_BOLD
);
1340 set
= diff_get_color_opt(o
, DIFF_FRAGINFO
);
1342 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_BOLD
);
1344 set
= diff_get_color_opt(o
, DIFF_CONTEXT_BOLD
);
1345 flags
&= ~DIFF_SYMBOL_CONTENT_WS_MASK
;
1347 emit_line_ws_markup(o
, set_sign
, set
, reset
,
1348 OUTPUT_INDICATOR_NEW
, line
, len
,
1349 flags
& DIFF_SYMBOL_CONTENT_WS_MASK
,
1350 flags
& DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF
);
1352 case DIFF_SYMBOL_MINUS
:
1353 switch (flags
& (DIFF_SYMBOL_MOVED_LINE
|
1354 DIFF_SYMBOL_MOVED_LINE_ALT
|
1355 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
)) {
1356 case DIFF_SYMBOL_MOVED_LINE
|
1357 DIFF_SYMBOL_MOVED_LINE_ALT
|
1358 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1359 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_ALT_DIM
);
1361 case DIFF_SYMBOL_MOVED_LINE
|
1362 DIFF_SYMBOL_MOVED_LINE_ALT
:
1363 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_ALT
);
1365 case DIFF_SYMBOL_MOVED_LINE
|
1366 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1367 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_DIM
);
1369 case DIFF_SYMBOL_MOVED_LINE
:
1370 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED
);
1373 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1375 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1376 if (!o
->flags
.dual_color_diffed_diffs
)
1379 char c
= !len
? 0 : line
[0];
1383 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_DIM
);
1385 set
= diff_get_color_opt(o
, DIFF_FRAGINFO
);
1387 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_DIM
);
1389 set
= diff_get_color_opt(o
, DIFF_CONTEXT_DIM
);
1391 emit_line_ws_markup(o
, set_sign
, set
, reset
,
1392 OUTPUT_INDICATOR_OLD
, line
, len
,
1393 flags
& DIFF_SYMBOL_CONTENT_WS_MASK
, 0);
1395 case DIFF_SYMBOL_WORDS_PORCELAIN
:
1396 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1397 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1398 emit_line(o
, context
, reset
, line
, len
);
1399 fputs("~\n", o
->file
);
1401 case DIFF_SYMBOL_WORDS
:
1402 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1403 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1405 * Skip the prefix character, if any. With
1406 * diff_suppress_blank_empty, there may be
1409 if (line
[0] != '\n') {
1413 emit_line(o
, context
, reset
, line
, len
);
1415 case DIFF_SYMBOL_FILEPAIR_PLUS
:
1416 meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
1417 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1418 fprintf(o
->file
, "%s%s+++ %s%s%s\n", diff_line_prefix(o
), meta
,
1420 strchr(line
, ' ') ? "\t" : "");
1422 case DIFF_SYMBOL_FILEPAIR_MINUS
:
1423 meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
1424 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1425 fprintf(o
->file
, "%s%s--- %s%s%s\n", diff_line_prefix(o
), meta
,
1427 strchr(line
, ' ') ? "\t" : "");
1429 case DIFF_SYMBOL_BINARY_FILES
:
1430 case DIFF_SYMBOL_HEADER
:
1431 fprintf(o
->file
, "%s", line
);
1433 case DIFF_SYMBOL_BINARY_DIFF_HEADER
:
1434 fprintf(o
->file
, "%sGIT binary patch\n", diff_line_prefix(o
));
1436 case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
:
1437 fprintf(o
->file
, "%sdelta %s\n", diff_line_prefix(o
), line
);
1439 case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
:
1440 fprintf(o
->file
, "%sliteral %s\n", diff_line_prefix(o
), line
);
1442 case DIFF_SYMBOL_BINARY_DIFF_FOOTER
:
1443 fputs(diff_line_prefix(o
), o
->file
);
1444 fputc('\n', o
->file
);
1446 case DIFF_SYMBOL_REWRITE_DIFF
:
1447 fraginfo
= diff_get_color(o
->use_color
, DIFF_FRAGINFO
);
1448 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1449 emit_line(o
, fraginfo
, reset
, line
, len
);
1451 case DIFF_SYMBOL_SUBMODULE_ADD
:
1452 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1453 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1454 emit_line(o
, set
, reset
, line
, len
);
1456 case DIFF_SYMBOL_SUBMODULE_DEL
:
1457 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1458 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1459 emit_line(o
, set
, reset
, line
, len
);
1461 case DIFF_SYMBOL_SUBMODULE_UNTRACKED
:
1462 fprintf(o
->file
, "%sSubmodule %s contains untracked content\n",
1463 diff_line_prefix(o
), line
);
1465 case DIFF_SYMBOL_SUBMODULE_MODIFIED
:
1466 fprintf(o
->file
, "%sSubmodule %s contains modified content\n",
1467 diff_line_prefix(o
), line
);
1469 case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
:
1470 emit_line(o
, "", "", " 0 files changed\n",
1471 strlen(" 0 files changed\n"));
1473 case DIFF_SYMBOL_STATS_SUMMARY_ABBREV
:
1474 emit_line(o
, "", "", " ...\n", strlen(" ...\n"));
1476 case DIFF_SYMBOL_WORD_DIFF
:
1477 fprintf(o
->file
, "%.*s", len
, line
);
1479 case DIFF_SYMBOL_STAT_SEP
:
1480 fputs(o
->stat_sep
, o
->file
);
1483 BUG("unknown diff symbol");
1485 strbuf_release(&sb
);
1488 static void emit_diff_symbol(struct diff_options
*o
, enum diff_symbol s
,
1489 const char *line
, int len
, unsigned flags
)
1491 struct emitted_diff_symbol e
= {line
, len
, flags
, s
};
1493 if (o
->emitted_symbols
)
1494 append_emitted_diff_symbol(o
, &e
);
1496 emit_diff_symbol_from_struct(o
, &e
);
1499 void diff_emit_submodule_del(struct diff_options
*o
, const char *line
)
1501 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_DEL
, line
, strlen(line
), 0);
1504 void diff_emit_submodule_add(struct diff_options
*o
, const char *line
)
1506 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_ADD
, line
, strlen(line
), 0);
1509 void diff_emit_submodule_untracked(struct diff_options
*o
, const char *path
)
1511 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_UNTRACKED
,
1512 path
, strlen(path
), 0);
1515 void diff_emit_submodule_modified(struct diff_options
*o
, const char *path
)
1517 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_MODIFIED
,
1518 path
, strlen(path
), 0);
1521 void diff_emit_submodule_header(struct diff_options
*o
, const char *header
)
1523 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_HEADER
,
1524 header
, strlen(header
), 0);
1527 void diff_emit_submodule_error(struct diff_options
*o
, const char *err
)
1529 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_ERROR
, err
, strlen(err
), 0);
1532 void diff_emit_submodule_pipethrough(struct diff_options
*o
,
1533 const char *line
, int len
)
1535 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
, line
, len
, 0);
1538 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
1540 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
1541 ecbdata
->blank_at_eof_in_preimage
&&
1542 ecbdata
->blank_at_eof_in_postimage
&&
1543 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
1544 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
1546 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
1549 static void emit_add_line(const char *reset
,
1550 struct emit_callback
*ecbdata
,
1551 const char *line
, int len
)
1553 unsigned flags
= WSEH_NEW
| ecbdata
->ws_rule
;
1554 if (new_blank_line_at_eof(ecbdata
, line
, len
))
1555 flags
|= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF
;
1557 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_PLUS
, line
, len
, flags
);
1560 static void emit_del_line(const char *reset
,
1561 struct emit_callback
*ecbdata
,
1562 const char *line
, int len
)
1564 unsigned flags
= WSEH_OLD
| ecbdata
->ws_rule
;
1565 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_MINUS
, line
, len
, flags
);
1568 static void emit_context_line(const char *reset
,
1569 struct emit_callback
*ecbdata
,
1570 const char *line
, int len
)
1572 unsigned flags
= WSEH_CONTEXT
| ecbdata
->ws_rule
;
1573 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_CONTEXT
, line
, len
, flags
);
1576 static void emit_hunk_header(struct emit_callback
*ecbdata
,
1577 const char *line
, int len
)
1579 const char *context
= diff_get_color(ecbdata
->color_diff
, DIFF_CONTEXT
);
1580 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
1581 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
1582 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1583 const char *reverse
= ecbdata
->color_diff
? GIT_COLOR_REVERSE
: "";
1584 static const char atat
[2] = { '@', '@' };
1585 const char *cp
, *ep
;
1586 struct strbuf msgbuf
= STRBUF_INIT
;
1591 * As a hunk header must begin with "@@ -<old>, +<new> @@",
1592 * it always is at least 10 bytes long.
1595 memcmp(line
, atat
, 2) ||
1596 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
1597 emit_diff_symbol(ecbdata
->opt
,
1598 DIFF_SYMBOL_CONTEXT_MARKER
, line
, len
, 0);
1601 ep
+= 2; /* skip over @@ */
1603 /* The hunk header in fraginfo color */
1604 if (ecbdata
->opt
->flags
.dual_color_diffed_diffs
)
1605 strbuf_addstr(&msgbuf
, reverse
);
1606 strbuf_addstr(&msgbuf
, frag
);
1607 strbuf_add(&msgbuf
, line
, ep
- line
);
1608 strbuf_addstr(&msgbuf
, reset
);
1614 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
1617 /* blank before the func header */
1618 for (cp
= ep
; ep
- line
< len
; ep
++)
1619 if (*ep
!= ' ' && *ep
!= '\t')
1622 strbuf_addstr(&msgbuf
, context
);
1623 strbuf_add(&msgbuf
, cp
, ep
- cp
);
1624 strbuf_addstr(&msgbuf
, reset
);
1627 if (ep
< line
+ len
) {
1628 strbuf_addstr(&msgbuf
, func
);
1629 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
1630 strbuf_addstr(&msgbuf
, reset
);
1633 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
1634 strbuf_complete_line(&msgbuf
);
1635 emit_diff_symbol(ecbdata
->opt
,
1636 DIFF_SYMBOL_CONTEXT_FRAGINFO
, msgbuf
.buf
, msgbuf
.len
, 0);
1637 strbuf_release(&msgbuf
);
1640 static struct diff_tempfile
*claim_diff_tempfile(void)
1643 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
1644 if (!diff_temp
[i
].name
)
1645 return diff_temp
+ i
;
1646 BUG("diff is failing to clean up its tempfiles");
1649 static void remove_tempfile(void)
1652 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
1653 if (is_tempfile_active(diff_temp
[i
].tempfile
))
1654 delete_tempfile(&diff_temp
[i
].tempfile
);
1655 diff_temp
[i
].name
= NULL
;
1659 static void add_line_count(struct strbuf
*out
, int count
)
1663 strbuf_addstr(out
, "0,0");
1666 strbuf_addstr(out
, "1");
1669 strbuf_addf(out
, "1,%d", count
);
1674 static void emit_rewrite_lines(struct emit_callback
*ecb
,
1675 int prefix
, const char *data
, int size
)
1677 const char *endp
= NULL
;
1678 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
1683 endp
= memchr(data
, '\n', size
);
1684 len
= endp
? (endp
- data
+ 1) : size
;
1685 if (prefix
!= '+') {
1686 ecb
->lno_in_preimage
++;
1687 emit_del_line(reset
, ecb
, data
, len
);
1689 ecb
->lno_in_postimage
++;
1690 emit_add_line(reset
, ecb
, data
, len
);
1696 emit_diff_symbol(ecb
->opt
, DIFF_SYMBOL_NO_LF_EOF
, NULL
, 0, 0);
1699 static void emit_rewrite_diff(const char *name_a
,
1701 struct diff_filespec
*one
,
1702 struct diff_filespec
*two
,
1703 struct userdiff_driver
*textconv_one
,
1704 struct userdiff_driver
*textconv_two
,
1705 struct diff_options
*o
)
1708 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
1709 const char *a_prefix
, *b_prefix
;
1710 char *data_one
, *data_two
;
1711 size_t size_one
, size_two
;
1712 struct emit_callback ecbdata
;
1713 struct strbuf out
= STRBUF_INIT
;
1715 if (diff_mnemonic_prefix
&& o
->flags
.reverse_diff
) {
1716 a_prefix
= o
->b_prefix
;
1717 b_prefix
= o
->a_prefix
;
1719 a_prefix
= o
->a_prefix
;
1720 b_prefix
= o
->b_prefix
;
1723 name_a
+= (*name_a
== '/');
1724 name_b
+= (*name_b
== '/');
1726 strbuf_reset(&a_name
);
1727 strbuf_reset(&b_name
);
1728 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
1729 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
1731 size_one
= fill_textconv(o
->repo
, textconv_one
, one
, &data_one
);
1732 size_two
= fill_textconv(o
->repo
, textconv_two
, two
, &data_two
);
1734 memset(&ecbdata
, 0, sizeof(ecbdata
));
1735 ecbdata
.color_diff
= want_color(o
->use_color
);
1736 ecbdata
.ws_rule
= whitespace_rule(o
->repo
->index
, name_b
);
1738 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
1740 mf1
.ptr
= (char *)data_one
;
1741 mf2
.ptr
= (char *)data_two
;
1742 mf1
.size
= size_one
;
1743 mf2
.size
= size_two
;
1744 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1746 ecbdata
.lno_in_preimage
= 1;
1747 ecbdata
.lno_in_postimage
= 1;
1749 lc_a
= count_lines(data_one
, size_one
);
1750 lc_b
= count_lines(data_two
, size_two
);
1752 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_MINUS
,
1753 a_name
.buf
, a_name
.len
, 0);
1754 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_PLUS
,
1755 b_name
.buf
, b_name
.len
, 0);
1757 strbuf_addstr(&out
, "@@ -");
1758 if (!o
->irreversible_delete
)
1759 add_line_count(&out
, lc_a
);
1761 strbuf_addstr(&out
, "?,?");
1762 strbuf_addstr(&out
, " +");
1763 add_line_count(&out
, lc_b
);
1764 strbuf_addstr(&out
, " @@\n");
1765 emit_diff_symbol(o
, DIFF_SYMBOL_REWRITE_DIFF
, out
.buf
, out
.len
, 0);
1766 strbuf_release(&out
);
1768 if (lc_a
&& !o
->irreversible_delete
)
1769 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
1771 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
1773 free((char *)data_one
);
1775 free((char *)data_two
);
1778 struct diff_words_buffer
{
1780 unsigned long alloc
;
1781 struct diff_words_orig
{
1782 const char *begin
, *end
;
1784 int orig_nr
, orig_alloc
;
1787 static void diff_words_append(char *line
, unsigned long len
,
1788 struct diff_words_buffer
*buffer
)
1790 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
1793 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
1794 buffer
->text
.size
+= len
;
1795 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
1798 struct diff_words_style_elem
{
1801 const char *color
; /* NULL; filled in by the setup code if
1802 * color is enabled */
1805 struct diff_words_style
{
1806 enum diff_words_type type
;
1807 struct diff_words_style_elem new_word
, old_word
, ctx
;
1808 const char *newline
;
1811 static struct diff_words_style diff_words_styles
[] = {
1812 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
1813 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
1814 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
1817 struct diff_words_data
{
1818 struct diff_words_buffer minus
, plus
;
1819 const char *current_plus
;
1821 struct diff_options
*opt
;
1822 regex_t
*word_regex
;
1823 enum diff_words_type type
;
1824 struct diff_words_style
*style
;
1827 static int fn_out_diff_words_write_helper(struct diff_options
*o
,
1828 struct diff_words_style_elem
*st_el
,
1829 const char *newline
,
1830 size_t count
, const char *buf
)
1833 struct strbuf sb
= STRBUF_INIT
;
1836 char *p
= memchr(buf
, '\n', count
);
1838 strbuf_addstr(&sb
, diff_line_prefix(o
));
1841 const char *reset
= st_el
->color
&& *st_el
->color
?
1842 GIT_COLOR_RESET
: NULL
;
1843 if (st_el
->color
&& *st_el
->color
)
1844 strbuf_addstr(&sb
, st_el
->color
);
1845 strbuf_addstr(&sb
, st_el
->prefix
);
1846 strbuf_add(&sb
, buf
, p
? p
- buf
: count
);
1847 strbuf_addstr(&sb
, st_el
->suffix
);
1849 strbuf_addstr(&sb
, reset
);
1854 strbuf_addstr(&sb
, newline
);
1855 count
-= p
+ 1 - buf
;
1859 emit_diff_symbol(o
, DIFF_SYMBOL_WORD_DIFF
,
1867 emit_diff_symbol(o
, DIFF_SYMBOL_WORD_DIFF
,
1869 strbuf_release(&sb
);
1874 * '--color-words' algorithm can be described as:
1876 * 1. collect the minus/plus lines of a diff hunk, divided into
1877 * minus-lines and plus-lines;
1879 * 2. break both minus-lines and plus-lines into words and
1880 * place them into two mmfile_t with one word for each line;
1882 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
1884 * And for the common parts of the both file, we output the plus side text.
1885 * diff_words->current_plus is used to trace the current position of the plus file
1886 * which printed. diff_words->last_minus is used to trace the last minus word
1889 * For '--graph' to work with '--color-words', we need to output the graph prefix
1890 * on each line of color words output. Generally, there are two conditions on
1891 * which we should output the prefix.
1893 * 1. diff_words->last_minus == 0 &&
1894 * diff_words->current_plus == diff_words->plus.text.ptr
1896 * that is: the plus text must start as a new line, and if there is no minus
1897 * word printed, a graph prefix must be printed.
1899 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
1900 * *(diff_words->current_plus - 1) == '\n'
1902 * that is: a graph prefix must be printed following a '\n'
1904 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
1906 if ((diff_words
->last_minus
== 0 &&
1907 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
1908 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
1909 *(diff_words
->current_plus
- 1) == '\n')) {
1916 static void fn_out_diff_words_aux(void *priv
,
1917 long minus_first
, long minus_len
,
1918 long plus_first
, long plus_len
,
1919 const char *func
, long funclen
)
1921 struct diff_words_data
*diff_words
= priv
;
1922 struct diff_words_style
*style
= diff_words
->style
;
1923 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
1924 struct diff_options
*opt
= diff_words
->opt
;
1925 const char *line_prefix
;
1928 line_prefix
= diff_line_prefix(opt
);
1930 /* POSIX requires that first be decremented by one if len == 0... */
1932 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
1934 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
1936 minus_begin
= minus_end
=
1937 diff_words
->minus
.orig
[minus_first
].end
;
1940 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
1941 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
1943 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
1945 if (color_words_output_graph_prefix(diff_words
)) {
1946 fputs(line_prefix
, diff_words
->opt
->file
);
1948 if (diff_words
->current_plus
!= plus_begin
) {
1949 fn_out_diff_words_write_helper(diff_words
->opt
,
1950 &style
->ctx
, style
->newline
,
1951 plus_begin
- diff_words
->current_plus
,
1952 diff_words
->current_plus
);
1954 if (minus_begin
!= minus_end
) {
1955 fn_out_diff_words_write_helper(diff_words
->opt
,
1956 &style
->old_word
, style
->newline
,
1957 minus_end
- minus_begin
, minus_begin
);
1959 if (plus_begin
!= plus_end
) {
1960 fn_out_diff_words_write_helper(diff_words
->opt
,
1961 &style
->new_word
, style
->newline
,
1962 plus_end
- plus_begin
, plus_begin
);
1965 diff_words
->current_plus
= plus_end
;
1966 diff_words
->last_minus
= minus_first
;
1969 /* This function starts looking at *begin, and returns 0 iff a word was found. */
1970 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
1971 int *begin
, int *end
)
1973 if (word_regex
&& *begin
< buffer
->size
) {
1974 regmatch_t match
[1];
1975 if (!regexec_buf(word_regex
, buffer
->ptr
+ *begin
,
1976 buffer
->size
- *begin
, 1, match
, 0)) {
1977 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
1978 '\n', match
[0].rm_eo
- match
[0].rm_so
);
1979 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
1980 *begin
+= match
[0].rm_so
;
1981 return *begin
>= *end
;
1986 /* find the next word */
1987 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
1989 if (*begin
>= buffer
->size
)
1992 /* find the end of the word */
1994 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
2001 * This function splits the words in buffer->text, stores the list with
2002 * newline separator into out, and saves the offsets of the original words
2005 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
2006 regex_t
*word_regex
)
2014 /* fake an empty "0th" word */
2015 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
2016 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
2017 buffer
->orig_nr
= 1;
2019 for (i
= 0; i
< buffer
->text
.size
; i
++) {
2020 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
2023 /* store original boundaries */
2024 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
2025 buffer
->orig_alloc
);
2026 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
2027 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
2030 /* store one word */
2031 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
2032 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
2033 out
->ptr
[out
->size
+ j
- i
] = '\n';
2034 out
->size
+= j
- i
+ 1;
2040 /* this executes the word diff on the accumulated buffers */
2041 static void diff_words_show(struct diff_words_data
*diff_words
)
2045 mmfile_t minus
, plus
;
2046 struct diff_words_style
*style
= diff_words
->style
;
2048 struct diff_options
*opt
= diff_words
->opt
;
2049 const char *line_prefix
;
2052 line_prefix
= diff_line_prefix(opt
);
2054 /* special case: only removal */
2055 if (!diff_words
->plus
.text
.size
) {
2056 emit_diff_symbol(diff_words
->opt
, DIFF_SYMBOL_WORD_DIFF
,
2057 line_prefix
, strlen(line_prefix
), 0);
2058 fn_out_diff_words_write_helper(diff_words
->opt
,
2059 &style
->old_word
, style
->newline
,
2060 diff_words
->minus
.text
.size
,
2061 diff_words
->minus
.text
.ptr
);
2062 diff_words
->minus
.text
.size
= 0;
2066 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
2067 diff_words
->last_minus
= 0;
2069 memset(&xpp
, 0, sizeof(xpp
));
2070 memset(&xecfg
, 0, sizeof(xecfg
));
2071 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
2072 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
2074 /* as only the hunk header will be parsed, we need a 0-context */
2076 if (xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, NULL
,
2077 diff_words
, &xpp
, &xecfg
))
2078 die("unable to generate word diff");
2081 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
2082 diff_words
->plus
.text
.size
) {
2083 if (color_words_output_graph_prefix(diff_words
))
2084 emit_diff_symbol(diff_words
->opt
, DIFF_SYMBOL_WORD_DIFF
,
2085 line_prefix
, strlen(line_prefix
), 0);
2086 fn_out_diff_words_write_helper(diff_words
->opt
,
2087 &style
->ctx
, style
->newline
,
2088 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
2089 - diff_words
->current_plus
, diff_words
->current_plus
);
2091 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
2094 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
2095 static void diff_words_flush(struct emit_callback
*ecbdata
)
2097 struct diff_options
*wo
= ecbdata
->diff_words
->opt
;
2099 if (ecbdata
->diff_words
->minus
.text
.size
||
2100 ecbdata
->diff_words
->plus
.text
.size
)
2101 diff_words_show(ecbdata
->diff_words
);
2103 if (wo
->emitted_symbols
) {
2104 struct diff_options
*o
= ecbdata
->opt
;
2105 struct emitted_diff_symbols
*wol
= wo
->emitted_symbols
;
2110 * Instead of appending each, concat all words to a line?
2112 for (i
= 0; i
< wol
->nr
; i
++)
2113 append_emitted_diff_symbol(o
, &wol
->buf
[i
]);
2115 for (i
= 0; i
< wol
->nr
; i
++)
2116 free((void *)wol
->buf
[i
].line
);
2122 static void diff_filespec_load_driver(struct diff_filespec
*one
,
2123 struct index_state
*istate
)
2125 /* Use already-loaded driver */
2129 if (S_ISREG(one
->mode
))
2130 one
->driver
= userdiff_find_by_path(istate
, one
->path
);
2132 /* Fallback to default settings */
2134 one
->driver
= userdiff_find_by_name("default");
2137 static const char *userdiff_word_regex(struct diff_filespec
*one
,
2138 struct index_state
*istate
)
2140 diff_filespec_load_driver(one
, istate
);
2141 return one
->driver
->word_regex
;
2144 static void init_diff_words_data(struct emit_callback
*ecbdata
,
2145 struct diff_options
*orig_opts
,
2146 struct diff_filespec
*one
,
2147 struct diff_filespec
*two
)
2150 struct diff_options
*o
= xmalloc(sizeof(struct diff_options
));
2151 memcpy(o
, orig_opts
, sizeof(struct diff_options
));
2153 ecbdata
->diff_words
=
2154 xcalloc(1, sizeof(struct diff_words_data
));
2155 ecbdata
->diff_words
->type
= o
->word_diff
;
2156 ecbdata
->diff_words
->opt
= o
;
2158 if (orig_opts
->emitted_symbols
)
2159 o
->emitted_symbols
=
2160 xcalloc(1, sizeof(struct emitted_diff_symbols
));
2163 o
->word_regex
= userdiff_word_regex(one
, o
->repo
->index
);
2165 o
->word_regex
= userdiff_word_regex(two
, o
->repo
->index
);
2167 o
->word_regex
= diff_word_regex_cfg
;
2168 if (o
->word_regex
) {
2169 ecbdata
->diff_words
->word_regex
= (regex_t
*)
2170 xmalloc(sizeof(regex_t
));
2171 if (regcomp(ecbdata
->diff_words
->word_regex
,
2173 REG_EXTENDED
| REG_NEWLINE
))
2174 die("invalid regular expression: %s",
2177 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
2178 if (o
->word_diff
== diff_words_styles
[i
].type
) {
2179 ecbdata
->diff_words
->style
=
2180 &diff_words_styles
[i
];
2184 if (want_color(o
->use_color
)) {
2185 struct diff_words_style
*st
= ecbdata
->diff_words
->style
;
2186 st
->old_word
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2187 st
->new_word
.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2188 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_CONTEXT
);
2192 static void free_diff_words_data(struct emit_callback
*ecbdata
)
2194 if (ecbdata
->diff_words
) {
2195 diff_words_flush(ecbdata
);
2196 free (ecbdata
->diff_words
->opt
->emitted_symbols
);
2197 free (ecbdata
->diff_words
->opt
);
2198 free (ecbdata
->diff_words
->minus
.text
.ptr
);
2199 free (ecbdata
->diff_words
->minus
.orig
);
2200 free (ecbdata
->diff_words
->plus
.text
.ptr
);
2201 free (ecbdata
->diff_words
->plus
.orig
);
2202 if (ecbdata
->diff_words
->word_regex
) {
2203 regfree(ecbdata
->diff_words
->word_regex
);
2204 free(ecbdata
->diff_words
->word_regex
);
2206 FREE_AND_NULL(ecbdata
->diff_words
);
2210 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
2212 if (want_color(diff_use_color
))
2213 return diff_colors
[ix
];
2217 const char *diff_line_prefix(struct diff_options
*opt
)
2219 struct strbuf
*msgbuf
;
2220 if (!opt
->output_prefix
)
2223 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
2227 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
2230 unsigned long allot
;
2236 (void) utf8_width(&cp
, &l
);
2238 break; /* truncated in the middle? */
2243 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
2246 ecbdata
->lno_in_preimage
= 0;
2247 ecbdata
->lno_in_postimage
= 0;
2248 p
= strchr(line
, '-');
2250 return; /* cannot happen */
2251 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
2254 return; /* cannot happen */
2255 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
2258 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
2260 struct emit_callback
*ecbdata
= priv
;
2261 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
2262 struct diff_options
*o
= ecbdata
->opt
;
2264 o
->found_changes
= 1;
2266 if (ecbdata
->header
) {
2267 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
2268 ecbdata
->header
->buf
, ecbdata
->header
->len
, 0);
2269 strbuf_reset(ecbdata
->header
);
2270 ecbdata
->header
= NULL
;
2273 if (ecbdata
->label_path
[0]) {
2274 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_MINUS
,
2275 ecbdata
->label_path
[0],
2276 strlen(ecbdata
->label_path
[0]), 0);
2277 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_PLUS
,
2278 ecbdata
->label_path
[1],
2279 strlen(ecbdata
->label_path
[1]), 0);
2280 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
2283 if (diff_suppress_blank_empty
2284 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
2289 if (line
[0] == '@') {
2290 if (ecbdata
->diff_words
)
2291 diff_words_flush(ecbdata
);
2292 len
= sane_truncate_line(ecbdata
, line
, len
);
2293 find_lno(line
, ecbdata
);
2294 emit_hunk_header(ecbdata
, line
, len
);
2298 if (ecbdata
->diff_words
) {
2299 enum diff_symbol s
=
2300 ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
?
2301 DIFF_SYMBOL_WORDS_PORCELAIN
: DIFF_SYMBOL_WORDS
;
2302 if (line
[0] == '-') {
2303 diff_words_append(line
, len
,
2304 &ecbdata
->diff_words
->minus
);
2306 } else if (line
[0] == '+') {
2307 diff_words_append(line
, len
,
2308 &ecbdata
->diff_words
->plus
);
2310 } else if (starts_with(line
, "\\ ")) {
2312 * Eat the "no newline at eof" marker as if we
2313 * saw a "+" or "-" line with nothing on it,
2314 * and return without diff_words_flush() to
2315 * defer processing. If this is the end of
2316 * preimage, more "+" lines may come after it.
2320 diff_words_flush(ecbdata
);
2321 emit_diff_symbol(o
, s
, line
, len
, 0);
2327 ecbdata
->lno_in_postimage
++;
2328 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
2331 ecbdata
->lno_in_preimage
++;
2332 emit_del_line(reset
, ecbdata
, line
+ 1, len
- 1);
2335 ecbdata
->lno_in_postimage
++;
2336 ecbdata
->lno_in_preimage
++;
2337 emit_context_line(reset
, ecbdata
, line
+ 1, len
- 1);
2340 /* incomplete line at the end */
2341 ecbdata
->lno_in_preimage
++;
2342 emit_diff_symbol(o
, DIFF_SYMBOL_CONTEXT_INCOMPLETE
,
2348 static void pprint_rename(struct strbuf
*name
, const char *a
, const char *b
)
2350 const char *old_name
= a
;
2351 const char *new_name
= b
;
2352 int pfx_length
, sfx_length
;
2353 int pfx_adjust_for_slash
;
2354 int len_a
= strlen(a
);
2355 int len_b
= strlen(b
);
2356 int a_midlen
, b_midlen
;
2357 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
2358 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
2360 if (qlen_a
|| qlen_b
) {
2361 quote_c_style(a
, name
, NULL
, 0);
2362 strbuf_addstr(name
, " => ");
2363 quote_c_style(b
, name
, NULL
, 0);
2367 /* Find common prefix */
2369 while (*old_name
&& *new_name
&& *old_name
== *new_name
) {
2370 if (*old_name
== '/')
2371 pfx_length
= old_name
- a
+ 1;
2376 /* Find common suffix */
2377 old_name
= a
+ len_a
;
2378 new_name
= b
+ len_b
;
2381 * If there is a common prefix, it must end in a slash. In
2382 * that case we let this loop run 1 into the prefix to see the
2385 * If there is no common prefix, we cannot do this as it would
2386 * underrun the input strings.
2388 pfx_adjust_for_slash
= (pfx_length
? 1 : 0);
2389 while (a
+ pfx_length
- pfx_adjust_for_slash
<= old_name
&&
2390 b
+ pfx_length
- pfx_adjust_for_slash
<= new_name
&&
2391 *old_name
== *new_name
) {
2392 if (*old_name
== '/')
2393 sfx_length
= len_a
- (old_name
- a
);
2399 * pfx{mid-a => mid-b}sfx
2400 * {pfx-a => pfx-b}sfx
2401 * pfx{sfx-a => sfx-b}
2404 a_midlen
= len_a
- pfx_length
- sfx_length
;
2405 b_midlen
= len_b
- pfx_length
- sfx_length
;
2411 strbuf_grow(name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
2412 if (pfx_length
+ sfx_length
) {
2413 strbuf_add(name
, a
, pfx_length
);
2414 strbuf_addch(name
, '{');
2416 strbuf_add(name
, a
+ pfx_length
, a_midlen
);
2417 strbuf_addstr(name
, " => ");
2418 strbuf_add(name
, b
+ pfx_length
, b_midlen
);
2419 if (pfx_length
+ sfx_length
) {
2420 strbuf_addch(name
, '}');
2421 strbuf_add(name
, a
+ len_a
- sfx_length
, sfx_length
);
2428 struct diffstat_file
{
2432 const char *comments
;
2433 unsigned is_unmerged
:1;
2434 unsigned is_binary
:1;
2435 unsigned is_renamed
:1;
2436 unsigned is_interesting
:1;
2437 uintmax_t added
, deleted
;
2441 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
2445 struct diffstat_file
*x
;
2446 x
= xcalloc(1, sizeof(*x
));
2447 ALLOC_GROW(diffstat
->files
, diffstat
->nr
+ 1, diffstat
->alloc
);
2448 diffstat
->files
[diffstat
->nr
++] = x
;
2450 x
->from_name
= xstrdup(name_a
);
2451 x
->name
= xstrdup(name_b
);
2455 x
->from_name
= NULL
;
2456 x
->name
= xstrdup(name_a
);
2461 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
2463 struct diffstat_t
*diffstat
= priv
;
2464 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
2468 else if (line
[0] == '-')
2472 const char mime_boundary_leader
[] = "------------";
2474 static int scale_linear(int it
, int width
, int max_change
)
2479 * make sure that at least one '-' or '+' is printed if
2480 * there is any change to this path. The easiest way is to
2481 * scale linearly as if the alloted width is one column shorter
2482 * than it is, and then add 1 to the result.
2484 return 1 + (it
* (width
- 1) / max_change
);
2487 static void show_graph(struct strbuf
*out
, char ch
, int cnt
,
2488 const char *set
, const char *reset
)
2492 strbuf_addstr(out
, set
);
2493 strbuf_addchars(out
, ch
, cnt
);
2494 strbuf_addstr(out
, reset
);
2497 static void fill_print_name(struct diffstat_file
*file
)
2499 struct strbuf pname
= STRBUF_INIT
;
2501 if (file
->print_name
)
2504 if (file
->is_renamed
)
2505 pprint_rename(&pname
, file
->from_name
, file
->name
);
2507 quote_c_style(file
->name
, &pname
, NULL
, 0);
2510 strbuf_addf(&pname
, " (%s)", file
->comments
);
2512 file
->print_name
= strbuf_detach(&pname
, NULL
);
2515 static void print_stat_summary_inserts_deletes(struct diff_options
*options
,
2516 int files
, int insertions
, int deletions
)
2518 struct strbuf sb
= STRBUF_INIT
;
2521 assert(insertions
== 0 && deletions
== 0);
2522 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
,
2528 (files
== 1) ? " %d file changed" : " %d files changed",
2532 * For binary diff, the caller may want to print "x files
2533 * changed" with insertions == 0 && deletions == 0.
2535 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
2536 * is probably less confusing (i.e skip over "2 files changed
2537 * but nothing about added/removed lines? Is this a bug in Git?").
2539 if (insertions
|| deletions
== 0) {
2541 (insertions
== 1) ? ", %d insertion(+)" : ", %d insertions(+)",
2545 if (deletions
|| insertions
== 0) {
2547 (deletions
== 1) ? ", %d deletion(-)" : ", %d deletions(-)",
2550 strbuf_addch(&sb
, '\n');
2551 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
,
2553 strbuf_release(&sb
);
2556 void print_stat_summary(FILE *fp
, int files
,
2557 int insertions
, int deletions
)
2559 struct diff_options o
;
2560 memset(&o
, 0, sizeof(o
));
2563 print_stat_summary_inserts_deletes(&o
, files
, insertions
, deletions
);
2566 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
2568 int i
, len
, add
, del
, adds
= 0, dels
= 0;
2569 uintmax_t max_change
= 0, max_len
= 0;
2570 int total_files
= data
->nr
, count
;
2571 int width
, name_width
, graph_width
, number_width
= 0, bin_width
= 0;
2572 const char *reset
, *add_c
, *del_c
;
2573 int extra_shown
= 0;
2574 const char *line_prefix
= diff_line_prefix(options
);
2575 struct strbuf out
= STRBUF_INIT
;
2580 count
= options
->stat_count
? options
->stat_count
: data
->nr
;
2582 reset
= diff_get_color_opt(options
, DIFF_RESET
);
2583 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
2584 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
2587 * Find the longest filename and max number of changes
2589 for (i
= 0; (i
< count
) && (i
< data
->nr
); i
++) {
2590 struct diffstat_file
*file
= data
->files
[i
];
2591 uintmax_t change
= file
->added
+ file
->deleted
;
2593 if (!file
->is_interesting
&& (change
== 0)) {
2594 count
++; /* not shown == room for one more */
2597 fill_print_name(file
);
2598 len
= strlen(file
->print_name
);
2602 if (file
->is_unmerged
) {
2603 /* "Unmerged" is 8 characters */
2604 bin_width
= bin_width
< 8 ? 8 : bin_width
;
2607 if (file
->is_binary
) {
2608 /* "Bin XXX -> YYY bytes" */
2609 int w
= 14 + decimal_width(file
->added
)
2610 + decimal_width(file
->deleted
);
2611 bin_width
= bin_width
< w
? w
: bin_width
;
2612 /* Display change counts aligned with "Bin" */
2617 if (max_change
< change
)
2618 max_change
= change
;
2620 count
= i
; /* where we can stop scanning in data->files[] */
2623 * We have width = stat_width or term_columns() columns total.
2624 * We want a maximum of min(max_len, stat_name_width) for the name part.
2625 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
2626 * We also need 1 for " " and 4 + decimal_width(max_change)
2627 * for " | NNNN " and one the empty column at the end, altogether
2628 * 6 + decimal_width(max_change).
2630 * If there's not enough space, we will use the smaller of
2631 * stat_name_width (if set) and 5/8*width for the filename,
2632 * and the rest for constant elements + graph part, but no more
2633 * than stat_graph_width for the graph part.
2634 * (5/8 gives 50 for filename and 30 for the constant parts + graph
2635 * for the standard terminal size).
2637 * In other words: stat_width limits the maximum width, and
2638 * stat_name_width fixes the maximum width of the filename,
2639 * and is also used to divide available columns if there
2642 * Binary files are displayed with "Bin XXX -> YYY bytes"
2643 * instead of the change count and graph. This part is treated
2644 * similarly to the graph part, except that it is not
2645 * "scaled". If total width is too small to accommodate the
2646 * guaranteed minimum width of the filename part and the
2647 * separators and this message, this message will "overflow"
2648 * making the line longer than the maximum width.
2651 if (options
->stat_width
== -1)
2652 width
= term_columns() - strlen(line_prefix
);
2654 width
= options
->stat_width
? options
->stat_width
: 80;
2655 number_width
= decimal_width(max_change
) > number_width
?
2656 decimal_width(max_change
) : number_width
;
2658 if (options
->stat_graph_width
== -1)
2659 options
->stat_graph_width
= diff_stat_graph_width
;
2662 * Guarantee 3/8*16==6 for the graph part
2663 * and 5/8*16==10 for the filename part
2665 if (width
< 16 + 6 + number_width
)
2666 width
= 16 + 6 + number_width
;
2669 * First assign sizes that are wanted, ignoring available width.
2670 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
2671 * starting from "XXX" should fit in graph_width.
2673 graph_width
= max_change
+ 4 > bin_width
? max_change
: bin_width
- 4;
2674 if (options
->stat_graph_width
&&
2675 options
->stat_graph_width
< graph_width
)
2676 graph_width
= options
->stat_graph_width
;
2678 name_width
= (options
->stat_name_width
> 0 &&
2679 options
->stat_name_width
< max_len
) ?
2680 options
->stat_name_width
: max_len
;
2683 * Adjust adjustable widths not to exceed maximum width
2685 if (name_width
+ number_width
+ 6 + graph_width
> width
) {
2686 if (graph_width
> width
* 3/8 - number_width
- 6) {
2687 graph_width
= width
* 3/8 - number_width
- 6;
2688 if (graph_width
< 6)
2692 if (options
->stat_graph_width
&&
2693 graph_width
> options
->stat_graph_width
)
2694 graph_width
= options
->stat_graph_width
;
2695 if (name_width
> width
- number_width
- 6 - graph_width
)
2696 name_width
= width
- number_width
- 6 - graph_width
;
2698 graph_width
= width
- number_width
- 6 - name_width
;
2702 * From here name_width is the width of the name area,
2703 * and graph_width is the width of the graph area.
2704 * max_change is used to scale graph properly.
2706 for (i
= 0; i
< count
; i
++) {
2707 const char *prefix
= "";
2708 struct diffstat_file
*file
= data
->files
[i
];
2709 char *name
= file
->print_name
;
2710 uintmax_t added
= file
->added
;
2711 uintmax_t deleted
= file
->deleted
;
2714 if (!file
->is_interesting
&& (added
+ deleted
== 0))
2718 * "scale" the filename
2721 name_len
= strlen(name
);
2722 if (name_width
< name_len
) {
2726 name
+= name_len
- len
;
2727 slash
= strchr(name
, '/');
2732 if (file
->is_binary
) {
2733 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2734 strbuf_addf(&out
, " %*s", number_width
, "Bin");
2735 if (!added
&& !deleted
) {
2736 strbuf_addch(&out
, '\n');
2737 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2738 out
.buf
, out
.len
, 0);
2742 strbuf_addf(&out
, " %s%"PRIuMAX
"%s",
2743 del_c
, deleted
, reset
);
2744 strbuf_addstr(&out
, " -> ");
2745 strbuf_addf(&out
, "%s%"PRIuMAX
"%s",
2746 add_c
, added
, reset
);
2747 strbuf_addstr(&out
, " bytes\n");
2748 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2749 out
.buf
, out
.len
, 0);
2753 else if (file
->is_unmerged
) {
2754 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2755 strbuf_addstr(&out
, " Unmerged\n");
2756 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2757 out
.buf
, out
.len
, 0);
2763 * scale the add/delete
2768 if (graph_width
<= max_change
) {
2769 int total
= scale_linear(add
+ del
, graph_width
, max_change
);
2770 if (total
< 2 && add
&& del
)
2771 /* width >= 2 due to the sanity check */
2774 add
= scale_linear(add
, graph_width
, max_change
);
2777 del
= scale_linear(del
, graph_width
, max_change
);
2781 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2782 strbuf_addf(&out
, " %*"PRIuMAX
"%s",
2783 number_width
, added
+ deleted
,
2784 added
+ deleted
? " " : "");
2785 show_graph(&out
, '+', add
, add_c
, reset
);
2786 show_graph(&out
, '-', del
, del_c
, reset
);
2787 strbuf_addch(&out
, '\n');
2788 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2789 out
.buf
, out
.len
, 0);
2793 for (i
= 0; i
< data
->nr
; i
++) {
2794 struct diffstat_file
*file
= data
->files
[i
];
2795 uintmax_t added
= file
->added
;
2796 uintmax_t deleted
= file
->deleted
;
2798 if (file
->is_unmerged
||
2799 (!file
->is_interesting
&& (added
+ deleted
== 0))) {
2804 if (!file
->is_binary
) {
2811 emit_diff_symbol(options
,
2812 DIFF_SYMBOL_STATS_SUMMARY_ABBREV
,
2817 print_stat_summary_inserts_deletes(options
, total_files
, adds
, dels
);
2818 strbuf_release(&out
);
2821 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
2823 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
2828 for (i
= 0; i
< data
->nr
; i
++) {
2829 int added
= data
->files
[i
]->added
;
2830 int deleted
= data
->files
[i
]->deleted
;
2832 if (data
->files
[i
]->is_unmerged
||
2833 (!data
->files
[i
]->is_interesting
&& (added
+ deleted
== 0))) {
2835 } else if (!data
->files
[i
]->is_binary
) { /* don't count bytes */
2840 print_stat_summary_inserts_deletes(options
, total_files
, adds
, dels
);
2843 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
2850 for (i
= 0; i
< data
->nr
; i
++) {
2851 struct diffstat_file
*file
= data
->files
[i
];
2853 fprintf(options
->file
, "%s", diff_line_prefix(options
));
2855 if (file
->is_binary
)
2856 fprintf(options
->file
, "-\t-\t");
2858 fprintf(options
->file
,
2859 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
2860 file
->added
, file
->deleted
);
2861 if (options
->line_termination
) {
2862 fill_print_name(file
);
2863 if (!file
->is_renamed
)
2864 write_name_quoted(file
->name
, options
->file
,
2865 options
->line_termination
);
2867 fputs(file
->print_name
, options
->file
);
2868 putc(options
->line_termination
, options
->file
);
2871 if (file
->is_renamed
) {
2872 putc('\0', options
->file
);
2873 write_name_quoted(file
->from_name
, options
->file
, '\0');
2875 write_name_quoted(file
->name
, options
->file
, '\0');
2880 struct dirstat_file
{
2882 unsigned long changed
;
2885 struct dirstat_dir
{
2886 struct dirstat_file
*files
;
2887 int alloc
, nr
, permille
, cumulative
;
2890 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
2891 unsigned long changed
, const char *base
, int baselen
)
2893 unsigned long sum_changes
= 0;
2894 unsigned int sources
= 0;
2895 const char *line_prefix
= diff_line_prefix(opt
);
2898 struct dirstat_file
*f
= dir
->files
;
2899 int namelen
= strlen(f
->name
);
2900 unsigned long changes
;
2903 if (namelen
< baselen
)
2905 if (memcmp(f
->name
, base
, baselen
))
2907 slash
= strchr(f
->name
+ baselen
, '/');
2909 int newbaselen
= slash
+ 1 - f
->name
;
2910 changes
= gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
2913 changes
= f
->changed
;
2918 sum_changes
+= changes
;
2922 * We don't report dirstat's for
2924 * - or cases where everything came from a single directory
2925 * under this directory (sources == 1).
2927 if (baselen
&& sources
!= 1) {
2929 int permille
= sum_changes
* 1000 / changed
;
2930 if (permille
>= dir
->permille
) {
2931 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
2932 permille
/ 10, permille
% 10, baselen
, base
);
2933 if (!dir
->cumulative
)
2941 static int dirstat_compare(const void *_a
, const void *_b
)
2943 const struct dirstat_file
*a
= _a
;
2944 const struct dirstat_file
*b
= _b
;
2945 return strcmp(a
->name
, b
->name
);
2948 static void show_dirstat(struct diff_options
*options
)
2951 unsigned long changed
;
2952 struct dirstat_dir dir
;
2953 struct diff_queue_struct
*q
= &diff_queued_diff
;
2958 dir
.permille
= options
->dirstat_permille
;
2959 dir
.cumulative
= options
->flags
.dirstat_cumulative
;
2962 for (i
= 0; i
< q
->nr
; i
++) {
2963 struct diff_filepair
*p
= q
->queue
[i
];
2965 unsigned long copied
, added
, damage
;
2967 name
= p
->two
->path
? p
->two
->path
: p
->one
->path
;
2969 if (p
->one
->oid_valid
&& p
->two
->oid_valid
&&
2970 oideq(&p
->one
->oid
, &p
->two
->oid
)) {
2972 * The SHA1 has not changed, so pre-/post-content is
2973 * identical. We can therefore skip looking at the
2974 * file contents altogether.
2980 if (options
->flags
.dirstat_by_file
) {
2982 * In --dirstat-by-file mode, we don't really need to
2983 * look at the actual file contents at all.
2984 * The fact that the SHA1 changed is enough for us to
2985 * add this file to the list of results
2986 * (with each file contributing equal damage).
2992 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
2993 diff_populate_filespec(options
->repo
, p
->one
, 0);
2994 diff_populate_filespec(options
->repo
, p
->two
, 0);
2995 diffcore_count_changes(options
->repo
,
2996 p
->one
, p
->two
, NULL
, NULL
,
2998 diff_free_filespec_data(p
->one
);
2999 diff_free_filespec_data(p
->two
);
3000 } else if (DIFF_FILE_VALID(p
->one
)) {
3001 diff_populate_filespec(options
->repo
, p
->one
, CHECK_SIZE_ONLY
);
3003 diff_free_filespec_data(p
->one
);
3004 } else if (DIFF_FILE_VALID(p
->two
)) {
3005 diff_populate_filespec(options
->repo
, p
->two
, CHECK_SIZE_ONLY
);
3007 added
= p
->two
->size
;
3008 diff_free_filespec_data(p
->two
);
3013 * Original minus copied is the removed material,
3014 * added is the new material. They are both damages
3015 * made to the preimage.
3016 * If the resulting damage is zero, we know that
3017 * diffcore_count_changes() considers the two entries to
3018 * be identical, but since the oid changed, we
3019 * know that there must have been _some_ kind of change,
3020 * so we force all entries to have damage > 0.
3022 damage
= (p
->one
->size
- copied
) + added
;
3027 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
3028 dir
.files
[dir
.nr
].name
= name
;
3029 dir
.files
[dir
.nr
].changed
= damage
;
3034 /* This can happen even with many files, if everything was renames */
3038 /* Show all directories with more than x% of the changes */
3039 QSORT(dir
.files
, dir
.nr
, dirstat_compare
);
3040 gather_dirstat(options
, &dir
, changed
, "", 0);
3043 static void show_dirstat_by_line(struct diffstat_t
*data
, struct diff_options
*options
)
3046 unsigned long changed
;
3047 struct dirstat_dir dir
;
3055 dir
.permille
= options
->dirstat_permille
;
3056 dir
.cumulative
= options
->flags
.dirstat_cumulative
;
3059 for (i
= 0; i
< data
->nr
; i
++) {
3060 struct diffstat_file
*file
= data
->files
[i
];
3061 unsigned long damage
= file
->added
+ file
->deleted
;
3062 if (file
->is_binary
)
3064 * binary files counts bytes, not lines. Must find some
3065 * way to normalize binary bytes vs. textual lines.
3066 * The following heuristic assumes that there are 64
3068 * This is stupid and ugly, but very cheap...
3070 damage
= DIV_ROUND_UP(damage
, 64);
3071 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
3072 dir
.files
[dir
.nr
].name
= file
->name
;
3073 dir
.files
[dir
.nr
].changed
= damage
;
3078 /* This can happen even with many files, if everything was renames */
3082 /* Show all directories with more than x% of the changes */
3083 QSORT(dir
.files
, dir
.nr
, dirstat_compare
);
3084 gather_dirstat(options
, &dir
, changed
, "", 0);
3087 static void free_diffstat_info(struct diffstat_t
*diffstat
)
3090 for (i
= 0; i
< diffstat
->nr
; i
++) {
3091 struct diffstat_file
*f
= diffstat
->files
[i
];
3092 free(f
->print_name
);
3097 free(diffstat
->files
);
3100 struct checkdiff_t
{
3101 const char *filename
;
3103 int conflict_marker_size
;
3104 struct diff_options
*o
;
3109 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
3114 if (len
< marker_size
+ 1)
3116 firstchar
= line
[0];
3117 switch (firstchar
) {
3118 case '=': case '>': case '<': case '|':
3123 for (cnt
= 1; cnt
< marker_size
; cnt
++)
3124 if (line
[cnt
] != firstchar
)
3126 /* line[1] thru line[marker_size-1] are same as firstchar */
3127 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
3132 static void checkdiff_consume_hunk(void *priv
,
3133 long ob
, long on
, long nb
, long nn
,
3134 const char *func
, long funclen
)
3137 struct checkdiff_t
*data
= priv
;
3138 data
->lineno
= nb
- 1;
3141 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
3143 struct checkdiff_t
*data
= priv
;
3144 int marker_size
= data
->conflict_marker_size
;
3145 const char *ws
= diff_get_color(data
->o
->use_color
, DIFF_WHITESPACE
);
3146 const char *reset
= diff_get_color(data
->o
->use_color
, DIFF_RESET
);
3147 const char *set
= diff_get_color(data
->o
->use_color
, DIFF_FILE_NEW
);
3149 const char *line_prefix
;
3152 line_prefix
= diff_line_prefix(data
->o
);
3154 if (line
[0] == '+') {
3157 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
3159 fprintf(data
->o
->file
,
3160 "%s%s:%d: leftover conflict marker\n",
3161 line_prefix
, data
->filename
, data
->lineno
);
3163 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
3166 data
->status
|= bad
;
3167 err
= whitespace_error_string(bad
);
3168 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
3169 line_prefix
, data
->filename
, data
->lineno
, err
);
3171 emit_line(data
->o
, set
, reset
, line
, 1);
3172 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
3173 data
->o
->file
, set
, reset
, ws
);
3174 } else if (line
[0] == ' ') {
3179 static unsigned char *deflate_it(char *data
,
3181 unsigned long *result_size
)
3184 unsigned char *deflated
;
3187 git_deflate_init(&stream
, zlib_compression_level
);
3188 bound
= git_deflate_bound(&stream
, size
);
3189 deflated
= xmalloc(bound
);
3190 stream
.next_out
= deflated
;
3191 stream
.avail_out
= bound
;
3193 stream
.next_in
= (unsigned char *)data
;
3194 stream
.avail_in
= size
;
3195 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
3197 git_deflate_end(&stream
);
3198 *result_size
= stream
.total_out
;
3202 static void emit_binary_diff_body(struct diff_options
*o
,
3203 mmfile_t
*one
, mmfile_t
*two
)
3209 unsigned long orig_size
;
3210 unsigned long delta_size
;
3211 unsigned long deflate_size
;
3212 unsigned long data_size
;
3214 /* We could do deflated delta, or we could do just deflated two,
3215 * whichever is smaller.
3218 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
3219 if (one
->size
&& two
->size
) {
3220 delta
= diff_delta(one
->ptr
, one
->size
,
3221 two
->ptr
, two
->size
,
3222 &delta_size
, deflate_size
);
3224 void *to_free
= delta
;
3225 orig_size
= delta_size
;
3226 delta
= deflate_it(delta
, delta_size
, &delta_size
);
3231 if (delta
&& delta_size
< deflate_size
) {
3232 char *s
= xstrfmt("%"PRIuMAX
, (uintmax_t)orig_size
);
3233 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
,
3238 data_size
= delta_size
;
3240 char *s
= xstrfmt("%lu", two
->size
);
3241 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
,
3246 data_size
= deflate_size
;
3249 /* emit data encoded in base85 */
3253 int bytes
= (52 < data_size
) ? 52 : data_size
;
3257 line
[0] = bytes
+ 'A' - 1;
3259 line
[0] = bytes
- 26 + 'a' - 1;
3260 encode_85(line
+ 1, cp
, bytes
);
3261 cp
= (char *) cp
+ bytes
;
3267 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_BODY
,
3270 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_FOOTER
, NULL
, 0, 0);
3274 static void emit_binary_diff(struct diff_options
*o
,
3275 mmfile_t
*one
, mmfile_t
*two
)
3277 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER
, NULL
, 0, 0);
3278 emit_binary_diff_body(o
, one
, two
);
3279 emit_binary_diff_body(o
, two
, one
);
3282 int diff_filespec_is_binary(struct repository
*r
,
3283 struct diff_filespec
*one
)
3285 if (one
->is_binary
== -1) {
3286 diff_filespec_load_driver(one
, r
->index
);
3287 if (one
->driver
->binary
!= -1)
3288 one
->is_binary
= one
->driver
->binary
;
3290 if (!one
->data
&& DIFF_FILE_VALID(one
))
3291 diff_populate_filespec(r
, one
, CHECK_BINARY
);
3292 if (one
->is_binary
== -1 && one
->data
)
3293 one
->is_binary
= buffer_is_binary(one
->data
,
3295 if (one
->is_binary
== -1)
3299 return one
->is_binary
;
3302 static const struct userdiff_funcname
*
3303 diff_funcname_pattern(struct diff_options
*o
, struct diff_filespec
*one
)
3305 diff_filespec_load_driver(one
, o
->repo
->index
);
3306 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
3309 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
3311 if (!options
->a_prefix
)
3312 options
->a_prefix
= a
;
3313 if (!options
->b_prefix
)
3314 options
->b_prefix
= b
;
3317 struct userdiff_driver
*get_textconv(struct repository
*r
,
3318 struct diff_filespec
*one
)
3320 if (!DIFF_FILE_VALID(one
))
3323 diff_filespec_load_driver(one
, r
->index
);
3324 return userdiff_get_textconv(r
, one
->driver
);
3327 static void builtin_diff(const char *name_a
,
3329 struct diff_filespec
*one
,
3330 struct diff_filespec
*two
,
3331 const char *xfrm_msg
,
3332 int must_show_header
,
3333 struct diff_options
*o
,
3334 int complete_rewrite
)
3338 char *a_one
, *b_two
;
3339 const char *meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
3340 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
3341 const char *a_prefix
, *b_prefix
;
3342 struct userdiff_driver
*textconv_one
= NULL
;
3343 struct userdiff_driver
*textconv_two
= NULL
;
3344 struct strbuf header
= STRBUF_INIT
;
3345 const char *line_prefix
= diff_line_prefix(o
);
3347 diff_set_mnemonic_prefix(o
, "a/", "b/");
3348 if (o
->flags
.reverse_diff
) {
3349 a_prefix
= o
->b_prefix
;
3350 b_prefix
= o
->a_prefix
;
3352 a_prefix
= o
->a_prefix
;
3353 b_prefix
= o
->b_prefix
;
3356 if (o
->submodule_format
== DIFF_SUBMODULE_LOG
&&
3357 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
3358 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
3359 show_submodule_summary(o
, one
->path
? one
->path
: two
->path
,
3360 &one
->oid
, &two
->oid
,
3361 two
->dirty_submodule
);
3363 } else if (o
->submodule_format
== DIFF_SUBMODULE_INLINE_DIFF
&&
3364 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
3365 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
3366 show_submodule_inline_diff(o
, one
->path
? one
->path
: two
->path
,
3367 &one
->oid
, &two
->oid
,
3368 two
->dirty_submodule
);
3372 if (o
->flags
.allow_textconv
) {
3373 textconv_one
= get_textconv(o
->repo
, one
);
3374 textconv_two
= get_textconv(o
->repo
, two
);
3377 /* Never use a non-valid filename anywhere if at all possible */
3378 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
3379 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
3381 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
3382 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
3383 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
3384 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
3385 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, meta
, a_one
, b_two
, reset
);
3386 if (lbl
[0][0] == '/') {
3388 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
3390 strbuf_addstr(&header
, xfrm_msg
);
3391 must_show_header
= 1;
3393 else if (lbl
[1][0] == '/') {
3394 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
3396 strbuf_addstr(&header
, xfrm_msg
);
3397 must_show_header
= 1;
3400 if (one
->mode
!= two
->mode
) {
3401 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
3402 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
3403 must_show_header
= 1;
3406 strbuf_addstr(&header
, xfrm_msg
);
3409 * we do not run diff between different kind
3412 if ((one
->mode
^ two
->mode
) & S_IFMT
)
3413 goto free_ab_and_return
;
3414 if (complete_rewrite
&&
3415 (textconv_one
|| !diff_filespec_is_binary(o
->repo
, one
)) &&
3416 (textconv_two
|| !diff_filespec_is_binary(o
->repo
, two
))) {
3417 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3418 header
.buf
, header
.len
, 0);
3419 strbuf_reset(&header
);
3420 emit_rewrite_diff(name_a
, name_b
, one
, two
,
3421 textconv_one
, textconv_two
, o
);
3422 o
->found_changes
= 1;
3423 goto free_ab_and_return
;
3427 if (o
->irreversible_delete
&& lbl
[1][0] == '/') {
3428 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
, header
.buf
,
3430 strbuf_reset(&header
);
3431 goto free_ab_and_return
;
3432 } else if (!o
->flags
.text
&&
3433 ( (!textconv_one
&& diff_filespec_is_binary(o
->repo
, one
)) ||
3434 (!textconv_two
&& diff_filespec_is_binary(o
->repo
, two
)) )) {
3435 struct strbuf sb
= STRBUF_INIT
;
3436 if (!one
->data
&& !two
->data
&&
3437 S_ISREG(one
->mode
) && S_ISREG(two
->mode
) &&
3439 if (oideq(&one
->oid
, &two
->oid
)) {
3440 if (must_show_header
)
3441 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3442 header
.buf
, header
.len
,
3444 goto free_ab_and_return
;
3446 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3447 header
.buf
, header
.len
, 0);
3448 strbuf_addf(&sb
, "%sBinary files %s and %s differ\n",
3449 diff_line_prefix(o
), lbl
[0], lbl
[1]);
3450 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_FILES
,
3452 strbuf_release(&sb
);
3453 goto free_ab_and_return
;
3455 if (fill_mmfile(o
->repo
, &mf1
, one
) < 0 ||
3456 fill_mmfile(o
->repo
, &mf2
, two
) < 0)
3457 die("unable to read files to diff");
3458 /* Quite common confusing case */
3459 if (mf1
.size
== mf2
.size
&&
3460 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
3461 if (must_show_header
)
3462 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3463 header
.buf
, header
.len
, 0);
3464 goto free_ab_and_return
;
3466 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
, header
.buf
, header
.len
, 0);
3467 strbuf_reset(&header
);
3468 if (o
->flags
.binary
)
3469 emit_binary_diff(o
, &mf1
, &mf2
);
3471 strbuf_addf(&sb
, "%sBinary files %s and %s differ\n",
3472 diff_line_prefix(o
), lbl
[0], lbl
[1]);
3473 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_FILES
,
3475 strbuf_release(&sb
);
3477 o
->found_changes
= 1;
3479 /* Crazy xdl interfaces.. */
3480 const char *diffopts
= getenv("GIT_DIFF_OPTS");
3484 struct emit_callback ecbdata
;
3485 const struct userdiff_funcname
*pe
;
3487 if (must_show_header
) {
3488 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3489 header
.buf
, header
.len
, 0);
3490 strbuf_reset(&header
);
3493 mf1
.size
= fill_textconv(o
->repo
, textconv_one
, one
, &mf1
.ptr
);
3494 mf2
.size
= fill_textconv(o
->repo
, textconv_two
, two
, &mf2
.ptr
);
3496 pe
= diff_funcname_pattern(o
, one
);
3498 pe
= diff_funcname_pattern(o
, two
);
3500 memset(&xpp
, 0, sizeof(xpp
));
3501 memset(&xecfg
, 0, sizeof(xecfg
));
3502 memset(&ecbdata
, 0, sizeof(ecbdata
));
3503 if (o
->flags
.suppress_diff_headers
)
3505 ecbdata
.label_path
= lbl
;
3506 ecbdata
.color_diff
= want_color(o
->use_color
);
3507 ecbdata
.ws_rule
= whitespace_rule(o
->repo
->index
, name_b
);
3508 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
3509 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
3511 if (header
.len
&& !o
->flags
.suppress_diff_headers
)
3512 ecbdata
.header
= &header
;
3513 xpp
.flags
= o
->xdl_opts
;
3514 xpp
.anchors
= o
->anchors
;
3515 xpp
.anchors_nr
= o
->anchors_nr
;
3516 xecfg
.ctxlen
= o
->context
;
3517 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
3518 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3519 if (o
->flags
.funccontext
)
3520 xecfg
.flags
|= XDL_EMIT_FUNCCONTEXT
;
3522 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
3525 else if (skip_prefix(diffopts
, "--unified=", &v
))
3526 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
3527 else if (skip_prefix(diffopts
, "-u", &v
))
3528 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
3530 init_diff_words_data(&ecbdata
, o
, one
, two
);
3531 if (xdi_diff_outf(&mf1
, &mf2
, NULL
, fn_out_consume
,
3532 &ecbdata
, &xpp
, &xecfg
))
3533 die("unable to generate diff for %s", one
->path
);
3535 free_diff_words_data(&ecbdata
);
3540 xdiff_clear_find_func(&xecfg
);
3544 strbuf_release(&header
);
3545 diff_free_filespec_data(one
);
3546 diff_free_filespec_data(two
);
3552 static char *get_compact_summary(const struct diff_filepair
*p
, int is_renamed
)
3555 if (p
->status
== DIFF_STATUS_ADDED
) {
3556 if (S_ISLNK(p
->two
->mode
))
3558 else if ((p
->two
->mode
& 0777) == 0755)
3562 } else if (p
->status
== DIFF_STATUS_DELETED
)
3565 if (S_ISLNK(p
->one
->mode
) && !S_ISLNK(p
->two
->mode
))
3567 else if (!S_ISLNK(p
->one
->mode
) && S_ISLNK(p
->two
->mode
))
3569 else if ((p
->one
->mode
& 0777) == 0644 &&
3570 (p
->two
->mode
& 0777) == 0755)
3572 else if ((p
->one
->mode
& 0777) == 0755 &&
3573 (p
->two
->mode
& 0777) == 0644)
3578 static void builtin_diffstat(const char *name_a
, const char *name_b
,
3579 struct diff_filespec
*one
,
3580 struct diff_filespec
*two
,
3581 struct diffstat_t
*diffstat
,
3582 struct diff_options
*o
,
3583 struct diff_filepair
*p
)
3586 struct diffstat_file
*data
;
3588 int complete_rewrite
= 0;
3590 if (!DIFF_PAIR_UNMERGED(p
)) {
3591 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
3592 complete_rewrite
= 1;
3595 data
= diffstat_add(diffstat
, name_a
, name_b
);
3596 data
->is_interesting
= p
->status
!= DIFF_STATUS_UNKNOWN
;
3597 if (o
->flags
.stat_with_summary
)
3598 data
->comments
= get_compact_summary(p
, data
->is_renamed
);
3601 data
->is_unmerged
= 1;
3605 same_contents
= oideq(&one
->oid
, &two
->oid
);
3607 if (diff_filespec_is_binary(o
->repo
, one
) ||
3608 diff_filespec_is_binary(o
->repo
, two
)) {
3609 data
->is_binary
= 1;
3610 if (same_contents
) {
3614 data
->added
= diff_filespec_size(o
->repo
, two
);
3615 data
->deleted
= diff_filespec_size(o
->repo
, one
);
3619 else if (complete_rewrite
) {
3620 diff_populate_filespec(o
->repo
, one
, 0);
3621 diff_populate_filespec(o
->repo
, two
, 0);
3622 data
->deleted
= count_lines(one
->data
, one
->size
);
3623 data
->added
= count_lines(two
->data
, two
->size
);
3626 else if (!same_contents
) {
3627 /* Crazy xdl interfaces.. */
3631 if (fill_mmfile(o
->repo
, &mf1
, one
) < 0 ||
3632 fill_mmfile(o
->repo
, &mf2
, two
) < 0)
3633 die("unable to read files to diff");
3635 memset(&xpp
, 0, sizeof(xpp
));
3636 memset(&xecfg
, 0, sizeof(xecfg
));
3637 xpp
.flags
= o
->xdl_opts
;
3638 xpp
.anchors
= o
->anchors
;
3639 xpp
.anchors_nr
= o
->anchors_nr
;
3640 xecfg
.ctxlen
= o
->context
;
3641 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
3642 if (xdi_diff_outf(&mf1
, &mf2
, discard_hunk_line
,
3643 diffstat_consume
, diffstat
, &xpp
, &xecfg
))
3644 die("unable to generate diffstat for %s", one
->path
);
3647 diff_free_filespec_data(one
);
3648 diff_free_filespec_data(two
);
3651 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
3652 const char *attr_path
,
3653 struct diff_filespec
*one
,
3654 struct diff_filespec
*two
,
3655 struct diff_options
*o
)
3658 struct checkdiff_t data
;
3663 memset(&data
, 0, sizeof(data
));
3664 data
.filename
= name_b
? name_b
: name_a
;
3667 data
.ws_rule
= whitespace_rule(o
->repo
->index
, attr_path
);
3668 data
.conflict_marker_size
= ll_merge_marker_size(o
->repo
->index
, attr_path
);
3670 if (fill_mmfile(o
->repo
, &mf1
, one
) < 0 ||
3671 fill_mmfile(o
->repo
, &mf2
, two
) < 0)
3672 die("unable to read files to diff");
3675 * All the other codepaths check both sides, but not checking
3676 * the "old" side here is deliberate. We are checking the newly
3677 * introduced changes, and as long as the "new" side is text, we
3678 * can and should check what it introduces.
3680 if (diff_filespec_is_binary(o
->repo
, two
))
3681 goto free_and_return
;
3683 /* Crazy xdl interfaces.. */
3687 memset(&xpp
, 0, sizeof(xpp
));
3688 memset(&xecfg
, 0, sizeof(xecfg
));
3689 xecfg
.ctxlen
= 1; /* at least one context line */
3691 if (xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume_hunk
,
3692 checkdiff_consume
, &data
,
3694 die("unable to generate checkdiff for %s", one
->path
);
3696 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
3697 struct emit_callback ecbdata
;
3700 ecbdata
.ws_rule
= data
.ws_rule
;
3701 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
3702 blank_at_eof
= ecbdata
.blank_at_eof_in_postimage
;
3707 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
3708 fprintf(o
->file
, "%s:%d: %s.\n",
3709 data
.filename
, blank_at_eof
, err
);
3710 data
.status
= 1; /* report errors */
3715 diff_free_filespec_data(one
);
3716 diff_free_filespec_data(two
);
3718 o
->flags
.check_failed
= 1;
3721 struct diff_filespec
*alloc_filespec(const char *path
)
3723 struct diff_filespec
*spec
;
3725 FLEXPTR_ALLOC_STR(spec
, path
, path
);
3727 spec
->is_binary
= -1;
3731 void free_filespec(struct diff_filespec
*spec
)
3733 if (!--spec
->count
) {
3734 diff_free_filespec_data(spec
);
3739 void fill_filespec(struct diff_filespec
*spec
, const struct object_id
*oid
,
3740 int oid_valid
, unsigned short mode
)
3743 spec
->mode
= canon_mode(mode
);
3744 oidcpy(&spec
->oid
, oid
);
3745 spec
->oid_valid
= oid_valid
;
3750 * Given a name and sha1 pair, if the index tells us the file in
3751 * the work tree has that object contents, return true, so that
3752 * prepare_temp_file() does not have to inflate and extract.
3754 static int reuse_worktree_file(struct index_state
*istate
,
3756 const struct object_id
*oid
,
3759 const struct cache_entry
*ce
;
3764 * We do not read the cache ourselves here, because the
3765 * benchmark with my previous version that always reads cache
3766 * shows that it makes things worse for diff-tree comparing
3767 * two linux-2.6 kernel trees in an already checked out work
3768 * tree. This is because most diff-tree comparisons deal with
3769 * only a small number of files, while reading the cache is
3770 * expensive for a large project, and its cost outweighs the
3771 * savings we get by not inflating the object to a temporary
3772 * file. Practically, this code only helps when we are used
3773 * by diff-cache --cached, which does read the cache before
3779 /* We want to avoid the working directory if our caller
3780 * doesn't need the data in a normal file, this system
3781 * is rather slow with its stat/open/mmap/close syscalls,
3782 * and the object is contained in a pack file. The pack
3783 * is probably already open and will be faster to obtain
3784 * the data through than the working directory. Loose
3785 * objects however would tend to be slower as they need
3786 * to be individually opened and inflated.
3788 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_object_pack(oid
))
3792 * Similarly, if we'd have to convert the file contents anyway, that
3793 * makes the optimization not worthwhile.
3795 if (!want_file
&& would_convert_to_git(istate
, name
))
3799 pos
= index_name_pos(istate
, name
, len
);
3802 ce
= istate
->cache
[pos
];
3805 * This is not the sha1 we are looking for, or
3806 * unreusable because it is not a regular file.
3808 if (!oideq(oid
, &ce
->oid
) || !S_ISREG(ce
->ce_mode
))
3812 * If ce is marked as "assume unchanged", there is no
3813 * guarantee that work tree matches what we are looking for.
3815 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
3819 * If ce matches the file in the work tree, we can reuse it.
3821 if (ce_uptodate(ce
) ||
3822 (!lstat(name
, &st
) && !ie_match_stat(istate
, ce
, &st
, 0)))
3828 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
3830 struct strbuf buf
= STRBUF_INIT
;
3833 /* Are we looking at the work tree? */
3834 if (s
->dirty_submodule
)
3837 strbuf_addf(&buf
, "Subproject commit %s%s\n",
3838 oid_to_hex(&s
->oid
), dirty
);
3842 strbuf_release(&buf
);
3844 s
->data
= strbuf_detach(&buf
, NULL
);
3851 * While doing rename detection and pickaxe operation, we may need to
3852 * grab the data for the blob (or file) for our own in-core comparison.
3853 * diff_filespec has data and size fields for this purpose.
3855 int diff_populate_filespec(struct repository
*r
,
3856 struct diff_filespec
*s
,
3859 int size_only
= flags
& CHECK_SIZE_ONLY
;
3861 int conv_flags
= global_conv_flags_eol
;
3863 * demote FAIL to WARN to allow inspecting the situation
3864 * instead of refusing.
3866 if (conv_flags
& CONV_EOL_RNDTRP_DIE
)
3867 conv_flags
= CONV_EOL_RNDTRP_WARN
;
3869 if (!DIFF_FILE_VALID(s
))
3870 die("internal error: asking to populate invalid file.");
3871 if (S_ISDIR(s
->mode
))
3877 if (size_only
&& 0 < s
->size
)
3880 if (S_ISGITLINK(s
->mode
))
3881 return diff_populate_gitlink(s
, size_only
);
3883 if (!s
->oid_valid
||
3884 reuse_worktree_file(r
->index
, s
->path
, &s
->oid
, 0)) {
3885 struct strbuf buf
= STRBUF_INIT
;
3889 if (lstat(s
->path
, &st
) < 0) {
3893 s
->data
= (char *)"";
3897 s
->size
= xsize_t(st
.st_size
);
3900 if (S_ISLNK(st
.st_mode
)) {
3901 struct strbuf sb
= STRBUF_INIT
;
3903 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
3906 s
->data
= strbuf_detach(&sb
, NULL
);
3912 * Even if the caller would be happy with getting
3913 * only the size, we cannot return early at this
3914 * point if the path requires us to run the content
3917 if (size_only
&& !would_convert_to_git(r
->index
, s
->path
))
3921 * Note: this check uses xsize_t(st.st_size) that may
3922 * not be the true size of the blob after it goes
3923 * through convert_to_git(). This may not strictly be
3924 * correct, but the whole point of big_file_threshold
3925 * and is_binary check being that we want to avoid
3926 * opening the file and inspecting the contents, this
3929 if ((flags
& CHECK_BINARY
) &&
3930 s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
3934 fd
= open(s
->path
, O_RDONLY
);
3937 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
3939 s
->should_munmap
= 1;
3942 * Convert from working tree format to canonical git format
3944 if (convert_to_git(r
->index
, s
->path
, s
->data
, s
->size
, &buf
, conv_flags
)) {
3946 munmap(s
->data
, s
->size
);
3947 s
->should_munmap
= 0;
3948 s
->data
= strbuf_detach(&buf
, &size
);
3954 enum object_type type
;
3955 if (size_only
|| (flags
& CHECK_BINARY
)) {
3956 type
= oid_object_info(r
, &s
->oid
, &s
->size
);
3958 die("unable to read %s",
3959 oid_to_hex(&s
->oid
));
3962 if (s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
3967 s
->data
= read_object_file(&s
->oid
, &type
, &s
->size
);
3969 die("unable to read %s", oid_to_hex(&s
->oid
));
3975 void diff_free_filespec_blob(struct diff_filespec
*s
)
3979 else if (s
->should_munmap
)
3980 munmap(s
->data
, s
->size
);
3982 if (s
->should_free
|| s
->should_munmap
) {
3983 s
->should_free
= s
->should_munmap
= 0;
3988 void diff_free_filespec_data(struct diff_filespec
*s
)
3990 diff_free_filespec_blob(s
);
3991 FREE_AND_NULL(s
->cnt_data
);
3994 static void prep_temp_blob(struct index_state
*istate
,
3995 const char *path
, struct diff_tempfile
*temp
,
3998 const struct object_id
*oid
,
4001 struct strbuf buf
= STRBUF_INIT
;
4002 struct strbuf tempfile
= STRBUF_INIT
;
4003 char *path_dup
= xstrdup(path
);
4004 const char *base
= basename(path_dup
);
4006 /* Generate "XXXXXX_basename.ext" */
4007 strbuf_addstr(&tempfile
, "XXXXXX_");
4008 strbuf_addstr(&tempfile
, base
);
4010 temp
->tempfile
= mks_tempfile_ts(tempfile
.buf
, strlen(base
) + 1);
4011 if (!temp
->tempfile
)
4012 die_errno("unable to create temp-file");
4013 if (convert_to_working_tree(istate
, path
,
4014 (const char *)blob
, (size_t)size
, &buf
)) {
4018 if (write_in_full(temp
->tempfile
->fd
, blob
, size
) < 0 ||
4019 close_tempfile_gently(temp
->tempfile
))
4020 die_errno("unable to write temp-file");
4021 temp
->name
= get_tempfile_path(temp
->tempfile
);
4022 oid_to_hex_r(temp
->hex
, oid
);
4023 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", mode
);
4024 strbuf_release(&buf
);
4025 strbuf_release(&tempfile
);
4029 static struct diff_tempfile
*prepare_temp_file(struct repository
*r
,
4031 struct diff_filespec
*one
)
4033 struct diff_tempfile
*temp
= claim_diff_tempfile();
4035 if (!DIFF_FILE_VALID(one
)) {
4037 /* A '-' entry produces this for file-2, and
4038 * a '+' entry produces this for file-1.
4040 temp
->name
= "/dev/null";
4041 xsnprintf(temp
->hex
, sizeof(temp
->hex
), ".");
4042 xsnprintf(temp
->mode
, sizeof(temp
->mode
), ".");
4046 if (!S_ISGITLINK(one
->mode
) &&
4048 reuse_worktree_file(r
->index
, name
, &one
->oid
, 1))) {
4050 if (lstat(name
, &st
) < 0) {
4051 if (errno
== ENOENT
)
4052 goto not_a_valid_file
;
4053 die_errno("stat(%s)", name
);
4055 if (S_ISLNK(st
.st_mode
)) {
4056 struct strbuf sb
= STRBUF_INIT
;
4057 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
4058 die_errno("readlink(%s)", name
);
4059 prep_temp_blob(r
->index
, name
, temp
, sb
.buf
, sb
.len
,
4061 &one
->oid
: &null_oid
),
4063 one
->mode
: S_IFLNK
));
4064 strbuf_release(&sb
);
4067 /* we can borrow from the file in the work tree */
4069 if (!one
->oid_valid
)
4070 oid_to_hex_r(temp
->hex
, &null_oid
);
4072 oid_to_hex_r(temp
->hex
, &one
->oid
);
4073 /* Even though we may sometimes borrow the
4074 * contents from the work tree, we always want
4075 * one->mode. mode is trustworthy even when
4076 * !(one->oid_valid), as long as
4077 * DIFF_FILE_VALID(one).
4079 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", one
->mode
);
4084 if (diff_populate_filespec(r
, one
, 0))
4085 die("cannot read data blob for %s", one
->path
);
4086 prep_temp_blob(r
->index
, name
, temp
,
4087 one
->data
, one
->size
,
4088 &one
->oid
, one
->mode
);
4093 static void add_external_diff_name(struct repository
*r
,
4094 struct argv_array
*argv
,
4096 struct diff_filespec
*df
)
4098 struct diff_tempfile
*temp
= prepare_temp_file(r
, name
, df
);
4099 argv_array_push(argv
, temp
->name
);
4100 argv_array_push(argv
, temp
->hex
);
4101 argv_array_push(argv
, temp
->mode
);
4104 /* An external diff command takes:
4106 * diff-cmd name infile1 infile1-sha1 infile1-mode \
4107 * infile2 infile2-sha1 infile2-mode [ rename-to ]
4110 static void run_external_diff(const char *pgm
,
4113 struct diff_filespec
*one
,
4114 struct diff_filespec
*two
,
4115 const char *xfrm_msg
,
4116 int complete_rewrite
,
4117 struct diff_options
*o
)
4119 struct argv_array argv
= ARGV_ARRAY_INIT
;
4120 struct argv_array env
= ARGV_ARRAY_INIT
;
4121 struct diff_queue_struct
*q
= &diff_queued_diff
;
4123 argv_array_push(&argv
, pgm
);
4124 argv_array_push(&argv
, name
);
4127 add_external_diff_name(o
->repo
, &argv
, name
, one
);
4129 add_external_diff_name(o
->repo
, &argv
, name
, two
);
4131 add_external_diff_name(o
->repo
, &argv
, other
, two
);
4132 argv_array_push(&argv
, other
);
4133 argv_array_push(&argv
, xfrm_msg
);
4137 argv_array_pushf(&env
, "GIT_DIFF_PATH_COUNTER=%d", ++o
->diff_path_counter
);
4138 argv_array_pushf(&env
, "GIT_DIFF_PATH_TOTAL=%d", q
->nr
);
4140 if (run_command_v_opt_cd_env(argv
.argv
, RUN_USING_SHELL
, NULL
, env
.argv
))
4141 die(_("external diff died, stopping at %s"), name
);
4144 argv_array_clear(&argv
);
4145 argv_array_clear(&env
);
4148 static int similarity_index(struct diff_filepair
*p
)
4150 return p
->score
* 100 / MAX_SCORE
;
4153 static const char *diff_abbrev_oid(const struct object_id
*oid
, int abbrev
)
4155 if (startup_info
->have_repository
)
4156 return find_unique_abbrev(oid
, abbrev
);
4158 char *hex
= oid_to_hex(oid
);
4160 abbrev
= FALLBACK_DEFAULT_ABBREV
;
4161 if (abbrev
> the_hash_algo
->hexsz
)
4162 BUG("oid abbreviation out of range: %d", abbrev
);
4169 static void fill_metainfo(struct strbuf
*msg
,
4172 struct diff_filespec
*one
,
4173 struct diff_filespec
*two
,
4174 struct diff_options
*o
,
4175 struct diff_filepair
*p
,
4176 int *must_show_header
,
4179 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
4180 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
4181 const char *line_prefix
= diff_line_prefix(o
);
4183 *must_show_header
= 1;
4184 strbuf_init(msg
, PATH_MAX
* 2 + 300);
4185 switch (p
->status
) {
4186 case DIFF_STATUS_COPIED
:
4187 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
4188 line_prefix
, set
, similarity_index(p
));
4189 strbuf_addf(msg
, "%s\n%s%scopy from ",
4190 reset
, line_prefix
, set
);
4191 quote_c_style(name
, msg
, NULL
, 0);
4192 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
4193 quote_c_style(other
, msg
, NULL
, 0);
4194 strbuf_addf(msg
, "%s\n", reset
);
4196 case DIFF_STATUS_RENAMED
:
4197 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
4198 line_prefix
, set
, similarity_index(p
));
4199 strbuf_addf(msg
, "%s\n%s%srename from ",
4200 reset
, line_prefix
, set
);
4201 quote_c_style(name
, msg
, NULL
, 0);
4202 strbuf_addf(msg
, "%s\n%s%srename to ",
4203 reset
, line_prefix
, set
);
4204 quote_c_style(other
, msg
, NULL
, 0);
4205 strbuf_addf(msg
, "%s\n", reset
);
4207 case DIFF_STATUS_MODIFIED
:
4209 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
4211 set
, similarity_index(p
), reset
);
4216 *must_show_header
= 0;
4218 if (one
&& two
&& !oideq(&one
->oid
, &two
->oid
)) {
4219 const unsigned hexsz
= the_hash_algo
->hexsz
;
4220 int abbrev
= o
->flags
.full_index
? hexsz
: DEFAULT_ABBREV
;
4222 if (o
->flags
.binary
) {
4224 if ((!fill_mmfile(o
->repo
, &mf
, one
) &&
4225 diff_filespec_is_binary(o
->repo
, one
)) ||
4226 (!fill_mmfile(o
->repo
, &mf
, two
) &&
4227 diff_filespec_is_binary(o
->repo
, two
)))
4230 strbuf_addf(msg
, "%s%sindex %s..%s", line_prefix
, set
,
4231 diff_abbrev_oid(&one
->oid
, abbrev
),
4232 diff_abbrev_oid(&two
->oid
, abbrev
));
4233 if (one
->mode
== two
->mode
)
4234 strbuf_addf(msg
, " %06o", one
->mode
);
4235 strbuf_addf(msg
, "%s\n", reset
);
4239 static void run_diff_cmd(const char *pgm
,
4242 const char *attr_path
,
4243 struct diff_filespec
*one
,
4244 struct diff_filespec
*two
,
4246 struct diff_options
*o
,
4247 struct diff_filepair
*p
)
4249 const char *xfrm_msg
= NULL
;
4250 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
4251 int must_show_header
= 0;
4254 if (o
->flags
.allow_external
) {
4255 struct userdiff_driver
*drv
;
4257 drv
= userdiff_find_by_path(o
->repo
->index
, attr_path
);
4258 if (drv
&& drv
->external
)
4259 pgm
= drv
->external
;
4264 * don't use colors when the header is intended for an
4265 * external diff driver
4267 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
4269 want_color(o
->use_color
) && !pgm
);
4270 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
4274 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
4275 complete_rewrite
, o
);
4279 builtin_diff(name
, other
? other
: name
,
4280 one
, two
, xfrm_msg
, must_show_header
,
4281 o
, complete_rewrite
);
4283 fprintf(o
->file
, "* Unmerged path %s\n", name
);
4286 static void diff_fill_oid_info(struct diff_filespec
*one
, struct index_state
*istate
)
4288 if (DIFF_FILE_VALID(one
)) {
4289 if (!one
->oid_valid
) {
4291 if (one
->is_stdin
) {
4295 if (lstat(one
->path
, &st
) < 0)
4296 die_errno("stat '%s'", one
->path
);
4297 if (index_path(istate
, &one
->oid
, one
->path
, &st
, 0))
4298 die("cannot hash %s", one
->path
);
4305 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
4307 /* Strip the prefix but do not molest /dev/null and absolute paths */
4308 if (*namep
&& !is_absolute_path(*namep
)) {
4309 *namep
+= prefix_length
;
4313 if (*otherp
&& !is_absolute_path(*otherp
)) {
4314 *otherp
+= prefix_length
;
4315 if (**otherp
== '/')
4320 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
4322 const char *pgm
= external_diff();
4324 struct diff_filespec
*one
= p
->one
;
4325 struct diff_filespec
*two
= p
->two
;
4328 const char *attr_path
;
4331 other
= (strcmp(name
, two
->path
) ? two
->path
: NULL
);
4333 if (o
->prefix_length
)
4334 strip_prefix(o
->prefix_length
, &name
, &other
);
4336 if (!o
->flags
.allow_external
)
4339 if (DIFF_PAIR_UNMERGED(p
)) {
4340 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
4341 NULL
, NULL
, NULL
, o
, p
);
4345 diff_fill_oid_info(one
, o
->repo
->index
);
4346 diff_fill_oid_info(two
, o
->repo
->index
);
4349 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
4350 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
4352 * a filepair that changes between file and symlink
4353 * needs to be split into deletion and creation.
4355 struct diff_filespec
*null
= alloc_filespec(two
->path
);
4356 run_diff_cmd(NULL
, name
, other
, attr_path
,
4360 strbuf_release(&msg
);
4362 null
= alloc_filespec(one
->path
);
4363 run_diff_cmd(NULL
, name
, other
, attr_path
,
4364 null
, two
, &msg
, o
, p
);
4368 run_diff_cmd(pgm
, name
, other
, attr_path
,
4369 one
, two
, &msg
, o
, p
);
4371 strbuf_release(&msg
);
4374 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
4375 struct diffstat_t
*diffstat
)
4380 if (DIFF_PAIR_UNMERGED(p
)) {
4382 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
,
4387 name
= p
->one
->path
;
4388 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
4390 if (o
->prefix_length
)
4391 strip_prefix(o
->prefix_length
, &name
, &other
);
4393 diff_fill_oid_info(p
->one
, o
->repo
->index
);
4394 diff_fill_oid_info(p
->two
, o
->repo
->index
);
4396 builtin_diffstat(name
, other
, p
->one
, p
->two
,
4400 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
4404 const char *attr_path
;
4406 if (DIFF_PAIR_UNMERGED(p
)) {
4411 name
= p
->one
->path
;
4412 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
4413 attr_path
= other
? other
: name
;
4415 if (o
->prefix_length
)
4416 strip_prefix(o
->prefix_length
, &name
, &other
);
4418 diff_fill_oid_info(p
->one
, o
->repo
->index
);
4419 diff_fill_oid_info(p
->two
, o
->repo
->index
);
4421 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
4424 static void prep_parse_options(struct diff_options
*options
);
4426 void repo_diff_setup(struct repository
*r
, struct diff_options
*options
)
4428 memcpy(options
, &default_diff_options
, sizeof(*options
));
4430 options
->file
= stdout
;
4433 options
->output_indicators
[OUTPUT_INDICATOR_NEW
] = '+';
4434 options
->output_indicators
[OUTPUT_INDICATOR_OLD
] = '-';
4435 options
->output_indicators
[OUTPUT_INDICATOR_CONTEXT
] = ' ';
4436 options
->abbrev
= DEFAULT_ABBREV
;
4437 options
->line_termination
= '\n';
4438 options
->break_opt
= -1;
4439 options
->rename_limit
= -1;
4440 options
->dirstat_permille
= diff_dirstat_permille_default
;
4441 options
->context
= diff_context_default
;
4442 options
->interhunkcontext
= diff_interhunk_context_default
;
4443 options
->ws_error_highlight
= ws_error_highlight_default
;
4444 options
->flags
.rename_empty
= 1;
4445 options
->objfind
= NULL
;
4447 /* pathchange left =NULL by default */
4448 options
->change
= diff_change
;
4449 options
->add_remove
= diff_addremove
;
4450 options
->use_color
= diff_use_color_default
;
4451 options
->detect_rename
= diff_detect_rename_default
;
4452 options
->xdl_opts
|= diff_algorithm
;
4453 if (diff_indent_heuristic
)
4454 DIFF_XDL_SET(options
, INDENT_HEURISTIC
);
4456 options
->orderfile
= diff_order_file_cfg
;
4458 if (diff_no_prefix
) {
4459 options
->a_prefix
= options
->b_prefix
= "";
4460 } else if (!diff_mnemonic_prefix
) {
4461 options
->a_prefix
= "a/";
4462 options
->b_prefix
= "b/";
4465 options
->color_moved
= diff_color_moved_default
;
4466 options
->color_moved_ws_handling
= diff_color_moved_ws_default
;
4468 prep_parse_options(options
);
4471 void diff_setup_done(struct diff_options
*options
)
4473 unsigned check_mask
= DIFF_FORMAT_NAME
|
4474 DIFF_FORMAT_NAME_STATUS
|
4475 DIFF_FORMAT_CHECKDIFF
|
4476 DIFF_FORMAT_NO_OUTPUT
;
4478 * This must be signed because we're comparing against a potentially
4481 const int hexsz
= the_hash_algo
->hexsz
;
4483 if (options
->set_default
)
4484 options
->set_default(options
);
4486 if (HAS_MULTI_BITS(options
->output_format
& check_mask
))
4487 die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
4489 if (HAS_MULTI_BITS(options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
))
4490 die(_("-G, -S and --find-object are mutually exclusive"));
4493 * Most of the time we can say "there are changes"
4494 * only by checking if there are changed paths, but
4495 * --ignore-whitespace* options force us to look
4499 if ((options
->xdl_opts
& XDF_WHITESPACE_FLAGS
))
4500 options
->flags
.diff_from_contents
= 1;
4502 options
->flags
.diff_from_contents
= 0;
4504 if (options
->flags
.find_copies_harder
)
4505 options
->detect_rename
= DIFF_DETECT_COPY
;
4507 if (!options
->flags
.relative_name
)
4508 options
->prefix
= NULL
;
4509 if (options
->prefix
)
4510 options
->prefix_length
= strlen(options
->prefix
);
4512 options
->prefix_length
= 0;
4514 if (options
->output_format
& (DIFF_FORMAT_NAME
|
4515 DIFF_FORMAT_NAME_STATUS
|
4516 DIFF_FORMAT_CHECKDIFF
|
4517 DIFF_FORMAT_NO_OUTPUT
))
4518 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
4519 DIFF_FORMAT_NUMSTAT
|
4520 DIFF_FORMAT_DIFFSTAT
|
4521 DIFF_FORMAT_SHORTSTAT
|
4522 DIFF_FORMAT_DIRSTAT
|
4523 DIFF_FORMAT_SUMMARY
|
4527 * These cases always need recursive; we do not drop caller-supplied
4528 * recursive bits for other formats here.
4530 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
4531 DIFF_FORMAT_NUMSTAT
|
4532 DIFF_FORMAT_DIFFSTAT
|
4533 DIFF_FORMAT_SHORTSTAT
|
4534 DIFF_FORMAT_DIRSTAT
|
4535 DIFF_FORMAT_SUMMARY
|
4536 DIFF_FORMAT_CHECKDIFF
))
4537 options
->flags
.recursive
= 1;
4539 * Also pickaxe would not work very well if you do not say recursive
4541 if (options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
)
4542 options
->flags
.recursive
= 1;
4544 * When patches are generated, submodules diffed against the work tree
4545 * must be checked for dirtiness too so it can be shown in the output
4547 if (options
->output_format
& DIFF_FORMAT_PATCH
)
4548 options
->flags
.dirty_submodules
= 1;
4550 if (options
->detect_rename
&& options
->rename_limit
< 0)
4551 options
->rename_limit
= diff_rename_limit_default
;
4552 if (hexsz
< options
->abbrev
)
4553 options
->abbrev
= hexsz
; /* full */
4556 * It does not make sense to show the first hit we happened
4557 * to have found. It does not make sense not to return with
4558 * exit code in such a case either.
4560 if (options
->flags
.quick
) {
4561 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
4562 options
->flags
.exit_with_status
= 1;
4565 options
->diff_path_counter
= 0;
4567 if (options
->flags
.follow_renames
&& options
->pathspec
.nr
!= 1)
4568 die(_("--follow requires exactly one pathspec"));
4570 if (!options
->use_color
|| external_diff())
4571 options
->color_moved
= 0;
4573 FREE_AND_NULL(options
->parseopts
);
4576 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
4586 if (c
== arg_short
) {
4590 if (val
&& isdigit(c
)) {
4592 int n
= strtoul(arg
, &end
, 10);
4603 eq
= strchrnul(arg
, '=');
4605 if (!len
|| strncmp(arg
, arg_long
, len
))
4610 if (!isdigit(*++eq
))
4612 n
= strtoul(eq
, &end
, 10);
4620 static inline int short_opt(char opt
, const char **argv
,
4621 const char **optarg
)
4623 const char *arg
= argv
[0];
4624 if (arg
[0] != '-' || arg
[1] != opt
)
4626 if (arg
[2] != '\0') {
4631 die("Option '%c' requires a value", opt
);
4636 int parse_long_opt(const char *opt
, const char **argv
,
4637 const char **optarg
)
4639 const char *arg
= argv
[0];
4640 if (!skip_prefix(arg
, "--", &arg
))
4642 if (!skip_prefix(arg
, opt
, &arg
))
4644 if (*arg
== '=') { /* stuck form: --option=value */
4650 /* separate form: --option value */
4652 die("Option '--%s' requires a value", opt
);
4657 static int diff_opt_stat(const struct option
*opt
, const char *value
, int unset
)
4659 struct diff_options
*options
= opt
->value
;
4660 int width
= options
->stat_width
;
4661 int name_width
= options
->stat_name_width
;
4662 int graph_width
= options
->stat_graph_width
;
4663 int count
= options
->stat_count
;
4666 BUG_ON_OPT_NEG(unset
);
4668 if (!strcmp(opt
->long_name
, "stat")) {
4670 width
= strtoul(value
, &end
, 10);
4672 name_width
= strtoul(end
+1, &end
, 10);
4674 count
= strtoul(end
+1, &end
, 10);
4676 return error(_("invalid --stat value: %s"), value
);
4678 } else if (!strcmp(opt
->long_name
, "stat-width")) {
4679 width
= strtoul(value
, &end
, 10);
4681 return error(_("%s expects a numerical value"),
4683 } else if (!strcmp(opt
->long_name
, "stat-name-width")) {
4684 name_width
= strtoul(value
, &end
, 10);
4686 return error(_("%s expects a numerical value"),
4688 } else if (!strcmp(opt
->long_name
, "stat-graph-width")) {
4689 graph_width
= strtoul(value
, &end
, 10);
4691 return error(_("%s expects a numerical value"),
4693 } else if (!strcmp(opt
->long_name
, "stat-count")) {
4694 count
= strtoul(value
, &end
, 10);
4696 return error(_("%s expects a numerical value"),
4699 BUG("%s should not get here", opt
->long_name
);
4701 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4702 options
->stat_name_width
= name_width
;
4703 options
->stat_graph_width
= graph_width
;
4704 options
->stat_width
= width
;
4705 options
->stat_count
= count
;
4709 static int parse_dirstat_opt(struct diff_options
*options
, const char *params
)
4711 struct strbuf errmsg
= STRBUF_INIT
;
4712 if (parse_dirstat_params(options
, params
, &errmsg
))
4713 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
4715 strbuf_release(&errmsg
);
4717 * The caller knows a dirstat-related option is given from the command
4718 * line; allow it to say "return this_function();"
4720 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
4724 static int parse_submodule_opt(struct diff_options
*options
, const char *value
)
4726 if (parse_submodule_params(options
, value
))
4727 die(_("Failed to parse --submodule option parameter: '%s'"),
4732 static const char diff_status_letters
[] = {
4735 DIFF_STATUS_DELETED
,
4736 DIFF_STATUS_MODIFIED
,
4737 DIFF_STATUS_RENAMED
,
4738 DIFF_STATUS_TYPE_CHANGED
,
4739 DIFF_STATUS_UNKNOWN
,
4740 DIFF_STATUS_UNMERGED
,
4741 DIFF_STATUS_FILTER_AON
,
4742 DIFF_STATUS_FILTER_BROKEN
,
4746 static unsigned int filter_bit
['Z' + 1];
4748 static void prepare_filter_bits(void)
4752 if (!filter_bit
[DIFF_STATUS_ADDED
]) {
4753 for (i
= 0; diff_status_letters
[i
]; i
++)
4754 filter_bit
[(int) diff_status_letters
[i
]] = (1 << i
);
4758 static unsigned filter_bit_tst(char status
, const struct diff_options
*opt
)
4760 return opt
->filter
& filter_bit
[(int) status
];
4763 static int parse_diff_filter_opt(const char *optarg
, struct diff_options
*opt
)
4767 prepare_filter_bits();
4770 * If there is a negation e.g. 'd' in the input, and we haven't
4771 * initialized the filter field with another --diff-filter, start
4772 * from full set of bits, except for AON.
4775 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
4776 if (optch
< 'a' || 'z' < optch
)
4778 opt
->filter
= (1 << (ARRAY_SIZE(diff_status_letters
) - 1)) - 1;
4779 opt
->filter
&= ~filter_bit
[DIFF_STATUS_FILTER_AON
];
4784 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
4788 if ('a' <= optch
&& optch
<= 'z') {
4790 optch
= toupper(optch
);
4795 bit
= (0 <= optch
&& optch
<= 'Z') ? filter_bit
[optch
] : 0;
4799 opt
->filter
&= ~bit
;
4806 static void enable_patch_output(int *fmt
)
4808 *fmt
&= ~DIFF_FORMAT_NO_OUTPUT
;
4809 *fmt
|= DIFF_FORMAT_PATCH
;
4812 static int parse_ws_error_highlight_opt(struct diff_options
*opt
, const char *arg
)
4814 int val
= parse_ws_error_highlight(arg
);
4817 error("unknown value after ws-error-highlight=%.*s",
4821 opt
->ws_error_highlight
= val
;
4825 static int parse_objfind_opt(struct diff_options
*opt
, const char *arg
)
4827 struct object_id oid
;
4829 if (get_oid(arg
, &oid
))
4830 return error("unable to resolve '%s'", arg
);
4833 opt
->objfind
= xcalloc(1, sizeof(*opt
->objfind
));
4835 opt
->pickaxe_opts
|= DIFF_PICKAXE_KIND_OBJFIND
;
4836 opt
->flags
.recursive
= 1;
4837 opt
->flags
.tree_in_recursive
= 1;
4838 oidset_insert(opt
->objfind
, &oid
);
4842 static int diff_opt_anchored(const struct option
*opt
,
4843 const char *arg
, int unset
)
4845 struct diff_options
*options
= opt
->value
;
4847 BUG_ON_OPT_NEG(unset
);
4848 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
4849 ALLOC_GROW(options
->anchors
, options
->anchors_nr
+ 1,
4850 options
->anchors_alloc
);
4851 options
->anchors
[options
->anchors_nr
++] = xstrdup(arg
);
4855 static int diff_opt_binary(const struct option
*opt
,
4856 const char *arg
, int unset
)
4858 struct diff_options
*options
= opt
->value
;
4860 BUG_ON_OPT_NEG(unset
);
4861 BUG_ON_OPT_ARG(arg
);
4862 enable_patch_output(&options
->output_format
);
4863 options
->flags
.binary
= 1;
4867 static int diff_opt_break_rewrites(const struct option
*opt
,
4868 const char *arg
, int unset
)
4870 int *break_opt
= opt
->value
;
4873 BUG_ON_OPT_NEG(unset
);
4876 opt1
= parse_rename_score(&arg
);
4879 else if (*arg
!= '/')
4880 return error(_("%s expects <n>/<m> form"), opt
->long_name
);
4883 opt2
= parse_rename_score(&arg
);
4886 return error(_("%s expects <n>/<m> form"), opt
->long_name
);
4887 *break_opt
= opt1
| (opt2
<< 16);
4891 static int diff_opt_char(const struct option
*opt
,
4892 const char *arg
, int unset
)
4894 char *value
= opt
->value
;
4896 BUG_ON_OPT_NEG(unset
);
4898 return error(_("%s expects a character, got '%s'"),
4899 opt
->long_name
, arg
);
4904 static int diff_opt_color_words(const struct option
*opt
,
4905 const char *arg
, int unset
)
4907 struct diff_options
*options
= opt
->value
;
4909 BUG_ON_OPT_NEG(unset
);
4910 options
->use_color
= 1;
4911 options
->word_diff
= DIFF_WORDS_COLOR
;
4912 options
->word_regex
= arg
;
4916 static int diff_opt_compact_summary(const struct option
*opt
,
4917 const char *arg
, int unset
)
4919 struct diff_options
*options
= opt
->value
;
4921 BUG_ON_OPT_ARG(arg
);
4923 options
->flags
.stat_with_summary
= 0;
4925 options
->flags
.stat_with_summary
= 1;
4926 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4931 static int diff_opt_diff_algorithm(const struct option
*opt
,
4932 const char *arg
, int unset
)
4934 struct diff_options
*options
= opt
->value
;
4935 long value
= parse_algorithm_value(arg
);
4937 BUG_ON_OPT_NEG(unset
);
4939 return error(_("option diff-algorithm accepts \"myers\", "
4940 "\"minimal\", \"patience\" and \"histogram\""));
4942 /* clear out previous settings */
4943 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
4944 options
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
4945 options
->xdl_opts
|= value
;
4949 static int diff_opt_dirstat(const struct option
*opt
,
4950 const char *arg
, int unset
)
4952 struct diff_options
*options
= opt
->value
;
4954 BUG_ON_OPT_NEG(unset
);
4955 if (!strcmp(opt
->long_name
, "cumulative")) {
4957 BUG("how come --cumulative take a value?");
4959 } else if (!strcmp(opt
->long_name
, "dirstat-by-file"))
4960 parse_dirstat_opt(options
, "files");
4961 parse_dirstat_opt(options
, arg
? arg
: "");
4965 static int diff_opt_find_copies(const struct option
*opt
,
4966 const char *arg
, int unset
)
4968 struct diff_options
*options
= opt
->value
;
4970 BUG_ON_OPT_NEG(unset
);
4973 options
->rename_score
= parse_rename_score(&arg
);
4975 return error(_("invalid argument to %s"), opt
->long_name
);
4977 if (options
->detect_rename
== DIFF_DETECT_COPY
)
4978 options
->flags
.find_copies_harder
= 1;
4980 options
->detect_rename
= DIFF_DETECT_COPY
;
4985 static int diff_opt_find_renames(const struct option
*opt
,
4986 const char *arg
, int unset
)
4988 struct diff_options
*options
= opt
->value
;
4990 BUG_ON_OPT_NEG(unset
);
4993 options
->rename_score
= parse_rename_score(&arg
);
4995 return error(_("invalid argument to %s"), opt
->long_name
);
4997 options
->detect_rename
= DIFF_DETECT_RENAME
;
5001 static int diff_opt_follow(const struct option
*opt
,
5002 const char *arg
, int unset
)
5004 struct diff_options
*options
= opt
->value
;
5006 BUG_ON_OPT_ARG(arg
);
5008 options
->flags
.follow_renames
= 0;
5009 options
->flags
.default_follow_renames
= 0;
5011 options
->flags
.follow_renames
= 1;
5016 static enum parse_opt_result
diff_opt_output(struct parse_opt_ctx_t
*ctx
,
5017 const struct option
*opt
,
5018 const char *arg
, int unset
)
5020 struct diff_options
*options
= opt
->value
;
5023 BUG_ON_OPT_NEG(unset
);
5024 path
= prefix_filename(ctx
->prefix
, arg
);
5025 options
->file
= xfopen(path
, "w");
5026 options
->close_file
= 1;
5027 if (options
->use_color
!= GIT_COLOR_ALWAYS
)
5028 options
->use_color
= GIT_COLOR_NEVER
;
5033 static int diff_opt_patience(const struct option
*opt
,
5034 const char *arg
, int unset
)
5036 struct diff_options
*options
= opt
->value
;
5039 BUG_ON_OPT_NEG(unset
);
5040 BUG_ON_OPT_ARG(arg
);
5041 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
5043 * Both --patience and --anchored use PATIENCE_DIFF
5044 * internally, so remove any anchors previously
5047 for (i
= 0; i
< options
->anchors_nr
; i
++)
5048 free(options
->anchors
[i
]);
5049 options
->anchors_nr
= 0;
5053 static int diff_opt_relative(const struct option
*opt
,
5054 const char *arg
, int unset
)
5056 struct diff_options
*options
= opt
->value
;
5058 BUG_ON_OPT_NEG(unset
);
5059 options
->flags
.relative_name
= 1;
5061 options
->prefix
= arg
;
5065 static int diff_opt_unified(const struct option
*opt
,
5066 const char *arg
, int unset
)
5068 struct diff_options
*options
= opt
->value
;
5071 BUG_ON_OPT_NEG(unset
);
5073 options
->context
= strtol(arg
, &s
, 10);
5075 return error(_("%s expects a numerical value"), "--unified");
5076 enable_patch_output(&options
->output_format
);
5081 static int diff_opt_word_diff(const struct option
*opt
,
5082 const char *arg
, int unset
)
5084 struct diff_options
*options
= opt
->value
;
5086 BUG_ON_OPT_NEG(unset
);
5088 if (!strcmp(arg
, "plain"))
5089 options
->word_diff
= DIFF_WORDS_PLAIN
;
5090 else if (!strcmp(arg
, "color")) {
5091 options
->use_color
= 1;
5092 options
->word_diff
= DIFF_WORDS_COLOR
;
5094 else if (!strcmp(arg
, "porcelain"))
5095 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
5096 else if (!strcmp(arg
, "none"))
5097 options
->word_diff
= DIFF_WORDS_NONE
;
5099 return error(_("bad --word-diff argument: %s"), arg
);
5101 if (options
->word_diff
== DIFF_WORDS_NONE
)
5102 options
->word_diff
= DIFF_WORDS_PLAIN
;
5107 static int diff_opt_word_diff_regex(const struct option
*opt
,
5108 const char *arg
, int unset
)
5110 struct diff_options
*options
= opt
->value
;
5112 BUG_ON_OPT_NEG(unset
);
5113 if (options
->word_diff
== DIFF_WORDS_NONE
)
5114 options
->word_diff
= DIFF_WORDS_PLAIN
;
5115 options
->word_regex
= arg
;
5119 static void prep_parse_options(struct diff_options
*options
)
5121 struct option parseopts
[] = {
5122 OPT_GROUP(N_("Diff output format options")),
5123 OPT_BITOP('p', "patch", &options
->output_format
,
5124 N_("generate patch"),
5125 DIFF_FORMAT_PATCH
, DIFF_FORMAT_NO_OUTPUT
),
5126 OPT_BIT_F('s', "no-patch", &options
->output_format
,
5127 N_("suppress diff output"),
5128 DIFF_FORMAT_NO_OUTPUT
, PARSE_OPT_NONEG
),
5129 OPT_BITOP('u', NULL
, &options
->output_format
,
5130 N_("generate patch"),
5131 DIFF_FORMAT_PATCH
, DIFF_FORMAT_NO_OUTPUT
),
5132 OPT_CALLBACK_F('U', "unified", options
, N_("<n>"),
5133 N_("generate diffs with <n> lines context"),
5134 PARSE_OPT_NONEG
, diff_opt_unified
),
5135 OPT_BOOL('W', "function-context", &options
->flags
.funccontext
,
5136 N_("generate diffs with <n> lines context")),
5137 OPT_BIT_F(0, "raw", &options
->output_format
,
5138 N_("generate the diff in raw format"),
5139 DIFF_FORMAT_RAW
, PARSE_OPT_NONEG
),
5140 OPT_BITOP(0, "patch-with-raw", &options
->output_format
,
5141 N_("synonym for '-p --raw'"),
5142 DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
,
5143 DIFF_FORMAT_NO_OUTPUT
),
5144 OPT_BITOP(0, "patch-with-stat", &options
->output_format
,
5145 N_("synonym for '-p --stat'"),
5146 DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
,
5147 DIFF_FORMAT_NO_OUTPUT
),
5148 OPT_BIT_F(0, "numstat", &options
->output_format
,
5149 N_("machine friendly --stat"),
5150 DIFF_FORMAT_NUMSTAT
, PARSE_OPT_NONEG
),
5151 OPT_BIT_F(0, "shortstat", &options
->output_format
,
5152 N_("output only the last line of --stat"),
5153 DIFF_FORMAT_SHORTSTAT
, PARSE_OPT_NONEG
),
5154 OPT_CALLBACK_F('X', "dirstat", options
, N_("<param1,param2>..."),
5155 N_("output the distribution of relative amount of changes for each sub-directory"),
5156 PARSE_OPT_NONEG
| PARSE_OPT_OPTARG
,
5158 OPT_CALLBACK_F(0, "cumulative", options
, NULL
,
5159 N_("synonym for --dirstat=cumulative"),
5160 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
5162 OPT_CALLBACK_F(0, "dirstat-by-file", options
, N_("<param1,param2>..."),
5163 N_("synonym for --dirstat=files,param1,param2..."),
5164 PARSE_OPT_NONEG
| PARSE_OPT_OPTARG
,
5166 OPT_BIT_F(0, "check", &options
->output_format
,
5167 N_("warn if changes introduce conflict markers or whitespace errors"),
5168 DIFF_FORMAT_CHECKDIFF
, PARSE_OPT_NONEG
),
5169 OPT_BIT_F(0, "summary", &options
->output_format
,
5170 N_("condensed summary such as creations, renames and mode changes"),
5171 DIFF_FORMAT_SUMMARY
, PARSE_OPT_NONEG
),
5172 OPT_BIT_F(0, "name-only", &options
->output_format
,
5173 N_("show only names of changed files"),
5174 DIFF_FORMAT_NAME
, PARSE_OPT_NONEG
),
5175 OPT_BIT_F(0, "name-status", &options
->output_format
,
5176 N_("show only names and status of changed files"),
5177 DIFF_FORMAT_NAME_STATUS
, PARSE_OPT_NONEG
),
5178 OPT_CALLBACK_F(0, "stat", options
, N_("<width>[,<name-width>[,<count>]]"),
5179 N_("generate diffstat"),
5180 PARSE_OPT_NONEG
| PARSE_OPT_OPTARG
, diff_opt_stat
),
5181 OPT_CALLBACK_F(0, "stat-width", options
, N_("<width>"),
5182 N_("generate diffstat with a given width"),
5183 PARSE_OPT_NONEG
, diff_opt_stat
),
5184 OPT_CALLBACK_F(0, "stat-name-width", options
, N_("<width>"),
5185 N_("generate diffstat with a given name width"),
5186 PARSE_OPT_NONEG
, diff_opt_stat
),
5187 OPT_CALLBACK_F(0, "stat-graph-width", options
, N_("<width>"),
5188 N_("generate diffstat with a given graph width"),
5189 PARSE_OPT_NONEG
, diff_opt_stat
),
5190 OPT_CALLBACK_F(0, "stat-count", options
, N_("<count>"),
5191 N_("generate diffstat with limited lines"),
5192 PARSE_OPT_NONEG
, diff_opt_stat
),
5193 OPT_CALLBACK_F(0, "compact-summary", options
, NULL
,
5194 N_("generate compact summary in diffstat"),
5195 PARSE_OPT_NOARG
, diff_opt_compact_summary
),
5196 OPT_CALLBACK_F(0, "binary", options
, NULL
,
5197 N_("output a binary diff that can be applied"),
5198 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
, diff_opt_binary
),
5199 OPT_BOOL(0, "full-index", &options
->flags
.full_index
,
5200 N_("show full pre- and post-image object names on the \"index\" lines")),
5201 OPT_COLOR_FLAG(0, "color", &options
->use_color
,
5202 N_("show colored diff")),
5203 OPT_CALLBACK_F(0, "output-indicator-new",
5204 &options
->output_indicators
[OUTPUT_INDICATOR_NEW
],
5206 N_("specify the character to indicate a new line instead of '+'"),
5207 PARSE_OPT_NONEG
, diff_opt_char
),
5208 OPT_CALLBACK_F(0, "output-indicator-old",
5209 &options
->output_indicators
[OUTPUT_INDICATOR_OLD
],
5211 N_("specify the character to indicate an old line instead of '-'"),
5212 PARSE_OPT_NONEG
, diff_opt_char
),
5213 OPT_CALLBACK_F(0, "output-indicator-context",
5214 &options
->output_indicators
[OUTPUT_INDICATOR_CONTEXT
],
5216 N_("specify the character to indicate a context instead of ' '"),
5217 PARSE_OPT_NONEG
, diff_opt_char
),
5219 OPT_GROUP(N_("Diff rename options")),
5220 OPT_CALLBACK_F('B', "break-rewrites", &options
->break_opt
, N_("<n>[/<m>]"),
5221 N_("break complete rewrite changes into pairs of delete and create"),
5222 PARSE_OPT_NONEG
| PARSE_OPT_OPTARG
,
5223 diff_opt_break_rewrites
),
5224 OPT_CALLBACK_F('M', "find-renames", options
, N_("<n>"),
5225 N_("detect renames"),
5226 PARSE_OPT_NONEG
| PARSE_OPT_OPTARG
,
5227 diff_opt_find_renames
),
5228 OPT_SET_INT_F('D', "irreversible-delete", &options
->irreversible_delete
,
5229 N_("omit the preimage for deletes"),
5230 1, PARSE_OPT_NONEG
),
5231 OPT_CALLBACK_F('C', "find-copies", options
, N_("<n>"),
5232 N_("detect copies"),
5233 PARSE_OPT_NONEG
| PARSE_OPT_OPTARG
,
5234 diff_opt_find_copies
),
5235 OPT_BOOL(0, "find-copies-harder", &options
->flags
.find_copies_harder
,
5236 N_("use unmodified files as source to find copies")),
5237 OPT_SET_INT_F(0, "no-renames", &options
->detect_rename
,
5238 N_("disable rename detection"),
5239 0, PARSE_OPT_NONEG
),
5240 OPT_BOOL(0, "rename-empty", &options
->flags
.rename_empty
,
5241 N_("use empty blobs as rename source")),
5242 OPT_CALLBACK_F(0, "follow", options
, NULL
,
5243 N_("continue listing the history of a file beyond renames"),
5244 PARSE_OPT_NOARG
, diff_opt_follow
),
5246 OPT_GROUP(N_("Diff algorithm options")),
5247 OPT_BIT(0, "minimal", &options
->xdl_opts
,
5248 N_("produce the smallest possible diff"),
5250 OPT_BIT_F('w', "ignore-all-space", &options
->xdl_opts
,
5251 N_("ignore whitespace when comparing lines"),
5252 XDF_IGNORE_WHITESPACE
, PARSE_OPT_NONEG
),
5253 OPT_BIT_F('b', "ignore-space-change", &options
->xdl_opts
,
5254 N_("ignore changes in amount of whitespace"),
5255 XDF_IGNORE_WHITESPACE_CHANGE
, PARSE_OPT_NONEG
),
5256 OPT_BIT_F(0, "ignore-space-at-eol", &options
->xdl_opts
,
5257 N_("ignore changes in whitespace at EOL"),
5258 XDF_IGNORE_WHITESPACE_AT_EOL
, PARSE_OPT_NONEG
),
5259 OPT_BIT_F(0, "ignore-cr-at-eol", &options
->xdl_opts
,
5260 N_("ignore carrier-return at the end of line"),
5261 XDF_IGNORE_CR_AT_EOL
, PARSE_OPT_NONEG
),
5262 OPT_BIT_F(0, "ignore-blank-lines", &options
->xdl_opts
,
5263 N_("ignore changes whose lines are all blank"),
5264 XDF_IGNORE_BLANK_LINES
, PARSE_OPT_NONEG
),
5265 OPT_BIT(0, "indent-heuristic", &options
->xdl_opts
,
5266 N_("heuristic to shift diff hunk boundaries for easy reading"),
5267 XDF_INDENT_HEURISTIC
),
5268 OPT_CALLBACK_F(0, "patience", options
, NULL
,
5269 N_("generate diff using the \"patience diff\" algorithm"),
5270 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
,
5272 OPT_BITOP(0, "histogram", &options
->xdl_opts
,
5273 N_("generate diff using the \"histogram diff\" algorithm"),
5274 XDF_HISTOGRAM_DIFF
, XDF_DIFF_ALGORITHM_MASK
),
5275 OPT_CALLBACK_F(0, "diff-algorithm", options
, N_("<algorithm>"),
5276 N_("choose a diff algorithm"),
5277 PARSE_OPT_NONEG
, diff_opt_diff_algorithm
),
5278 OPT_CALLBACK_F(0, "anchored", options
, N_("<text>"),
5279 N_("generate diff using the \"anchored diff\" algorithm"),
5280 PARSE_OPT_NONEG
, diff_opt_anchored
),
5281 OPT_CALLBACK_F(0, "word-diff", options
, N_("<mode>"),
5282 N_("show word diff, using <mode> to delimit changed words"),
5283 PARSE_OPT_NONEG
| PARSE_OPT_OPTARG
, diff_opt_word_diff
),
5284 OPT_CALLBACK_F(0, "word-diff-regex", options
, N_("<regex>"),
5285 N_("use <regex> to decide what a word is"),
5286 PARSE_OPT_NONEG
, diff_opt_word_diff_regex
),
5287 OPT_CALLBACK_F(0, "color-words", options
, N_("<regex>"),
5288 N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
5289 PARSE_OPT_NONEG
| PARSE_OPT_OPTARG
, diff_opt_color_words
),
5291 OPT_GROUP(N_("Diff other options")),
5292 OPT_CALLBACK_F(0, "relative", options
, N_("<prefix>"),
5293 N_("when run from subdir, exclude changes outside and show relative paths"),
5294 PARSE_OPT_NONEG
| PARSE_OPT_OPTARG
,
5296 OPT_BOOL('a', "text", &options
->flags
.text
,
5297 N_("treat all files as text")),
5298 OPT_BOOL('R', NULL
, &options
->flags
.reverse_diff
,
5299 N_("swap two inputs, reverse the diff")),
5300 OPT_BOOL(0, "exit-code", &options
->flags
.exit_with_status
,
5301 N_("exit with 1 if there were differences, 0 otherwise")),
5302 OPT_BOOL(0, "quiet", &options
->flags
.quick
,
5303 N_("disable all output of the program")),
5304 OPT_BOOL(0, "ext-diff", &options
->flags
.allow_external
,
5305 N_("allow an external diff helper to be executed")),
5306 { OPTION_CALLBACK
, 0, "output", options
, N_("<file>"),
5307 N_("Output to a specific file"),
5308 PARSE_OPT_NONEG
, NULL
, 0, diff_opt_output
},
5313 ALLOC_ARRAY(options
->parseopts
, ARRAY_SIZE(parseopts
));
5314 memcpy(options
->parseopts
, parseopts
, sizeof(parseopts
));
5317 int diff_opt_parse(struct diff_options
*options
,
5318 const char **av
, int ac
, const char *prefix
)
5320 const char *arg
= av
[0];
5327 ac
= parse_options(ac
, av
, prefix
, options
->parseopts
, NULL
,
5328 PARSE_OPT_KEEP_DASHDASH
|
5329 PARSE_OPT_KEEP_UNKNOWN
|
5330 PARSE_OPT_NO_INTERNAL_HELP
|
5331 PARSE_OPT_ONE_SHOT
|
5332 PARSE_OPT_STOP_AT_NON_OPTION
);
5338 if (!strcmp(arg
, "--color-moved")) {
5339 if (diff_color_moved_default
)
5340 options
->color_moved
= diff_color_moved_default
;
5341 if (options
->color_moved
== COLOR_MOVED_NO
)
5342 options
->color_moved
= COLOR_MOVED_DEFAULT
;
5343 } else if (!strcmp(arg
, "--no-color-moved"))
5344 options
->color_moved
= COLOR_MOVED_NO
;
5345 else if (skip_prefix(arg
, "--color-moved=", &arg
)) {
5346 int cm
= parse_color_moved(arg
);
5348 return error("bad --color-moved argument: %s", arg
);
5349 options
->color_moved
= cm
;
5350 } else if (skip_prefix(arg
, "--color-moved-ws=", &arg
)) {
5351 unsigned cm
= parse_color_moved_ws(arg
);
5352 if (cm
& COLOR_MOVED_WS_ERROR
)
5354 options
->color_moved_ws_handling
= cm
;
5355 } else if (!strcmp(arg
, "--textconv")) {
5356 options
->flags
.allow_textconv
= 1;
5357 options
->flags
.textconv_set_via_cmdline
= 1;
5358 } else if (!strcmp(arg
, "--no-textconv"))
5359 options
->flags
.allow_textconv
= 0;
5360 else if (skip_to_optional_arg_default(arg
, "--ignore-submodules", &arg
, "all")) {
5361 options
->flags
.override_submodule_config
= 1;
5362 handle_ignore_submodules_arg(options
, arg
);
5363 } else if (skip_to_optional_arg_default(arg
, "--submodule", &arg
, "log"))
5364 return parse_submodule_opt(options
, arg
);
5365 else if (skip_prefix(arg
, "--ws-error-highlight=", &arg
))
5366 return parse_ws_error_highlight_opt(options
, arg
);
5367 else if (!strcmp(arg
, "--ita-invisible-in-index"))
5368 options
->ita_invisible_in_index
= 1;
5369 else if (!strcmp(arg
, "--ita-visible-in-index"))
5370 options
->ita_invisible_in_index
= 0;
5373 else if (!strcmp(arg
, "-z"))
5374 options
->line_termination
= 0;
5375 else if ((argcount
= short_opt('l', av
, &optarg
))) {
5376 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
5379 else if ((argcount
= short_opt('S', av
, &optarg
))) {
5380 options
->pickaxe
= optarg
;
5381 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_S
;
5383 } else if ((argcount
= short_opt('G', av
, &optarg
))) {
5384 options
->pickaxe
= optarg
;
5385 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_G
;
5388 else if (!strcmp(arg
, "--pickaxe-all"))
5389 options
->pickaxe_opts
|= DIFF_PICKAXE_ALL
;
5390 else if (!strcmp(arg
, "--pickaxe-regex"))
5391 options
->pickaxe_opts
|= DIFF_PICKAXE_REGEX
;
5392 else if ((argcount
= short_opt('O', av
, &optarg
))) {
5393 options
->orderfile
= prefix_filename(prefix
, optarg
);
5395 } else if (skip_prefix(arg
, "--find-object=", &arg
))
5396 return parse_objfind_opt(options
, arg
);
5397 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
5398 int offending
= parse_diff_filter_opt(optarg
, options
);
5400 die("unknown change class '%c' in --diff-filter=%s",
5404 else if (!strcmp(arg
, "--no-abbrev"))
5405 options
->abbrev
= 0;
5406 else if (!strcmp(arg
, "--abbrev"))
5407 options
->abbrev
= DEFAULT_ABBREV
;
5408 else if (skip_prefix(arg
, "--abbrev=", &arg
)) {
5409 options
->abbrev
= strtoul(arg
, NULL
, 10);
5410 if (options
->abbrev
< MINIMUM_ABBREV
)
5411 options
->abbrev
= MINIMUM_ABBREV
;
5412 else if (the_hash_algo
->hexsz
< options
->abbrev
)
5413 options
->abbrev
= the_hash_algo
->hexsz
;
5415 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
5416 options
->a_prefix
= optarg
;
5419 else if ((argcount
= parse_long_opt("line-prefix", av
, &optarg
))) {
5420 options
->line_prefix
= optarg
;
5421 options
->line_prefix_length
= strlen(options
->line_prefix
);
5422 graph_setup_line_prefix(options
);
5425 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
5426 options
->b_prefix
= optarg
;
5429 else if (!strcmp(arg
, "--no-prefix"))
5430 options
->a_prefix
= options
->b_prefix
= "";
5431 else if (opt_arg(arg
, '\0', "inter-hunk-context",
5432 &options
->interhunkcontext
))
5439 int parse_rename_score(const char **cp_p
)
5441 unsigned long num
, scale
;
5443 const char *cp
= *cp_p
;
5450 if ( !dot
&& ch
== '.' ) {
5453 } else if ( ch
== '%' ) {
5454 scale
= dot
? scale
*100 : 100;
5455 cp
++; /* % is always at the end */
5457 } else if ( ch
>= '0' && ch
<= '9' ) {
5458 if ( scale
< 100000 ) {
5460 num
= (num
*10) + (ch
-'0');
5469 /* user says num divided by scale and we say internally that
5470 * is MAX_SCORE * num / scale.
5472 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
5475 struct diff_queue_struct diff_queued_diff
;
5477 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
5479 ALLOC_GROW(queue
->queue
, queue
->nr
+ 1, queue
->alloc
);
5480 queue
->queue
[queue
->nr
++] = dp
;
5483 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
5484 struct diff_filespec
*one
,
5485 struct diff_filespec
*two
)
5487 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
5495 void diff_free_filepair(struct diff_filepair
*p
)
5497 free_filespec(p
->one
);
5498 free_filespec(p
->two
);
5502 const char *diff_aligned_abbrev(const struct object_id
*oid
, int len
)
5507 /* Do we want all 40 hex characters? */
5508 if (len
== the_hash_algo
->hexsz
)
5509 return oid_to_hex(oid
);
5511 /* An abbreviated value is fine, possibly followed by an ellipsis. */
5512 abbrev
= diff_abbrev_oid(oid
, len
);
5514 if (!print_sha1_ellipsis())
5517 abblen
= strlen(abbrev
);
5520 * In well-behaved cases, where the abbreviated result is the
5521 * same as the requested length, append three dots after the
5522 * abbreviation (hence the whole logic is limited to the case
5523 * where abblen < 37); when the actual abbreviated result is a
5524 * bit longer than the requested length, we reduce the number
5525 * of dots so that they match the well-behaved ones. However,
5526 * if the actual abbreviation is longer than the requested
5527 * length by more than three, we give up on aligning, and add
5528 * three dots anyway, to indicate that the output is not the
5529 * full object name. Yes, this may be suboptimal, but this
5530 * appears only in "diff --raw --abbrev" output and it is not
5531 * worth the effort to change it now. Note that this would
5532 * likely to work fine when the automatic sizing of default
5533 * abbreviation length is used--we would be fed -1 in "len" in
5534 * that case, and will end up always appending three-dots, but
5535 * the automatic sizing is supposed to give abblen that ensures
5536 * uniqueness across all objects (statistically speaking).
5538 if (abblen
< the_hash_algo
->hexsz
- 3) {
5539 static char hex
[GIT_MAX_HEXSZ
+ 1];
5540 if (len
< abblen
&& abblen
<= len
+ 2)
5541 xsnprintf(hex
, sizeof(hex
), "%s%.*s", abbrev
, len
+3-abblen
, "..");
5543 xsnprintf(hex
, sizeof(hex
), "%s...", abbrev
);
5547 return oid_to_hex(oid
);
5550 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
5552 int line_termination
= opt
->line_termination
;
5553 int inter_name_termination
= line_termination
? '\t' : '\0';
5555 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
5556 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
5557 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
5558 diff_aligned_abbrev(&p
->one
->oid
, opt
->abbrev
));
5559 fprintf(opt
->file
, "%s ",
5560 diff_aligned_abbrev(&p
->two
->oid
, opt
->abbrev
));
5563 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
5564 inter_name_termination
);
5566 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
5569 if (p
->status
== DIFF_STATUS_COPIED
||
5570 p
->status
== DIFF_STATUS_RENAMED
) {
5571 const char *name_a
, *name_b
;
5572 name_a
= p
->one
->path
;
5573 name_b
= p
->two
->path
;
5574 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5575 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
5576 write_name_quoted(name_b
, opt
->file
, line_termination
);
5578 const char *name_a
, *name_b
;
5579 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
5581 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5582 write_name_quoted(name_a
, opt
->file
, line_termination
);
5586 int diff_unmodified_pair(struct diff_filepair
*p
)
5588 /* This function is written stricter than necessary to support
5589 * the currently implemented transformers, but the idea is to
5590 * let transformers to produce diff_filepairs any way they want,
5591 * and filter and clean them up here before producing the output.
5593 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
5595 if (DIFF_PAIR_UNMERGED(p
))
5596 return 0; /* unmerged is interesting */
5598 /* deletion, addition, mode or type change
5599 * and rename are all interesting.
5601 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
5602 DIFF_PAIR_MODE_CHANGED(p
) ||
5603 strcmp(one
->path
, two
->path
))
5606 /* both are valid and point at the same path. that is, we are
5607 * dealing with a change.
5609 if (one
->oid_valid
&& two
->oid_valid
&&
5610 oideq(&one
->oid
, &two
->oid
) &&
5611 !one
->dirty_submodule
&& !two
->dirty_submodule
)
5612 return 1; /* no change */
5613 if (!one
->oid_valid
&& !two
->oid_valid
)
5614 return 1; /* both look at the same file on the filesystem. */
5618 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
5620 if (diff_unmodified_pair(p
))
5623 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5624 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5625 return; /* no tree diffs in patch format */
5630 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
5631 struct diffstat_t
*diffstat
)
5633 if (diff_unmodified_pair(p
))
5636 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5637 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5638 return; /* no useful stat for tree diffs */
5640 run_diffstat(p
, o
, diffstat
);
5643 static void diff_flush_checkdiff(struct diff_filepair
*p
,
5644 struct diff_options
*o
)
5646 if (diff_unmodified_pair(p
))
5649 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5650 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5651 return; /* nothing to check in tree diffs */
5653 run_checkdiff(p
, o
);
5656 int diff_queue_is_empty(void)
5658 struct diff_queue_struct
*q
= &diff_queued_diff
;
5660 for (i
= 0; i
< q
->nr
; i
++)
5661 if (!diff_unmodified_pair(q
->queue
[i
]))
5667 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
5669 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
5672 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
5674 s
->oid_valid
? oid_to_hex(&s
->oid
) : "");
5675 fprintf(stderr
, "queue[%d] %s size %lu\n",
5680 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
5682 diff_debug_filespec(p
->one
, i
, "one");
5683 diff_debug_filespec(p
->two
, i
, "two");
5684 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
5685 p
->score
, p
->status
? p
->status
: '?',
5686 p
->one
->rename_used
, p
->broken_pair
);
5689 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
5693 fprintf(stderr
, "%s\n", msg
);
5694 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
5695 for (i
= 0; i
< q
->nr
; i
++) {
5696 struct diff_filepair
*p
= q
->queue
[i
];
5697 diff_debug_filepair(p
, i
);
5702 static void diff_resolve_rename_copy(void)
5705 struct diff_filepair
*p
;
5706 struct diff_queue_struct
*q
= &diff_queued_diff
;
5708 diff_debug_queue("resolve-rename-copy", q
);
5710 for (i
= 0; i
< q
->nr
; i
++) {
5712 p
->status
= 0; /* undecided */
5713 if (DIFF_PAIR_UNMERGED(p
))
5714 p
->status
= DIFF_STATUS_UNMERGED
;
5715 else if (!DIFF_FILE_VALID(p
->one
))
5716 p
->status
= DIFF_STATUS_ADDED
;
5717 else if (!DIFF_FILE_VALID(p
->two
))
5718 p
->status
= DIFF_STATUS_DELETED
;
5719 else if (DIFF_PAIR_TYPE_CHANGED(p
))
5720 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
5722 /* from this point on, we are dealing with a pair
5723 * whose both sides are valid and of the same type, i.e.
5724 * either in-place edit or rename/copy edit.
5726 else if (DIFF_PAIR_RENAME(p
)) {
5728 * A rename might have re-connected a broken
5729 * pair up, causing the pathnames to be the
5730 * same again. If so, that's not a rename at
5731 * all, just a modification..
5733 * Otherwise, see if this source was used for
5734 * multiple renames, in which case we decrement
5735 * the count, and call it a copy.
5737 if (!strcmp(p
->one
->path
, p
->two
->path
))
5738 p
->status
= DIFF_STATUS_MODIFIED
;
5739 else if (--p
->one
->rename_used
> 0)
5740 p
->status
= DIFF_STATUS_COPIED
;
5742 p
->status
= DIFF_STATUS_RENAMED
;
5744 else if (!oideq(&p
->one
->oid
, &p
->two
->oid
) ||
5745 p
->one
->mode
!= p
->two
->mode
||
5746 p
->one
->dirty_submodule
||
5747 p
->two
->dirty_submodule
||
5748 is_null_oid(&p
->one
->oid
))
5749 p
->status
= DIFF_STATUS_MODIFIED
;
5751 /* This is a "no-change" entry and should not
5752 * happen anymore, but prepare for broken callers.
5754 error("feeding unmodified %s to diffcore",
5756 p
->status
= DIFF_STATUS_UNKNOWN
;
5759 diff_debug_queue("resolve-rename-copy done", q
);
5762 static int check_pair_status(struct diff_filepair
*p
)
5764 switch (p
->status
) {
5765 case DIFF_STATUS_UNKNOWN
:
5768 die("internal error in diff-resolve-rename-copy");
5774 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
5776 int fmt
= opt
->output_format
;
5778 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
5779 diff_flush_checkdiff(p
, opt
);
5780 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
5781 diff_flush_raw(p
, opt
);
5782 else if (fmt
& DIFF_FORMAT_NAME
) {
5783 const char *name_a
, *name_b
;
5784 name_a
= p
->two
->path
;
5786 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5787 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
5788 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
5792 static void show_file_mode_name(struct diff_options
*opt
, const char *newdelete
, struct diff_filespec
*fs
)
5794 struct strbuf sb
= STRBUF_INIT
;
5796 strbuf_addf(&sb
, " %s mode %06o ", newdelete
, fs
->mode
);
5798 strbuf_addf(&sb
, " %s ", newdelete
);
5800 quote_c_style(fs
->path
, &sb
, NULL
, 0);
5801 strbuf_addch(&sb
, '\n');
5802 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5804 strbuf_release(&sb
);
5807 static void show_mode_change(struct diff_options
*opt
, struct diff_filepair
*p
,
5810 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
5811 struct strbuf sb
= STRBUF_INIT
;
5812 strbuf_addf(&sb
, " mode change %06o => %06o",
5813 p
->one
->mode
, p
->two
->mode
);
5815 strbuf_addch(&sb
, ' ');
5816 quote_c_style(p
->two
->path
, &sb
, NULL
, 0);
5818 strbuf_addch(&sb
, '\n');
5819 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5821 strbuf_release(&sb
);
5825 static void show_rename_copy(struct diff_options
*opt
, const char *renamecopy
,
5826 struct diff_filepair
*p
)
5828 struct strbuf sb
= STRBUF_INIT
;
5829 struct strbuf names
= STRBUF_INIT
;
5831 pprint_rename(&names
, p
->one
->path
, p
->two
->path
);
5832 strbuf_addf(&sb
, " %s %s (%d%%)\n",
5833 renamecopy
, names
.buf
, similarity_index(p
));
5834 strbuf_release(&names
);
5835 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5837 show_mode_change(opt
, p
, 0);
5838 strbuf_release(&sb
);
5841 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
5844 case DIFF_STATUS_DELETED
:
5845 show_file_mode_name(opt
, "delete", p
->one
);
5847 case DIFF_STATUS_ADDED
:
5848 show_file_mode_name(opt
, "create", p
->two
);
5850 case DIFF_STATUS_COPIED
:
5851 show_rename_copy(opt
, "copy", p
);
5853 case DIFF_STATUS_RENAMED
:
5854 show_rename_copy(opt
, "rename", p
);
5858 struct strbuf sb
= STRBUF_INIT
;
5859 strbuf_addstr(&sb
, " rewrite ");
5860 quote_c_style(p
->two
->path
, &sb
, NULL
, 0);
5861 strbuf_addf(&sb
, " (%d%%)\n", similarity_index(p
));
5862 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5864 strbuf_release(&sb
);
5866 show_mode_change(opt
, p
, !p
->score
);
5876 static int remove_space(char *line
, int len
)
5882 for (i
= 0; i
< len
; i
++)
5883 if (!isspace((c
= line
[i
])))
5889 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
5891 struct patch_id_t
*data
= priv
;
5894 new_len
= remove_space(line
, len
);
5896 git_SHA1_Update(data
->ctx
, line
, new_len
);
5897 data
->patchlen
+= new_len
;
5900 static void patch_id_add_string(git_SHA_CTX
*ctx
, const char *str
)
5902 git_SHA1_Update(ctx
, str
, strlen(str
));
5905 static void patch_id_add_mode(git_SHA_CTX
*ctx
, unsigned mode
)
5907 /* large enough for 2^32 in octal */
5909 int len
= xsnprintf(buf
, sizeof(buf
), "%06o", mode
);
5910 git_SHA1_Update(ctx
, buf
, len
);
5913 /* returns 0 upon success, and writes result into sha1 */
5914 static int diff_get_patch_id(struct diff_options
*options
, struct object_id
*oid
, int diff_header_only
)
5916 struct diff_queue_struct
*q
= &diff_queued_diff
;
5919 struct patch_id_t data
;
5921 git_SHA1_Init(&ctx
);
5922 memset(&data
, 0, sizeof(struct patch_id_t
));
5925 for (i
= 0; i
< q
->nr
; i
++) {
5929 struct diff_filepair
*p
= q
->queue
[i
];
5932 memset(&xpp
, 0, sizeof(xpp
));
5933 memset(&xecfg
, 0, sizeof(xecfg
));
5935 return error("internal diff status error");
5936 if (p
->status
== DIFF_STATUS_UNKNOWN
)
5938 if (diff_unmodified_pair(p
))
5940 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5941 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5943 if (DIFF_PAIR_UNMERGED(p
))
5946 diff_fill_oid_info(p
->one
, options
->repo
->index
);
5947 diff_fill_oid_info(p
->two
, options
->repo
->index
);
5949 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
5950 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
5951 patch_id_add_string(&ctx
, "diff--git");
5952 patch_id_add_string(&ctx
, "a/");
5953 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5954 patch_id_add_string(&ctx
, "b/");
5955 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5957 if (p
->one
->mode
== 0) {
5958 patch_id_add_string(&ctx
, "newfilemode");
5959 patch_id_add_mode(&ctx
, p
->two
->mode
);
5960 patch_id_add_string(&ctx
, "---/dev/null");
5961 patch_id_add_string(&ctx
, "+++b/");
5962 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5963 } else if (p
->two
->mode
== 0) {
5964 patch_id_add_string(&ctx
, "deletedfilemode");
5965 patch_id_add_mode(&ctx
, p
->one
->mode
);
5966 patch_id_add_string(&ctx
, "---a/");
5967 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5968 patch_id_add_string(&ctx
, "+++/dev/null");
5970 patch_id_add_string(&ctx
, "---a/");
5971 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5972 patch_id_add_string(&ctx
, "+++b/");
5973 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5976 if (diff_header_only
)
5979 if (fill_mmfile(options
->repo
, &mf1
, p
->one
) < 0 ||
5980 fill_mmfile(options
->repo
, &mf2
, p
->two
) < 0)
5981 return error("unable to read files to diff");
5983 if (diff_filespec_is_binary(options
->repo
, p
->one
) ||
5984 diff_filespec_is_binary(options
->repo
, p
->two
)) {
5985 git_SHA1_Update(&ctx
, oid_to_hex(&p
->one
->oid
),
5987 git_SHA1_Update(&ctx
, oid_to_hex(&p
->two
->oid
),
5995 if (xdi_diff_outf(&mf1
, &mf2
, discard_hunk_line
,
5996 patch_id_consume
, &data
, &xpp
, &xecfg
))
5997 return error("unable to generate patch-id diff for %s",
6001 git_SHA1_Final(oid
->hash
, &ctx
);
6005 int diff_flush_patch_id(struct diff_options
*options
, struct object_id
*oid
, int diff_header_only
)
6007 struct diff_queue_struct
*q
= &diff_queued_diff
;
6009 int result
= diff_get_patch_id(options
, oid
, diff_header_only
);
6011 for (i
= 0; i
< q
->nr
; i
++)
6012 diff_free_filepair(q
->queue
[i
]);
6015 DIFF_QUEUE_CLEAR(q
);
6020 static int is_summary_empty(const struct diff_queue_struct
*q
)
6024 for (i
= 0; i
< q
->nr
; i
++) {
6025 const struct diff_filepair
*p
= q
->queue
[i
];
6027 switch (p
->status
) {
6028 case DIFF_STATUS_DELETED
:
6029 case DIFF_STATUS_ADDED
:
6030 case DIFF_STATUS_COPIED
:
6031 case DIFF_STATUS_RENAMED
:
6036 if (p
->one
->mode
&& p
->two
->mode
&&
6037 p
->one
->mode
!= p
->two
->mode
)
6045 static const char rename_limit_warning
[] =
6046 N_("inexact rename detection was skipped due to too many files.");
6048 static const char degrade_cc_to_c_warning
[] =
6049 N_("only found copies from modified paths due to too many files.");
6051 static const char rename_limit_advice
[] =
6052 N_("you may want to set your %s variable to at least "
6053 "%d and retry the command.");
6055 void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
)
6059 warning(_(degrade_cc_to_c_warning
));
6061 warning(_(rename_limit_warning
));
6065 warning(_(rename_limit_advice
), varname
, needed
);
6068 static void diff_flush_patch_all_file_pairs(struct diff_options
*o
)
6071 static struct emitted_diff_symbols esm
= EMITTED_DIFF_SYMBOLS_INIT
;
6072 struct diff_queue_struct
*q
= &diff_queued_diff
;
6074 if (WSEH_NEW
& WS_RULE_MASK
)
6075 BUG("WS rules bit mask overlaps with diff symbol flags");
6078 o
->emitted_symbols
= &esm
;
6080 for (i
= 0; i
< q
->nr
; i
++) {
6081 struct diff_filepair
*p
= q
->queue
[i
];
6082 if (check_pair_status(p
))
6083 diff_flush_patch(p
, o
);
6086 if (o
->emitted_symbols
) {
6087 if (o
->color_moved
) {
6088 struct hashmap add_lines
, del_lines
;
6090 if (o
->color_moved_ws_handling
&
6091 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
)
6092 o
->color_moved_ws_handling
|= XDF_IGNORE_WHITESPACE
;
6094 hashmap_init(&del_lines
, moved_entry_cmp
, o
, 0);
6095 hashmap_init(&add_lines
, moved_entry_cmp
, o
, 0);
6097 add_lines_to_move_detection(o
, &add_lines
, &del_lines
);
6098 mark_color_as_moved(o
, &add_lines
, &del_lines
);
6099 if (o
->color_moved
== COLOR_MOVED_ZEBRA_DIM
)
6102 hashmap_free(&add_lines
, 1);
6103 hashmap_free(&del_lines
, 1);
6106 for (i
= 0; i
< esm
.nr
; i
++)
6107 emit_diff_symbol_from_struct(o
, &esm
.buf
[i
]);
6109 for (i
= 0; i
< esm
.nr
; i
++)
6110 free((void *)esm
.buf
[i
].line
);
6115 void diff_flush(struct diff_options
*options
)
6117 struct diff_queue_struct
*q
= &diff_queued_diff
;
6118 int i
, output_format
= options
->output_format
;
6120 int dirstat_by_line
= 0;
6123 * Order: raw, stat, summary, patch
6124 * or: name/name-status/checkdiff (other bits clear)
6129 if (output_format
& (DIFF_FORMAT_RAW
|
6131 DIFF_FORMAT_NAME_STATUS
|
6132 DIFF_FORMAT_CHECKDIFF
)) {
6133 for (i
= 0; i
< q
->nr
; i
++) {
6134 struct diff_filepair
*p
= q
->queue
[i
];
6135 if (check_pair_status(p
))
6136 flush_one_pair(p
, options
);
6141 if (output_format
& DIFF_FORMAT_DIRSTAT
&& options
->flags
.dirstat_by_line
)
6142 dirstat_by_line
= 1;
6144 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
) ||
6146 struct diffstat_t diffstat
;
6148 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
6149 for (i
= 0; i
< q
->nr
; i
++) {
6150 struct diff_filepair
*p
= q
->queue
[i
];
6151 if (check_pair_status(p
))
6152 diff_flush_stat(p
, options
, &diffstat
);
6154 if (output_format
& DIFF_FORMAT_NUMSTAT
)
6155 show_numstat(&diffstat
, options
);
6156 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
6157 show_stats(&diffstat
, options
);
6158 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
6159 show_shortstats(&diffstat
, options
);
6160 if (output_format
& DIFF_FORMAT_DIRSTAT
&& dirstat_by_line
)
6161 show_dirstat_by_line(&diffstat
, options
);
6162 free_diffstat_info(&diffstat
);
6165 if ((output_format
& DIFF_FORMAT_DIRSTAT
) && !dirstat_by_line
)
6166 show_dirstat(options
);
6168 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
6169 for (i
= 0; i
< q
->nr
; i
++) {
6170 diff_summary(options
, q
->queue
[i
]);
6175 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
6176 options
->flags
.exit_with_status
&&
6177 options
->flags
.diff_from_contents
) {
6179 * run diff_flush_patch for the exit status. setting
6180 * options->file to /dev/null should be safe, because we
6181 * aren't supposed to produce any output anyway.
6183 if (options
->close_file
)
6184 fclose(options
->file
);
6185 options
->file
= xfopen("/dev/null", "w");
6186 options
->close_file
= 1;
6187 options
->color_moved
= 0;
6188 for (i
= 0; i
< q
->nr
; i
++) {
6189 struct diff_filepair
*p
= q
->queue
[i
];
6190 if (check_pair_status(p
))
6191 diff_flush_patch(p
, options
);
6192 if (options
->found_changes
)
6197 if (output_format
& DIFF_FORMAT_PATCH
) {
6199 emit_diff_symbol(options
, DIFF_SYMBOL_SEPARATOR
, NULL
, 0, 0);
6200 if (options
->stat_sep
)
6201 /* attach patch instead of inline */
6202 emit_diff_symbol(options
, DIFF_SYMBOL_STAT_SEP
,
6206 diff_flush_patch_all_file_pairs(options
);
6209 if (output_format
& DIFF_FORMAT_CALLBACK
)
6210 options
->format_callback(q
, options
, options
->format_callback_data
);
6212 for (i
= 0; i
< q
->nr
; i
++)
6213 diff_free_filepair(q
->queue
[i
]);
6216 DIFF_QUEUE_CLEAR(q
);
6217 if (options
->close_file
)
6218 fclose(options
->file
);
6221 * Report the content-level differences with HAS_CHANGES;
6222 * diff_addremove/diff_change does not set the bit when
6223 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
6225 if (options
->flags
.diff_from_contents
) {
6226 if (options
->found_changes
)
6227 options
->flags
.has_changes
= 1;
6229 options
->flags
.has_changes
= 0;
6233 static int match_filter(const struct diff_options
*options
, const struct diff_filepair
*p
)
6235 return (((p
->status
== DIFF_STATUS_MODIFIED
) &&
6237 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN
, options
)) ||
6239 filter_bit_tst(DIFF_STATUS_MODIFIED
, options
)))) ||
6240 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
6241 filter_bit_tst(p
->status
, options
)));
6244 static void diffcore_apply_filter(struct diff_options
*options
)
6247 struct diff_queue_struct
*q
= &diff_queued_diff
;
6248 struct diff_queue_struct outq
;
6250 DIFF_QUEUE_CLEAR(&outq
);
6252 if (!options
->filter
)
6255 if (filter_bit_tst(DIFF_STATUS_FILTER_AON
, options
)) {
6257 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
6258 if (match_filter(options
, q
->queue
[i
]))
6264 /* otherwise we will clear the whole queue
6265 * by copying the empty outq at the end of this
6266 * function, but first clear the current entries
6269 for (i
= 0; i
< q
->nr
; i
++)
6270 diff_free_filepair(q
->queue
[i
]);
6273 /* Only the matching ones */
6274 for (i
= 0; i
< q
->nr
; i
++) {
6275 struct diff_filepair
*p
= q
->queue
[i
];
6276 if (match_filter(options
, p
))
6279 diff_free_filepair(p
);
6286 /* Check whether two filespecs with the same mode and size are identical */
6287 static int diff_filespec_is_identical(struct repository
*r
,
6288 struct diff_filespec
*one
,
6289 struct diff_filespec
*two
)
6291 if (S_ISGITLINK(one
->mode
))
6293 if (diff_populate_filespec(r
, one
, 0))
6295 if (diff_populate_filespec(r
, two
, 0))
6297 return !memcmp(one
->data
, two
->data
, one
->size
);
6300 static int diff_filespec_check_stat_unmatch(struct repository
*r
,
6301 struct diff_filepair
*p
)
6303 if (p
->done_skip_stat_unmatch
)
6304 return p
->skip_stat_unmatch_result
;
6306 p
->done_skip_stat_unmatch
= 1;
6307 p
->skip_stat_unmatch_result
= 0;
6309 * 1. Entries that come from stat info dirtiness
6310 * always have both sides (iow, not create/delete),
6311 * one side of the object name is unknown, with
6312 * the same mode and size. Keep the ones that
6313 * do not match these criteria. They have real
6316 * 2. At this point, the file is known to be modified,
6317 * with the same mode and size, and the object
6318 * name of one side is unknown. Need to inspect
6319 * the identical contents.
6321 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
6322 !DIFF_FILE_VALID(p
->two
) ||
6323 (p
->one
->oid_valid
&& p
->two
->oid_valid
) ||
6324 (p
->one
->mode
!= p
->two
->mode
) ||
6325 diff_populate_filespec(r
, p
->one
, CHECK_SIZE_ONLY
) ||
6326 diff_populate_filespec(r
, p
->two
, CHECK_SIZE_ONLY
) ||
6327 (p
->one
->size
!= p
->two
->size
) ||
6328 !diff_filespec_is_identical(r
, p
->one
, p
->two
)) /* (2) */
6329 p
->skip_stat_unmatch_result
= 1;
6330 return p
->skip_stat_unmatch_result
;
6333 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
6336 struct diff_queue_struct
*q
= &diff_queued_diff
;
6337 struct diff_queue_struct outq
;
6338 DIFF_QUEUE_CLEAR(&outq
);
6340 for (i
= 0; i
< q
->nr
; i
++) {
6341 struct diff_filepair
*p
= q
->queue
[i
];
6343 if (diff_filespec_check_stat_unmatch(diffopt
->repo
, p
))
6347 * The caller can subtract 1 from skip_stat_unmatch
6348 * to determine how many paths were dirty only
6349 * due to stat info mismatch.
6351 if (!diffopt
->flags
.no_index
)
6352 diffopt
->skip_stat_unmatch
++;
6353 diff_free_filepair(p
);
6360 static int diffnamecmp(const void *a_
, const void *b_
)
6362 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
6363 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
6364 const char *name_a
, *name_b
;
6366 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
6367 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
6368 return strcmp(name_a
, name_b
);
6371 void diffcore_fix_diff_index(struct diff_options
*options
)
6373 struct diff_queue_struct
*q
= &diff_queued_diff
;
6374 QSORT(q
->queue
, q
->nr
, diffnamecmp
);
6377 void diffcore_std(struct diff_options
*options
)
6379 /* NOTE please keep the following in sync with diff_tree_combined() */
6380 if (options
->skip_stat_unmatch
)
6381 diffcore_skip_stat_unmatch(options
);
6382 if (!options
->found_follow
) {
6383 /* See try_to_follow_renames() in tree-diff.c */
6384 if (options
->break_opt
!= -1)
6385 diffcore_break(options
->repo
,
6386 options
->break_opt
);
6387 if (options
->detect_rename
)
6388 diffcore_rename(options
);
6389 if (options
->break_opt
!= -1)
6390 diffcore_merge_broken();
6392 if (options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
)
6393 diffcore_pickaxe(options
);
6394 if (options
->orderfile
)
6395 diffcore_order(options
->orderfile
);
6396 if (!options
->found_follow
)
6397 /* See try_to_follow_renames() in tree-diff.c */
6398 diff_resolve_rename_copy();
6399 diffcore_apply_filter(options
);
6401 if (diff_queued_diff
.nr
&& !options
->flags
.diff_from_contents
)
6402 options
->flags
.has_changes
= 1;
6404 options
->flags
.has_changes
= 0;
6406 options
->found_follow
= 0;
6409 int diff_result_code(struct diff_options
*opt
, int status
)
6413 diff_warn_rename_limit("diff.renameLimit",
6414 opt
->needed_rename_limit
,
6415 opt
->degraded_cc_to_c
);
6416 if (!opt
->flags
.exit_with_status
&&
6417 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
6419 if (opt
->flags
.exit_with_status
&&
6420 opt
->flags
.has_changes
)
6422 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
6423 opt
->flags
.check_failed
)
6428 int diff_can_quit_early(struct diff_options
*opt
)
6430 return (opt
->flags
.quick
&&
6432 opt
->flags
.has_changes
);
6436 * Shall changes to this submodule be ignored?
6438 * Submodule changes can be configured to be ignored separately for each path,
6439 * but that configuration can be overridden from the command line.
6441 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
6444 struct diff_flags orig_flags
= options
->flags
;
6445 if (!options
->flags
.override_submodule_config
)
6446 set_diffopt_flags_from_submodule_config(options
, path
);
6447 if (options
->flags
.ignore_submodules
)
6449 options
->flags
= orig_flags
;
6453 void diff_addremove(struct diff_options
*options
,
6454 int addremove
, unsigned mode
,
6455 const struct object_id
*oid
,
6457 const char *concatpath
, unsigned dirty_submodule
)
6459 struct diff_filespec
*one
, *two
;
6461 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
6464 /* This may look odd, but it is a preparation for
6465 * feeding "there are unchanged files which should
6466 * not produce diffs, but when you are doing copy
6467 * detection you would need them, so here they are"
6468 * entries to the diff-core. They will be prefixed
6469 * with something like '=' or '*' (I haven't decided
6470 * which but should not make any difference).
6471 * Feeding the same new and old to diff_change()
6472 * also has the same effect.
6473 * Before the final output happens, they are pruned after
6474 * merged into rename/copy pairs as appropriate.
6476 if (options
->flags
.reverse_diff
)
6477 addremove
= (addremove
== '+' ? '-' :
6478 addremove
== '-' ? '+' : addremove
);
6480 if (options
->prefix
&&
6481 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
6484 one
= alloc_filespec(concatpath
);
6485 two
= alloc_filespec(concatpath
);
6487 if (addremove
!= '+')
6488 fill_filespec(one
, oid
, oid_valid
, mode
);
6489 if (addremove
!= '-') {
6490 fill_filespec(two
, oid
, oid_valid
, mode
);
6491 two
->dirty_submodule
= dirty_submodule
;
6494 diff_queue(&diff_queued_diff
, one
, two
);
6495 if (!options
->flags
.diff_from_contents
)
6496 options
->flags
.has_changes
= 1;
6499 void diff_change(struct diff_options
*options
,
6500 unsigned old_mode
, unsigned new_mode
,
6501 const struct object_id
*old_oid
,
6502 const struct object_id
*new_oid
,
6503 int old_oid_valid
, int new_oid_valid
,
6504 const char *concatpath
,
6505 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
6507 struct diff_filespec
*one
, *two
;
6508 struct diff_filepair
*p
;
6510 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
6511 is_submodule_ignored(concatpath
, options
))
6514 if (options
->flags
.reverse_diff
) {
6515 SWAP(old_mode
, new_mode
);
6516 SWAP(old_oid
, new_oid
);
6517 SWAP(old_oid_valid
, new_oid_valid
);
6518 SWAP(old_dirty_submodule
, new_dirty_submodule
);
6521 if (options
->prefix
&&
6522 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
6525 one
= alloc_filespec(concatpath
);
6526 two
= alloc_filespec(concatpath
);
6527 fill_filespec(one
, old_oid
, old_oid_valid
, old_mode
);
6528 fill_filespec(two
, new_oid
, new_oid_valid
, new_mode
);
6529 one
->dirty_submodule
= old_dirty_submodule
;
6530 two
->dirty_submodule
= new_dirty_submodule
;
6531 p
= diff_queue(&diff_queued_diff
, one
, two
);
6533 if (options
->flags
.diff_from_contents
)
6536 if (options
->flags
.quick
&& options
->skip_stat_unmatch
&&
6537 !diff_filespec_check_stat_unmatch(options
->repo
, p
))
6540 options
->flags
.has_changes
= 1;
6543 struct diff_filepair
*diff_unmerge(struct diff_options
*options
, const char *path
)
6545 struct diff_filepair
*pair
;
6546 struct diff_filespec
*one
, *two
;
6548 if (options
->prefix
&&
6549 strncmp(path
, options
->prefix
, options
->prefix_length
))
6552 one
= alloc_filespec(path
);
6553 two
= alloc_filespec(path
);
6554 pair
= diff_queue(&diff_queued_diff
, one
, two
);
6555 pair
->is_unmerged
= 1;
6559 static char *run_textconv(struct repository
*r
,
6561 struct diff_filespec
*spec
,
6564 struct diff_tempfile
*temp
;
6565 const char *argv
[3];
6566 const char **arg
= argv
;
6567 struct child_process child
= CHILD_PROCESS_INIT
;
6568 struct strbuf buf
= STRBUF_INIT
;
6571 temp
= prepare_temp_file(r
, spec
->path
, spec
);
6573 *arg
++ = temp
->name
;
6576 child
.use_shell
= 1;
6579 if (start_command(&child
)) {
6584 if (strbuf_read(&buf
, child
.out
, 0) < 0)
6585 err
= error("error reading from textconv command '%s'", pgm
);
6588 if (finish_command(&child
) || err
) {
6589 strbuf_release(&buf
);
6595 return strbuf_detach(&buf
, outsize
);
6598 size_t fill_textconv(struct repository
*r
,
6599 struct userdiff_driver
*driver
,
6600 struct diff_filespec
*df
,
6606 if (!DIFF_FILE_VALID(df
)) {
6610 if (diff_populate_filespec(r
, df
, 0))
6611 die("unable to read files to diff");
6616 if (!driver
->textconv
)
6617 BUG("fill_textconv called with non-textconv driver");
6619 if (driver
->textconv_cache
&& df
->oid_valid
) {
6620 *outbuf
= notes_cache_get(driver
->textconv_cache
,
6627 *outbuf
= run_textconv(r
, driver
->textconv
, df
, &size
);
6629 die("unable to read files to diff");
6631 if (driver
->textconv_cache
&& df
->oid_valid
) {
6632 /* ignore errors, as we might be in a readonly repository */
6633 notes_cache_put(driver
->textconv_cache
, &df
->oid
, *outbuf
,
6636 * we could save up changes and flush them all at the end,
6637 * but we would need an extra call after all diffing is done.
6638 * Since generating a cache entry is the slow path anyway,
6639 * this extra overhead probably isn't a big deal.
6641 notes_cache_write(driver
->textconv_cache
);
6647 int textconv_object(struct repository
*r
,
6650 const struct object_id
*oid
,
6653 unsigned long *buf_size
)
6655 struct diff_filespec
*df
;
6656 struct userdiff_driver
*textconv
;
6658 df
= alloc_filespec(path
);
6659 fill_filespec(df
, oid
, oid_valid
, mode
);
6660 textconv
= get_textconv(r
, df
);
6666 *buf_size
= fill_textconv(r
, textconv
, df
, buf
);
6671 void setup_diff_pager(struct diff_options
*opt
)
6674 * If the user asked for our exit code, then either they want --quiet
6675 * or --exit-code. We should definitely not bother with a pager in the
6676 * former case, as we will generate no output. Since we still properly
6677 * report our exit code even when a pager is run, we _could_ run a
6678 * pager with --exit-code. But since we have not done so historically,
6679 * and because it is easy to find people oneline advising "git diff
6680 * --exit-code" in hooks and other scripts, we do not do so.
6682 if (!opt
->flags
.exit_with_status
&&
6683 check_pager_config("diff") != 0)