2 * Copyright (C) 2005 Junio C Hamano
11 #include "xdiff-interface.h"
14 #include "run-command.h"
17 #include "submodule-config.h"
18 #include "submodule.h"
21 #include "string-list.h"
22 #include "argv-array.h"
27 #ifdef NO_FAST_WORKING_DIRECTORY
28 #define FAST_WORKING_DIRECTORY 0
30 #define FAST_WORKING_DIRECTORY 1
33 static int diff_detect_rename_default
;
34 static int diff_indent_heuristic
= 1;
35 static int diff_rename_limit_default
= 400;
36 static int diff_suppress_blank_empty
;
37 static int diff_use_color_default
= -1;
38 static int diff_color_moved_default
;
39 static int diff_context_default
= 3;
40 static int diff_interhunk_context_default
;
41 static const char *diff_word_regex_cfg
;
42 static const char *external_diff_cmd_cfg
;
43 static const char *diff_order_file_cfg
;
44 int diff_auto_refresh_index
= 1;
45 static int diff_mnemonic_prefix
;
46 static int diff_no_prefix
;
47 static int diff_stat_graph_width
;
48 static int diff_dirstat_permille_default
= 30;
49 static struct diff_options default_diff_options
;
50 static long diff_algorithm
;
51 static unsigned ws_error_highlight_default
= WSEH_NEW
;
53 static char diff_colors
[][COLOR_MAXLEN
] = {
55 GIT_COLOR_NORMAL
, /* CONTEXT */
56 GIT_COLOR_BOLD
, /* METAINFO */
57 GIT_COLOR_CYAN
, /* FRAGINFO */
58 GIT_COLOR_RED
, /* OLD */
59 GIT_COLOR_GREEN
, /* NEW */
60 GIT_COLOR_YELLOW
, /* COMMIT */
61 GIT_COLOR_BG_RED
, /* WHITESPACE */
62 GIT_COLOR_NORMAL
, /* FUNCINFO */
63 GIT_COLOR_BOLD_MAGENTA
, /* OLD_MOVED */
64 GIT_COLOR_BOLD_BLUE
, /* OLD_MOVED ALTERNATIVE */
65 GIT_COLOR_FAINT
, /* OLD_MOVED_DIM */
66 GIT_COLOR_FAINT_ITALIC
, /* OLD_MOVED_ALTERNATIVE_DIM */
67 GIT_COLOR_BOLD_CYAN
, /* NEW_MOVED */
68 GIT_COLOR_BOLD_YELLOW
, /* NEW_MOVED ALTERNATIVE */
69 GIT_COLOR_FAINT
, /* NEW_MOVED_DIM */
70 GIT_COLOR_FAINT_ITALIC
, /* NEW_MOVED_ALTERNATIVE_DIM */
73 static const char *color_diff_slots
[] = {
74 [DIFF_CONTEXT
] = "context",
75 [DIFF_METAINFO
] = "meta",
76 [DIFF_FRAGINFO
] = "frag",
77 [DIFF_FILE_OLD
] = "old",
78 [DIFF_FILE_NEW
] = "new",
79 [DIFF_COMMIT
] = "commit",
80 [DIFF_WHITESPACE
] = "whitespace",
81 [DIFF_FUNCINFO
] = "func",
82 [DIFF_FILE_OLD_MOVED
] = "oldMoved",
83 [DIFF_FILE_OLD_MOVED_ALT
] = "oldMovedAlternative",
84 [DIFF_FILE_OLD_MOVED_DIM
] = "oldMovedDimmed",
85 [DIFF_FILE_OLD_MOVED_ALT_DIM
] = "oldMovedAlternativeDimmed",
86 [DIFF_FILE_NEW_MOVED
] = "newMoved",
87 [DIFF_FILE_NEW_MOVED_ALT
] = "newMovedAlternative",
88 [DIFF_FILE_NEW_MOVED_DIM
] = "newMovedDimmed",
89 [DIFF_FILE_NEW_MOVED_ALT_DIM
] = "newMovedAlternativeDimmed",
92 static NORETURN
void die_want_option(const char *option_name
)
94 die(_("option '%s' requires a value"), option_name
);
97 define_list_config_array_extra(color_diff_slots
, {"plain"});
99 static int parse_diff_color_slot(const char *var
)
101 if (!strcasecmp(var
, "plain"))
103 return LOOKUP_CONFIG(color_diff_slots
, var
);
106 static int parse_dirstat_params(struct diff_options
*options
, const char *params_string
,
107 struct strbuf
*errmsg
)
109 char *params_copy
= xstrdup(params_string
);
110 struct string_list params
= STRING_LIST_INIT_NODUP
;
115 string_list_split_in_place(¶ms
, params_copy
, ',', -1);
116 for (i
= 0; i
< params
.nr
; i
++) {
117 const char *p
= params
.items
[i
].string
;
118 if (!strcmp(p
, "changes")) {
119 options
->flags
.dirstat_by_line
= 0;
120 options
->flags
.dirstat_by_file
= 0;
121 } else if (!strcmp(p
, "lines")) {
122 options
->flags
.dirstat_by_line
= 1;
123 options
->flags
.dirstat_by_file
= 0;
124 } else if (!strcmp(p
, "files")) {
125 options
->flags
.dirstat_by_line
= 0;
126 options
->flags
.dirstat_by_file
= 1;
127 } else if (!strcmp(p
, "noncumulative")) {
128 options
->flags
.dirstat_cumulative
= 0;
129 } else if (!strcmp(p
, "cumulative")) {
130 options
->flags
.dirstat_cumulative
= 1;
131 } else if (isdigit(*p
)) {
133 int permille
= strtoul(p
, &end
, 10) * 10;
134 if (*end
== '.' && isdigit(*++end
)) {
135 /* only use first digit */
136 permille
+= *end
- '0';
137 /* .. and ignore any further digits */
138 while (isdigit(*++end
))
142 options
->dirstat_permille
= permille
;
144 strbuf_addf(errmsg
, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
149 strbuf_addf(errmsg
, _(" Unknown dirstat parameter '%s'\n"), p
);
154 string_list_clear(¶ms
, 0);
159 static int parse_submodule_params(struct diff_options
*options
, const char *value
)
161 if (!strcmp(value
, "log"))
162 options
->submodule_format
= DIFF_SUBMODULE_LOG
;
163 else if (!strcmp(value
, "short"))
164 options
->submodule_format
= DIFF_SUBMODULE_SHORT
;
165 else if (!strcmp(value
, "diff"))
166 options
->submodule_format
= DIFF_SUBMODULE_INLINE_DIFF
;
172 static int git_config_rename(const char *var
, const char *value
)
175 return DIFF_DETECT_RENAME
;
176 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
177 return DIFF_DETECT_COPY
;
178 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
181 long parse_algorithm_value(const char *value
)
185 else if (!strcasecmp(value
, "myers") || !strcasecmp(value
, "default"))
187 else if (!strcasecmp(value
, "minimal"))
188 return XDF_NEED_MINIMAL
;
189 else if (!strcasecmp(value
, "patience"))
190 return XDF_PATIENCE_DIFF
;
191 else if (!strcasecmp(value
, "histogram"))
192 return XDF_HISTOGRAM_DIFF
;
196 static int parse_one_token(const char **arg
, const char *token
)
199 if (skip_prefix(*arg
, token
, &rest
) && (!*rest
|| *rest
== ',')) {
206 static int parse_ws_error_highlight(const char *arg
)
208 const char *orig_arg
= arg
;
212 if (parse_one_token(&arg
, "none"))
214 else if (parse_one_token(&arg
, "default"))
216 else if (parse_one_token(&arg
, "all"))
217 val
= WSEH_NEW
| WSEH_OLD
| WSEH_CONTEXT
;
218 else if (parse_one_token(&arg
, "new"))
220 else if (parse_one_token(&arg
, "old"))
222 else if (parse_one_token(&arg
, "context"))
225 return -1 - (int)(arg
- orig_arg
);
234 * These are to give UI layer defaults.
235 * The core-level commands such as git-diff-files should
236 * never be affected by the setting of diff.renames
237 * the user happens to have in the configuration file.
239 void init_diff_ui_defaults(void)
241 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
244 int git_diff_heuristic_config(const char *var
, const char *value
, void *cb
)
246 if (!strcmp(var
, "diff.indentheuristic"))
247 diff_indent_heuristic
= git_config_bool(var
, value
);
251 static int parse_color_moved(const char *arg
)
253 switch (git_parse_maybe_bool(arg
)) {
255 return COLOR_MOVED_NO
;
257 return COLOR_MOVED_DEFAULT
;
262 if (!strcmp(arg
, "no"))
263 return COLOR_MOVED_NO
;
264 else if (!strcmp(arg
, "plain"))
265 return COLOR_MOVED_PLAIN
;
266 else if (!strcmp(arg
, "zebra"))
267 return COLOR_MOVED_ZEBRA
;
268 else if (!strcmp(arg
, "default"))
269 return COLOR_MOVED_DEFAULT
;
270 else if (!strcmp(arg
, "dimmed_zebra"))
271 return COLOR_MOVED_ZEBRA_DIM
;
273 return error(_("color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'"));
276 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
278 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
279 diff_use_color_default
= git_config_colorbool(var
, value
);
282 if (!strcmp(var
, "diff.colormoved")) {
283 int cm
= parse_color_moved(value
);
286 diff_color_moved_default
= cm
;
289 if (!strcmp(var
, "diff.context")) {
290 diff_context_default
= git_config_int(var
, value
);
291 if (diff_context_default
< 0)
295 if (!strcmp(var
, "diff.interhunkcontext")) {
296 diff_interhunk_context_default
= git_config_int(var
, value
);
297 if (diff_interhunk_context_default
< 0)
301 if (!strcmp(var
, "diff.renames")) {
302 diff_detect_rename_default
= git_config_rename(var
, value
);
305 if (!strcmp(var
, "diff.autorefreshindex")) {
306 diff_auto_refresh_index
= git_config_bool(var
, value
);
309 if (!strcmp(var
, "diff.mnemonicprefix")) {
310 diff_mnemonic_prefix
= git_config_bool(var
, value
);
313 if (!strcmp(var
, "diff.noprefix")) {
314 diff_no_prefix
= git_config_bool(var
, value
);
317 if (!strcmp(var
, "diff.statgraphwidth")) {
318 diff_stat_graph_width
= git_config_int(var
, value
);
321 if (!strcmp(var
, "diff.external"))
322 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
323 if (!strcmp(var
, "diff.wordregex"))
324 return git_config_string(&diff_word_regex_cfg
, var
, value
);
325 if (!strcmp(var
, "diff.orderfile"))
326 return git_config_pathname(&diff_order_file_cfg
, var
, value
);
328 if (!strcmp(var
, "diff.ignoresubmodules"))
329 handle_ignore_submodules_arg(&default_diff_options
, value
);
331 if (!strcmp(var
, "diff.submodule")) {
332 if (parse_submodule_params(&default_diff_options
, value
))
333 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
338 if (!strcmp(var
, "diff.algorithm")) {
339 diff_algorithm
= parse_algorithm_value(value
);
340 if (diff_algorithm
< 0)
345 if (!strcmp(var
, "diff.wserrorhighlight")) {
346 int val
= parse_ws_error_highlight(value
);
349 ws_error_highlight_default
= val
;
353 if (git_color_config(var
, value
, cb
) < 0)
356 return git_diff_basic_config(var
, value
, cb
);
359 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
363 if (!strcmp(var
, "diff.renamelimit")) {
364 diff_rename_limit_default
= git_config_int(var
, value
);
368 if (userdiff_config(var
, value
) < 0)
371 if (skip_prefix(var
, "diff.color.", &name
) ||
372 skip_prefix(var
, "color.diff.", &name
)) {
373 int slot
= parse_diff_color_slot(name
);
377 return config_error_nonbool(var
);
378 return color_parse(value
, diff_colors
[slot
]);
381 /* like GNU diff's --suppress-blank-empty option */
382 if (!strcmp(var
, "diff.suppressblankempty") ||
383 /* for backwards compatibility */
384 !strcmp(var
, "diff.suppress-blank-empty")) {
385 diff_suppress_blank_empty
= git_config_bool(var
, value
);
389 if (!strcmp(var
, "diff.dirstat")) {
390 struct strbuf errmsg
= STRBUF_INIT
;
391 default_diff_options
.dirstat_permille
= diff_dirstat_permille_default
;
392 if (parse_dirstat_params(&default_diff_options
, value
, &errmsg
))
393 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
395 strbuf_release(&errmsg
);
396 diff_dirstat_permille_default
= default_diff_options
.dirstat_permille
;
400 if (git_diff_heuristic_config(var
, value
, cb
) < 0)
403 return git_default_config(var
, value
, cb
);
406 static char *quote_two(const char *one
, const char *two
)
408 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
409 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
410 struct strbuf res
= STRBUF_INIT
;
412 if (need_one
+ need_two
) {
413 strbuf_addch(&res
, '"');
414 quote_c_style(one
, &res
, NULL
, 1);
415 quote_c_style(two
, &res
, NULL
, 1);
416 strbuf_addch(&res
, '"');
418 strbuf_addstr(&res
, one
);
419 strbuf_addstr(&res
, two
);
421 return strbuf_detach(&res
, NULL
);
424 static const char *external_diff(void)
426 static const char *external_diff_cmd
= NULL
;
427 static int done_preparing
= 0;
430 return external_diff_cmd
;
431 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
432 if (!external_diff_cmd
)
433 external_diff_cmd
= external_diff_cmd_cfg
;
435 return external_diff_cmd
;
439 * Keep track of files used for diffing. Sometimes such an entry
440 * refers to a temporary file, sometimes to an existing file, and
441 * sometimes to "/dev/null".
443 static struct diff_tempfile
{
445 * filename external diff should read from, or NULL if this
446 * entry is currently not in use:
450 char hex
[GIT_MAX_HEXSZ
+ 1];
454 * If this diff_tempfile instance refers to a temporary file,
455 * this tempfile object is used to manage its lifetime.
457 struct tempfile
*tempfile
;
460 struct emit_callback
{
463 int blank_at_eof_in_preimage
;
464 int blank_at_eof_in_postimage
;
466 int lno_in_postimage
;
467 const char **label_path
;
468 struct diff_words_data
*diff_words
;
469 struct diff_options
*opt
;
470 struct strbuf
*header
;
473 static int count_lines(const char *data
, int size
)
475 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
482 completely_empty
= 0;
486 completely_empty
= 0;
489 if (completely_empty
)
492 count
++; /* no trailing newline */
496 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
498 if (!DIFF_FILE_VALID(one
)) {
499 mf
->ptr
= (char *)""; /* does not matter */
503 else if (diff_populate_filespec(one
, 0))
507 mf
->size
= one
->size
;
511 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
512 static unsigned long diff_filespec_size(struct diff_filespec
*one
)
514 if (!DIFF_FILE_VALID(one
))
516 diff_populate_filespec(one
, CHECK_SIZE_ONLY
);
520 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
523 long size
= mf
->size
;
528 ptr
+= size
- 1; /* pointing at the very end */
530 ; /* incomplete line */
532 ptr
--; /* skip the last LF */
533 while (mf
->ptr
< ptr
) {
535 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
536 if (*prev_eol
== '\n')
538 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
546 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
547 struct emit_callback
*ecbdata
)
550 unsigned ws_rule
= ecbdata
->ws_rule
;
551 l1
= count_trailing_blank(mf1
, ws_rule
);
552 l2
= count_trailing_blank(mf2
, ws_rule
);
554 ecbdata
->blank_at_eof_in_preimage
= 0;
555 ecbdata
->blank_at_eof_in_postimage
= 0;
558 at
= count_lines(mf1
->ptr
, mf1
->size
);
559 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
561 at
= count_lines(mf2
->ptr
, mf2
->size
);
562 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
565 static void emit_line_0(struct diff_options
*o
, const char *set
, const char *reset
,
566 int first
, const char *line
, int len
)
568 int has_trailing_newline
, has_trailing_carriage_return
;
570 FILE *file
= o
->file
;
572 fputs(diff_line_prefix(o
), file
);
575 has_trailing_newline
= (first
== '\n');
576 has_trailing_carriage_return
= (!has_trailing_newline
&&
578 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
580 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
581 if (has_trailing_newline
)
583 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
584 if (has_trailing_carriage_return
)
589 if (len
|| !nofirst
) {
593 fwrite(line
, len
, 1, file
);
596 if (has_trailing_carriage_return
)
598 if (has_trailing_newline
)
602 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
603 const char *line
, int len
)
605 emit_line_0(o
, set
, reset
, line
[0], line
+1, len
-1);
609 DIFF_SYMBOL_BINARY_DIFF_HEADER
,
610 DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
,
611 DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
,
612 DIFF_SYMBOL_BINARY_DIFF_BODY
,
613 DIFF_SYMBOL_BINARY_DIFF_FOOTER
,
614 DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
,
615 DIFF_SYMBOL_STATS_SUMMARY_ABBREV
,
616 DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
,
617 DIFF_SYMBOL_STATS_LINE
,
618 DIFF_SYMBOL_WORD_DIFF
,
619 DIFF_SYMBOL_STAT_SEP
,
621 DIFF_SYMBOL_SUBMODULE_ADD
,
622 DIFF_SYMBOL_SUBMODULE_DEL
,
623 DIFF_SYMBOL_SUBMODULE_UNTRACKED
,
624 DIFF_SYMBOL_SUBMODULE_MODIFIED
,
625 DIFF_SYMBOL_SUBMODULE_HEADER
,
626 DIFF_SYMBOL_SUBMODULE_ERROR
,
627 DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
,
628 DIFF_SYMBOL_REWRITE_DIFF
,
629 DIFF_SYMBOL_BINARY_FILES
,
631 DIFF_SYMBOL_FILEPAIR_PLUS
,
632 DIFF_SYMBOL_FILEPAIR_MINUS
,
633 DIFF_SYMBOL_WORDS_PORCELAIN
,
636 DIFF_SYMBOL_CONTEXT_INCOMPLETE
,
639 DIFF_SYMBOL_NO_LF_EOF
,
640 DIFF_SYMBOL_CONTEXT_FRAGINFO
,
641 DIFF_SYMBOL_CONTEXT_MARKER
,
642 DIFF_SYMBOL_SEPARATOR
645 * Flags for content lines:
646 * 0..12 are whitespace rules
647 * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
648 * 16 is marking if the line is blank at EOF
650 #define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF (1<<16)
651 #define DIFF_SYMBOL_MOVED_LINE (1<<17)
652 #define DIFF_SYMBOL_MOVED_LINE_ALT (1<<18)
653 #define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING (1<<19)
654 #define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)
657 * This struct is used when we need to buffer the output of the diff output.
659 * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
660 * into the pre/post image file. This pointer could be a union with the
661 * line pointer. By storing an offset into the file instead of the literal line,
662 * we can decrease the memory footprint for the buffered output. At first we
663 * may want to only have indirection for the content lines, but we could also
664 * enhance the state for emitting prefabricated lines, e.g. the similarity
665 * score line or hunk/file headers would only need to store a number or path
666 * and then the output can be constructed later on depending on state.
668 struct emitted_diff_symbol
{
674 #define EMITTED_DIFF_SYMBOL_INIT {NULL}
676 struct emitted_diff_symbols
{
677 struct emitted_diff_symbol
*buf
;
680 #define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
682 static void append_emitted_diff_symbol(struct diff_options
*o
,
683 struct emitted_diff_symbol
*e
)
685 struct emitted_diff_symbol
*f
;
687 ALLOC_GROW(o
->emitted_symbols
->buf
,
688 o
->emitted_symbols
->nr
+ 1,
689 o
->emitted_symbols
->alloc
);
690 f
= &o
->emitted_symbols
->buf
[o
->emitted_symbols
->nr
++];
692 memcpy(f
, e
, sizeof(struct emitted_diff_symbol
));
693 f
->line
= e
->line
? xmemdupz(e
->line
, e
->len
) : NULL
;
697 struct hashmap_entry ent
;
698 const struct emitted_diff_symbol
*es
;
699 struct moved_entry
*next_line
;
702 static int moved_entry_cmp(const struct diff_options
*diffopt
,
703 const struct moved_entry
*a
,
704 const struct moved_entry
*b
,
707 return !xdiff_compare_lines(a
->es
->line
, a
->es
->len
,
708 b
->es
->line
, b
->es
->len
,
712 static struct moved_entry
*prepare_entry(struct diff_options
*o
,
715 struct moved_entry
*ret
= xmalloc(sizeof(*ret
));
716 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[line_no
];
718 ret
->ent
.hash
= xdiff_hash_string(l
->line
, l
->len
, o
->xdl_opts
);
720 ret
->next_line
= NULL
;
725 static void add_lines_to_move_detection(struct diff_options
*o
,
726 struct hashmap
*add_lines
,
727 struct hashmap
*del_lines
)
729 struct moved_entry
*prev_line
= NULL
;
732 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
734 struct moved_entry
*key
;
736 switch (o
->emitted_symbols
->buf
[n
].s
) {
737 case DIFF_SYMBOL_PLUS
:
740 case DIFF_SYMBOL_MINUS
:
748 key
= prepare_entry(o
, n
);
749 if (prev_line
&& prev_line
->es
->s
== o
->emitted_symbols
->buf
[n
].s
)
750 prev_line
->next_line
= key
;
752 hashmap_add(hm
, key
);
757 static int shrink_potential_moved_blocks(struct moved_entry
**pmb
,
762 /* Shrink the set of potential block to the remaining running */
763 for (lp
= 0, rp
= pmb_nr
- 1; lp
<= rp
;) {
764 while (lp
< pmb_nr
&& pmb
[lp
])
766 /* lp points at the first NULL now */
768 while (rp
> -1 && !pmb
[rp
])
770 /* rp points at the last non-NULL */
772 if (lp
< pmb_nr
&& rp
> -1 && lp
< rp
) {
780 /* Remember the number of running sets */
785 * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
787 * Otherwise, if the last block has fewer alphanumeric characters than
788 * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
791 * The last block consists of the (n - block_length)'th line up to but not
792 * including the nth line.
794 * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
795 * Think of a way to unify them.
797 static void adjust_last_block(struct diff_options
*o
, int n
, int block_length
)
799 int i
, alnum_count
= 0;
800 if (o
->color_moved
== COLOR_MOVED_PLAIN
)
802 for (i
= 1; i
< block_length
+ 1; i
++) {
803 const char *c
= o
->emitted_symbols
->buf
[n
- i
].line
;
808 if (alnum_count
>= COLOR_MOVED_MIN_ALNUM_COUNT
)
812 for (i
= 1; i
< block_length
+ 1; i
++)
813 o
->emitted_symbols
->buf
[n
- i
].flags
&= ~DIFF_SYMBOL_MOVED_LINE
;
816 /* Find blocks of moved code, delegate actual coloring decision to helper */
817 static void mark_color_as_moved(struct diff_options
*o
,
818 struct hashmap
*add_lines
,
819 struct hashmap
*del_lines
)
821 struct moved_entry
**pmb
= NULL
; /* potentially moved blocks */
822 int pmb_nr
= 0, pmb_alloc
= 0;
823 int n
, flipped_block
= 1, block_length
= 0;
826 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
827 struct hashmap
*hm
= NULL
;
828 struct moved_entry
*key
;
829 struct moved_entry
*match
= NULL
;
830 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
834 case DIFF_SYMBOL_PLUS
:
836 key
= prepare_entry(o
, n
);
837 match
= hashmap_get(hm
, key
, o
);
840 case DIFF_SYMBOL_MINUS
:
842 key
= prepare_entry(o
, n
);
843 match
= hashmap_get(hm
, key
, o
);
851 adjust_last_block(o
, n
, block_length
);
857 l
->flags
|= DIFF_SYMBOL_MOVED_LINE
;
859 if (o
->color_moved
== COLOR_MOVED_PLAIN
)
862 /* Check any potential block runs, advance each or nullify */
863 for (i
= 0; i
< pmb_nr
; i
++) {
864 struct moved_entry
*p
= pmb
[i
];
865 struct moved_entry
*pnext
= (p
&& p
->next_line
) ?
867 if (pnext
&& !hm
->cmpfn(o
, pnext
, match
, NULL
)) {
868 pmb
[i
] = p
->next_line
;
874 pmb_nr
= shrink_potential_moved_blocks(pmb
, pmb_nr
);
878 * The current line is the start of a new block.
879 * Setup the set of potential blocks.
881 for (; match
; match
= hashmap_get_next(hm
, match
)) {
882 ALLOC_GROW(pmb
, pmb_nr
+ 1, pmb_alloc
);
883 pmb
[pmb_nr
++] = match
;
886 flipped_block
= (flipped_block
+ 1) % 2;
888 adjust_last_block(o
, n
, block_length
);
895 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_ALT
;
897 adjust_last_block(o
, n
, block_length
);
902 #define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
903 (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
904 static void dim_moved_lines(struct diff_options
*o
)
907 for (n
= 0; n
< o
->emitted_symbols
->nr
; n
++) {
908 struct emitted_diff_symbol
*prev
= (n
!= 0) ?
909 &o
->emitted_symbols
->buf
[n
- 1] : NULL
;
910 struct emitted_diff_symbol
*l
= &o
->emitted_symbols
->buf
[n
];
911 struct emitted_diff_symbol
*next
=
912 (n
< o
->emitted_symbols
->nr
- 1) ?
913 &o
->emitted_symbols
->buf
[n
+ 1] : NULL
;
915 /* Not a plus or minus line? */
916 if (l
->s
!= DIFF_SYMBOL_PLUS
&& l
->s
!= DIFF_SYMBOL_MINUS
)
919 /* Not a moved line? */
920 if (!(l
->flags
& DIFF_SYMBOL_MOVED_LINE
))
924 * If prev or next are not a plus or minus line,
925 * pretend they don't exist
927 if (prev
&& prev
->s
!= DIFF_SYMBOL_PLUS
&&
928 prev
->s
!= DIFF_SYMBOL_MINUS
)
930 if (next
&& next
->s
!= DIFF_SYMBOL_PLUS
&&
931 next
->s
!= DIFF_SYMBOL_MINUS
)
934 /* Inside a block? */
936 (prev
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
) ==
937 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
)) &&
939 (next
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
) ==
940 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK
))) {
941 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
;
945 /* Check if we are at an interesting bound: */
946 if (prev
&& (prev
->flags
& DIFF_SYMBOL_MOVED_LINE
) &&
947 (prev
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
) !=
948 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
))
950 if (next
&& (next
->flags
& DIFF_SYMBOL_MOVED_LINE
) &&
951 (next
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
) !=
952 (l
->flags
& DIFF_SYMBOL_MOVED_LINE_ALT
))
956 * The boundary to prev and next are not interesting,
957 * so this line is not interesting as a whole
959 l
->flags
|= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
;
963 static void emit_line_ws_markup(struct diff_options
*o
,
964 const char *set
, const char *reset
,
965 const char *line
, int len
, char sign
,
966 unsigned ws_rule
, int blank_at_eof
)
968 const char *ws
= NULL
;
970 if (o
->ws_error_highlight
& ws_rule
) {
971 ws
= diff_get_color_opt(o
, DIFF_WHITESPACE
);
977 emit_line_0(o
, set
, reset
, sign
, line
, len
);
978 else if (blank_at_eof
)
979 /* Blank line at EOF - paint '+' as well */
980 emit_line_0(o
, ws
, reset
, sign
, line
, len
);
982 /* Emit just the prefix, then the rest. */
983 emit_line_0(o
, set
, reset
, sign
, "", 0);
984 ws_check_emit(line
, len
, ws_rule
,
985 o
->file
, set
, reset
, ws
);
989 static void emit_diff_symbol_from_struct(struct diff_options
*o
,
990 struct emitted_diff_symbol
*eds
)
992 static const char *nneof
= " No newline at end of file\n";
993 const char *context
, *reset
, *set
, *meta
, *fraginfo
;
994 struct strbuf sb
= STRBUF_INIT
;
996 enum diff_symbol s
= eds
->s
;
997 const char *line
= eds
->line
;
999 unsigned flags
= eds
->flags
;
1002 case DIFF_SYMBOL_NO_LF_EOF
:
1003 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1004 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1005 putc('\n', o
->file
);
1006 emit_line_0(o
, context
, reset
, '\\',
1007 nneof
, strlen(nneof
));
1009 case DIFF_SYMBOL_SUBMODULE_HEADER
:
1010 case DIFF_SYMBOL_SUBMODULE_ERROR
:
1011 case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
:
1012 case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
:
1013 case DIFF_SYMBOL_SUMMARY
:
1014 case DIFF_SYMBOL_STATS_LINE
:
1015 case DIFF_SYMBOL_BINARY_DIFF_BODY
:
1016 case DIFF_SYMBOL_CONTEXT_FRAGINFO
:
1017 emit_line(o
, "", "", line
, len
);
1019 case DIFF_SYMBOL_CONTEXT_INCOMPLETE
:
1020 case DIFF_SYMBOL_CONTEXT_MARKER
:
1021 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1022 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1023 emit_line(o
, context
, reset
, line
, len
);
1025 case DIFF_SYMBOL_SEPARATOR
:
1026 fprintf(o
->file
, "%s%c",
1027 diff_line_prefix(o
),
1028 o
->line_termination
);
1030 case DIFF_SYMBOL_CONTEXT
:
1031 set
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1032 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1033 emit_line_ws_markup(o
, set
, reset
, line
, len
, ' ',
1034 flags
& (DIFF_SYMBOL_CONTENT_WS_MASK
), 0);
1036 case DIFF_SYMBOL_PLUS
:
1037 switch (flags
& (DIFF_SYMBOL_MOVED_LINE
|
1038 DIFF_SYMBOL_MOVED_LINE_ALT
|
1039 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
)) {
1040 case DIFF_SYMBOL_MOVED_LINE
|
1041 DIFF_SYMBOL_MOVED_LINE_ALT
|
1042 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1043 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_ALT_DIM
);
1045 case DIFF_SYMBOL_MOVED_LINE
|
1046 DIFF_SYMBOL_MOVED_LINE_ALT
:
1047 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_ALT
);
1049 case DIFF_SYMBOL_MOVED_LINE
|
1050 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1051 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED_DIM
);
1053 case DIFF_SYMBOL_MOVED_LINE
:
1054 set
= diff_get_color_opt(o
, DIFF_FILE_NEW_MOVED
);
1057 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1059 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1060 emit_line_ws_markup(o
, set
, reset
, line
, len
, '+',
1061 flags
& DIFF_SYMBOL_CONTENT_WS_MASK
,
1062 flags
& DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF
);
1064 case DIFF_SYMBOL_MINUS
:
1065 switch (flags
& (DIFF_SYMBOL_MOVED_LINE
|
1066 DIFF_SYMBOL_MOVED_LINE_ALT
|
1067 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
)) {
1068 case DIFF_SYMBOL_MOVED_LINE
|
1069 DIFF_SYMBOL_MOVED_LINE_ALT
|
1070 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1071 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_ALT_DIM
);
1073 case DIFF_SYMBOL_MOVED_LINE
|
1074 DIFF_SYMBOL_MOVED_LINE_ALT
:
1075 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_ALT
);
1077 case DIFF_SYMBOL_MOVED_LINE
|
1078 DIFF_SYMBOL_MOVED_LINE_UNINTERESTING
:
1079 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED_DIM
);
1081 case DIFF_SYMBOL_MOVED_LINE
:
1082 set
= diff_get_color_opt(o
, DIFF_FILE_OLD_MOVED
);
1085 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1087 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1088 emit_line_ws_markup(o
, set
, reset
, line
, len
, '-',
1089 flags
& DIFF_SYMBOL_CONTENT_WS_MASK
, 0);
1091 case DIFF_SYMBOL_WORDS_PORCELAIN
:
1092 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1093 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1094 emit_line(o
, context
, reset
, line
, len
);
1095 fputs("~\n", o
->file
);
1097 case DIFF_SYMBOL_WORDS
:
1098 context
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1099 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1101 * Skip the prefix character, if any. With
1102 * diff_suppress_blank_empty, there may be
1105 if (line
[0] != '\n') {
1109 emit_line(o
, context
, reset
, line
, len
);
1111 case DIFF_SYMBOL_FILEPAIR_PLUS
:
1112 meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
1113 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1114 fprintf(o
->file
, "%s%s+++ %s%s%s\n", diff_line_prefix(o
), meta
,
1116 strchr(line
, ' ') ? "\t" : "");
1118 case DIFF_SYMBOL_FILEPAIR_MINUS
:
1119 meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
1120 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1121 fprintf(o
->file
, "%s%s--- %s%s%s\n", diff_line_prefix(o
), meta
,
1123 strchr(line
, ' ') ? "\t" : "");
1125 case DIFF_SYMBOL_BINARY_FILES
:
1126 case DIFF_SYMBOL_HEADER
:
1127 fprintf(o
->file
, "%s", line
);
1129 case DIFF_SYMBOL_BINARY_DIFF_HEADER
:
1130 fprintf(o
->file
, "%sGIT binary patch\n", diff_line_prefix(o
));
1132 case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
:
1133 fprintf(o
->file
, "%sdelta %s\n", diff_line_prefix(o
), line
);
1135 case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
:
1136 fprintf(o
->file
, "%sliteral %s\n", diff_line_prefix(o
), line
);
1138 case DIFF_SYMBOL_BINARY_DIFF_FOOTER
:
1139 fputs(diff_line_prefix(o
), o
->file
);
1140 fputc('\n', o
->file
);
1142 case DIFF_SYMBOL_REWRITE_DIFF
:
1143 fraginfo
= diff_get_color(o
->use_color
, DIFF_FRAGINFO
);
1144 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1145 emit_line(o
, fraginfo
, reset
, line
, len
);
1147 case DIFF_SYMBOL_SUBMODULE_ADD
:
1148 set
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1149 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1150 emit_line(o
, set
, reset
, line
, len
);
1152 case DIFF_SYMBOL_SUBMODULE_DEL
:
1153 set
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1154 reset
= diff_get_color_opt(o
, DIFF_RESET
);
1155 emit_line(o
, set
, reset
, line
, len
);
1157 case DIFF_SYMBOL_SUBMODULE_UNTRACKED
:
1158 fprintf(o
->file
, "%sSubmodule %s contains untracked content\n",
1159 diff_line_prefix(o
), line
);
1161 case DIFF_SYMBOL_SUBMODULE_MODIFIED
:
1162 fprintf(o
->file
, "%sSubmodule %s contains modified content\n",
1163 diff_line_prefix(o
), line
);
1165 case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
:
1166 emit_line(o
, "", "", " 0 files changed\n",
1167 strlen(" 0 files changed\n"));
1169 case DIFF_SYMBOL_STATS_SUMMARY_ABBREV
:
1170 emit_line(o
, "", "", " ...\n", strlen(" ...\n"));
1172 case DIFF_SYMBOL_WORD_DIFF
:
1173 fprintf(o
->file
, "%.*s", len
, line
);
1175 case DIFF_SYMBOL_STAT_SEP
:
1176 fputs(o
->stat_sep
, o
->file
);
1179 die("BUG: unknown diff symbol");
1181 strbuf_release(&sb
);
1184 static void emit_diff_symbol(struct diff_options
*o
, enum diff_symbol s
,
1185 const char *line
, int len
, unsigned flags
)
1187 struct emitted_diff_symbol e
= {line
, len
, flags
, s
};
1189 if (o
->emitted_symbols
)
1190 append_emitted_diff_symbol(o
, &e
);
1192 emit_diff_symbol_from_struct(o
, &e
);
1195 void diff_emit_submodule_del(struct diff_options
*o
, const char *line
)
1197 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_DEL
, line
, strlen(line
), 0);
1200 void diff_emit_submodule_add(struct diff_options
*o
, const char *line
)
1202 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_ADD
, line
, strlen(line
), 0);
1205 void diff_emit_submodule_untracked(struct diff_options
*o
, const char *path
)
1207 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_UNTRACKED
,
1208 path
, strlen(path
), 0);
1211 void diff_emit_submodule_modified(struct diff_options
*o
, const char *path
)
1213 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_MODIFIED
,
1214 path
, strlen(path
), 0);
1217 void diff_emit_submodule_header(struct diff_options
*o
, const char *header
)
1219 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_HEADER
,
1220 header
, strlen(header
), 0);
1223 void diff_emit_submodule_error(struct diff_options
*o
, const char *err
)
1225 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_ERROR
, err
, strlen(err
), 0);
1228 void diff_emit_submodule_pipethrough(struct diff_options
*o
,
1229 const char *line
, int len
)
1231 emit_diff_symbol(o
, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH
, line
, len
, 0);
1234 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
1236 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
1237 ecbdata
->blank_at_eof_in_preimage
&&
1238 ecbdata
->blank_at_eof_in_postimage
&&
1239 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
1240 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
1242 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
1245 static void emit_add_line(const char *reset
,
1246 struct emit_callback
*ecbdata
,
1247 const char *line
, int len
)
1249 unsigned flags
= WSEH_NEW
| ecbdata
->ws_rule
;
1250 if (new_blank_line_at_eof(ecbdata
, line
, len
))
1251 flags
|= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF
;
1253 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_PLUS
, line
, len
, flags
);
1256 static void emit_del_line(const char *reset
,
1257 struct emit_callback
*ecbdata
,
1258 const char *line
, int len
)
1260 unsigned flags
= WSEH_OLD
| ecbdata
->ws_rule
;
1261 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_MINUS
, line
, len
, flags
);
1264 static void emit_context_line(const char *reset
,
1265 struct emit_callback
*ecbdata
,
1266 const char *line
, int len
)
1268 unsigned flags
= WSEH_CONTEXT
| ecbdata
->ws_rule
;
1269 emit_diff_symbol(ecbdata
->opt
, DIFF_SYMBOL_CONTEXT
, line
, len
, flags
);
1272 static void emit_hunk_header(struct emit_callback
*ecbdata
,
1273 const char *line
, int len
)
1275 const char *context
= diff_get_color(ecbdata
->color_diff
, DIFF_CONTEXT
);
1276 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
1277 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
1278 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1279 static const char atat
[2] = { '@', '@' };
1280 const char *cp
, *ep
;
1281 struct strbuf msgbuf
= STRBUF_INIT
;
1286 * As a hunk header must begin with "@@ -<old>, +<new> @@",
1287 * it always is at least 10 bytes long.
1290 memcmp(line
, atat
, 2) ||
1291 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
1292 emit_diff_symbol(ecbdata
->opt
,
1293 DIFF_SYMBOL_CONTEXT_MARKER
, line
, len
, 0);
1296 ep
+= 2; /* skip over @@ */
1298 /* The hunk header in fraginfo color */
1299 strbuf_addstr(&msgbuf
, frag
);
1300 strbuf_add(&msgbuf
, line
, ep
- line
);
1301 strbuf_addstr(&msgbuf
, reset
);
1307 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
1310 /* blank before the func header */
1311 for (cp
= ep
; ep
- line
< len
; ep
++)
1312 if (*ep
!= ' ' && *ep
!= '\t')
1315 strbuf_addstr(&msgbuf
, context
);
1316 strbuf_add(&msgbuf
, cp
, ep
- cp
);
1317 strbuf_addstr(&msgbuf
, reset
);
1320 if (ep
< line
+ len
) {
1321 strbuf_addstr(&msgbuf
, func
);
1322 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
1323 strbuf_addstr(&msgbuf
, reset
);
1326 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
1327 strbuf_complete_line(&msgbuf
);
1328 emit_diff_symbol(ecbdata
->opt
,
1329 DIFF_SYMBOL_CONTEXT_FRAGINFO
, msgbuf
.buf
, msgbuf
.len
, 0);
1330 strbuf_release(&msgbuf
);
1333 static struct diff_tempfile
*claim_diff_tempfile(void) {
1335 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
1336 if (!diff_temp
[i
].name
)
1337 return diff_temp
+ i
;
1338 die("BUG: diff is failing to clean up its tempfiles");
1341 static void remove_tempfile(void)
1344 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
1345 if (is_tempfile_active(diff_temp
[i
].tempfile
))
1346 delete_tempfile(&diff_temp
[i
].tempfile
);
1347 diff_temp
[i
].name
= NULL
;
1351 static void add_line_count(struct strbuf
*out
, int count
)
1355 strbuf_addstr(out
, "0,0");
1358 strbuf_addstr(out
, "1");
1361 strbuf_addf(out
, "1,%d", count
);
1366 static void emit_rewrite_lines(struct emit_callback
*ecb
,
1367 int prefix
, const char *data
, int size
)
1369 const char *endp
= NULL
;
1370 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
1375 endp
= memchr(data
, '\n', size
);
1376 len
= endp
? (endp
- data
+ 1) : size
;
1377 if (prefix
!= '+') {
1378 ecb
->lno_in_preimage
++;
1379 emit_del_line(reset
, ecb
, data
, len
);
1381 ecb
->lno_in_postimage
++;
1382 emit_add_line(reset
, ecb
, data
, len
);
1388 emit_diff_symbol(ecb
->opt
, DIFF_SYMBOL_NO_LF_EOF
, NULL
, 0, 0);
1391 static void emit_rewrite_diff(const char *name_a
,
1393 struct diff_filespec
*one
,
1394 struct diff_filespec
*two
,
1395 struct userdiff_driver
*textconv_one
,
1396 struct userdiff_driver
*textconv_two
,
1397 struct diff_options
*o
)
1400 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
1401 const char *a_prefix
, *b_prefix
;
1402 char *data_one
, *data_two
;
1403 size_t size_one
, size_two
;
1404 struct emit_callback ecbdata
;
1405 struct strbuf out
= STRBUF_INIT
;
1407 if (diff_mnemonic_prefix
&& o
->flags
.reverse_diff
) {
1408 a_prefix
= o
->b_prefix
;
1409 b_prefix
= o
->a_prefix
;
1411 a_prefix
= o
->a_prefix
;
1412 b_prefix
= o
->b_prefix
;
1415 name_a
+= (*name_a
== '/');
1416 name_b
+= (*name_b
== '/');
1418 strbuf_reset(&a_name
);
1419 strbuf_reset(&b_name
);
1420 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
1421 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
1423 size_one
= fill_textconv(textconv_one
, one
, &data_one
);
1424 size_two
= fill_textconv(textconv_two
, two
, &data_two
);
1426 memset(&ecbdata
, 0, sizeof(ecbdata
));
1427 ecbdata
.color_diff
= want_color(o
->use_color
);
1428 ecbdata
.ws_rule
= whitespace_rule(name_b
);
1430 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
1432 mf1
.ptr
= (char *)data_one
;
1433 mf2
.ptr
= (char *)data_two
;
1434 mf1
.size
= size_one
;
1435 mf2
.size
= size_two
;
1436 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1438 ecbdata
.lno_in_preimage
= 1;
1439 ecbdata
.lno_in_postimage
= 1;
1441 lc_a
= count_lines(data_one
, size_one
);
1442 lc_b
= count_lines(data_two
, size_two
);
1444 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_MINUS
,
1445 a_name
.buf
, a_name
.len
, 0);
1446 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_PLUS
,
1447 b_name
.buf
, b_name
.len
, 0);
1449 strbuf_addstr(&out
, "@@ -");
1450 if (!o
->irreversible_delete
)
1451 add_line_count(&out
, lc_a
);
1453 strbuf_addstr(&out
, "?,?");
1454 strbuf_addstr(&out
, " +");
1455 add_line_count(&out
, lc_b
);
1456 strbuf_addstr(&out
, " @@\n");
1457 emit_diff_symbol(o
, DIFF_SYMBOL_REWRITE_DIFF
, out
.buf
, out
.len
, 0);
1458 strbuf_release(&out
);
1460 if (lc_a
&& !o
->irreversible_delete
)
1461 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
1463 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
1465 free((char *)data_one
);
1467 free((char *)data_two
);
1470 struct diff_words_buffer
{
1472 unsigned long alloc
;
1473 struct diff_words_orig
{
1474 const char *begin
, *end
;
1476 int orig_nr
, orig_alloc
;
1479 static void diff_words_append(char *line
, unsigned long len
,
1480 struct diff_words_buffer
*buffer
)
1482 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
1485 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
1486 buffer
->text
.size
+= len
;
1487 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
1490 struct diff_words_style_elem
{
1493 const char *color
; /* NULL; filled in by the setup code if
1494 * color is enabled */
1497 struct diff_words_style
{
1498 enum diff_words_type type
;
1499 struct diff_words_style_elem new_word
, old_word
, ctx
;
1500 const char *newline
;
1503 static struct diff_words_style diff_words_styles
[] = {
1504 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
1505 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
1506 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
1509 struct diff_words_data
{
1510 struct diff_words_buffer minus
, plus
;
1511 const char *current_plus
;
1513 struct diff_options
*opt
;
1514 regex_t
*word_regex
;
1515 enum diff_words_type type
;
1516 struct diff_words_style
*style
;
1519 static int fn_out_diff_words_write_helper(struct diff_options
*o
,
1520 struct diff_words_style_elem
*st_el
,
1521 const char *newline
,
1522 size_t count
, const char *buf
)
1525 struct strbuf sb
= STRBUF_INIT
;
1528 char *p
= memchr(buf
, '\n', count
);
1530 strbuf_addstr(&sb
, diff_line_prefix(o
));
1533 const char *reset
= st_el
->color
&& *st_el
->color
?
1534 GIT_COLOR_RESET
: NULL
;
1535 if (st_el
->color
&& *st_el
->color
)
1536 strbuf_addstr(&sb
, st_el
->color
);
1537 strbuf_addstr(&sb
, st_el
->prefix
);
1538 strbuf_add(&sb
, buf
, p
? p
- buf
: count
);
1539 strbuf_addstr(&sb
, st_el
->suffix
);
1541 strbuf_addstr(&sb
, reset
);
1546 strbuf_addstr(&sb
, newline
);
1547 count
-= p
+ 1 - buf
;
1551 emit_diff_symbol(o
, DIFF_SYMBOL_WORD_DIFF
,
1559 emit_diff_symbol(o
, DIFF_SYMBOL_WORD_DIFF
,
1561 strbuf_release(&sb
);
1566 * '--color-words' algorithm can be described as:
1568 * 1. collect the minus/plus lines of a diff hunk, divided into
1569 * minus-lines and plus-lines;
1571 * 2. break both minus-lines and plus-lines into words and
1572 * place them into two mmfile_t with one word for each line;
1574 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
1576 * And for the common parts of the both file, we output the plus side text.
1577 * diff_words->current_plus is used to trace the current position of the plus file
1578 * which printed. diff_words->last_minus is used to trace the last minus word
1581 * For '--graph' to work with '--color-words', we need to output the graph prefix
1582 * on each line of color words output. Generally, there are two conditions on
1583 * which we should output the prefix.
1585 * 1. diff_words->last_minus == 0 &&
1586 * diff_words->current_plus == diff_words->plus.text.ptr
1588 * that is: the plus text must start as a new line, and if there is no minus
1589 * word printed, a graph prefix must be printed.
1591 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
1592 * *(diff_words->current_plus - 1) == '\n'
1594 * that is: a graph prefix must be printed following a '\n'
1596 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
1598 if ((diff_words
->last_minus
== 0 &&
1599 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
1600 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
1601 *(diff_words
->current_plus
- 1) == '\n')) {
1608 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
1610 struct diff_words_data
*diff_words
= priv
;
1611 struct diff_words_style
*style
= diff_words
->style
;
1612 int minus_first
, minus_len
, plus_first
, plus_len
;
1613 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
1614 struct diff_options
*opt
= diff_words
->opt
;
1615 const char *line_prefix
;
1617 if (line
[0] != '@' || parse_hunk_header(line
, len
,
1618 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
1622 line_prefix
= diff_line_prefix(opt
);
1624 /* POSIX requires that first be decremented by one if len == 0... */
1626 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
1628 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
1630 minus_begin
= minus_end
=
1631 diff_words
->minus
.orig
[minus_first
].end
;
1634 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
1635 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
1637 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
1639 if (color_words_output_graph_prefix(diff_words
)) {
1640 fputs(line_prefix
, diff_words
->opt
->file
);
1642 if (diff_words
->current_plus
!= plus_begin
) {
1643 fn_out_diff_words_write_helper(diff_words
->opt
,
1644 &style
->ctx
, style
->newline
,
1645 plus_begin
- diff_words
->current_plus
,
1646 diff_words
->current_plus
);
1648 if (minus_begin
!= minus_end
) {
1649 fn_out_diff_words_write_helper(diff_words
->opt
,
1650 &style
->old_word
, style
->newline
,
1651 minus_end
- minus_begin
, minus_begin
);
1653 if (plus_begin
!= plus_end
) {
1654 fn_out_diff_words_write_helper(diff_words
->opt
,
1655 &style
->new_word
, style
->newline
,
1656 plus_end
- plus_begin
, plus_begin
);
1659 diff_words
->current_plus
= plus_end
;
1660 diff_words
->last_minus
= minus_first
;
1663 /* This function starts looking at *begin, and returns 0 iff a word was found. */
1664 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
1665 int *begin
, int *end
)
1667 if (word_regex
&& *begin
< buffer
->size
) {
1668 regmatch_t match
[1];
1669 if (!regexec_buf(word_regex
, buffer
->ptr
+ *begin
,
1670 buffer
->size
- *begin
, 1, match
, 0)) {
1671 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
1672 '\n', match
[0].rm_eo
- match
[0].rm_so
);
1673 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
1674 *begin
+= match
[0].rm_so
;
1675 return *begin
>= *end
;
1680 /* find the next word */
1681 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
1683 if (*begin
>= buffer
->size
)
1686 /* find the end of the word */
1688 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
1695 * This function splits the words in buffer->text, stores the list with
1696 * newline separator into out, and saves the offsets of the original words
1699 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
1700 regex_t
*word_regex
)
1708 /* fake an empty "0th" word */
1709 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
1710 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
1711 buffer
->orig_nr
= 1;
1713 for (i
= 0; i
< buffer
->text
.size
; i
++) {
1714 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
1717 /* store original boundaries */
1718 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
1719 buffer
->orig_alloc
);
1720 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
1721 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
1724 /* store one word */
1725 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
1726 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
1727 out
->ptr
[out
->size
+ j
- i
] = '\n';
1728 out
->size
+= j
- i
+ 1;
1734 /* this executes the word diff on the accumulated buffers */
1735 static void diff_words_show(struct diff_words_data
*diff_words
)
1739 mmfile_t minus
, plus
;
1740 struct diff_words_style
*style
= diff_words
->style
;
1742 struct diff_options
*opt
= diff_words
->opt
;
1743 const char *line_prefix
;
1746 line_prefix
= diff_line_prefix(opt
);
1748 /* special case: only removal */
1749 if (!diff_words
->plus
.text
.size
) {
1750 emit_diff_symbol(diff_words
->opt
, DIFF_SYMBOL_WORD_DIFF
,
1751 line_prefix
, strlen(line_prefix
), 0);
1752 fn_out_diff_words_write_helper(diff_words
->opt
,
1753 &style
->old_word
, style
->newline
,
1754 diff_words
->minus
.text
.size
,
1755 diff_words
->minus
.text
.ptr
);
1756 diff_words
->minus
.text
.size
= 0;
1760 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
1761 diff_words
->last_minus
= 0;
1763 memset(&xpp
, 0, sizeof(xpp
));
1764 memset(&xecfg
, 0, sizeof(xecfg
));
1765 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
1766 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
1768 /* as only the hunk header will be parsed, we need a 0-context */
1770 if (xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
1772 die("unable to generate word diff");
1775 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
1776 diff_words
->plus
.text
.size
) {
1777 if (color_words_output_graph_prefix(diff_words
))
1778 emit_diff_symbol(diff_words
->opt
, DIFF_SYMBOL_WORD_DIFF
,
1779 line_prefix
, strlen(line_prefix
), 0);
1780 fn_out_diff_words_write_helper(diff_words
->opt
,
1781 &style
->ctx
, style
->newline
,
1782 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
1783 - diff_words
->current_plus
, diff_words
->current_plus
);
1785 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
1788 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
1789 static void diff_words_flush(struct emit_callback
*ecbdata
)
1791 struct diff_options
*wo
= ecbdata
->diff_words
->opt
;
1793 if (ecbdata
->diff_words
->minus
.text
.size
||
1794 ecbdata
->diff_words
->plus
.text
.size
)
1795 diff_words_show(ecbdata
->diff_words
);
1797 if (wo
->emitted_symbols
) {
1798 struct diff_options
*o
= ecbdata
->opt
;
1799 struct emitted_diff_symbols
*wol
= wo
->emitted_symbols
;
1804 * Instead of appending each, concat all words to a line?
1806 for (i
= 0; i
< wol
->nr
; i
++)
1807 append_emitted_diff_symbol(o
, &wol
->buf
[i
]);
1809 for (i
= 0; i
< wol
->nr
; i
++)
1810 free((void *)wol
->buf
[i
].line
);
1816 static void diff_filespec_load_driver(struct diff_filespec
*one
)
1818 /* Use already-loaded driver */
1822 if (S_ISREG(one
->mode
))
1823 one
->driver
= userdiff_find_by_path(one
->path
);
1825 /* Fallback to default settings */
1827 one
->driver
= userdiff_find_by_name("default");
1830 static const char *userdiff_word_regex(struct diff_filespec
*one
)
1832 diff_filespec_load_driver(one
);
1833 return one
->driver
->word_regex
;
1836 static void init_diff_words_data(struct emit_callback
*ecbdata
,
1837 struct diff_options
*orig_opts
,
1838 struct diff_filespec
*one
,
1839 struct diff_filespec
*two
)
1842 struct diff_options
*o
= xmalloc(sizeof(struct diff_options
));
1843 memcpy(o
, orig_opts
, sizeof(struct diff_options
));
1845 ecbdata
->diff_words
=
1846 xcalloc(1, sizeof(struct diff_words_data
));
1847 ecbdata
->diff_words
->type
= o
->word_diff
;
1848 ecbdata
->diff_words
->opt
= o
;
1850 if (orig_opts
->emitted_symbols
)
1851 o
->emitted_symbols
=
1852 xcalloc(1, sizeof(struct emitted_diff_symbols
));
1855 o
->word_regex
= userdiff_word_regex(one
);
1857 o
->word_regex
= userdiff_word_regex(two
);
1859 o
->word_regex
= diff_word_regex_cfg
;
1860 if (o
->word_regex
) {
1861 ecbdata
->diff_words
->word_regex
= (regex_t
*)
1862 xmalloc(sizeof(regex_t
));
1863 if (regcomp(ecbdata
->diff_words
->word_regex
,
1865 REG_EXTENDED
| REG_NEWLINE
))
1866 die ("Invalid regular expression: %s",
1869 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
1870 if (o
->word_diff
== diff_words_styles
[i
].type
) {
1871 ecbdata
->diff_words
->style
=
1872 &diff_words_styles
[i
];
1876 if (want_color(o
->use_color
)) {
1877 struct diff_words_style
*st
= ecbdata
->diff_words
->style
;
1878 st
->old_word
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1879 st
->new_word
.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1880 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_CONTEXT
);
1884 static void free_diff_words_data(struct emit_callback
*ecbdata
)
1886 if (ecbdata
->diff_words
) {
1887 diff_words_flush(ecbdata
);
1888 free (ecbdata
->diff_words
->opt
->emitted_symbols
);
1889 free (ecbdata
->diff_words
->opt
);
1890 free (ecbdata
->diff_words
->minus
.text
.ptr
);
1891 free (ecbdata
->diff_words
->minus
.orig
);
1892 free (ecbdata
->diff_words
->plus
.text
.ptr
);
1893 free (ecbdata
->diff_words
->plus
.orig
);
1894 if (ecbdata
->diff_words
->word_regex
) {
1895 regfree(ecbdata
->diff_words
->word_regex
);
1896 free(ecbdata
->diff_words
->word_regex
);
1898 FREE_AND_NULL(ecbdata
->diff_words
);
1902 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
1904 if (want_color(diff_use_color
))
1905 return diff_colors
[ix
];
1909 const char *diff_line_prefix(struct diff_options
*opt
)
1911 struct strbuf
*msgbuf
;
1912 if (!opt
->output_prefix
)
1915 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
1919 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
1922 unsigned long allot
;
1928 (void) utf8_width(&cp
, &l
);
1930 break; /* truncated in the middle? */
1935 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
1938 ecbdata
->lno_in_preimage
= 0;
1939 ecbdata
->lno_in_postimage
= 0;
1940 p
= strchr(line
, '-');
1942 return; /* cannot happen */
1943 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
1946 return; /* cannot happen */
1947 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
1950 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
1952 struct emit_callback
*ecbdata
= priv
;
1953 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1954 struct diff_options
*o
= ecbdata
->opt
;
1956 o
->found_changes
= 1;
1958 if (ecbdata
->header
) {
1959 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
1960 ecbdata
->header
->buf
, ecbdata
->header
->len
, 0);
1961 strbuf_reset(ecbdata
->header
);
1962 ecbdata
->header
= NULL
;
1965 if (ecbdata
->label_path
[0]) {
1966 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_MINUS
,
1967 ecbdata
->label_path
[0],
1968 strlen(ecbdata
->label_path
[0]), 0);
1969 emit_diff_symbol(o
, DIFF_SYMBOL_FILEPAIR_PLUS
,
1970 ecbdata
->label_path
[1],
1971 strlen(ecbdata
->label_path
[1]), 0);
1972 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
1975 if (diff_suppress_blank_empty
1976 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
1981 if (line
[0] == '@') {
1982 if (ecbdata
->diff_words
)
1983 diff_words_flush(ecbdata
);
1984 len
= sane_truncate_line(ecbdata
, line
, len
);
1985 find_lno(line
, ecbdata
);
1986 emit_hunk_header(ecbdata
, line
, len
);
1990 if (ecbdata
->diff_words
) {
1991 enum diff_symbol s
=
1992 ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
?
1993 DIFF_SYMBOL_WORDS_PORCELAIN
: DIFF_SYMBOL_WORDS
;
1994 if (line
[0] == '-') {
1995 diff_words_append(line
, len
,
1996 &ecbdata
->diff_words
->minus
);
1998 } else if (line
[0] == '+') {
1999 diff_words_append(line
, len
,
2000 &ecbdata
->diff_words
->plus
);
2002 } else if (starts_with(line
, "\\ ")) {
2004 * Eat the "no newline at eof" marker as if we
2005 * saw a "+" or "-" line with nothing on it,
2006 * and return without diff_words_flush() to
2007 * defer processing. If this is the end of
2008 * preimage, more "+" lines may come after it.
2012 diff_words_flush(ecbdata
);
2013 emit_diff_symbol(o
, s
, line
, len
, 0);
2019 ecbdata
->lno_in_postimage
++;
2020 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
2023 ecbdata
->lno_in_preimage
++;
2024 emit_del_line(reset
, ecbdata
, line
+ 1, len
- 1);
2027 ecbdata
->lno_in_postimage
++;
2028 ecbdata
->lno_in_preimage
++;
2029 emit_context_line(reset
, ecbdata
, line
+ 1, len
- 1);
2032 /* incomplete line at the end */
2033 ecbdata
->lno_in_preimage
++;
2034 emit_diff_symbol(o
, DIFF_SYMBOL_CONTEXT_INCOMPLETE
,
2040 static void pprint_rename(struct strbuf
*name
, const char *a
, const char *b
)
2042 const char *old_name
= a
;
2043 const char *new_name
= b
;
2044 int pfx_length
, sfx_length
;
2045 int pfx_adjust_for_slash
;
2046 int len_a
= strlen(a
);
2047 int len_b
= strlen(b
);
2048 int a_midlen
, b_midlen
;
2049 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
2050 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
2052 if (qlen_a
|| qlen_b
) {
2053 quote_c_style(a
, name
, NULL
, 0);
2054 strbuf_addstr(name
, " => ");
2055 quote_c_style(b
, name
, NULL
, 0);
2059 /* Find common prefix */
2061 while (*old_name
&& *new_name
&& *old_name
== *new_name
) {
2062 if (*old_name
== '/')
2063 pfx_length
= old_name
- a
+ 1;
2068 /* Find common suffix */
2069 old_name
= a
+ len_a
;
2070 new_name
= b
+ len_b
;
2073 * If there is a common prefix, it must end in a slash. In
2074 * that case we let this loop run 1 into the prefix to see the
2077 * If there is no common prefix, we cannot do this as it would
2078 * underrun the input strings.
2080 pfx_adjust_for_slash
= (pfx_length
? 1 : 0);
2081 while (a
+ pfx_length
- pfx_adjust_for_slash
<= old_name
&&
2082 b
+ pfx_length
- pfx_adjust_for_slash
<= new_name
&&
2083 *old_name
== *new_name
) {
2084 if (*old_name
== '/')
2085 sfx_length
= len_a
- (old_name
- a
);
2091 * pfx{mid-a => mid-b}sfx
2092 * {pfx-a => pfx-b}sfx
2093 * pfx{sfx-a => sfx-b}
2096 a_midlen
= len_a
- pfx_length
- sfx_length
;
2097 b_midlen
= len_b
- pfx_length
- sfx_length
;
2103 strbuf_grow(name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
2104 if (pfx_length
+ sfx_length
) {
2105 strbuf_add(name
, a
, pfx_length
);
2106 strbuf_addch(name
, '{');
2108 strbuf_add(name
, a
+ pfx_length
, a_midlen
);
2109 strbuf_addstr(name
, " => ");
2110 strbuf_add(name
, b
+ pfx_length
, b_midlen
);
2111 if (pfx_length
+ sfx_length
) {
2112 strbuf_addch(name
, '}');
2113 strbuf_add(name
, a
+ len_a
- sfx_length
, sfx_length
);
2120 struct diffstat_file
{
2124 const char *comments
;
2125 unsigned is_unmerged
:1;
2126 unsigned is_binary
:1;
2127 unsigned is_renamed
:1;
2128 unsigned is_interesting
:1;
2129 uintmax_t added
, deleted
;
2133 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
2137 struct diffstat_file
*x
;
2138 x
= xcalloc(1, sizeof(*x
));
2139 ALLOC_GROW(diffstat
->files
, diffstat
->nr
+ 1, diffstat
->alloc
);
2140 diffstat
->files
[diffstat
->nr
++] = x
;
2142 x
->from_name
= xstrdup(name_a
);
2143 x
->name
= xstrdup(name_b
);
2147 x
->from_name
= NULL
;
2148 x
->name
= xstrdup(name_a
);
2153 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
2155 struct diffstat_t
*diffstat
= priv
;
2156 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
2160 else if (line
[0] == '-')
2164 const char mime_boundary_leader
[] = "------------";
2166 static int scale_linear(int it
, int width
, int max_change
)
2171 * make sure that at least one '-' or '+' is printed if
2172 * there is any change to this path. The easiest way is to
2173 * scale linearly as if the alloted width is one column shorter
2174 * than it is, and then add 1 to the result.
2176 return 1 + (it
* (width
- 1) / max_change
);
2179 static void show_graph(struct strbuf
*out
, char ch
, int cnt
,
2180 const char *set
, const char *reset
)
2184 strbuf_addstr(out
, set
);
2185 strbuf_addchars(out
, ch
, cnt
);
2186 strbuf_addstr(out
, reset
);
2189 static void fill_print_name(struct diffstat_file
*file
)
2191 struct strbuf pname
= STRBUF_INIT
;
2193 if (file
->print_name
)
2196 if (file
->is_renamed
)
2197 pprint_rename(&pname
, file
->from_name
, file
->name
);
2199 quote_c_style(file
->name
, &pname
, NULL
, 0);
2202 strbuf_addf(&pname
, " (%s)", file
->comments
);
2204 file
->print_name
= strbuf_detach(&pname
, NULL
);
2207 static void print_stat_summary_inserts_deletes(struct diff_options
*options
,
2208 int files
, int insertions
, int deletions
)
2210 struct strbuf sb
= STRBUF_INIT
;
2213 assert(insertions
== 0 && deletions
== 0);
2214 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES
,
2220 (files
== 1) ? " %d file changed" : " %d files changed",
2224 * For binary diff, the caller may want to print "x files
2225 * changed" with insertions == 0 && deletions == 0.
2227 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
2228 * is probably less confusing (i.e skip over "2 files changed
2229 * but nothing about added/removed lines? Is this a bug in Git?").
2231 if (insertions
|| deletions
== 0) {
2233 (insertions
== 1) ? ", %d insertion(+)" : ", %d insertions(+)",
2237 if (deletions
|| insertions
== 0) {
2239 (deletions
== 1) ? ", %d deletion(-)" : ", %d deletions(-)",
2242 strbuf_addch(&sb
, '\n');
2243 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES
,
2245 strbuf_release(&sb
);
2248 void print_stat_summary(FILE *fp
, int files
,
2249 int insertions
, int deletions
)
2251 struct diff_options o
;
2252 memset(&o
, 0, sizeof(o
));
2255 print_stat_summary_inserts_deletes(&o
, files
, insertions
, deletions
);
2258 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
2260 int i
, len
, add
, del
, adds
= 0, dels
= 0;
2261 uintmax_t max_change
= 0, max_len
= 0;
2262 int total_files
= data
->nr
, count
;
2263 int width
, name_width
, graph_width
, number_width
= 0, bin_width
= 0;
2264 const char *reset
, *add_c
, *del_c
;
2265 int extra_shown
= 0;
2266 const char *line_prefix
= diff_line_prefix(options
);
2267 struct strbuf out
= STRBUF_INIT
;
2272 count
= options
->stat_count
? options
->stat_count
: data
->nr
;
2274 reset
= diff_get_color_opt(options
, DIFF_RESET
);
2275 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
2276 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
2279 * Find the longest filename and max number of changes
2281 for (i
= 0; (i
< count
) && (i
< data
->nr
); i
++) {
2282 struct diffstat_file
*file
= data
->files
[i
];
2283 uintmax_t change
= file
->added
+ file
->deleted
;
2285 if (!file
->is_interesting
&& (change
== 0)) {
2286 count
++; /* not shown == room for one more */
2289 fill_print_name(file
);
2290 len
= strlen(file
->print_name
);
2294 if (file
->is_unmerged
) {
2295 /* "Unmerged" is 8 characters */
2296 bin_width
= bin_width
< 8 ? 8 : bin_width
;
2299 if (file
->is_binary
) {
2300 /* "Bin XXX -> YYY bytes" */
2301 int w
= 14 + decimal_width(file
->added
)
2302 + decimal_width(file
->deleted
);
2303 bin_width
= bin_width
< w
? w
: bin_width
;
2304 /* Display change counts aligned with "Bin" */
2309 if (max_change
< change
)
2310 max_change
= change
;
2312 count
= i
; /* where we can stop scanning in data->files[] */
2315 * We have width = stat_width or term_columns() columns total.
2316 * We want a maximum of min(max_len, stat_name_width) for the name part.
2317 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
2318 * We also need 1 for " " and 4 + decimal_width(max_change)
2319 * for " | NNNN " and one the empty column at the end, altogether
2320 * 6 + decimal_width(max_change).
2322 * If there's not enough space, we will use the smaller of
2323 * stat_name_width (if set) and 5/8*width for the filename,
2324 * and the rest for constant elements + graph part, but no more
2325 * than stat_graph_width for the graph part.
2326 * (5/8 gives 50 for filename and 30 for the constant parts + graph
2327 * for the standard terminal size).
2329 * In other words: stat_width limits the maximum width, and
2330 * stat_name_width fixes the maximum width of the filename,
2331 * and is also used to divide available columns if there
2334 * Binary files are displayed with "Bin XXX -> YYY bytes"
2335 * instead of the change count and graph. This part is treated
2336 * similarly to the graph part, except that it is not
2337 * "scaled". If total width is too small to accommodate the
2338 * guaranteed minimum width of the filename part and the
2339 * separators and this message, this message will "overflow"
2340 * making the line longer than the maximum width.
2343 if (options
->stat_width
== -1)
2344 width
= term_columns() - strlen(line_prefix
);
2346 width
= options
->stat_width
? options
->stat_width
: 80;
2347 number_width
= decimal_width(max_change
) > number_width
?
2348 decimal_width(max_change
) : number_width
;
2350 if (options
->stat_graph_width
== -1)
2351 options
->stat_graph_width
= diff_stat_graph_width
;
2354 * Guarantee 3/8*16==6 for the graph part
2355 * and 5/8*16==10 for the filename part
2357 if (width
< 16 + 6 + number_width
)
2358 width
= 16 + 6 + number_width
;
2361 * First assign sizes that are wanted, ignoring available width.
2362 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
2363 * starting from "XXX" should fit in graph_width.
2365 graph_width
= max_change
+ 4 > bin_width
? max_change
: bin_width
- 4;
2366 if (options
->stat_graph_width
&&
2367 options
->stat_graph_width
< graph_width
)
2368 graph_width
= options
->stat_graph_width
;
2370 name_width
= (options
->stat_name_width
> 0 &&
2371 options
->stat_name_width
< max_len
) ?
2372 options
->stat_name_width
: max_len
;
2375 * Adjust adjustable widths not to exceed maximum width
2377 if (name_width
+ number_width
+ 6 + graph_width
> width
) {
2378 if (graph_width
> width
* 3/8 - number_width
- 6) {
2379 graph_width
= width
* 3/8 - number_width
- 6;
2380 if (graph_width
< 6)
2384 if (options
->stat_graph_width
&&
2385 graph_width
> options
->stat_graph_width
)
2386 graph_width
= options
->stat_graph_width
;
2387 if (name_width
> width
- number_width
- 6 - graph_width
)
2388 name_width
= width
- number_width
- 6 - graph_width
;
2390 graph_width
= width
- number_width
- 6 - name_width
;
2394 * From here name_width is the width of the name area,
2395 * and graph_width is the width of the graph area.
2396 * max_change is used to scale graph properly.
2398 for (i
= 0; i
< count
; i
++) {
2399 const char *prefix
= "";
2400 struct diffstat_file
*file
= data
->files
[i
];
2401 char *name
= file
->print_name
;
2402 uintmax_t added
= file
->added
;
2403 uintmax_t deleted
= file
->deleted
;
2406 if (!file
->is_interesting
&& (added
+ deleted
== 0))
2410 * "scale" the filename
2413 name_len
= strlen(name
);
2414 if (name_width
< name_len
) {
2418 name
+= name_len
- len
;
2419 slash
= strchr(name
, '/');
2424 if (file
->is_binary
) {
2425 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2426 strbuf_addf(&out
, " %*s", number_width
, "Bin");
2427 if (!added
&& !deleted
) {
2428 strbuf_addch(&out
, '\n');
2429 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2430 out
.buf
, out
.len
, 0);
2434 strbuf_addf(&out
, " %s%"PRIuMAX
"%s",
2435 del_c
, deleted
, reset
);
2436 strbuf_addstr(&out
, " -> ");
2437 strbuf_addf(&out
, "%s%"PRIuMAX
"%s",
2438 add_c
, added
, reset
);
2439 strbuf_addstr(&out
, " bytes\n");
2440 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2441 out
.buf
, out
.len
, 0);
2445 else if (file
->is_unmerged
) {
2446 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2447 strbuf_addstr(&out
, " Unmerged\n");
2448 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2449 out
.buf
, out
.len
, 0);
2455 * scale the add/delete
2460 if (graph_width
<= max_change
) {
2461 int total
= scale_linear(add
+ del
, graph_width
, max_change
);
2462 if (total
< 2 && add
&& del
)
2463 /* width >= 2 due to the sanity check */
2466 add
= scale_linear(add
, graph_width
, max_change
);
2469 del
= scale_linear(del
, graph_width
, max_change
);
2473 strbuf_addf(&out
, " %s%-*s |", prefix
, len
, name
);
2474 strbuf_addf(&out
, " %*"PRIuMAX
"%s",
2475 number_width
, added
+ deleted
,
2476 added
+ deleted
? " " : "");
2477 show_graph(&out
, '+', add
, add_c
, reset
);
2478 show_graph(&out
, '-', del
, del_c
, reset
);
2479 strbuf_addch(&out
, '\n');
2480 emit_diff_symbol(options
, DIFF_SYMBOL_STATS_LINE
,
2481 out
.buf
, out
.len
, 0);
2485 for (i
= 0; i
< data
->nr
; i
++) {
2486 struct diffstat_file
*file
= data
->files
[i
];
2487 uintmax_t added
= file
->added
;
2488 uintmax_t deleted
= file
->deleted
;
2490 if (file
->is_unmerged
||
2491 (!file
->is_interesting
&& (added
+ deleted
== 0))) {
2496 if (!file
->is_binary
) {
2503 emit_diff_symbol(options
,
2504 DIFF_SYMBOL_STATS_SUMMARY_ABBREV
,
2509 print_stat_summary_inserts_deletes(options
, total_files
, adds
, dels
);
2510 strbuf_release(&out
);
2513 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
2515 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
2520 for (i
= 0; i
< data
->nr
; i
++) {
2521 int added
= data
->files
[i
]->added
;
2522 int deleted
= data
->files
[i
]->deleted
;
2524 if (data
->files
[i
]->is_unmerged
||
2525 (!data
->files
[i
]->is_interesting
&& (added
+ deleted
== 0))) {
2527 } else if (!data
->files
[i
]->is_binary
) { /* don't count bytes */
2532 print_stat_summary_inserts_deletes(options
, total_files
, adds
, dels
);
2535 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
2542 for (i
= 0; i
< data
->nr
; i
++) {
2543 struct diffstat_file
*file
= data
->files
[i
];
2545 fprintf(options
->file
, "%s", diff_line_prefix(options
));
2547 if (file
->is_binary
)
2548 fprintf(options
->file
, "-\t-\t");
2550 fprintf(options
->file
,
2551 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
2552 file
->added
, file
->deleted
);
2553 if (options
->line_termination
) {
2554 fill_print_name(file
);
2555 if (!file
->is_renamed
)
2556 write_name_quoted(file
->name
, options
->file
,
2557 options
->line_termination
);
2559 fputs(file
->print_name
, options
->file
);
2560 putc(options
->line_termination
, options
->file
);
2563 if (file
->is_renamed
) {
2564 putc('\0', options
->file
);
2565 write_name_quoted(file
->from_name
, options
->file
, '\0');
2567 write_name_quoted(file
->name
, options
->file
, '\0');
2572 struct dirstat_file
{
2574 unsigned long changed
;
2577 struct dirstat_dir
{
2578 struct dirstat_file
*files
;
2579 int alloc
, nr
, permille
, cumulative
;
2582 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
2583 unsigned long changed
, const char *base
, int baselen
)
2585 unsigned long sum_changes
= 0;
2586 unsigned int sources
= 0;
2587 const char *line_prefix
= diff_line_prefix(opt
);
2590 struct dirstat_file
*f
= dir
->files
;
2591 int namelen
= strlen(f
->name
);
2592 unsigned long changes
;
2595 if (namelen
< baselen
)
2597 if (memcmp(f
->name
, base
, baselen
))
2599 slash
= strchr(f
->name
+ baselen
, '/');
2601 int newbaselen
= slash
+ 1 - f
->name
;
2602 changes
= gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
2605 changes
= f
->changed
;
2610 sum_changes
+= changes
;
2614 * We don't report dirstat's for
2616 * - or cases where everything came from a single directory
2617 * under this directory (sources == 1).
2619 if (baselen
&& sources
!= 1) {
2621 int permille
= sum_changes
* 1000 / changed
;
2622 if (permille
>= dir
->permille
) {
2623 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
2624 permille
/ 10, permille
% 10, baselen
, base
);
2625 if (!dir
->cumulative
)
2633 static int dirstat_compare(const void *_a
, const void *_b
)
2635 const struct dirstat_file
*a
= _a
;
2636 const struct dirstat_file
*b
= _b
;
2637 return strcmp(a
->name
, b
->name
);
2640 static void show_dirstat(struct diff_options
*options
)
2643 unsigned long changed
;
2644 struct dirstat_dir dir
;
2645 struct diff_queue_struct
*q
= &diff_queued_diff
;
2650 dir
.permille
= options
->dirstat_permille
;
2651 dir
.cumulative
= options
->flags
.dirstat_cumulative
;
2654 for (i
= 0; i
< q
->nr
; i
++) {
2655 struct diff_filepair
*p
= q
->queue
[i
];
2657 unsigned long copied
, added
, damage
;
2658 int content_changed
;
2660 name
= p
->two
->path
? p
->two
->path
: p
->one
->path
;
2662 if (p
->one
->oid_valid
&& p
->two
->oid_valid
)
2663 content_changed
= oidcmp(&p
->one
->oid
, &p
->two
->oid
);
2665 content_changed
= 1;
2667 if (!content_changed
) {
2669 * The SHA1 has not changed, so pre-/post-content is
2670 * identical. We can therefore skip looking at the
2671 * file contents altogether.
2677 if (options
->flags
.dirstat_by_file
) {
2679 * In --dirstat-by-file mode, we don't really need to
2680 * look at the actual file contents at all.
2681 * The fact that the SHA1 changed is enough for us to
2682 * add this file to the list of results
2683 * (with each file contributing equal damage).
2689 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
2690 diff_populate_filespec(p
->one
, 0);
2691 diff_populate_filespec(p
->two
, 0);
2692 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
,
2694 diff_free_filespec_data(p
->one
);
2695 diff_free_filespec_data(p
->two
);
2696 } else if (DIFF_FILE_VALID(p
->one
)) {
2697 diff_populate_filespec(p
->one
, CHECK_SIZE_ONLY
);
2699 diff_free_filespec_data(p
->one
);
2700 } else if (DIFF_FILE_VALID(p
->two
)) {
2701 diff_populate_filespec(p
->two
, CHECK_SIZE_ONLY
);
2703 added
= p
->two
->size
;
2704 diff_free_filespec_data(p
->two
);
2709 * Original minus copied is the removed material,
2710 * added is the new material. They are both damages
2711 * made to the preimage.
2712 * If the resulting damage is zero, we know that
2713 * diffcore_count_changes() considers the two entries to
2714 * be identical, but since content_changed is true, we
2715 * know that there must have been _some_ kind of change,
2716 * so we force all entries to have damage > 0.
2718 damage
= (p
->one
->size
- copied
) + added
;
2723 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
2724 dir
.files
[dir
.nr
].name
= name
;
2725 dir
.files
[dir
.nr
].changed
= damage
;
2730 /* This can happen even with many files, if everything was renames */
2734 /* Show all directories with more than x% of the changes */
2735 QSORT(dir
.files
, dir
.nr
, dirstat_compare
);
2736 gather_dirstat(options
, &dir
, changed
, "", 0);
2739 static void show_dirstat_by_line(struct diffstat_t
*data
, struct diff_options
*options
)
2742 unsigned long changed
;
2743 struct dirstat_dir dir
;
2751 dir
.permille
= options
->dirstat_permille
;
2752 dir
.cumulative
= options
->flags
.dirstat_cumulative
;
2755 for (i
= 0; i
< data
->nr
; i
++) {
2756 struct diffstat_file
*file
= data
->files
[i
];
2757 unsigned long damage
= file
->added
+ file
->deleted
;
2758 if (file
->is_binary
)
2760 * binary files counts bytes, not lines. Must find some
2761 * way to normalize binary bytes vs. textual lines.
2762 * The following heuristic assumes that there are 64
2764 * This is stupid and ugly, but very cheap...
2766 damage
= DIV_ROUND_UP(damage
, 64);
2767 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
2768 dir
.files
[dir
.nr
].name
= file
->name
;
2769 dir
.files
[dir
.nr
].changed
= damage
;
2774 /* This can happen even with many files, if everything was renames */
2778 /* Show all directories with more than x% of the changes */
2779 QSORT(dir
.files
, dir
.nr
, dirstat_compare
);
2780 gather_dirstat(options
, &dir
, changed
, "", 0);
2783 static void free_diffstat_info(struct diffstat_t
*diffstat
)
2786 for (i
= 0; i
< diffstat
->nr
; i
++) {
2787 struct diffstat_file
*f
= diffstat
->files
[i
];
2788 free(f
->print_name
);
2793 free(diffstat
->files
);
2796 struct checkdiff_t
{
2797 const char *filename
;
2799 int conflict_marker_size
;
2800 struct diff_options
*o
;
2805 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
2810 if (len
< marker_size
+ 1)
2812 firstchar
= line
[0];
2813 switch (firstchar
) {
2814 case '=': case '>': case '<': case '|':
2819 for (cnt
= 1; cnt
< marker_size
; cnt
++)
2820 if (line
[cnt
] != firstchar
)
2822 /* line[1] thru line[marker_size-1] are same as firstchar */
2823 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
2828 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
2830 struct checkdiff_t
*data
= priv
;
2831 int marker_size
= data
->conflict_marker_size
;
2832 const char *ws
= diff_get_color(data
->o
->use_color
, DIFF_WHITESPACE
);
2833 const char *reset
= diff_get_color(data
->o
->use_color
, DIFF_RESET
);
2834 const char *set
= diff_get_color(data
->o
->use_color
, DIFF_FILE_NEW
);
2836 const char *line_prefix
;
2839 line_prefix
= diff_line_prefix(data
->o
);
2841 if (line
[0] == '+') {
2844 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
2846 fprintf(data
->o
->file
,
2847 "%s%s:%d: leftover conflict marker\n",
2848 line_prefix
, data
->filename
, data
->lineno
);
2850 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
2853 data
->status
|= bad
;
2854 err
= whitespace_error_string(bad
);
2855 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
2856 line_prefix
, data
->filename
, data
->lineno
, err
);
2858 emit_line(data
->o
, set
, reset
, line
, 1);
2859 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
2860 data
->o
->file
, set
, reset
, ws
);
2861 } else if (line
[0] == ' ') {
2863 } else if (line
[0] == '@') {
2864 char *plus
= strchr(line
, '+');
2866 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
2868 die("invalid diff");
2872 static unsigned char *deflate_it(char *data
,
2874 unsigned long *result_size
)
2877 unsigned char *deflated
;
2880 git_deflate_init(&stream
, zlib_compression_level
);
2881 bound
= git_deflate_bound(&stream
, size
);
2882 deflated
= xmalloc(bound
);
2883 stream
.next_out
= deflated
;
2884 stream
.avail_out
= bound
;
2886 stream
.next_in
= (unsigned char *)data
;
2887 stream
.avail_in
= size
;
2888 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
2890 git_deflate_end(&stream
);
2891 *result_size
= stream
.total_out
;
2895 static void emit_binary_diff_body(struct diff_options
*o
,
2896 mmfile_t
*one
, mmfile_t
*two
)
2902 unsigned long orig_size
;
2903 unsigned long delta_size
;
2904 unsigned long deflate_size
;
2905 unsigned long data_size
;
2907 /* We could do deflated delta, or we could do just deflated two,
2908 * whichever is smaller.
2911 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
2912 if (one
->size
&& two
->size
) {
2913 delta
= diff_delta(one
->ptr
, one
->size
,
2914 two
->ptr
, two
->size
,
2915 &delta_size
, deflate_size
);
2917 void *to_free
= delta
;
2918 orig_size
= delta_size
;
2919 delta
= deflate_it(delta
, delta_size
, &delta_size
);
2924 if (delta
&& delta_size
< deflate_size
) {
2925 char *s
= xstrfmt("%lu", orig_size
);
2926 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA
,
2931 data_size
= delta_size
;
2933 char *s
= xstrfmt("%lu", two
->size
);
2934 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL
,
2939 data_size
= deflate_size
;
2942 /* emit data encoded in base85 */
2946 int bytes
= (52 < data_size
) ? 52 : data_size
;
2950 line
[0] = bytes
+ 'A' - 1;
2952 line
[0] = bytes
- 26 + 'a' - 1;
2953 encode_85(line
+ 1, cp
, bytes
);
2954 cp
= (char *) cp
+ bytes
;
2960 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_BODY
,
2963 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_FOOTER
, NULL
, 0, 0);
2967 static void emit_binary_diff(struct diff_options
*o
,
2968 mmfile_t
*one
, mmfile_t
*two
)
2970 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_DIFF_HEADER
, NULL
, 0, 0);
2971 emit_binary_diff_body(o
, one
, two
);
2972 emit_binary_diff_body(o
, two
, one
);
2975 int diff_filespec_is_binary(struct diff_filespec
*one
)
2977 if (one
->is_binary
== -1) {
2978 diff_filespec_load_driver(one
);
2979 if (one
->driver
->binary
!= -1)
2980 one
->is_binary
= one
->driver
->binary
;
2982 if (!one
->data
&& DIFF_FILE_VALID(one
))
2983 diff_populate_filespec(one
, CHECK_BINARY
);
2984 if (one
->is_binary
== -1 && one
->data
)
2985 one
->is_binary
= buffer_is_binary(one
->data
,
2987 if (one
->is_binary
== -1)
2991 return one
->is_binary
;
2994 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
2996 diff_filespec_load_driver(one
);
2997 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
3000 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
3002 if (!options
->a_prefix
)
3003 options
->a_prefix
= a
;
3004 if (!options
->b_prefix
)
3005 options
->b_prefix
= b
;
3008 struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
3010 if (!DIFF_FILE_VALID(one
))
3013 diff_filespec_load_driver(one
);
3014 return userdiff_get_textconv(one
->driver
);
3017 static void builtin_diff(const char *name_a
,
3019 struct diff_filespec
*one
,
3020 struct diff_filespec
*two
,
3021 const char *xfrm_msg
,
3022 int must_show_header
,
3023 struct diff_options
*o
,
3024 int complete_rewrite
)
3028 char *a_one
, *b_two
;
3029 const char *meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
3030 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
3031 const char *a_prefix
, *b_prefix
;
3032 struct userdiff_driver
*textconv_one
= NULL
;
3033 struct userdiff_driver
*textconv_two
= NULL
;
3034 struct strbuf header
= STRBUF_INIT
;
3035 const char *line_prefix
= diff_line_prefix(o
);
3037 diff_set_mnemonic_prefix(o
, "a/", "b/");
3038 if (o
->flags
.reverse_diff
) {
3039 a_prefix
= o
->b_prefix
;
3040 b_prefix
= o
->a_prefix
;
3042 a_prefix
= o
->a_prefix
;
3043 b_prefix
= o
->b_prefix
;
3046 if (o
->submodule_format
== DIFF_SUBMODULE_LOG
&&
3047 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
3048 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
3049 show_submodule_summary(o
, one
->path
? one
->path
: two
->path
,
3050 &one
->oid
, &two
->oid
,
3051 two
->dirty_submodule
);
3053 } else if (o
->submodule_format
== DIFF_SUBMODULE_INLINE_DIFF
&&
3054 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
3055 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
3056 show_submodule_inline_diff(o
, one
->path
? one
->path
: two
->path
,
3057 &one
->oid
, &two
->oid
,
3058 two
->dirty_submodule
);
3062 if (o
->flags
.allow_textconv
) {
3063 textconv_one
= get_textconv(one
);
3064 textconv_two
= get_textconv(two
);
3067 /* Never use a non-valid filename anywhere if at all possible */
3068 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
3069 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
3071 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
3072 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
3073 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
3074 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
3075 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, meta
, a_one
, b_two
, reset
);
3076 if (lbl
[0][0] == '/') {
3078 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
3080 strbuf_addstr(&header
, xfrm_msg
);
3081 must_show_header
= 1;
3083 else if (lbl
[1][0] == '/') {
3084 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
3086 strbuf_addstr(&header
, xfrm_msg
);
3087 must_show_header
= 1;
3090 if (one
->mode
!= two
->mode
) {
3091 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
3092 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
3093 must_show_header
= 1;
3096 strbuf_addstr(&header
, xfrm_msg
);
3099 * we do not run diff between different kind
3102 if ((one
->mode
^ two
->mode
) & S_IFMT
)
3103 goto free_ab_and_return
;
3104 if (complete_rewrite
&&
3105 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
3106 (textconv_two
|| !diff_filespec_is_binary(two
))) {
3107 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3108 header
.buf
, header
.len
, 0);
3109 strbuf_reset(&header
);
3110 emit_rewrite_diff(name_a
, name_b
, one
, two
,
3111 textconv_one
, textconv_two
, o
);
3112 o
->found_changes
= 1;
3113 goto free_ab_and_return
;
3117 if (o
->irreversible_delete
&& lbl
[1][0] == '/') {
3118 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
, header
.buf
,
3120 strbuf_reset(&header
);
3121 goto free_ab_and_return
;
3122 } else if (!o
->flags
.text
&&
3123 ( (!textconv_one
&& diff_filespec_is_binary(one
)) ||
3124 (!textconv_two
&& diff_filespec_is_binary(two
)) )) {
3125 struct strbuf sb
= STRBUF_INIT
;
3126 if (!one
->data
&& !two
->data
&&
3127 S_ISREG(one
->mode
) && S_ISREG(two
->mode
) &&
3129 if (!oidcmp(&one
->oid
, &two
->oid
)) {
3130 if (must_show_header
)
3131 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3132 header
.buf
, header
.len
,
3134 goto free_ab_and_return
;
3136 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3137 header
.buf
, header
.len
, 0);
3138 strbuf_addf(&sb
, "%sBinary files %s and %s differ\n",
3139 diff_line_prefix(o
), lbl
[0], lbl
[1]);
3140 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_FILES
,
3142 strbuf_release(&sb
);
3143 goto free_ab_and_return
;
3145 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
3146 die("unable to read files to diff");
3147 /* Quite common confusing case */
3148 if (mf1
.size
== mf2
.size
&&
3149 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
3150 if (must_show_header
)
3151 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3152 header
.buf
, header
.len
, 0);
3153 goto free_ab_and_return
;
3155 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
, header
.buf
, header
.len
, 0);
3156 strbuf_reset(&header
);
3157 if (o
->flags
.binary
)
3158 emit_binary_diff(o
, &mf1
, &mf2
);
3160 strbuf_addf(&sb
, "%sBinary files %s and %s differ\n",
3161 diff_line_prefix(o
), lbl
[0], lbl
[1]);
3162 emit_diff_symbol(o
, DIFF_SYMBOL_BINARY_FILES
,
3164 strbuf_release(&sb
);
3166 o
->found_changes
= 1;
3168 /* Crazy xdl interfaces.. */
3169 const char *diffopts
= getenv("GIT_DIFF_OPTS");
3173 struct emit_callback ecbdata
;
3174 const struct userdiff_funcname
*pe
;
3176 if (must_show_header
) {
3177 emit_diff_symbol(o
, DIFF_SYMBOL_HEADER
,
3178 header
.buf
, header
.len
, 0);
3179 strbuf_reset(&header
);
3182 mf1
.size
= fill_textconv(textconv_one
, one
, &mf1
.ptr
);
3183 mf2
.size
= fill_textconv(textconv_two
, two
, &mf2
.ptr
);
3185 pe
= diff_funcname_pattern(one
);
3187 pe
= diff_funcname_pattern(two
);
3189 memset(&xpp
, 0, sizeof(xpp
));
3190 memset(&xecfg
, 0, sizeof(xecfg
));
3191 memset(&ecbdata
, 0, sizeof(ecbdata
));
3192 ecbdata
.label_path
= lbl
;
3193 ecbdata
.color_diff
= want_color(o
->use_color
);
3194 ecbdata
.ws_rule
= whitespace_rule(name_b
);
3195 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
3196 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
3198 ecbdata
.header
= header
.len
? &header
: NULL
;
3199 xpp
.flags
= o
->xdl_opts
;
3200 xpp
.anchors
= o
->anchors
;
3201 xpp
.anchors_nr
= o
->anchors_nr
;
3202 xecfg
.ctxlen
= o
->context
;
3203 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
3204 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3205 if (o
->flags
.funccontext
)
3206 xecfg
.flags
|= XDL_EMIT_FUNCCONTEXT
;
3208 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
3211 else if (skip_prefix(diffopts
, "--unified=", &v
))
3212 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
3213 else if (skip_prefix(diffopts
, "-u", &v
))
3214 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
3216 init_diff_words_data(&ecbdata
, o
, one
, two
);
3217 if (xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
3219 die("unable to generate diff for %s", one
->path
);
3221 free_diff_words_data(&ecbdata
);
3226 xdiff_clear_find_func(&xecfg
);
3230 strbuf_release(&header
);
3231 diff_free_filespec_data(one
);
3232 diff_free_filespec_data(two
);
3238 static char *get_compact_summary(const struct diff_filepair
*p
, int is_renamed
)
3241 if (p
->status
== DIFF_STATUS_ADDED
) {
3242 if (S_ISLNK(p
->two
->mode
))
3244 else if ((p
->two
->mode
& 0777) == 0755)
3248 } else if (p
->status
== DIFF_STATUS_DELETED
)
3251 if (S_ISLNK(p
->one
->mode
) && !S_ISLNK(p
->two
->mode
))
3253 else if (!S_ISLNK(p
->one
->mode
) && S_ISLNK(p
->two
->mode
))
3255 else if ((p
->one
->mode
& 0777) == 0644 &&
3256 (p
->two
->mode
& 0777) == 0755)
3258 else if ((p
->one
->mode
& 0777) == 0755 &&
3259 (p
->two
->mode
& 0777) == 0644)
3264 static void builtin_diffstat(const char *name_a
, const char *name_b
,
3265 struct diff_filespec
*one
,
3266 struct diff_filespec
*two
,
3267 struct diffstat_t
*diffstat
,
3268 struct diff_options
*o
,
3269 struct diff_filepair
*p
)
3272 struct diffstat_file
*data
;
3274 int complete_rewrite
= 0;
3276 if (!DIFF_PAIR_UNMERGED(p
)) {
3277 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
3278 complete_rewrite
= 1;
3281 data
= diffstat_add(diffstat
, name_a
, name_b
);
3282 data
->is_interesting
= p
->status
!= DIFF_STATUS_UNKNOWN
;
3283 if (o
->flags
.stat_with_summary
)
3284 data
->comments
= get_compact_summary(p
, data
->is_renamed
);
3287 data
->is_unmerged
= 1;
3291 same_contents
= !oidcmp(&one
->oid
, &two
->oid
);
3293 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
3294 data
->is_binary
= 1;
3295 if (same_contents
) {
3299 data
->added
= diff_filespec_size(two
);
3300 data
->deleted
= diff_filespec_size(one
);
3304 else if (complete_rewrite
) {
3305 diff_populate_filespec(one
, 0);
3306 diff_populate_filespec(two
, 0);
3307 data
->deleted
= count_lines(one
->data
, one
->size
);
3308 data
->added
= count_lines(two
->data
, two
->size
);
3311 else if (!same_contents
) {
3312 /* Crazy xdl interfaces.. */
3316 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
3317 die("unable to read files to diff");
3319 memset(&xpp
, 0, sizeof(xpp
));
3320 memset(&xecfg
, 0, sizeof(xecfg
));
3321 xpp
.flags
= o
->xdl_opts
;
3322 xpp
.anchors
= o
->anchors
;
3323 xpp
.anchors_nr
= o
->anchors_nr
;
3324 xecfg
.ctxlen
= o
->context
;
3325 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
3326 if (xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
3328 die("unable to generate diffstat for %s", one
->path
);
3331 diff_free_filespec_data(one
);
3332 diff_free_filespec_data(two
);
3335 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
3336 const char *attr_path
,
3337 struct diff_filespec
*one
,
3338 struct diff_filespec
*two
,
3339 struct diff_options
*o
)
3342 struct checkdiff_t data
;
3347 memset(&data
, 0, sizeof(data
));
3348 data
.filename
= name_b
? name_b
: name_a
;
3351 data
.ws_rule
= whitespace_rule(attr_path
);
3352 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
3354 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
3355 die("unable to read files to diff");
3358 * All the other codepaths check both sides, but not checking
3359 * the "old" side here is deliberate. We are checking the newly
3360 * introduced changes, and as long as the "new" side is text, we
3361 * can and should check what it introduces.
3363 if (diff_filespec_is_binary(two
))
3364 goto free_and_return
;
3366 /* Crazy xdl interfaces.. */
3370 memset(&xpp
, 0, sizeof(xpp
));
3371 memset(&xecfg
, 0, sizeof(xecfg
));
3372 xecfg
.ctxlen
= 1; /* at least one context line */
3374 if (xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
3376 die("unable to generate checkdiff for %s", one
->path
);
3378 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
3379 struct emit_callback ecbdata
;
3382 ecbdata
.ws_rule
= data
.ws_rule
;
3383 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
3384 blank_at_eof
= ecbdata
.blank_at_eof_in_postimage
;
3389 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
3390 fprintf(o
->file
, "%s:%d: %s.\n",
3391 data
.filename
, blank_at_eof
, err
);
3392 data
.status
= 1; /* report errors */
3397 diff_free_filespec_data(one
);
3398 diff_free_filespec_data(two
);
3400 o
->flags
.check_failed
= 1;
3403 struct diff_filespec
*alloc_filespec(const char *path
)
3405 struct diff_filespec
*spec
;
3407 FLEXPTR_ALLOC_STR(spec
, path
, path
);
3409 spec
->is_binary
= -1;
3413 void free_filespec(struct diff_filespec
*spec
)
3415 if (!--spec
->count
) {
3416 diff_free_filespec_data(spec
);
3421 void fill_filespec(struct diff_filespec
*spec
, const struct object_id
*oid
,
3422 int oid_valid
, unsigned short mode
)
3425 spec
->mode
= canon_mode(mode
);
3426 oidcpy(&spec
->oid
, oid
);
3427 spec
->oid_valid
= oid_valid
;
3432 * Given a name and sha1 pair, if the index tells us the file in
3433 * the work tree has that object contents, return true, so that
3434 * prepare_temp_file() does not have to inflate and extract.
3436 static int reuse_worktree_file(const char *name
, const struct object_id
*oid
, int want_file
)
3438 const struct cache_entry
*ce
;
3443 * We do not read the cache ourselves here, because the
3444 * benchmark with my previous version that always reads cache
3445 * shows that it makes things worse for diff-tree comparing
3446 * two linux-2.6 kernel trees in an already checked out work
3447 * tree. This is because most diff-tree comparisons deal with
3448 * only a small number of files, while reading the cache is
3449 * expensive for a large project, and its cost outweighs the
3450 * savings we get by not inflating the object to a temporary
3451 * file. Practically, this code only helps when we are used
3452 * by diff-cache --cached, which does read the cache before
3458 /* We want to avoid the working directory if our caller
3459 * doesn't need the data in a normal file, this system
3460 * is rather slow with its stat/open/mmap/close syscalls,
3461 * and the object is contained in a pack file. The pack
3462 * is probably already open and will be faster to obtain
3463 * the data through than the working directory. Loose
3464 * objects however would tend to be slower as they need
3465 * to be individually opened and inflated.
3467 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(oid
->hash
))
3471 * Similarly, if we'd have to convert the file contents anyway, that
3472 * makes the optimization not worthwhile.
3474 if (!want_file
&& would_convert_to_git(&the_index
, name
))
3478 pos
= cache_name_pos(name
, len
);
3481 ce
= active_cache
[pos
];
3484 * This is not the sha1 we are looking for, or
3485 * unreusable because it is not a regular file.
3487 if (oidcmp(oid
, &ce
->oid
) || !S_ISREG(ce
->ce_mode
))
3491 * If ce is marked as "assume unchanged", there is no
3492 * guarantee that work tree matches what we are looking for.
3494 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
3498 * If ce matches the file in the work tree, we can reuse it.
3500 if (ce_uptodate(ce
) ||
3501 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
3507 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
3509 struct strbuf buf
= STRBUF_INIT
;
3512 /* Are we looking at the work tree? */
3513 if (s
->dirty_submodule
)
3516 strbuf_addf(&buf
, "Subproject commit %s%s\n",
3517 oid_to_hex(&s
->oid
), dirty
);
3521 strbuf_release(&buf
);
3523 s
->data
= strbuf_detach(&buf
, NULL
);
3530 * While doing rename detection and pickaxe operation, we may need to
3531 * grab the data for the blob (or file) for our own in-core comparison.
3532 * diff_filespec has data and size fields for this purpose.
3534 int diff_populate_filespec(struct diff_filespec
*s
, unsigned int flags
)
3536 int size_only
= flags
& CHECK_SIZE_ONLY
;
3538 int conv_flags
= global_conv_flags_eol
;
3540 * demote FAIL to WARN to allow inspecting the situation
3541 * instead of refusing.
3543 if (conv_flags
& CONV_EOL_RNDTRP_DIE
)
3544 conv_flags
= CONV_EOL_RNDTRP_WARN
;
3546 if (!DIFF_FILE_VALID(s
))
3547 die("internal error: asking to populate invalid file.");
3548 if (S_ISDIR(s
->mode
))
3554 if (size_only
&& 0 < s
->size
)
3557 if (S_ISGITLINK(s
->mode
))
3558 return diff_populate_gitlink(s
, size_only
);
3560 if (!s
->oid_valid
||
3561 reuse_worktree_file(s
->path
, &s
->oid
, 0)) {
3562 struct strbuf buf
= STRBUF_INIT
;
3566 if (lstat(s
->path
, &st
) < 0) {
3570 s
->data
= (char *)"";
3574 s
->size
= xsize_t(st
.st_size
);
3577 if (S_ISLNK(st
.st_mode
)) {
3578 struct strbuf sb
= STRBUF_INIT
;
3580 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
3583 s
->data
= strbuf_detach(&sb
, NULL
);
3589 * Even if the caller would be happy with getting
3590 * only the size, we cannot return early at this
3591 * point if the path requires us to run the content
3594 if (size_only
&& !would_convert_to_git(&the_index
, s
->path
))
3598 * Note: this check uses xsize_t(st.st_size) that may
3599 * not be the true size of the blob after it goes
3600 * through convert_to_git(). This may not strictly be
3601 * correct, but the whole point of big_file_threshold
3602 * and is_binary check being that we want to avoid
3603 * opening the file and inspecting the contents, this
3606 if ((flags
& CHECK_BINARY
) &&
3607 s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
3611 fd
= open(s
->path
, O_RDONLY
);
3614 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
3616 s
->should_munmap
= 1;
3619 * Convert from working tree format to canonical git format
3621 if (convert_to_git(&the_index
, s
->path
, s
->data
, s
->size
, &buf
, conv_flags
)) {
3623 munmap(s
->data
, s
->size
);
3624 s
->should_munmap
= 0;
3625 s
->data
= strbuf_detach(&buf
, &size
);
3631 enum object_type type
;
3632 if (size_only
|| (flags
& CHECK_BINARY
)) {
3633 type
= oid_object_info(the_repository
, &s
->oid
,
3636 die("unable to read %s",
3637 oid_to_hex(&s
->oid
));
3640 if (s
->size
> big_file_threshold
&& s
->is_binary
== -1) {
3645 s
->data
= read_object_file(&s
->oid
, &type
, &s
->size
);
3647 die("unable to read %s", oid_to_hex(&s
->oid
));
3653 void diff_free_filespec_blob(struct diff_filespec
*s
)
3657 else if (s
->should_munmap
)
3658 munmap(s
->data
, s
->size
);
3660 if (s
->should_free
|| s
->should_munmap
) {
3661 s
->should_free
= s
->should_munmap
= 0;
3666 void diff_free_filespec_data(struct diff_filespec
*s
)
3668 diff_free_filespec_blob(s
);
3669 FREE_AND_NULL(s
->cnt_data
);
3672 static void prep_temp_blob(const char *path
, struct diff_tempfile
*temp
,
3675 const struct object_id
*oid
,
3678 struct strbuf buf
= STRBUF_INIT
;
3679 struct strbuf tempfile
= STRBUF_INIT
;
3680 char *path_dup
= xstrdup(path
);
3681 const char *base
= basename(path_dup
);
3683 /* Generate "XXXXXX_basename.ext" */
3684 strbuf_addstr(&tempfile
, "XXXXXX_");
3685 strbuf_addstr(&tempfile
, base
);
3687 temp
->tempfile
= mks_tempfile_ts(tempfile
.buf
, strlen(base
) + 1);
3688 if (!temp
->tempfile
)
3689 die_errno("unable to create temp-file");
3690 if (convert_to_working_tree(path
,
3691 (const char *)blob
, (size_t)size
, &buf
)) {
3695 if (write_in_full(temp
->tempfile
->fd
, blob
, size
) < 0 ||
3696 close_tempfile_gently(temp
->tempfile
))
3697 die_errno("unable to write temp-file");
3698 temp
->name
= get_tempfile_path(temp
->tempfile
);
3699 oid_to_hex_r(temp
->hex
, oid
);
3700 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", mode
);
3701 strbuf_release(&buf
);
3702 strbuf_release(&tempfile
);
3706 static struct diff_tempfile
*prepare_temp_file(const char *name
,
3707 struct diff_filespec
*one
)
3709 struct diff_tempfile
*temp
= claim_diff_tempfile();
3711 if (!DIFF_FILE_VALID(one
)) {
3713 /* A '-' entry produces this for file-2, and
3714 * a '+' entry produces this for file-1.
3716 temp
->name
= "/dev/null";
3717 xsnprintf(temp
->hex
, sizeof(temp
->hex
), ".");
3718 xsnprintf(temp
->mode
, sizeof(temp
->mode
), ".");
3722 if (!S_ISGITLINK(one
->mode
) &&
3724 reuse_worktree_file(name
, &one
->oid
, 1))) {
3726 if (lstat(name
, &st
) < 0) {
3727 if (errno
== ENOENT
)
3728 goto not_a_valid_file
;
3729 die_errno("stat(%s)", name
);
3731 if (S_ISLNK(st
.st_mode
)) {
3732 struct strbuf sb
= STRBUF_INIT
;
3733 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
3734 die_errno("readlink(%s)", name
);
3735 prep_temp_blob(name
, temp
, sb
.buf
, sb
.len
,
3737 &one
->oid
: &null_oid
),
3739 one
->mode
: S_IFLNK
));
3740 strbuf_release(&sb
);
3743 /* we can borrow from the file in the work tree */
3745 if (!one
->oid_valid
)
3746 oid_to_hex_r(temp
->hex
, &null_oid
);
3748 oid_to_hex_r(temp
->hex
, &one
->oid
);
3749 /* Even though we may sometimes borrow the
3750 * contents from the work tree, we always want
3751 * one->mode. mode is trustworthy even when
3752 * !(one->oid_valid), as long as
3753 * DIFF_FILE_VALID(one).
3755 xsnprintf(temp
->mode
, sizeof(temp
->mode
), "%06o", one
->mode
);
3760 if (diff_populate_filespec(one
, 0))
3761 die("cannot read data blob for %s", one
->path
);
3762 prep_temp_blob(name
, temp
, one
->data
, one
->size
,
3763 &one
->oid
, one
->mode
);
3768 static void add_external_diff_name(struct argv_array
*argv
,
3770 struct diff_filespec
*df
)
3772 struct diff_tempfile
*temp
= prepare_temp_file(name
, df
);
3773 argv_array_push(argv
, temp
->name
);
3774 argv_array_push(argv
, temp
->hex
);
3775 argv_array_push(argv
, temp
->mode
);
3778 /* An external diff command takes:
3780 * diff-cmd name infile1 infile1-sha1 infile1-mode \
3781 * infile2 infile2-sha1 infile2-mode [ rename-to ]
3784 static void run_external_diff(const char *pgm
,
3787 struct diff_filespec
*one
,
3788 struct diff_filespec
*two
,
3789 const char *xfrm_msg
,
3790 int complete_rewrite
,
3791 struct diff_options
*o
)
3793 struct argv_array argv
= ARGV_ARRAY_INIT
;
3794 struct argv_array env
= ARGV_ARRAY_INIT
;
3795 struct diff_queue_struct
*q
= &diff_queued_diff
;
3797 argv_array_push(&argv
, pgm
);
3798 argv_array_push(&argv
, name
);
3801 add_external_diff_name(&argv
, name
, one
);
3803 add_external_diff_name(&argv
, name
, two
);
3805 add_external_diff_name(&argv
, other
, two
);
3806 argv_array_push(&argv
, other
);
3807 argv_array_push(&argv
, xfrm_msg
);
3811 argv_array_pushf(&env
, "GIT_DIFF_PATH_COUNTER=%d", ++o
->diff_path_counter
);
3812 argv_array_pushf(&env
, "GIT_DIFF_PATH_TOTAL=%d", q
->nr
);
3814 if (run_command_v_opt_cd_env(argv
.argv
, RUN_USING_SHELL
, NULL
, env
.argv
))
3815 die(_("external diff died, stopping at %s"), name
);
3818 argv_array_clear(&argv
);
3819 argv_array_clear(&env
);
3822 static int similarity_index(struct diff_filepair
*p
)
3824 return p
->score
* 100 / MAX_SCORE
;
3827 static const char *diff_abbrev_oid(const struct object_id
*oid
, int abbrev
)
3829 if (startup_info
->have_repository
)
3830 return find_unique_abbrev(oid
, abbrev
);
3832 char *hex
= oid_to_hex(oid
);
3834 abbrev
= FALLBACK_DEFAULT_ABBREV
;
3835 if (abbrev
> GIT_SHA1_HEXSZ
)
3836 die("BUG: oid abbreviation out of range: %d", abbrev
);
3843 static void fill_metainfo(struct strbuf
*msg
,
3846 struct diff_filespec
*one
,
3847 struct diff_filespec
*two
,
3848 struct diff_options
*o
,
3849 struct diff_filepair
*p
,
3850 int *must_show_header
,
3853 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
3854 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
3855 const char *line_prefix
= diff_line_prefix(o
);
3857 *must_show_header
= 1;
3858 strbuf_init(msg
, PATH_MAX
* 2 + 300);
3859 switch (p
->status
) {
3860 case DIFF_STATUS_COPIED
:
3861 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
3862 line_prefix
, set
, similarity_index(p
));
3863 strbuf_addf(msg
, "%s\n%s%scopy from ",
3864 reset
, line_prefix
, set
);
3865 quote_c_style(name
, msg
, NULL
, 0);
3866 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
3867 quote_c_style(other
, msg
, NULL
, 0);
3868 strbuf_addf(msg
, "%s\n", reset
);
3870 case DIFF_STATUS_RENAMED
:
3871 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
3872 line_prefix
, set
, similarity_index(p
));
3873 strbuf_addf(msg
, "%s\n%s%srename from ",
3874 reset
, line_prefix
, set
);
3875 quote_c_style(name
, msg
, NULL
, 0);
3876 strbuf_addf(msg
, "%s\n%s%srename to ",
3877 reset
, line_prefix
, set
);
3878 quote_c_style(other
, msg
, NULL
, 0);
3879 strbuf_addf(msg
, "%s\n", reset
);
3881 case DIFF_STATUS_MODIFIED
:
3883 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
3885 set
, similarity_index(p
), reset
);
3890 *must_show_header
= 0;
3892 if (one
&& two
&& oidcmp(&one
->oid
, &two
->oid
)) {
3893 int abbrev
= o
->flags
.full_index
? 40 : DEFAULT_ABBREV
;
3895 if (o
->flags
.binary
) {
3897 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
3898 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
3901 strbuf_addf(msg
, "%s%sindex %s..%s", line_prefix
, set
,
3902 diff_abbrev_oid(&one
->oid
, abbrev
),
3903 diff_abbrev_oid(&two
->oid
, abbrev
));
3904 if (one
->mode
== two
->mode
)
3905 strbuf_addf(msg
, " %06o", one
->mode
);
3906 strbuf_addf(msg
, "%s\n", reset
);
3910 static void run_diff_cmd(const char *pgm
,
3913 const char *attr_path
,
3914 struct diff_filespec
*one
,
3915 struct diff_filespec
*two
,
3917 struct diff_options
*o
,
3918 struct diff_filepair
*p
)
3920 const char *xfrm_msg
= NULL
;
3921 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
3922 int must_show_header
= 0;
3925 if (o
->flags
.allow_external
) {
3926 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
3927 if (drv
&& drv
->external
)
3928 pgm
= drv
->external
;
3933 * don't use colors when the header is intended for an
3934 * external diff driver
3936 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
3938 want_color(o
->use_color
) && !pgm
);
3939 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
3943 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
3944 complete_rewrite
, o
);
3948 builtin_diff(name
, other
? other
: name
,
3949 one
, two
, xfrm_msg
, must_show_header
,
3950 o
, complete_rewrite
);
3952 fprintf(o
->file
, "* Unmerged path %s\n", name
);
3955 static void diff_fill_oid_info(struct diff_filespec
*one
)
3957 if (DIFF_FILE_VALID(one
)) {
3958 if (!one
->oid_valid
) {
3960 if (one
->is_stdin
) {
3964 if (lstat(one
->path
, &st
) < 0)
3965 die_errno("stat '%s'", one
->path
);
3966 if (index_path(&one
->oid
, one
->path
, &st
, 0))
3967 die("cannot hash %s", one
->path
);
3974 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
3976 /* Strip the prefix but do not molest /dev/null and absolute paths */
3977 if (*namep
&& **namep
!= '/') {
3978 *namep
+= prefix_length
;
3982 if (*otherp
&& **otherp
!= '/') {
3983 *otherp
+= prefix_length
;
3984 if (**otherp
== '/')
3989 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
3991 const char *pgm
= external_diff();
3993 struct diff_filespec
*one
= p
->one
;
3994 struct diff_filespec
*two
= p
->two
;
3997 const char *attr_path
;
4000 other
= (strcmp(name
, two
->path
) ? two
->path
: NULL
);
4002 if (o
->prefix_length
)
4003 strip_prefix(o
->prefix_length
, &name
, &other
);
4005 if (!o
->flags
.allow_external
)
4008 if (DIFF_PAIR_UNMERGED(p
)) {
4009 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
4010 NULL
, NULL
, NULL
, o
, p
);
4014 diff_fill_oid_info(one
);
4015 diff_fill_oid_info(two
);
4018 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
4019 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
4021 * a filepair that changes between file and symlink
4022 * needs to be split into deletion and creation.
4024 struct diff_filespec
*null
= alloc_filespec(two
->path
);
4025 run_diff_cmd(NULL
, name
, other
, attr_path
,
4026 one
, null
, &msg
, o
, p
);
4028 strbuf_release(&msg
);
4030 null
= alloc_filespec(one
->path
);
4031 run_diff_cmd(NULL
, name
, other
, attr_path
,
4032 null
, two
, &msg
, o
, p
);
4036 run_diff_cmd(pgm
, name
, other
, attr_path
,
4037 one
, two
, &msg
, o
, p
);
4039 strbuf_release(&msg
);
4042 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
4043 struct diffstat_t
*diffstat
)
4048 if (DIFF_PAIR_UNMERGED(p
)) {
4050 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, p
);
4054 name
= p
->one
->path
;
4055 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
4057 if (o
->prefix_length
)
4058 strip_prefix(o
->prefix_length
, &name
, &other
);
4060 diff_fill_oid_info(p
->one
);
4061 diff_fill_oid_info(p
->two
);
4063 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, p
);
4066 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
4070 const char *attr_path
;
4072 if (DIFF_PAIR_UNMERGED(p
)) {
4077 name
= p
->one
->path
;
4078 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
4079 attr_path
= other
? other
: name
;
4081 if (o
->prefix_length
)
4082 strip_prefix(o
->prefix_length
, &name
, &other
);
4084 diff_fill_oid_info(p
->one
);
4085 diff_fill_oid_info(p
->two
);
4087 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
4090 void diff_setup(struct diff_options
*options
)
4092 memcpy(options
, &default_diff_options
, sizeof(*options
));
4094 options
->file
= stdout
;
4096 options
->abbrev
= DEFAULT_ABBREV
;
4097 options
->line_termination
= '\n';
4098 options
->break_opt
= -1;
4099 options
->rename_limit
= -1;
4100 options
->dirstat_permille
= diff_dirstat_permille_default
;
4101 options
->context
= diff_context_default
;
4102 options
->interhunkcontext
= diff_interhunk_context_default
;
4103 options
->ws_error_highlight
= ws_error_highlight_default
;
4104 options
->flags
.rename_empty
= 1;
4105 options
->objfind
= NULL
;
4107 /* pathchange left =NULL by default */
4108 options
->change
= diff_change
;
4109 options
->add_remove
= diff_addremove
;
4110 options
->use_color
= diff_use_color_default
;
4111 options
->detect_rename
= diff_detect_rename_default
;
4112 options
->xdl_opts
|= diff_algorithm
;
4113 if (diff_indent_heuristic
)
4114 DIFF_XDL_SET(options
, INDENT_HEURISTIC
);
4116 options
->orderfile
= diff_order_file_cfg
;
4118 if (diff_no_prefix
) {
4119 options
->a_prefix
= options
->b_prefix
= "";
4120 } else if (!diff_mnemonic_prefix
) {
4121 options
->a_prefix
= "a/";
4122 options
->b_prefix
= "b/";
4125 options
->color_moved
= diff_color_moved_default
;
4128 void diff_setup_done(struct diff_options
*options
)
4130 unsigned check_mask
= DIFF_FORMAT_NAME
|
4131 DIFF_FORMAT_NAME_STATUS
|
4132 DIFF_FORMAT_CHECKDIFF
|
4133 DIFF_FORMAT_NO_OUTPUT
;
4135 if (options
->set_default
)
4136 options
->set_default(options
);
4138 if (HAS_MULTI_BITS(options
->output_format
& check_mask
))
4139 die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
4141 if (HAS_MULTI_BITS(options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
))
4142 die(_("-G, -S and --find-object are mutually exclusive"));
4145 * Most of the time we can say "there are changes"
4146 * only by checking if there are changed paths, but
4147 * --ignore-whitespace* options force us to look
4151 if ((options
->xdl_opts
& XDF_WHITESPACE_FLAGS
))
4152 options
->flags
.diff_from_contents
= 1;
4154 options
->flags
.diff_from_contents
= 0;
4156 if (options
->flags
.find_copies_harder
)
4157 options
->detect_rename
= DIFF_DETECT_COPY
;
4159 if (!options
->flags
.relative_name
)
4160 options
->prefix
= NULL
;
4161 if (options
->prefix
)
4162 options
->prefix_length
= strlen(options
->prefix
);
4164 options
->prefix_length
= 0;
4166 if (options
->output_format
& (DIFF_FORMAT_NAME
|
4167 DIFF_FORMAT_NAME_STATUS
|
4168 DIFF_FORMAT_CHECKDIFF
|
4169 DIFF_FORMAT_NO_OUTPUT
))
4170 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
4171 DIFF_FORMAT_NUMSTAT
|
4172 DIFF_FORMAT_DIFFSTAT
|
4173 DIFF_FORMAT_SHORTSTAT
|
4174 DIFF_FORMAT_DIRSTAT
|
4175 DIFF_FORMAT_SUMMARY
|
4179 * These cases always need recursive; we do not drop caller-supplied
4180 * recursive bits for other formats here.
4182 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
4183 DIFF_FORMAT_NUMSTAT
|
4184 DIFF_FORMAT_DIFFSTAT
|
4185 DIFF_FORMAT_SHORTSTAT
|
4186 DIFF_FORMAT_DIRSTAT
|
4187 DIFF_FORMAT_SUMMARY
|
4188 DIFF_FORMAT_CHECKDIFF
))
4189 options
->flags
.recursive
= 1;
4191 * Also pickaxe would not work very well if you do not say recursive
4193 if (options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
)
4194 options
->flags
.recursive
= 1;
4196 * When patches are generated, submodules diffed against the work tree
4197 * must be checked for dirtiness too so it can be shown in the output
4199 if (options
->output_format
& DIFF_FORMAT_PATCH
)
4200 options
->flags
.dirty_submodules
= 1;
4202 if (options
->detect_rename
&& options
->rename_limit
< 0)
4203 options
->rename_limit
= diff_rename_limit_default
;
4204 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
4206 /* read-cache does not die even when it fails
4207 * so it is safe for us to do this here. Also
4208 * it does not smudge active_cache or active_nr
4209 * when it fails, so we do not have to worry about
4210 * cleaning it up ourselves either.
4214 if (40 < options
->abbrev
)
4215 options
->abbrev
= 40; /* full */
4218 * It does not make sense to show the first hit we happened
4219 * to have found. It does not make sense not to return with
4220 * exit code in such a case either.
4222 if (options
->flags
.quick
) {
4223 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
4224 options
->flags
.exit_with_status
= 1;
4227 options
->diff_path_counter
= 0;
4229 if (options
->flags
.follow_renames
&& options
->pathspec
.nr
!= 1)
4230 die(_("--follow requires exactly one pathspec"));
4232 if (!options
->use_color
|| external_diff())
4233 options
->color_moved
= 0;
4236 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
4246 if (c
== arg_short
) {
4250 if (val
&& isdigit(c
)) {
4252 int n
= strtoul(arg
, &end
, 10);
4263 eq
= strchrnul(arg
, '=');
4265 if (!len
|| strncmp(arg
, arg_long
, len
))
4270 if (!isdigit(*++eq
))
4272 n
= strtoul(eq
, &end
, 10);
4280 static int diff_scoreopt_parse(const char *opt
);
4282 static inline int short_opt(char opt
, const char **argv
,
4283 const char **optarg
)
4285 const char *arg
= argv
[0];
4286 if (arg
[0] != '-' || arg
[1] != opt
)
4288 if (arg
[2] != '\0') {
4293 die("Option '%c' requires a value", opt
);
4298 int parse_long_opt(const char *opt
, const char **argv
,
4299 const char **optarg
)
4301 const char *arg
= argv
[0];
4302 if (!skip_prefix(arg
, "--", &arg
))
4304 if (!skip_prefix(arg
, opt
, &arg
))
4306 if (*arg
== '=') { /* stuck form: --option=value */
4312 /* separate form: --option value */
4314 die("Option '--%s' requires a value", opt
);
4319 static int stat_opt(struct diff_options
*options
, const char **av
)
4321 const char *arg
= av
[0];
4323 int width
= options
->stat_width
;
4324 int name_width
= options
->stat_name_width
;
4325 int graph_width
= options
->stat_graph_width
;
4326 int count
= options
->stat_count
;
4329 if (!skip_prefix(arg
, "--stat", &arg
))
4330 die("BUG: stat option does not begin with --stat: %s", arg
);
4335 if (skip_prefix(arg
, "-width", &arg
)) {
4337 width
= strtoul(arg
+ 1, &end
, 10);
4338 else if (!*arg
&& !av
[1])
4339 die_want_option("--stat-width");
4341 width
= strtoul(av
[1], &end
, 10);
4344 } else if (skip_prefix(arg
, "-name-width", &arg
)) {
4346 name_width
= strtoul(arg
+ 1, &end
, 10);
4347 else if (!*arg
&& !av
[1])
4348 die_want_option("--stat-name-width");
4350 name_width
= strtoul(av
[1], &end
, 10);
4353 } else if (skip_prefix(arg
, "-graph-width", &arg
)) {
4355 graph_width
= strtoul(arg
+ 1, &end
, 10);
4356 else if (!*arg
&& !av
[1])
4357 die_want_option("--stat-graph-width");
4359 graph_width
= strtoul(av
[1], &end
, 10);
4362 } else if (skip_prefix(arg
, "-count", &arg
)) {
4364 count
= strtoul(arg
+ 1, &end
, 10);
4365 else if (!*arg
&& !av
[1])
4366 die_want_option("--stat-count");
4368 count
= strtoul(av
[1], &end
, 10);
4374 width
= strtoul(arg
+1, &end
, 10);
4376 name_width
= strtoul(end
+1, &end
, 10);
4378 count
= strtoul(end
+1, &end
, 10);
4381 /* Important! This checks all the error cases! */
4384 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4385 options
->stat_name_width
= name_width
;
4386 options
->stat_graph_width
= graph_width
;
4387 options
->stat_width
= width
;
4388 options
->stat_count
= count
;
4392 static int parse_dirstat_opt(struct diff_options
*options
, const char *params
)
4394 struct strbuf errmsg
= STRBUF_INIT
;
4395 if (parse_dirstat_params(options
, params
, &errmsg
))
4396 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
4398 strbuf_release(&errmsg
);
4400 * The caller knows a dirstat-related option is given from the command
4401 * line; allow it to say "return this_function();"
4403 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
4407 static int parse_submodule_opt(struct diff_options
*options
, const char *value
)
4409 if (parse_submodule_params(options
, value
))
4410 die(_("Failed to parse --submodule option parameter: '%s'"),
4415 static const char diff_status_letters
[] = {
4418 DIFF_STATUS_DELETED
,
4419 DIFF_STATUS_MODIFIED
,
4420 DIFF_STATUS_RENAMED
,
4421 DIFF_STATUS_TYPE_CHANGED
,
4422 DIFF_STATUS_UNKNOWN
,
4423 DIFF_STATUS_UNMERGED
,
4424 DIFF_STATUS_FILTER_AON
,
4425 DIFF_STATUS_FILTER_BROKEN
,
4429 static unsigned int filter_bit
['Z' + 1];
4431 static void prepare_filter_bits(void)
4435 if (!filter_bit
[DIFF_STATUS_ADDED
]) {
4436 for (i
= 0; diff_status_letters
[i
]; i
++)
4437 filter_bit
[(int) diff_status_letters
[i
]] = (1 << i
);
4441 static unsigned filter_bit_tst(char status
, const struct diff_options
*opt
)
4443 return opt
->filter
& filter_bit
[(int) status
];
4446 static int parse_diff_filter_opt(const char *optarg
, struct diff_options
*opt
)
4450 prepare_filter_bits();
4453 * If there is a negation e.g. 'd' in the input, and we haven't
4454 * initialized the filter field with another --diff-filter, start
4455 * from full set of bits, except for AON.
4458 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
4459 if (optch
< 'a' || 'z' < optch
)
4461 opt
->filter
= (1 << (ARRAY_SIZE(diff_status_letters
) - 1)) - 1;
4462 opt
->filter
&= ~filter_bit
[DIFF_STATUS_FILTER_AON
];
4467 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
4471 if ('a' <= optch
&& optch
<= 'z') {
4473 optch
= toupper(optch
);
4478 bit
= (0 <= optch
&& optch
<= 'Z') ? filter_bit
[optch
] : 0;
4482 opt
->filter
&= ~bit
;
4489 static void enable_patch_output(int *fmt
) {
4490 *fmt
&= ~DIFF_FORMAT_NO_OUTPUT
;
4491 *fmt
|= DIFF_FORMAT_PATCH
;
4494 static int parse_ws_error_highlight_opt(struct diff_options
*opt
, const char *arg
)
4496 int val
= parse_ws_error_highlight(arg
);
4499 error("unknown value after ws-error-highlight=%.*s",
4503 opt
->ws_error_highlight
= val
;
4507 static int parse_objfind_opt(struct diff_options
*opt
, const char *arg
)
4509 struct object_id oid
;
4511 if (get_oid(arg
, &oid
))
4512 return error("unable to resolve '%s'", arg
);
4515 opt
->objfind
= xcalloc(1, sizeof(*opt
->objfind
));
4517 opt
->pickaxe_opts
|= DIFF_PICKAXE_KIND_OBJFIND
;
4518 opt
->flags
.recursive
= 1;
4519 opt
->flags
.tree_in_recursive
= 1;
4520 oidset_insert(opt
->objfind
, &oid
);
4524 int diff_opt_parse(struct diff_options
*options
,
4525 const char **av
, int ac
, const char *prefix
)
4527 const char *arg
= av
[0];
4534 /* Output format options */
4535 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch")
4536 || opt_arg(arg
, 'U', "unified", &options
->context
))
4537 enable_patch_output(&options
->output_format
);
4538 else if (!strcmp(arg
, "--raw"))
4539 options
->output_format
|= DIFF_FORMAT_RAW
;
4540 else if (!strcmp(arg
, "--patch-with-raw")) {
4541 enable_patch_output(&options
->output_format
);
4542 options
->output_format
|= DIFF_FORMAT_RAW
;
4543 } else if (!strcmp(arg
, "--numstat"))
4544 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
4545 else if (!strcmp(arg
, "--shortstat"))
4546 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
4547 else if (skip_prefix(arg
, "-X", &arg
) ||
4548 skip_to_optional_arg(arg
, "--dirstat", &arg
))
4549 return parse_dirstat_opt(options
, arg
);
4550 else if (!strcmp(arg
, "--cumulative"))
4551 return parse_dirstat_opt(options
, "cumulative");
4552 else if (skip_to_optional_arg(arg
, "--dirstat-by-file", &arg
)) {
4553 parse_dirstat_opt(options
, "files");
4554 return parse_dirstat_opt(options
, arg
);
4556 else if (!strcmp(arg
, "--check"))
4557 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
4558 else if (!strcmp(arg
, "--summary"))
4559 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
4560 else if (!strcmp(arg
, "--patch-with-stat")) {
4561 enable_patch_output(&options
->output_format
);
4562 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4563 } else if (!strcmp(arg
, "--name-only"))
4564 options
->output_format
|= DIFF_FORMAT_NAME
;
4565 else if (!strcmp(arg
, "--name-status"))
4566 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
4567 else if (!strcmp(arg
, "-s") || !strcmp(arg
, "--no-patch"))
4568 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
4569 else if (starts_with(arg
, "--stat"))
4570 /* --stat, --stat-width, --stat-name-width, or --stat-count */
4571 return stat_opt(options
, av
);
4572 else if (!strcmp(arg
, "--compact-summary")) {
4573 options
->flags
.stat_with_summary
= 1;
4574 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
4575 } else if (!strcmp(arg
, "--no-compact-summary"))
4576 options
->flags
.stat_with_summary
= 0;
4578 /* renames options */
4579 else if (starts_with(arg
, "-B") ||
4580 skip_to_optional_arg(arg
, "--break-rewrites", NULL
)) {
4581 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
4582 return error("invalid argument to -B: %s", arg
+2);
4584 else if (starts_with(arg
, "-M") ||
4585 skip_to_optional_arg(arg
, "--find-renames", NULL
)) {
4586 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
4587 return error("invalid argument to -M: %s", arg
+2);
4588 options
->detect_rename
= DIFF_DETECT_RENAME
;
4590 else if (!strcmp(arg
, "-D") || !strcmp(arg
, "--irreversible-delete")) {
4591 options
->irreversible_delete
= 1;
4593 else if (starts_with(arg
, "-C") ||
4594 skip_to_optional_arg(arg
, "--find-copies", NULL
)) {
4595 if (options
->detect_rename
== DIFF_DETECT_COPY
)
4596 options
->flags
.find_copies_harder
= 1;
4597 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
4598 return error("invalid argument to -C: %s", arg
+2);
4599 options
->detect_rename
= DIFF_DETECT_COPY
;
4601 else if (!strcmp(arg
, "--no-renames"))
4602 options
->detect_rename
= 0;
4603 else if (!strcmp(arg
, "--rename-empty"))
4604 options
->flags
.rename_empty
= 1;
4605 else if (!strcmp(arg
, "--no-rename-empty"))
4606 options
->flags
.rename_empty
= 0;
4607 else if (skip_to_optional_arg_default(arg
, "--relative", &arg
, NULL
)) {
4608 options
->flags
.relative_name
= 1;
4610 options
->prefix
= arg
;
4614 else if (!strcmp(arg
, "--minimal"))
4615 DIFF_XDL_SET(options
, NEED_MINIMAL
);
4616 else if (!strcmp(arg
, "--no-minimal"))
4617 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
4618 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
4619 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
4620 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
4621 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
4622 else if (!strcmp(arg
, "--ignore-space-at-eol"))
4623 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
4624 else if (!strcmp(arg
, "--ignore-cr-at-eol"))
4625 DIFF_XDL_SET(options
, IGNORE_CR_AT_EOL
);
4626 else if (!strcmp(arg
, "--ignore-blank-lines"))
4627 DIFF_XDL_SET(options
, IGNORE_BLANK_LINES
);
4628 else if (!strcmp(arg
, "--indent-heuristic"))
4629 DIFF_XDL_SET(options
, INDENT_HEURISTIC
);
4630 else if (!strcmp(arg
, "--no-indent-heuristic"))
4631 DIFF_XDL_CLR(options
, INDENT_HEURISTIC
);
4632 else if (!strcmp(arg
, "--patience")) {
4634 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
4636 * Both --patience and --anchored use PATIENCE_DIFF
4637 * internally, so remove any anchors previously
4640 for (i
= 0; i
< options
->anchors_nr
; i
++)
4641 free(options
->anchors
[i
]);
4642 options
->anchors_nr
= 0;
4643 } else if (!strcmp(arg
, "--histogram"))
4644 options
->xdl_opts
= DIFF_WITH_ALG(options
, HISTOGRAM_DIFF
);
4645 else if ((argcount
= parse_long_opt("diff-algorithm", av
, &optarg
))) {
4646 long value
= parse_algorithm_value(optarg
);
4648 return error("option diff-algorithm accepts \"myers\", "
4649 "\"minimal\", \"patience\" and \"histogram\"");
4650 /* clear out previous settings */
4651 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
4652 options
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
4653 options
->xdl_opts
|= value
;
4655 } else if (skip_prefix(arg
, "--anchored=", &arg
)) {
4656 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
4657 ALLOC_GROW(options
->anchors
, options
->anchors_nr
+ 1,
4658 options
->anchors_alloc
);
4659 options
->anchors
[options
->anchors_nr
++] = xstrdup(arg
);
4663 else if (!strcmp(arg
, "--binary")) {
4664 enable_patch_output(&options
->output_format
);
4665 options
->flags
.binary
= 1;
4667 else if (!strcmp(arg
, "--full-index"))
4668 options
->flags
.full_index
= 1;
4669 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
4670 options
->flags
.text
= 1;
4671 else if (!strcmp(arg
, "-R"))
4672 options
->flags
.reverse_diff
= 1;
4673 else if (!strcmp(arg
, "--find-copies-harder"))
4674 options
->flags
.find_copies_harder
= 1;
4675 else if (!strcmp(arg
, "--follow"))
4676 options
->flags
.follow_renames
= 1;
4677 else if (!strcmp(arg
, "--no-follow")) {
4678 options
->flags
.follow_renames
= 0;
4679 options
->flags
.default_follow_renames
= 0;
4680 } else if (skip_to_optional_arg_default(arg
, "--color", &arg
, "always")) {
4681 int value
= git_config_colorbool(NULL
, arg
);
4683 return error("option `color' expects \"always\", \"auto\", or \"never\"");
4684 options
->use_color
= value
;
4686 else if (!strcmp(arg
, "--no-color"))
4687 options
->use_color
= 0;
4688 else if (!strcmp(arg
, "--color-moved")) {
4689 if (diff_color_moved_default
)
4690 options
->color_moved
= diff_color_moved_default
;
4691 if (options
->color_moved
== COLOR_MOVED_NO
)
4692 options
->color_moved
= COLOR_MOVED_DEFAULT
;
4693 } else if (!strcmp(arg
, "--no-color-moved"))
4694 options
->color_moved
= COLOR_MOVED_NO
;
4695 else if (skip_prefix(arg
, "--color-moved=", &arg
)) {
4696 int cm
= parse_color_moved(arg
);
4698 die("bad --color-moved argument: %s", arg
);
4699 options
->color_moved
= cm
;
4700 } else if (skip_to_optional_arg_default(arg
, "--color-words", &options
->word_regex
, NULL
)) {
4701 options
->use_color
= 1;
4702 options
->word_diff
= DIFF_WORDS_COLOR
;
4704 else if (!strcmp(arg
, "--word-diff")) {
4705 if (options
->word_diff
== DIFF_WORDS_NONE
)
4706 options
->word_diff
= DIFF_WORDS_PLAIN
;
4708 else if (skip_prefix(arg
, "--word-diff=", &arg
)) {
4709 if (!strcmp(arg
, "plain"))
4710 options
->word_diff
= DIFF_WORDS_PLAIN
;
4711 else if (!strcmp(arg
, "color")) {
4712 options
->use_color
= 1;
4713 options
->word_diff
= DIFF_WORDS_COLOR
;
4715 else if (!strcmp(arg
, "porcelain"))
4716 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
4717 else if (!strcmp(arg
, "none"))
4718 options
->word_diff
= DIFF_WORDS_NONE
;
4720 die("bad --word-diff argument: %s", arg
);
4722 else if ((argcount
= parse_long_opt("word-diff-regex", av
, &optarg
))) {
4723 if (options
->word_diff
== DIFF_WORDS_NONE
)
4724 options
->word_diff
= DIFF_WORDS_PLAIN
;
4725 options
->word_regex
= optarg
;
4728 else if (!strcmp(arg
, "--exit-code"))
4729 options
->flags
.exit_with_status
= 1;
4730 else if (!strcmp(arg
, "--quiet"))
4731 options
->flags
.quick
= 1;
4732 else if (!strcmp(arg
, "--ext-diff"))
4733 options
->flags
.allow_external
= 1;
4734 else if (!strcmp(arg
, "--no-ext-diff"))
4735 options
->flags
.allow_external
= 0;
4736 else if (!strcmp(arg
, "--textconv")) {
4737 options
->flags
.allow_textconv
= 1;
4738 options
->flags
.textconv_set_via_cmdline
= 1;
4739 } else if (!strcmp(arg
, "--no-textconv"))
4740 options
->flags
.allow_textconv
= 0;
4741 else if (skip_to_optional_arg_default(arg
, "--ignore-submodules", &arg
, "all")) {
4742 options
->flags
.override_submodule_config
= 1;
4743 handle_ignore_submodules_arg(options
, arg
);
4744 } else if (skip_to_optional_arg_default(arg
, "--submodule", &arg
, "log"))
4745 return parse_submodule_opt(options
, arg
);
4746 else if (skip_prefix(arg
, "--ws-error-highlight=", &arg
))
4747 return parse_ws_error_highlight_opt(options
, arg
);
4748 else if (!strcmp(arg
, "--ita-invisible-in-index"))
4749 options
->ita_invisible_in_index
= 1;
4750 else if (!strcmp(arg
, "--ita-visible-in-index"))
4751 options
->ita_invisible_in_index
= 0;
4754 else if (!strcmp(arg
, "-z"))
4755 options
->line_termination
= 0;
4756 else if ((argcount
= short_opt('l', av
, &optarg
))) {
4757 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
4760 else if ((argcount
= short_opt('S', av
, &optarg
))) {
4761 options
->pickaxe
= optarg
;
4762 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_S
;
4764 } else if ((argcount
= short_opt('G', av
, &optarg
))) {
4765 options
->pickaxe
= optarg
;
4766 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_G
;
4769 else if (!strcmp(arg
, "--pickaxe-all"))
4770 options
->pickaxe_opts
|= DIFF_PICKAXE_ALL
;
4771 else if (!strcmp(arg
, "--pickaxe-regex"))
4772 options
->pickaxe_opts
|= DIFF_PICKAXE_REGEX
;
4773 else if ((argcount
= short_opt('O', av
, &optarg
))) {
4774 options
->orderfile
= prefix_filename(prefix
, optarg
);
4776 } else if (skip_prefix(arg
, "--find-object=", &arg
))
4777 return parse_objfind_opt(options
, arg
);
4778 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
4779 int offending
= parse_diff_filter_opt(optarg
, options
);
4781 die("unknown change class '%c' in --diff-filter=%s",
4785 else if (!strcmp(arg
, "--no-abbrev"))
4786 options
->abbrev
= 0;
4787 else if (!strcmp(arg
, "--abbrev"))
4788 options
->abbrev
= DEFAULT_ABBREV
;
4789 else if (skip_prefix(arg
, "--abbrev=", &arg
)) {
4790 options
->abbrev
= strtoul(arg
, NULL
, 10);
4791 if (options
->abbrev
< MINIMUM_ABBREV
)
4792 options
->abbrev
= MINIMUM_ABBREV
;
4793 else if (40 < options
->abbrev
)
4794 options
->abbrev
= 40;
4796 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
4797 options
->a_prefix
= optarg
;
4800 else if ((argcount
= parse_long_opt("line-prefix", av
, &optarg
))) {
4801 options
->line_prefix
= optarg
;
4802 options
->line_prefix_length
= strlen(options
->line_prefix
);
4803 graph_setup_line_prefix(options
);
4806 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
4807 options
->b_prefix
= optarg
;
4810 else if (!strcmp(arg
, "--no-prefix"))
4811 options
->a_prefix
= options
->b_prefix
= "";
4812 else if (opt_arg(arg
, '\0', "inter-hunk-context",
4813 &options
->interhunkcontext
))
4815 else if (!strcmp(arg
, "-W"))
4816 options
->flags
.funccontext
= 1;
4817 else if (!strcmp(arg
, "--function-context"))
4818 options
->flags
.funccontext
= 1;
4819 else if (!strcmp(arg
, "--no-function-context"))
4820 options
->flags
.funccontext
= 0;
4821 else if ((argcount
= parse_long_opt("output", av
, &optarg
))) {
4822 char *path
= prefix_filename(prefix
, optarg
);
4823 options
->file
= xfopen(path
, "w");
4824 options
->close_file
= 1;
4825 if (options
->use_color
!= GIT_COLOR_ALWAYS
)
4826 options
->use_color
= GIT_COLOR_NEVER
;
4834 int parse_rename_score(const char **cp_p
)
4836 unsigned long num
, scale
;
4838 const char *cp
= *cp_p
;
4845 if ( !dot
&& ch
== '.' ) {
4848 } else if ( ch
== '%' ) {
4849 scale
= dot
? scale
*100 : 100;
4850 cp
++; /* % is always at the end */
4852 } else if ( ch
>= '0' && ch
<= '9' ) {
4853 if ( scale
< 100000 ) {
4855 num
= (num
*10) + (ch
-'0');
4864 /* user says num divided by scale and we say internally that
4865 * is MAX_SCORE * num / scale.
4867 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
4870 static int diff_scoreopt_parse(const char *opt
)
4872 int opt1
, opt2
, cmd
;
4878 /* convert the long-form arguments into short-form versions */
4879 if (skip_prefix(opt
, "break-rewrites", &opt
)) {
4880 if (*opt
== 0 || *opt
++ == '=')
4882 } else if (skip_prefix(opt
, "find-copies", &opt
)) {
4883 if (*opt
== 0 || *opt
++ == '=')
4885 } else if (skip_prefix(opt
, "find-renames", &opt
)) {
4886 if (*opt
== 0 || *opt
++ == '=')
4890 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
4891 return -1; /* that is not a -M, -C, or -B option */
4893 opt1
= parse_rename_score(&opt
);
4899 else if (*opt
!= '/')
4900 return -1; /* we expect -B80/99 or -B80 */
4903 opt2
= parse_rename_score(&opt
);
4908 return opt1
| (opt2
<< 16);
4911 struct diff_queue_struct diff_queued_diff
;
4913 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
4915 ALLOC_GROW(queue
->queue
, queue
->nr
+ 1, queue
->alloc
);
4916 queue
->queue
[queue
->nr
++] = dp
;
4919 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
4920 struct diff_filespec
*one
,
4921 struct diff_filespec
*two
)
4923 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
4931 void diff_free_filepair(struct diff_filepair
*p
)
4933 free_filespec(p
->one
);
4934 free_filespec(p
->two
);
4938 const char *diff_aligned_abbrev(const struct object_id
*oid
, int len
)
4943 /* Do we want all 40 hex characters? */
4944 if (len
== GIT_SHA1_HEXSZ
)
4945 return oid_to_hex(oid
);
4947 /* An abbreviated value is fine, possibly followed by an ellipsis. */
4948 abbrev
= diff_abbrev_oid(oid
, len
);
4950 if (!print_sha1_ellipsis())
4953 abblen
= strlen(abbrev
);
4956 * In well-behaved cases, where the abbreviated result is the
4957 * same as the requested length, append three dots after the
4958 * abbreviation (hence the whole logic is limited to the case
4959 * where abblen < 37); when the actual abbreviated result is a
4960 * bit longer than the requested length, we reduce the number
4961 * of dots so that they match the well-behaved ones. However,
4962 * if the actual abbreviation is longer than the requested
4963 * length by more than three, we give up on aligning, and add
4964 * three dots anyway, to indicate that the output is not the
4965 * full object name. Yes, this may be suboptimal, but this
4966 * appears only in "diff --raw --abbrev" output and it is not
4967 * worth the effort to change it now. Note that this would
4968 * likely to work fine when the automatic sizing of default
4969 * abbreviation length is used--we would be fed -1 in "len" in
4970 * that case, and will end up always appending three-dots, but
4971 * the automatic sizing is supposed to give abblen that ensures
4972 * uniqueness across all objects (statistically speaking).
4974 if (abblen
< GIT_SHA1_HEXSZ
- 3) {
4975 static char hex
[GIT_MAX_HEXSZ
+ 1];
4976 if (len
< abblen
&& abblen
<= len
+ 2)
4977 xsnprintf(hex
, sizeof(hex
), "%s%.*s", abbrev
, len
+3-abblen
, "..");
4979 xsnprintf(hex
, sizeof(hex
), "%s...", abbrev
);
4983 return oid_to_hex(oid
);
4986 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
4988 int line_termination
= opt
->line_termination
;
4989 int inter_name_termination
= line_termination
? '\t' : '\0';
4991 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
4992 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
4993 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
4994 diff_aligned_abbrev(&p
->one
->oid
, opt
->abbrev
));
4995 fprintf(opt
->file
, "%s ",
4996 diff_aligned_abbrev(&p
->two
->oid
, opt
->abbrev
));
4999 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
5000 inter_name_termination
);
5002 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
5005 if (p
->status
== DIFF_STATUS_COPIED
||
5006 p
->status
== DIFF_STATUS_RENAMED
) {
5007 const char *name_a
, *name_b
;
5008 name_a
= p
->one
->path
;
5009 name_b
= p
->two
->path
;
5010 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5011 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
5012 write_name_quoted(name_b
, opt
->file
, line_termination
);
5014 const char *name_a
, *name_b
;
5015 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
5017 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5018 write_name_quoted(name_a
, opt
->file
, line_termination
);
5022 int diff_unmodified_pair(struct diff_filepair
*p
)
5024 /* This function is written stricter than necessary to support
5025 * the currently implemented transformers, but the idea is to
5026 * let transformers to produce diff_filepairs any way they want,
5027 * and filter and clean them up here before producing the output.
5029 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
5031 if (DIFF_PAIR_UNMERGED(p
))
5032 return 0; /* unmerged is interesting */
5034 /* deletion, addition, mode or type change
5035 * and rename are all interesting.
5037 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
5038 DIFF_PAIR_MODE_CHANGED(p
) ||
5039 strcmp(one
->path
, two
->path
))
5042 /* both are valid and point at the same path. that is, we are
5043 * dealing with a change.
5045 if (one
->oid_valid
&& two
->oid_valid
&&
5046 !oidcmp(&one
->oid
, &two
->oid
) &&
5047 !one
->dirty_submodule
&& !two
->dirty_submodule
)
5048 return 1; /* no change */
5049 if (!one
->oid_valid
&& !two
->oid_valid
)
5050 return 1; /* both look at the same file on the filesystem. */
5054 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
5056 if (diff_unmodified_pair(p
))
5059 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5060 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5061 return; /* no tree diffs in patch format */
5066 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
5067 struct diffstat_t
*diffstat
)
5069 if (diff_unmodified_pair(p
))
5072 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5073 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5074 return; /* no useful stat for tree diffs */
5076 run_diffstat(p
, o
, diffstat
);
5079 static void diff_flush_checkdiff(struct diff_filepair
*p
,
5080 struct diff_options
*o
)
5082 if (diff_unmodified_pair(p
))
5085 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5086 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5087 return; /* nothing to check in tree diffs */
5089 run_checkdiff(p
, o
);
5092 int diff_queue_is_empty(void)
5094 struct diff_queue_struct
*q
= &diff_queued_diff
;
5096 for (i
= 0; i
< q
->nr
; i
++)
5097 if (!diff_unmodified_pair(q
->queue
[i
]))
5103 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
5105 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
5108 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
5110 s
->oid_valid
? oid_to_hex(&s
->oid
) : "");
5111 fprintf(stderr
, "queue[%d] %s size %lu\n",
5116 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
5118 diff_debug_filespec(p
->one
, i
, "one");
5119 diff_debug_filespec(p
->two
, i
, "two");
5120 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
5121 p
->score
, p
->status
? p
->status
: '?',
5122 p
->one
->rename_used
, p
->broken_pair
);
5125 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
5129 fprintf(stderr
, "%s\n", msg
);
5130 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
5131 for (i
= 0; i
< q
->nr
; i
++) {
5132 struct diff_filepair
*p
= q
->queue
[i
];
5133 diff_debug_filepair(p
, i
);
5138 static void diff_resolve_rename_copy(void)
5141 struct diff_filepair
*p
;
5142 struct diff_queue_struct
*q
= &diff_queued_diff
;
5144 diff_debug_queue("resolve-rename-copy", q
);
5146 for (i
= 0; i
< q
->nr
; i
++) {
5148 p
->status
= 0; /* undecided */
5149 if (DIFF_PAIR_UNMERGED(p
))
5150 p
->status
= DIFF_STATUS_UNMERGED
;
5151 else if (!DIFF_FILE_VALID(p
->one
))
5152 p
->status
= DIFF_STATUS_ADDED
;
5153 else if (!DIFF_FILE_VALID(p
->two
))
5154 p
->status
= DIFF_STATUS_DELETED
;
5155 else if (DIFF_PAIR_TYPE_CHANGED(p
))
5156 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
5158 /* from this point on, we are dealing with a pair
5159 * whose both sides are valid and of the same type, i.e.
5160 * either in-place edit or rename/copy edit.
5162 else if (DIFF_PAIR_RENAME(p
)) {
5164 * A rename might have re-connected a broken
5165 * pair up, causing the pathnames to be the
5166 * same again. If so, that's not a rename at
5167 * all, just a modification..
5169 * Otherwise, see if this source was used for
5170 * multiple renames, in which case we decrement
5171 * the count, and call it a copy.
5173 if (!strcmp(p
->one
->path
, p
->two
->path
))
5174 p
->status
= DIFF_STATUS_MODIFIED
;
5175 else if (--p
->one
->rename_used
> 0)
5176 p
->status
= DIFF_STATUS_COPIED
;
5178 p
->status
= DIFF_STATUS_RENAMED
;
5180 else if (oidcmp(&p
->one
->oid
, &p
->two
->oid
) ||
5181 p
->one
->mode
!= p
->two
->mode
||
5182 p
->one
->dirty_submodule
||
5183 p
->two
->dirty_submodule
||
5184 is_null_oid(&p
->one
->oid
))
5185 p
->status
= DIFF_STATUS_MODIFIED
;
5187 /* This is a "no-change" entry and should not
5188 * happen anymore, but prepare for broken callers.
5190 error("feeding unmodified %s to diffcore",
5192 p
->status
= DIFF_STATUS_UNKNOWN
;
5195 diff_debug_queue("resolve-rename-copy done", q
);
5198 static int check_pair_status(struct diff_filepair
*p
)
5200 switch (p
->status
) {
5201 case DIFF_STATUS_UNKNOWN
:
5204 die("internal error in diff-resolve-rename-copy");
5210 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
5212 int fmt
= opt
->output_format
;
5214 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
5215 diff_flush_checkdiff(p
, opt
);
5216 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
5217 diff_flush_raw(p
, opt
);
5218 else if (fmt
& DIFF_FORMAT_NAME
) {
5219 const char *name_a
, *name_b
;
5220 name_a
= p
->two
->path
;
5222 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
5223 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
5224 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
5228 static void show_file_mode_name(struct diff_options
*opt
, const char *newdelete
, struct diff_filespec
*fs
)
5230 struct strbuf sb
= STRBUF_INIT
;
5232 strbuf_addf(&sb
, " %s mode %06o ", newdelete
, fs
->mode
);
5234 strbuf_addf(&sb
, " %s ", newdelete
);
5236 quote_c_style(fs
->path
, &sb
, NULL
, 0);
5237 strbuf_addch(&sb
, '\n');
5238 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5240 strbuf_release(&sb
);
5243 static void show_mode_change(struct diff_options
*opt
, struct diff_filepair
*p
,
5246 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
5247 struct strbuf sb
= STRBUF_INIT
;
5248 strbuf_addf(&sb
, " mode change %06o => %06o",
5249 p
->one
->mode
, p
->two
->mode
);
5251 strbuf_addch(&sb
, ' ');
5252 quote_c_style(p
->two
->path
, &sb
, NULL
, 0);
5254 strbuf_addch(&sb
, '\n');
5255 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5257 strbuf_release(&sb
);
5261 static void show_rename_copy(struct diff_options
*opt
, const char *renamecopy
,
5262 struct diff_filepair
*p
)
5264 struct strbuf sb
= STRBUF_INIT
;
5265 struct strbuf names
= STRBUF_INIT
;
5267 pprint_rename(&names
, p
->one
->path
, p
->two
->path
);
5268 strbuf_addf(&sb
, " %s %s (%d%%)\n",
5269 renamecopy
, names
.buf
, similarity_index(p
));
5270 strbuf_release(&names
);
5271 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5273 show_mode_change(opt
, p
, 0);
5274 strbuf_release(&sb
);
5277 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
5280 case DIFF_STATUS_DELETED
:
5281 show_file_mode_name(opt
, "delete", p
->one
);
5283 case DIFF_STATUS_ADDED
:
5284 show_file_mode_name(opt
, "create", p
->two
);
5286 case DIFF_STATUS_COPIED
:
5287 show_rename_copy(opt
, "copy", p
);
5289 case DIFF_STATUS_RENAMED
:
5290 show_rename_copy(opt
, "rename", p
);
5294 struct strbuf sb
= STRBUF_INIT
;
5295 strbuf_addstr(&sb
, " rewrite ");
5296 quote_c_style(p
->two
->path
, &sb
, NULL
, 0);
5297 strbuf_addf(&sb
, " (%d%%)\n", similarity_index(p
));
5298 emit_diff_symbol(opt
, DIFF_SYMBOL_SUMMARY
,
5300 strbuf_release(&sb
);
5302 show_mode_change(opt
, p
, !p
->score
);
5312 static int remove_space(char *line
, int len
)
5318 for (i
= 0; i
< len
; i
++)
5319 if (!isspace((c
= line
[i
])))
5325 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
5327 struct patch_id_t
*data
= priv
;
5330 /* Ignore line numbers when computing the SHA1 of the patch */
5331 if (starts_with(line
, "@@ -"))
5334 new_len
= remove_space(line
, len
);
5336 git_SHA1_Update(data
->ctx
, line
, new_len
);
5337 data
->patchlen
+= new_len
;
5340 static void patch_id_add_string(git_SHA_CTX
*ctx
, const char *str
)
5342 git_SHA1_Update(ctx
, str
, strlen(str
));
5345 static void patch_id_add_mode(git_SHA_CTX
*ctx
, unsigned mode
)
5347 /* large enough for 2^32 in octal */
5349 int len
= xsnprintf(buf
, sizeof(buf
), "%06o", mode
);
5350 git_SHA1_Update(ctx
, buf
, len
);
5353 /* returns 0 upon success, and writes result into sha1 */
5354 static int diff_get_patch_id(struct diff_options
*options
, struct object_id
*oid
, int diff_header_only
)
5356 struct diff_queue_struct
*q
= &diff_queued_diff
;
5359 struct patch_id_t data
;
5361 git_SHA1_Init(&ctx
);
5362 memset(&data
, 0, sizeof(struct patch_id_t
));
5365 for (i
= 0; i
< q
->nr
; i
++) {
5369 struct diff_filepair
*p
= q
->queue
[i
];
5372 memset(&xpp
, 0, sizeof(xpp
));
5373 memset(&xecfg
, 0, sizeof(xecfg
));
5375 return error("internal diff status error");
5376 if (p
->status
== DIFF_STATUS_UNKNOWN
)
5378 if (diff_unmodified_pair(p
))
5380 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
5381 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
5383 if (DIFF_PAIR_UNMERGED(p
))
5386 diff_fill_oid_info(p
->one
);
5387 diff_fill_oid_info(p
->two
);
5389 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
5390 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
5391 patch_id_add_string(&ctx
, "diff--git");
5392 patch_id_add_string(&ctx
, "a/");
5393 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5394 patch_id_add_string(&ctx
, "b/");
5395 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5397 if (p
->one
->mode
== 0) {
5398 patch_id_add_string(&ctx
, "newfilemode");
5399 patch_id_add_mode(&ctx
, p
->two
->mode
);
5400 patch_id_add_string(&ctx
, "---/dev/null");
5401 patch_id_add_string(&ctx
, "+++b/");
5402 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5403 } else if (p
->two
->mode
== 0) {
5404 patch_id_add_string(&ctx
, "deletedfilemode");
5405 patch_id_add_mode(&ctx
, p
->one
->mode
);
5406 patch_id_add_string(&ctx
, "---a/");
5407 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5408 patch_id_add_string(&ctx
, "+++/dev/null");
5410 patch_id_add_string(&ctx
, "---a/");
5411 git_SHA1_Update(&ctx
, p
->one
->path
, len1
);
5412 patch_id_add_string(&ctx
, "+++b/");
5413 git_SHA1_Update(&ctx
, p
->two
->path
, len2
);
5416 if (diff_header_only
)
5419 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
5420 fill_mmfile(&mf2
, p
->two
) < 0)
5421 return error("unable to read files to diff");
5423 if (diff_filespec_is_binary(p
->one
) ||
5424 diff_filespec_is_binary(p
->two
)) {
5425 git_SHA1_Update(&ctx
, oid_to_hex(&p
->one
->oid
),
5427 git_SHA1_Update(&ctx
, oid_to_hex(&p
->two
->oid
),
5435 if (xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
5437 return error("unable to generate patch-id diff for %s",
5441 git_SHA1_Final(oid
->hash
, &ctx
);
5445 int diff_flush_patch_id(struct diff_options
*options
, struct object_id
*oid
, int diff_header_only
)
5447 struct diff_queue_struct
*q
= &diff_queued_diff
;
5449 int result
= diff_get_patch_id(options
, oid
, diff_header_only
);
5451 for (i
= 0; i
< q
->nr
; i
++)
5452 diff_free_filepair(q
->queue
[i
]);
5455 DIFF_QUEUE_CLEAR(q
);
5460 static int is_summary_empty(const struct diff_queue_struct
*q
)
5464 for (i
= 0; i
< q
->nr
; i
++) {
5465 const struct diff_filepair
*p
= q
->queue
[i
];
5467 switch (p
->status
) {
5468 case DIFF_STATUS_DELETED
:
5469 case DIFF_STATUS_ADDED
:
5470 case DIFF_STATUS_COPIED
:
5471 case DIFF_STATUS_RENAMED
:
5476 if (p
->one
->mode
&& p
->two
->mode
&&
5477 p
->one
->mode
!= p
->two
->mode
)
5485 static const char rename_limit_warning
[] =
5486 N_("inexact rename detection was skipped due to too many files.");
5488 static const char degrade_cc_to_c_warning
[] =
5489 N_("only found copies from modified paths due to too many files.");
5491 static const char rename_limit_advice
[] =
5492 N_("you may want to set your %s variable to at least "
5493 "%d and retry the command.");
5495 void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
)
5499 warning(_(degrade_cc_to_c_warning
));
5501 warning(_(rename_limit_warning
));
5505 warning(_(rename_limit_advice
), varname
, needed
);
5508 static void diff_flush_patch_all_file_pairs(struct diff_options
*o
)
5511 static struct emitted_diff_symbols esm
= EMITTED_DIFF_SYMBOLS_INIT
;
5512 struct diff_queue_struct
*q
= &diff_queued_diff
;
5514 if (WSEH_NEW
& WS_RULE_MASK
)
5515 die("BUG: WS rules bit mask overlaps with diff symbol flags");
5518 o
->emitted_symbols
= &esm
;
5520 for (i
= 0; i
< q
->nr
; i
++) {
5521 struct diff_filepair
*p
= q
->queue
[i
];
5522 if (check_pair_status(p
))
5523 diff_flush_patch(p
, o
);
5526 if (o
->emitted_symbols
) {
5527 if (o
->color_moved
) {
5528 struct hashmap add_lines
, del_lines
;
5530 hashmap_init(&del_lines
,
5531 (hashmap_cmp_fn
)moved_entry_cmp
, o
, 0);
5532 hashmap_init(&add_lines
,
5533 (hashmap_cmp_fn
)moved_entry_cmp
, o
, 0);
5535 add_lines_to_move_detection(o
, &add_lines
, &del_lines
);
5536 mark_color_as_moved(o
, &add_lines
, &del_lines
);
5537 if (o
->color_moved
== COLOR_MOVED_ZEBRA_DIM
)
5540 hashmap_free(&add_lines
, 0);
5541 hashmap_free(&del_lines
, 0);
5544 for (i
= 0; i
< esm
.nr
; i
++)
5545 emit_diff_symbol_from_struct(o
, &esm
.buf
[i
]);
5547 for (i
= 0; i
< esm
.nr
; i
++)
5548 free((void *)esm
.buf
[i
].line
);
5553 void diff_flush(struct diff_options
*options
)
5555 struct diff_queue_struct
*q
= &diff_queued_diff
;
5556 int i
, output_format
= options
->output_format
;
5558 int dirstat_by_line
= 0;
5561 * Order: raw, stat, summary, patch
5562 * or: name/name-status/checkdiff (other bits clear)
5567 if (output_format
& (DIFF_FORMAT_RAW
|
5569 DIFF_FORMAT_NAME_STATUS
|
5570 DIFF_FORMAT_CHECKDIFF
)) {
5571 for (i
= 0; i
< q
->nr
; i
++) {
5572 struct diff_filepair
*p
= q
->queue
[i
];
5573 if (check_pair_status(p
))
5574 flush_one_pair(p
, options
);
5579 if (output_format
& DIFF_FORMAT_DIRSTAT
&& options
->flags
.dirstat_by_line
)
5580 dirstat_by_line
= 1;
5582 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
) ||
5584 struct diffstat_t diffstat
;
5586 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
5587 for (i
= 0; i
< q
->nr
; i
++) {
5588 struct diff_filepair
*p
= q
->queue
[i
];
5589 if (check_pair_status(p
))
5590 diff_flush_stat(p
, options
, &diffstat
);
5592 if (output_format
& DIFF_FORMAT_NUMSTAT
)
5593 show_numstat(&diffstat
, options
);
5594 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
5595 show_stats(&diffstat
, options
);
5596 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
5597 show_shortstats(&diffstat
, options
);
5598 if (output_format
& DIFF_FORMAT_DIRSTAT
&& dirstat_by_line
)
5599 show_dirstat_by_line(&diffstat
, options
);
5600 free_diffstat_info(&diffstat
);
5603 if ((output_format
& DIFF_FORMAT_DIRSTAT
) && !dirstat_by_line
)
5604 show_dirstat(options
);
5606 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
5607 for (i
= 0; i
< q
->nr
; i
++) {
5608 diff_summary(options
, q
->queue
[i
]);
5613 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
5614 options
->flags
.exit_with_status
&&
5615 options
->flags
.diff_from_contents
) {
5617 * run diff_flush_patch for the exit status. setting
5618 * options->file to /dev/null should be safe, because we
5619 * aren't supposed to produce any output anyway.
5621 if (options
->close_file
)
5622 fclose(options
->file
);
5623 options
->file
= xfopen("/dev/null", "w");
5624 options
->close_file
= 1;
5625 options
->color_moved
= 0;
5626 for (i
= 0; i
< q
->nr
; i
++) {
5627 struct diff_filepair
*p
= q
->queue
[i
];
5628 if (check_pair_status(p
))
5629 diff_flush_patch(p
, options
);
5630 if (options
->found_changes
)
5635 if (output_format
& DIFF_FORMAT_PATCH
) {
5637 emit_diff_symbol(options
, DIFF_SYMBOL_SEPARATOR
, NULL
, 0, 0);
5638 if (options
->stat_sep
)
5639 /* attach patch instead of inline */
5640 emit_diff_symbol(options
, DIFF_SYMBOL_STAT_SEP
,
5644 diff_flush_patch_all_file_pairs(options
);
5647 if (output_format
& DIFF_FORMAT_CALLBACK
)
5648 options
->format_callback(q
, options
, options
->format_callback_data
);
5650 for (i
= 0; i
< q
->nr
; i
++)
5651 diff_free_filepair(q
->queue
[i
]);
5654 DIFF_QUEUE_CLEAR(q
);
5655 if (options
->close_file
)
5656 fclose(options
->file
);
5659 * Report the content-level differences with HAS_CHANGES;
5660 * diff_addremove/diff_change does not set the bit when
5661 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
5663 if (options
->flags
.diff_from_contents
) {
5664 if (options
->found_changes
)
5665 options
->flags
.has_changes
= 1;
5667 options
->flags
.has_changes
= 0;
5671 static int match_filter(const struct diff_options
*options
, const struct diff_filepair
*p
)
5673 return (((p
->status
== DIFF_STATUS_MODIFIED
) &&
5675 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN
, options
)) ||
5677 filter_bit_tst(DIFF_STATUS_MODIFIED
, options
)))) ||
5678 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
5679 filter_bit_tst(p
->status
, options
)));
5682 static void diffcore_apply_filter(struct diff_options
*options
)
5685 struct diff_queue_struct
*q
= &diff_queued_diff
;
5686 struct diff_queue_struct outq
;
5688 DIFF_QUEUE_CLEAR(&outq
);
5690 if (!options
->filter
)
5693 if (filter_bit_tst(DIFF_STATUS_FILTER_AON
, options
)) {
5695 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
5696 if (match_filter(options
, q
->queue
[i
]))
5702 /* otherwise we will clear the whole queue
5703 * by copying the empty outq at the end of this
5704 * function, but first clear the current entries
5707 for (i
= 0; i
< q
->nr
; i
++)
5708 diff_free_filepair(q
->queue
[i
]);
5711 /* Only the matching ones */
5712 for (i
= 0; i
< q
->nr
; i
++) {
5713 struct diff_filepair
*p
= q
->queue
[i
];
5714 if (match_filter(options
, p
))
5717 diff_free_filepair(p
);
5724 /* Check whether two filespecs with the same mode and size are identical */
5725 static int diff_filespec_is_identical(struct diff_filespec
*one
,
5726 struct diff_filespec
*two
)
5728 if (S_ISGITLINK(one
->mode
))
5730 if (diff_populate_filespec(one
, 0))
5732 if (diff_populate_filespec(two
, 0))
5734 return !memcmp(one
->data
, two
->data
, one
->size
);
5737 static int diff_filespec_check_stat_unmatch(struct diff_filepair
*p
)
5739 if (p
->done_skip_stat_unmatch
)
5740 return p
->skip_stat_unmatch_result
;
5742 p
->done_skip_stat_unmatch
= 1;
5743 p
->skip_stat_unmatch_result
= 0;
5745 * 1. Entries that come from stat info dirtiness
5746 * always have both sides (iow, not create/delete),
5747 * one side of the object name is unknown, with
5748 * the same mode and size. Keep the ones that
5749 * do not match these criteria. They have real
5752 * 2. At this point, the file is known to be modified,
5753 * with the same mode and size, and the object
5754 * name of one side is unknown. Need to inspect
5755 * the identical contents.
5757 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
5758 !DIFF_FILE_VALID(p
->two
) ||
5759 (p
->one
->oid_valid
&& p
->two
->oid_valid
) ||
5760 (p
->one
->mode
!= p
->two
->mode
) ||
5761 diff_populate_filespec(p
->one
, CHECK_SIZE_ONLY
) ||
5762 diff_populate_filespec(p
->two
, CHECK_SIZE_ONLY
) ||
5763 (p
->one
->size
!= p
->two
->size
) ||
5764 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
5765 p
->skip_stat_unmatch_result
= 1;
5766 return p
->skip_stat_unmatch_result
;
5769 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
5772 struct diff_queue_struct
*q
= &diff_queued_diff
;
5773 struct diff_queue_struct outq
;
5774 DIFF_QUEUE_CLEAR(&outq
);
5776 for (i
= 0; i
< q
->nr
; i
++) {
5777 struct diff_filepair
*p
= q
->queue
[i
];
5779 if (diff_filespec_check_stat_unmatch(p
))
5783 * The caller can subtract 1 from skip_stat_unmatch
5784 * to determine how many paths were dirty only
5785 * due to stat info mismatch.
5787 if (!diffopt
->flags
.no_index
)
5788 diffopt
->skip_stat_unmatch
++;
5789 diff_free_filepair(p
);
5796 static int diffnamecmp(const void *a_
, const void *b_
)
5798 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
5799 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
5800 const char *name_a
, *name_b
;
5802 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
5803 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
5804 return strcmp(name_a
, name_b
);
5807 void diffcore_fix_diff_index(struct diff_options
*options
)
5809 struct diff_queue_struct
*q
= &diff_queued_diff
;
5810 QSORT(q
->queue
, q
->nr
, diffnamecmp
);
5813 void diffcore_std(struct diff_options
*options
)
5815 /* NOTE please keep the following in sync with diff_tree_combined() */
5816 if (options
->skip_stat_unmatch
)
5817 diffcore_skip_stat_unmatch(options
);
5818 if (!options
->found_follow
) {
5819 /* See try_to_follow_renames() in tree-diff.c */
5820 if (options
->break_opt
!= -1)
5821 diffcore_break(options
->break_opt
);
5822 if (options
->detect_rename
)
5823 diffcore_rename(options
);
5824 if (options
->break_opt
!= -1)
5825 diffcore_merge_broken();
5827 if (options
->pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
)
5828 diffcore_pickaxe(options
);
5829 if (options
->orderfile
)
5830 diffcore_order(options
->orderfile
);
5831 if (!options
->found_follow
)
5832 /* See try_to_follow_renames() in tree-diff.c */
5833 diff_resolve_rename_copy();
5834 diffcore_apply_filter(options
);
5836 if (diff_queued_diff
.nr
&& !options
->flags
.diff_from_contents
)
5837 options
->flags
.has_changes
= 1;
5839 options
->flags
.has_changes
= 0;
5841 options
->found_follow
= 0;
5844 int diff_result_code(struct diff_options
*opt
, int status
)
5848 diff_warn_rename_limit("diff.renameLimit",
5849 opt
->needed_rename_limit
,
5850 opt
->degraded_cc_to_c
);
5851 if (!opt
->flags
.exit_with_status
&&
5852 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
5854 if (opt
->flags
.exit_with_status
&&
5855 opt
->flags
.has_changes
)
5857 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
5858 opt
->flags
.check_failed
)
5863 int diff_can_quit_early(struct diff_options
*opt
)
5865 return (opt
->flags
.quick
&&
5867 opt
->flags
.has_changes
);
5871 * Shall changes to this submodule be ignored?
5873 * Submodule changes can be configured to be ignored separately for each path,
5874 * but that configuration can be overridden from the command line.
5876 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
5879 struct diff_flags orig_flags
= options
->flags
;
5880 if (!options
->flags
.override_submodule_config
)
5881 set_diffopt_flags_from_submodule_config(options
, path
);
5882 if (options
->flags
.ignore_submodules
)
5884 options
->flags
= orig_flags
;
5888 void diff_addremove(struct diff_options
*options
,
5889 int addremove
, unsigned mode
,
5890 const struct object_id
*oid
,
5892 const char *concatpath
, unsigned dirty_submodule
)
5894 struct diff_filespec
*one
, *two
;
5896 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
5899 /* This may look odd, but it is a preparation for
5900 * feeding "there are unchanged files which should
5901 * not produce diffs, but when you are doing copy
5902 * detection you would need them, so here they are"
5903 * entries to the diff-core. They will be prefixed
5904 * with something like '=' or '*' (I haven't decided
5905 * which but should not make any difference).
5906 * Feeding the same new and old to diff_change()
5907 * also has the same effect.
5908 * Before the final output happens, they are pruned after
5909 * merged into rename/copy pairs as appropriate.
5911 if (options
->flags
.reverse_diff
)
5912 addremove
= (addremove
== '+' ? '-' :
5913 addremove
== '-' ? '+' : addremove
);
5915 if (options
->prefix
&&
5916 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
5919 one
= alloc_filespec(concatpath
);
5920 two
= alloc_filespec(concatpath
);
5922 if (addremove
!= '+')
5923 fill_filespec(one
, oid
, oid_valid
, mode
);
5924 if (addremove
!= '-') {
5925 fill_filespec(two
, oid
, oid_valid
, mode
);
5926 two
->dirty_submodule
= dirty_submodule
;
5929 diff_queue(&diff_queued_diff
, one
, two
);
5930 if (!options
->flags
.diff_from_contents
)
5931 options
->flags
.has_changes
= 1;
5934 void diff_change(struct diff_options
*options
,
5935 unsigned old_mode
, unsigned new_mode
,
5936 const struct object_id
*old_oid
,
5937 const struct object_id
*new_oid
,
5938 int old_oid_valid
, int new_oid_valid
,
5939 const char *concatpath
,
5940 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
5942 struct diff_filespec
*one
, *two
;
5943 struct diff_filepair
*p
;
5945 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
5946 is_submodule_ignored(concatpath
, options
))
5949 if (options
->flags
.reverse_diff
) {
5950 SWAP(old_mode
, new_mode
);
5951 SWAP(old_oid
, new_oid
);
5952 SWAP(old_oid_valid
, new_oid_valid
);
5953 SWAP(old_dirty_submodule
, new_dirty_submodule
);
5956 if (options
->prefix
&&
5957 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
5960 one
= alloc_filespec(concatpath
);
5961 two
= alloc_filespec(concatpath
);
5962 fill_filespec(one
, old_oid
, old_oid_valid
, old_mode
);
5963 fill_filespec(two
, new_oid
, new_oid_valid
, new_mode
);
5964 one
->dirty_submodule
= old_dirty_submodule
;
5965 two
->dirty_submodule
= new_dirty_submodule
;
5966 p
= diff_queue(&diff_queued_diff
, one
, two
);
5968 if (options
->flags
.diff_from_contents
)
5971 if (options
->flags
.quick
&& options
->skip_stat_unmatch
&&
5972 !diff_filespec_check_stat_unmatch(p
))
5975 options
->flags
.has_changes
= 1;
5978 struct diff_filepair
*diff_unmerge(struct diff_options
*options
, const char *path
)
5980 struct diff_filepair
*pair
;
5981 struct diff_filespec
*one
, *two
;
5983 if (options
->prefix
&&
5984 strncmp(path
, options
->prefix
, options
->prefix_length
))
5987 one
= alloc_filespec(path
);
5988 two
= alloc_filespec(path
);
5989 pair
= diff_queue(&diff_queued_diff
, one
, two
);
5990 pair
->is_unmerged
= 1;
5994 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
5997 struct diff_tempfile
*temp
;
5998 const char *argv
[3];
5999 const char **arg
= argv
;
6000 struct child_process child
= CHILD_PROCESS_INIT
;
6001 struct strbuf buf
= STRBUF_INIT
;
6004 temp
= prepare_temp_file(spec
->path
, spec
);
6006 *arg
++ = temp
->name
;
6009 child
.use_shell
= 1;
6012 if (start_command(&child
)) {
6017 if (strbuf_read(&buf
, child
.out
, 0) < 0)
6018 err
= error("error reading from textconv command '%s'", pgm
);
6021 if (finish_command(&child
) || err
) {
6022 strbuf_release(&buf
);
6028 return strbuf_detach(&buf
, outsize
);
6031 size_t fill_textconv(struct userdiff_driver
*driver
,
6032 struct diff_filespec
*df
,
6038 if (!DIFF_FILE_VALID(df
)) {
6042 if (diff_populate_filespec(df
, 0))
6043 die("unable to read files to diff");
6048 if (!driver
->textconv
)
6049 die("BUG: fill_textconv called with non-textconv driver");
6051 if (driver
->textconv_cache
&& df
->oid_valid
) {
6052 *outbuf
= notes_cache_get(driver
->textconv_cache
,
6059 *outbuf
= run_textconv(driver
->textconv
, df
, &size
);
6061 die("unable to read files to diff");
6063 if (driver
->textconv_cache
&& df
->oid_valid
) {
6064 /* ignore errors, as we might be in a readonly repository */
6065 notes_cache_put(driver
->textconv_cache
, &df
->oid
, *outbuf
,
6068 * we could save up changes and flush them all at the end,
6069 * but we would need an extra call after all diffing is done.
6070 * Since generating a cache entry is the slow path anyway,
6071 * this extra overhead probably isn't a big deal.
6073 notes_cache_write(driver
->textconv_cache
);
6079 int textconv_object(const char *path
,
6081 const struct object_id
*oid
,
6084 unsigned long *buf_size
)
6086 struct diff_filespec
*df
;
6087 struct userdiff_driver
*textconv
;
6089 df
= alloc_filespec(path
);
6090 fill_filespec(df
, oid
, oid_valid
, mode
);
6091 textconv
= get_textconv(df
);
6097 *buf_size
= fill_textconv(textconv
, df
, buf
);
6102 void setup_diff_pager(struct diff_options
*opt
)
6105 * If the user asked for our exit code, then either they want --quiet
6106 * or --exit-code. We should definitely not bother with a pager in the
6107 * former case, as we will generate no output. Since we still properly
6108 * report our exit code even when a pager is run, we _could_ run a
6109 * pager with --exit-code. But since we have not done so historically,
6110 * and because it is easy to find people oneline advising "git diff
6111 * --exit-code" in hooks and other scripts, we do not do so.
6113 if (!opt
->flags
.exit_with_status
&&
6114 check_pager_config("diff") != 0)