2 * Copyright (C) 2005 Junio C Hamano
11 #include "xdiff-interface.h"
14 #include "run-command.h"
16 #include "object-store.h"
18 #include "submodule-config.h"
19 #include "submodule.h"
22 #include "string-list.h"
23 #include "argv-array.h"
28 #ifdef NO_FAST_WORKING_DIRECTORY
29 #define FAST_WORKING_DIRECTORY 0
31 #define FAST_WORKING_DIRECTORY 1
34 static int diff_detect_rename_default
;
35 static int diff_indent_heuristic
= 1;
36 static int diff_rename_limit_default
= 400;
37 static int diff_suppress_blank_empty
;
38 static int diff_use_color_default
= -1;
39 static int diff_color_moved_default
;
40 static int diff_color_moved_ws_default
;
41 static int diff_context_default
= 3;
42 static int diff_interhunk_context_default
;
43 static const char *diff_word_regex_cfg
;
44 static const char *external_diff_cmd_cfg
;
45 static const char *diff_order_file_cfg
;
46 int diff_auto_refresh_index
= 1;
47 static int diff_mnemonic_prefix
;
48 static int diff_no_prefix
;
49 static int diff_stat_graph_width
;
50 static int diff_dirstat_permille_default
= 30;
51 static struct diff_options default_diff_options
;
52 static long diff_algorithm
;
53 static unsigned ws_error_highlight_default
= WSEH_NEW
;
55 static char diff_colors
[][COLOR_MAXLEN
] = {
57 GIT_COLOR_NORMAL
, /* CONTEXT */
58 GIT_COLOR_BOLD
, /* METAINFO */
59 GIT_COLOR_CYAN
, /* FRAGINFO */
60 GIT_COLOR_RED
, /* OLD */
61 GIT_COLOR_GREEN
, /* NEW */
62 GIT_COLOR_YELLOW
, /* COMMIT */
63 GIT_COLOR_BG_RED
, /* WHITESPACE */
64 GIT_COLOR_NORMAL
, /* FUNCINFO */
65 GIT_COLOR_BOLD_MAGENTA
, /* OLD_MOVED */
66 GIT_COLOR_BOLD_BLUE
, /* OLD_MOVED ALTERNATIVE */
67 GIT_COLOR_FAINT
, /* OLD_MOVED_DIM */
68 GIT_COLOR_FAINT_ITALIC
, /* OLD_MOVED_ALTERNATIVE_DIM */
69 GIT_COLOR_BOLD_CYAN
, /* NEW_MOVED */
70 GIT_COLOR_BOLD_YELLOW
, /* NEW_MOVED ALTERNATIVE */
71 GIT_COLOR_FAINT
, /* NEW_MOVED_DIM */
72 GIT_COLOR_FAINT_ITALIC
, /* NEW_MOVED_ALTERNATIVE_DIM */
73 GIT_COLOR_FAINT
, /* CONTEXT_DIM */
74 GIT_COLOR_FAINT_RED
, /* OLD_DIM */
75 GIT_COLOR_FAINT_GREEN
, /* NEW_DIM */
76 GIT_COLOR_BOLD
, /* CONTEXT_BOLD */
77 GIT_COLOR_BOLD_RED
, /* OLD_BOLD */
78 GIT_COLOR_BOLD_GREEN
, /* NEW_BOLD */
81 static const char *color_diff_slots
[] = {
82 [DIFF_CONTEXT
] = "context",
83 [DIFF_METAINFO
] = "meta",
84 [DIFF_FRAGINFO
] = "frag",
85 [DIFF_FILE_OLD
] = "old",
86 [DIFF_FILE_NEW
] = "new",
87 [DIFF_COMMIT
] = "commit",
88 [DIFF_WHITESPACE
] = "whitespace",
89 [DIFF_FUNCINFO
] = "func",
90 [DIFF_FILE_OLD_MOVED
] = "oldMoved",
91 [DIFF_FILE_OLD_MOVED_ALT
] = "oldMovedAlternative",
92 [DIFF_FILE_OLD_MOVED_DIM
] = "oldMovedDimmed",
93 [DIFF_FILE_OLD_MOVED_ALT_DIM
] = "oldMovedAlternativeDimmed",
94 [DIFF_FILE_NEW_MOVED
] = "newMoved",
95 [DIFF_FILE_NEW_MOVED_ALT
] = "newMovedAlternative",
96 [DIFF_FILE_NEW_MOVED_DIM
] = "newMovedDimmed",
97 [DIFF_FILE_NEW_MOVED_ALT_DIM
] = "newMovedAlternativeDimmed",
98 [DIFF_CONTEXT_DIM
] = "contextDimmed",
99 [DIFF_FILE_OLD_DIM
] = "oldDimmed",
100 [DIFF_FILE_NEW_DIM
] = "newDimmed",
101 [DIFF_CONTEXT_BOLD
] = "contextBold",
102 [DIFF_FILE_OLD_BOLD
] = "oldBold",
103 [DIFF_FILE_NEW_BOLD
] = "newBold",
106 static NORETURN
void die_want_option(const char *option_name
)
108 die(_("option '%s' requires a value"), option_name
);
111 define_list_config_array_extra(color_diff_slots
, {"plain"});
113 static int parse_diff_color_slot(const char *var
)
115 if (!strcasecmp(var
, "plain"))
117 return LOOKUP_CONFIG(color_diff_slots
, var
);
120 static int parse_dirstat_params(struct diff_options
*options
, const char *params_string
,
121 struct strbuf
*errmsg
)
123 char *params_copy
= xstrdup(params_string
);
124 struct string_list params
= STRING_LIST_INIT_NODUP
;
129 string_list_split_in_place(¶ms
, params_copy
, ',', -1);
130 for (i
= 0; i
< params
.nr
; i
++) {
131 const char *p
= params
.items
[i
].string
;
132 if (!strcmp(p
, "changes")) {
133 options
->flags
.dirstat_by_line
= 0;
134 options
->flags
.dirstat_by_file
= 0;
135 } else if (!strcmp(p
, "lines")) {
136 options
->flags
.dirstat_by_line
= 1;
137 options
->flags
.dirstat_by_file
= 0;
138 } else if (!strcmp(p
, "files")) {
139 options
->flags
.dirstat_by_line
= 0;
140 options
->flags
.dirstat_by_file
= 1;
141 } else if (!strcmp(p
, "noncumulative")) {
142 options
->flags
.dirstat_cumulative
= 0;
143 } else if (!strcmp(p
, "cumulative")) {
144 options
->flags
.dirstat_cumulative
= 1;
145 } else if (isdigit(*p
)) {
147 int permille
= strtoul(p
, &end
, 10) * 10;
148 if (*end
== '.' && isdigit(*++end
)) {
149 /* only use first digit */
150 permille
+= *end
- '0';
151 /* .. and ignore any further digits */
152 while (isdigit(*++end
))
156 options
->dirstat_permille
= permille
;
158 strbuf_addf(errmsg
, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
163 strbuf_addf(errmsg
, _(" Unknown dirstat parameter '%s'\n"), p
);
168 string_list_clear(¶ms
, 0);
173 static int parse_submodule_params(struct diff_options
*options
, const char *value
)
175 if (!strcmp(value
, "log"))
176 options
->submodule_format
= DIFF_SUBMODULE_LOG
;
177 else if (!strcmp(value
, "short"))
178 options
->submodule_format
= DIFF_SUBMODULE_SHORT
;
179 else if (!strcmp(value
, "diff"))
180 options
->submodule_format
= DIFF_SUBMODULE_INLINE_DIFF
;
186 int git_config_rename(const char *var
, const char *value
)
189 return DIFF_DETECT_RENAME
;
190 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
191 return DIFF_DETECT_COPY
;
192 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
195 long parse_algorithm_value(const char *value
)
199 else if (!strcasecmp(value
, "myers") || !strcasecmp(value
, "default"))
201 else if (!strcasecmp(value
, "minimal"))
202 return XDF_NEED_MINIMAL
;
203 else if (!strcasecmp(value
, "patience"))
204 return XDF_PATIENCE_DIFF
;
205 else if (!strcasecmp(value
, "histogram"))
206 return XDF_HISTOGRAM_DIFF
;
210 static int parse_one_token(const char **arg
, const char *token
)
213 if (skip_prefix(*arg
, token
, &rest
) && (!*rest
|| *rest
== ',')) {
220 static int parse_ws_error_highlight(const char *arg
)
222 const char *orig_arg
= arg
;
226 if (parse_one_token(&arg
, "none"))
228 else if (parse_one_token(&arg
, "default"))
230 else if (parse_one_token(&arg
, "all"))
231 val
= WSEH_NEW
| WSEH_OLD
| WSEH_CONTEXT
;
232 else if (parse_one_token(&arg
, "new"))
234 else if (parse_one_token(&arg
, "old"))
236 else if (parse_one_token(&arg
, "context"))
239 return -1 - (int)(arg
- orig_arg
);
248 * These are to give UI layer defaults.
249 * The core-level commands such as git-diff-files should
250 * never be affected by the setting of diff.renames
251 * the user happens to have in the configuration file.
253 void init_diff_ui_defaults(void)
255 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
258 int git_diff_heuristic_config(const char *var
, const char *value
, void *cb
)
260 if (!strcmp(var
, "diff.indentheuristic"))
261 diff_indent_heuristic
= git_config_bool(var
, value
);
265 static int parse_color_moved(const char *arg
)
267 switch (git_parse_maybe_bool(arg
)) {
269 return COLOR_MOVED_NO
;
271 return COLOR_MOVED_DEFAULT
;
276 if (!strcmp(arg
, "no"))
277 return COLOR_MOVED_NO
;
278 else if (!strcmp(arg
, "plain"))
279 return COLOR_MOVED_PLAIN
;
280 else if (!strcmp(arg
, "blocks"))
281 return COLOR_MOVED_BLOCKS
;
282 else if (!strcmp(arg
, "zebra"))
283 return COLOR_MOVED_ZEBRA
;
284 else if (!strcmp(arg
, "default"))
285 return COLOR_MOVED_DEFAULT
;
286 else if (!strcmp(arg
, "dimmed_zebra"))
287 return COLOR_MOVED_ZEBRA_DIM
;
289 return error(_("color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed_zebra', 'plain'"));
292 static int parse_color_moved_ws(const char *arg
)
295 struct string_list l
= STRING_LIST_INIT_DUP
;
296 struct string_list_item
*i
;
298 string_list_split(&l
, arg
, ',', -1);
300 for_each_string_list_item(i
, &l
) {
301 struct strbuf sb
= STRBUF_INIT
;
302 strbuf_addstr(&sb
, i
->string
);
305 if (!strcmp(sb
.buf
, "ignore-space-change"))
306 ret
|= XDF_IGNORE_WHITESPACE_CHANGE
;
307 else if (!strcmp(sb
.buf
, "ignore-space-at-eol"))
308 ret
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
309 else if (!strcmp(sb
.buf
, "ignore-all-space"))
310 ret
|= XDF_IGNORE_WHITESPACE
;
311 else if (!strcmp(sb
.buf
, "allow-indentation-change"))
312 ret
|= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
;
314 error(_("ignoring unknown color-moved-ws mode '%s'"), sb
.buf
);
319 if ((ret
& COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
) &&
320 (ret
& XDF_WHITESPACE_FLAGS
))
321 die(_("color-moved-ws: allow-indentation-change cannot be combined with other white space modes"));
323 string_list_clear(&l
, 0);
328 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
330 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
331 diff_use_color_default
= git_config_colorbool(var
, value
);
334 if (!strcmp(var
, "diff.colormoved")) {
335 int cm
= parse_color_moved(value
);
338 diff_color_moved_default
= cm
;
341 if (!strcmp(var
, "diff.colormovedws")) {
342 int cm
= parse_color_moved_ws(value
);
345 diff_color_moved_ws_default
= cm
;
348 if (!strcmp(var
, "diff.context")) {
349 diff_context_default
= git_config_int(var
, value
);
350 if (diff_context_default
< 0)
354 if (!strcmp(var
, "diff.interhunkcontext")) {
355 diff_interhunk_context_default
= git_config_int(var
, value
);
356 if (diff_interhunk_context_default
< 0)
360 if (!strcmp(var
, "diff.renames")) {
361 diff_detect_rename_default
= git_config_rename(var
, value
);
364 if (!strcmp(var
, "diff.autorefreshindex")) {
365 diff_auto_refresh_index
= git_config_bool(var
, value
);
368 if (!strcmp(var
, "diff.mnemonicprefix")) {
369 diff_mnemonic_prefix
= git_config_bool(var
, value
);
372 if (!strcmp(var
, "diff.noprefix")) {
373 diff_no_prefix
= git_config_bool(var
, value
);
376 if (!strcmp(var
, "diff.statgraphwidth")) {
377 diff_stat_graph_width
= git_config_int(var
, value
);
380 if (!strcmp(var
, "diff.external"))
381 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
382 if (!strcmp(var
, "diff.wordregex"))
383 return git_config_string(&diff_word_regex_cfg
, var
, value
);
384 if (!strcmp(var
, "diff.orderfile"))
385 return git_config_pathname(&diff_order_file_cfg
, var
, value
);
387 if (!strcmp(var
, "diff.ignoresubmodules"))
388 handle_ignore_submodules_arg(&default_diff_options
, value
);
390 if (!strcmp(var
, "diff.submodule")) {
391 if (parse_submodule_params(&default_diff_options
, value
))
392 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
397 if (!strcmp(var
, "diff.algorithm")) {
398 diff_algorithm
= parse_algorithm_value(value
);
399 if (diff_algorithm
< 0)
404 if (!strcmp(var
, "diff.wserrorhighlight")) {
405 int val
= parse_ws_error_highlight(value
);
408 ws_error_highlight_default
= val
;
412 if (git_color_config(var
, value
, cb
) < 0)
415 return git_diff_basic_config(var
, value
, cb
);
418 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
422 if (!strcmp(var
, "diff.renamelimit")) {
423 diff_rename_limit_default
= git_config_int(var
, value
);
427 if (userdiff_config(var
, value
) < 0)
430 if (skip_prefix(var
, "diff.color.", &name
) ||
431 skip_prefix(var
, "color.diff.", &name
)) {
432 int slot
= parse_diff_color_slot(name
);
436 return config_error_nonbool(var
);
437 return color_parse(value
, diff_colors
[slot
]);
440 /* like GNU diff's --suppress-blank-empty option */
441 if (!strcmp(var
, "diff.suppressblankempty") ||
442 /* for backwards compatibility */
443 !strcmp(var
, "diff.suppress-blank-empty")) {
444 diff_suppress_blank_empty
= git_config_bool(var
, value
);
448 if (!strcmp(var
, "diff.dirstat")) {
449 struct strbuf errmsg
= STRBUF_INIT
;
450 default_diff_options
.dirstat_permille
= diff_dirstat_permille_default
;
451 if (parse_dirstat_params(&default_diff_options
, value
, &errmsg
))
452 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
454 strbuf_release(&errmsg
);
455 diff_dirstat_permille_default
= default_diff_options
.dirstat_permille
;
459 if (git_diff_heuristic_config(var
, value
, cb
) < 0)
462 return git_default_config(var
, value
, cb
);
465 static char *quote_two(const char *one
, const char *two
)
467 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
468 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
469 struct strbuf res
= STRBUF_INIT
;
471 if (need_one
+ need_two
) {
472 strbuf_addch(&res
, '"');
473 quote_c_style(one
, &res
, NULL
, 1);
474 quote_c_style(two
, &res
, NULL
, 1);
475 strbuf_addch(&res
, '"');
477 strbuf_addstr(&res
, one
);
478 strbuf_addstr(&res
, two
);
480 return strbuf_detach(&res
, NULL
);
483 static const char *external_diff(void)
485 static const char *external_diff_cmd
= NULL
;
486 static int done_preparing
= 0;
489 return external_diff_cmd
;
490 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
491 if (!external_diff_cmd
)
492 external_diff_cmd
= external_diff_cmd_cfg
;
494 return external_diff_cmd
;
498 * Keep track of files used for diffing. Sometimes such an entry
499 * refers to a temporary file, sometimes to an existing file, and
500 * sometimes to "/dev/null".
502 static struct diff_tempfile
{
504 * filename external diff should read from, or NULL if this
505 * entry is currently not in use:
509 char hex
[GIT_MAX_HEXSZ
+ 1];
513 * If this diff_tempfile instance refers to a temporary file,
514 * this tempfile object is used to manage its lifetime.
516 struct tempfile
*tempfile
;
519 struct emit_callback
{
522 int blank_at_eof_in_preimage
;
523 int blank_at_eof_in_postimage
;
525 int lno_in_postimage
;
526 const char **label_path
;
527 struct diff_words_data
*diff_words
;
528 struct diff_options
*opt
;
529 struct strbuf
*header
;
532 static int count_lines(const char *data
, int size
)
534 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
541 completely_empty
= 0;
545 completely_empty
= 0;
548 if (completely_empty
)
551 count
++; /* no trailing newline */
555 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
557 if (!DIFF_FILE_VALID(one
)) {
558 mf
->ptr
= (char *)""; /* does not matter */
562 else if (diff_populate_filespec(one
, 0))
566 mf
->size
= one
->size
;
570 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
571 static unsigned long diff_filespec_size(struct diff_filespec
*one
)
573 if (!DIFF_FILE_VALID(one
))
575 diff_populate_filespec(one
, CHECK_SIZE_ONLY
);
579 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
582 long size
= mf
->size
;
587 ptr
+= size
- 1; /* pointing at the very end */
589 ; /* incomplete line */
591 ptr
--; /* skip the last LF */
592 while (mf
->ptr
< ptr
) {
594 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
595 if (*prev_eol
== '\n')
597 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
605 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
606 struct emit_callback
*ecbdata
)
609 unsigned ws_rule
= ecbdata
->ws_rule
;
610 l1
= count_trailing_blank(mf1
, ws_rule
);
611 l2
= count_trailing_blank(mf2
, ws_rule
);
613 ecbdata
->blank_at_eof_in_preimage
= 0;
614 ecbdata
->blank_at_eof_in_postimage
= 0;
617 at
= count_lines(mf1
->ptr
, mf1
->size
);
618 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
620 at
= count_lines(mf2
->ptr
, mf2
->size
);
621 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
624 static void emit_line_0(struct diff_options
*o
,
625 const char *set_sign
, const char *set
, unsigned reverse
, const char *reset
,
626 int first
, const char *line
, int len
)
628 int has_trailing_newline
, has_trailing_carriage_return
;
629 int needs_reset
= 0; /* at the end of the line */
630 FILE *file
= o
->file
;
632 fputs(diff_line_prefix(o
), file
);
634 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
635 if (has_trailing_newline
)
638 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
639 if (has_trailing_carriage_return
)
645 if (reverse
&& want_color(o
->use_color
)) {
646 fputs(GIT_COLOR_REVERSE
, file
);
651 fputs(set_sign
, file
);
662 if (set_sign
&& set
!= set_sign
)
667 fwrite(line
, len
, 1, file
);
668 needs_reset
= 1; /* 'line' may contain color codes. */
673 if (has_trailing_carriage_return
)
675 if (has_trailing_newline
)
679 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
680 const char *line
, int len
)
682 emit_line_0(o
, set
, NULL
, 0, reset
, 0, line
, len
);
686 DIFF_SYMBOL_BINARY_DIFF_HEADER
,
687 DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
,
688 DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
,
689 DIFF_SYMBOL_BINARY_DIFF_BODY
,
690 DIFF_SYMBOL_BINARY_DIFF_FOOTER
,
691 DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
,
692 DIFF_SYMBOL_STATS_SUMMARY_ABBREV
,
693 DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
,
694 DIFF_SYMBOL_STATS_LINE
,
695 DIFF_SYMBOL_WORD_DIFF
,
696 DIFF_SYMBOL_STAT_SEP
,
698 DIFF_SYMBOL_SUBMODULE_ADD
,
699 DIFF_SYMBOL_SUBMODULE_DEL
,
700 DIFF_SYMBOL_SUBMODULE_UNTRACKED
,
701 DIFF_SYMBOL_SUBMODULE_MODIFIED
,
702 DIFF_SYMBOL_SUBMODULE_HEADER
,
703 DIFF_SYMBOL_SUBMODULE_ERROR
,
704 DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
,
705 DIFF_SYMBOL_REWRITE_DIFF
,
706 DIFF_SYMBOL_BINARY_FILES
,
708 DIFF_SYMBOL_FILEPAIR_PLUS
,
709 DIFF_SYMBOL_FILEPAIR_MINUS
,
710 DIFF_SYMBOL_WORDS_PORCELAIN
,
713 DIFF_SYMBOL_CONTEXT_INCOMPLETE
,
716 DIFF_SYMBOL_NO_LF_EOF
,
717 DIFF_SYMBOL_CONTEXT_FRAGINFO
,
718 DIFF_SYMBOL_CONTEXT_MARKER
,
719 DIFF_SYMBOL_SEPARATOR
722 * Flags for content lines:
723 * 0..12 are whitespace rules
724 * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
725 * 16 is marking if the line is blank at EOF
727 #define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF (1<<16)
728 #define DIFF_SYMBOL_MOVED_LINE (1<<17)
729 #define DIFF_SYMBOL_MOVED_LINE_ALT (1<<18)
730 #define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING (1<<19)
731 #define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)
734 * This struct is used when we need to buffer the output of the diff output.
736 * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
737 * into the pre/post image file. This pointer could be a union with the
738 * line pointer. By storing an offset into the file instead of the literal line,
739 * we can decrease the memory footprint for the buffered output. At first we
740 * may want to only have indirection for the content lines, but we could also
741 * enhance the state for emitting prefabricated lines, e.g. the similarity
742 * score line or hunk/file headers would only need to store a number or path
743 * and then the output can be constructed later on depending on state.
745 struct emitted_diff_symbol
{
751 #define EMITTED_DIFF_SYMBOL_INIT {NULL}
753 struct emitted_diff_symbols
{
754 struct emitted_diff_symbol
*buf
;
757 #define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
759 static void append_emitted_diff_symbol(struct diff_options
*o
,
760 struct emitted_diff_symbol
*e
)
762 struct emitted_diff_symbol
*f
;
764 ALLOC_GROW(o
->emitted_symbols
->buf
,
765 o
->emitted_symbols
->nr
+ 1,
766 o
->emitted_symbols
->alloc
);
767 f
= &o
->emitted_symbols
->buf
[o
->emitted_symbols
->nr
++];
769 memcpy(f
, e
, sizeof(struct emitted_diff_symbol
));
770 f
->line
= e
->line
? xmemdupz(e
->line
, e
->len
) : NULL
;
774 struct hashmap_entry ent
;
775 const struct emitted_diff_symbol
*es
;
776 struct moved_entry
*next_line
;
777 struct ws_delta
*wsd
;
781 * The struct ws_delta holds white space differences between moved lines, i.e.
782 * between '+' and '-' lines that have been detected to be a move.
783 * The string contains the difference in leading white spaces, before the
784 * rest of the line is compared using the white space config for move
785 * coloring. The current_longer indicates if the first string in the
786 * comparision is longer than the second.
790 unsigned int current_longer
: 1;
792 #define WS_DELTA_INIT { NULL, 0 }
794 static int compute_ws_delta(const struct emitted_diff_symbol
*a
,
795 const struct emitted_diff_symbol
*b
,
796 struct ws_delta
*out
)
798 const struct emitted_diff_symbol
*longer
= a
->len
> b
->len
? a
: b
;
799 const struct emitted_diff_symbol
*shorter
= a
->len
> b
->len
? b
: a
;
800 int d
= longer
->len
- shorter
->len
;
802 out
->string
= xmemdupz(longer
->line
, d
);
803 out
->current_longer
= (a
== longer
);
805 return !strncmp(longer
->line
+ d
, shorter
->line
, shorter
->len
);
808 static int cmp_in_block_with_wsd(const struct diff_options
*o
,
809 const struct moved_entry
*cur
,
810 const struct moved_entry
*match
,
811 struct moved_entry
*pmb
,
814 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
815 int al
= cur
->es
->len
, cl
= l
->len
;
816 const char *a
= cur
->es
->line
,
817 *b
= match
->es
->line
,
823 * We need to check if 'cur' is equal to 'match'.
824 * As those are from the same (+/-) side, we do not need to adjust for
825 * indent changes. However these were found using fuzzy matching
826 * so we do have to check if they are equal.
833 * No white space delta was carried forward? This can happen
834 * when we exit early in this function and do not carry
840 * The indent changes of the block are known and carried forward in
841 * pmb->wsd; however we need to check if the indent changes of the
842 * current line are still the same as before.
844 * To do so we need to compare 'l' to 'cur', adjusting the
845 * one of them for the white spaces, depending which was longer.
848 wslen
= strlen(pmb
->wsd
->string
);
849 if (pmb
->wsd
->current_longer
) {
863 static int moved_entry_cmp(const void *hashmap_cmp_fn_data
,
865 const void *entry_or_key
,
868 const struct diff_options
*diffopt
= hashmap_cmp_fn_data
;
869 const struct moved_entry
*a
= entry
;
870 const struct moved_entry
*b
= entry_or_key
;
871 unsigned flags
= diffopt
->color_moved_ws_handling
872 & XDF_WHITESPACE_FLAGS
;
874 if (diffopt
->color_moved_ws_handling
&
875 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
)
877 * As there is not specific white space config given,
878 * we'd need to check for a new block, so ignore all
879 * white space. The setup of the white space
880 * configuration for the next block is done else where
882 flags
|= XDF_IGNORE_WHITESPACE
;
884 return !xdiff_compare_lines(a
->es
->line
, a
->es
->len
,
885 b
->es
->line
, b
->es
->len
,
889 static struct moved_entry
*prepare_entry(struct diff_options
*o
,
892 struct moved_entry
*ret
= xmalloc(sizeof(*ret
));
893 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[line_no
];
894 unsigned flags
= o
->color_moved_ws_handling
& XDF_WHITESPACE_FLAGS
;
896 ret
->ent
.hash
= xdiff_hash_string(l
->line
, l
->len
, flags
);
898 ret
->next_line
= NULL
;
904 static void add_lines_to_move_detection(struct diff_options
*o
,
905 struct hashmap
*add_lines
,
906 struct hashmap
*del_lines
)
908 struct moved_entry
*prev_line
= NULL
;
911 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
913 struct moved_entry
*key
;
915 switch (o
->emitted_symbols
->buf
[n
].s
) {
916 case DIFF_SYMBOL_PLUS
:
919 case DIFF_SYMBOL_MINUS
:
927 key
= prepare_entry(o
, n
);
928 if (prev_line
&& prev_line
->es
->s
== o
->emitted_symbols
->buf
[n
].s
)
929 prev_line
->next_line
= key
;
931 hashmap_add(hm
, key
);
936 static void pmb_advance_or_null(struct diff_options
*o
,
937 struct moved_entry
*match
,
939 struct moved_entry
**pmb
,
943 for (i
= 0; i
< pmb_nr
; i
++) {
944 struct moved_entry
*prev
= pmb
[i
];
945 struct moved_entry
*cur
= (prev
&& prev
->next_line
) ?
946 prev
->next_line
: NULL
;
947 if (cur
&& !hm
->cmpfn(o
, cur
, match
, NULL
)) {
955 static void pmb_advance_or_null_multi_match(struct diff_options
*o
,
956 struct moved_entry
*match
,
958 struct moved_entry
**pmb
,
962 char *got_match
= xcalloc(1, pmb_nr
);
964 for (; match
; match
= hashmap_get_next(hm
, match
)) {
965 for (i
= 0; i
< pmb_nr
; i
++) {
966 struct moved_entry
*prev
= pmb
[i
];
967 struct moved_entry
*cur
= (prev
&& prev
->next_line
) ?
968 prev
->next_line
: NULL
;
971 if (!cmp_in_block_with_wsd(o
, cur
, match
, pmb
[i
], n
))
976 for (i
= 0; i
< pmb_nr
; i
++) {
978 /* Carry the white space delta forward */
979 pmb
[i
]->next_line
->wsd
= pmb
[i
]->wsd
;
980 pmb
[i
] = pmb
[i
]->next_line
;
986 static int shrink_potential_moved_blocks(struct moved_entry
**pmb
,
991 /* Shrink the set of potential block to the remaining running */
992 for (lp
= 0, rp
= pmb_nr
- 1; lp
<= rp
;) {
993 while (lp
< pmb_nr
&& pmb
[lp
])
995 /* lp points at the first NULL now */
997 while (rp
> -1 && !pmb
[rp
])
999 /* rp points at the last non-NULL */
1001 if (lp
< pmb_nr
&& rp
> -1 && lp
< rp
) {
1004 free(pmb
[rp
]->wsd
->string
);
1005 FREE_AND_NULL(pmb
[rp
]->wsd
);
1013 /* Remember the number of running sets */
1018 * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
1020 * Otherwise, if the last block has fewer alphanumeric characters than
1021 * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
1024 * The last block consists of the (n - block_length)'th line up to but not
1025 * including the nth line.
1027 * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
1028 * Think of a way to unify them.
1030 static void adjust_last_block(struct diff_options
*o
, int n
, int block_length
)
1032 int i
, alnum_count
= 0;
1033 if (o
->color_moved
== COLOR_MOVED_PLAIN
)
1035 for (i
= 1; i
< block_length
+ 1; i
++) {
1036 const char *c
= o
->emitted_symbols
->buf
[n
- i
].line
;
1041 if (alnum_count
>= COLOR_MOVED_MIN_ALNUM_COUNT
)
1045 for (i
= 1; i
< block_length
+ 1; i
++)
1046 o
->emitted_symbols
->buf
[n
- i
].flags
&= ~DIFF_SYMBOL_MOVED_LINE
;
1049 /* Find blocks of moved code, delegate actual coloring decision to helper */
1050 static void mark_color_as_moved(struct diff_options
*o
,
1051 struct hashmap
*add_lines
,
1052 struct hashmap
*del_lines
)
1054 struct moved_entry
**pmb
= NULL
; /* potentially moved blocks */
1055 int pmb_nr
= 0, pmb_alloc
= 0;
1056 int n
, flipped_block
= 1, block_length
= 0;
1059 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
1060 struct hashmap
*hm
= NULL
;
1061 struct moved_entry
*key
;
1062 struct moved_entry
*match
= NULL
;
1063 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
1066 case DIFF_SYMBOL_PLUS
:
1068 key
= prepare_entry(o
, n
);
1069 match
= hashmap_get(hm
, key
, NULL
);
1072 case DIFF_SYMBOL_MINUS
:
1074 key
= prepare_entry(o
, n
);
1075 match
= hashmap_get(hm
, key
, NULL
);
1083 adjust_last_block(o
, n
, block_length
);
1089 l
->flags
|= DIFF_SYMBOL_MOVED_LINE
;
1091 if (o
->color_moved
== COLOR_MOVED_PLAIN
)
1094 if (o
->color_moved_ws_handling
&
1095 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
)
1096 pmb_advance_or_null_multi_match(o
, match
, hm
, pmb
, pmb_nr
, n
);
1098 pmb_advance_or_null(o
, match
, hm
, pmb
, pmb_nr
);
1100 pmb_nr
= shrink_potential_moved_blocks(pmb
, pmb_nr
);
1104 * The current line is the start of a new block.
1105 * Setup the set of potential blocks.
1107 for (; match
; match
= hashmap_get_next(hm
, match
)) {
1108 ALLOC_GROW(pmb
, pmb_nr
+ 1, pmb_alloc
);
1109 if (o
->color_moved_ws_handling
&
1110 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
) {
1111 struct ws_delta
*wsd
= xmalloc(sizeof(*match
->wsd
));
1112 if (compute_ws_delta(l
, match
->es
, wsd
)) {
1114 pmb
[pmb_nr
++] = match
;
1118 pmb
[pmb_nr
++] = match
;
1122 flipped_block
= (flipped_block
+ 1) % 2;
1124 adjust_last_block(o
, n
, block_length
);
1130 if (flipped_block
&& o
->color_moved
!= COLOR_MOVED_BLOCKS
)
1131 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_ALT
;
1133 adjust_last_block(o
, n
, block_length
);
1138 #define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
1139 (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
1140 static void dim_moved_lines(struct diff_options
*o
)
1143 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
1144 struct emitted_diff_symbol
*prev
= (n
!= 0) ?
1145 &o
->emitted_symbols
->buf
[n
- 1] : NULL
;
1146 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
1147 struct emitted_diff_symbol
*next
=
1148 (n
< o
->emitted_symbols
->nr
- 1) ?
1149 &o
->emitted_symbols
->buf
[n
+ 1] : NULL
;
1151 /* Not a plus or minus line? */
1152 if (l
->s
!= DIFF_SYMBOL_PLUS
&& l
->s
!= DIFF_SYMBOL_MINUS
)
1155 /* Not a moved line? */
1156 if (!(l
->flags
& DIFF_SYMBOL_MOVED_LINE
))
1160 * If prev or next are not a plus or minus line,
1161 * pretend they don't exist
1163 if (prev
&& prev
->s
!= DIFF_SYMBOL_PLUS
&&
1164 prev
->s
!= DIFF_SYMBOL_MINUS
)
1166 if (next
&& next
->s
!= DIFF_SYMBOL_PLUS
&&
1167 next
->s
!= DIFF_SYMBOL_MINUS
)
1170 /* Inside a block? */
1172 (prev
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
) ==
1173 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
)) &&
1175 (next
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
) ==
1176 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
))) {
1177 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
;
1181 /* Check if we are at an interesting bound: */
1182 if (prev
&& (prev
->flags
& DIFF_SYMBOL_MOVED_LINE
) &&
1183 (prev
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
) !=
1184 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
))
1186 if (next
&& (next
->flags
& DIFF_SYMBOL_MOVED_LINE
) &&
1187 (next
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
) !=
1188 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
))
1192 * The boundary to prev and next are not interesting,
1193 * so this line is not interesting as a whole
1195 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
;
1199 static void emit_line_ws_markup(struct diff_options
*o
,
1200 const char *set_sign
, const char *set
,
1202 char sign
, const char *line
, int len
,
1203 unsigned ws_rule
, int blank_at_eof
)
1205 const char *ws
= NULL
;
1207 if (o
->ws_error_highlight
& ws_rule
) {
1208 ws
= diff_get_color_opt(o
, DIFF_WHITESPACE
);
1213 if (!ws
&& !set_sign
)
1214 emit_line_0(o
, set
, NULL
, 0, reset
, sign
, line
, len
);
1216 emit_line_0(o
, set_sign
, set
, !!set_sign
, reset
, sign
, line
, len
);
1217 } else if (blank_at_eof
)
1218 /* Blank line at EOF - paint '+' as well */
1219 emit_line_0(o
, ws
, NULL
, 0, reset
, sign
, line
, len
);
1221 /* Emit just the prefix, then the rest. */
1222 emit_line_0(o
, set_sign
? set_sign
: set
, NULL
, !!set_sign
, reset
,
1224 ws_check_emit(line
, len
, ws_rule
,
1225 o
->file
, set
, reset
, ws
);
1229 static void emit_diff_symbol_from_struct(struct diff_options
*o
,
1230 struct emitted_diff_symbol
*eds
)
1232 static const char *nneof
= " No newline at end of file\n";
1233 const char *context
, *reset
, *set
, *set_sign
, *meta
, *fraginfo
;
1234 struct strbuf sb
= STRBUF_INIT
;
1236 enum diff_symbol s
= eds
->s
;
1237 const char *line
= eds
->line
;
1239 unsigned flags
= eds
->flags
;
1242 case DIFF_SYMBOL_NO_LF_EOF
:
1243 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1244 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1245 putc('\n', o
->file
);
1246 emit_line_0(o
, context
, NULL
, 0, reset
, '\\',
1247 nneof
, strlen(nneof
));
1249 case DIFF_SYMBOL_SUBMODULE_HEADER
:
1250 case DIFF_SYMBOL_SUBMODULE_ERROR
:
1251 case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
:
1252 case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
:
1253 case DIFF_SYMBOL_SUMMARY
:
1254 case DIFF_SYMBOL_STATS_LINE
:
1255 case DIFF_SYMBOL_BINARY_DIFF_BODY
:
1256 case DIFF_SYMBOL_CONTEXT_FRAGINFO
:
1257 emit_line(o
, "", "", line
, len
);
1259 case DIFF_SYMBOL_CONTEXT_INCOMPLETE
:
1260 case DIFF_SYMBOL_CONTEXT_MARKER
:
1261 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1262 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1263 emit_line(o
, context
, reset
, line
, len
);
1265 case DIFF_SYMBOL_SEPARATOR
:
1266 fprintf(o
->file
, "%s%c",
1267 diff_line_prefix(o
),
1268 o
->line_termination
);
1270 case DIFF_SYMBOL_CONTEXT
:
1271 set
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1272 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1274 if (o
->flags
.dual_color_diffed_diffs
) {
1275 char c
= !len
? 0 : line
[0];
1278 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1280 set
= diff_get_color_opt(o
, DIFF_FRAGINFO
);
1282 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1284 emit_line_ws_markup(o
, set_sign
, set
, reset
, ' ', line
, len
,
1285 flags
& (DIFF_SYMBOL_CONTENT_WS_MASK
), 0);
1287 case DIFF_SYMBOL_PLUS
:
1288 switch (flags
& (DIFF_SYMBOL_MOVED_LINE
|
1289 DIFF_SYMBOL_MOVED_LINE_ALT
|
1290 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
)) {
1291 case DIFF_SYMBOL_MOVED_LINE
|
1292 DIFF_SYMBOL_MOVED_LINE_ALT
|
1293 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1294 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_ALT_DIM
);
1296 case DIFF_SYMBOL_MOVED_LINE
|
1297 DIFF_SYMBOL_MOVED_LINE_ALT
:
1298 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_ALT
);
1300 case DIFF_SYMBOL_MOVED_LINE
|
1301 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1302 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_DIM
);
1304 case DIFF_SYMBOL_MOVED_LINE
:
1305 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED
);
1308 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1310 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1311 if (!o
->flags
.dual_color_diffed_diffs
)
1314 char c
= !len
? 0 : line
[0];
1318 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_BOLD
);
1320 set
= diff_get_color_opt(o
, DIFF_FRAGINFO
);
1322 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_BOLD
);
1324 set
= diff_get_color_opt(o
, DIFF_CONTEXT_BOLD
);
1325 flags
&= ~DIFF_SYMBOL_CONTENT_WS_MASK
;
1327 emit_line_ws_markup(o
, set_sign
, set
, reset
, '+', line
, len
,
1328 flags
& DIFF_SYMBOL_CONTENT_WS_MASK
,
1329 flags
& DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF
);
1331 case DIFF_SYMBOL_MINUS
:
1332 switch (flags
& (DIFF_SYMBOL_MOVED_LINE
|
1333 DIFF_SYMBOL_MOVED_LINE_ALT
|
1334 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
)) {
1335 case DIFF_SYMBOL_MOVED_LINE
|
1336 DIFF_SYMBOL_MOVED_LINE_ALT
|
1337 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1338 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_ALT_DIM
);
1340 case DIFF_SYMBOL_MOVED_LINE
|
1341 DIFF_SYMBOL_MOVED_LINE_ALT
:
1342 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_ALT
);
1344 case DIFF_SYMBOL_MOVED_LINE
|
1345 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1346 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_DIM
);
1348 case DIFF_SYMBOL_MOVED_LINE
:
1349 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED
);
1352 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1354 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1355 if (!o
->flags
.dual_color_diffed_diffs
)
1358 char c
= !len
? 0 : line
[0];
1362 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_DIM
);
1364 set
= diff_get_color_opt(o
, DIFF_FRAGINFO
);
1366 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_DIM
);
1368 set
= diff_get_color_opt(o
, DIFF_CONTEXT_DIM
);
1370 emit_line_ws_markup(o
, set_sign
, set
, reset
, '-', line
, len
,
1371 flags
& DIFF_SYMBOL_CONTENT_WS_MASK
, 0);
1373 case DIFF_SYMBOL_WORDS_PORCELAIN
:
1374 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1375 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1376 emit_line(o
, context
, reset
, line
, len
);
1377 fputs("~\n", o
->file
);
1379 case DIFF_SYMBOL_WORDS
:
1380 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1381 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1383 * Skip the prefix character, if any. With
1384 * diff_suppress_blank_empty, there may be
1387 if (line
[0] != '\n') {
1391 emit_line(o
, context
, reset
, line
, len
);
1393 case DIFF_SYMBOL_FILEPAIR_PLUS
:
1394 meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
1395 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1396 fprintf(o
->file
, "%s%s+++ %s%s%s\n", diff_line_prefix(o
), meta
,
1398 strchr(line
, ' ') ? "\t" : "");
1400 case DIFF_SYMBOL_FILEPAIR_MINUS
:
1401 meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
1402 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1403 fprintf(o
->file
, "%s%s--- %s%s%s\n", diff_line_prefix(o
), meta
,
1405 strchr(line
, ' ') ? "\t" : "");
1407 case DIFF_SYMBOL_BINARY_FILES
:
1408 case DIFF_SYMBOL_HEADER
:
1409 fprintf(o
->file
, "%s", line
);
1411 case DIFF_SYMBOL_BINARY_DIFF_HEADER
:
1412 fprintf(o
->file
, "%sGIT binary patch\n", diff_line_prefix(o
));
1414 case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
:
1415 fprintf(o
->file
, "%sdelta %s\n", diff_line_prefix(o
), line
);
1417 case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
:
1418 fprintf(o
->file
, "%sliteral %s\n", diff_line_prefix(o
), line
);
1420 case DIFF_SYMBOL_BINARY_DIFF_FOOTER
:
1421 fputs(diff_line_prefix(o
), o
->file
);
1422 fputc('\n', o
->file
);
1424 case DIFF_SYMBOL_REWRITE_DIFF
:
1425 fraginfo
= diff_get_color(o
->use_color
, DIFF_FRAGINFO
);
1426 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1427 emit_line(o
, fraginfo
, reset
, line
, len
);
1429 case DIFF_SYMBOL_SUBMODULE_ADD
:
1430 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1431 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1432 emit_line(o
, set
, reset
, line
, len
);
1434 case DIFF_SYMBOL_SUBMODULE_DEL
:
1435 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1436 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1437 emit_line(o
, set
, reset
, line
, len
);
1439 case DIFF_SYMBOL_SUBMODULE_UNTRACKED
:
1440 fprintf(o
->file
, "%sSubmodule %s contains untracked content\n",
1441 diff_line_prefix(o
), line
);
1443 case DIFF_SYMBOL_SUBMODULE_MODIFIED
:
1444 fprintf(o
->file
, "%sSubmodule %s contains modified content\n",
1445 diff_line_prefix(o
), line
);
1447 case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
:
1448 emit_line(o
, "", "", " 0 files changed\n",
1449 strlen(" 0 files changed\n"));
1451 case DIFF_SYMBOL_STATS_SUMMARY_ABBREV
:
1452 emit_line(o
, "", "", " ...\n", strlen(" ...\n"));
1454 case DIFF_SYMBOL_WORD_DIFF
:
1455 fprintf(o
->file
, "%.*s", len
, line
);
1457 case DIFF_SYMBOL_STAT_SEP
:
1458 fputs(o
->stat_sep
, o
->file
);
1461 BUG("unknown diff symbol");
1463 strbuf_release(&sb
);
1466 static void emit_diff_symbol(struct diff_options
*o
, enum diff_symbol s
,
1467 const char *line
, int len
, unsigned flags
)
1469 struct emitted_diff_symbol e
= {line
, len
, flags
, s
};
1471 if (o
->emitted_symbols
)
1472 append_emitted_diff_symbol(o
, &e
);
1474 emit_diff_symbol_from_struct(o
, &e
);
1477 void diff_emit_submodule_del(struct diff_options
*o
, const char *line
)
1479 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_DEL
, line
, strlen(line
), 0);
1482 void diff_emit_submodule_add(struct diff_options
*o
, const char *line
)
1484 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_ADD
, line
, strlen(line
), 0);
1487 void diff_emit_submodule_untracked(struct diff_options
*o
, const char *path
)
1489 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_UNTRACKED
,
1490 path
, strlen(path
), 0);
1493 void diff_emit_submodule_modified(struct diff_options
*o
, const char *path
)
1495 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_MODIFIED
,
1496 path
, strlen(path
), 0);
1499 void diff_emit_submodule_header(struct diff_options
*o
, const char *header
)
1501 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_HEADER
,
1502 header
, strlen(header
), 0);
1505 void diff_emit_submodule_error(struct diff_options
*o
, const char *err
)
1507 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_ERROR
, err
, strlen(err
), 0);
1510 void diff_emit_submodule_pipethrough(struct diff_options
*o
,
1511 const char *line
, int len
)
1513 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
, line
, len
, 0);
1516 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
1518 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
1519 ecbdata
->blank_at_eof_in_preimage
&&
1520 ecbdata
->blank_at_eof_in_postimage
&&
1521 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
1522 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
1524 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
1527 static void emit_add_line(const char *reset
,
1528 struct emit_callback
*ecbdata
,
1529 const char *line
, int len
)
1531 unsigned flags
= WSEH_NEW
| ecbdata
->ws_rule
;
1532 if (new_blank_line_at_eof(ecbdata
, line
, len
))
1533 flags
|= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF
;
1535 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_PLUS
, line
, len
, flags
);
1538 static void emit_del_line(const char *reset
,
1539 struct emit_callback
*ecbdata
,
1540 const char *line
, int len
)
1542 unsigned flags
= WSEH_OLD
| ecbdata
->ws_rule
;
1543 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_MINUS
, line
, len
, flags
);
1546 static void emit_context_line(const char *reset
,
1547 struct emit_callback
*ecbdata
,
1548 const char *line
, int len
)
1550 unsigned flags
= WSEH_CONTEXT
| ecbdata
->ws_rule
;
1551 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_CONTEXT
, line
, len
, flags
);
1554 static void emit_hunk_header(struct emit_callback
*ecbdata
,
1555 const char *line
, int len
)
1557 const char *context
= diff_get_color(ecbdata
->color_diff
, DIFF_CONTEXT
);
1558 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
1559 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
1560 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1561 const char *reverse
= ecbdata
->color_diff
? GIT_COLOR_REVERSE
: "";
1562 static const char atat
[2] = { '@', '@' };
1563 const char *cp
, *ep
;
1564 struct strbuf msgbuf
= STRBUF_INIT
;
1569 * As a hunk header must begin with "@@ -<old>, +<new> @@",
1570 * it always is at least 10 bytes long.
1573 memcmp(line
, atat
, 2) ||
1574 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
1575 emit_diff_symbol(ecbdata
->opt
,
1576 DIFF_SYMBOL_CONTEXT_MARKER
, line
, len
, 0);
1579 ep
+= 2; /* skip over @@ */
1581 /* The hunk header in fraginfo color */
1582 if (ecbdata
->opt
->flags
.dual_color_diffed_diffs
)
1583 strbuf_addstr(&msgbuf
, reverse
);
1584 strbuf_addstr(&msgbuf
, frag
);
1585 strbuf_add(&msgbuf
, line
, ep
- line
);
1586 strbuf_addstr(&msgbuf
, reset
);
1592 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
1595 /* blank before the func header */
1596 for (cp
= ep
; ep
- line
< len
; ep
++)
1597 if (*ep
!= ' ' && *ep
!= '\t')
1600 strbuf_addstr(&msgbuf
, context
);
1601 strbuf_add(&msgbuf
, cp
, ep
- cp
);
1602 strbuf_addstr(&msgbuf
, reset
);
1605 if (ep
< line
+ len
) {
1606 strbuf_addstr(&msgbuf
, func
);
1607 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
1608 strbuf_addstr(&msgbuf
, reset
);
1611 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
1612 strbuf_complete_line(&msgbuf
);
1613 emit_diff_symbol(ecbdata
->opt
,
1614 DIFF_SYMBOL_CONTEXT_FRAGINFO
, msgbuf
.buf
, msgbuf
.len
, 0);
1615 strbuf_release(&msgbuf
);
1618 static struct diff_tempfile
*claim_diff_tempfile(void) {
1620 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
1621 if (!diff_temp
[i
].name
)
1622 return diff_temp
+ i
;
1623 BUG("diff is failing to clean up its tempfiles");
1626 static void remove_tempfile(void)
1629 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
1630 if (is_tempfile_active(diff_temp
[i
].tempfile
))
1631 delete_tempfile(&diff_temp
[i
].tempfile
);
1632 diff_temp
[i
].name
= NULL
;
1636 static void add_line_count(struct strbuf
*out
, int count
)
1640 strbuf_addstr(out
, "0,0");
1643 strbuf_addstr(out
, "1");
1646 strbuf_addf(out
, "1,%d", count
);
1651 static void emit_rewrite_lines(struct emit_callback
*ecb
,
1652 int prefix
, const char *data
, int size
)
1654 const char *endp
= NULL
;
1655 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
1660 endp
= memchr(data
, '\n', size
);
1661 len
= endp
? (endp
- data
+ 1) : size
;
1662 if (prefix
!= '+') {
1663 ecb
->lno_in_preimage
++;
1664 emit_del_line(reset
, ecb
, data
, len
);
1666 ecb
->lno_in_postimage
++;
1667 emit_add_line(reset
, ecb
, data
, len
);
1673 emit_diff_symbol(ecb
->opt
, DIFF_SYMBOL_NO_LF_EOF
, NULL
, 0, 0);
1676 static void emit_rewrite_diff(const char *name_a
,
1678 struct diff_filespec
*one
,
1679 struct diff_filespec
*two
,
1680 struct userdiff_driver
*textconv_one
,
1681 struct userdiff_driver
*textconv_two
,
1682 struct diff_options
*o
)
1685 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
1686 const char *a_prefix
, *b_prefix
;
1687 char *data_one
, *data_two
;
1688 size_t size_one
, size_two
;
1689 struct emit_callback ecbdata
;
1690 struct strbuf out
= STRBUF_INIT
;
1692 if (diff_mnemonic_prefix
&& o
->flags
.reverse_diff
) {
1693 a_prefix
= o
->b_prefix
;
1694 b_prefix
= o
->a_prefix
;
1696 a_prefix
= o
->a_prefix
;
1697 b_prefix
= o
->b_prefix
;
1700 name_a
+= (*name_a
== '/');
1701 name_b
+= (*name_b
== '/');
1703 strbuf_reset(&a_name
);
1704 strbuf_reset(&b_name
);
1705 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
1706 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
1708 size_one
= fill_textconv(textconv_one
, one
, &data_one
);
1709 size_two
= fill_textconv(textconv_two
, two
, &data_two
);
1711 memset(&ecbdata
, 0, sizeof(ecbdata
));
1712 ecbdata
.color_diff
= want_color(o
->use_color
);
1713 ecbdata
.ws_rule
= whitespace_rule(name_b
);
1715 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
1717 mf1
.ptr
= (char *)data_one
;
1718 mf2
.ptr
= (char *)data_two
;
1719 mf1
.size
= size_one
;
1720 mf2
.size
= size_two
;
1721 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1723 ecbdata
.lno_in_preimage
= 1;
1724 ecbdata
.lno_in_postimage
= 1;
1726 lc_a
= count_lines(data_one
, size_one
);
1727 lc_b
= count_lines(data_two
, size_two
);
1729 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_MINUS
,
1730 a_name
.buf
, a_name
.len
, 0);
1731 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_PLUS
,
1732 b_name
.buf
, b_name
.len
, 0);
1734 strbuf_addstr(&out
, "@@ -");
1735 if (!o
->irreversible_delete
)
1736 add_line_count(&out
, lc_a
);
1738 strbuf_addstr(&out
, "?,?");
1739 strbuf_addstr(&out
, " +");
1740 add_line_count(&out
, lc_b
);
1741 strbuf_addstr(&out
, " @@\n");
1742 emit_diff_symbol(o
, DIFF_SYMBOL_REWRITE_DIFF
, out
.buf
, out
.len
, 0);
1743 strbuf_release(&out
);
1745 if (lc_a
&& !o
->irreversible_delete
)
1746 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
1748 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
1750 free((char *)data_one
);
1752 free((char *)data_two
);
1755 struct diff_words_buffer
{
1757 unsigned long alloc
;
1758 struct diff_words_orig
{
1759 const char *begin
, *end
;
1761 int orig_nr
, orig_alloc
;
1764 static void diff_words_append(char *line
, unsigned long len
,
1765 struct diff_words_buffer
*buffer
)
1767 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
1770 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
1771 buffer
->text
.size
+= len
;
1772 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
1775 struct diff_words_style_elem
{
1778 const char *color
; /* NULL; filled in by the setup code if
1779 * color is enabled */
1782 struct diff_words_style
{
1783 enum diff_words_type type
;
1784 struct diff_words_style_elem new_word
, old_word
, ctx
;
1785 const char *newline
;
1788 static struct diff_words_style diff_words_styles
[] = {
1789 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
1790 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
1791 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
1794 struct diff_words_data
{
1795 struct diff_words_buffer minus
, plus
;
1796 const char *current_plus
;
1798 struct diff_options
*opt
;
1799 regex_t
*word_regex
;
1800 enum diff_words_type type
;
1801 struct diff_words_style
*style
;
1804 static int fn_out_diff_words_write_helper(struct diff_options
*o
,
1805 struct diff_words_style_elem
*st_el
,
1806 const char *newline
,
1807 size_t count
, const char *buf
)
1810 struct strbuf sb
= STRBUF_INIT
;
1813 char *p
= memchr(buf
, '\n', count
);
1815 strbuf_addstr(&sb
, diff_line_prefix(o
));
1818 const char *reset
= st_el
->color
&& *st_el
->color
?
1819 GIT_COLOR_RESET
: NULL
;
1820 if (st_el
->color
&& *st_el
->color
)
1821 strbuf_addstr(&sb
, st_el
->color
);
1822 strbuf_addstr(&sb
, st_el
->prefix
);
1823 strbuf_add(&sb
, buf
, p
? p
- buf
: count
);
1824 strbuf_addstr(&sb
, st_el
->suffix
);
1826 strbuf_addstr(&sb
, reset
);
1831 strbuf_addstr(&sb
, newline
);
1832 count
-= p
+ 1 - buf
;
1836 emit_diff_symbol(o
, DIFF_SYMBOL_WORD_DIFF
,
1844 emit_diff_symbol(o
, DIFF_SYMBOL_WORD_DIFF
,
1846 strbuf_release(&sb
);
1851 * '--color-words' algorithm can be described as:
1853 * 1. collect the minus/plus lines of a diff hunk, divided into
1854 * minus-lines and plus-lines;
1856 * 2. break both minus-lines and plus-lines into words and
1857 * place them into two mmfile_t with one word for each line;
1859 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
1861 * And for the common parts of the both file, we output the plus side text.
1862 * diff_words->current_plus is used to trace the current position of the plus file
1863 * which printed. diff_words->last_minus is used to trace the last minus word
1866 * For '--graph' to work with '--color-words', we need to output the graph prefix
1867 * on each line of color words output. Generally, there are two conditions on
1868 * which we should output the prefix.
1870 * 1. diff_words->last_minus == 0 &&
1871 * diff_words->current_plus == diff_words->plus.text.ptr
1873 * that is: the plus text must start as a new line, and if there is no minus
1874 * word printed, a graph prefix must be printed.
1876 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
1877 * *(diff_words->current_plus - 1) == '\n'
1879 * that is: a graph prefix must be printed following a '\n'
1881 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
1883 if ((diff_words
->last_minus
== 0 &&
1884 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
1885 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
1886 *(diff_words
->current_plus
- 1) == '\n')) {
1893 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
1895 struct diff_words_data
*diff_words
= priv
;
1896 struct diff_words_style
*style
= diff_words
->style
;
1897 int minus_first
, minus_len
, plus_first
, plus_len
;
1898 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
1899 struct diff_options
*opt
= diff_words
->opt
;
1900 const char *line_prefix
;
1902 if (line
[0] != '@' || parse_hunk_header(line
, len
,
1903 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
1907 line_prefix
= diff_line_prefix(opt
);
1909 /* POSIX requires that first be decremented by one if len == 0... */
1911 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
1913 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
1915 minus_begin
= minus_end
=
1916 diff_words
->minus
.orig
[minus_first
].end
;
1919 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
1920 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
1922 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
1924 if (color_words_output_graph_prefix(diff_words
)) {
1925 fputs(line_prefix
, diff_words
->opt
->file
);
1927 if (diff_words
->current_plus
!= plus_begin
) {
1928 fn_out_diff_words_write_helper(diff_words
->opt
,
1929 &style
->ctx
, style
->newline
,
1930 plus_begin
- diff_words
->current_plus
,
1931 diff_words
->current_plus
);
1933 if (minus_begin
!= minus_end
) {
1934 fn_out_diff_words_write_helper(diff_words
->opt
,
1935 &style
->old_word
, style
->newline
,
1936 minus_end
- minus_begin
, minus_begin
);
1938 if (plus_begin
!= plus_end
) {
1939 fn_out_diff_words_write_helper(diff_words
->opt
,
1940 &style
->new_word
, style
->newline
,
1941 plus_end
- plus_begin
, plus_begin
);
1944 diff_words
->current_plus
= plus_end
;
1945 diff_words
->last_minus
= minus_first
;
1948 /* This function starts looking at *begin, and returns 0 iff a word was found. */
1949 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
1950 int *begin
, int *end
)
1952 if (word_regex
&& *begin
< buffer
->size
) {
1953 regmatch_t match
[1];
1954 if (!regexec_buf(word_regex
, buffer
->ptr
+ *begin
,
1955 buffer
->size
- *begin
, 1, match
, 0)) {
1956 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
1957 '\n', match
[0].rm_eo
- match
[0].rm_so
);
1958 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
1959 *begin
+= match
[0].rm_so
;
1960 return *begin
>= *end
;
1965 /* find the next word */
1966 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
1968 if (*begin
>= buffer
->size
)
1971 /* find the end of the word */
1973 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
1980 * This function splits the words in buffer->text, stores the list with
1981 * newline separator into out, and saves the offsets of the original words
1984 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
1985 regex_t
*word_regex
)
1993 /* fake an empty "0th" word */
1994 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
1995 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
1996 buffer
->orig_nr
= 1;
1998 for (i
= 0; i
< buffer
->text
.size
; i
++) {
1999 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
2002 /* store original boundaries */
2003 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
2004 buffer
->orig_alloc
);
2005 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
2006 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
2009 /* store one word */
2010 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
2011 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
2012 out
->ptr
[out
->size
+ j
- i
] = '\n';
2013 out
->size
+= j
- i
+ 1;
2019 /* this executes the word diff on the accumulated buffers */
2020 static void diff_words_show(struct diff_words_data
*diff_words
)
2024 mmfile_t minus
, plus
;
2025 struct diff_words_style
*style
= diff_words
->style
;
2027 struct diff_options
*opt
= diff_words
->opt
;
2028 const char *line_prefix
;
2031 line_prefix
= diff_line_prefix(opt
);
2033 /* special case: only removal */
2034 if (!diff_words
->plus
.text
.size
) {
2035 emit_diff_symbol(diff_words
->opt
, DIFF_SYMBOL_WORD_DIFF
,
2036 line_prefix
, strlen(line_prefix
), 0);
2037 fn_out_diff_words_write_helper(diff_words
->opt
,
2038 &style
->old_word
, style
->newline
,
2039 diff_words
->minus
.text
.size
,
2040 diff_words
->minus
.text
.ptr
);
2041 diff_words
->minus
.text
.size
= 0;
2045 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
2046 diff_words
->last_minus
= 0;
2048 memset(&xpp
, 0, sizeof(xpp
));
2049 memset(&xecfg
, 0, sizeof(xecfg
));
2050 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
2051 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
2053 /* as only the hunk header will be parsed, we need a 0-context */
2055 if (xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
2057 die("unable to generate word diff");
2060 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
2061 diff_words
->plus
.text
.size
) {
2062 if (color_words_output_graph_prefix(diff_words
))
2063 emit_diff_symbol(diff_words
->opt
, DIFF_SYMBOL_WORD_DIFF
,
2064 line_prefix
, strlen(line_prefix
), 0);
2065 fn_out_diff_words_write_helper(diff_words
->opt
,
2066 &style
->ctx
, style
->newline
,
2067 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
2068 - diff_words
->current_plus
, diff_words
->current_plus
);
2070 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
2073 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
2074 static void diff_words_flush(struct emit_callback
*ecbdata
)
2076 struct diff_options
*wo
= ecbdata
->diff_words
->opt
;
2078 if (ecbdata
->diff_words
->minus
.text
.size
||
2079 ecbdata
->diff_words
->plus
.text
.size
)
2080 diff_words_show(ecbdata
->diff_words
);
2082 if (wo
->emitted_symbols
) {
2083 struct diff_options
*o
= ecbdata
->opt
;
2084 struct emitted_diff_symbols
*wol
= wo
->emitted_symbols
;
2089 * Instead of appending each, concat all words to a line?
2091 for (i
= 0; i
< wol
->nr
; i
++)
2092 append_emitted_diff_symbol(o
, &wol
->buf
[i
]);
2094 for (i
= 0; i
< wol
->nr
; i
++)
2095 free((void *)wol
->buf
[i
].line
);
2101 static void diff_filespec_load_driver(struct diff_filespec
*one
)
2103 /* Use already-loaded driver */
2107 if (S_ISREG(one
->mode
))
2108 one
->driver
= userdiff_find_by_path(one
->path
);
2110 /* Fallback to default settings */
2112 one
->driver
= userdiff_find_by_name("default");
2115 static const char *userdiff_word_regex(struct diff_filespec
*one
)
2117 diff_filespec_load_driver(one
);
2118 return one
->driver
->word_regex
;
2121 static void init_diff_words_data(struct emit_callback
*ecbdata
,
2122 struct diff_options
*orig_opts
,
2123 struct diff_filespec
*one
,
2124 struct diff_filespec
*two
)
2127 struct diff_options
*o
= xmalloc(sizeof(struct diff_options
));
2128 memcpy(o
, orig_opts
, sizeof(struct diff_options
));
2130 ecbdata
->diff_words
=
2131 xcalloc(1, sizeof(struct diff_words_data
));
2132 ecbdata
->diff_words
->type
= o
->word_diff
;
2133 ecbdata
->diff_words
->opt
= o
;
2135 if (orig_opts
->emitted_symbols
)
2136 o
->emitted_symbols
=
2137 xcalloc(1, sizeof(struct emitted_diff_symbols
));
2140 o
->word_regex
= userdiff_word_regex(one
);
2142 o
->word_regex
= userdiff_word_regex(two
);
2144 o
->word_regex
= diff_word_regex_cfg
;
2145 if (o
->word_regex
) {
2146 ecbdata
->diff_words
->word_regex
= (regex_t
*)
2147 xmalloc(sizeof(regex_t
));
2148 if (regcomp(ecbdata
->diff_words
->word_regex
,
2150 REG_EXTENDED
| REG_NEWLINE
))
2151 die ("Invalid regular expression: %s",
2154 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
2155 if (o
->word_diff
== diff_words_styles
[i
].type
) {
2156 ecbdata
->diff_words
->style
=
2157 &diff_words_styles
[i
];
2161 if (want_color(o
->use_color
)) {
2162 struct diff_words_style
*st
= ecbdata
->diff_words
->style
;
2163 st
->old_word
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2164 st
->new_word
.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2165 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_CONTEXT
);
2169 static void free_diff_words_data(struct emit_callback
*ecbdata
)
2171 if (ecbdata
->diff_words
) {
2172 diff_words_flush(ecbdata
);
2173 free (ecbdata
->diff_words
->opt
->emitted_symbols
);
2174 free (ecbdata
->diff_words
->opt
);
2175 free (ecbdata
->diff_words
->minus
.text
.ptr
);
2176 free (ecbdata
->diff_words
->minus
.orig
);
2177 free (ecbdata
->diff_words
->plus
.text
.ptr
);
2178 free (ecbdata
->diff_words
->plus
.orig
);
2179 if (ecbdata
->diff_words
->word_regex
) {
2180 regfree(ecbdata
->diff_words
->word_regex
);
2181 free(ecbdata
->diff_words
->word_regex
);
2183 FREE_AND_NULL(ecbdata
->diff_words
);
2187 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
2189 if (want_color(diff_use_color
))
2190 return diff_colors
[ix
];
2194 const char *diff_line_prefix(struct diff_options
*opt
)
2196 struct strbuf
*msgbuf
;
2197 if (!opt
->output_prefix
)
2200 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
2204 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
2207 unsigned long allot
;
2213 (void) utf8_width(&cp
, &l
);
2215 break; /* truncated in the middle? */
2220 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
2223 ecbdata
->lno_in_preimage
= 0;
2224 ecbdata
->lno_in_postimage
= 0;
2225 p
= strchr(line
, '-');
2227 return; /* cannot happen */
2228 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
2231 return; /* cannot happen */
2232 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
2235 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
2237 struct emit_callback
*ecbdata
= priv
;
2238 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
2239 struct diff_options
*o
= ecbdata
->opt
;
2241 o
->found_changes
= 1;
2243 if (ecbdata
->header
) {
2244 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
2245 ecbdata
->header
->buf
, ecbdata
->header
->len
, 0);
2246 strbuf_reset(ecbdata
->header
);
2247 ecbdata
->header
= NULL
;
2250 if (ecbdata
->label_path
[0]) {
2251 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_MINUS
,
2252 ecbdata
->label_path
[0],
2253 strlen(ecbdata
->label_path
[0]), 0);
2254 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_PLUS
,
2255 ecbdata
->label_path
[1],
2256 strlen(ecbdata
->label_path
[1]), 0);
2257 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
2260 if (diff_suppress_blank_empty
2261 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
2266 if (line
[0] == '@') {
2267 if (ecbdata
->diff_words
)
2268 diff_words_flush(ecbdata
);
2269 len
= sane_truncate_line(ecbdata
, line
, len
);
2270 find_lno(line
, ecbdata
);
2271 emit_hunk_header(ecbdata
, line
, len
);
2275 if (ecbdata
->diff_words
) {
2276 enum diff_symbol s
=
2277 ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
?
2278 DIFF_SYMBOL_WORDS_PORCELAIN
: DIFF_SYMBOL_WORDS
;
2279 if (line
[0] == '-') {
2280 diff_words_append(line
, len
,
2281 &ecbdata
->diff_words
->minus
);
2283 } else if (line
[0] == '+') {
2284 diff_words_append(line
, len
,
2285 &ecbdata
->diff_words
->plus
);
2287 } else if (starts_with(line
, "\\ ")) {
2289 * Eat the "no newline at eof" marker as if we
2290 * saw a "+" or "-" line with nothing on it,
2291 * and return without diff_words_flush() to
2292 * defer processing. If this is the end of
2293 * preimage, more "+" lines may come after it.
2297 diff_words_flush(ecbdata
);
2298 emit_diff_symbol(o
, s
, line
, len
, 0);
2304 ecbdata
->lno_in_postimage
++;
2305 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
2308 ecbdata
->lno_in_preimage
++;
2309 emit_del_line(reset
, ecbdata
, line
+ 1, len
- 1);
2312 ecbdata
->lno_in_postimage
++;
2313 ecbdata
->lno_in_preimage
++;
2314 emit_context_line(reset
, ecbdata
, line
+ 1, len
- 1);
2317 /* incomplete line at the end */
2318 ecbdata
->lno_in_preimage
++;
2319 emit_diff_symbol(o
, DIFF_SYMBOL_CONTEXT_INCOMPLETE
,
2325 static void pprint_rename(struct strbuf
*name
, const char *a
, const char *b
)
2327 const char *old_name
= a
;
2328 const char *new_name
= b
;
2329 int pfx_length
, sfx_length
;
2330 int pfx_adjust_for_slash
;
2331 int len_a
= strlen(a
);
2332 int len_b
= strlen(b
);
2333 int a_midlen
, b_midlen
;
2334 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
2335 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
2337 if (qlen_a
|| qlen_b
) {
2338 quote_c_style(a
, name
, NULL
, 0);
2339 strbuf_addstr(name
, " => ");
2340 quote_c_style(b
, name
, NULL
, 0);
2344 /* Find common prefix */
2346 while (*old_name
&& *new_name
&& *old_name
== *new_name
) {
2347 if (*old_name
== '/')
2348 pfx_length
= old_name
- a
+ 1;
2353 /* Find common suffix */
2354 old_name
= a
+ len_a
;
2355 new_name
= b
+ len_b
;
2358 * If there is a common prefix, it must end in a slash. In
2359 * that case we let this loop run 1 into the prefix to see the
2362 * If there is no common prefix, we cannot do this as it would
2363 * underrun the input strings.
2365 pfx_adjust_for_slash
= (pfx_length
? 1 : 0);
2366 while (a
+ pfx_length
- pfx_adjust_for_slash
<= old_name
&&
2367 b
+ pfx_length
- pfx_adjust_for_slash
<= new_name
&&
2368 *old_name
== *new_name
) {
2369 if (*old_name
== '/')
2370 sfx_length
= len_a
- (old_name
- a
);
2376 * pfx{mid-a => mid-b}sfx
2377 * {pfx-a => pfx-b}sfx
2378 * pfx{sfx-a => sfx-b}
2381 a_midlen
= len_a
- pfx_length
- sfx_length
;
2382 b_midlen
= len_b
- pfx_length
- sfx_length
;
2388 strbuf_grow(name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
2389 if (pfx_length
+ sfx_length
) {
2390 strbuf_add(name
, a
, pfx_length
);
2391 strbuf_addch(name
, '{');
2393 strbuf_add(name
, a
+ pfx_length
, a_midlen
);
2394 strbuf_addstr(name
, " => ");
2395 strbuf_add(name
, b
+ pfx_length
, b_midlen
);
2396 if (pfx_length
+ sfx_length
) {
2397 strbuf_addch(name
, '}');
2398 strbuf_add(name
, a
+ len_a
- sfx_length
, sfx_length
);
2405 struct diffstat_file
{
2409 const char *comments
;
2410 unsigned is_unmerged
:1;
2411 unsigned is_binary
:1;
2412 unsigned is_renamed
:1;
2413 unsigned is_interesting
:1;
2414 uintmax_t added
, deleted
;
2418 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
2422 struct diffstat_file
*x
;
2423 x
= xcalloc(1, sizeof(*x
));
2424 ALLOC_GROW(diffstat
->files
, diffstat
->nr
+ 1, diffstat
->alloc
);
2425 diffstat
->files
[diffstat
->nr
++] = x
;
2427 x
->from_name
= xstrdup(name_a
);
2428 x
->name
= xstrdup(name_b
);
2432 x
->from_name
= NULL
;
2433 x
->name
= xstrdup(name_a
);
2438 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
2440 struct diffstat_t
*diffstat
= priv
;
2441 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
2445 else if (line
[0] == '-')
2449 const char mime_boundary_leader
[] = "------------";
2451 static int scale_linear(int it
, int width
, int max_change
)
2456 * make sure that at least one '-' or '+' is printed if
2457 * there is any change to this path. The easiest way is to
2458 * scale linearly as if the alloted width is one column shorter
2459 * than it is, and then add 1 to the result.
2461 return 1 + (it
* (width
- 1) / max_change
);
2464 static void show_graph(struct strbuf
*out
, char ch
, int cnt
,
2465 const char *set
, const char *reset
)
2469 strbuf_addstr(out
, set
);
2470 strbuf_addchars(out
, ch
, cnt
);
2471 strbuf_addstr(out
, reset
);
2474 static void fill_print_name(struct diffstat_file
*file
)
2476 struct strbuf pname
= STRBUF_INIT
;
2478 if (file
->print_name
)
2481 if (file
->is_renamed
)
2482 pprint_rename(&pname
, file
->from_name
, file
->name
);
2484 quote_c_style(file
->name
, &pname
, NULL
, 0);
2487 strbuf_addf(&pname
, " (%s)", file
->comments
);
2489 file
->print_name
= strbuf_detach(&pname
, NULL
);
2492 static void print_stat_summary_inserts_deletes(struct diff_options
*options
,
2493 int files
, int insertions
, int deletions
)
2495 struct strbuf sb
= STRBUF_INIT
;
2498 assert(insertions
== 0 && deletions
== 0);
2499 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
,
2505 (files
== 1) ? " %d file changed" : " %d files changed",
2509 * For binary diff, the caller may want to print "x files
2510 * changed" with insertions == 0 && deletions == 0.
2512 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
2513 * is probably less confusing (i.e skip over "2 files changed
2514 * but nothing about added/removed lines? Is this a bug in Git?").
2516 if (insertions
|| deletions
== 0) {
2518 (insertions
== 1) ? ", %d insertion(+)" : ", %d insertions(+)",
2522 if (deletions
|| insertions
== 0) {
2524 (deletions
== 1) ? ", %d deletion(-)" : ", %d deletions(-)",
2527 strbuf_addch(&sb
, '\n');
2528 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
,
2530 strbuf_release(&sb
);
2533 void print_stat_summary(FILE *fp
, int files
,
2534 int insertions
, int deletions
)
2536 struct diff_options o
;
2537 memset(&o
, 0, sizeof(o
));
2540 print_stat_summary_inserts_deletes(&o
, files
, insertions
, deletions
);
2543 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
2545 int i
, len
, add
, del
, adds
= 0, dels
= 0;
2546 uintmax_t max_change
= 0, max_len
= 0;
2547 int total_files
= data
->nr
, count
;
2548 int width
, name_width
, graph_width
, number_width
= 0, bin_width
= 0;
2549 const char *reset
, *add_c
, *del_c
;
2550 int extra_shown
= 0;
2551 const char *line_prefix
= diff_line_prefix(options
);
2552 struct strbuf out
= STRBUF_INIT
;
2557 count
= options
->stat_count
? options
->stat_count
: data
->nr
;
2559 reset
= diff_get_color_opt(options
, DIFF_RESET
);
2560 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
2561 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
2564 * Find the longest filename and max number of changes
2566 for (i
= 0; (i
< count
) && (i
< data
->nr
); i
++) {
2567 struct diffstat_file
*file
= data
->files
[i
];
2568 uintmax_t change
= file
->added
+ file
->deleted
;
2570 if (!file
->is_interesting
&& (change
== 0)) {
2571 count
++; /* not shown == room for one more */
2574 fill_print_name(file
);
2575 len
= strlen(file
->print_name
);
2579 if (file
->is_unmerged
) {
2580 /* "Unmerged" is 8 characters */
2581 bin_width
= bin_width
< 8 ? 8 : bin_width
;
2584 if (file
->is_binary
) {
2585 /* "Bin XXX -> YYY bytes" */
2586 int w
= 14 + decimal_width(file
->added
)
2587 + decimal_width(file
->deleted
);
2588 bin_width
= bin_width
< w
? w
: bin_width
;
2589 /* Display change counts aligned with "Bin" */
2594 if (max_change
< change
)
2595 max_change
= change
;
2597 count
= i
; /* where we can stop scanning in data->files[] */
2600 * We have width = stat_width or term_columns() columns total.
2601 * We want a maximum of min(max_len, stat_name_width) for the name part.
2602 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
2603 * We also need 1 for " " and 4 + decimal_width(max_change)
2604 * for " | NNNN " and one the empty column at the end, altogether
2605 * 6 + decimal_width(max_change).
2607 * If there's not enough space, we will use the smaller of
2608 * stat_name_width (if set) and 5/8*width for the filename,
2609 * and the rest for constant elements + graph part, but no more
2610 * than stat_graph_width for the graph part.
2611 * (5/8 gives 50 for filename and 30 for the constant parts + graph
2612 * for the standard terminal size).
2614 * In other words: stat_width limits the maximum width, and
2615 * stat_name_width fixes the maximum width of the filename,
2616 * and is also used to divide available columns if there
2619 * Binary files are displayed with "Bin XXX -> YYY bytes"
2620 * instead of the change count and graph. This part is treated
2621 * similarly to the graph part, except that it is not
2622 * "scaled". If total width is too small to accommodate the
2623 * guaranteed minimum width of the filename part and the
2624 * separators and this message, this message will "overflow"
2625 * making the line longer than the maximum width.
2628 if (options
->stat_width
== -1)
2629 width
= term_columns() - strlen(line_prefix
);
2631 width
= options
->stat_width
? options
->stat_width
: 80;
2632 number_width
= decimal_width(max_change
) > number_width
?
2633 decimal_width(max_change
) : number_width
;
2635 if (options
->stat_graph_width
== -1)
2636 options
->stat_graph_width
= diff_stat_graph_width
;
2639 * Guarantee 3/8*16==6 for the graph part
2640 * and 5/8*16==10 for the filename part
2642 if (width
< 16 + 6 + number_width
)
2643 width
= 16 + 6 + number_width
;
2646 * First assign sizes that are wanted, ignoring available width.
2647 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
2648 * starting from "XXX" should fit in graph_width.
2650 graph_width
= max_change
+ 4 > bin_width
? max_change
: bin_width
- 4;
2651 if (options
->stat_graph_width
&&
2652 options
->stat_graph_width
< graph_width
)
2653 graph_width
= options
->stat_graph_width
;
2655 name_width
= (options
->stat_name_width
> 0 &&
2656 options
->stat_name_width
< max_len
) ?
2657 options
->stat_name_width
: max_len
;
2660 * Adjust adjustable widths not to exceed maximum width
2662 if (name_width
+ number_width
+ 6 + graph_width
> width
) {
2663 if (graph_width
> width
* 3/8 - number_width
- 6) {
2664 graph_width
= width
* 3/8 - number_width
- 6;
2665 if (graph_width
< 6)
2669 if (options
->stat_graph_width
&&
2670 graph_width
> options
->stat_graph_width
)
2671 graph_width
= options
->stat_graph_width
;
2672 if (name_width
> width
- number_width
- 6 - graph_width
)
2673 name_width
= width
- number_width
- 6 - graph_width
;
2675 graph_width
= width
- number_width
- 6 - name_width
;
2679 * From here name_width is the width of the name area,
2680 * and graph_width is the width of the graph area.
2681 * max_change is used to scale graph properly.
2683 for (i
= 0; i
< count
; i
++) {
2684 const char *prefix
= "";
2685 struct diffstat_file
*file
= data
->files
[i
];
2686 char *name
= file
->print_name
;
2687 uintmax_t added
= file
->added
;
2688 uintmax_t deleted
= file
->deleted
;
2691 if (!file
->is_interesting
&& (added
+ deleted
== 0))
2695 * "scale" the filename
2698 name_len
= strlen(name
);
2699 if (name_width
< name_len
) {
2703 name
+= name_len
- len
;
2704 slash
= strchr(name
, '/');
2709 if (file
->is_binary
) {
2710 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2711 strbuf_addf(&out
, " %*s", number_width
, "Bin");
2712 if (!added
&& !deleted
) {
2713 strbuf_addch(&out
, '\n');
2714 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2715 out
.buf
, out
.len
, 0);
2719 strbuf_addf(&out
, " %s%"PRIuMAX
"%s",
2720 del_c
, deleted
, reset
);
2721 strbuf_addstr(&out
, " -> ");
2722 strbuf_addf(&out
, "%s%"PRIuMAX
"%s",
2723 add_c
, added
, reset
);
2724 strbuf_addstr(&out
, " bytes\n");
2725 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2726 out
.buf
, out
.len
, 0);
2730 else if (file
->is_unmerged
) {
2731 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2732 strbuf_addstr(&out
, " Unmerged\n");
2733 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2734 out
.buf
, out
.len
, 0);
2740 * scale the add/delete
2745 if (graph_width
<= max_change
) {
2746 int total
= scale_linear(add
+ del
, graph_width
, max_change
);
2747 if (total
< 2 && add
&& del
)
2748 /* width >= 2 due to the sanity check */
2751 add
= scale_linear(add
, graph_width
, max_change
);
2754 del
= scale_linear(del
, graph_width
, max_change
);
2758 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2759 strbuf_addf(&out
, " %*"PRIuMAX
"%s",
2760 number_width
, added
+ deleted
,
2761 added
+ deleted
? " " : "");
2762 show_graph(&out
, '+', add
, add_c
, reset
);
2763 show_graph(&out
, '-', del
, del_c
, reset
);
2764 strbuf_addch(&out
, '\n');
2765 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2766 out
.buf
, out
.len
, 0);
2770 for (i
= 0; i
< data
->nr
; i
++) {
2771 struct diffstat_file
*file
= data
->files
[i
];
2772 uintmax_t added
= file
->added
;
2773 uintmax_t deleted
= file
->deleted
;
2775 if (file
->is_unmerged
||
2776 (!file
->is_interesting
&& (added
+ deleted
== 0))) {
2781 if (!file
->is_binary
) {
2788 emit_diff_symbol(options
,
2789 DIFF_SYMBOL_STATS_SUMMARY_ABBREV
,
2794 print_stat_summary_inserts_deletes(options
, total_files
, adds
, dels
);
2795 strbuf_release(&out
);
2798 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
2800 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
2805 for (i
= 0; i
< data
->nr
; i
++) {
2806 int added
= data
->files
[i
]->added
;
2807 int deleted
= data
->files
[i
]->deleted
;
2809 if (data
->files
[i
]->is_unmerged
||
2810 (!data
->files
[i
]->is_interesting
&& (added
+ deleted
== 0))) {
2812 } else if (!data
->files
[i
]->is_binary
) { /* don't count bytes */
2817 print_stat_summary_inserts_deletes(options
, total_files
, adds
, dels
);
2820 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
2827 for (i
= 0; i
< data
->nr
; i
++) {
2828 struct diffstat_file
*file
= data
->files
[i
];
2830 fprintf(options
->file
, "%s", diff_line_prefix(options
));
2832 if (file
->is_binary
)
2833 fprintf(options
->file
, "-\t-\t");
2835 fprintf(options
->file
,
2836 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
2837 file
->added
, file
->deleted
);
2838 if (options
->line_termination
) {
2839 fill_print_name(file
);
2840 if (!file
->is_renamed
)
2841 write_name_quoted(file
->name
, options
->file
,
2842 options
->line_termination
);
2844 fputs(file
->print_name
, options
->file
);
2845 putc(options
->line_termination
, options
->file
);
2848 if (file
->is_renamed
) {
2849 putc('\0', options
->file
);
2850 write_name_quoted(file
->from_name
, options
->file
, '\0');
2852 write_name_quoted(file
->name
, options
->file
, '\0');
2857 struct dirstat_file
{
2859 unsigned long changed
;
2862 struct dirstat_dir
{
2863 struct dirstat_file
*files
;
2864 int alloc
, nr
, permille
, cumulative
;
2867 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
2868 unsigned long changed
, const char *base
, int baselen
)
2870 unsigned long sum_changes
= 0;
2871 unsigned int sources
= 0;
2872 const char *line_prefix
= diff_line_prefix(opt
);
2875 struct dirstat_file
*f
= dir
->files
;
2876 int namelen
= strlen(f
->name
);
2877 unsigned long changes
;
2880 if (namelen
< baselen
)
2882 if (memcmp(f
->name
, base
, baselen
))
2884 slash
= strchr(f
->name
+ baselen
, '/');
2886 int newbaselen
= slash
+ 1 - f
->name
;
2887 changes
= gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
2890 changes
= f
->changed
;
2895 sum_changes
+= changes
;
2899 * We don't report dirstat's for
2901 * - or cases where everything came from a single directory
2902 * under this directory (sources == 1).
2904 if (baselen
&& sources
!= 1) {
2906 int permille
= sum_changes
* 1000 / changed
;
2907 if (permille
>= dir
->permille
) {
2908 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
2909 permille
/ 10, permille
% 10, baselen
, base
);
2910 if (!dir
->cumulative
)
2918 static int dirstat_compare(const void *_a
, const void *_b
)
2920 const struct dirstat_file
*a
= _a
;
2921 const struct dirstat_file
*b
= _b
;
2922 return strcmp(a
->name
, b
->name
);
2925 static void show_dirstat(struct diff_options
*options
)
2928 unsigned long changed
;
2929 struct dirstat_dir dir
;
2930 struct diff_queue_struct
*q
= &diff_queued_diff
;
2935 dir
.permille
= options
->dirstat_permille
;
2936 dir
.cumulative
= options
->flags
.dirstat_cumulative
;
2939 for (i
= 0; i
< q
->nr
; i
++) {
2940 struct diff_filepair
*p
= q
->queue
[i
];
2942 unsigned long copied
, added
, damage
;
2943 int content_changed
;
2945 name
= p
->two
->path
? p
->two
->path
: p
->one
->path
;
2947 if (p
->one
->oid_valid
&& p
->two
->oid_valid
)
2948 content_changed
= oidcmp(&p
->one
->oid
, &p
->two
->oid
);
2950 content_changed
= 1;
2952 if (!content_changed
) {
2954 * The SHA1 has not changed, so pre-/post-content is
2955 * identical. We can therefore skip looking at the
2956 * file contents altogether.
2962 if (options
->flags
.dirstat_by_file
) {
2964 * In --dirstat-by-file mode, we don't really need to
2965 * look at the actual file contents at all.
2966 * The fact that the SHA1 changed is enough for us to
2967 * add this file to the list of results
2968 * (with each file contributing equal damage).
2974 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
2975 diff_populate_filespec(p
->one
, 0);
2976 diff_populate_filespec(p
->two
, 0);
2977 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
,
2979 diff_free_filespec_data(p
->one
);
2980 diff_free_filespec_data(p
->two
);
2981 } else if (DIFF_FILE_VALID(p
->one
)) {
2982 diff_populate_filespec(p
->one
, CHECK_SIZE_ONLY
);
2984 diff_free_filespec_data(p
->one
);
2985 } else if (DIFF_FILE_VALID(p
->two
)) {
2986 diff_populate_filespec(p
->two
, CHECK_SIZE_ONLY
);
2988 added
= p
->two
->size
;
2989 diff_free_filespec_data(p
->two
);
2994 * Original minus copied is the removed material,
2995 * added is the new material. They are both damages
2996 * made to the preimage.
2997 * If the resulting damage is zero, we know that
2998 * diffcore_count_changes() considers the two entries to
2999 * be identical, but since content_changed is true, we
3000 * know that there must have been _some_ kind of change,
3001 * so we force all entries to have damage > 0.
3003 damage
= (p
->one
->size
- copied
) + added
;
3008 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
3009 dir
.files
[dir
.nr
].name
= name
;
3010 dir
.files
[dir
.nr
].changed
= damage
;
3015 /* This can happen even with many files, if everything was renames */
3019 /* Show all directories with more than x% of the changes */
3020 QSORT(dir
.files
, dir
.nr
, dirstat_compare
);
3021 gather_dirstat(options
, &dir
, changed
, "", 0);
3024 static void show_dirstat_by_line(struct diffstat_t
*data
, struct diff_options
*options
)
3027 unsigned long changed
;
3028 struct dirstat_dir dir
;
3036 dir
.permille
= options
->dirstat_permille
;
3037 dir
.cumulative
= options
->flags
.dirstat_cumulative
;
3040 for (i
= 0; i
< data
->nr
; i
++) {
3041 struct diffstat_file
*file
= data
->files
[i
];
3042 unsigned long damage
= file
->added
+ file
->deleted
;
3043 if (file
->is_binary
)
3045 * binary files counts bytes, not lines. Must find some
3046 * way to normalize binary bytes vs. textual lines.
3047 * The following heuristic assumes that there are 64
3049 * This is stupid and ugly, but very cheap...
3051 damage
= DIV_ROUND_UP(damage
, 64);
3052 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
3053 dir
.files
[dir
.nr
].name
= file
->name
;
3054 dir
.files
[dir
.nr
].changed
= damage
;
3059 /* This can happen even with many files, if everything was renames */
3063 /* Show all directories with more than x% of the changes */
3064 QSORT(dir
.files
, dir
.nr
, dirstat_compare
);
3065 gather_dirstat(options
, &dir
, changed
, "", 0);
3068 static void free_diffstat_info(struct diffstat_t
*diffstat
)
3071 for (i
= 0; i
< diffstat
->nr
; i
++) {
3072 struct diffstat_file
*f
= diffstat
->files
[i
];
3073 free(f
->print_name
);
3078 free(diffstat
->files
);
3081 struct checkdiff_t
{
3082 const char *filename
;
3084 int conflict_marker_size
;
3085 struct diff_options
*o
;
3090 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
3095 if (len
< marker_size
+ 1)
3097 firstchar
= line
[0];
3098 switch (firstchar
) {
3099 case '=': case '>': case '<': case '|':
3104 for (cnt
= 1; cnt
< marker_size
; cnt
++)
3105 if (line
[cnt
] != firstchar
)
3107 /* line[1] thru line[marker_size-1] are same as firstchar */
3108 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
3113 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
3115 struct checkdiff_t
*data
= priv
;
3116 int marker_size
= data
->conflict_marker_size
;
3117 const char *ws
= diff_get_color(data
->o
->use_color
, DIFF_WHITESPACE
);
3118 const char *reset
= diff_get_color(data
->o
->use_color
, DIFF_RESET
);
3119 const char *set
= diff_get_color(data
->o
->use_color
, DIFF_FILE_NEW
);
3121 const char *line_prefix
;
3124 line_prefix
= diff_line_prefix(data
->o
);
3126 if (line
[0] == '+') {
3129 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
3131 fprintf(data
->o
->file
,
3132 "%s%s:%d: leftover conflict marker\n",
3133 line_prefix
, data
->filename
, data
->lineno
);
3135 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
3138 data
->status
|= bad
;
3139 err
= whitespace_error_string(bad
);
3140 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
3141 line_prefix
, data
->filename
, data
->lineno
, err
);
3143 emit_line(data
->o
, set
, reset
, line
, 1);
3144 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
3145 data
->o
->file
, set
, reset
, ws
);
3146 } else if (line
[0] == ' ') {
3148 } else if (line
[0] == '@') {
3149 char *plus
= strchr(line
, '+');
3151 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
3153 die("invalid diff");
3157 static unsigned char *deflate_it(char *data
,
3159 unsigned long *result_size
)
3162 unsigned char *deflated
;
3165 git_deflate_init(&stream
, zlib_compression_level
);
3166 bound
= git_deflate_bound(&stream
, size
);
3167 deflated
= xmalloc(bound
);
3168 stream
.next_out
= deflated
;
3169 stream
.avail_out
= bound
;
3171 stream
.next_in
= (unsigned char *)data
;
3172 stream
.avail_in
= size
;
3173 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
3175 git_deflate_end(&stream
);
3176 *result_size
= stream
.total_out
;
3180 static void emit_binary_diff_body(struct diff_options
*o
,
3181 mmfile_t
*one
, mmfile_t
*two
)
3187 unsigned long orig_size
;
3188 unsigned long delta_size
;
3189 unsigned long deflate_size
;
3190 unsigned long data_size
;
3192 /* We could do deflated delta, or we could do just deflated two,
3193 * whichever is smaller.
3196 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
3197 if (one
->size
&& two
->size
) {
3198 delta
= diff_delta(one
->ptr
, one
->size
,
3199 two
->ptr
, two
->size
,
3200 &delta_size
, deflate_size
);
3202 void *to_free
= delta
;
3203 orig_size
= delta_size
;
3204 delta
= deflate_it(delta
, delta_size
, &delta_size
);
3209 if (delta
&& delta_size
< deflate_size
) {
3210 char *s
= xstrfmt("%lu", orig_size
);
3211 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
,
3216 data_size
= delta_size
;
3218 char *s
= xstrfmt("%lu", two
->size
);
3219 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
,
3224 data_size
= deflate_size
;
3227 /* emit data encoded in base85 */
3231 int bytes
= (52 < data_size
) ? 52 : data_size
;
3235 line
[0] = bytes
+ 'A' - 1;
3237 line
[0] = bytes
- 26 + 'a' - 1;
3238 encode_85(line
+ 1, cp
, bytes
);
3239 cp
= (char *) cp
+ bytes
;
3245 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_BODY
,
3248 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_FOOTER
, NULL
, 0, 0);
3252 static void emit_binary_diff(struct diff_options
*o
,
3253 mmfile_t
*one
, mmfile_t
*two
)
3255 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER
, NULL
, 0, 0);
3256 emit_binary_diff_body(o
, one
, two
);
3257 emit_binary_diff_body(o
, two
, one
);
3260 int diff_filespec_is_binary(struct diff_filespec
*one
)
3262 if (one
->is_binary
== -1) {
3263 diff_filespec_load_driver(one
);
3264 if (one
->driver
->binary
!= -1)
3265 one
->is_binary
= one
->driver
->binary
;
3267 if (!one
->data
&& DIFF_FILE_VALID(one
))
3268 diff_populate_filespec(one
, CHECK_BINARY
);
3269 if (one
->is_binary
== -1 && one
->data
)
3270 one
->is_binary
= buffer_is_binary(one
->data
,
3272 if (one
->is_binary
== -1)
3276 return one
->is_binary
;
3279 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
3281 diff_filespec_load_driver(one
);
3282 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
3285 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
3287 if (!options
->a_prefix
)
3288 options
->a_prefix
= a
;
3289 if (!options
->b_prefix
)
3290 options
->b_prefix
= b
;
3293 struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
3295 if (!DIFF_FILE_VALID(one
))
3298 diff_filespec_load_driver(one
);
3299 return userdiff_get_textconv(one
->driver
);
3302 static void builtin_diff(const char *name_a
,
3304 struct diff_filespec
*one
,
3305 struct diff_filespec
*two
,
3306 const char *xfrm_msg
,
3307 int must_show_header
,
3308 struct diff_options
*o
,
3309 int complete_rewrite
)
3313 char *a_one
, *b_two
;
3314 const char *meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
3315 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
3316 const char *a_prefix
, *b_prefix
;
3317 struct userdiff_driver
*textconv_one
= NULL
;
3318 struct userdiff_driver
*textconv_two
= NULL
;
3319 struct strbuf header
= STRBUF_INIT
;
3320 const char *line_prefix
= diff_line_prefix(o
);
3322 diff_set_mnemonic_prefix(o
, "a/", "b/");
3323 if (o
->flags
.reverse_diff
) {
3324 a_prefix
= o
->b_prefix
;
3325 b_prefix
= o
->a_prefix
;
3327 a_prefix
= o
->a_prefix
;
3328 b_prefix
= o
->b_prefix
;
3331 if (o
->submodule_format
== DIFF_SUBMODULE_LOG
&&
3332 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
3333 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
3334 show_submodule_summary(o
, one
->path
? one
->path
: two
->path
,
3335 &one
->oid
, &two
->oid
,
3336 two
->dirty_submodule
);
3338 } else if (o
->submodule_format
== DIFF_SUBMODULE_INLINE_DIFF
&&
3339 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
3340 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
3341 show_submodule_inline_diff(o
, one
->path
? one
->path
: two
->path
,
3342 &one
->oid
, &two
->oid
,
3343 two
->dirty_submodule
);
3347 if (o
->flags
.allow_textconv
) {
3348 textconv_one
= get_textconv(one
);
3349 textconv_two
= get_textconv(two
);
3352 /* Never use a non-valid filename anywhere if at all possible */
3353 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
3354 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
3356 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
3357 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
3358 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
3359 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
3360 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, meta
, a_one
, b_two
, reset
);
3361 if (lbl
[0][0] == '/') {
3363 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
3365 strbuf_addstr(&header
, xfrm_msg
);
3366 must_show_header
= 1;
3368 else if (lbl
[1][0] == '/') {
3369 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
3371 strbuf_addstr(&header
, xfrm_msg
);
3372 must_show_header
= 1;
3375 if (one
->mode
!= two
->mode
) {
3376 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
3377 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
3378 must_show_header
= 1;
3381 strbuf_addstr(&header
, xfrm_msg
);
3384 * we do not run diff between different kind
3387 if ((one
->mode
^ two
->mode
) & S_IFMT
)
3388 goto free_ab_and_return
;
3389 if (complete_rewrite
&&
3390 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
3391 (textconv_two
|| !diff_filespec_is_binary(two
))) {
3392 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3393 header
.buf
, header
.len
, 0);
3394 strbuf_reset(&header
);
3395 emit_rewrite_diff(name_a
, name_b
, one
, two
,
3396 textconv_one
, textconv_two
, o
);
3397 o
->found_changes
= 1;
3398 goto free_ab_and_return
;
3402 if (o
->irreversible_delete
&& lbl
[1][0] == '/') {
3403 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
, header
.buf
,
3405 strbuf_reset(&header
);
3406 goto free_ab_and_return
;
3407 } else if (!o
->flags
.text
&&
3408 ( (!textconv_one
&& diff_filespec_is_binary(one
)) ||
3409 (!textconv_two
&& diff_filespec_is_binary(two
)) )) {
3410 struct strbuf sb
= STRBUF_INIT
;
3411 if (!one
->data
&& !two
->data
&&
3412 S_ISREG(one
->mode
) && S_ISREG(two
->mode
) &&
3414 if (!oidcmp(&one
->oid
, &two
->oid
)) {
3415 if (must_show_header
)
3416 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3417 header
.buf
, header
.len
,
3419 goto free_ab_and_return
;
3421 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3422 header
.buf
, header
.len
, 0);
3423 strbuf_addf(&sb
, "%sBinary files %s and %s differ\n",
3424 diff_line_prefix(o
), lbl
[0], lbl
[1]);
3425 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_FILES
,
3427 strbuf_release(&sb
);
3428 goto free_ab_and_return
;
3430 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
3431 die("unable to read files to diff");
3432 /* Quite common confusing case */
3433 if (mf1
.size
== mf2
.size
&&
3434 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
3435 if (must_show_header
)
3436 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3437 header
.buf
, header
.len
, 0);
3438 goto free_ab_and_return
;
3440 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
, header
.buf
, header
.len
, 0);
3441 strbuf_reset(&header
);
3442 if (o
->flags
.binary
)
3443 emit_binary_diff(o
, &mf1
, &mf2
);
3445 strbuf_addf(&sb
, "%sBinary files %s and %s differ\n",
3446 diff_line_prefix(o
), lbl
[0], lbl
[1]);
3447 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_FILES
,
3449 strbuf_release(&sb
);
3451 o
->found_changes
= 1;
3453 /* Crazy xdl interfaces.. */
3454 const char *diffopts
= getenv("GIT_DIFF_OPTS");
3458 struct emit_callback ecbdata
;
3459 const struct userdiff_funcname
*pe
;
3461 if (must_show_header
) {
3462 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3463 header
.buf
, header
.len
, 0);
3464 strbuf_reset(&header
);
3467 mf1
.size
= fill_textconv(textconv_one
, one
, &mf1
.ptr
);
3468 mf2
.size
= fill_textconv(textconv_two
, two
, &mf2
.ptr
);
3470 pe
= diff_funcname_pattern(one
);
3472 pe
= diff_funcname_pattern(two
);
3474 memset(&xpp
, 0, sizeof(xpp
));
3475 memset(&xecfg
, 0, sizeof(xecfg
));
3476 memset(&ecbdata
, 0, sizeof(ecbdata
));
3477 if (o
->flags
.suppress_diff_headers
)
3479 ecbdata
.label_path
= lbl
;
3480 ecbdata
.color_diff
= want_color(o
->use_color
);
3481 ecbdata
.ws_rule
= whitespace_rule(name_b
);
3482 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
3483 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
3485 if (header
.len
&& !o
->flags
.suppress_diff_headers
)
3486 ecbdata
.header
= &header
;
3487 xpp
.flags
= o
->xdl_opts
;
3488 xpp
.anchors
= o
->anchors
;
3489 xpp
.anchors_nr
= o
->anchors_nr
;
3490 xecfg
.ctxlen
= o
->context
;
3491 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
3492 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3493 if (o
->flags
.funccontext
)
3494 xecfg
.flags
|= XDL_EMIT_FUNCCONTEXT
;
3496 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
3499 else if (skip_prefix(diffopts
, "--unified=", &v
))
3500 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
3501 else if (skip_prefix(diffopts
, "-u", &v
))
3502 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
3504 init_diff_words_data(&ecbdata
, o
, one
, two
);
3505 if (xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
3507 die("unable to generate diff for %s", one
->path
);
3509 free_diff_words_data(&ecbdata
);
3514 xdiff_clear_find_func(&xecfg
);
3518 strbuf_release(&header
);
3519 diff_free_filespec_data(one
);
3520 diff_free_filespec_data(two
);
3526 static char *get_compact_summary(const struct diff_filepair
*p
, int is_renamed
)
3529 if (p
->status
== DIFF_STATUS_ADDED
) {
3530 if (S_ISLNK(p
->two
->mode
))
3532 else if ((p
->two
->mode
& 0777) == 0755)
3536 } else if (p
->status
== DIFF_STATUS_DELETED
)
3539 if (S_ISLNK(p
->one
->mode
) && !S_ISLNK(p
->two
->mode
))
3541 else if (!S_ISLNK(p
->one
->mode
) && S_ISLNK(p
->two
->mode
))
3543 else if ((p
->one
->mode
& 0777) == 0644 &&
3544 (p
->two
->mode
& 0777) == 0755)
3546 else if ((p
->one
->mode
& 0777) == 0755 &&
3547 (p
->two
->mode
& 0777) == 0644)
3552 static void builtin_diffstat(const char *name_a
, const char *name_b
,
3553 struct diff_filespec
*one
,
3554 struct diff_filespec
*two
,
3555 struct diffstat_t
*diffstat
,
3556 struct diff_options
*o
,
3557 struct diff_filepair
*p
)
3560 struct diffstat_file
*data
;
3562 int complete_rewrite
= 0;
3564 if (!DIFF_PAIR_UNMERGED(p
)) {
3565 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
3566 complete_rewrite
= 1;
3569 data
= diffstat_add(diffstat
, name_a
, name_b
);
3570 data
->is_interesting
= p
->status
!= DIFF_STATUS_UNKNOWN
;
3571 if (o
->flags
.stat_with_summary
)
3572 data
->comments
= get_compact_summary(p
, data
->is_renamed
);
3575 data
->is_unmerged
= 1;
3579 same_contents
= !oidcmp(&one
->oid
, &two
->oid
);
3581 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
3582 data
->is_binary
= 1;
3583 if (same_contents
) {
3587 data
->added
= diff_filespec_size(two
);
3588 data
->deleted
= diff_filespec_size(one
);
3592 else if (complete_rewrite
) {
3593 diff_populate_filespec(one
, 0);
3594 diff_populate_filespec(two
, 0);
3595 data
->deleted
= count_lines(one
->data
, one
->size
);
3596 data
->added
= count_lines(two
->data
, two
->size
);
3599 else if (!same_contents
) {
3600 /* Crazy xdl interfaces.. */
3604 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
3605 die("unable to read files to diff");
3607 memset(&xpp
, 0, sizeof(xpp
));
3608 memset(&xecfg
, 0, sizeof(xecfg
));
3609 xpp
.flags
= o
->xdl_opts
;
3610 xpp
.anchors
= o
->anchors
;
3611 xpp
.anchors_nr
= o
->anchors_nr
;
3612 xecfg
.ctxlen
= o
->context
;
3613 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
3614 if (xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
3616 die("unable to generate diffstat for %s", one
->path
);
3619 diff_free_filespec_data(one
);
3620 diff_free_filespec_data(two
);
3623 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
3624 const char *attr_path
,
3625 struct diff_filespec
*one
,
3626 struct diff_filespec
*two
,
3627 struct diff_options
*o
)
3630 struct checkdiff_t data
;
3635 memset(&data
, 0, sizeof(data
));
3636 data
.filename
= name_b
? name_b
: name_a
;
3639 data
.ws_rule
= whitespace_rule(attr_path
);
3640 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
3642 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
3643 die("unable to read files to diff");
3646 * All the other codepaths check both sides, but not checking
3647 * the "old" side here is deliberate. We are checking the newly
3648 * introduced changes, and as long as the "new" side is text, we
3649 * can and should check what it introduces.
3651 if (diff_filespec_is_binary(two
))
3652 goto free_and_return
;
3654 /* Crazy xdl interfaces.. */
3658 memset(&xpp
, 0, sizeof(xpp
));
3659 memset(&xecfg
, 0, sizeof(xecfg
));
3660 xecfg
.ctxlen
= 1; /* at least one context line */
3662 if (xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
3664 die("unable to generate checkdiff for %s", one
->path
);
3666 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
3667 struct emit_callback ecbdata
;
3670 ecbdata
.ws_rule
= data
.ws_rule
;
3671 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
3672 blank_at_eof
= ecbdata
.blank_at_eof_in_postimage
;
3677 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
3678 fprintf(o
->file
, "%s:%d: %s.\n",
3679 data
.filename
, blank_at_eof
, err
);
3680 data
.status
= 1; /* report errors */
3685 diff_free_filespec_data(one
);
3686 diff_free_filespec_data(two
);
3688 o
->flags
.check_failed
= 1;
3691 struct diff_filespec
*alloc_filespec(const char *path
)
3693 struct diff_filespec
*spec
;
3695 FLEXPTR_ALLOC_STR(spec
, path
, path
);
3697 spec
->is_binary
= -1;
3701 void free_filespec(struct diff_filespec
*spec
)
3703 if (!--spec
->count
) {
3704 diff_free_filespec_data(spec
);
3709 void fill_filespec(struct diff_filespec
*spec
, const struct object_id
*oid
,
3710 int oid_valid
, unsigned short mode
)
3713 spec
->mode
= canon_mode(mode
);
3714 oidcpy(&spec
->oid
, oid
);
3715 spec
->oid_valid
= oid_valid
;
3720 * Given a name and sha1 pair, if the index tells us the file in
3721 * the work tree has that object contents, return true, so that
3722 * prepare_temp_file() does not have to inflate and extract.
3724 static int reuse_worktree_file(const char *name
, const struct object_id
*oid
, int want_file
)
3726 const struct cache_entry
*ce
;
3731 * We do not read the cache ourselves here, because the
3732 * benchmark with my previous version that always reads cache
3733 * shows that it makes things worse for diff-tree comparing
3734 * two linux-2.6 kernel trees in an already checked out work
3735 * tree. This is because most diff-tree comparisons deal with
3736 * only a small number of files, while reading the cache is
3737 * expensive for a large project, and its cost outweighs the
3738 * savings we get by not inflating the object to a temporary
3739 * file. Practically, this code only helps when we are used
3740 * by diff-cache --cached, which does read the cache before
3746 /* We want to avoid the working directory if our caller
3747 * doesn't need the data in a normal file, this system
3748 * is rather slow with its stat/open/mmap/close syscalls,
3749 * and the object is contained in a pack file. The pack
3750 * is probably already open and will be faster to obtain
3751 * the data through than the working directory. Loose
3752 * objects however would tend to be slower as they need
3753 * to be individually opened and inflated.
3755 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_object_pack(oid
))
3759 * Similarly, if we'd have to convert the file contents anyway, that
3760 * makes the optimization not worthwhile.
3762 if (!want_file
&& would_convert_to_git(&the_index
, name
))
3766 pos
= cache_name_pos(name
, len
);
3769 ce
= active_cache
[pos
];
3772 * This is not the sha1 we are looking for, or
3773 * unreusable because it is not a regular file.
3775 if (oidcmp(oid
, &ce
->oid
) || !S_ISREG(ce
->ce_mode
))
3779 * If ce is marked as "assume unchanged", there is no
3780 * guarantee that work tree matches what we are looking for.
3782 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
3786 * If ce matches the file in the work tree, we can reuse it.
3788 if (ce_uptodate(ce
) ||
3789 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
3795 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
3797 struct strbuf buf
= STRBUF_INIT
;
3800 /* Are we looking at the work tree? */
3801 if (s
->dirty_submodule
)
3804 strbuf_addf(&buf
, "Subproject commit %s%s\n",
3805 oid_to_hex(&s
->oid
), dirty
);
3809 strbuf_release(&buf
);
3811 s
->data
= strbuf_detach(&buf
, NULL
);
3818 * While doing rename detection and pickaxe operation, we may need to
3819 * grab the data for the blob (or file) for our own in-core comparison.
3820 * diff_filespec has data and size fields for this purpose.
3822 int diff_populate_filespec(struct diff_filespec
*s
, unsigned int flags
)
3824 int size_only
= flags
& CHECK_SIZE_ONLY
;
3826 int conv_flags
= global_conv_flags_eol
;
3828 * demote FAIL to WARN to allow inspecting the situation
3829 * instead of refusing.
3831 if (conv_flags
& CONV_EOL_RNDTRP_DIE
)
3832 conv_flags
= CONV_EOL_RNDTRP_WARN
;
3834 if (!DIFF_FILE_VALID(s
))
3835 die("internal error: asking to populate invalid file.");
3836 if (S_ISDIR(s
->mode
))
3842 if (size_only
&& 0 < s
->size
)
3845 if (S_ISGITLINK(s
->mode
))
3846 return diff_populate_gitlink(s
, size_only
);
3848 if (!s
->oid_valid
||
3849 reuse_worktree_file(s
->path
, &s
->oid
, 0)) {
3850 struct strbuf buf
= STRBUF_INIT
;
3854 if (lstat(s
->path
, &st
) < 0) {
3858 s
->data
= (char *)"";
3862 s
->size
= xsize_t(st
.st_size
);
3865 if (S_ISLNK(st
.st_mode
)) {
3866 struct strbuf sb
= STRBUF_INIT
;
3868 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
3871 s
->data
= strbuf_detach(&sb
, NULL
);
3877 * Even if the caller would be happy with getting
3878 * only the size, we cannot return early at this
3879 * point if the path requires us to run the content
3882 if (size_only
&& !would_convert_to_git(&the_index
, s
->path
))
3886 * Note: this check uses xsize_t(st.st_size) that may
3887 * not be the true size of the blob after it goes
3888 * through convert_to_git(). This may not strictly be
3889 * correct, but the whole point of big_file_threshold
3890 * and is_binary check being that we want to avoid
3891 * opening the file and inspecting the contents, this
3894 if ((flags
& CHECK_BINARY
) &&
3895 s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
3899 fd
= open(s
->path
, O_RDONLY
);
3902 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
3904 s
->should_munmap
= 1;
3907 * Convert from working tree format to canonical git format
3909 if (convert_to_git(&the_index
, s
->path
, s
->data
, s
->size
, &buf
, conv_flags
)) {
3911 munmap(s
->data
, s
->size
);
3912 s
->should_munmap
= 0;
3913 s
->data
= strbuf_detach(&buf
, &size
);
3919 enum object_type type
;
3920 if (size_only
|| (flags
& CHECK_BINARY
)) {
3921 type
= oid_object_info(the_repository
, &s
->oid
,
3924 die("unable to read %s",
3925 oid_to_hex(&s
->oid
));
3928 if (s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
3933 s
->data
= read_object_file(&s
->oid
, &type
, &s
->size
);
3935 die("unable to read %s", oid_to_hex(&s
->oid
));
3941 void diff_free_filespec_blob(struct diff_filespec
*s
)
3945 else if (s
->should_munmap
)
3946 munmap(s
->data
, s
->size
);
3948 if (s
->should_free
|| s
->should_munmap
) {
3949 s
->should_free
= s
->should_munmap
= 0;
3954 void diff_free_filespec_data(struct diff_filespec
*s
)
3956 diff_free_filespec_blob(s
);
3957 FREE_AND_NULL(s
->cnt_data
);
3960 static void prep_temp_blob(const char *path
, struct diff_tempfile
*temp
,
3963 const struct object_id
*oid
,
3966 struct strbuf buf
= STRBUF_INIT
;
3967 struct strbuf tempfile
= STRBUF_INIT
;
3968 char *path_dup
= xstrdup(path
);
3969 const char *base
= basename(path_dup
);
3971 /* Generate "XXXXXX_basename.ext" */
3972 strbuf_addstr(&tempfile
, "XXXXXX_");
3973 strbuf_addstr(&tempfile
, base
);
3975 temp
->tempfile
= mks_tempfile_ts(tempfile
.buf
, strlen(base
) + 1);
3976 if (!temp
->tempfile
)
3977 die_errno("unable to create temp-file");
3978 if (convert_to_working_tree(path
,
3979 (const char *)blob
, (size_t)size
, &buf
)) {
3983 if (write_in_full(temp
->tempfile
->fd
, blob
, size
) < 0 ||
3984 close_tempfile_gently(temp
->tempfile
))
3985 die_errno("unable to write temp-file");
3986 temp
->name
= get_tempfile_path(temp
->tempfile
);
3987 oid_to_hex_r(temp
->hex
, oid
);
3988 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", mode
);
3989 strbuf_release(&buf
);
3990 strbuf_release(&tempfile
);
3994 static struct diff_tempfile
*prepare_temp_file(const char *name
,
3995 struct diff_filespec
*one
)
3997 struct diff_tempfile
*temp
= claim_diff_tempfile();
3999 if (!DIFF_FILE_VALID(one
)) {
4001 /* A '-' entry produces this for file-2, and
4002 * a '+' entry produces this for file-1.
4004 temp
->name
= "/dev/null";
4005 xsnprintf(temp
->hex
, sizeof(temp
->hex
), ".");
4006 xsnprintf(temp
->mode
, sizeof(temp
->mode
), ".");
4010 if (!S_ISGITLINK(one
->mode
) &&
4012 reuse_worktree_file(name
, &one
->oid
, 1))) {
4014 if (lstat(name
, &st
) < 0) {
4015 if (errno
== ENOENT
)
4016 goto not_a_valid_file
;
4017 die_errno("stat(%s)", name
);
4019 if (S_ISLNK(st
.st_mode
)) {
4020 struct strbuf sb
= STRBUF_INIT
;
4021 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
4022 die_errno("readlink(%s)", name
);
4023 prep_temp_blob(name
, temp
, sb
.buf
, sb
.len
,
4025 &one
->oid
: &null_oid
),
4027 one
->mode
: S_IFLNK
));
4028 strbuf_release(&sb
);
4031 /* we can borrow from the file in the work tree */
4033 if (!one
->oid_valid
)
4034 oid_to_hex_r(temp
->hex
, &null_oid
);
4036 oid_to_hex_r(temp
->hex
, &one
->oid
);
4037 /* Even though we may sometimes borrow the
4038 * contents from the work tree, we always want
4039 * one->mode. mode is trustworthy even when
4040 * !(one->oid_valid), as long as
4041 * DIFF_FILE_VALID(one).
4043 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", one
->mode
);
4048 if (diff_populate_filespec(one
, 0))
4049 die("cannot read data blob for %s", one
->path
);
4050 prep_temp_blob(name
, temp
, one
->data
, one
->size
,
4051 &one
->oid
, one
->mode
);
4056 static void add_external_diff_name(struct argv_array
*argv
,
4058 struct diff_filespec
*df
)
4060 struct diff_tempfile
*temp
= prepare_temp_file(name
, df
);
4061 argv_array_push(argv
, temp
->name
);
4062 argv_array_push(argv
, temp
->hex
);
4063 argv_array_push(argv
, temp
->mode
);
4066 /* An external diff command takes:
4068 * diff-cmd name infile1 infile1-sha1 infile1-mode \
4069 * infile2 infile2-sha1 infile2-mode [ rename-to ]
4072 static void run_external_diff(const char *pgm
,
4075 struct diff_filespec
*one
,
4076 struct diff_filespec
*two
,
4077 const char *xfrm_msg
,
4078 int complete_rewrite
,
4079 struct diff_options
*o
)
4081 struct argv_array argv
= ARGV_ARRAY_INIT
;
4082 struct argv_array env
= ARGV_ARRAY_INIT
;
4083 struct diff_queue_struct
*q
= &diff_queued_diff
;
4085 argv_array_push(&argv
, pgm
);
4086 argv_array_push(&argv
, name
);
4089 add_external_diff_name(&argv
, name
, one
);
4091 add_external_diff_name(&argv
, name
, two
);
4093 add_external_diff_name(&argv
, other
, two
);
4094 argv_array_push(&argv
, other
);
4095 argv_array_push(&argv
, xfrm_msg
);
4099 argv_array_pushf(&env
, "GIT_DIFF_PATH_COUNTER=%d", ++o
->diff_path_counter
);
4100 argv_array_pushf(&env
, "GIT_DIFF_PATH_TOTAL=%d", q
->nr
);
4102 if (run_command_v_opt_cd_env(argv
.argv
, RUN_USING_SHELL
, NULL
, env
.argv
))
4103 die(_("external diff died, stopping at %s"), name
);
4106 argv_array_clear(&argv
);
4107 argv_array_clear(&env
);
4110 static int similarity_index(struct diff_filepair
*p
)
4112 return p
->score
* 100 / MAX_SCORE
;
4115 static const char *diff_abbrev_oid(const struct object_id
*oid
, int abbrev
)
4117 if (startup_info
->have_repository
)
4118 return find_unique_abbrev(oid
, abbrev
);
4120 char *hex
= oid_to_hex(oid
);
4122 abbrev
= FALLBACK_DEFAULT_ABBREV
;
4123 if (abbrev
> the_hash_algo
->hexsz
)
4124 BUG("oid abbreviation out of range: %d", abbrev
);
4131 static void fill_metainfo(struct strbuf
*msg
,
4134 struct diff_filespec
*one
,
4135 struct diff_filespec
*two
,
4136 struct diff_options
*o
,
4137 struct diff_filepair
*p
,
4138 int *must_show_header
,
4141 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
4142 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
4143 const char *line_prefix
= diff_line_prefix(o
);
4145 *must_show_header
= 1;
4146 strbuf_init(msg
, PATH_MAX
* 2 + 300);
4147 switch (p
->status
) {
4148 case DIFF_STATUS_COPIED
:
4149 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
4150 line_prefix
, set
, similarity_index(p
));
4151 strbuf_addf(msg
, "%s\n%s%scopy from ",
4152 reset
, line_prefix
, set
);
4153 quote_c_style(name
, msg
, NULL
, 0);
4154 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
4155 quote_c_style(other
, msg
, NULL
, 0);
4156 strbuf_addf(msg
, "%s\n", reset
);
4158 case DIFF_STATUS_RENAMED
:
4159 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
4160 line_prefix
, set
, similarity_index(p
));
4161 strbuf_addf(msg
, "%s\n%s%srename from ",
4162 reset
, line_prefix
, set
);
4163 quote_c_style(name
, msg
, NULL
, 0);
4164 strbuf_addf(msg
, "%s\n%s%srename to ",
4165 reset
, line_prefix
, set
);
4166 quote_c_style(other
, msg
, NULL
, 0);
4167 strbuf_addf(msg
, "%s\n", reset
);
4169 case DIFF_STATUS_MODIFIED
:
4171 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
4173 set
, similarity_index(p
), reset
);
4178 *must_show_header
= 0;
4180 if (one
&& two
&& oidcmp(&one
->oid
, &two
->oid
)) {
4181 const unsigned hexsz
= the_hash_algo
->hexsz
;
4182 int abbrev
= o
->flags
.full_index
? hexsz
: DEFAULT_ABBREV
;
4184 if (o
->flags
.binary
) {
4186 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
4187 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
4190 strbuf_addf(msg
, "%s%sindex %s..%s", line_prefix
, set
,
4191 diff_abbrev_oid(&one
->oid
, abbrev
),
4192 diff_abbrev_oid(&two
->oid
, abbrev
));
4193 if (one
->mode
== two
->mode
)
4194 strbuf_addf(msg
, " %06o", one
->mode
);
4195 strbuf_addf(msg
, "%s\n", reset
);
4199 static void run_diff_cmd(const char *pgm
,
4202 const char *attr_path
,
4203 struct diff_filespec
*one
,
4204 struct diff_filespec
*two
,
4206 struct diff_options
*o
,
4207 struct diff_filepair
*p
)
4209 const char *xfrm_msg
= NULL
;
4210 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
4211 int must_show_header
= 0;
4214 if (o
->flags
.allow_external
) {
4215 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
4216 if (drv
&& drv
->external
)
4217 pgm
= drv
->external
;
4222 * don't use colors when the header is intended for an
4223 * external diff driver
4225 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
4227 want_color(o
->use_color
) && !pgm
);
4228 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
4232 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
4233 complete_rewrite
, o
);
4237 builtin_diff(name
, other
? other
: name
,
4238 one
, two
, xfrm_msg
, must_show_header
,
4239 o
, complete_rewrite
);
4241 fprintf(o
->file
, "* Unmerged path %s\n", name
);
4244 static void diff_fill_oid_info(struct diff_filespec
*one
)
4246 if (DIFF_FILE_VALID(one
)) {
4247 if (!one
->oid_valid
) {
4249 if (one
->is_stdin
) {
4253 if (lstat(one
->path
, &st
) < 0)
4254 die_errno("stat '%s'", one
->path
);
4255 if (index_path(&one
->oid
, one
->path
, &st
, 0))
4256 die("cannot hash %s", one
->path
);
4263 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
4265 /* Strip the prefix but do not molest /dev/null and absolute paths */
4266 if (*namep
&& **namep
!= '/') {
4267 *namep
+= prefix_length
;
4271 if (*otherp
&& **otherp
!= '/') {
4272 *otherp
+= prefix_length
;
4273 if (**otherp
== '/')
4278 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
4280 const char *pgm
= external_diff();
4282 struct diff_filespec
*one
= p
->one
;
4283 struct diff_filespec
*two
= p
->two
;
4286 const char *attr_path
;
4289 other
= (strcmp(name
, two
->path
) ? two
->path
: NULL
);
4291 if (o
->prefix_length
)
4292 strip_prefix(o
->prefix_length
, &name
, &other
);
4294 if (!o
->flags
.allow_external
)
4297 if (DIFF_PAIR_UNMERGED(p
)) {
4298 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
4299 NULL
, NULL
, NULL
, o
, p
);
4303 diff_fill_oid_info(one
);
4304 diff_fill_oid_info(two
);
4307 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
4308 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
4310 * a filepair that changes between file and symlink
4311 * needs to be split into deletion and creation.
4313 struct diff_filespec
*null
= alloc_filespec(two
->path
);
4314 run_diff_cmd(NULL
, name
, other
, attr_path
,
4315 one
, null
, &msg
, o
, p
);
4317 strbuf_release(&msg
);
4319 null
= alloc_filespec(one
->path
);
4320 run_diff_cmd(NULL
, name
, other
, attr_path
,
4321 null
, two
, &msg
, o
, p
);
4325 run_diff_cmd(pgm
, name
, other
, attr_path
,
4326 one
, two
, &msg
, o
, p
);
4328 strbuf_release(&msg
);
4331 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
4332 struct diffstat_t
*diffstat
)
4337 if (DIFF_PAIR_UNMERGED(p
)) {
4339 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, p
);
4343 name
= p
->one
->path
;
4344 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
4346 if (o
->prefix_length
)
4347 strip_prefix(o
->prefix_length
, &name
, &other
);
4349 diff_fill_oid_info(p
->one
);
4350 diff_fill_oid_info(p
->two
);
4352 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, p
);
4355 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
4359 const char *attr_path
;
4361 if (DIFF_PAIR_UNMERGED(p
)) {
4366 name
= p
->one
->path
;
4367 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
4368 attr_path
= other
? other
: name
;
4370 if (o
->prefix_length
)
4371 strip_prefix(o
->prefix_length
, &name
, &other
);
4373 diff_fill_oid_info(p
->one
);
4374 diff_fill_oid_info(p
->two
);
4376 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
4379 void diff_setup(struct diff_options
*options
)
4381 memcpy(options
, &default_diff_options
, sizeof(*options
));
4383 options
->file
= stdout
;
4385 options
->abbrev
= DEFAULT_ABBREV
;
4386 options
->line_termination
= '\n';
4387 options
->break_opt
= -1;
4388 options
->rename_limit
= -1;
4389 options
->dirstat_permille
= diff_dirstat_permille_default
;
4390 options
->context
= diff_context_default
;
4391 options
->interhunkcontext
= diff_interhunk_context_default
;
4392 options
->ws_error_highlight
= ws_error_highlight_default
;
4393 options
->flags
.rename_empty
= 1;
4394 options
->objfind
= NULL
;
4396 /* pathchange left =NULL by default */
4397 options
->change
= diff_change
;
4398 options
->add_remove
= diff_addremove
;
4399 options
->use_color
= diff_use_color_default
;
4400 options
->detect_rename
= diff_detect_rename_default
;
4401 options
->xdl_opts
|= diff_algorithm
;
4402 if (diff_indent_heuristic
)
4403 DIFF_XDL_SET(options
, INDENT_HEURISTIC
);
4405 options
->orderfile
= diff_order_file_cfg
;
4407 if (diff_no_prefix
) {
4408 options
->a_prefix
= options
->b_prefix
= "";
4409 } else if (!diff_mnemonic_prefix
) {
4410 options
->a_prefix
= "a/";
4411 options
->b_prefix
= "b/";
4414 options
->color_moved
= diff_color_moved_default
;
4415 options
->color_moved_ws_handling
= diff_color_moved_ws_default
;
4418 void diff_setup_done(struct diff_options
*options
)
4420 unsigned check_mask
= DIFF_FORMAT_NAME
|
4421 DIFF_FORMAT_NAME_STATUS
|
4422 DIFF_FORMAT_CHECKDIFF
|
4423 DIFF_FORMAT_NO_OUTPUT
;
4425 * This must be signed because we're comparing against a potentially
4428 const int hexsz
= the_hash_algo
->hexsz
;
4430 if (options
->set_default
)
4431 options
->set_default(options
);
4433 if (HAS_MULTI_BITS(options
->output_format
& check_mask
))
4434 die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
4436 if (HAS_MULTI_BITS(options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
))
4437 die(_("-G, -S and --find-object are mutually exclusive"));
4440 * Most of the time we can say "there are changes"
4441 * only by checking if there are changed paths, but
4442 * --ignore-whitespace* options force us to look
4446 if ((options
->xdl_opts
& XDF_WHITESPACE_FLAGS
))
4447 options
->flags
.diff_from_contents
= 1;
4449 options
->flags
.diff_from_contents
= 0;
4451 if (options
->flags
.find_copies_harder
)
4452 options
->detect_rename
= DIFF_DETECT_COPY
;
4454 if (!options
->flags
.relative_name
)
4455 options
->prefix
= NULL
;
4456 if (options
->prefix
)
4457 options
->prefix_length
= strlen(options
->prefix
);
4459 options
->prefix_length
= 0;
4461 if (options
->output_format
& (DIFF_FORMAT_NAME
|
4462 DIFF_FORMAT_NAME_STATUS
|
4463 DIFF_FORMAT_CHECKDIFF
|
4464 DIFF_FORMAT_NO_OUTPUT
))
4465 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
4466 DIFF_FORMAT_NUMSTAT
|
4467 DIFF_FORMAT_DIFFSTAT
|
4468 DIFF_FORMAT_SHORTSTAT
|
4469 DIFF_FORMAT_DIRSTAT
|
4470 DIFF_FORMAT_SUMMARY
|
4474 * These cases always need recursive; we do not drop caller-supplied
4475 * recursive bits for other formats here.
4477 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
4478 DIFF_FORMAT_NUMSTAT
|
4479 DIFF_FORMAT_DIFFSTAT
|
4480 DIFF_FORMAT_SHORTSTAT
|
4481 DIFF_FORMAT_DIRSTAT
|
4482 DIFF_FORMAT_SUMMARY
|
4483 DIFF_FORMAT_CHECKDIFF
))
4484 options
->flags
.recursive
= 1;
4486 * Also pickaxe would not work very well if you do not say recursive
4488 if (options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
)
4489 options
->flags
.recursive
= 1;
4491 * When patches are generated, submodules diffed against the work tree
4492 * must be checked for dirtiness too so it can be shown in the output
4494 if (options
->output_format
& DIFF_FORMAT_PATCH
)
4495 options
->flags
.dirty_submodules
= 1;
4497 if (options
->detect_rename
&& options
->rename_limit
< 0)
4498 options
->rename_limit
= diff_rename_limit_default
;
4499 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
4501 /* read-cache does not die even when it fails
4502 * so it is safe for us to do this here. Also
4503 * it does not smudge active_cache or active_nr
4504 * when it fails, so we do not have to worry about
4505 * cleaning it up ourselves either.
4509 if (hexsz
< options
->abbrev
)
4510 options
->abbrev
= hexsz
; /* full */
4513 * It does not make sense to show the first hit we happened
4514 * to have found. It does not make sense not to return with
4515 * exit code in such a case either.
4517 if (options
->flags
.quick
) {
4518 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
4519 options
->flags
.exit_with_status
= 1;
4522 options
->diff_path_counter
= 0;
4524 if (options
->flags
.follow_renames
&& options
->pathspec
.nr
!= 1)
4525 die(_("--follow requires exactly one pathspec"));
4527 if (!options
->use_color
|| external_diff())
4528 options
->color_moved
= 0;
4531 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
4541 if (c
== arg_short
) {
4545 if (val
&& isdigit(c
)) {
4547 int n
= strtoul(arg
, &end
, 10);
4558 eq
= strchrnul(arg
, '=');
4560 if (!len
|| strncmp(arg
, arg_long
, len
))
4565 if (!isdigit(*++eq
))
4567 n
= strtoul(eq
, &end
, 10);
4575 static int diff_scoreopt_parse(const char *opt
);
4577 static inline int short_opt(char opt
, const char **argv
,
4578 const char **optarg
)
4580 const char *arg
= argv
[0];
4581 if (arg
[0] != '-' || arg
[1] != opt
)
4583 if (arg
[2] != '\0') {
4588 die("Option '%c' requires a value", opt
);
4593 int parse_long_opt(const char *opt
, const char **argv
,
4594 const char **optarg
)
4596 const char *arg
= argv
[0];
4597 if (!skip_prefix(arg
, "--", &arg
))
4599 if (!skip_prefix(arg
, opt
, &arg
))
4601 if (*arg
== '=') { /* stuck form: --option=value */
4607 /* separate form: --option value */
4609 die("Option '--%s' requires a value", opt
);
4614 static int stat_opt(struct diff_options
*options
, const char **av
)
4616 const char *arg
= av
[0];
4618 int width
= options
->stat_width
;
4619 int name_width
= options
->stat_name_width
;
4620 int graph_width
= options
->stat_graph_width
;
4621 int count
= options
->stat_count
;
4624 if (!skip_prefix(arg
, "--stat", &arg
))
4625 BUG("stat option does not begin with --stat: %s", arg
);
4630 if (skip_prefix(arg
, "-width", &arg
)) {
4632 width
= strtoul(arg
+ 1, &end
, 10);
4633 else if (!*arg
&& !av
[1])
4634 die_want_option("--stat-width");
4636 width
= strtoul(av
[1], &end
, 10);
4639 } else if (skip_prefix(arg
, "-name-width", &arg
)) {
4641 name_width
= strtoul(arg
+ 1, &end
, 10);
4642 else if (!*arg
&& !av
[1])
4643 die_want_option("--stat-name-width");
4645 name_width
= strtoul(av
[1], &end
, 10);
4648 } else if (skip_prefix(arg
, "-graph-width", &arg
)) {
4650 graph_width
= strtoul(arg
+ 1, &end
, 10);
4651 else if (!*arg
&& !av
[1])
4652 die_want_option("--stat-graph-width");
4654 graph_width
= strtoul(av
[1], &end
, 10);
4657 } else if (skip_prefix(arg
, "-count", &arg
)) {
4659 count
= strtoul(arg
+ 1, &end
, 10);
4660 else if (!*arg
&& !av
[1])
4661 die_want_option("--stat-count");
4663 count
= strtoul(av
[1], &end
, 10);
4669 width
= strtoul(arg
+1, &end
, 10);
4671 name_width
= strtoul(end
+1, &end
, 10);
4673 count
= strtoul(end
+1, &end
, 10);
4676 /* Important! This checks all the error cases! */
4679 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4680 options
->stat_name_width
= name_width
;
4681 options
->stat_graph_width
= graph_width
;
4682 options
->stat_width
= width
;
4683 options
->stat_count
= count
;
4687 static int parse_dirstat_opt(struct diff_options
*options
, const char *params
)
4689 struct strbuf errmsg
= STRBUF_INIT
;
4690 if (parse_dirstat_params(options
, params
, &errmsg
))
4691 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
4693 strbuf_release(&errmsg
);
4695 * The caller knows a dirstat-related option is given from the command
4696 * line; allow it to say "return this_function();"
4698 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
4702 static int parse_submodule_opt(struct diff_options
*options
, const char *value
)
4704 if (parse_submodule_params(options
, value
))
4705 die(_("Failed to parse --submodule option parameter: '%s'"),
4710 static const char diff_status_letters
[] = {
4713 DIFF_STATUS_DELETED
,
4714 DIFF_STATUS_MODIFIED
,
4715 DIFF_STATUS_RENAMED
,
4716 DIFF_STATUS_TYPE_CHANGED
,
4717 DIFF_STATUS_UNKNOWN
,
4718 DIFF_STATUS_UNMERGED
,
4719 DIFF_STATUS_FILTER_AON
,
4720 DIFF_STATUS_FILTER_BROKEN
,
4724 static unsigned int filter_bit
['Z' + 1];
4726 static void prepare_filter_bits(void)
4730 if (!filter_bit
[DIFF_STATUS_ADDED
]) {
4731 for (i
= 0; diff_status_letters
[i
]; i
++)
4732 filter_bit
[(int) diff_status_letters
[i
]] = (1 << i
);
4736 static unsigned filter_bit_tst(char status
, const struct diff_options
*opt
)
4738 return opt
->filter
& filter_bit
[(int) status
];
4741 static int parse_diff_filter_opt(const char *optarg
, struct diff_options
*opt
)
4745 prepare_filter_bits();
4748 * If there is a negation e.g. 'd' in the input, and we haven't
4749 * initialized the filter field with another --diff-filter, start
4750 * from full set of bits, except for AON.
4753 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
4754 if (optch
< 'a' || 'z' < optch
)
4756 opt
->filter
= (1 << (ARRAY_SIZE(diff_status_letters
) - 1)) - 1;
4757 opt
->filter
&= ~filter_bit
[DIFF_STATUS_FILTER_AON
];
4762 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
4766 if ('a' <= optch
&& optch
<= 'z') {
4768 optch
= toupper(optch
);
4773 bit
= (0 <= optch
&& optch
<= 'Z') ? filter_bit
[optch
] : 0;
4777 opt
->filter
&= ~bit
;
4784 static void enable_patch_output(int *fmt
) {
4785 *fmt
&= ~DIFF_FORMAT_NO_OUTPUT
;
4786 *fmt
|= DIFF_FORMAT_PATCH
;
4789 static int parse_ws_error_highlight_opt(struct diff_options
*opt
, const char *arg
)
4791 int val
= parse_ws_error_highlight(arg
);
4794 error("unknown value after ws-error-highlight=%.*s",
4798 opt
->ws_error_highlight
= val
;
4802 static int parse_objfind_opt(struct diff_options
*opt
, const char *arg
)
4804 struct object_id oid
;
4806 if (get_oid(arg
, &oid
))
4807 return error("unable to resolve '%s'", arg
);
4810 opt
->objfind
= xcalloc(1, sizeof(*opt
->objfind
));
4812 opt
->pickaxe_opts
|= DIFF_PICKAXE_KIND_OBJFIND
;
4813 opt
->flags
.recursive
= 1;
4814 opt
->flags
.tree_in_recursive
= 1;
4815 oidset_insert(opt
->objfind
, &oid
);
4819 int diff_opt_parse(struct diff_options
*options
,
4820 const char **av
, int ac
, const char *prefix
)
4822 const char *arg
= av
[0];
4829 /* Output format options */
4830 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch")
4831 || opt_arg(arg
, 'U', "unified", &options
->context
))
4832 enable_patch_output(&options
->output_format
);
4833 else if (!strcmp(arg
, "--raw"))
4834 options
->output_format
|= DIFF_FORMAT_RAW
;
4835 else if (!strcmp(arg
, "--patch-with-raw")) {
4836 enable_patch_output(&options
->output_format
);
4837 options
->output_format
|= DIFF_FORMAT_RAW
;
4838 } else if (!strcmp(arg
, "--numstat"))
4839 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
4840 else if (!strcmp(arg
, "--shortstat"))
4841 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
4842 else if (skip_prefix(arg
, "-X", &arg
) ||
4843 skip_to_optional_arg(arg
, "--dirstat", &arg
))
4844 return parse_dirstat_opt(options
, arg
);
4845 else if (!strcmp(arg
, "--cumulative"))
4846 return parse_dirstat_opt(options
, "cumulative");
4847 else if (skip_to_optional_arg(arg
, "--dirstat-by-file", &arg
)) {
4848 parse_dirstat_opt(options
, "files");
4849 return parse_dirstat_opt(options
, arg
);
4851 else if (!strcmp(arg
, "--check"))
4852 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
4853 else if (!strcmp(arg
, "--summary"))
4854 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
4855 else if (!strcmp(arg
, "--patch-with-stat")) {
4856 enable_patch_output(&options
->output_format
);
4857 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4858 } else if (!strcmp(arg
, "--name-only"))
4859 options
->output_format
|= DIFF_FORMAT_NAME
;
4860 else if (!strcmp(arg
, "--name-status"))
4861 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
4862 else if (!strcmp(arg
, "-s") || !strcmp(arg
, "--no-patch"))
4863 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
4864 else if (starts_with(arg
, "--stat"))
4865 /* --stat, --stat-width, --stat-name-width, or --stat-count */
4866 return stat_opt(options
, av
);
4867 else if (!strcmp(arg
, "--compact-summary")) {
4868 options
->flags
.stat_with_summary
= 1;
4869 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4870 } else if (!strcmp(arg
, "--no-compact-summary"))
4871 options
->flags
.stat_with_summary
= 0;
4873 /* renames options */
4874 else if (starts_with(arg
, "-B") ||
4875 skip_to_optional_arg(arg
, "--break-rewrites", NULL
)) {
4876 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
4877 return error("invalid argument to -B: %s", arg
+2);
4879 else if (starts_with(arg
, "-M") ||
4880 skip_to_optional_arg(arg
, "--find-renames", NULL
)) {
4881 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
4882 return error("invalid argument to -M: %s", arg
+2);
4883 options
->detect_rename
= DIFF_DETECT_RENAME
;
4885 else if (!strcmp(arg
, "-D") || !strcmp(arg
, "--irreversible-delete")) {
4886 options
->irreversible_delete
= 1;
4888 else if (starts_with(arg
, "-C") ||
4889 skip_to_optional_arg(arg
, "--find-copies", NULL
)) {
4890 if (options
->detect_rename
== DIFF_DETECT_COPY
)
4891 options
->flags
.find_copies_harder
= 1;
4892 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
4893 return error("invalid argument to -C: %s", arg
+2);
4894 options
->detect_rename
= DIFF_DETECT_COPY
;
4896 else if (!strcmp(arg
, "--no-renames"))
4897 options
->detect_rename
= 0;
4898 else if (!strcmp(arg
, "--rename-empty"))
4899 options
->flags
.rename_empty
= 1;
4900 else if (!strcmp(arg
, "--no-rename-empty"))
4901 options
->flags
.rename_empty
= 0;
4902 else if (skip_to_optional_arg_default(arg
, "--relative", &arg
, NULL
)) {
4903 options
->flags
.relative_name
= 1;
4905 options
->prefix
= arg
;
4909 else if (!strcmp(arg
, "--minimal"))
4910 DIFF_XDL_SET(options
, NEED_MINIMAL
);
4911 else if (!strcmp(arg
, "--no-minimal"))
4912 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
4913 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
4914 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
4915 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
4916 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
4917 else if (!strcmp(arg
, "--ignore-space-at-eol"))
4918 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
4919 else if (!strcmp(arg
, "--ignore-cr-at-eol"))
4920 DIFF_XDL_SET(options
, IGNORE_CR_AT_EOL
);
4921 else if (!strcmp(arg
, "--ignore-blank-lines"))
4922 DIFF_XDL_SET(options
, IGNORE_BLANK_LINES
);
4923 else if (!strcmp(arg
, "--indent-heuristic"))
4924 DIFF_XDL_SET(options
, INDENT_HEURISTIC
);
4925 else if (!strcmp(arg
, "--no-indent-heuristic"))
4926 DIFF_XDL_CLR(options
, INDENT_HEURISTIC
);
4927 else if (!strcmp(arg
, "--patience")) {
4929 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
4931 * Both --patience and --anchored use PATIENCE_DIFF
4932 * internally, so remove any anchors previously
4935 for (i
= 0; i
< options
->anchors_nr
; i
++)
4936 free(options
->anchors
[i
]);
4937 options
->anchors_nr
= 0;
4938 } else if (!strcmp(arg
, "--histogram"))
4939 options
->xdl_opts
= DIFF_WITH_ALG(options
, HISTOGRAM_DIFF
);
4940 else if ((argcount
= parse_long_opt("diff-algorithm", av
, &optarg
))) {
4941 long value
= parse_algorithm_value(optarg
);
4943 return error("option diff-algorithm accepts \"myers\", "
4944 "\"minimal\", \"patience\" and \"histogram\"");
4945 /* clear out previous settings */
4946 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
4947 options
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
4948 options
->xdl_opts
|= value
;
4950 } else if (skip_prefix(arg
, "--anchored=", &arg
)) {
4951 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
4952 ALLOC_GROW(options
->anchors
, options
->anchors_nr
+ 1,
4953 options
->anchors_alloc
);
4954 options
->anchors
[options
->anchors_nr
++] = xstrdup(arg
);
4958 else if (!strcmp(arg
, "--binary")) {
4959 enable_patch_output(&options
->output_format
);
4960 options
->flags
.binary
= 1;
4962 else if (!strcmp(arg
, "--full-index"))
4963 options
->flags
.full_index
= 1;
4964 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
4965 options
->flags
.text
= 1;
4966 else if (!strcmp(arg
, "-R"))
4967 options
->flags
.reverse_diff
= 1;
4968 else if (!strcmp(arg
, "--find-copies-harder"))
4969 options
->flags
.find_copies_harder
= 1;
4970 else if (!strcmp(arg
, "--follow"))
4971 options
->flags
.follow_renames
= 1;
4972 else if (!strcmp(arg
, "--no-follow")) {
4973 options
->flags
.follow_renames
= 0;
4974 options
->flags
.default_follow_renames
= 0;
4975 } else if (skip_to_optional_arg_default(arg
, "--color", &arg
, "always")) {
4976 int value
= git_config_colorbool(NULL
, arg
);
4978 return error("option `color' expects \"always\", \"auto\", or \"never\"");
4979 options
->use_color
= value
;
4981 else if (!strcmp(arg
, "--no-color"))
4982 options
->use_color
= 0;
4983 else if (!strcmp(arg
, "--color-moved")) {
4984 if (diff_color_moved_default
)
4985 options
->color_moved
= diff_color_moved_default
;
4986 if (options
->color_moved
== COLOR_MOVED_NO
)
4987 options
->color_moved
= COLOR_MOVED_DEFAULT
;
4988 } else if (!strcmp(arg
, "--no-color-moved"))
4989 options
->color_moved
= COLOR_MOVED_NO
;
4990 else if (skip_prefix(arg
, "--color-moved=", &arg
)) {
4991 int cm
= parse_color_moved(arg
);
4993 die("bad --color-moved argument: %s", arg
);
4994 options
->color_moved
= cm
;
4995 } else if (skip_prefix(arg
, "--color-moved-ws=", &arg
)) {
4996 options
->color_moved_ws_handling
= parse_color_moved_ws(arg
);
4997 } else if (skip_to_optional_arg_default(arg
, "--color-words", &options
->word_regex
, NULL
)) {
4998 options
->use_color
= 1;
4999 options
->word_diff
= DIFF_WORDS_COLOR
;
5001 else if (!strcmp(arg
, "--word-diff")) {
5002 if (options
->word_diff
== DIFF_WORDS_NONE
)
5003 options
->word_diff
= DIFF_WORDS_PLAIN
;
5005 else if (skip_prefix(arg
, "--word-diff=", &arg
)) {
5006 if (!strcmp(arg
, "plain"))
5007 options
->word_diff
= DIFF_WORDS_PLAIN
;
5008 else if (!strcmp(arg
, "color")) {
5009 options
->use_color
= 1;
5010 options
->word_diff
= DIFF_WORDS_COLOR
;
5012 else if (!strcmp(arg
, "porcelain"))
5013 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
5014 else if (!strcmp(arg
, "none"))
5015 options
->word_diff
= DIFF_WORDS_NONE
;
5017 die("bad --word-diff argument: %s", arg
);
5019 else if ((argcount
= parse_long_opt("word-diff-regex", av
, &optarg
))) {
5020 if (options
->word_diff
== DIFF_WORDS_NONE
)
5021 options
->word_diff
= DIFF_WORDS_PLAIN
;
5022 options
->word_regex
= optarg
;
5025 else if (!strcmp(arg
, "--exit-code"))
5026 options
->flags
.exit_with_status
= 1;
5027 else if (!strcmp(arg
, "--quiet"))
5028 options
->flags
.quick
= 1;
5029 else if (!strcmp(arg
, "--ext-diff"))
5030 options
->flags
.allow_external
= 1;
5031 else if (!strcmp(arg
, "--no-ext-diff"))
5032 options
->flags
.allow_external
= 0;
5033 else if (!strcmp(arg
, "--textconv")) {
5034 options
->flags
.allow_textconv
= 1;
5035 options
->flags
.textconv_set_via_cmdline
= 1;
5036 } else if (!strcmp(arg
, "--no-textconv"))
5037 options
->flags
.allow_textconv
= 0;
5038 else if (skip_to_optional_arg_default(arg
, "--ignore-submodules", &arg
, "all")) {
5039 options
->flags
.override_submodule_config
= 1;
5040 handle_ignore_submodules_arg(options
, arg
);
5041 } else if (skip_to_optional_arg_default(arg
, "--submodule", &arg
, "log"))
5042 return parse_submodule_opt(options
, arg
);
5043 else if (skip_prefix(arg
, "--ws-error-highlight=", &arg
))
5044 return parse_ws_error_highlight_opt(options
, arg
);
5045 else if (!strcmp(arg
, "--ita-invisible-in-index"))
5046 options
->ita_invisible_in_index
= 1;
5047 else if (!strcmp(arg
, "--ita-visible-in-index"))
5048 options
->ita_invisible_in_index
= 0;
5051 else if (!strcmp(arg
, "-z"))
5052 options
->line_termination
= 0;
5053 else if ((argcount
= short_opt('l', av
, &optarg
))) {
5054 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
5057 else if ((argcount
= short_opt('S', av
, &optarg
))) {
5058 options
->pickaxe
= optarg
;
5059 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_S
;
5061 } else if ((argcount
= short_opt('G', av
, &optarg
))) {
5062 options
->pickaxe
= optarg
;
5063 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_G
;
5066 else if (!strcmp(arg
, "--pickaxe-all"))
5067 options
->pickaxe_opts
|= DIFF_PICKAXE_ALL
;
5068 else if (!strcmp(arg
, "--pickaxe-regex"))
5069 options
->pickaxe_opts
|= DIFF_PICKAXE_REGEX
;
5070 else if ((argcount
= short_opt('O', av
, &optarg
))) {
5071 options
->orderfile
= prefix_filename(prefix
, optarg
);
5073 } else if (skip_prefix(arg
, "--find-object=", &arg
))
5074 return parse_objfind_opt(options
, arg
);
5075 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
5076 int offending
= parse_diff_filter_opt(optarg
, options
);
5078 die("unknown change class '%c' in --diff-filter=%s",
5082 else if (!strcmp(arg
, "--no-abbrev"))
5083 options
->abbrev
= 0;
5084 else if (!strcmp(arg
, "--abbrev"))
5085 options
->abbrev
= DEFAULT_ABBREV
;
5086 else if (skip_prefix(arg
, "--abbrev=", &arg
)) {
5087 options
->abbrev
= strtoul(arg
, NULL
, 10);
5088 if (options
->abbrev
< MINIMUM_ABBREV
)
5089 options
->abbrev
= MINIMUM_ABBREV
;
5090 else if (the_hash_algo
->hexsz
< options
->abbrev
)
5091 options
->abbrev
= the_hash_algo
->hexsz
;
5093 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
5094 options
->a_prefix
= optarg
;
5097 else if ((argcount
= parse_long_opt("line-prefix", av
, &optarg
))) {
5098 options
->line_prefix
= optarg
;
5099 options
->line_prefix_length
= strlen(options
->line_prefix
);
5100 graph_setup_line_prefix(options
);
5103 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
5104 options
->b_prefix
= optarg
;
5107 else if (!strcmp(arg
, "--no-prefix"))
5108 options
->a_prefix
= options
->b_prefix
= "";
5109 else if (opt_arg(arg
, '\0', "inter-hunk-context",
5110 &options
->interhunkcontext
))
5112 else if (!strcmp(arg
, "-W"))
5113 options
->flags
.funccontext
= 1;
5114 else if (!strcmp(arg
, "--function-context"))
5115 options
->flags
.funccontext
= 1;
5116 else if (!strcmp(arg
, "--no-function-context"))
5117 options
->flags
.funccontext
= 0;
5118 else if ((argcount
= parse_long_opt("output", av
, &optarg
))) {
5119 char *path
= prefix_filename(prefix
, optarg
);
5120 options
->file
= xfopen(path
, "w");
5121 options
->close_file
= 1;
5122 if (options
->use_color
!= GIT_COLOR_ALWAYS
)
5123 options
->use_color
= GIT_COLOR_NEVER
;
5131 int parse_rename_score(const char **cp_p
)
5133 unsigned long num
, scale
;
5135 const char *cp
= *cp_p
;
5142 if ( !dot
&& ch
== '.' ) {
5145 } else if ( ch
== '%' ) {
5146 scale
= dot
? scale
*100 : 100;
5147 cp
++; /* % is always at the end */
5149 } else if ( ch
>= '0' && ch
<= '9' ) {
5150 if ( scale
< 100000 ) {
5152 num
= (num
*10) + (ch
-'0');
5161 /* user says num divided by scale and we say internally that
5162 * is MAX_SCORE * num / scale.
5164 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
5167 static int diff_scoreopt_parse(const char *opt
)
5169 int opt1
, opt2
, cmd
;
5175 /* convert the long-form arguments into short-form versions */
5176 if (skip_prefix(opt
, "break-rewrites", &opt
)) {
5177 if (*opt
== 0 || *opt
++ == '=')
5179 } else if (skip_prefix(opt
, "find-copies", &opt
)) {
5180 if (*opt
== 0 || *opt
++ == '=')
5182 } else if (skip_prefix(opt
, "find-renames", &opt
)) {
5183 if (*opt
== 0 || *opt
++ == '=')
5187 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
5188 return -1; /* that is not a -M, -C, or -B option */
5190 opt1
= parse_rename_score(&opt
);
5196 else if (*opt
!= '/')
5197 return -1; /* we expect -B80/99 or -B80 */
5200 opt2
= parse_rename_score(&opt
);
5205 return opt1
| (opt2
<< 16);
5208 struct diff_queue_struct diff_queued_diff
;
5210 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
5212 ALLOC_GROW(queue
->queue
, queue
->nr
+ 1, queue
->alloc
);
5213 queue
->queue
[queue
->nr
++] = dp
;
5216 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
5217 struct diff_filespec
*one
,
5218 struct diff_filespec
*two
)
5220 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
5228 void diff_free_filepair(struct diff_filepair
*p
)
5230 free_filespec(p
->one
);
5231 free_filespec(p
->two
);
5235 const char *diff_aligned_abbrev(const struct object_id
*oid
, int len
)
5240 /* Do we want all 40 hex characters? */
5241 if (len
== the_hash_algo
->hexsz
)
5242 return oid_to_hex(oid
);
5244 /* An abbreviated value is fine, possibly followed by an ellipsis. */
5245 abbrev
= diff_abbrev_oid(oid
, len
);
5247 if (!print_sha1_ellipsis())
5250 abblen
= strlen(abbrev
);
5253 * In well-behaved cases, where the abbreviated result is the
5254 * same as the requested length, append three dots after the
5255 * abbreviation (hence the whole logic is limited to the case
5256 * where abblen < 37); when the actual abbreviated result is a
5257 * bit longer than the requested length, we reduce the number
5258 * of dots so that they match the well-behaved ones. However,
5259 * if the actual abbreviation is longer than the requested
5260 * length by more than three, we give up on aligning, and add
5261 * three dots anyway, to indicate that the output is not the
5262 * full object name. Yes, this may be suboptimal, but this
5263 * appears only in "diff --raw --abbrev" output and it is not
5264 * worth the effort to change it now. Note that this would
5265 * likely to work fine when the automatic sizing of default
5266 * abbreviation length is used--we would be fed -1 in "len" in
5267 * that case, and will end up always appending three-dots, but
5268 * the automatic sizing is supposed to give abblen that ensures
5269 * uniqueness across all objects (statistically speaking).
5271 if (abblen
< the_hash_algo
->hexsz
- 3) {
5272 static char hex
[GIT_MAX_HEXSZ
+ 1];
5273 if (len
< abblen
&& abblen
<= len
+ 2)
5274 xsnprintf(hex
, sizeof(hex
), "%s%.*s", abbrev
, len
+3-abblen
, "..");
5276 xsnprintf(hex
, sizeof(hex
), "%s...", abbrev
);
5280 return oid_to_hex(oid
);
5283 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
5285 int line_termination
= opt
->line_termination
;
5286 int inter_name_termination
= line_termination
? '\t' : '\0';
5288 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
5289 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
5290 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
5291 diff_aligned_abbrev(&p
->one
->oid
, opt
->abbrev
));
5292 fprintf(opt
->file
, "%s ",
5293 diff_aligned_abbrev(&p
->two
->oid
, opt
->abbrev
));
5296 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
5297 inter_name_termination
);
5299 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
5302 if (p
->status
== DIFF_STATUS_COPIED
||
5303 p
->status
== DIFF_STATUS_RENAMED
) {
5304 const char *name_a
, *name_b
;
5305 name_a
= p
->one
->path
;
5306 name_b
= p
->two
->path
;
5307 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5308 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
5309 write_name_quoted(name_b
, opt
->file
, line_termination
);
5311 const char *name_a
, *name_b
;
5312 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
5314 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5315 write_name_quoted(name_a
, opt
->file
, line_termination
);
5319 int diff_unmodified_pair(struct diff_filepair
*p
)
5321 /* This function is written stricter than necessary to support
5322 * the currently implemented transformers, but the idea is to
5323 * let transformers to produce diff_filepairs any way they want,
5324 * and filter and clean them up here before producing the output.
5326 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
5328 if (DIFF_PAIR_UNMERGED(p
))
5329 return 0; /* unmerged is interesting */
5331 /* deletion, addition, mode or type change
5332 * and rename are all interesting.
5334 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
5335 DIFF_PAIR_MODE_CHANGED(p
) ||
5336 strcmp(one
->path
, two
->path
))
5339 /* both are valid and point at the same path. that is, we are
5340 * dealing with a change.
5342 if (one
->oid_valid
&& two
->oid_valid
&&
5343 !oidcmp(&one
->oid
, &two
->oid
) &&
5344 !one
->dirty_submodule
&& !two
->dirty_submodule
)
5345 return 1; /* no change */
5346 if (!one
->oid_valid
&& !two
->oid_valid
)
5347 return 1; /* both look at the same file on the filesystem. */
5351 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
5353 if (diff_unmodified_pair(p
))
5356 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5357 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5358 return; /* no tree diffs in patch format */
5363 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
5364 struct diffstat_t
*diffstat
)
5366 if (diff_unmodified_pair(p
))
5369 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5370 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5371 return; /* no useful stat for tree diffs */
5373 run_diffstat(p
, o
, diffstat
);
5376 static void diff_flush_checkdiff(struct diff_filepair
*p
,
5377 struct diff_options
*o
)
5379 if (diff_unmodified_pair(p
))
5382 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5383 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5384 return; /* nothing to check in tree diffs */
5386 run_checkdiff(p
, o
);
5389 int diff_queue_is_empty(void)
5391 struct diff_queue_struct
*q
= &diff_queued_diff
;
5393 for (i
= 0; i
< q
->nr
; i
++)
5394 if (!diff_unmodified_pair(q
->queue
[i
]))
5400 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
5402 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
5405 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
5407 s
->oid_valid
? oid_to_hex(&s
->oid
) : "");
5408 fprintf(stderr
, "queue[%d] %s size %lu\n",
5413 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
5415 diff_debug_filespec(p
->one
, i
, "one");
5416 diff_debug_filespec(p
->two
, i
, "two");
5417 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
5418 p
->score
, p
->status
? p
->status
: '?',
5419 p
->one
->rename_used
, p
->broken_pair
);
5422 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
5426 fprintf(stderr
, "%s\n", msg
);
5427 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
5428 for (i
= 0; i
< q
->nr
; i
++) {
5429 struct diff_filepair
*p
= q
->queue
[i
];
5430 diff_debug_filepair(p
, i
);
5435 static void diff_resolve_rename_copy(void)
5438 struct diff_filepair
*p
;
5439 struct diff_queue_struct
*q
= &diff_queued_diff
;
5441 diff_debug_queue("resolve-rename-copy", q
);
5443 for (i
= 0; i
< q
->nr
; i
++) {
5445 p
->status
= 0; /* undecided */
5446 if (DIFF_PAIR_UNMERGED(p
))
5447 p
->status
= DIFF_STATUS_UNMERGED
;
5448 else if (!DIFF_FILE_VALID(p
->one
))
5449 p
->status
= DIFF_STATUS_ADDED
;
5450 else if (!DIFF_FILE_VALID(p
->two
))
5451 p
->status
= DIFF_STATUS_DELETED
;
5452 else if (DIFF_PAIR_TYPE_CHANGED(p
))
5453 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
5455 /* from this point on, we are dealing with a pair
5456 * whose both sides are valid and of the same type, i.e.
5457 * either in-place edit or rename/copy edit.
5459 else if (DIFF_PAIR_RENAME(p
)) {
5461 * A rename might have re-connected a broken
5462 * pair up, causing the pathnames to be the
5463 * same again. If so, that's not a rename at
5464 * all, just a modification..
5466 * Otherwise, see if this source was used for
5467 * multiple renames, in which case we decrement
5468 * the count, and call it a copy.
5470 if (!strcmp(p
->one
->path
, p
->two
->path
))
5471 p
->status
= DIFF_STATUS_MODIFIED
;
5472 else if (--p
->one
->rename_used
> 0)
5473 p
->status
= DIFF_STATUS_COPIED
;
5475 p
->status
= DIFF_STATUS_RENAMED
;
5477 else if (oidcmp(&p
->one
->oid
, &p
->two
->oid
) ||
5478 p
->one
->mode
!= p
->two
->mode
||
5479 p
->one
->dirty_submodule
||
5480 p
->two
->dirty_submodule
||
5481 is_null_oid(&p
->one
->oid
))
5482 p
->status
= DIFF_STATUS_MODIFIED
;
5484 /* This is a "no-change" entry and should not
5485 * happen anymore, but prepare for broken callers.
5487 error("feeding unmodified %s to diffcore",
5489 p
->status
= DIFF_STATUS_UNKNOWN
;
5492 diff_debug_queue("resolve-rename-copy done", q
);
5495 static int check_pair_status(struct diff_filepair
*p
)
5497 switch (p
->status
) {
5498 case DIFF_STATUS_UNKNOWN
:
5501 die("internal error in diff-resolve-rename-copy");
5507 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
5509 int fmt
= opt
->output_format
;
5511 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
5512 diff_flush_checkdiff(p
, opt
);
5513 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
5514 diff_flush_raw(p
, opt
);
5515 else if (fmt
& DIFF_FORMAT_NAME
) {
5516 const char *name_a
, *name_b
;
5517 name_a
= p
->two
->path
;
5519 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5520 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
5521 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
5525 static void show_file_mode_name(struct diff_options
*opt
, const char *newdelete
, struct diff_filespec
*fs
)
5527 struct strbuf sb
= STRBUF_INIT
;
5529 strbuf_addf(&sb
, " %s mode %06o ", newdelete
, fs
->mode
);
5531 strbuf_addf(&sb
, " %s ", newdelete
);
5533 quote_c_style(fs
->path
, &sb
, NULL
, 0);
5534 strbuf_addch(&sb
, '\n');
5535 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5537 strbuf_release(&sb
);
5540 static void show_mode_change(struct diff_options
*opt
, struct diff_filepair
*p
,
5543 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
5544 struct strbuf sb
= STRBUF_INIT
;
5545 strbuf_addf(&sb
, " mode change %06o => %06o",
5546 p
->one
->mode
, p
->two
->mode
);
5548 strbuf_addch(&sb
, ' ');
5549 quote_c_style(p
->two
->path
, &sb
, NULL
, 0);
5551 strbuf_addch(&sb
, '\n');
5552 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5554 strbuf_release(&sb
);
5558 static void show_rename_copy(struct diff_options
*opt
, const char *renamecopy
,
5559 struct diff_filepair
*p
)
5561 struct strbuf sb
= STRBUF_INIT
;
5562 struct strbuf names
= STRBUF_INIT
;
5564 pprint_rename(&names
, p
->one
->path
, p
->two
->path
);
5565 strbuf_addf(&sb
, " %s %s (%d%%)\n",
5566 renamecopy
, names
.buf
, similarity_index(p
));
5567 strbuf_release(&names
);
5568 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5570 show_mode_change(opt
, p
, 0);
5571 strbuf_release(&sb
);
5574 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
5577 case DIFF_STATUS_DELETED
:
5578 show_file_mode_name(opt
, "delete", p
->one
);
5580 case DIFF_STATUS_ADDED
:
5581 show_file_mode_name(opt
, "create", p
->two
);
5583 case DIFF_STATUS_COPIED
:
5584 show_rename_copy(opt
, "copy", p
);
5586 case DIFF_STATUS_RENAMED
:
5587 show_rename_copy(opt
, "rename", p
);
5591 struct strbuf sb
= STRBUF_INIT
;
5592 strbuf_addstr(&sb
, " rewrite ");
5593 quote_c_style(p
->two
->path
, &sb
, NULL
, 0);
5594 strbuf_addf(&sb
, " (%d%%)\n", similarity_index(p
));
5595 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5597 strbuf_release(&sb
);
5599 show_mode_change(opt
, p
, !p
->score
);
5609 static int remove_space(char *line
, int len
)
5615 for (i
= 0; i
< len
; i
++)
5616 if (!isspace((c
= line
[i
])))
5622 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
5624 struct patch_id_t
*data
= priv
;
5627 /* Ignore line numbers when computing the SHA1 of the patch */
5628 if (starts_with(line
, "@@ -"))
5631 new_len
= remove_space(line
, len
);
5633 git_SHA1_Update(data
->ctx
, line
, new_len
);
5634 data
->patchlen
+= new_len
;
5637 static void patch_id_add_string(git_SHA_CTX
*ctx
, const char *str
)
5639 git_SHA1_Update(ctx
, str
, strlen(str
));
5642 static void patch_id_add_mode(git_SHA_CTX
*ctx
, unsigned mode
)
5644 /* large enough for 2^32 in octal */
5646 int len
= xsnprintf(buf
, sizeof(buf
), "%06o", mode
);
5647 git_SHA1_Update(ctx
, buf
, len
);
5650 /* returns 0 upon success, and writes result into sha1 */
5651 static int diff_get_patch_id(struct diff_options
*options
, struct object_id
*oid
, int diff_header_only
)
5653 struct diff_queue_struct
*q
= &diff_queued_diff
;
5656 struct patch_id_t data
;
5658 git_SHA1_Init(&ctx
);
5659 memset(&data
, 0, sizeof(struct patch_id_t
));
5662 for (i
= 0; i
< q
->nr
; i
++) {
5666 struct diff_filepair
*p
= q
->queue
[i
];
5669 memset(&xpp
, 0, sizeof(xpp
));
5670 memset(&xecfg
, 0, sizeof(xecfg
));
5672 return error("internal diff status error");
5673 if (p
->status
== DIFF_STATUS_UNKNOWN
)
5675 if (diff_unmodified_pair(p
))
5677 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5678 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5680 if (DIFF_PAIR_UNMERGED(p
))
5683 diff_fill_oid_info(p
->one
);
5684 diff_fill_oid_info(p
->two
);
5686 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
5687 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
5688 patch_id_add_string(&ctx
, "diff--git");
5689 patch_id_add_string(&ctx
, "a/");
5690 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5691 patch_id_add_string(&ctx
, "b/");
5692 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5694 if (p
->one
->mode
== 0) {
5695 patch_id_add_string(&ctx
, "newfilemode");
5696 patch_id_add_mode(&ctx
, p
->two
->mode
);
5697 patch_id_add_string(&ctx
, "---/dev/null");
5698 patch_id_add_string(&ctx
, "+++b/");
5699 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5700 } else if (p
->two
->mode
== 0) {
5701 patch_id_add_string(&ctx
, "deletedfilemode");
5702 patch_id_add_mode(&ctx
, p
->one
->mode
);
5703 patch_id_add_string(&ctx
, "---a/");
5704 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5705 patch_id_add_string(&ctx
, "+++/dev/null");
5707 patch_id_add_string(&ctx
, "---a/");
5708 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5709 patch_id_add_string(&ctx
, "+++b/");
5710 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5713 if (diff_header_only
)
5716 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
5717 fill_mmfile(&mf2
, p
->two
) < 0)
5718 return error("unable to read files to diff");
5720 if (diff_filespec_is_binary(p
->one
) ||
5721 diff_filespec_is_binary(p
->two
)) {
5722 git_SHA1_Update(&ctx
, oid_to_hex(&p
->one
->oid
),
5724 git_SHA1_Update(&ctx
, oid_to_hex(&p
->two
->oid
),
5732 if (xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
5734 return error("unable to generate patch-id diff for %s",
5738 git_SHA1_Final(oid
->hash
, &ctx
);
5742 int diff_flush_patch_id(struct diff_options
*options
, struct object_id
*oid
, int diff_header_only
)
5744 struct diff_queue_struct
*q
= &diff_queued_diff
;
5746 int result
= diff_get_patch_id(options
, oid
, diff_header_only
);
5748 for (i
= 0; i
< q
->nr
; i
++)
5749 diff_free_filepair(q
->queue
[i
]);
5752 DIFF_QUEUE_CLEAR(q
);
5757 static int is_summary_empty(const struct diff_queue_struct
*q
)
5761 for (i
= 0; i
< q
->nr
; i
++) {
5762 const struct diff_filepair
*p
= q
->queue
[i
];
5764 switch (p
->status
) {
5765 case DIFF_STATUS_DELETED
:
5766 case DIFF_STATUS_ADDED
:
5767 case DIFF_STATUS_COPIED
:
5768 case DIFF_STATUS_RENAMED
:
5773 if (p
->one
->mode
&& p
->two
->mode
&&
5774 p
->one
->mode
!= p
->two
->mode
)
5782 static const char rename_limit_warning
[] =
5783 N_("inexact rename detection was skipped due to too many files.");
5785 static const char degrade_cc_to_c_warning
[] =
5786 N_("only found copies from modified paths due to too many files.");
5788 static const char rename_limit_advice
[] =
5789 N_("you may want to set your %s variable to at least "
5790 "%d and retry the command.");
5792 void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
)
5796 warning(_(degrade_cc_to_c_warning
));
5798 warning(_(rename_limit_warning
));
5802 warning(_(rename_limit_advice
), varname
, needed
);
5805 static void diff_flush_patch_all_file_pairs(struct diff_options
*o
)
5808 static struct emitted_diff_symbols esm
= EMITTED_DIFF_SYMBOLS_INIT
;
5809 struct diff_queue_struct
*q
= &diff_queued_diff
;
5811 if (WSEH_NEW
& WS_RULE_MASK
)
5812 BUG("WS rules bit mask overlaps with diff symbol flags");
5815 o
->emitted_symbols
= &esm
;
5817 for (i
= 0; i
< q
->nr
; i
++) {
5818 struct diff_filepair
*p
= q
->queue
[i
];
5819 if (check_pair_status(p
))
5820 diff_flush_patch(p
, o
);
5823 if (o
->emitted_symbols
) {
5824 if (o
->color_moved
) {
5825 struct hashmap add_lines
, del_lines
;
5827 if (o
->color_moved_ws_handling
&
5828 COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE
)
5829 o
->color_moved_ws_handling
|= XDF_IGNORE_WHITESPACE
;
5831 hashmap_init(&del_lines
, moved_entry_cmp
, o
, 0);
5832 hashmap_init(&add_lines
, moved_entry_cmp
, o
, 0);
5834 add_lines_to_move_detection(o
, &add_lines
, &del_lines
);
5835 mark_color_as_moved(o
, &add_lines
, &del_lines
);
5836 if (o
->color_moved
== COLOR_MOVED_ZEBRA_DIM
)
5839 hashmap_free(&add_lines
, 0);
5840 hashmap_free(&del_lines
, 0);
5843 for (i
= 0; i
< esm
.nr
; i
++)
5844 emit_diff_symbol_from_struct(o
, &esm
.buf
[i
]);
5846 for (i
= 0; i
< esm
.nr
; i
++)
5847 free((void *)esm
.buf
[i
].line
);
5852 void diff_flush(struct diff_options
*options
)
5854 struct diff_queue_struct
*q
= &diff_queued_diff
;
5855 int i
, output_format
= options
->output_format
;
5857 int dirstat_by_line
= 0;
5860 * Order: raw, stat, summary, patch
5861 * or: name/name-status/checkdiff (other bits clear)
5866 if (output_format
& (DIFF_FORMAT_RAW
|
5868 DIFF_FORMAT_NAME_STATUS
|
5869 DIFF_FORMAT_CHECKDIFF
)) {
5870 for (i
= 0; i
< q
->nr
; i
++) {
5871 struct diff_filepair
*p
= q
->queue
[i
];
5872 if (check_pair_status(p
))
5873 flush_one_pair(p
, options
);
5878 if (output_format
& DIFF_FORMAT_DIRSTAT
&& options
->flags
.dirstat_by_line
)
5879 dirstat_by_line
= 1;
5881 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
) ||
5883 struct diffstat_t diffstat
;
5885 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
5886 for (i
= 0; i
< q
->nr
; i
++) {
5887 struct diff_filepair
*p
= q
->queue
[i
];
5888 if (check_pair_status(p
))
5889 diff_flush_stat(p
, options
, &diffstat
);
5891 if (output_format
& DIFF_FORMAT_NUMSTAT
)
5892 show_numstat(&diffstat
, options
);
5893 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
5894 show_stats(&diffstat
, options
);
5895 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
5896 show_shortstats(&diffstat
, options
);
5897 if (output_format
& DIFF_FORMAT_DIRSTAT
&& dirstat_by_line
)
5898 show_dirstat_by_line(&diffstat
, options
);
5899 free_diffstat_info(&diffstat
);
5902 if ((output_format
& DIFF_FORMAT_DIRSTAT
) && !dirstat_by_line
)
5903 show_dirstat(options
);
5905 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
5906 for (i
= 0; i
< q
->nr
; i
++) {
5907 diff_summary(options
, q
->queue
[i
]);
5912 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
5913 options
->flags
.exit_with_status
&&
5914 options
->flags
.diff_from_contents
) {
5916 * run diff_flush_patch for the exit status. setting
5917 * options->file to /dev/null should be safe, because we
5918 * aren't supposed to produce any output anyway.
5920 if (options
->close_file
)
5921 fclose(options
->file
);
5922 options
->file
= xfopen("/dev/null", "w");
5923 options
->close_file
= 1;
5924 options
->color_moved
= 0;
5925 for (i
= 0; i
< q
->nr
; i
++) {
5926 struct diff_filepair
*p
= q
->queue
[i
];
5927 if (check_pair_status(p
))
5928 diff_flush_patch(p
, options
);
5929 if (options
->found_changes
)
5934 if (output_format
& DIFF_FORMAT_PATCH
) {
5936 emit_diff_symbol(options
, DIFF_SYMBOL_SEPARATOR
, NULL
, 0, 0);
5937 if (options
->stat_sep
)
5938 /* attach patch instead of inline */
5939 emit_diff_symbol(options
, DIFF_SYMBOL_STAT_SEP
,
5943 diff_flush_patch_all_file_pairs(options
);
5946 if (output_format
& DIFF_FORMAT_CALLBACK
)
5947 options
->format_callback(q
, options
, options
->format_callback_data
);
5949 for (i
= 0; i
< q
->nr
; i
++)
5950 diff_free_filepair(q
->queue
[i
]);
5953 DIFF_QUEUE_CLEAR(q
);
5954 if (options
->close_file
)
5955 fclose(options
->file
);
5958 * Report the content-level differences with HAS_CHANGES;
5959 * diff_addremove/diff_change does not set the bit when
5960 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
5962 if (options
->flags
.diff_from_contents
) {
5963 if (options
->found_changes
)
5964 options
->flags
.has_changes
= 1;
5966 options
->flags
.has_changes
= 0;
5970 static int match_filter(const struct diff_options
*options
, const struct diff_filepair
*p
)
5972 return (((p
->status
== DIFF_STATUS_MODIFIED
) &&
5974 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN
, options
)) ||
5976 filter_bit_tst(DIFF_STATUS_MODIFIED
, options
)))) ||
5977 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
5978 filter_bit_tst(p
->status
, options
)));
5981 static void diffcore_apply_filter(struct diff_options
*options
)
5984 struct diff_queue_struct
*q
= &diff_queued_diff
;
5985 struct diff_queue_struct outq
;
5987 DIFF_QUEUE_CLEAR(&outq
);
5989 if (!options
->filter
)
5992 if (filter_bit_tst(DIFF_STATUS_FILTER_AON
, options
)) {
5994 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
5995 if (match_filter(options
, q
->queue
[i
]))
6001 /* otherwise we will clear the whole queue
6002 * by copying the empty outq at the end of this
6003 * function, but first clear the current entries
6006 for (i
= 0; i
< q
->nr
; i
++)
6007 diff_free_filepair(q
->queue
[i
]);
6010 /* Only the matching ones */
6011 for (i
= 0; i
< q
->nr
; i
++) {
6012 struct diff_filepair
*p
= q
->queue
[i
];
6013 if (match_filter(options
, p
))
6016 diff_free_filepair(p
);
6023 /* Check whether two filespecs with the same mode and size are identical */
6024 static int diff_filespec_is_identical(struct diff_filespec
*one
,
6025 struct diff_filespec
*two
)
6027 if (S_ISGITLINK(one
->mode
))
6029 if (diff_populate_filespec(one
, 0))
6031 if (diff_populate_filespec(two
, 0))
6033 return !memcmp(one
->data
, two
->data
, one
->size
);
6036 static int diff_filespec_check_stat_unmatch(struct diff_filepair
*p
)
6038 if (p
->done_skip_stat_unmatch
)
6039 return p
->skip_stat_unmatch_result
;
6041 p
->done_skip_stat_unmatch
= 1;
6042 p
->skip_stat_unmatch_result
= 0;
6044 * 1. Entries that come from stat info dirtiness
6045 * always have both sides (iow, not create/delete),
6046 * one side of the object name is unknown, with
6047 * the same mode and size. Keep the ones that
6048 * do not match these criteria. They have real
6051 * 2. At this point, the file is known to be modified,
6052 * with the same mode and size, and the object
6053 * name of one side is unknown. Need to inspect
6054 * the identical contents.
6056 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
6057 !DIFF_FILE_VALID(p
->two
) ||
6058 (p
->one
->oid_valid
&& p
->two
->oid_valid
) ||
6059 (p
->one
->mode
!= p
->two
->mode
) ||
6060 diff_populate_filespec(p
->one
, CHECK_SIZE_ONLY
) ||
6061 diff_populate_filespec(p
->two
, CHECK_SIZE_ONLY
) ||
6062 (p
->one
->size
!= p
->two
->size
) ||
6063 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
6064 p
->skip_stat_unmatch_result
= 1;
6065 return p
->skip_stat_unmatch_result
;
6068 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
6071 struct diff_queue_struct
*q
= &diff_queued_diff
;
6072 struct diff_queue_struct outq
;
6073 DIFF_QUEUE_CLEAR(&outq
);
6075 for (i
= 0; i
< q
->nr
; i
++) {
6076 struct diff_filepair
*p
= q
->queue
[i
];
6078 if (diff_filespec_check_stat_unmatch(p
))
6082 * The caller can subtract 1 from skip_stat_unmatch
6083 * to determine how many paths were dirty only
6084 * due to stat info mismatch.
6086 if (!diffopt
->flags
.no_index
)
6087 diffopt
->skip_stat_unmatch
++;
6088 diff_free_filepair(p
);
6095 static int diffnamecmp(const void *a_
, const void *b_
)
6097 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
6098 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
6099 const char *name_a
, *name_b
;
6101 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
6102 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
6103 return strcmp(name_a
, name_b
);
6106 void diffcore_fix_diff_index(struct diff_options
*options
)
6108 struct diff_queue_struct
*q
= &diff_queued_diff
;
6109 QSORT(q
->queue
, q
->nr
, diffnamecmp
);
6112 void diffcore_std(struct diff_options
*options
)
6114 /* NOTE please keep the following in sync with diff_tree_combined() */
6115 if (options
->skip_stat_unmatch
)
6116 diffcore_skip_stat_unmatch(options
);
6117 if (!options
->found_follow
) {
6118 /* See try_to_follow_renames() in tree-diff.c */
6119 if (options
->break_opt
!= -1)
6120 diffcore_break(options
->break_opt
);
6121 if (options
->detect_rename
)
6122 diffcore_rename(options
);
6123 if (options
->break_opt
!= -1)
6124 diffcore_merge_broken();
6126 if (options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
)
6127 diffcore_pickaxe(options
);
6128 if (options
->orderfile
)
6129 diffcore_order(options
->orderfile
);
6130 if (!options
->found_follow
)
6131 /* See try_to_follow_renames() in tree-diff.c */
6132 diff_resolve_rename_copy();
6133 diffcore_apply_filter(options
);
6135 if (diff_queued_diff
.nr
&& !options
->flags
.diff_from_contents
)
6136 options
->flags
.has_changes
= 1;
6138 options
->flags
.has_changes
= 0;
6140 options
->found_follow
= 0;
6143 int diff_result_code(struct diff_options
*opt
, int status
)
6147 diff_warn_rename_limit("diff.renameLimit",
6148 opt
->needed_rename_limit
,
6149 opt
->degraded_cc_to_c
);
6150 if (!opt
->flags
.exit_with_status
&&
6151 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
6153 if (opt
->flags
.exit_with_status
&&
6154 opt
->flags
.has_changes
)
6156 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
6157 opt
->flags
.check_failed
)
6162 int diff_can_quit_early(struct diff_options
*opt
)
6164 return (opt
->flags
.quick
&&
6166 opt
->flags
.has_changes
);
6170 * Shall changes to this submodule be ignored?
6172 * Submodule changes can be configured to be ignored separately for each path,
6173 * but that configuration can be overridden from the command line.
6175 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
6178 struct diff_flags orig_flags
= options
->flags
;
6179 if (!options
->flags
.override_submodule_config
)
6180 set_diffopt_flags_from_submodule_config(options
, path
);
6181 if (options
->flags
.ignore_submodules
)
6183 options
->flags
= orig_flags
;
6187 void diff_addremove(struct diff_options
*options
,
6188 int addremove
, unsigned mode
,
6189 const struct object_id
*oid
,
6191 const char *concatpath
, unsigned dirty_submodule
)
6193 struct diff_filespec
*one
, *two
;
6195 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
6198 /* This may look odd, but it is a preparation for
6199 * feeding "there are unchanged files which should
6200 * not produce diffs, but when you are doing copy
6201 * detection you would need them, so here they are"
6202 * entries to the diff-core. They will be prefixed
6203 * with something like '=' or '*' (I haven't decided
6204 * which but should not make any difference).
6205 * Feeding the same new and old to diff_change()
6206 * also has the same effect.
6207 * Before the final output happens, they are pruned after
6208 * merged into rename/copy pairs as appropriate.
6210 if (options
->flags
.reverse_diff
)
6211 addremove
= (addremove
== '+' ? '-' :
6212 addremove
== '-' ? '+' : addremove
);
6214 if (options
->prefix
&&
6215 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
6218 one
= alloc_filespec(concatpath
);
6219 two
= alloc_filespec(concatpath
);
6221 if (addremove
!= '+')
6222 fill_filespec(one
, oid
, oid_valid
, mode
);
6223 if (addremove
!= '-') {
6224 fill_filespec(two
, oid
, oid_valid
, mode
);
6225 two
->dirty_submodule
= dirty_submodule
;
6228 diff_queue(&diff_queued_diff
, one
, two
);
6229 if (!options
->flags
.diff_from_contents
)
6230 options
->flags
.has_changes
= 1;
6233 void diff_change(struct diff_options
*options
,
6234 unsigned old_mode
, unsigned new_mode
,
6235 const struct object_id
*old_oid
,
6236 const struct object_id
*new_oid
,
6237 int old_oid_valid
, int new_oid_valid
,
6238 const char *concatpath
,
6239 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
6241 struct diff_filespec
*one
, *two
;
6242 struct diff_filepair
*p
;
6244 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
6245 is_submodule_ignored(concatpath
, options
))
6248 if (options
->flags
.reverse_diff
) {
6249 SWAP(old_mode
, new_mode
);
6250 SWAP(old_oid
, new_oid
);
6251 SWAP(old_oid_valid
, new_oid_valid
);
6252 SWAP(old_dirty_submodule
, new_dirty_submodule
);
6255 if (options
->prefix
&&
6256 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
6259 one
= alloc_filespec(concatpath
);
6260 two
= alloc_filespec(concatpath
);
6261 fill_filespec(one
, old_oid
, old_oid_valid
, old_mode
);
6262 fill_filespec(two
, new_oid
, new_oid_valid
, new_mode
);
6263 one
->dirty_submodule
= old_dirty_submodule
;
6264 two
->dirty_submodule
= new_dirty_submodule
;
6265 p
= diff_queue(&diff_queued_diff
, one
, two
);
6267 if (options
->flags
.diff_from_contents
)
6270 if (options
->flags
.quick
&& options
->skip_stat_unmatch
&&
6271 !diff_filespec_check_stat_unmatch(p
))
6274 options
->flags
.has_changes
= 1;
6277 struct diff_filepair
*diff_unmerge(struct diff_options
*options
, const char *path
)
6279 struct diff_filepair
*pair
;
6280 struct diff_filespec
*one
, *two
;
6282 if (options
->prefix
&&
6283 strncmp(path
, options
->prefix
, options
->prefix_length
))
6286 one
= alloc_filespec(path
);
6287 two
= alloc_filespec(path
);
6288 pair
= diff_queue(&diff_queued_diff
, one
, two
);
6289 pair
->is_unmerged
= 1;
6293 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
6296 struct diff_tempfile
*temp
;
6297 const char *argv
[3];
6298 const char **arg
= argv
;
6299 struct child_process child
= CHILD_PROCESS_INIT
;
6300 struct strbuf buf
= STRBUF_INIT
;
6303 temp
= prepare_temp_file(spec
->path
, spec
);
6305 *arg
++ = temp
->name
;
6308 child
.use_shell
= 1;
6311 if (start_command(&child
)) {
6316 if (strbuf_read(&buf
, child
.out
, 0) < 0)
6317 err
= error("error reading from textconv command '%s'", pgm
);
6320 if (finish_command(&child
) || err
) {
6321 strbuf_release(&buf
);
6327 return strbuf_detach(&buf
, outsize
);
6330 size_t fill_textconv(struct userdiff_driver
*driver
,
6331 struct diff_filespec
*df
,
6337 if (!DIFF_FILE_VALID(df
)) {
6341 if (diff_populate_filespec(df
, 0))
6342 die("unable to read files to diff");
6347 if (!driver
->textconv
)
6348 BUG("fill_textconv called with non-textconv driver");
6350 if (driver
->textconv_cache
&& df
->oid_valid
) {
6351 *outbuf
= notes_cache_get(driver
->textconv_cache
,
6358 *outbuf
= run_textconv(driver
->textconv
, df
, &size
);
6360 die("unable to read files to diff");
6362 if (driver
->textconv_cache
&& df
->oid_valid
) {
6363 /* ignore errors, as we might be in a readonly repository */
6364 notes_cache_put(driver
->textconv_cache
, &df
->oid
, *outbuf
,
6367 * we could save up changes and flush them all at the end,
6368 * but we would need an extra call after all diffing is done.
6369 * Since generating a cache entry is the slow path anyway,
6370 * this extra overhead probably isn't a big deal.
6372 notes_cache_write(driver
->textconv_cache
);
6378 int textconv_object(const char *path
,
6380 const struct object_id
*oid
,
6383 unsigned long *buf_size
)
6385 struct diff_filespec
*df
;
6386 struct userdiff_driver
*textconv
;
6388 df
= alloc_filespec(path
);
6389 fill_filespec(df
, oid
, oid_valid
, mode
);
6390 textconv
= get_textconv(df
);
6396 *buf_size
= fill_textconv(textconv
, df
, buf
);
6401 void setup_diff_pager(struct diff_options
*opt
)
6404 * If the user asked for our exit code, then either they want --quiet
6405 * or --exit-code. We should definitely not bother with a pager in the
6406 * former case, as we will generate no output. Since we still properly
6407 * report our exit code even when a pager is run, we _could_ run a
6408 * pager with --exit-code. But since we have not done so historically,
6409 * and because it is easy to find people oneline advising "git diff
6410 * --exit-code" in hooks and other scripts, we do not do so.
6412 if (!opt
->flags
.exit_with_status
&&
6413 check_pager_config("diff") != 0)