2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
16 #include "submodule.h"
18 #include "string-list.h"
19 #include "argv-array.h"
21 #ifdef NO_FAST_WORKING_DIRECTORY
22 #define FAST_WORKING_DIRECTORY 0
24 #define FAST_WORKING_DIRECTORY 1
27 static int diff_detect_rename_default
;
28 static int diff_rename_limit_default
= 400;
29 static int diff_suppress_blank_empty
;
30 static int diff_use_color_default
= -1;
31 static int diff_context_default
= 3;
32 static const char *diff_word_regex_cfg
;
33 static const char *external_diff_cmd_cfg
;
34 static const char *diff_order_file_cfg
;
35 int diff_auto_refresh_index
= 1;
36 static int diff_mnemonic_prefix
;
37 static int diff_no_prefix
;
38 static int diff_stat_graph_width
;
39 static int diff_dirstat_permille_default
= 30;
40 static struct diff_options default_diff_options
;
41 static long diff_algorithm
;
43 static char diff_colors
[][COLOR_MAXLEN
] = {
45 GIT_COLOR_NORMAL
, /* PLAIN */
46 GIT_COLOR_BOLD
, /* METAINFO */
47 GIT_COLOR_CYAN
, /* FRAGINFO */
48 GIT_COLOR_RED
, /* OLD */
49 GIT_COLOR_GREEN
, /* NEW */
50 GIT_COLOR_YELLOW
, /* COMMIT */
51 GIT_COLOR_BG_RED
, /* WHITESPACE */
52 GIT_COLOR_NORMAL
, /* FUNCINFO */
55 static int parse_diff_color_slot(const char *var
)
57 if (!strcasecmp(var
, "plain"))
59 if (!strcasecmp(var
, "meta"))
61 if (!strcasecmp(var
, "frag"))
63 if (!strcasecmp(var
, "old"))
65 if (!strcasecmp(var
, "new"))
67 if (!strcasecmp(var
, "commit"))
69 if (!strcasecmp(var
, "whitespace"))
70 return DIFF_WHITESPACE
;
71 if (!strcasecmp(var
, "func"))
76 static int parse_dirstat_params(struct diff_options
*options
, const char *params_string
,
77 struct strbuf
*errmsg
)
79 char *params_copy
= xstrdup(params_string
);
80 struct string_list params
= STRING_LIST_INIT_NODUP
;
85 string_list_split_in_place(¶ms
, params_copy
, ',', -1);
86 for (i
= 0; i
< params
.nr
; i
++) {
87 const char *p
= params
.items
[i
].string
;
88 if (!strcmp(p
, "changes")) {
89 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
90 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
91 } else if (!strcmp(p
, "lines")) {
92 DIFF_OPT_SET(options
, DIRSTAT_BY_LINE
);
93 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
94 } else if (!strcmp(p
, "files")) {
95 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
96 DIFF_OPT_SET(options
, DIRSTAT_BY_FILE
);
97 } else if (!strcmp(p
, "noncumulative")) {
98 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
99 } else if (!strcmp(p
, "cumulative")) {
100 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
101 } else if (isdigit(*p
)) {
103 int permille
= strtoul(p
, &end
, 10) * 10;
104 if (*end
== '.' && isdigit(*++end
)) {
105 /* only use first digit */
106 permille
+= *end
- '0';
107 /* .. and ignore any further digits */
108 while (isdigit(*++end
))
112 options
->dirstat_permille
= permille
;
114 strbuf_addf(errmsg
, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
119 strbuf_addf(errmsg
, _(" Unknown dirstat parameter '%s'\n"), p
);
124 string_list_clear(¶ms
, 0);
129 static int parse_submodule_params(struct diff_options
*options
, const char *value
)
131 if (!strcmp(value
, "log"))
132 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
133 else if (!strcmp(value
, "short"))
134 DIFF_OPT_CLR(options
, SUBMODULE_LOG
);
140 static int git_config_rename(const char *var
, const char *value
)
143 return DIFF_DETECT_RENAME
;
144 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
145 return DIFF_DETECT_COPY
;
146 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
149 long parse_algorithm_value(const char *value
)
153 else if (!strcasecmp(value
, "myers") || !strcasecmp(value
, "default"))
155 else if (!strcasecmp(value
, "minimal"))
156 return XDF_NEED_MINIMAL
;
157 else if (!strcasecmp(value
, "patience"))
158 return XDF_PATIENCE_DIFF
;
159 else if (!strcasecmp(value
, "histogram"))
160 return XDF_HISTOGRAM_DIFF
;
165 * These are to give UI layer defaults.
166 * The core-level commands such as git-diff-files should
167 * never be affected by the setting of diff.renames
168 * the user happens to have in the configuration file.
170 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
172 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
173 diff_use_color_default
= git_config_colorbool(var
, value
);
176 if (!strcmp(var
, "diff.context")) {
177 diff_context_default
= git_config_int(var
, value
);
178 if (diff_context_default
< 0)
182 if (!strcmp(var
, "diff.renames")) {
183 diff_detect_rename_default
= git_config_rename(var
, value
);
186 if (!strcmp(var
, "diff.autorefreshindex")) {
187 diff_auto_refresh_index
= git_config_bool(var
, value
);
190 if (!strcmp(var
, "diff.mnemonicprefix")) {
191 diff_mnemonic_prefix
= git_config_bool(var
, value
);
194 if (!strcmp(var
, "diff.noprefix")) {
195 diff_no_prefix
= git_config_bool(var
, value
);
198 if (!strcmp(var
, "diff.statgraphwidth")) {
199 diff_stat_graph_width
= git_config_int(var
, value
);
202 if (!strcmp(var
, "diff.external"))
203 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
204 if (!strcmp(var
, "diff.wordregex"))
205 return git_config_string(&diff_word_regex_cfg
, var
, value
);
206 if (!strcmp(var
, "diff.orderfile"))
207 return git_config_pathname(&diff_order_file_cfg
, var
, value
);
209 if (!strcmp(var
, "diff.ignoresubmodules"))
210 handle_ignore_submodules_arg(&default_diff_options
, value
);
212 if (!strcmp(var
, "diff.submodule")) {
213 if (parse_submodule_params(&default_diff_options
, value
))
214 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
219 if (!strcmp(var
, "diff.algorithm")) {
220 diff_algorithm
= parse_algorithm_value(value
);
221 if (diff_algorithm
< 0)
226 if (git_color_config(var
, value
, cb
) < 0)
229 return git_diff_basic_config(var
, value
, cb
);
232 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
236 if (!strcmp(var
, "diff.renamelimit")) {
237 diff_rename_limit_default
= git_config_int(var
, value
);
241 if (userdiff_config(var
, value
) < 0)
244 if (skip_prefix(var
, "diff.color.", &name
) ||
245 skip_prefix(var
, "color.diff.", &name
)) {
246 int slot
= parse_diff_color_slot(name
);
250 return config_error_nonbool(var
);
251 color_parse(value
, var
, diff_colors
[slot
]);
255 /* like GNU diff's --suppress-blank-empty option */
256 if (!strcmp(var
, "diff.suppressblankempty") ||
257 /* for backwards compatibility */
258 !strcmp(var
, "diff.suppress-blank-empty")) {
259 diff_suppress_blank_empty
= git_config_bool(var
, value
);
263 if (!strcmp(var
, "diff.dirstat")) {
264 struct strbuf errmsg
= STRBUF_INIT
;
265 default_diff_options
.dirstat_permille
= diff_dirstat_permille_default
;
266 if (parse_dirstat_params(&default_diff_options
, value
, &errmsg
))
267 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
269 strbuf_release(&errmsg
);
270 diff_dirstat_permille_default
= default_diff_options
.dirstat_permille
;
274 if (starts_with(var
, "submodule."))
275 return parse_submodule_config_option(var
, value
);
277 return git_default_config(var
, value
, cb
);
280 static char *quote_two(const char *one
, const char *two
)
282 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
283 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
284 struct strbuf res
= STRBUF_INIT
;
286 if (need_one
+ need_two
) {
287 strbuf_addch(&res
, '"');
288 quote_c_style(one
, &res
, NULL
, 1);
289 quote_c_style(two
, &res
, NULL
, 1);
290 strbuf_addch(&res
, '"');
292 strbuf_addstr(&res
, one
);
293 strbuf_addstr(&res
, two
);
295 return strbuf_detach(&res
, NULL
);
298 static const char *external_diff(void)
300 static const char *external_diff_cmd
= NULL
;
301 static int done_preparing
= 0;
304 return external_diff_cmd
;
305 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
306 if (!external_diff_cmd
)
307 external_diff_cmd
= external_diff_cmd_cfg
;
309 return external_diff_cmd
;
312 static struct diff_tempfile
{
313 const char *name
; /* filename external diff should read from */
316 char tmp_path
[PATH_MAX
];
319 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
321 struct emit_callback
{
324 int blank_at_eof_in_preimage
;
325 int blank_at_eof_in_postimage
;
327 int lno_in_postimage
;
328 sane_truncate_fn truncate
;
329 const char **label_path
;
330 struct diff_words_data
*diff_words
;
331 struct diff_options
*opt
;
333 struct strbuf
*header
;
336 static int count_lines(const char *data
, int size
)
338 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
345 completely_empty
= 0;
349 completely_empty
= 0;
352 if (completely_empty
)
355 count
++; /* no trailing newline */
359 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
361 if (!DIFF_FILE_VALID(one
)) {
362 mf
->ptr
= (char *)""; /* does not matter */
366 else if (diff_populate_filespec(one
, 0))
370 mf
->size
= one
->size
;
374 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
375 static unsigned long diff_filespec_size(struct diff_filespec
*one
)
377 if (!DIFF_FILE_VALID(one
))
379 diff_populate_filespec(one
, CHECK_SIZE_ONLY
);
383 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
386 long size
= mf
->size
;
391 ptr
+= size
- 1; /* pointing at the very end */
393 ; /* incomplete line */
395 ptr
--; /* skip the last LF */
396 while (mf
->ptr
< ptr
) {
398 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
399 if (*prev_eol
== '\n')
401 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
409 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
410 struct emit_callback
*ecbdata
)
413 unsigned ws_rule
= ecbdata
->ws_rule
;
414 l1
= count_trailing_blank(mf1
, ws_rule
);
415 l2
= count_trailing_blank(mf2
, ws_rule
);
417 ecbdata
->blank_at_eof_in_preimage
= 0;
418 ecbdata
->blank_at_eof_in_postimage
= 0;
421 at
= count_lines(mf1
->ptr
, mf1
->size
);
422 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
424 at
= count_lines(mf2
->ptr
, mf2
->size
);
425 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
428 static void emit_line_0(struct diff_options
*o
, const char *set
, const char *reset
,
429 int first
, const char *line
, int len
)
431 int has_trailing_newline
, has_trailing_carriage_return
;
433 FILE *file
= o
->file
;
435 fputs(diff_line_prefix(o
), file
);
438 has_trailing_newline
= (first
== '\n');
439 has_trailing_carriage_return
= (!has_trailing_newline
&&
441 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
443 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
444 if (has_trailing_newline
)
446 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
447 if (has_trailing_carriage_return
)
452 if (len
|| !nofirst
) {
456 fwrite(line
, len
, 1, file
);
459 if (has_trailing_carriage_return
)
461 if (has_trailing_newline
)
465 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
466 const char *line
, int len
)
468 emit_line_0(o
, set
, reset
, line
[0], line
+1, len
-1);
471 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
473 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
474 ecbdata
->blank_at_eof_in_preimage
&&
475 ecbdata
->blank_at_eof_in_postimage
&&
476 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
477 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
479 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
482 static void emit_add_line(const char *reset
,
483 struct emit_callback
*ecbdata
,
484 const char *line
, int len
)
486 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
487 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
490 emit_line_0(ecbdata
->opt
, set
, reset
, '+', line
, len
);
491 else if (new_blank_line_at_eof(ecbdata
, line
, len
))
492 /* Blank line at EOF - paint '+' as well */
493 emit_line_0(ecbdata
->opt
, ws
, reset
, '+', line
, len
);
495 /* Emit just the prefix, then the rest. */
496 emit_line_0(ecbdata
->opt
, set
, reset
, '+', "", 0);
497 ws_check_emit(line
, len
, ecbdata
->ws_rule
,
498 ecbdata
->opt
->file
, set
, reset
, ws
);
502 static void emit_hunk_header(struct emit_callback
*ecbdata
,
503 const char *line
, int len
)
505 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
506 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
507 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
508 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
509 static const char atat
[2] = { '@', '@' };
511 struct strbuf msgbuf
= STRBUF_INIT
;
516 * As a hunk header must begin with "@@ -<old>, +<new> @@",
517 * it always is at least 10 bytes long.
520 memcmp(line
, atat
, 2) ||
521 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
522 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
525 ep
+= 2; /* skip over @@ */
527 /* The hunk header in fraginfo color */
528 strbuf_addstr(&msgbuf
, frag
);
529 strbuf_add(&msgbuf
, line
, ep
- line
);
530 strbuf_addstr(&msgbuf
, reset
);
536 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
539 /* blank before the func header */
540 for (cp
= ep
; ep
- line
< len
; ep
++)
541 if (*ep
!= ' ' && *ep
!= '\t')
544 strbuf_addstr(&msgbuf
, plain
);
545 strbuf_add(&msgbuf
, cp
, ep
- cp
);
546 strbuf_addstr(&msgbuf
, reset
);
549 if (ep
< line
+ len
) {
550 strbuf_addstr(&msgbuf
, func
);
551 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
552 strbuf_addstr(&msgbuf
, reset
);
555 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
556 emit_line(ecbdata
->opt
, "", "", msgbuf
.buf
, msgbuf
.len
);
557 strbuf_release(&msgbuf
);
560 static struct diff_tempfile
*claim_diff_tempfile(void) {
562 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
563 if (!diff_temp
[i
].name
)
564 return diff_temp
+ i
;
565 die("BUG: diff is failing to clean up its tempfiles");
568 static int remove_tempfile_installed
;
570 static void remove_tempfile(void)
573 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
574 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
)
575 unlink_or_warn(diff_temp
[i
].name
);
576 diff_temp
[i
].name
= NULL
;
580 static void remove_tempfile_on_signal(int signo
)
587 static void print_line_count(FILE *file
, int count
)
591 fprintf(file
, "0,0");
597 fprintf(file
, "1,%d", count
);
602 static void emit_rewrite_lines(struct emit_callback
*ecb
,
603 int prefix
, const char *data
, int size
)
605 const char *endp
= NULL
;
606 static const char *nneof
= " No newline at end of file\n";
607 const char *old
= diff_get_color(ecb
->color_diff
, DIFF_FILE_OLD
);
608 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
613 endp
= memchr(data
, '\n', size
);
614 len
= endp
? (endp
- data
+ 1) : size
;
616 ecb
->lno_in_preimage
++;
617 emit_line_0(ecb
->opt
, old
, reset
, '-',
620 ecb
->lno_in_postimage
++;
621 emit_add_line(reset
, ecb
, data
, len
);
627 const char *plain
= diff_get_color(ecb
->color_diff
,
629 putc('\n', ecb
->opt
->file
);
630 emit_line_0(ecb
->opt
, plain
, reset
, '\\',
631 nneof
, strlen(nneof
));
635 static void emit_rewrite_diff(const char *name_a
,
637 struct diff_filespec
*one
,
638 struct diff_filespec
*two
,
639 struct userdiff_driver
*textconv_one
,
640 struct userdiff_driver
*textconv_two
,
641 struct diff_options
*o
)
644 const char *name_a_tab
, *name_b_tab
;
645 const char *metainfo
= diff_get_color(o
->use_color
, DIFF_METAINFO
);
646 const char *fraginfo
= diff_get_color(o
->use_color
, DIFF_FRAGINFO
);
647 const char *reset
= diff_get_color(o
->use_color
, DIFF_RESET
);
648 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
649 const char *a_prefix
, *b_prefix
;
650 char *data_one
, *data_two
;
651 size_t size_one
, size_two
;
652 struct emit_callback ecbdata
;
653 const char *line_prefix
= diff_line_prefix(o
);
655 if (diff_mnemonic_prefix
&& DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
656 a_prefix
= o
->b_prefix
;
657 b_prefix
= o
->a_prefix
;
659 a_prefix
= o
->a_prefix
;
660 b_prefix
= o
->b_prefix
;
663 name_a
+= (*name_a
== '/');
664 name_b
+= (*name_b
== '/');
665 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
666 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
668 strbuf_reset(&a_name
);
669 strbuf_reset(&b_name
);
670 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
671 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
673 size_one
= fill_textconv(textconv_one
, one
, &data_one
);
674 size_two
= fill_textconv(textconv_two
, two
, &data_two
);
676 memset(&ecbdata
, 0, sizeof(ecbdata
));
677 ecbdata
.color_diff
= want_color(o
->use_color
);
678 ecbdata
.found_changesp
= &o
->found_changes
;
679 ecbdata
.ws_rule
= whitespace_rule(name_b
);
681 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
683 mf1
.ptr
= (char *)data_one
;
684 mf2
.ptr
= (char *)data_two
;
687 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
689 ecbdata
.lno_in_preimage
= 1;
690 ecbdata
.lno_in_postimage
= 1;
692 lc_a
= count_lines(data_one
, size_one
);
693 lc_b
= count_lines(data_two
, size_two
);
695 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
696 line_prefix
, metainfo
, a_name
.buf
, name_a_tab
, reset
,
697 line_prefix
, metainfo
, b_name
.buf
, name_b_tab
, reset
,
698 line_prefix
, fraginfo
);
699 if (!o
->irreversible_delete
)
700 print_line_count(o
->file
, lc_a
);
702 fprintf(o
->file
, "?,?");
703 fprintf(o
->file
, " +");
704 print_line_count(o
->file
, lc_b
);
705 fprintf(o
->file
, " @@%s\n", reset
);
706 if (lc_a
&& !o
->irreversible_delete
)
707 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
709 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
711 free((char *)data_one
);
713 free((char *)data_two
);
716 struct diff_words_buffer
{
719 struct diff_words_orig
{
720 const char *begin
, *end
;
722 int orig_nr
, orig_alloc
;
725 static void diff_words_append(char *line
, unsigned long len
,
726 struct diff_words_buffer
*buffer
)
728 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
731 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
732 buffer
->text
.size
+= len
;
733 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
736 struct diff_words_style_elem
{
739 const char *color
; /* NULL; filled in by the setup code if
740 * color is enabled */
743 struct diff_words_style
{
744 enum diff_words_type type
;
745 struct diff_words_style_elem
new, old
, ctx
;
749 static struct diff_words_style diff_words_styles
[] = {
750 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
751 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
752 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
755 struct diff_words_data
{
756 struct diff_words_buffer minus
, plus
;
757 const char *current_plus
;
759 struct diff_options
*opt
;
761 enum diff_words_type type
;
762 struct diff_words_style
*style
;
765 static int fn_out_diff_words_write_helper(FILE *fp
,
766 struct diff_words_style_elem
*st_el
,
768 size_t count
, const char *buf
,
769 const char *line_prefix
)
774 char *p
= memchr(buf
, '\n', count
);
776 fputs(line_prefix
, fp
);
778 if (st_el
->color
&& fputs(st_el
->color
, fp
) < 0)
780 if (fputs(st_el
->prefix
, fp
) < 0 ||
781 fwrite(buf
, p
? p
- buf
: count
, 1, fp
) != 1 ||
782 fputs(st_el
->suffix
, fp
) < 0)
784 if (st_el
->color
&& *st_el
->color
785 && fputs(GIT_COLOR_RESET
, fp
) < 0)
790 if (fputs(newline
, fp
) < 0)
792 count
-= p
+ 1 - buf
;
800 * '--color-words' algorithm can be described as:
802 * 1. collect a the minus/plus lines of a diff hunk, divided into
803 * minus-lines and plus-lines;
805 * 2. break both minus-lines and plus-lines into words and
806 * place them into two mmfile_t with one word for each line;
808 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
810 * And for the common parts of the both file, we output the plus side text.
811 * diff_words->current_plus is used to trace the current position of the plus file
812 * which printed. diff_words->last_minus is used to trace the last minus word
815 * For '--graph' to work with '--color-words', we need to output the graph prefix
816 * on each line of color words output. Generally, there are two conditions on
817 * which we should output the prefix.
819 * 1. diff_words->last_minus == 0 &&
820 * diff_words->current_plus == diff_words->plus.text.ptr
822 * that is: the plus text must start as a new line, and if there is no minus
823 * word printed, a graph prefix must be printed.
825 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
826 * *(diff_words->current_plus - 1) == '\n'
828 * that is: a graph prefix must be printed following a '\n'
830 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
832 if ((diff_words
->last_minus
== 0 &&
833 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
834 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
835 *(diff_words
->current_plus
- 1) == '\n')) {
842 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
844 struct diff_words_data
*diff_words
= priv
;
845 struct diff_words_style
*style
= diff_words
->style
;
846 int minus_first
, minus_len
, plus_first
, plus_len
;
847 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
848 struct diff_options
*opt
= diff_words
->opt
;
849 const char *line_prefix
;
851 if (line
[0] != '@' || parse_hunk_header(line
, len
,
852 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
856 line_prefix
= diff_line_prefix(opt
);
858 /* POSIX requires that first be decremented by one if len == 0... */
860 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
862 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
864 minus_begin
= minus_end
=
865 diff_words
->minus
.orig
[minus_first
].end
;
868 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
869 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
871 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
873 if (color_words_output_graph_prefix(diff_words
)) {
874 fputs(line_prefix
, diff_words
->opt
->file
);
876 if (diff_words
->current_plus
!= plus_begin
) {
877 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
878 &style
->ctx
, style
->newline
,
879 plus_begin
- diff_words
->current_plus
,
880 diff_words
->current_plus
, line_prefix
);
881 if (*(plus_begin
- 1) == '\n')
882 fputs(line_prefix
, diff_words
->opt
->file
);
884 if (minus_begin
!= minus_end
) {
885 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
886 &style
->old
, style
->newline
,
887 minus_end
- minus_begin
, minus_begin
,
890 if (plus_begin
!= plus_end
) {
891 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
892 &style
->new, style
->newline
,
893 plus_end
- plus_begin
, plus_begin
,
897 diff_words
->current_plus
= plus_end
;
898 diff_words
->last_minus
= minus_first
;
901 /* This function starts looking at *begin, and returns 0 iff a word was found. */
902 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
903 int *begin
, int *end
)
905 if (word_regex
&& *begin
< buffer
->size
) {
907 if (!regexec(word_regex
, buffer
->ptr
+ *begin
, 1, match
, 0)) {
908 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
909 '\n', match
[0].rm_eo
- match
[0].rm_so
);
910 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
911 *begin
+= match
[0].rm_so
;
912 return *begin
>= *end
;
917 /* find the next word */
918 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
920 if (*begin
>= buffer
->size
)
923 /* find the end of the word */
925 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
932 * This function splits the words in buffer->text, stores the list with
933 * newline separator into out, and saves the offsets of the original words
936 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
945 /* fake an empty "0th" word */
946 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
947 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
950 for (i
= 0; i
< buffer
->text
.size
; i
++) {
951 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
954 /* store original boundaries */
955 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
957 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
958 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
962 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
963 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
964 out
->ptr
[out
->size
+ j
- i
] = '\n';
965 out
->size
+= j
- i
+ 1;
971 /* this executes the word diff on the accumulated buffers */
972 static void diff_words_show(struct diff_words_data
*diff_words
)
976 mmfile_t minus
, plus
;
977 struct diff_words_style
*style
= diff_words
->style
;
979 struct diff_options
*opt
= diff_words
->opt
;
980 const char *line_prefix
;
983 line_prefix
= diff_line_prefix(opt
);
985 /* special case: only removal */
986 if (!diff_words
->plus
.text
.size
) {
987 fputs(line_prefix
, diff_words
->opt
->file
);
988 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
989 &style
->old
, style
->newline
,
990 diff_words
->minus
.text
.size
,
991 diff_words
->minus
.text
.ptr
, line_prefix
);
992 diff_words
->minus
.text
.size
= 0;
996 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
997 diff_words
->last_minus
= 0;
999 memset(&xpp
, 0, sizeof(xpp
));
1000 memset(&xecfg
, 0, sizeof(xecfg
));
1001 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
1002 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
1004 /* as only the hunk header will be parsed, we need a 0-context */
1006 xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
1010 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
1011 diff_words
->plus
.text
.size
) {
1012 if (color_words_output_graph_prefix(diff_words
))
1013 fputs(line_prefix
, diff_words
->opt
->file
);
1014 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
1015 &style
->ctx
, style
->newline
,
1016 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
1017 - diff_words
->current_plus
, diff_words
->current_plus
,
1020 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
1023 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
1024 static void diff_words_flush(struct emit_callback
*ecbdata
)
1026 if (ecbdata
->diff_words
->minus
.text
.size
||
1027 ecbdata
->diff_words
->plus
.text
.size
)
1028 diff_words_show(ecbdata
->diff_words
);
1031 static void diff_filespec_load_driver(struct diff_filespec
*one
)
1033 /* Use already-loaded driver */
1037 if (S_ISREG(one
->mode
))
1038 one
->driver
= userdiff_find_by_path(one
->path
);
1040 /* Fallback to default settings */
1042 one
->driver
= userdiff_find_by_name("default");
1045 static const char *userdiff_word_regex(struct diff_filespec
*one
)
1047 diff_filespec_load_driver(one
);
1048 return one
->driver
->word_regex
;
1051 static void init_diff_words_data(struct emit_callback
*ecbdata
,
1052 struct diff_options
*orig_opts
,
1053 struct diff_filespec
*one
,
1054 struct diff_filespec
*two
)
1057 struct diff_options
*o
= xmalloc(sizeof(struct diff_options
));
1058 memcpy(o
, orig_opts
, sizeof(struct diff_options
));
1060 ecbdata
->diff_words
=
1061 xcalloc(1, sizeof(struct diff_words_data
));
1062 ecbdata
->diff_words
->type
= o
->word_diff
;
1063 ecbdata
->diff_words
->opt
= o
;
1065 o
->word_regex
= userdiff_word_regex(one
);
1067 o
->word_regex
= userdiff_word_regex(two
);
1069 o
->word_regex
= diff_word_regex_cfg
;
1070 if (o
->word_regex
) {
1071 ecbdata
->diff_words
->word_regex
= (regex_t
*)
1072 xmalloc(sizeof(regex_t
));
1073 if (regcomp(ecbdata
->diff_words
->word_regex
,
1075 REG_EXTENDED
| REG_NEWLINE
))
1076 die ("Invalid regular expression: %s",
1079 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
1080 if (o
->word_diff
== diff_words_styles
[i
].type
) {
1081 ecbdata
->diff_words
->style
=
1082 &diff_words_styles
[i
];
1086 if (want_color(o
->use_color
)) {
1087 struct diff_words_style
*st
= ecbdata
->diff_words
->style
;
1088 st
->old
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1089 st
->new.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1090 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_PLAIN
);
1094 static void free_diff_words_data(struct emit_callback
*ecbdata
)
1096 if (ecbdata
->diff_words
) {
1097 diff_words_flush(ecbdata
);
1098 free (ecbdata
->diff_words
->opt
);
1099 free (ecbdata
->diff_words
->minus
.text
.ptr
);
1100 free (ecbdata
->diff_words
->minus
.orig
);
1101 free (ecbdata
->diff_words
->plus
.text
.ptr
);
1102 free (ecbdata
->diff_words
->plus
.orig
);
1103 if (ecbdata
->diff_words
->word_regex
) {
1104 regfree(ecbdata
->diff_words
->word_regex
);
1105 free(ecbdata
->diff_words
->word_regex
);
1107 free(ecbdata
->diff_words
);
1108 ecbdata
->diff_words
= NULL
;
1112 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
1114 if (want_color(diff_use_color
))
1115 return diff_colors
[ix
];
1119 const char *diff_line_prefix(struct diff_options
*opt
)
1121 struct strbuf
*msgbuf
;
1122 if (!opt
->output_prefix
)
1125 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
1129 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
1132 unsigned long allot
;
1136 return ecb
->truncate(line
, len
);
1140 (void) utf8_width(&cp
, &l
);
1142 break; /* truncated in the middle? */
1147 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
1150 ecbdata
->lno_in_preimage
= 0;
1151 ecbdata
->lno_in_postimage
= 0;
1152 p
= strchr(line
, '-');
1154 return; /* cannot happen */
1155 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
1158 return; /* cannot happen */
1159 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
1162 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
1164 struct emit_callback
*ecbdata
= priv
;
1165 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
1166 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
1167 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1168 struct diff_options
*o
= ecbdata
->opt
;
1169 const char *line_prefix
= diff_line_prefix(o
);
1171 if (ecbdata
->header
) {
1172 fprintf(ecbdata
->opt
->file
, "%s", ecbdata
->header
->buf
);
1173 strbuf_reset(ecbdata
->header
);
1174 ecbdata
->header
= NULL
;
1176 *(ecbdata
->found_changesp
) = 1;
1178 if (ecbdata
->label_path
[0]) {
1179 const char *name_a_tab
, *name_b_tab
;
1181 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
1182 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
1184 fprintf(ecbdata
->opt
->file
, "%s%s--- %s%s%s\n",
1185 line_prefix
, meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
1186 fprintf(ecbdata
->opt
->file
, "%s%s+++ %s%s%s\n",
1187 line_prefix
, meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
1188 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
1191 if (diff_suppress_blank_empty
1192 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
1197 if (line
[0] == '@') {
1198 if (ecbdata
->diff_words
)
1199 diff_words_flush(ecbdata
);
1200 len
= sane_truncate_line(ecbdata
, line
, len
);
1201 find_lno(line
, ecbdata
);
1202 emit_hunk_header(ecbdata
, line
, len
);
1203 if (line
[len
-1] != '\n')
1204 putc('\n', ecbdata
->opt
->file
);
1209 emit_line(ecbdata
->opt
, reset
, reset
, line
, len
);
1210 if (ecbdata
->diff_words
1211 && ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
)
1212 fputs("~\n", ecbdata
->opt
->file
);
1216 if (ecbdata
->diff_words
) {
1217 if (line
[0] == '-') {
1218 diff_words_append(line
, len
,
1219 &ecbdata
->diff_words
->minus
);
1221 } else if (line
[0] == '+') {
1222 diff_words_append(line
, len
,
1223 &ecbdata
->diff_words
->plus
);
1225 } else if (starts_with(line
, "\\ ")) {
1227 * Eat the "no newline at eof" marker as if we
1228 * saw a "+" or "-" line with nothing on it,
1229 * and return without diff_words_flush() to
1230 * defer processing. If this is the end of
1231 * preimage, more "+" lines may come after it.
1235 diff_words_flush(ecbdata
);
1236 if (ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
) {
1237 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
1238 fputs("~\n", ecbdata
->opt
->file
);
1241 * Skip the prefix character, if any. With
1242 * diff_suppress_blank_empty, there may be
1245 if (line
[0] != '\n') {
1249 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
1254 if (line
[0] != '+') {
1256 diff_get_color(ecbdata
->color_diff
,
1257 line
[0] == '-' ? DIFF_FILE_OLD
: DIFF_PLAIN
);
1258 ecbdata
->lno_in_preimage
++;
1260 ecbdata
->lno_in_postimage
++;
1261 emit_line(ecbdata
->opt
, color
, reset
, line
, len
);
1263 ecbdata
->lno_in_postimage
++;
1264 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
1268 static char *pprint_rename(const char *a
, const char *b
)
1270 const char *old
= a
;
1271 const char *new = b
;
1272 struct strbuf name
= STRBUF_INIT
;
1273 int pfx_length
, sfx_length
;
1274 int pfx_adjust_for_slash
;
1275 int len_a
= strlen(a
);
1276 int len_b
= strlen(b
);
1277 int a_midlen
, b_midlen
;
1278 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
1279 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
1281 if (qlen_a
|| qlen_b
) {
1282 quote_c_style(a
, &name
, NULL
, 0);
1283 strbuf_addstr(&name
, " => ");
1284 quote_c_style(b
, &name
, NULL
, 0);
1285 return strbuf_detach(&name
, NULL
);
1288 /* Find common prefix */
1290 while (*old
&& *new && *old
== *new) {
1292 pfx_length
= old
- a
+ 1;
1297 /* Find common suffix */
1302 * If there is a common prefix, it must end in a slash. In
1303 * that case we let this loop run 1 into the prefix to see the
1306 * If there is no common prefix, we cannot do this as it would
1307 * underrun the input strings.
1309 pfx_adjust_for_slash
= (pfx_length
? 1 : 0);
1310 while (a
+ pfx_length
- pfx_adjust_for_slash
<= old
&&
1311 b
+ pfx_length
- pfx_adjust_for_slash
<= new &&
1314 sfx_length
= len_a
- (old
- a
);
1320 * pfx{mid-a => mid-b}sfx
1321 * {pfx-a => pfx-b}sfx
1322 * pfx{sfx-a => sfx-b}
1325 a_midlen
= len_a
- pfx_length
- sfx_length
;
1326 b_midlen
= len_b
- pfx_length
- sfx_length
;
1332 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
1333 if (pfx_length
+ sfx_length
) {
1334 strbuf_add(&name
, a
, pfx_length
);
1335 strbuf_addch(&name
, '{');
1337 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
1338 strbuf_addstr(&name
, " => ");
1339 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
1340 if (pfx_length
+ sfx_length
) {
1341 strbuf_addch(&name
, '}');
1342 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
1344 return strbuf_detach(&name
, NULL
);
1350 struct diffstat_file
{
1354 unsigned is_unmerged
:1;
1355 unsigned is_binary
:1;
1356 unsigned is_renamed
:1;
1357 unsigned is_interesting
:1;
1358 uintmax_t added
, deleted
;
1362 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
1366 struct diffstat_file
*x
;
1367 x
= xcalloc(1, sizeof(*x
));
1368 ALLOC_GROW(diffstat
->files
, diffstat
->nr
+ 1, diffstat
->alloc
);
1369 diffstat
->files
[diffstat
->nr
++] = x
;
1371 x
->from_name
= xstrdup(name_a
);
1372 x
->name
= xstrdup(name_b
);
1376 x
->from_name
= NULL
;
1377 x
->name
= xstrdup(name_a
);
1382 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
1384 struct diffstat_t
*diffstat
= priv
;
1385 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
1389 else if (line
[0] == '-')
1393 const char mime_boundary_leader
[] = "------------";
1395 static int scale_linear(int it
, int width
, int max_change
)
1400 * make sure that at least one '-' or '+' is printed if
1401 * there is any change to this path. The easiest way is to
1402 * scale linearly as if the alloted width is one column shorter
1403 * than it is, and then add 1 to the result.
1405 return 1 + (it
* (width
- 1) / max_change
);
1408 static void show_name(FILE *file
,
1409 const char *prefix
, const char *name
, int len
)
1411 fprintf(file
, " %s%-*s |", prefix
, len
, name
);
1414 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
1418 fprintf(file
, "%s", set
);
1421 fprintf(file
, "%s", reset
);
1424 static void fill_print_name(struct diffstat_file
*file
)
1428 if (file
->print_name
)
1431 if (!file
->is_renamed
) {
1432 struct strbuf buf
= STRBUF_INIT
;
1433 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
1434 pname
= strbuf_detach(&buf
, NULL
);
1437 strbuf_release(&buf
);
1440 pname
= pprint_rename(file
->from_name
, file
->name
);
1442 file
->print_name
= pname
;
1445 int print_stat_summary(FILE *fp
, int files
, int insertions
, int deletions
)
1447 struct strbuf sb
= STRBUF_INIT
;
1451 assert(insertions
== 0 && deletions
== 0);
1452 return fprintf(fp
, "%s\n", " 0 files changed");
1456 (files
== 1) ? " %d file changed" : " %d files changed",
1460 * For binary diff, the caller may want to print "x files
1461 * changed" with insertions == 0 && deletions == 0.
1463 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1464 * is probably less confusing (i.e skip over "2 files changed
1465 * but nothing about added/removed lines? Is this a bug in Git?").
1467 if (insertions
|| deletions
== 0) {
1469 (insertions
== 1) ? ", %d insertion(+)" : ", %d insertions(+)",
1473 if (deletions
|| insertions
== 0) {
1475 (deletions
== 1) ? ", %d deletion(-)" : ", %d deletions(-)",
1478 strbuf_addch(&sb
, '\n');
1479 ret
= fputs(sb
.buf
, fp
);
1480 strbuf_release(&sb
);
1484 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
1486 int i
, len
, add
, del
, adds
= 0, dels
= 0;
1487 uintmax_t max_change
= 0, max_len
= 0;
1488 int total_files
= data
->nr
, count
;
1489 int width
, name_width
, graph_width
, number_width
= 0, bin_width
= 0;
1490 const char *reset
, *add_c
, *del_c
;
1491 const char *line_prefix
= "";
1492 int extra_shown
= 0;
1497 line_prefix
= diff_line_prefix(options
);
1498 count
= options
->stat_count
? options
->stat_count
: data
->nr
;
1500 reset
= diff_get_color_opt(options
, DIFF_RESET
);
1501 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
1502 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
1505 * Find the longest filename and max number of changes
1507 for (i
= 0; (i
< count
) && (i
< data
->nr
); i
++) {
1508 struct diffstat_file
*file
= data
->files
[i
];
1509 uintmax_t change
= file
->added
+ file
->deleted
;
1511 if (!file
->is_interesting
&& (change
== 0)) {
1512 count
++; /* not shown == room for one more */
1515 fill_print_name(file
);
1516 len
= strlen(file
->print_name
);
1520 if (file
->is_unmerged
) {
1521 /* "Unmerged" is 8 characters */
1522 bin_width
= bin_width
< 8 ? 8 : bin_width
;
1525 if (file
->is_binary
) {
1526 /* "Bin XXX -> YYY bytes" */
1527 int w
= 14 + decimal_width(file
->added
)
1528 + decimal_width(file
->deleted
);
1529 bin_width
= bin_width
< w
? w
: bin_width
;
1530 /* Display change counts aligned with "Bin" */
1535 if (max_change
< change
)
1536 max_change
= change
;
1538 count
= i
; /* where we can stop scanning in data->files[] */
1541 * We have width = stat_width or term_columns() columns total.
1542 * We want a maximum of min(max_len, stat_name_width) for the name part.
1543 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1544 * We also need 1 for " " and 4 + decimal_width(max_change)
1545 * for " | NNNN " and one the empty column at the end, altogether
1546 * 6 + decimal_width(max_change).
1548 * If there's not enough space, we will use the smaller of
1549 * stat_name_width (if set) and 5/8*width for the filename,
1550 * and the rest for constant elements + graph part, but no more
1551 * than stat_graph_width for the graph part.
1552 * (5/8 gives 50 for filename and 30 for the constant parts + graph
1553 * for the standard terminal size).
1555 * In other words: stat_width limits the maximum width, and
1556 * stat_name_width fixes the maximum width of the filename,
1557 * and is also used to divide available columns if there
1560 * Binary files are displayed with "Bin XXX -> YYY bytes"
1561 * instead of the change count and graph. This part is treated
1562 * similarly to the graph part, except that it is not
1563 * "scaled". If total width is too small to accommodate the
1564 * guaranteed minimum width of the filename part and the
1565 * separators and this message, this message will "overflow"
1566 * making the line longer than the maximum width.
1569 if (options
->stat_width
== -1)
1570 width
= term_columns() - options
->output_prefix_length
;
1572 width
= options
->stat_width
? options
->stat_width
: 80;
1573 number_width
= decimal_width(max_change
) > number_width
?
1574 decimal_width(max_change
) : number_width
;
1576 if (options
->stat_graph_width
== -1)
1577 options
->stat_graph_width
= diff_stat_graph_width
;
1580 * Guarantee 3/8*16==6 for the graph part
1581 * and 5/8*16==10 for the filename part
1583 if (width
< 16 + 6 + number_width
)
1584 width
= 16 + 6 + number_width
;
1587 * First assign sizes that are wanted, ignoring available width.
1588 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1589 * starting from "XXX" should fit in graph_width.
1591 graph_width
= max_change
+ 4 > bin_width
? max_change
: bin_width
- 4;
1592 if (options
->stat_graph_width
&&
1593 options
->stat_graph_width
< graph_width
)
1594 graph_width
= options
->stat_graph_width
;
1596 name_width
= (options
->stat_name_width
> 0 &&
1597 options
->stat_name_width
< max_len
) ?
1598 options
->stat_name_width
: max_len
;
1601 * Adjust adjustable widths not to exceed maximum width
1603 if (name_width
+ number_width
+ 6 + graph_width
> width
) {
1604 if (graph_width
> width
* 3/8 - number_width
- 6) {
1605 graph_width
= width
* 3/8 - number_width
- 6;
1606 if (graph_width
< 6)
1610 if (options
->stat_graph_width
&&
1611 graph_width
> options
->stat_graph_width
)
1612 graph_width
= options
->stat_graph_width
;
1613 if (name_width
> width
- number_width
- 6 - graph_width
)
1614 name_width
= width
- number_width
- 6 - graph_width
;
1616 graph_width
= width
- number_width
- 6 - name_width
;
1620 * From here name_width is the width of the name area,
1621 * and graph_width is the width of the graph area.
1622 * max_change is used to scale graph properly.
1624 for (i
= 0; i
< count
; i
++) {
1625 const char *prefix
= "";
1626 struct diffstat_file
*file
= data
->files
[i
];
1627 char *name
= file
->print_name
;
1628 uintmax_t added
= file
->added
;
1629 uintmax_t deleted
= file
->deleted
;
1632 if (!file
->is_interesting
&& (added
+ deleted
== 0))
1636 * "scale" the filename
1639 name_len
= strlen(name
);
1640 if (name_width
< name_len
) {
1644 name
+= name_len
- len
;
1645 slash
= strchr(name
, '/');
1650 if (file
->is_binary
) {
1651 fprintf(options
->file
, "%s", line_prefix
);
1652 show_name(options
->file
, prefix
, name
, len
);
1653 fprintf(options
->file
, " %*s", number_width
, "Bin");
1654 if (!added
&& !deleted
) {
1655 putc('\n', options
->file
);
1658 fprintf(options
->file
, " %s%"PRIuMAX
"%s",
1659 del_c
, deleted
, reset
);
1660 fprintf(options
->file
, " -> ");
1661 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1662 add_c
, added
, reset
);
1663 fprintf(options
->file
, " bytes");
1664 fprintf(options
->file
, "\n");
1667 else if (file
->is_unmerged
) {
1668 fprintf(options
->file
, "%s", line_prefix
);
1669 show_name(options
->file
, prefix
, name
, len
);
1670 fprintf(options
->file
, " Unmerged\n");
1675 * scale the add/delete
1680 if (graph_width
<= max_change
) {
1681 int total
= scale_linear(add
+ del
, graph_width
, max_change
);
1682 if (total
< 2 && add
&& del
)
1683 /* width >= 2 due to the sanity check */
1686 add
= scale_linear(add
, graph_width
, max_change
);
1689 del
= scale_linear(del
, graph_width
, max_change
);
1693 fprintf(options
->file
, "%s", line_prefix
);
1694 show_name(options
->file
, prefix
, name
, len
);
1695 fprintf(options
->file
, " %*"PRIuMAX
"%s",
1696 number_width
, added
+ deleted
,
1697 added
+ deleted
? " " : "");
1698 show_graph(options
->file
, '+', add
, add_c
, reset
);
1699 show_graph(options
->file
, '-', del
, del_c
, reset
);
1700 fprintf(options
->file
, "\n");
1703 for (i
= 0; i
< data
->nr
; i
++) {
1704 struct diffstat_file
*file
= data
->files
[i
];
1705 uintmax_t added
= file
->added
;
1706 uintmax_t deleted
= file
->deleted
;
1708 if (file
->is_unmerged
||
1709 (!file
->is_interesting
&& (added
+ deleted
== 0))) {
1714 if (!file
->is_binary
) {
1721 fprintf(options
->file
, "%s ...\n", line_prefix
);
1724 fprintf(options
->file
, "%s", line_prefix
);
1725 print_stat_summary(options
->file
, total_files
, adds
, dels
);
1728 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
1730 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
1735 for (i
= 0; i
< data
->nr
; i
++) {
1736 int added
= data
->files
[i
]->added
;
1737 int deleted
= data
->files
[i
]->deleted
;
1739 if (data
->files
[i
]->is_unmerged
||
1740 (!data
->files
[i
]->is_interesting
&& (added
+ deleted
== 0))) {
1742 } else if (!data
->files
[i
]->is_binary
) { /* don't count bytes */
1747 fprintf(options
->file
, "%s", diff_line_prefix(options
));
1748 print_stat_summary(options
->file
, total_files
, adds
, dels
);
1751 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
1758 for (i
= 0; i
< data
->nr
; i
++) {
1759 struct diffstat_file
*file
= data
->files
[i
];
1761 fprintf(options
->file
, "%s", diff_line_prefix(options
));
1763 if (file
->is_binary
)
1764 fprintf(options
->file
, "-\t-\t");
1766 fprintf(options
->file
,
1767 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
1768 file
->added
, file
->deleted
);
1769 if (options
->line_termination
) {
1770 fill_print_name(file
);
1771 if (!file
->is_renamed
)
1772 write_name_quoted(file
->name
, options
->file
,
1773 options
->line_termination
);
1775 fputs(file
->print_name
, options
->file
);
1776 putc(options
->line_termination
, options
->file
);
1779 if (file
->is_renamed
) {
1780 putc('\0', options
->file
);
1781 write_name_quoted(file
->from_name
, options
->file
, '\0');
1783 write_name_quoted(file
->name
, options
->file
, '\0');
1788 struct dirstat_file
{
1790 unsigned long changed
;
1793 struct dirstat_dir
{
1794 struct dirstat_file
*files
;
1795 int alloc
, nr
, permille
, cumulative
;
1798 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
1799 unsigned long changed
, const char *base
, int baselen
)
1801 unsigned long this_dir
= 0;
1802 unsigned int sources
= 0;
1803 const char *line_prefix
= diff_line_prefix(opt
);
1806 struct dirstat_file
*f
= dir
->files
;
1807 int namelen
= strlen(f
->name
);
1811 if (namelen
< baselen
)
1813 if (memcmp(f
->name
, base
, baselen
))
1815 slash
= strchr(f
->name
+ baselen
, '/');
1817 int newbaselen
= slash
+ 1 - f
->name
;
1818 this = gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
1830 * We don't report dirstat's for
1832 * - or cases where everything came from a single directory
1833 * under this directory (sources == 1).
1835 if (baselen
&& sources
!= 1) {
1837 int permille
= this_dir
* 1000 / changed
;
1838 if (permille
>= dir
->permille
) {
1839 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
1840 permille
/ 10, permille
% 10, baselen
, base
);
1841 if (!dir
->cumulative
)
1849 static int dirstat_compare(const void *_a
, const void *_b
)
1851 const struct dirstat_file
*a
= _a
;
1852 const struct dirstat_file
*b
= _b
;
1853 return strcmp(a
->name
, b
->name
);
1856 static void show_dirstat(struct diff_options
*options
)
1859 unsigned long changed
;
1860 struct dirstat_dir dir
;
1861 struct diff_queue_struct
*q
= &diff_queued_diff
;
1866 dir
.permille
= options
->dirstat_permille
;
1867 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1870 for (i
= 0; i
< q
->nr
; i
++) {
1871 struct diff_filepair
*p
= q
->queue
[i
];
1873 unsigned long copied
, added
, damage
;
1874 int content_changed
;
1876 name
= p
->two
->path
? p
->two
->path
: p
->one
->path
;
1878 if (p
->one
->sha1_valid
&& p
->two
->sha1_valid
)
1879 content_changed
= hashcmp(p
->one
->sha1
, p
->two
->sha1
);
1881 content_changed
= 1;
1883 if (!content_changed
) {
1885 * The SHA1 has not changed, so pre-/post-content is
1886 * identical. We can therefore skip looking at the
1887 * file contents altogether.
1893 if (DIFF_OPT_TST(options
, DIRSTAT_BY_FILE
)) {
1895 * In --dirstat-by-file mode, we don't really need to
1896 * look at the actual file contents at all.
1897 * The fact that the SHA1 changed is enough for us to
1898 * add this file to the list of results
1899 * (with each file contributing equal damage).
1905 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1906 diff_populate_filespec(p
->one
, 0);
1907 diff_populate_filespec(p
->two
, 0);
1908 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1910 diff_free_filespec_data(p
->one
);
1911 diff_free_filespec_data(p
->two
);
1912 } else if (DIFF_FILE_VALID(p
->one
)) {
1913 diff_populate_filespec(p
->one
, CHECK_SIZE_ONLY
);
1915 diff_free_filespec_data(p
->one
);
1916 } else if (DIFF_FILE_VALID(p
->two
)) {
1917 diff_populate_filespec(p
->two
, CHECK_SIZE_ONLY
);
1919 added
= p
->two
->size
;
1920 diff_free_filespec_data(p
->two
);
1925 * Original minus copied is the removed material,
1926 * added is the new material. They are both damages
1927 * made to the preimage.
1928 * If the resulting damage is zero, we know that
1929 * diffcore_count_changes() considers the two entries to
1930 * be identical, but since content_changed is true, we
1931 * know that there must have been _some_ kind of change,
1932 * so we force all entries to have damage > 0.
1934 damage
= (p
->one
->size
- copied
) + added
;
1939 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1940 dir
.files
[dir
.nr
].name
= name
;
1941 dir
.files
[dir
.nr
].changed
= damage
;
1946 /* This can happen even with many files, if everything was renames */
1950 /* Show all directories with more than x% of the changes */
1951 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1952 gather_dirstat(options
, &dir
, changed
, "", 0);
1955 static void show_dirstat_by_line(struct diffstat_t
*data
, struct diff_options
*options
)
1958 unsigned long changed
;
1959 struct dirstat_dir dir
;
1967 dir
.permille
= options
->dirstat_permille
;
1968 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1971 for (i
= 0; i
< data
->nr
; i
++) {
1972 struct diffstat_file
*file
= data
->files
[i
];
1973 unsigned long damage
= file
->added
+ file
->deleted
;
1974 if (file
->is_binary
)
1976 * binary files counts bytes, not lines. Must find some
1977 * way to normalize binary bytes vs. textual lines.
1978 * The following heuristic assumes that there are 64
1980 * This is stupid and ugly, but very cheap...
1982 damage
= (damage
+ 63) / 64;
1983 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1984 dir
.files
[dir
.nr
].name
= file
->name
;
1985 dir
.files
[dir
.nr
].changed
= damage
;
1990 /* This can happen even with many files, if everything was renames */
1994 /* Show all directories with more than x% of the changes */
1995 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1996 gather_dirstat(options
, &dir
, changed
, "", 0);
1999 static void free_diffstat_info(struct diffstat_t
*diffstat
)
2002 for (i
= 0; i
< diffstat
->nr
; i
++) {
2003 struct diffstat_file
*f
= diffstat
->files
[i
];
2004 if (f
->name
!= f
->print_name
)
2005 free(f
->print_name
);
2010 free(diffstat
->files
);
2013 struct checkdiff_t
{
2014 const char *filename
;
2016 int conflict_marker_size
;
2017 struct diff_options
*o
;
2022 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
2027 if (len
< marker_size
+ 1)
2029 firstchar
= line
[0];
2030 switch (firstchar
) {
2031 case '=': case '>': case '<': case '|':
2036 for (cnt
= 1; cnt
< marker_size
; cnt
++)
2037 if (line
[cnt
] != firstchar
)
2039 /* line[1] thru line[marker_size-1] are same as firstchar */
2040 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
2045 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
2047 struct checkdiff_t
*data
= priv
;
2048 int marker_size
= data
->conflict_marker_size
;
2049 const char *ws
= diff_get_color(data
->o
->use_color
, DIFF_WHITESPACE
);
2050 const char *reset
= diff_get_color(data
->o
->use_color
, DIFF_RESET
);
2051 const char *set
= diff_get_color(data
->o
->use_color
, DIFF_FILE_NEW
);
2053 const char *line_prefix
;
2056 line_prefix
= diff_line_prefix(data
->o
);
2058 if (line
[0] == '+') {
2061 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
2063 fprintf(data
->o
->file
,
2064 "%s%s:%d: leftover conflict marker\n",
2065 line_prefix
, data
->filename
, data
->lineno
);
2067 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
2070 data
->status
|= bad
;
2071 err
= whitespace_error_string(bad
);
2072 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
2073 line_prefix
, data
->filename
, data
->lineno
, err
);
2075 emit_line(data
->o
, set
, reset
, line
, 1);
2076 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
2077 data
->o
->file
, set
, reset
, ws
);
2078 } else if (line
[0] == ' ') {
2080 } else if (line
[0] == '@') {
2081 char *plus
= strchr(line
, '+');
2083 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
2085 die("invalid diff");
2089 static unsigned char *deflate_it(char *data
,
2091 unsigned long *result_size
)
2094 unsigned char *deflated
;
2097 memset(&stream
, 0, sizeof(stream
));
2098 git_deflate_init(&stream
, zlib_compression_level
);
2099 bound
= git_deflate_bound(&stream
, size
);
2100 deflated
= xmalloc(bound
);
2101 stream
.next_out
= deflated
;
2102 stream
.avail_out
= bound
;
2104 stream
.next_in
= (unsigned char *)data
;
2105 stream
.avail_in
= size
;
2106 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
2108 git_deflate_end(&stream
);
2109 *result_size
= stream
.total_out
;
2113 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
,
2120 unsigned long orig_size
;
2121 unsigned long delta_size
;
2122 unsigned long deflate_size
;
2123 unsigned long data_size
;
2125 /* We could do deflated delta, or we could do just deflated two,
2126 * whichever is smaller.
2129 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
2130 if (one
->size
&& two
->size
) {
2131 delta
= diff_delta(one
->ptr
, one
->size
,
2132 two
->ptr
, two
->size
,
2133 &delta_size
, deflate_size
);
2135 void *to_free
= delta
;
2136 orig_size
= delta_size
;
2137 delta
= deflate_it(delta
, delta_size
, &delta_size
);
2142 if (delta
&& delta_size
< deflate_size
) {
2143 fprintf(file
, "%sdelta %lu\n", prefix
, orig_size
);
2146 data_size
= delta_size
;
2149 fprintf(file
, "%sliteral %lu\n", prefix
, two
->size
);
2152 data_size
= deflate_size
;
2155 /* emit data encoded in base85 */
2158 int bytes
= (52 < data_size
) ? 52 : data_size
;
2162 line
[0] = bytes
+ 'A' - 1;
2164 line
[0] = bytes
- 26 + 'a' - 1;
2165 encode_85(line
+ 1, cp
, bytes
);
2166 cp
= (char *) cp
+ bytes
;
2167 fprintf(file
, "%s", prefix
);
2171 fprintf(file
, "%s\n", prefix
);
2175 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
,
2178 fprintf(file
, "%sGIT binary patch\n", prefix
);
2179 emit_binary_diff_body(file
, one
, two
, prefix
);
2180 emit_binary_diff_body(file
, two
, one
, prefix
);
2183 int diff_filespec_is_binary(struct diff_filespec
*one
)
2185 if (one
->is_binary
== -1) {
2186 diff_filespec_load_driver(one
);
2187 if (one
->driver
->binary
!= -1)
2188 one
->is_binary
= one
->driver
->binary
;
2190 if (!one
->data
&& DIFF_FILE_VALID(one
))
2191 diff_populate_filespec(one
, 0);
2193 one
->is_binary
= buffer_is_binary(one
->data
,
2195 if (one
->is_binary
== -1)
2199 return one
->is_binary
;
2202 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
2204 diff_filespec_load_driver(one
);
2205 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
2208 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
2210 if (!options
->a_prefix
)
2211 options
->a_prefix
= a
;
2212 if (!options
->b_prefix
)
2213 options
->b_prefix
= b
;
2216 struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
2218 if (!DIFF_FILE_VALID(one
))
2221 diff_filespec_load_driver(one
);
2222 return userdiff_get_textconv(one
->driver
);
2225 static void builtin_diff(const char *name_a
,
2227 struct diff_filespec
*one
,
2228 struct diff_filespec
*two
,
2229 const char *xfrm_msg
,
2230 int must_show_header
,
2231 struct diff_options
*o
,
2232 int complete_rewrite
)
2236 char *a_one
, *b_two
;
2237 const char *meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
2238 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
2239 const char *a_prefix
, *b_prefix
;
2240 struct userdiff_driver
*textconv_one
= NULL
;
2241 struct userdiff_driver
*textconv_two
= NULL
;
2242 struct strbuf header
= STRBUF_INIT
;
2243 const char *line_prefix
= diff_line_prefix(o
);
2245 if (DIFF_OPT_TST(o
, SUBMODULE_LOG
) &&
2246 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
2247 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
2248 const char *del
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2249 const char *add
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2250 show_submodule_summary(o
->file
, one
->path
? one
->path
: two
->path
,
2252 one
->sha1
, two
->sha1
, two
->dirty_submodule
,
2253 meta
, del
, add
, reset
);
2257 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
2258 textconv_one
= get_textconv(one
);
2259 textconv_two
= get_textconv(two
);
2262 diff_set_mnemonic_prefix(o
, "a/", "b/");
2263 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
2264 a_prefix
= o
->b_prefix
;
2265 b_prefix
= o
->a_prefix
;
2267 a_prefix
= o
->a_prefix
;
2268 b_prefix
= o
->b_prefix
;
2271 /* Never use a non-valid filename anywhere if at all possible */
2272 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
2273 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
2275 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
2276 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
2277 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
2278 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
2279 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, meta
, a_one
, b_two
, reset
);
2280 if (lbl
[0][0] == '/') {
2282 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
2284 strbuf_addstr(&header
, xfrm_msg
);
2285 must_show_header
= 1;
2287 else if (lbl
[1][0] == '/') {
2288 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
2290 strbuf_addstr(&header
, xfrm_msg
);
2291 must_show_header
= 1;
2294 if (one
->mode
!= two
->mode
) {
2295 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
2296 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
2297 must_show_header
= 1;
2300 strbuf_addstr(&header
, xfrm_msg
);
2303 * we do not run diff between different kind
2306 if ((one
->mode
^ two
->mode
) & S_IFMT
)
2307 goto free_ab_and_return
;
2308 if (complete_rewrite
&&
2309 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
2310 (textconv_two
|| !diff_filespec_is_binary(two
))) {
2311 fprintf(o
->file
, "%s", header
.buf
);
2312 strbuf_reset(&header
);
2313 emit_rewrite_diff(name_a
, name_b
, one
, two
,
2314 textconv_one
, textconv_two
, o
);
2315 o
->found_changes
= 1;
2316 goto free_ab_and_return
;
2320 if (o
->irreversible_delete
&& lbl
[1][0] == '/') {
2321 fprintf(o
->file
, "%s", header
.buf
);
2322 strbuf_reset(&header
);
2323 goto free_ab_and_return
;
2324 } else if (!DIFF_OPT_TST(o
, TEXT
) &&
2325 ( (!textconv_one
&& diff_filespec_is_binary(one
)) ||
2326 (!textconv_two
&& diff_filespec_is_binary(two
)) )) {
2327 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2328 die("unable to read files to diff");
2329 /* Quite common confusing case */
2330 if (mf1
.size
== mf2
.size
&&
2331 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
2332 if (must_show_header
)
2333 fprintf(o
->file
, "%s", header
.buf
);
2334 goto free_ab_and_return
;
2336 fprintf(o
->file
, "%s", header
.buf
);
2337 strbuf_reset(&header
);
2338 if (DIFF_OPT_TST(o
, BINARY
))
2339 emit_binary_diff(o
->file
, &mf1
, &mf2
, line_prefix
);
2341 fprintf(o
->file
, "%sBinary files %s and %s differ\n",
2342 line_prefix
, lbl
[0], lbl
[1]);
2343 o
->found_changes
= 1;
2345 /* Crazy xdl interfaces.. */
2346 const char *diffopts
= getenv("GIT_DIFF_OPTS");
2350 struct emit_callback ecbdata
;
2351 const struct userdiff_funcname
*pe
;
2353 if (must_show_header
) {
2354 fprintf(o
->file
, "%s", header
.buf
);
2355 strbuf_reset(&header
);
2358 mf1
.size
= fill_textconv(textconv_one
, one
, &mf1
.ptr
);
2359 mf2
.size
= fill_textconv(textconv_two
, two
, &mf2
.ptr
);
2361 pe
= diff_funcname_pattern(one
);
2363 pe
= diff_funcname_pattern(two
);
2365 memset(&xpp
, 0, sizeof(xpp
));
2366 memset(&xecfg
, 0, sizeof(xecfg
));
2367 memset(&ecbdata
, 0, sizeof(ecbdata
));
2368 ecbdata
.label_path
= lbl
;
2369 ecbdata
.color_diff
= want_color(o
->use_color
);
2370 ecbdata
.found_changesp
= &o
->found_changes
;
2371 ecbdata
.ws_rule
= whitespace_rule(name_b
);
2372 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
2373 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2375 ecbdata
.header
= header
.len
? &header
: NULL
;
2376 xpp
.flags
= o
->xdl_opts
;
2377 xecfg
.ctxlen
= o
->context
;
2378 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2379 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2380 if (DIFF_OPT_TST(o
, FUNCCONTEXT
))
2381 xecfg
.flags
|= XDL_EMIT_FUNCCONTEXT
;
2383 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
2386 else if (skip_prefix(diffopts
, "--unified=", &v
))
2387 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
2388 else if (skip_prefix(diffopts
, "-u", &v
))
2389 xecfg
.ctxlen
= strtoul(v
, NULL
, 10);
2391 init_diff_words_data(&ecbdata
, o
, one
, two
);
2392 xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
2395 free_diff_words_data(&ecbdata
);
2400 xdiff_clear_find_func(&xecfg
);
2404 strbuf_release(&header
);
2405 diff_free_filespec_data(one
);
2406 diff_free_filespec_data(two
);
2412 static void builtin_diffstat(const char *name_a
, const char *name_b
,
2413 struct diff_filespec
*one
,
2414 struct diff_filespec
*two
,
2415 struct diffstat_t
*diffstat
,
2416 struct diff_options
*o
,
2417 struct diff_filepair
*p
)
2420 struct diffstat_file
*data
;
2422 int complete_rewrite
= 0;
2424 if (!DIFF_PAIR_UNMERGED(p
)) {
2425 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2426 complete_rewrite
= 1;
2429 data
= diffstat_add(diffstat
, name_a
, name_b
);
2430 data
->is_interesting
= p
->status
!= DIFF_STATUS_UNKNOWN
;
2433 data
->is_unmerged
= 1;
2437 same_contents
= !hashcmp(one
->sha1
, two
->sha1
);
2439 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
2440 data
->is_binary
= 1;
2441 if (same_contents
) {
2445 data
->added
= diff_filespec_size(two
);
2446 data
->deleted
= diff_filespec_size(one
);
2450 else if (complete_rewrite
) {
2451 diff_populate_filespec(one
, 0);
2452 diff_populate_filespec(two
, 0);
2453 data
->deleted
= count_lines(one
->data
, one
->size
);
2454 data
->added
= count_lines(two
->data
, two
->size
);
2457 else if (!same_contents
) {
2458 /* Crazy xdl interfaces.. */
2462 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2463 die("unable to read files to diff");
2465 memset(&xpp
, 0, sizeof(xpp
));
2466 memset(&xecfg
, 0, sizeof(xecfg
));
2467 xpp
.flags
= o
->xdl_opts
;
2468 xecfg
.ctxlen
= o
->context
;
2469 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2470 xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
2474 diff_free_filespec_data(one
);
2475 diff_free_filespec_data(two
);
2478 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
2479 const char *attr_path
,
2480 struct diff_filespec
*one
,
2481 struct diff_filespec
*two
,
2482 struct diff_options
*o
)
2485 struct checkdiff_t data
;
2490 memset(&data
, 0, sizeof(data
));
2491 data
.filename
= name_b
? name_b
: name_a
;
2494 data
.ws_rule
= whitespace_rule(attr_path
);
2495 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
2497 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2498 die("unable to read files to diff");
2501 * All the other codepaths check both sides, but not checking
2502 * the "old" side here is deliberate. We are checking the newly
2503 * introduced changes, and as long as the "new" side is text, we
2504 * can and should check what it introduces.
2506 if (diff_filespec_is_binary(two
))
2507 goto free_and_return
;
2509 /* Crazy xdl interfaces.. */
2513 memset(&xpp
, 0, sizeof(xpp
));
2514 memset(&xecfg
, 0, sizeof(xecfg
));
2515 xecfg
.ctxlen
= 1; /* at least one context line */
2517 xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
2520 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
2521 struct emit_callback ecbdata
;
2524 ecbdata
.ws_rule
= data
.ws_rule
;
2525 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2526 blank_at_eof
= ecbdata
.blank_at_eof_in_postimage
;
2531 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
2532 fprintf(o
->file
, "%s:%d: %s.\n",
2533 data
.filename
, blank_at_eof
, err
);
2534 data
.status
= 1; /* report errors */
2539 diff_free_filespec_data(one
);
2540 diff_free_filespec_data(two
);
2542 DIFF_OPT_SET(o
, CHECK_FAILED
);
2545 struct diff_filespec
*alloc_filespec(const char *path
)
2547 int namelen
= strlen(path
);
2548 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
2550 memset(spec
, 0, sizeof(*spec
));
2551 spec
->path
= (char *)(spec
+ 1);
2552 memcpy(spec
->path
, path
, namelen
+1);
2554 spec
->is_binary
= -1;
2558 void free_filespec(struct diff_filespec
*spec
)
2560 if (!--spec
->count
) {
2561 diff_free_filespec_data(spec
);
2566 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
2567 int sha1_valid
, unsigned short mode
)
2570 spec
->mode
= canon_mode(mode
);
2571 hashcpy(spec
->sha1
, sha1
);
2572 spec
->sha1_valid
= sha1_valid
;
2577 * Given a name and sha1 pair, if the index tells us the file in
2578 * the work tree has that object contents, return true, so that
2579 * prepare_temp_file() does not have to inflate and extract.
2581 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
2583 const struct cache_entry
*ce
;
2588 * We do not read the cache ourselves here, because the
2589 * benchmark with my previous version that always reads cache
2590 * shows that it makes things worse for diff-tree comparing
2591 * two linux-2.6 kernel trees in an already checked out work
2592 * tree. This is because most diff-tree comparisons deal with
2593 * only a small number of files, while reading the cache is
2594 * expensive for a large project, and its cost outweighs the
2595 * savings we get by not inflating the object to a temporary
2596 * file. Practically, this code only helps when we are used
2597 * by diff-cache --cached, which does read the cache before
2603 /* We want to avoid the working directory if our caller
2604 * doesn't need the data in a normal file, this system
2605 * is rather slow with its stat/open/mmap/close syscalls,
2606 * and the object is contained in a pack file. The pack
2607 * is probably already open and will be faster to obtain
2608 * the data through than the working directory. Loose
2609 * objects however would tend to be slower as they need
2610 * to be individually opened and inflated.
2612 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
))
2616 pos
= cache_name_pos(name
, len
);
2619 ce
= active_cache
[pos
];
2622 * This is not the sha1 we are looking for, or
2623 * unreusable because it is not a regular file.
2625 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
2629 * If ce is marked as "assume unchanged", there is no
2630 * guarantee that work tree matches what we are looking for.
2632 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
2636 * If ce matches the file in the work tree, we can reuse it.
2638 if (ce_uptodate(ce
) ||
2639 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
2645 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
2648 char *data
= xmalloc(100), *dirty
= "";
2650 /* Are we looking at the work tree? */
2651 if (s
->dirty_submodule
)
2654 len
= snprintf(data
, 100,
2655 "Subproject commit %s%s\n", sha1_to_hex(s
->sha1
), dirty
);
2667 * While doing rename detection and pickaxe operation, we may need to
2668 * grab the data for the blob (or file) for our own in-core comparison.
2669 * diff_filespec has data and size fields for this purpose.
2671 int diff_populate_filespec(struct diff_filespec
*s
, unsigned int flags
)
2673 int size_only
= flags
& CHECK_SIZE_ONLY
;
2676 * demote FAIL to WARN to allow inspecting the situation
2677 * instead of refusing.
2679 enum safe_crlf crlf_warn
= (safe_crlf
== SAFE_CRLF_FAIL
2683 if (!DIFF_FILE_VALID(s
))
2684 die("internal error: asking to populate invalid file.");
2685 if (S_ISDIR(s
->mode
))
2691 if (size_only
&& 0 < s
->size
)
2694 if (S_ISGITLINK(s
->mode
))
2695 return diff_populate_gitlink(s
, size_only
);
2697 if (!s
->sha1_valid
||
2698 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
2699 struct strbuf buf
= STRBUF_INIT
;
2703 if (lstat(s
->path
, &st
) < 0) {
2704 if (errno
== ENOENT
) {
2708 s
->data
= (char *)"";
2713 s
->size
= xsize_t(st
.st_size
);
2716 if (S_ISLNK(st
.st_mode
)) {
2717 struct strbuf sb
= STRBUF_INIT
;
2719 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
2722 s
->data
= strbuf_detach(&sb
, NULL
);
2728 fd
= open(s
->path
, O_RDONLY
);
2731 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2733 s
->should_munmap
= 1;
2736 * Convert from working tree format to canonical git format
2738 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, crlf_warn
)) {
2740 munmap(s
->data
, s
->size
);
2741 s
->should_munmap
= 0;
2742 s
->data
= strbuf_detach(&buf
, &size
);
2748 enum object_type type
;
2750 type
= sha1_object_info(s
->sha1
, &s
->size
);
2752 die("unable to read %s", sha1_to_hex(s
->sha1
));
2754 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
2756 die("unable to read %s", sha1_to_hex(s
->sha1
));
2763 void diff_free_filespec_blob(struct diff_filespec
*s
)
2767 else if (s
->should_munmap
)
2768 munmap(s
->data
, s
->size
);
2770 if (s
->should_free
|| s
->should_munmap
) {
2771 s
->should_free
= s
->should_munmap
= 0;
2776 void diff_free_filespec_data(struct diff_filespec
*s
)
2778 diff_free_filespec_blob(s
);
2783 static void prep_temp_blob(const char *path
, struct diff_tempfile
*temp
,
2786 const unsigned char *sha1
,
2790 struct strbuf buf
= STRBUF_INIT
;
2791 struct strbuf
template = STRBUF_INIT
;
2792 char *path_dup
= xstrdup(path
);
2793 const char *base
= basename(path_dup
);
2795 /* Generate "XXXXXX_basename.ext" */
2796 strbuf_addstr(&template, "XXXXXX_");
2797 strbuf_addstr(&template, base
);
2799 fd
= git_mkstemps(temp
->tmp_path
, PATH_MAX
, template.buf
,
2802 die_errno("unable to create temp-file");
2803 if (convert_to_working_tree(path
,
2804 (const char *)blob
, (size_t)size
, &buf
)) {
2808 if (write_in_full(fd
, blob
, size
) != size
)
2809 die_errno("unable to write temp-file");
2811 temp
->name
= temp
->tmp_path
;
2812 strcpy(temp
->hex
, sha1_to_hex(sha1
));
2814 sprintf(temp
->mode
, "%06o", mode
);
2815 strbuf_release(&buf
);
2816 strbuf_release(&template);
2820 static struct diff_tempfile
*prepare_temp_file(const char *name
,
2821 struct diff_filespec
*one
)
2823 struct diff_tempfile
*temp
= claim_diff_tempfile();
2825 if (!DIFF_FILE_VALID(one
)) {
2827 /* A '-' entry produces this for file-2, and
2828 * a '+' entry produces this for file-1.
2830 temp
->name
= "/dev/null";
2831 strcpy(temp
->hex
, ".");
2832 strcpy(temp
->mode
, ".");
2836 if (!remove_tempfile_installed
) {
2837 atexit(remove_tempfile
);
2838 sigchain_push_common(remove_tempfile_on_signal
);
2839 remove_tempfile_installed
= 1;
2842 if (!S_ISGITLINK(one
->mode
) &&
2843 (!one
->sha1_valid
||
2844 reuse_worktree_file(name
, one
->sha1
, 1))) {
2846 if (lstat(name
, &st
) < 0) {
2847 if (errno
== ENOENT
)
2848 goto not_a_valid_file
;
2849 die_errno("stat(%s)", name
);
2851 if (S_ISLNK(st
.st_mode
)) {
2852 struct strbuf sb
= STRBUF_INIT
;
2853 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
2854 die_errno("readlink(%s)", name
);
2855 prep_temp_blob(name
, temp
, sb
.buf
, sb
.len
,
2857 one
->sha1
: null_sha1
),
2859 one
->mode
: S_IFLNK
));
2860 strbuf_release(&sb
);
2863 /* we can borrow from the file in the work tree */
2865 if (!one
->sha1_valid
)
2866 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
2868 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
2869 /* Even though we may sometimes borrow the
2870 * contents from the work tree, we always want
2871 * one->mode. mode is trustworthy even when
2872 * !(one->sha1_valid), as long as
2873 * DIFF_FILE_VALID(one).
2875 sprintf(temp
->mode
, "%06o", one
->mode
);
2880 if (diff_populate_filespec(one
, 0))
2881 die("cannot read data blob for %s", one
->path
);
2882 prep_temp_blob(name
, temp
, one
->data
, one
->size
,
2883 one
->sha1
, one
->mode
);
2888 static void add_external_diff_name(struct argv_array
*argv
,
2890 struct diff_filespec
*df
)
2892 struct diff_tempfile
*temp
= prepare_temp_file(name
, df
);
2893 argv_array_push(argv
, temp
->name
);
2894 argv_array_push(argv
, temp
->hex
);
2895 argv_array_push(argv
, temp
->mode
);
2898 /* An external diff command takes:
2900 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2901 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2904 static void run_external_diff(const char *pgm
,
2907 struct diff_filespec
*one
,
2908 struct diff_filespec
*two
,
2909 const char *xfrm_msg
,
2910 int complete_rewrite
,
2911 struct diff_options
*o
)
2913 struct argv_array argv
= ARGV_ARRAY_INIT
;
2914 struct argv_array env
= ARGV_ARRAY_INIT
;
2915 struct diff_queue_struct
*q
= &diff_queued_diff
;
2917 argv_array_push(&argv
, pgm
);
2918 argv_array_push(&argv
, name
);
2921 add_external_diff_name(&argv
, name
, one
);
2923 add_external_diff_name(&argv
, name
, two
);
2925 add_external_diff_name(&argv
, other
, two
);
2926 argv_array_push(&argv
, other
);
2927 argv_array_push(&argv
, xfrm_msg
);
2931 argv_array_pushf(&env
, "GIT_DIFF_PATH_COUNTER=%d", ++o
->diff_path_counter
);
2932 argv_array_pushf(&env
, "GIT_DIFF_PATH_TOTAL=%d", q
->nr
);
2934 if (run_command_v_opt_cd_env(argv
.argv
, RUN_USING_SHELL
, NULL
, env
.argv
))
2935 die(_("external diff died, stopping at %s"), name
);
2938 argv_array_clear(&argv
);
2939 argv_array_clear(&env
);
2942 static int similarity_index(struct diff_filepair
*p
)
2944 return p
->score
* 100 / MAX_SCORE
;
2947 static void fill_metainfo(struct strbuf
*msg
,
2950 struct diff_filespec
*one
,
2951 struct diff_filespec
*two
,
2952 struct diff_options
*o
,
2953 struct diff_filepair
*p
,
2954 int *must_show_header
,
2957 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
2958 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
2959 const char *line_prefix
= diff_line_prefix(o
);
2961 *must_show_header
= 1;
2962 strbuf_init(msg
, PATH_MAX
* 2 + 300);
2963 switch (p
->status
) {
2964 case DIFF_STATUS_COPIED
:
2965 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2966 line_prefix
, set
, similarity_index(p
));
2967 strbuf_addf(msg
, "%s\n%s%scopy from ",
2968 reset
, line_prefix
, set
);
2969 quote_c_style(name
, msg
, NULL
, 0);
2970 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
2971 quote_c_style(other
, msg
, NULL
, 0);
2972 strbuf_addf(msg
, "%s\n", reset
);
2974 case DIFF_STATUS_RENAMED
:
2975 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2976 line_prefix
, set
, similarity_index(p
));
2977 strbuf_addf(msg
, "%s\n%s%srename from ",
2978 reset
, line_prefix
, set
);
2979 quote_c_style(name
, msg
, NULL
, 0);
2980 strbuf_addf(msg
, "%s\n%s%srename to ",
2981 reset
, line_prefix
, set
);
2982 quote_c_style(other
, msg
, NULL
, 0);
2983 strbuf_addf(msg
, "%s\n", reset
);
2985 case DIFF_STATUS_MODIFIED
:
2987 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
2989 set
, similarity_index(p
), reset
);
2994 *must_show_header
= 0;
2996 if (one
&& two
&& hashcmp(one
->sha1
, two
->sha1
)) {
2997 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2999 if (DIFF_OPT_TST(o
, BINARY
)) {
3001 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
3002 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
3005 strbuf_addf(msg
, "%s%sindex %s..", line_prefix
, set
,
3006 find_unique_abbrev(one
->sha1
, abbrev
));
3007 strbuf_addstr(msg
, find_unique_abbrev(two
->sha1
, abbrev
));
3008 if (one
->mode
== two
->mode
)
3009 strbuf_addf(msg
, " %06o", one
->mode
);
3010 strbuf_addf(msg
, "%s\n", reset
);
3014 static void run_diff_cmd(const char *pgm
,
3017 const char *attr_path
,
3018 struct diff_filespec
*one
,
3019 struct diff_filespec
*two
,
3021 struct diff_options
*o
,
3022 struct diff_filepair
*p
)
3024 const char *xfrm_msg
= NULL
;
3025 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
3026 int must_show_header
= 0;
3029 if (DIFF_OPT_TST(o
, ALLOW_EXTERNAL
)) {
3030 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
3031 if (drv
&& drv
->external
)
3032 pgm
= drv
->external
;
3037 * don't use colors when the header is intended for an
3038 * external diff driver
3040 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
3042 want_color(o
->use_color
) && !pgm
);
3043 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
3047 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
3048 complete_rewrite
, o
);
3052 builtin_diff(name
, other
? other
: name
,
3053 one
, two
, xfrm_msg
, must_show_header
,
3054 o
, complete_rewrite
);
3056 fprintf(o
->file
, "* Unmerged path %s\n", name
);
3059 static void diff_fill_sha1_info(struct diff_filespec
*one
)
3061 if (DIFF_FILE_VALID(one
)) {
3062 if (!one
->sha1_valid
) {
3064 if (one
->is_stdin
) {
3065 hashcpy(one
->sha1
, null_sha1
);
3068 if (lstat(one
->path
, &st
) < 0)
3069 die_errno("stat '%s'", one
->path
);
3070 if (index_path(one
->sha1
, one
->path
, &st
, 0))
3071 die("cannot hash %s", one
->path
);
3078 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
3080 /* Strip the prefix but do not molest /dev/null and absolute paths */
3081 if (*namep
&& **namep
!= '/') {
3082 *namep
+= prefix_length
;
3086 if (*otherp
&& **otherp
!= '/') {
3087 *otherp
+= prefix_length
;
3088 if (**otherp
== '/')
3093 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
3095 const char *pgm
= external_diff();
3097 struct diff_filespec
*one
= p
->one
;
3098 struct diff_filespec
*two
= p
->two
;
3101 const char *attr_path
;
3103 name
= p
->one
->path
;
3104 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3106 if (o
->prefix_length
)
3107 strip_prefix(o
->prefix_length
, &name
, &other
);
3109 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
3112 if (DIFF_PAIR_UNMERGED(p
)) {
3113 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
3114 NULL
, NULL
, NULL
, o
, p
);
3118 diff_fill_sha1_info(one
);
3119 diff_fill_sha1_info(two
);
3122 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
3123 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
3125 * a filepair that changes between file and symlink
3126 * needs to be split into deletion and creation.
3128 struct diff_filespec
*null
= alloc_filespec(two
->path
);
3129 run_diff_cmd(NULL
, name
, other
, attr_path
,
3130 one
, null
, &msg
, o
, p
);
3132 strbuf_release(&msg
);
3134 null
= alloc_filespec(one
->path
);
3135 run_diff_cmd(NULL
, name
, other
, attr_path
,
3136 null
, two
, &msg
, o
, p
);
3140 run_diff_cmd(pgm
, name
, other
, attr_path
,
3141 one
, two
, &msg
, o
, p
);
3143 strbuf_release(&msg
);
3146 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
3147 struct diffstat_t
*diffstat
)
3152 if (DIFF_PAIR_UNMERGED(p
)) {
3154 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, p
);
3158 name
= p
->one
->path
;
3159 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3161 if (o
->prefix_length
)
3162 strip_prefix(o
->prefix_length
, &name
, &other
);
3164 diff_fill_sha1_info(p
->one
);
3165 diff_fill_sha1_info(p
->two
);
3167 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, p
);
3170 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
3174 const char *attr_path
;
3176 if (DIFF_PAIR_UNMERGED(p
)) {
3181 name
= p
->one
->path
;
3182 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3183 attr_path
= other
? other
: name
;
3185 if (o
->prefix_length
)
3186 strip_prefix(o
->prefix_length
, &name
, &other
);
3188 diff_fill_sha1_info(p
->one
);
3189 diff_fill_sha1_info(p
->two
);
3191 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
3194 void diff_setup(struct diff_options
*options
)
3196 memcpy(options
, &default_diff_options
, sizeof(*options
));
3198 options
->file
= stdout
;
3200 options
->line_termination
= '\n';
3201 options
->break_opt
= -1;
3202 options
->rename_limit
= -1;
3203 options
->dirstat_permille
= diff_dirstat_permille_default
;
3204 options
->context
= diff_context_default
;
3205 DIFF_OPT_SET(options
, RENAME_EMPTY
);
3207 /* pathchange left =NULL by default */
3208 options
->change
= diff_change
;
3209 options
->add_remove
= diff_addremove
;
3210 options
->use_color
= diff_use_color_default
;
3211 options
->detect_rename
= diff_detect_rename_default
;
3212 options
->xdl_opts
|= diff_algorithm
;
3214 options
->orderfile
= diff_order_file_cfg
;
3216 if (diff_no_prefix
) {
3217 options
->a_prefix
= options
->b_prefix
= "";
3218 } else if (!diff_mnemonic_prefix
) {
3219 options
->a_prefix
= "a/";
3220 options
->b_prefix
= "b/";
3224 void diff_setup_done(struct diff_options
*options
)
3228 if (options
->set_default
)
3229 options
->set_default(options
);
3231 if (options
->output_format
& DIFF_FORMAT_NAME
)
3233 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
3235 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
3237 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
3240 die("--name-only, --name-status, --check and -s are mutually exclusive");
3243 * Most of the time we can say "there are changes"
3244 * only by checking if there are changed paths, but
3245 * --ignore-whitespace* options force us to look
3249 if (DIFF_XDL_TST(options
, IGNORE_WHITESPACE
) ||
3250 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_CHANGE
) ||
3251 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_AT_EOL
))
3252 DIFF_OPT_SET(options
, DIFF_FROM_CONTENTS
);
3254 DIFF_OPT_CLR(options
, DIFF_FROM_CONTENTS
);
3256 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3257 options
->detect_rename
= DIFF_DETECT_COPY
;
3259 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
3260 options
->prefix
= NULL
;
3261 if (options
->prefix
)
3262 options
->prefix_length
= strlen(options
->prefix
);
3264 options
->prefix_length
= 0;
3266 if (options
->output_format
& (DIFF_FORMAT_NAME
|
3267 DIFF_FORMAT_NAME_STATUS
|
3268 DIFF_FORMAT_CHECKDIFF
|
3269 DIFF_FORMAT_NO_OUTPUT
))
3270 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
3271 DIFF_FORMAT_NUMSTAT
|
3272 DIFF_FORMAT_DIFFSTAT
|
3273 DIFF_FORMAT_SHORTSTAT
|
3274 DIFF_FORMAT_DIRSTAT
|
3275 DIFF_FORMAT_SUMMARY
|
3279 * These cases always need recursive; we do not drop caller-supplied
3280 * recursive bits for other formats here.
3282 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
3283 DIFF_FORMAT_NUMSTAT
|
3284 DIFF_FORMAT_DIFFSTAT
|
3285 DIFF_FORMAT_SHORTSTAT
|
3286 DIFF_FORMAT_DIRSTAT
|
3287 DIFF_FORMAT_SUMMARY
|
3288 DIFF_FORMAT_CHECKDIFF
))
3289 DIFF_OPT_SET(options
, RECURSIVE
);
3291 * Also pickaxe would not work very well if you do not say recursive
3293 if (options
->pickaxe
)
3294 DIFF_OPT_SET(options
, RECURSIVE
);
3296 * When patches are generated, submodules diffed against the work tree
3297 * must be checked for dirtiness too so it can be shown in the output
3299 if (options
->output_format
& DIFF_FORMAT_PATCH
)
3300 DIFF_OPT_SET(options
, DIRTY_SUBMODULES
);
3302 if (options
->detect_rename
&& options
->rename_limit
< 0)
3303 options
->rename_limit
= diff_rename_limit_default
;
3304 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
3306 /* read-cache does not die even when it fails
3307 * so it is safe for us to do this here. Also
3308 * it does not smudge active_cache or active_nr
3309 * when it fails, so we do not have to worry about
3310 * cleaning it up ourselves either.
3314 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
3315 options
->abbrev
= 40; /* full */
3318 * It does not make sense to show the first hit we happened
3319 * to have found. It does not make sense not to return with
3320 * exit code in such a case either.
3322 if (DIFF_OPT_TST(options
, QUICK
)) {
3323 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
3324 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3327 options
->diff_path_counter
= 0;
3329 if (DIFF_OPT_TST(options
, FOLLOW_RENAMES
) && options
->pathspec
.nr
!= 1)
3330 die(_("--follow requires exactly one pathspec"));
3333 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
3343 if (c
== arg_short
) {
3347 if (val
&& isdigit(c
)) {
3349 int n
= strtoul(arg
, &end
, 10);
3360 eq
= strchrnul(arg
, '=');
3362 if (!len
|| strncmp(arg
, arg_long
, len
))
3367 if (!isdigit(*++eq
))
3369 n
= strtoul(eq
, &end
, 10);
3377 static int diff_scoreopt_parse(const char *opt
);
3379 static inline int short_opt(char opt
, const char **argv
,
3380 const char **optarg
)
3382 const char *arg
= argv
[0];
3383 if (arg
[0] != '-' || arg
[1] != opt
)
3385 if (arg
[2] != '\0') {
3390 die("Option '%c' requires a value", opt
);
3395 int parse_long_opt(const char *opt
, const char **argv
,
3396 const char **optarg
)
3398 const char *arg
= argv
[0];
3399 if (!skip_prefix(arg
, "--", &arg
))
3401 if (!skip_prefix(arg
, opt
, &arg
))
3403 if (*arg
== '=') { /* stuck form: --option=value */
3409 /* separate form: --option value */
3411 die("Option '--%s' requires a value", opt
);
3416 static int stat_opt(struct diff_options
*options
, const char **av
)
3418 const char *arg
= av
[0];
3420 int width
= options
->stat_width
;
3421 int name_width
= options
->stat_name_width
;
3422 int graph_width
= options
->stat_graph_width
;
3423 int count
= options
->stat_count
;
3426 if (!skip_prefix(arg
, "--stat", &arg
))
3427 die("BUG: stat option does not begin with --stat: %s", arg
);
3432 if (skip_prefix(arg
, "-width", &arg
)) {
3434 width
= strtoul(arg
+ 1, &end
, 10);
3435 else if (!*arg
&& !av
[1])
3436 die("Option '--stat-width' requires a value");
3438 width
= strtoul(av
[1], &end
, 10);
3441 } else if (skip_prefix(arg
, "-name-width", &arg
)) {
3443 name_width
= strtoul(arg
+ 1, &end
, 10);
3444 else if (!*arg
&& !av
[1])
3445 die("Option '--stat-name-width' requires a value");
3447 name_width
= strtoul(av
[1], &end
, 10);
3450 } else if (skip_prefix(arg
, "-graph-width", &arg
)) {
3452 graph_width
= strtoul(arg
+ 1, &end
, 10);
3453 else if (!*arg
&& !av
[1])
3454 die("Option '--stat-graph-width' requires a value");
3456 graph_width
= strtoul(av
[1], &end
, 10);
3459 } else if (skip_prefix(arg
, "-count", &arg
)) {
3461 count
= strtoul(arg
+ 1, &end
, 10);
3462 else if (!*arg
&& !av
[1])
3463 die("Option '--stat-count' requires a value");
3465 count
= strtoul(av
[1], &end
, 10);
3471 width
= strtoul(arg
+1, &end
, 10);
3473 name_width
= strtoul(end
+1, &end
, 10);
3475 count
= strtoul(end
+1, &end
, 10);
3478 /* Important! This checks all the error cases! */
3481 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
3482 options
->stat_name_width
= name_width
;
3483 options
->stat_graph_width
= graph_width
;
3484 options
->stat_width
= width
;
3485 options
->stat_count
= count
;
3489 static int parse_dirstat_opt(struct diff_options
*options
, const char *params
)
3491 struct strbuf errmsg
= STRBUF_INIT
;
3492 if (parse_dirstat_params(options
, params
, &errmsg
))
3493 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3495 strbuf_release(&errmsg
);
3497 * The caller knows a dirstat-related option is given from the command
3498 * line; allow it to say "return this_function();"
3500 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
3504 static int parse_submodule_opt(struct diff_options
*options
, const char *value
)
3506 if (parse_submodule_params(options
, value
))
3507 die(_("Failed to parse --submodule option parameter: '%s'"),
3512 static const char diff_status_letters
[] = {
3515 DIFF_STATUS_DELETED
,
3516 DIFF_STATUS_MODIFIED
,
3517 DIFF_STATUS_RENAMED
,
3518 DIFF_STATUS_TYPE_CHANGED
,
3519 DIFF_STATUS_UNKNOWN
,
3520 DIFF_STATUS_UNMERGED
,
3521 DIFF_STATUS_FILTER_AON
,
3522 DIFF_STATUS_FILTER_BROKEN
,
3526 static unsigned int filter_bit
['Z' + 1];
3528 static void prepare_filter_bits(void)
3532 if (!filter_bit
[DIFF_STATUS_ADDED
]) {
3533 for (i
= 0; diff_status_letters
[i
]; i
++)
3534 filter_bit
[(int) diff_status_letters
[i
]] = (1 << i
);
3538 static unsigned filter_bit_tst(char status
, const struct diff_options
*opt
)
3540 return opt
->filter
& filter_bit
[(int) status
];
3543 static int parse_diff_filter_opt(const char *optarg
, struct diff_options
*opt
)
3547 prepare_filter_bits();
3550 * If there is a negation e.g. 'd' in the input, and we haven't
3551 * initialized the filter field with another --diff-filter, start
3552 * from full set of bits, except for AON.
3555 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
3556 if (optch
< 'a' || 'z' < optch
)
3558 opt
->filter
= (1 << (ARRAY_SIZE(diff_status_letters
) - 1)) - 1;
3559 opt
->filter
&= ~filter_bit
[DIFF_STATUS_FILTER_AON
];
3564 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
3568 if ('a' <= optch
&& optch
<= 'z') {
3570 optch
= toupper(optch
);
3575 bit
= (0 <= optch
&& optch
<= 'Z') ? filter_bit
[optch
] : 0;
3579 opt
->filter
&= ~bit
;
3586 static void enable_patch_output(int *fmt
) {
3587 *fmt
&= ~DIFF_FORMAT_NO_OUTPUT
;
3588 *fmt
|= DIFF_FORMAT_PATCH
;
3591 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
3593 const char *arg
= av
[0];
3597 /* Output format options */
3598 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch")
3599 || opt_arg(arg
, 'U', "unified", &options
->context
))
3600 enable_patch_output(&options
->output_format
);
3601 else if (!strcmp(arg
, "--raw"))
3602 options
->output_format
|= DIFF_FORMAT_RAW
;
3603 else if (!strcmp(arg
, "--patch-with-raw")) {
3604 enable_patch_output(&options
->output_format
);
3605 options
->output_format
|= DIFF_FORMAT_RAW
;
3606 } else if (!strcmp(arg
, "--numstat"))
3607 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
3608 else if (!strcmp(arg
, "--shortstat"))
3609 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
3610 else if (!strcmp(arg
, "-X") || !strcmp(arg
, "--dirstat"))
3611 return parse_dirstat_opt(options
, "");
3612 else if (skip_prefix(arg
, "-X", &arg
))
3613 return parse_dirstat_opt(options
, arg
);
3614 else if (skip_prefix(arg
, "--dirstat=", &arg
))
3615 return parse_dirstat_opt(options
, arg
);
3616 else if (!strcmp(arg
, "--cumulative"))
3617 return parse_dirstat_opt(options
, "cumulative");
3618 else if (!strcmp(arg
, "--dirstat-by-file"))
3619 return parse_dirstat_opt(options
, "files");
3620 else if (skip_prefix(arg
, "--dirstat-by-file=", &arg
)) {
3621 parse_dirstat_opt(options
, "files");
3622 return parse_dirstat_opt(options
, arg
);
3624 else if (!strcmp(arg
, "--check"))
3625 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
3626 else if (!strcmp(arg
, "--summary"))
3627 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
3628 else if (!strcmp(arg
, "--patch-with-stat")) {
3629 enable_patch_output(&options
->output_format
);
3630 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
3631 } else if (!strcmp(arg
, "--name-only"))
3632 options
->output_format
|= DIFF_FORMAT_NAME
;
3633 else if (!strcmp(arg
, "--name-status"))
3634 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
3635 else if (!strcmp(arg
, "-s") || !strcmp(arg
, "--no-patch"))
3636 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
3637 else if (starts_with(arg
, "--stat"))
3638 /* --stat, --stat-width, --stat-name-width, or --stat-count */
3639 return stat_opt(options
, av
);
3641 /* renames options */
3642 else if (starts_with(arg
, "-B") || starts_with(arg
, "--break-rewrites=") ||
3643 !strcmp(arg
, "--break-rewrites")) {
3644 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
3645 return error("invalid argument to -B: %s", arg
+2);
3647 else if (starts_with(arg
, "-M") || starts_with(arg
, "--find-renames=") ||
3648 !strcmp(arg
, "--find-renames")) {
3649 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3650 return error("invalid argument to -M: %s", arg
+2);
3651 options
->detect_rename
= DIFF_DETECT_RENAME
;
3653 else if (!strcmp(arg
, "-D") || !strcmp(arg
, "--irreversible-delete")) {
3654 options
->irreversible_delete
= 1;
3656 else if (starts_with(arg
, "-C") || starts_with(arg
, "--find-copies=") ||
3657 !strcmp(arg
, "--find-copies")) {
3658 if (options
->detect_rename
== DIFF_DETECT_COPY
)
3659 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3660 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3661 return error("invalid argument to -C: %s", arg
+2);
3662 options
->detect_rename
= DIFF_DETECT_COPY
;
3664 else if (!strcmp(arg
, "--no-renames"))
3665 options
->detect_rename
= 0;
3666 else if (!strcmp(arg
, "--rename-empty"))
3667 DIFF_OPT_SET(options
, RENAME_EMPTY
);
3668 else if (!strcmp(arg
, "--no-rename-empty"))
3669 DIFF_OPT_CLR(options
, RENAME_EMPTY
);
3670 else if (!strcmp(arg
, "--relative"))
3671 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3672 else if (skip_prefix(arg
, "--relative=", &arg
)) {
3673 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3674 options
->prefix
= arg
;
3678 else if (!strcmp(arg
, "--minimal"))
3679 DIFF_XDL_SET(options
, NEED_MINIMAL
);
3680 else if (!strcmp(arg
, "--no-minimal"))
3681 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
3682 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
3683 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
3684 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
3685 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
3686 else if (!strcmp(arg
, "--ignore-space-at-eol"))
3687 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
3688 else if (!strcmp(arg
, "--ignore-blank-lines"))
3689 DIFF_XDL_SET(options
, IGNORE_BLANK_LINES
);
3690 else if (!strcmp(arg
, "--patience"))
3691 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
3692 else if (!strcmp(arg
, "--histogram"))
3693 options
->xdl_opts
= DIFF_WITH_ALG(options
, HISTOGRAM_DIFF
);
3694 else if ((argcount
= parse_long_opt("diff-algorithm", av
, &optarg
))) {
3695 long value
= parse_algorithm_value(optarg
);
3697 return error("option diff-algorithm accepts \"myers\", "
3698 "\"minimal\", \"patience\" and \"histogram\"");
3699 /* clear out previous settings */
3700 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
3701 options
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
3702 options
->xdl_opts
|= value
;
3707 else if (!strcmp(arg
, "--binary")) {
3708 enable_patch_output(&options
->output_format
);
3709 DIFF_OPT_SET(options
, BINARY
);
3711 else if (!strcmp(arg
, "--full-index"))
3712 DIFF_OPT_SET(options
, FULL_INDEX
);
3713 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
3714 DIFF_OPT_SET(options
, TEXT
);
3715 else if (!strcmp(arg
, "-R"))
3716 DIFF_OPT_SET(options
, REVERSE_DIFF
);
3717 else if (!strcmp(arg
, "--find-copies-harder"))
3718 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3719 else if (!strcmp(arg
, "--follow"))
3720 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
3721 else if (!strcmp(arg
, "--no-follow"))
3722 DIFF_OPT_CLR(options
, FOLLOW_RENAMES
);
3723 else if (!strcmp(arg
, "--color"))
3724 options
->use_color
= 1;
3725 else if (skip_prefix(arg
, "--color=", &arg
)) {
3726 int value
= git_config_colorbool(NULL
, arg
);
3728 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3729 options
->use_color
= value
;
3731 else if (!strcmp(arg
, "--no-color"))
3732 options
->use_color
= 0;
3733 else if (!strcmp(arg
, "--color-words")) {
3734 options
->use_color
= 1;
3735 options
->word_diff
= DIFF_WORDS_COLOR
;
3737 else if (skip_prefix(arg
, "--color-words=", &arg
)) {
3738 options
->use_color
= 1;
3739 options
->word_diff
= DIFF_WORDS_COLOR
;
3740 options
->word_regex
= arg
;
3742 else if (!strcmp(arg
, "--word-diff")) {
3743 if (options
->word_diff
== DIFF_WORDS_NONE
)
3744 options
->word_diff
= DIFF_WORDS_PLAIN
;
3746 else if (skip_prefix(arg
, "--word-diff=", &arg
)) {
3747 if (!strcmp(arg
, "plain"))
3748 options
->word_diff
= DIFF_WORDS_PLAIN
;
3749 else if (!strcmp(arg
, "color")) {
3750 options
->use_color
= 1;
3751 options
->word_diff
= DIFF_WORDS_COLOR
;
3753 else if (!strcmp(arg
, "porcelain"))
3754 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
3755 else if (!strcmp(arg
, "none"))
3756 options
->word_diff
= DIFF_WORDS_NONE
;
3758 die("bad --word-diff argument: %s", arg
);
3760 else if ((argcount
= parse_long_opt("word-diff-regex", av
, &optarg
))) {
3761 if (options
->word_diff
== DIFF_WORDS_NONE
)
3762 options
->word_diff
= DIFF_WORDS_PLAIN
;
3763 options
->word_regex
= optarg
;
3766 else if (!strcmp(arg
, "--exit-code"))
3767 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3768 else if (!strcmp(arg
, "--quiet"))
3769 DIFF_OPT_SET(options
, QUICK
);
3770 else if (!strcmp(arg
, "--ext-diff"))
3771 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
3772 else if (!strcmp(arg
, "--no-ext-diff"))
3773 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
3774 else if (!strcmp(arg
, "--textconv"))
3775 DIFF_OPT_SET(options
, ALLOW_TEXTCONV
);
3776 else if (!strcmp(arg
, "--no-textconv"))
3777 DIFF_OPT_CLR(options
, ALLOW_TEXTCONV
);
3778 else if (!strcmp(arg
, "--ignore-submodules")) {
3779 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3780 handle_ignore_submodules_arg(options
, "all");
3781 } else if (skip_prefix(arg
, "--ignore-submodules=", &arg
)) {
3782 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3783 handle_ignore_submodules_arg(options
, arg
);
3784 } else if (!strcmp(arg
, "--submodule"))
3785 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
3786 else if (skip_prefix(arg
, "--submodule=", &arg
))
3787 return parse_submodule_opt(options
, arg
);
3790 else if (!strcmp(arg
, "-z"))
3791 options
->line_termination
= 0;
3792 else if ((argcount
= short_opt('l', av
, &optarg
))) {
3793 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
3796 else if ((argcount
= short_opt('S', av
, &optarg
))) {
3797 options
->pickaxe
= optarg
;
3798 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_S
;
3800 } else if ((argcount
= short_opt('G', av
, &optarg
))) {
3801 options
->pickaxe
= optarg
;
3802 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_G
;
3805 else if (!strcmp(arg
, "--pickaxe-all"))
3806 options
->pickaxe_opts
|= DIFF_PICKAXE_ALL
;
3807 else if (!strcmp(arg
, "--pickaxe-regex"))
3808 options
->pickaxe_opts
|= DIFF_PICKAXE_REGEX
;
3809 else if ((argcount
= short_opt('O', av
, &optarg
))) {
3810 options
->orderfile
= optarg
;
3813 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
3814 int offending
= parse_diff_filter_opt(optarg
, options
);
3816 die("unknown change class '%c' in --diff-filter=%s",
3820 else if (!strcmp(arg
, "--abbrev"))
3821 options
->abbrev
= DEFAULT_ABBREV
;
3822 else if (skip_prefix(arg
, "--abbrev=", &arg
)) {
3823 options
->abbrev
= strtoul(arg
, NULL
, 10);
3824 if (options
->abbrev
< MINIMUM_ABBREV
)
3825 options
->abbrev
= MINIMUM_ABBREV
;
3826 else if (40 < options
->abbrev
)
3827 options
->abbrev
= 40;
3829 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
3830 options
->a_prefix
= optarg
;
3833 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
3834 options
->b_prefix
= optarg
;
3837 else if (!strcmp(arg
, "--no-prefix"))
3838 options
->a_prefix
= options
->b_prefix
= "";
3839 else if (opt_arg(arg
, '\0', "inter-hunk-context",
3840 &options
->interhunkcontext
))
3842 else if (!strcmp(arg
, "-W"))
3843 DIFF_OPT_SET(options
, FUNCCONTEXT
);
3844 else if (!strcmp(arg
, "--function-context"))
3845 DIFF_OPT_SET(options
, FUNCCONTEXT
);
3846 else if (!strcmp(arg
, "--no-function-context"))
3847 DIFF_OPT_CLR(options
, FUNCCONTEXT
);
3848 else if ((argcount
= parse_long_opt("output", av
, &optarg
))) {
3849 options
->file
= fopen(optarg
, "w");
3851 die_errno("Could not open '%s'", optarg
);
3852 options
->close_file
= 1;
3859 int parse_rename_score(const char **cp_p
)
3861 unsigned long num
, scale
;
3863 const char *cp
= *cp_p
;
3870 if ( !dot
&& ch
== '.' ) {
3873 } else if ( ch
== '%' ) {
3874 scale
= dot
? scale
*100 : 100;
3875 cp
++; /* % is always at the end */
3877 } else if ( ch
>= '0' && ch
<= '9' ) {
3878 if ( scale
< 100000 ) {
3880 num
= (num
*10) + (ch
-'0');
3889 /* user says num divided by scale and we say internally that
3890 * is MAX_SCORE * num / scale.
3892 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
3895 static int diff_scoreopt_parse(const char *opt
)
3897 int opt1
, opt2
, cmd
;
3903 /* convert the long-form arguments into short-form versions */
3904 if (skip_prefix(opt
, "break-rewrites", &opt
)) {
3905 if (*opt
== 0 || *opt
++ == '=')
3907 } else if (skip_prefix(opt
, "find-copies", &opt
)) {
3908 if (*opt
== 0 || *opt
++ == '=')
3910 } else if (skip_prefix(opt
, "find-renames", &opt
)) {
3911 if (*opt
== 0 || *opt
++ == '=')
3915 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
3916 return -1; /* that is not a -M, -C, or -B option */
3918 opt1
= parse_rename_score(&opt
);
3924 else if (*opt
!= '/')
3925 return -1; /* we expect -B80/99 or -B80 */
3928 opt2
= parse_rename_score(&opt
);
3933 return opt1
| (opt2
<< 16);
3936 struct diff_queue_struct diff_queued_diff
;
3938 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
3940 ALLOC_GROW(queue
->queue
, queue
->nr
+ 1, queue
->alloc
);
3941 queue
->queue
[queue
->nr
++] = dp
;
3944 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
3945 struct diff_filespec
*one
,
3946 struct diff_filespec
*two
)
3948 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
3956 void diff_free_filepair(struct diff_filepair
*p
)
3958 free_filespec(p
->one
);
3959 free_filespec(p
->two
);
3963 /* This is different from find_unique_abbrev() in that
3964 * it stuffs the result with dots for alignment.
3966 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
3971 return sha1_to_hex(sha1
);
3973 abbrev
= find_unique_abbrev(sha1
, len
);
3974 abblen
= strlen(abbrev
);
3976 static char hex
[41];
3977 if (len
< abblen
&& abblen
<= len
+ 2)
3978 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
3980 sprintf(hex
, "%s...", abbrev
);
3983 return sha1_to_hex(sha1
);
3986 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
3988 int line_termination
= opt
->line_termination
;
3989 int inter_name_termination
= line_termination
? '\t' : '\0';
3991 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
3992 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
3993 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
3994 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
3995 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
3998 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
3999 inter_name_termination
);
4001 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
4004 if (p
->status
== DIFF_STATUS_COPIED
||
4005 p
->status
== DIFF_STATUS_RENAMED
) {
4006 const char *name_a
, *name_b
;
4007 name_a
= p
->one
->path
;
4008 name_b
= p
->two
->path
;
4009 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4010 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
4011 write_name_quoted(name_b
, opt
->file
, line_termination
);
4013 const char *name_a
, *name_b
;
4014 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
4016 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4017 write_name_quoted(name_a
, opt
->file
, line_termination
);
4021 int diff_unmodified_pair(struct diff_filepair
*p
)
4023 /* This function is written stricter than necessary to support
4024 * the currently implemented transformers, but the idea is to
4025 * let transformers to produce diff_filepairs any way they want,
4026 * and filter and clean them up here before producing the output.
4028 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
4030 if (DIFF_PAIR_UNMERGED(p
))
4031 return 0; /* unmerged is interesting */
4033 /* deletion, addition, mode or type change
4034 * and rename are all interesting.
4036 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
4037 DIFF_PAIR_MODE_CHANGED(p
) ||
4038 strcmp(one
->path
, two
->path
))
4041 /* both are valid and point at the same path. that is, we are
4042 * dealing with a change.
4044 if (one
->sha1_valid
&& two
->sha1_valid
&&
4045 !hashcmp(one
->sha1
, two
->sha1
) &&
4046 !one
->dirty_submodule
&& !two
->dirty_submodule
)
4047 return 1; /* no change */
4048 if (!one
->sha1_valid
&& !two
->sha1_valid
)
4049 return 1; /* both look at the same file on the filesystem. */
4053 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
4055 if (diff_unmodified_pair(p
))
4058 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4059 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4060 return; /* no tree diffs in patch format */
4065 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
4066 struct diffstat_t
*diffstat
)
4068 if (diff_unmodified_pair(p
))
4071 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4072 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4073 return; /* no useful stat for tree diffs */
4075 run_diffstat(p
, o
, diffstat
);
4078 static void diff_flush_checkdiff(struct diff_filepair
*p
,
4079 struct diff_options
*o
)
4081 if (diff_unmodified_pair(p
))
4084 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4085 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4086 return; /* nothing to check in tree diffs */
4088 run_checkdiff(p
, o
);
4091 int diff_queue_is_empty(void)
4093 struct diff_queue_struct
*q
= &diff_queued_diff
;
4095 for (i
= 0; i
< q
->nr
; i
++)
4096 if (!diff_unmodified_pair(q
->queue
[i
]))
4102 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
4104 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
4107 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
4109 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
4110 fprintf(stderr
, "queue[%d] %s size %lu\n",
4115 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
4117 diff_debug_filespec(p
->one
, i
, "one");
4118 diff_debug_filespec(p
->two
, i
, "two");
4119 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
4120 p
->score
, p
->status
? p
->status
: '?',
4121 p
->one
->rename_used
, p
->broken_pair
);
4124 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
4128 fprintf(stderr
, "%s\n", msg
);
4129 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
4130 for (i
= 0; i
< q
->nr
; i
++) {
4131 struct diff_filepair
*p
= q
->queue
[i
];
4132 diff_debug_filepair(p
, i
);
4137 static void diff_resolve_rename_copy(void)
4140 struct diff_filepair
*p
;
4141 struct diff_queue_struct
*q
= &diff_queued_diff
;
4143 diff_debug_queue("resolve-rename-copy", q
);
4145 for (i
= 0; i
< q
->nr
; i
++) {
4147 p
->status
= 0; /* undecided */
4148 if (DIFF_PAIR_UNMERGED(p
))
4149 p
->status
= DIFF_STATUS_UNMERGED
;
4150 else if (!DIFF_FILE_VALID(p
->one
))
4151 p
->status
= DIFF_STATUS_ADDED
;
4152 else if (!DIFF_FILE_VALID(p
->two
))
4153 p
->status
= DIFF_STATUS_DELETED
;
4154 else if (DIFF_PAIR_TYPE_CHANGED(p
))
4155 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
4157 /* from this point on, we are dealing with a pair
4158 * whose both sides are valid and of the same type, i.e.
4159 * either in-place edit or rename/copy edit.
4161 else if (DIFF_PAIR_RENAME(p
)) {
4163 * A rename might have re-connected a broken
4164 * pair up, causing the pathnames to be the
4165 * same again. If so, that's not a rename at
4166 * all, just a modification..
4168 * Otherwise, see if this source was used for
4169 * multiple renames, in which case we decrement
4170 * the count, and call it a copy.
4172 if (!strcmp(p
->one
->path
, p
->two
->path
))
4173 p
->status
= DIFF_STATUS_MODIFIED
;
4174 else if (--p
->one
->rename_used
> 0)
4175 p
->status
= DIFF_STATUS_COPIED
;
4177 p
->status
= DIFF_STATUS_RENAMED
;
4179 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
4180 p
->one
->mode
!= p
->two
->mode
||
4181 p
->one
->dirty_submodule
||
4182 p
->two
->dirty_submodule
||
4183 is_null_sha1(p
->one
->sha1
))
4184 p
->status
= DIFF_STATUS_MODIFIED
;
4186 /* This is a "no-change" entry and should not
4187 * happen anymore, but prepare for broken callers.
4189 error("feeding unmodified %s to diffcore",
4191 p
->status
= DIFF_STATUS_UNKNOWN
;
4194 diff_debug_queue("resolve-rename-copy done", q
);
4197 static int check_pair_status(struct diff_filepair
*p
)
4199 switch (p
->status
) {
4200 case DIFF_STATUS_UNKNOWN
:
4203 die("internal error in diff-resolve-rename-copy");
4209 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
4211 int fmt
= opt
->output_format
;
4213 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
4214 diff_flush_checkdiff(p
, opt
);
4215 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
4216 diff_flush_raw(p
, opt
);
4217 else if (fmt
& DIFF_FORMAT_NAME
) {
4218 const char *name_a
, *name_b
;
4219 name_a
= p
->two
->path
;
4221 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4222 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
4226 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
4229 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
4231 fprintf(file
, " %s ", newdelete
);
4232 write_name_quoted(fs
->path
, file
, '\n');
4236 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
,
4237 const char *line_prefix
)
4239 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
4240 fprintf(file
, "%s mode change %06o => %06o%c", line_prefix
, p
->one
->mode
,
4241 p
->two
->mode
, show_name
? ' ' : '\n');
4243 write_name_quoted(p
->two
->path
, file
, '\n');
4248 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
,
4249 const char *line_prefix
)
4251 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
4253 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
4255 show_mode_change(file
, p
, 0, line_prefix
);
4258 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
4260 FILE *file
= opt
->file
;
4261 const char *line_prefix
= diff_line_prefix(opt
);
4264 case DIFF_STATUS_DELETED
:
4265 fputs(line_prefix
, file
);
4266 show_file_mode_name(file
, "delete", p
->one
);
4268 case DIFF_STATUS_ADDED
:
4269 fputs(line_prefix
, file
);
4270 show_file_mode_name(file
, "create", p
->two
);
4272 case DIFF_STATUS_COPIED
:
4273 fputs(line_prefix
, file
);
4274 show_rename_copy(file
, "copy", p
, line_prefix
);
4276 case DIFF_STATUS_RENAMED
:
4277 fputs(line_prefix
, file
);
4278 show_rename_copy(file
, "rename", p
, line_prefix
);
4282 fprintf(file
, "%s rewrite ", line_prefix
);
4283 write_name_quoted(p
->two
->path
, file
, ' ');
4284 fprintf(file
, "(%d%%)\n", similarity_index(p
));
4286 show_mode_change(file
, p
, !p
->score
, line_prefix
);
4296 static int remove_space(char *line
, int len
)
4302 for (i
= 0; i
< len
; i
++)
4303 if (!isspace((c
= line
[i
])))
4309 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
4311 struct patch_id_t
*data
= priv
;
4314 /* Ignore line numbers when computing the SHA1 of the patch */
4315 if (starts_with(line
, "@@ -"))
4318 new_len
= remove_space(line
, len
);
4320 git_SHA1_Update(data
->ctx
, line
, new_len
);
4321 data
->patchlen
+= new_len
;
4324 /* returns 0 upon success, and writes result into sha1 */
4325 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
4327 struct diff_queue_struct
*q
= &diff_queued_diff
;
4330 struct patch_id_t data
;
4331 char buffer
[PATH_MAX
* 4 + 20];
4333 git_SHA1_Init(&ctx
);
4334 memset(&data
, 0, sizeof(struct patch_id_t
));
4337 for (i
= 0; i
< q
->nr
; i
++) {
4341 struct diff_filepair
*p
= q
->queue
[i
];
4344 memset(&xpp
, 0, sizeof(xpp
));
4345 memset(&xecfg
, 0, sizeof(xecfg
));
4347 return error("internal diff status error");
4348 if (p
->status
== DIFF_STATUS_UNKNOWN
)
4350 if (diff_unmodified_pair(p
))
4352 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4353 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4355 if (DIFF_PAIR_UNMERGED(p
))
4358 diff_fill_sha1_info(p
->one
);
4359 diff_fill_sha1_info(p
->two
);
4360 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
4361 fill_mmfile(&mf2
, p
->two
) < 0)
4362 return error("unable to read files to diff");
4364 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
4365 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
4366 if (p
->one
->mode
== 0)
4367 len1
= snprintf(buffer
, sizeof(buffer
),
4368 "diff--gita/%.*sb/%.*s"
4375 len2
, p
->two
->path
);
4376 else if (p
->two
->mode
== 0)
4377 len1
= snprintf(buffer
, sizeof(buffer
),
4378 "diff--gita/%.*sb/%.*s"
4379 "deletedfilemode%06o"
4385 len1
, p
->one
->path
);
4387 len1
= snprintf(buffer
, sizeof(buffer
),
4388 "diff--gita/%.*sb/%.*s"
4394 len2
, p
->two
->path
);
4395 git_SHA1_Update(&ctx
, buffer
, len1
);
4397 if (diff_filespec_is_binary(p
->one
) ||
4398 diff_filespec_is_binary(p
->two
)) {
4399 git_SHA1_Update(&ctx
, sha1_to_hex(p
->one
->sha1
), 40);
4400 git_SHA1_Update(&ctx
, sha1_to_hex(p
->two
->sha1
), 40);
4407 xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
4411 git_SHA1_Final(sha1
, &ctx
);
4415 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
4417 struct diff_queue_struct
*q
= &diff_queued_diff
;
4419 int result
= diff_get_patch_id(options
, sha1
);
4421 for (i
= 0; i
< q
->nr
; i
++)
4422 diff_free_filepair(q
->queue
[i
]);
4425 DIFF_QUEUE_CLEAR(q
);
4430 static int is_summary_empty(const struct diff_queue_struct
*q
)
4434 for (i
= 0; i
< q
->nr
; i
++) {
4435 const struct diff_filepair
*p
= q
->queue
[i
];
4437 switch (p
->status
) {
4438 case DIFF_STATUS_DELETED
:
4439 case DIFF_STATUS_ADDED
:
4440 case DIFF_STATUS_COPIED
:
4441 case DIFF_STATUS_RENAMED
:
4446 if (p
->one
->mode
&& p
->two
->mode
&&
4447 p
->one
->mode
!= p
->two
->mode
)
4455 static const char rename_limit_warning
[] =
4456 "inexact rename detection was skipped due to too many files.";
4458 static const char degrade_cc_to_c_warning
[] =
4459 "only found copies from modified paths due to too many files.";
4461 static const char rename_limit_advice
[] =
4462 "you may want to set your %s variable to at least "
4463 "%d and retry the command.";
4465 void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
)
4468 warning(degrade_cc_to_c_warning
);
4470 warning(rename_limit_warning
);
4473 if (0 < needed
&& needed
< 32767)
4474 warning(rename_limit_advice
, varname
, needed
);
4477 void diff_flush(struct diff_options
*options
)
4479 struct diff_queue_struct
*q
= &diff_queued_diff
;
4480 int i
, output_format
= options
->output_format
;
4482 int dirstat_by_line
= 0;
4485 * Order: raw, stat, summary, patch
4486 * or: name/name-status/checkdiff (other bits clear)
4491 if (output_format
& (DIFF_FORMAT_RAW
|
4493 DIFF_FORMAT_NAME_STATUS
|
4494 DIFF_FORMAT_CHECKDIFF
)) {
4495 for (i
= 0; i
< q
->nr
; i
++) {
4496 struct diff_filepair
*p
= q
->queue
[i
];
4497 if (check_pair_status(p
))
4498 flush_one_pair(p
, options
);
4503 if (output_format
& DIFF_FORMAT_DIRSTAT
&& DIFF_OPT_TST(options
, DIRSTAT_BY_LINE
))
4504 dirstat_by_line
= 1;
4506 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
) ||
4508 struct diffstat_t diffstat
;
4510 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
4511 for (i
= 0; i
< q
->nr
; i
++) {
4512 struct diff_filepair
*p
= q
->queue
[i
];
4513 if (check_pair_status(p
))
4514 diff_flush_stat(p
, options
, &diffstat
);
4516 if (output_format
& DIFF_FORMAT_NUMSTAT
)
4517 show_numstat(&diffstat
, options
);
4518 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
4519 show_stats(&diffstat
, options
);
4520 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
4521 show_shortstats(&diffstat
, options
);
4522 if (output_format
& DIFF_FORMAT_DIRSTAT
)
4523 show_dirstat_by_line(&diffstat
, options
);
4524 free_diffstat_info(&diffstat
);
4527 if ((output_format
& DIFF_FORMAT_DIRSTAT
) && !dirstat_by_line
)
4528 show_dirstat(options
);
4530 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
4531 for (i
= 0; i
< q
->nr
; i
++) {
4532 diff_summary(options
, q
->queue
[i
]);
4537 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
4538 DIFF_OPT_TST(options
, EXIT_WITH_STATUS
) &&
4539 DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4541 * run diff_flush_patch for the exit status. setting
4542 * options->file to /dev/null should be safe, because we
4543 * aren't supposed to produce any output anyway.
4545 if (options
->close_file
)
4546 fclose(options
->file
);
4547 options
->file
= fopen("/dev/null", "w");
4549 die_errno("Could not open /dev/null");
4550 options
->close_file
= 1;
4551 for (i
= 0; i
< q
->nr
; i
++) {
4552 struct diff_filepair
*p
= q
->queue
[i
];
4553 if (check_pair_status(p
))
4554 diff_flush_patch(p
, options
);
4555 if (options
->found_changes
)
4560 if (output_format
& DIFF_FORMAT_PATCH
) {
4562 fprintf(options
->file
, "%s%c",
4563 diff_line_prefix(options
),
4564 options
->line_termination
);
4565 if (options
->stat_sep
) {
4566 /* attach patch instead of inline */
4567 fputs(options
->stat_sep
, options
->file
);
4571 for (i
= 0; i
< q
->nr
; i
++) {
4572 struct diff_filepair
*p
= q
->queue
[i
];
4573 if (check_pair_status(p
))
4574 diff_flush_patch(p
, options
);
4578 if (output_format
& DIFF_FORMAT_CALLBACK
)
4579 options
->format_callback(q
, options
, options
->format_callback_data
);
4581 for (i
= 0; i
< q
->nr
; i
++)
4582 diff_free_filepair(q
->queue
[i
]);
4585 DIFF_QUEUE_CLEAR(q
);
4586 if (options
->close_file
)
4587 fclose(options
->file
);
4590 * Report the content-level differences with HAS_CHANGES;
4591 * diff_addremove/diff_change does not set the bit when
4592 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4594 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4595 if (options
->found_changes
)
4596 DIFF_OPT_SET(options
, HAS_CHANGES
);
4598 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4602 static int match_filter(const struct diff_options
*options
, const struct diff_filepair
*p
)
4604 return (((p
->status
== DIFF_STATUS_MODIFIED
) &&
4606 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN
, options
)) ||
4608 filter_bit_tst(DIFF_STATUS_MODIFIED
, options
)))) ||
4609 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
4610 filter_bit_tst(p
->status
, options
)));
4613 static void diffcore_apply_filter(struct diff_options
*options
)
4616 struct diff_queue_struct
*q
= &diff_queued_diff
;
4617 struct diff_queue_struct outq
;
4619 DIFF_QUEUE_CLEAR(&outq
);
4621 if (!options
->filter
)
4624 if (filter_bit_tst(DIFF_STATUS_FILTER_AON
, options
)) {
4626 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
4627 if (match_filter(options
, q
->queue
[i
]))
4633 /* otherwise we will clear the whole queue
4634 * by copying the empty outq at the end of this
4635 * function, but first clear the current entries
4638 for (i
= 0; i
< q
->nr
; i
++)
4639 diff_free_filepair(q
->queue
[i
]);
4642 /* Only the matching ones */
4643 for (i
= 0; i
< q
->nr
; i
++) {
4644 struct diff_filepair
*p
= q
->queue
[i
];
4645 if (match_filter(options
, p
))
4648 diff_free_filepair(p
);
4655 /* Check whether two filespecs with the same mode and size are identical */
4656 static int diff_filespec_is_identical(struct diff_filespec
*one
,
4657 struct diff_filespec
*two
)
4659 if (S_ISGITLINK(one
->mode
))
4661 if (diff_populate_filespec(one
, 0))
4663 if (diff_populate_filespec(two
, 0))
4665 return !memcmp(one
->data
, two
->data
, one
->size
);
4668 static int diff_filespec_check_stat_unmatch(struct diff_filepair
*p
)
4670 if (p
->done_skip_stat_unmatch
)
4671 return p
->skip_stat_unmatch_result
;
4673 p
->done_skip_stat_unmatch
= 1;
4674 p
->skip_stat_unmatch_result
= 0;
4676 * 1. Entries that come from stat info dirtiness
4677 * always have both sides (iow, not create/delete),
4678 * one side of the object name is unknown, with
4679 * the same mode and size. Keep the ones that
4680 * do not match these criteria. They have real
4683 * 2. At this point, the file is known to be modified,
4684 * with the same mode and size, and the object
4685 * name of one side is unknown. Need to inspect
4686 * the identical contents.
4688 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
4689 !DIFF_FILE_VALID(p
->two
) ||
4690 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
4691 (p
->one
->mode
!= p
->two
->mode
) ||
4692 diff_populate_filespec(p
->one
, CHECK_SIZE_ONLY
) ||
4693 diff_populate_filespec(p
->two
, CHECK_SIZE_ONLY
) ||
4694 (p
->one
->size
!= p
->two
->size
) ||
4695 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
4696 p
->skip_stat_unmatch_result
= 1;
4697 return p
->skip_stat_unmatch_result
;
4700 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
4703 struct diff_queue_struct
*q
= &diff_queued_diff
;
4704 struct diff_queue_struct outq
;
4705 DIFF_QUEUE_CLEAR(&outq
);
4707 for (i
= 0; i
< q
->nr
; i
++) {
4708 struct diff_filepair
*p
= q
->queue
[i
];
4710 if (diff_filespec_check_stat_unmatch(p
))
4714 * The caller can subtract 1 from skip_stat_unmatch
4715 * to determine how many paths were dirty only
4716 * due to stat info mismatch.
4718 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
4719 diffopt
->skip_stat_unmatch
++;
4720 diff_free_filepair(p
);
4727 static int diffnamecmp(const void *a_
, const void *b_
)
4729 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
4730 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
4731 const char *name_a
, *name_b
;
4733 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
4734 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
4735 return strcmp(name_a
, name_b
);
4738 void diffcore_fix_diff_index(struct diff_options
*options
)
4740 struct diff_queue_struct
*q
= &diff_queued_diff
;
4741 qsort(q
->queue
, q
->nr
, sizeof(q
->queue
[0]), diffnamecmp
);
4744 void diffcore_std(struct diff_options
*options
)
4746 /* NOTE please keep the following in sync with diff_tree_combined() */
4747 if (options
->skip_stat_unmatch
)
4748 diffcore_skip_stat_unmatch(options
);
4749 if (!options
->found_follow
) {
4750 /* See try_to_follow_renames() in tree-diff.c */
4751 if (options
->break_opt
!= -1)
4752 diffcore_break(options
->break_opt
);
4753 if (options
->detect_rename
)
4754 diffcore_rename(options
);
4755 if (options
->break_opt
!= -1)
4756 diffcore_merge_broken();
4758 if (options
->pickaxe
)
4759 diffcore_pickaxe(options
);
4760 if (options
->orderfile
)
4761 diffcore_order(options
->orderfile
);
4762 if (!options
->found_follow
)
4763 /* See try_to_follow_renames() in tree-diff.c */
4764 diff_resolve_rename_copy();
4765 diffcore_apply_filter(options
);
4767 if (diff_queued_diff
.nr
&& !DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4768 DIFF_OPT_SET(options
, HAS_CHANGES
);
4770 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4772 options
->found_follow
= 0;
4775 int diff_result_code(struct diff_options
*opt
, int status
)
4779 diff_warn_rename_limit("diff.renameLimit",
4780 opt
->needed_rename_limit
,
4781 opt
->degraded_cc_to_c
);
4782 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4783 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
4785 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4786 DIFF_OPT_TST(opt
, HAS_CHANGES
))
4788 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
4789 DIFF_OPT_TST(opt
, CHECK_FAILED
))
4794 int diff_can_quit_early(struct diff_options
*opt
)
4796 return (DIFF_OPT_TST(opt
, QUICK
) &&
4798 DIFF_OPT_TST(opt
, HAS_CHANGES
));
4802 * Shall changes to this submodule be ignored?
4804 * Submodule changes can be configured to be ignored separately for each path,
4805 * but that configuration can be overridden from the command line.
4807 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
4810 unsigned orig_flags
= options
->flags
;
4811 if (!DIFF_OPT_TST(options
, OVERRIDE_SUBMODULE_CONFIG
))
4812 set_diffopt_flags_from_submodule_config(options
, path
);
4813 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
))
4815 options
->flags
= orig_flags
;
4819 void diff_addremove(struct diff_options
*options
,
4820 int addremove
, unsigned mode
,
4821 const unsigned char *sha1
,
4823 const char *concatpath
, unsigned dirty_submodule
)
4825 struct diff_filespec
*one
, *two
;
4827 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
4830 /* This may look odd, but it is a preparation for
4831 * feeding "there are unchanged files which should
4832 * not produce diffs, but when you are doing copy
4833 * detection you would need them, so here they are"
4834 * entries to the diff-core. They will be prefixed
4835 * with something like '=' or '*' (I haven't decided
4836 * which but should not make any difference).
4837 * Feeding the same new and old to diff_change()
4838 * also has the same effect.
4839 * Before the final output happens, they are pruned after
4840 * merged into rename/copy pairs as appropriate.
4842 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
4843 addremove
= (addremove
== '+' ? '-' :
4844 addremove
== '-' ? '+' : addremove
);
4846 if (options
->prefix
&&
4847 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4850 one
= alloc_filespec(concatpath
);
4851 two
= alloc_filespec(concatpath
);
4853 if (addremove
!= '+')
4854 fill_filespec(one
, sha1
, sha1_valid
, mode
);
4855 if (addremove
!= '-') {
4856 fill_filespec(two
, sha1
, sha1_valid
, mode
);
4857 two
->dirty_submodule
= dirty_submodule
;
4860 diff_queue(&diff_queued_diff
, one
, two
);
4861 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4862 DIFF_OPT_SET(options
, HAS_CHANGES
);
4865 void diff_change(struct diff_options
*options
,
4866 unsigned old_mode
, unsigned new_mode
,
4867 const unsigned char *old_sha1
,
4868 const unsigned char *new_sha1
,
4869 int old_sha1_valid
, int new_sha1_valid
,
4870 const char *concatpath
,
4871 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
4873 struct diff_filespec
*one
, *two
;
4874 struct diff_filepair
*p
;
4876 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
4877 is_submodule_ignored(concatpath
, options
))
4880 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
4882 const unsigned char *tmp_c
;
4883 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
4884 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
4885 tmp
= old_sha1_valid
; old_sha1_valid
= new_sha1_valid
;
4886 new_sha1_valid
= tmp
;
4887 tmp
= old_dirty_submodule
; old_dirty_submodule
= new_dirty_submodule
;
4888 new_dirty_submodule
= tmp
;
4891 if (options
->prefix
&&
4892 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4895 one
= alloc_filespec(concatpath
);
4896 two
= alloc_filespec(concatpath
);
4897 fill_filespec(one
, old_sha1
, old_sha1_valid
, old_mode
);
4898 fill_filespec(two
, new_sha1
, new_sha1_valid
, new_mode
);
4899 one
->dirty_submodule
= old_dirty_submodule
;
4900 two
->dirty_submodule
= new_dirty_submodule
;
4901 p
= diff_queue(&diff_queued_diff
, one
, two
);
4903 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4906 if (DIFF_OPT_TST(options
, QUICK
) && options
->skip_stat_unmatch
&&
4907 !diff_filespec_check_stat_unmatch(p
))
4910 DIFF_OPT_SET(options
, HAS_CHANGES
);
4913 struct diff_filepair
*diff_unmerge(struct diff_options
*options
, const char *path
)
4915 struct diff_filepair
*pair
;
4916 struct diff_filespec
*one
, *two
;
4918 if (options
->prefix
&&
4919 strncmp(path
, options
->prefix
, options
->prefix_length
))
4922 one
= alloc_filespec(path
);
4923 two
= alloc_filespec(path
);
4924 pair
= diff_queue(&diff_queued_diff
, one
, two
);
4925 pair
->is_unmerged
= 1;
4929 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
4932 struct diff_tempfile
*temp
;
4933 const char *argv
[3];
4934 const char **arg
= argv
;
4935 struct child_process child
;
4936 struct strbuf buf
= STRBUF_INIT
;
4939 temp
= prepare_temp_file(spec
->path
, spec
);
4941 *arg
++ = temp
->name
;
4944 memset(&child
, 0, sizeof(child
));
4945 child
.use_shell
= 1;
4948 if (start_command(&child
)) {
4953 if (strbuf_read(&buf
, child
.out
, 0) < 0)
4954 err
= error("error reading from textconv command '%s'", pgm
);
4957 if (finish_command(&child
) || err
) {
4958 strbuf_release(&buf
);
4964 return strbuf_detach(&buf
, outsize
);
4967 size_t fill_textconv(struct userdiff_driver
*driver
,
4968 struct diff_filespec
*df
,
4973 if (!driver
|| !driver
->textconv
) {
4974 if (!DIFF_FILE_VALID(df
)) {
4978 if (diff_populate_filespec(df
, 0))
4979 die("unable to read files to diff");
4984 if (driver
->textconv_cache
&& df
->sha1_valid
) {
4985 *outbuf
= notes_cache_get(driver
->textconv_cache
, df
->sha1
,
4991 *outbuf
= run_textconv(driver
->textconv
, df
, &size
);
4993 die("unable to read files to diff");
4995 if (driver
->textconv_cache
&& df
->sha1_valid
) {
4996 /* ignore errors, as we might be in a readonly repository */
4997 notes_cache_put(driver
->textconv_cache
, df
->sha1
, *outbuf
,
5000 * we could save up changes and flush them all at the end,
5001 * but we would need an extra call after all diffing is done.
5002 * Since generating a cache entry is the slow path anyway,
5003 * this extra overhead probably isn't a big deal.
5005 notes_cache_write(driver
->textconv_cache
);
5011 void setup_diff_pager(struct diff_options
*opt
)
5014 * If the user asked for our exit code, then either they want --quiet
5015 * or --exit-code. We should definitely not bother with a pager in the
5016 * former case, as we will generate no output. Since we still properly
5017 * report our exit code even when a pager is run, we _could_ run a
5018 * pager with --exit-code. But since we have not done so historically,
5019 * and because it is easy to find people oneline advising "git diff
5020 * --exit-code" in hooks and other scripts, we do not do so.
5022 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
5023 check_pager_config("diff") != 0)