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"
20 #ifdef NO_FAST_WORKING_DIRECTORY
21 #define FAST_WORKING_DIRECTORY 0
23 #define FAST_WORKING_DIRECTORY 1
26 static int diff_detect_rename_default
;
27 static int diff_rename_limit_default
= 400;
28 static int diff_suppress_blank_empty
;
29 static int diff_use_color_default
= -1;
30 static int diff_context_default
= 3;
31 static const char *diff_word_regex_cfg
;
32 static const char *external_diff_cmd_cfg
;
33 static const char *diff_order_file_cfg
;
34 int diff_auto_refresh_index
= 1;
35 static int diff_mnemonic_prefix
;
36 static int diff_no_prefix
;
37 static int diff_stat_graph_width
;
38 static int diff_dirstat_permille_default
= 30;
39 static struct diff_options default_diff_options
;
40 static long diff_algorithm
;
42 static char diff_colors
[][COLOR_MAXLEN
] = {
44 GIT_COLOR_NORMAL
, /* PLAIN */
45 GIT_COLOR_BOLD
, /* METAINFO */
46 GIT_COLOR_CYAN
, /* FRAGINFO */
47 GIT_COLOR_RED
, /* OLD */
48 GIT_COLOR_GREEN
, /* NEW */
49 GIT_COLOR_YELLOW
, /* COMMIT */
50 GIT_COLOR_BG_RED
, /* WHITESPACE */
51 GIT_COLOR_NORMAL
, /* FUNCINFO */
54 static int parse_diff_color_slot(const char *var
, int ofs
)
56 if (!strcasecmp(var
+ofs
, "plain"))
58 if (!strcasecmp(var
+ofs
, "meta"))
60 if (!strcasecmp(var
+ofs
, "frag"))
62 if (!strcasecmp(var
+ofs
, "old"))
64 if (!strcasecmp(var
+ofs
, "new"))
66 if (!strcasecmp(var
+ofs
, "commit"))
68 if (!strcasecmp(var
+ofs
, "whitespace"))
69 return DIFF_WHITESPACE
;
70 if (!strcasecmp(var
+ofs
, "func"))
75 static int parse_dirstat_params(struct diff_options
*options
, const char *params_string
,
76 struct strbuf
*errmsg
)
78 char *params_copy
= xstrdup(params_string
);
79 struct string_list params
= STRING_LIST_INIT_NODUP
;
84 string_list_split_in_place(¶ms
, params_copy
, ',', -1);
85 for (i
= 0; i
< params
.nr
; i
++) {
86 const char *p
= params
.items
[i
].string
;
87 if (!strcmp(p
, "changes")) {
88 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
89 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
90 } else if (!strcmp(p
, "lines")) {
91 DIFF_OPT_SET(options
, DIRSTAT_BY_LINE
);
92 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
93 } else if (!strcmp(p
, "files")) {
94 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
95 DIFF_OPT_SET(options
, DIRSTAT_BY_FILE
);
96 } else if (!strcmp(p
, "noncumulative")) {
97 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
98 } else if (!strcmp(p
, "cumulative")) {
99 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
100 } else if (isdigit(*p
)) {
102 int permille
= strtoul(p
, &end
, 10) * 10;
103 if (*end
== '.' && isdigit(*++end
)) {
104 /* only use first digit */
105 permille
+= *end
- '0';
106 /* .. and ignore any further digits */
107 while (isdigit(*++end
))
111 options
->dirstat_permille
= permille
;
113 strbuf_addf(errmsg
, _(" Failed to parse dirstat cut-off percentage '%s'\n"),
118 strbuf_addf(errmsg
, _(" Unknown dirstat parameter '%s'\n"), p
);
123 string_list_clear(¶ms
, 0);
128 static int parse_submodule_params(struct diff_options
*options
, const char *value
)
130 if (!strcmp(value
, "log"))
131 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
132 else if (!strcmp(value
, "short"))
133 DIFF_OPT_CLR(options
, SUBMODULE_LOG
);
139 static int git_config_rename(const char *var
, const char *value
)
142 return DIFF_DETECT_RENAME
;
143 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
144 return DIFF_DETECT_COPY
;
145 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
148 long parse_algorithm_value(const char *value
)
152 else if (!strcasecmp(value
, "myers") || !strcasecmp(value
, "default"))
154 else if (!strcasecmp(value
, "minimal"))
155 return XDF_NEED_MINIMAL
;
156 else if (!strcasecmp(value
, "patience"))
157 return XDF_PATIENCE_DIFF
;
158 else if (!strcasecmp(value
, "histogram"))
159 return XDF_HISTOGRAM_DIFF
;
164 * These are to give UI layer defaults.
165 * The core-level commands such as git-diff-files should
166 * never be affected by the setting of diff.renames
167 * the user happens to have in the configuration file.
169 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
171 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
172 diff_use_color_default
= git_config_colorbool(var
, value
);
175 if (!strcmp(var
, "diff.context")) {
176 diff_context_default
= git_config_int(var
, value
);
177 if (diff_context_default
< 0)
181 if (!strcmp(var
, "diff.renames")) {
182 diff_detect_rename_default
= git_config_rename(var
, value
);
185 if (!strcmp(var
, "diff.autorefreshindex")) {
186 diff_auto_refresh_index
= git_config_bool(var
, value
);
189 if (!strcmp(var
, "diff.mnemonicprefix")) {
190 diff_mnemonic_prefix
= git_config_bool(var
, value
);
193 if (!strcmp(var
, "diff.noprefix")) {
194 diff_no_prefix
= git_config_bool(var
, value
);
197 if (!strcmp(var
, "diff.statgraphwidth")) {
198 diff_stat_graph_width
= git_config_int(var
, value
);
201 if (!strcmp(var
, "diff.external"))
202 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
203 if (!strcmp(var
, "diff.wordregex"))
204 return git_config_string(&diff_word_regex_cfg
, var
, value
);
205 if (!strcmp(var
, "diff.orderfile"))
206 return git_config_pathname(&diff_order_file_cfg
, var
, value
);
208 if (!strcmp(var
, "diff.ignoresubmodules"))
209 handle_ignore_submodules_arg(&default_diff_options
, value
);
211 if (!strcmp(var
, "diff.submodule")) {
212 if (parse_submodule_params(&default_diff_options
, value
))
213 warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
218 if (!strcmp(var
, "diff.algorithm")) {
219 diff_algorithm
= parse_algorithm_value(value
);
220 if (diff_algorithm
< 0)
225 if (git_color_config(var
, value
, cb
) < 0)
228 return git_diff_basic_config(var
, value
, cb
);
231 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
233 if (!strcmp(var
, "diff.renamelimit")) {
234 diff_rename_limit_default
= git_config_int(var
, value
);
238 if (userdiff_config(var
, value
) < 0)
241 if (starts_with(var
, "diff.color.") || starts_with(var
, "color.diff.")) {
242 int slot
= parse_diff_color_slot(var
, 11);
246 return config_error_nonbool(var
);
247 color_parse(value
, var
, diff_colors
[slot
]);
251 /* like GNU diff's --suppress-blank-empty option */
252 if (!strcmp(var
, "diff.suppressblankempty") ||
253 /* for backwards compatibility */
254 !strcmp(var
, "diff.suppress-blank-empty")) {
255 diff_suppress_blank_empty
= git_config_bool(var
, value
);
259 if (!strcmp(var
, "diff.dirstat")) {
260 struct strbuf errmsg
= STRBUF_INIT
;
261 default_diff_options
.dirstat_permille
= diff_dirstat_permille_default
;
262 if (parse_dirstat_params(&default_diff_options
, value
, &errmsg
))
263 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
265 strbuf_release(&errmsg
);
266 diff_dirstat_permille_default
= default_diff_options
.dirstat_permille
;
270 if (starts_with(var
, "submodule."))
271 return parse_submodule_config_option(var
, value
);
273 return git_default_config(var
, value
, cb
);
276 static char *quote_two(const char *one
, const char *two
)
278 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
279 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
280 struct strbuf res
= STRBUF_INIT
;
282 if (need_one
+ need_two
) {
283 strbuf_addch(&res
, '"');
284 quote_c_style(one
, &res
, NULL
, 1);
285 quote_c_style(two
, &res
, NULL
, 1);
286 strbuf_addch(&res
, '"');
288 strbuf_addstr(&res
, one
);
289 strbuf_addstr(&res
, two
);
291 return strbuf_detach(&res
, NULL
);
294 static const char *external_diff(void)
296 static const char *external_diff_cmd
= NULL
;
297 static int done_preparing
= 0;
300 return external_diff_cmd
;
301 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
302 if (!external_diff_cmd
)
303 external_diff_cmd
= external_diff_cmd_cfg
;
305 return external_diff_cmd
;
308 static struct diff_tempfile
{
309 const char *name
; /* filename external diff should read from */
312 char tmp_path
[PATH_MAX
];
315 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
317 struct emit_callback
{
320 int blank_at_eof_in_preimage
;
321 int blank_at_eof_in_postimage
;
323 int lno_in_postimage
;
324 sane_truncate_fn truncate
;
325 const char **label_path
;
326 struct diff_words_data
*diff_words
;
327 struct diff_options
*opt
;
329 struct strbuf
*header
;
332 static int count_lines(const char *data
, int size
)
334 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
341 completely_empty
= 0;
345 completely_empty
= 0;
348 if (completely_empty
)
351 count
++; /* no trailing newline */
355 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
357 if (!DIFF_FILE_VALID(one
)) {
358 mf
->ptr
= (char *)""; /* does not matter */
362 else if (diff_populate_filespec(one
, 0))
366 mf
->size
= one
->size
;
370 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
371 static unsigned long diff_filespec_size(struct diff_filespec
*one
)
373 if (!DIFF_FILE_VALID(one
))
375 diff_populate_filespec(one
, 1);
379 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
382 long size
= mf
->size
;
387 ptr
+= size
- 1; /* pointing at the very end */
389 ; /* incomplete line */
391 ptr
--; /* skip the last LF */
392 while (mf
->ptr
< ptr
) {
394 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
395 if (*prev_eol
== '\n')
397 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
405 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
406 struct emit_callback
*ecbdata
)
409 unsigned ws_rule
= ecbdata
->ws_rule
;
410 l1
= count_trailing_blank(mf1
, ws_rule
);
411 l2
= count_trailing_blank(mf2
, ws_rule
);
413 ecbdata
->blank_at_eof_in_preimage
= 0;
414 ecbdata
->blank_at_eof_in_postimage
= 0;
417 at
= count_lines(mf1
->ptr
, mf1
->size
);
418 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
420 at
= count_lines(mf2
->ptr
, mf2
->size
);
421 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
424 static void emit_line_0(struct diff_options
*o
, const char *set
, const char *reset
,
425 int first
, const char *line
, int len
)
427 int has_trailing_newline
, has_trailing_carriage_return
;
429 FILE *file
= o
->file
;
431 fputs(diff_line_prefix(o
), file
);
434 has_trailing_newline
= (first
== '\n');
435 has_trailing_carriage_return
= (!has_trailing_newline
&&
437 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
439 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
440 if (has_trailing_newline
)
442 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
443 if (has_trailing_carriage_return
)
448 if (len
|| !nofirst
) {
452 fwrite(line
, len
, 1, file
);
455 if (has_trailing_carriage_return
)
457 if (has_trailing_newline
)
461 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
462 const char *line
, int len
)
464 emit_line_0(o
, set
, reset
, line
[0], line
+1, len
-1);
467 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
469 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
470 ecbdata
->blank_at_eof_in_preimage
&&
471 ecbdata
->blank_at_eof_in_postimage
&&
472 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
473 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
475 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
478 static void emit_add_line(const char *reset
,
479 struct emit_callback
*ecbdata
,
480 const char *line
, int len
)
482 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
483 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
486 emit_line_0(ecbdata
->opt
, set
, reset
, '+', line
, len
);
487 else if (new_blank_line_at_eof(ecbdata
, line
, len
))
488 /* Blank line at EOF - paint '+' as well */
489 emit_line_0(ecbdata
->opt
, ws
, reset
, '+', line
, len
);
491 /* Emit just the prefix, then the rest. */
492 emit_line_0(ecbdata
->opt
, set
, reset
, '+', "", 0);
493 ws_check_emit(line
, len
, ecbdata
->ws_rule
,
494 ecbdata
->opt
->file
, set
, reset
, ws
);
498 static void emit_hunk_header(struct emit_callback
*ecbdata
,
499 const char *line
, int len
)
501 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
502 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
503 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
504 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
505 static const char atat
[2] = { '@', '@' };
507 struct strbuf msgbuf
= STRBUF_INIT
;
512 * As a hunk header must begin with "@@ -<old>, +<new> @@",
513 * it always is at least 10 bytes long.
516 memcmp(line
, atat
, 2) ||
517 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
518 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
521 ep
+= 2; /* skip over @@ */
523 /* The hunk header in fraginfo color */
524 strbuf_add(&msgbuf
, frag
, strlen(frag
));
525 strbuf_add(&msgbuf
, line
, ep
- line
);
526 strbuf_add(&msgbuf
, reset
, strlen(reset
));
532 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
535 /* blank before the func header */
536 for (cp
= ep
; ep
- line
< len
; ep
++)
537 if (*ep
!= ' ' && *ep
!= '\t')
540 strbuf_add(&msgbuf
, plain
, strlen(plain
));
541 strbuf_add(&msgbuf
, cp
, ep
- cp
);
542 strbuf_add(&msgbuf
, reset
, strlen(reset
));
545 if (ep
< line
+ len
) {
546 strbuf_add(&msgbuf
, func
, strlen(func
));
547 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
548 strbuf_add(&msgbuf
, reset
, strlen(reset
));
551 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
552 emit_line(ecbdata
->opt
, "", "", msgbuf
.buf
, msgbuf
.len
);
553 strbuf_release(&msgbuf
);
556 static struct diff_tempfile
*claim_diff_tempfile(void) {
558 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
559 if (!diff_temp
[i
].name
)
560 return diff_temp
+ i
;
561 die("BUG: diff is failing to clean up its tempfiles");
564 static int remove_tempfile_installed
;
566 static void remove_tempfile(void)
569 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
570 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
)
571 unlink_or_warn(diff_temp
[i
].name
);
572 diff_temp
[i
].name
= NULL
;
576 static void remove_tempfile_on_signal(int signo
)
583 static void print_line_count(FILE *file
, int count
)
587 fprintf(file
, "0,0");
593 fprintf(file
, "1,%d", count
);
598 static void emit_rewrite_lines(struct emit_callback
*ecb
,
599 int prefix
, const char *data
, int size
)
601 const char *endp
= NULL
;
602 static const char *nneof
= " No newline at end of file\n";
603 const char *old
= diff_get_color(ecb
->color_diff
, DIFF_FILE_OLD
);
604 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
609 endp
= memchr(data
, '\n', size
);
610 len
= endp
? (endp
- data
+ 1) : size
;
612 ecb
->lno_in_preimage
++;
613 emit_line_0(ecb
->opt
, old
, reset
, '-',
616 ecb
->lno_in_postimage
++;
617 emit_add_line(reset
, ecb
, data
, len
);
623 const char *plain
= diff_get_color(ecb
->color_diff
,
625 putc('\n', ecb
->opt
->file
);
626 emit_line_0(ecb
->opt
, plain
, reset
, '\\',
627 nneof
, strlen(nneof
));
631 static void emit_rewrite_diff(const char *name_a
,
633 struct diff_filespec
*one
,
634 struct diff_filespec
*two
,
635 struct userdiff_driver
*textconv_one
,
636 struct userdiff_driver
*textconv_two
,
637 struct diff_options
*o
)
640 const char *name_a_tab
, *name_b_tab
;
641 const char *metainfo
= diff_get_color(o
->use_color
, DIFF_METAINFO
);
642 const char *fraginfo
= diff_get_color(o
->use_color
, DIFF_FRAGINFO
);
643 const char *reset
= diff_get_color(o
->use_color
, DIFF_RESET
);
644 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
645 const char *a_prefix
, *b_prefix
;
646 char *data_one
, *data_two
;
647 size_t size_one
, size_two
;
648 struct emit_callback ecbdata
;
649 const char *line_prefix
= diff_line_prefix(o
);
651 if (diff_mnemonic_prefix
&& DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
652 a_prefix
= o
->b_prefix
;
653 b_prefix
= o
->a_prefix
;
655 a_prefix
= o
->a_prefix
;
656 b_prefix
= o
->b_prefix
;
659 name_a
+= (*name_a
== '/');
660 name_b
+= (*name_b
== '/');
661 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
662 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
664 strbuf_reset(&a_name
);
665 strbuf_reset(&b_name
);
666 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
667 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
669 size_one
= fill_textconv(textconv_one
, one
, &data_one
);
670 size_two
= fill_textconv(textconv_two
, two
, &data_two
);
672 memset(&ecbdata
, 0, sizeof(ecbdata
));
673 ecbdata
.color_diff
= want_color(o
->use_color
);
674 ecbdata
.found_changesp
= &o
->found_changes
;
675 ecbdata
.ws_rule
= whitespace_rule(name_b
);
677 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
679 mf1
.ptr
= (char *)data_one
;
680 mf2
.ptr
= (char *)data_two
;
683 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
685 ecbdata
.lno_in_preimage
= 1;
686 ecbdata
.lno_in_postimage
= 1;
688 lc_a
= count_lines(data_one
, size_one
);
689 lc_b
= count_lines(data_two
, size_two
);
691 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
692 line_prefix
, metainfo
, a_name
.buf
, name_a_tab
, reset
,
693 line_prefix
, metainfo
, b_name
.buf
, name_b_tab
, reset
,
694 line_prefix
, fraginfo
);
695 if (!o
->irreversible_delete
)
696 print_line_count(o
->file
, lc_a
);
698 fprintf(o
->file
, "?,?");
699 fprintf(o
->file
, " +");
700 print_line_count(o
->file
, lc_b
);
701 fprintf(o
->file
, " @@%s\n", reset
);
702 if (lc_a
&& !o
->irreversible_delete
)
703 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
705 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
707 free((char *)data_one
);
709 free((char *)data_two
);
712 struct diff_words_buffer
{
715 struct diff_words_orig
{
716 const char *begin
, *end
;
718 int orig_nr
, orig_alloc
;
721 static void diff_words_append(char *line
, unsigned long len
,
722 struct diff_words_buffer
*buffer
)
724 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
727 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
728 buffer
->text
.size
+= len
;
729 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
732 struct diff_words_style_elem
{
735 const char *color
; /* NULL; filled in by the setup code if
736 * color is enabled */
739 struct diff_words_style
{
740 enum diff_words_type type
;
741 struct diff_words_style_elem
new, old
, ctx
;
745 static struct diff_words_style diff_words_styles
[] = {
746 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
747 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
748 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
751 struct diff_words_data
{
752 struct diff_words_buffer minus
, plus
;
753 const char *current_plus
;
755 struct diff_options
*opt
;
757 enum diff_words_type type
;
758 struct diff_words_style
*style
;
761 static int fn_out_diff_words_write_helper(FILE *fp
,
762 struct diff_words_style_elem
*st_el
,
764 size_t count
, const char *buf
,
765 const char *line_prefix
)
770 char *p
= memchr(buf
, '\n', count
);
772 fputs(line_prefix
, fp
);
774 if (st_el
->color
&& fputs(st_el
->color
, fp
) < 0)
776 if (fputs(st_el
->prefix
, fp
) < 0 ||
777 fwrite(buf
, p
? p
- buf
: count
, 1, fp
) != 1 ||
778 fputs(st_el
->suffix
, fp
) < 0)
780 if (st_el
->color
&& *st_el
->color
781 && fputs(GIT_COLOR_RESET
, fp
) < 0)
786 if (fputs(newline
, fp
) < 0)
788 count
-= p
+ 1 - buf
;
796 * '--color-words' algorithm can be described as:
798 * 1. collect a the minus/plus lines of a diff hunk, divided into
799 * minus-lines and plus-lines;
801 * 2. break both minus-lines and plus-lines into words and
802 * place them into two mmfile_t with one word for each line;
804 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
806 * And for the common parts of the both file, we output the plus side text.
807 * diff_words->current_plus is used to trace the current position of the plus file
808 * which printed. diff_words->last_minus is used to trace the last minus word
811 * For '--graph' to work with '--color-words', we need to output the graph prefix
812 * on each line of color words output. Generally, there are two conditions on
813 * which we should output the prefix.
815 * 1. diff_words->last_minus == 0 &&
816 * diff_words->current_plus == diff_words->plus.text.ptr
818 * that is: the plus text must start as a new line, and if there is no minus
819 * word printed, a graph prefix must be printed.
821 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
822 * *(diff_words->current_plus - 1) == '\n'
824 * that is: a graph prefix must be printed following a '\n'
826 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
828 if ((diff_words
->last_minus
== 0 &&
829 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
830 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
831 *(diff_words
->current_plus
- 1) == '\n')) {
838 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
840 struct diff_words_data
*diff_words
= priv
;
841 struct diff_words_style
*style
= diff_words
->style
;
842 int minus_first
, minus_len
, plus_first
, plus_len
;
843 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
844 struct diff_options
*opt
= diff_words
->opt
;
845 const char *line_prefix
;
847 if (line
[0] != '@' || parse_hunk_header(line
, len
,
848 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
852 line_prefix
= diff_line_prefix(opt
);
854 /* POSIX requires that first be decremented by one if len == 0... */
856 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
858 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
860 minus_begin
= minus_end
=
861 diff_words
->minus
.orig
[minus_first
].end
;
864 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
865 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
867 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
869 if (color_words_output_graph_prefix(diff_words
)) {
870 fputs(line_prefix
, diff_words
->opt
->file
);
872 if (diff_words
->current_plus
!= plus_begin
) {
873 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
874 &style
->ctx
, style
->newline
,
875 plus_begin
- diff_words
->current_plus
,
876 diff_words
->current_plus
, line_prefix
);
877 if (*(plus_begin
- 1) == '\n')
878 fputs(line_prefix
, diff_words
->opt
->file
);
880 if (minus_begin
!= minus_end
) {
881 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
882 &style
->old
, style
->newline
,
883 minus_end
- minus_begin
, minus_begin
,
886 if (plus_begin
!= plus_end
) {
887 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
888 &style
->new, style
->newline
,
889 plus_end
- plus_begin
, plus_begin
,
893 diff_words
->current_plus
= plus_end
;
894 diff_words
->last_minus
= minus_first
;
897 /* This function starts looking at *begin, and returns 0 iff a word was found. */
898 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
899 int *begin
, int *end
)
901 if (word_regex
&& *begin
< buffer
->size
) {
903 if (!regexec(word_regex
, buffer
->ptr
+ *begin
, 1, match
, 0)) {
904 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
905 '\n', match
[0].rm_eo
- match
[0].rm_so
);
906 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
907 *begin
+= match
[0].rm_so
;
908 return *begin
>= *end
;
913 /* find the next word */
914 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
916 if (*begin
>= buffer
->size
)
919 /* find the end of the word */
921 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
928 * This function splits the words in buffer->text, stores the list with
929 * newline separator into out, and saves the offsets of the original words
932 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
941 /* fake an empty "0th" word */
942 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
943 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
946 for (i
= 0; i
< buffer
->text
.size
; i
++) {
947 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
950 /* store original boundaries */
951 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
953 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
954 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
958 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
959 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
960 out
->ptr
[out
->size
+ j
- i
] = '\n';
961 out
->size
+= j
- i
+ 1;
967 /* this executes the word diff on the accumulated buffers */
968 static void diff_words_show(struct diff_words_data
*diff_words
)
972 mmfile_t minus
, plus
;
973 struct diff_words_style
*style
= diff_words
->style
;
975 struct diff_options
*opt
= diff_words
->opt
;
976 const char *line_prefix
;
979 line_prefix
= diff_line_prefix(opt
);
981 /* special case: only removal */
982 if (!diff_words
->plus
.text
.size
) {
983 fputs(line_prefix
, diff_words
->opt
->file
);
984 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
985 &style
->old
, style
->newline
,
986 diff_words
->minus
.text
.size
,
987 diff_words
->minus
.text
.ptr
, line_prefix
);
988 diff_words
->minus
.text
.size
= 0;
992 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
993 diff_words
->last_minus
= 0;
995 memset(&xpp
, 0, sizeof(xpp
));
996 memset(&xecfg
, 0, sizeof(xecfg
));
997 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
998 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
1000 /* as only the hunk header will be parsed, we need a 0-context */
1002 xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
1006 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
1007 diff_words
->plus
.text
.size
) {
1008 if (color_words_output_graph_prefix(diff_words
))
1009 fputs(line_prefix
, diff_words
->opt
->file
);
1010 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
1011 &style
->ctx
, style
->newline
,
1012 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
1013 - diff_words
->current_plus
, diff_words
->current_plus
,
1016 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
1019 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
1020 static void diff_words_flush(struct emit_callback
*ecbdata
)
1022 if (ecbdata
->diff_words
->minus
.text
.size
||
1023 ecbdata
->diff_words
->plus
.text
.size
)
1024 diff_words_show(ecbdata
->diff_words
);
1027 static void diff_filespec_load_driver(struct diff_filespec
*one
)
1029 /* Use already-loaded driver */
1033 if (S_ISREG(one
->mode
))
1034 one
->driver
= userdiff_find_by_path(one
->path
);
1036 /* Fallback to default settings */
1038 one
->driver
= userdiff_find_by_name("default");
1041 static const char *userdiff_word_regex(struct diff_filespec
*one
)
1043 diff_filespec_load_driver(one
);
1044 return one
->driver
->word_regex
;
1047 static void init_diff_words_data(struct emit_callback
*ecbdata
,
1048 struct diff_options
*orig_opts
,
1049 struct diff_filespec
*one
,
1050 struct diff_filespec
*two
)
1053 struct diff_options
*o
= xmalloc(sizeof(struct diff_options
));
1054 memcpy(o
, orig_opts
, sizeof(struct diff_options
));
1056 ecbdata
->diff_words
=
1057 xcalloc(1, sizeof(struct diff_words_data
));
1058 ecbdata
->diff_words
->type
= o
->word_diff
;
1059 ecbdata
->diff_words
->opt
= o
;
1061 o
->word_regex
= userdiff_word_regex(one
);
1063 o
->word_regex
= userdiff_word_regex(two
);
1065 o
->word_regex
= diff_word_regex_cfg
;
1066 if (o
->word_regex
) {
1067 ecbdata
->diff_words
->word_regex
= (regex_t
*)
1068 xmalloc(sizeof(regex_t
));
1069 if (regcomp(ecbdata
->diff_words
->word_regex
,
1071 REG_EXTENDED
| REG_NEWLINE
))
1072 die ("Invalid regular expression: %s",
1075 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
1076 if (o
->word_diff
== diff_words_styles
[i
].type
) {
1077 ecbdata
->diff_words
->style
=
1078 &diff_words_styles
[i
];
1082 if (want_color(o
->use_color
)) {
1083 struct diff_words_style
*st
= ecbdata
->diff_words
->style
;
1084 st
->old
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1085 st
->new.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1086 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_PLAIN
);
1090 static void free_diff_words_data(struct emit_callback
*ecbdata
)
1092 if (ecbdata
->diff_words
) {
1093 diff_words_flush(ecbdata
);
1094 free (ecbdata
->diff_words
->opt
);
1095 free (ecbdata
->diff_words
->minus
.text
.ptr
);
1096 free (ecbdata
->diff_words
->minus
.orig
);
1097 free (ecbdata
->diff_words
->plus
.text
.ptr
);
1098 free (ecbdata
->diff_words
->plus
.orig
);
1099 if (ecbdata
->diff_words
->word_regex
) {
1100 regfree(ecbdata
->diff_words
->word_regex
);
1101 free(ecbdata
->diff_words
->word_regex
);
1103 free(ecbdata
->diff_words
);
1104 ecbdata
->diff_words
= NULL
;
1108 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
1110 if (want_color(diff_use_color
))
1111 return diff_colors
[ix
];
1115 const char *diff_line_prefix(struct diff_options
*opt
)
1117 struct strbuf
*msgbuf
;
1118 if (!opt
->output_prefix
)
1121 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
1125 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
1128 unsigned long allot
;
1132 return ecb
->truncate(line
, len
);
1136 (void) utf8_width(&cp
, &l
);
1138 break; /* truncated in the middle? */
1143 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
1146 ecbdata
->lno_in_preimage
= 0;
1147 ecbdata
->lno_in_postimage
= 0;
1148 p
= strchr(line
, '-');
1150 return; /* cannot happen */
1151 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
1154 return; /* cannot happen */
1155 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
1158 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
1160 struct emit_callback
*ecbdata
= priv
;
1161 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
1162 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
1163 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1164 struct diff_options
*o
= ecbdata
->opt
;
1165 const char *line_prefix
= diff_line_prefix(o
);
1167 if (ecbdata
->header
) {
1168 fprintf(ecbdata
->opt
->file
, "%s", ecbdata
->header
->buf
);
1169 strbuf_reset(ecbdata
->header
);
1170 ecbdata
->header
= NULL
;
1172 *(ecbdata
->found_changesp
) = 1;
1174 if (ecbdata
->label_path
[0]) {
1175 const char *name_a_tab
, *name_b_tab
;
1177 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
1178 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
1180 fprintf(ecbdata
->opt
->file
, "%s%s--- %s%s%s\n",
1181 line_prefix
, meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
1182 fprintf(ecbdata
->opt
->file
, "%s%s+++ %s%s%s\n",
1183 line_prefix
, meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
1184 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
1187 if (diff_suppress_blank_empty
1188 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
1193 if (line
[0] == '@') {
1194 if (ecbdata
->diff_words
)
1195 diff_words_flush(ecbdata
);
1196 len
= sane_truncate_line(ecbdata
, line
, len
);
1197 find_lno(line
, ecbdata
);
1198 emit_hunk_header(ecbdata
, line
, len
);
1199 if (line
[len
-1] != '\n')
1200 putc('\n', ecbdata
->opt
->file
);
1205 emit_line(ecbdata
->opt
, reset
, reset
, line
, len
);
1206 if (ecbdata
->diff_words
1207 && ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
)
1208 fputs("~\n", ecbdata
->opt
->file
);
1212 if (ecbdata
->diff_words
) {
1213 if (line
[0] == '-') {
1214 diff_words_append(line
, len
,
1215 &ecbdata
->diff_words
->minus
);
1217 } else if (line
[0] == '+') {
1218 diff_words_append(line
, len
,
1219 &ecbdata
->diff_words
->plus
);
1221 } else if (starts_with(line
, "\\ ")) {
1223 * Eat the "no newline at eof" marker as if we
1224 * saw a "+" or "-" line with nothing on it,
1225 * and return without diff_words_flush() to
1226 * defer processing. If this is the end of
1227 * preimage, more "+" lines may come after it.
1231 diff_words_flush(ecbdata
);
1232 if (ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
) {
1233 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
1234 fputs("~\n", ecbdata
->opt
->file
);
1237 * Skip the prefix character, if any. With
1238 * diff_suppress_blank_empty, there may be
1241 if (line
[0] != '\n') {
1245 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
1250 if (line
[0] != '+') {
1252 diff_get_color(ecbdata
->color_diff
,
1253 line
[0] == '-' ? DIFF_FILE_OLD
: DIFF_PLAIN
);
1254 ecbdata
->lno_in_preimage
++;
1256 ecbdata
->lno_in_postimage
++;
1257 emit_line(ecbdata
->opt
, color
, reset
, line
, len
);
1259 ecbdata
->lno_in_postimage
++;
1260 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
1264 static char *pprint_rename(const char *a
, const char *b
)
1266 const char *old
= a
;
1267 const char *new = b
;
1268 struct strbuf name
= STRBUF_INIT
;
1269 int pfx_length
, sfx_length
;
1270 int pfx_adjust_for_slash
;
1271 int len_a
= strlen(a
);
1272 int len_b
= strlen(b
);
1273 int a_midlen
, b_midlen
;
1274 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
1275 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
1277 if (qlen_a
|| qlen_b
) {
1278 quote_c_style(a
, &name
, NULL
, 0);
1279 strbuf_addstr(&name
, " => ");
1280 quote_c_style(b
, &name
, NULL
, 0);
1281 return strbuf_detach(&name
, NULL
);
1284 /* Find common prefix */
1286 while (*old
&& *new && *old
== *new) {
1288 pfx_length
= old
- a
+ 1;
1293 /* Find common suffix */
1298 * If there is a common prefix, it must end in a slash. In
1299 * that case we let this loop run 1 into the prefix to see the
1302 * If there is no common prefix, we cannot do this as it would
1303 * underrun the input strings.
1305 pfx_adjust_for_slash
= (pfx_length
? 1 : 0);
1306 while (a
+ pfx_length
- pfx_adjust_for_slash
<= old
&&
1307 b
+ pfx_length
- pfx_adjust_for_slash
<= new &&
1310 sfx_length
= len_a
- (old
- a
);
1316 * pfx{mid-a => mid-b}sfx
1317 * {pfx-a => pfx-b}sfx
1318 * pfx{sfx-a => sfx-b}
1321 a_midlen
= len_a
- pfx_length
- sfx_length
;
1322 b_midlen
= len_b
- pfx_length
- sfx_length
;
1328 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
1329 if (pfx_length
+ sfx_length
) {
1330 strbuf_add(&name
, a
, pfx_length
);
1331 strbuf_addch(&name
, '{');
1333 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
1334 strbuf_addstr(&name
, " => ");
1335 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
1336 if (pfx_length
+ sfx_length
) {
1337 strbuf_addch(&name
, '}');
1338 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
1340 return strbuf_detach(&name
, NULL
);
1346 struct diffstat_file
{
1350 unsigned is_unmerged
:1;
1351 unsigned is_binary
:1;
1352 unsigned is_renamed
:1;
1353 unsigned is_interesting
:1;
1354 uintmax_t added
, deleted
;
1358 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
1362 struct diffstat_file
*x
;
1363 x
= xcalloc(sizeof (*x
), 1);
1364 ALLOC_GROW(diffstat
->files
, diffstat
->nr
+ 1, diffstat
->alloc
);
1365 diffstat
->files
[diffstat
->nr
++] = x
;
1367 x
->from_name
= xstrdup(name_a
);
1368 x
->name
= xstrdup(name_b
);
1372 x
->from_name
= NULL
;
1373 x
->name
= xstrdup(name_a
);
1378 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
1380 struct diffstat_t
*diffstat
= priv
;
1381 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
1385 else if (line
[0] == '-')
1389 const char mime_boundary_leader
[] = "------------";
1391 static int scale_linear(int it
, int width
, int max_change
)
1396 * make sure that at least one '-' or '+' is printed if
1397 * there is any change to this path. The easiest way is to
1398 * scale linearly as if the alloted width is one column shorter
1399 * than it is, and then add 1 to the result.
1401 return 1 + (it
* (width
- 1) / max_change
);
1404 static void show_name(FILE *file
,
1405 const char *prefix
, const char *name
, int len
)
1407 fprintf(file
, " %s%-*s |", prefix
, len
, name
);
1410 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
1414 fprintf(file
, "%s", set
);
1417 fprintf(file
, "%s", reset
);
1420 static void fill_print_name(struct diffstat_file
*file
)
1424 if (file
->print_name
)
1427 if (!file
->is_renamed
) {
1428 struct strbuf buf
= STRBUF_INIT
;
1429 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
1430 pname
= strbuf_detach(&buf
, NULL
);
1433 strbuf_release(&buf
);
1436 pname
= pprint_rename(file
->from_name
, file
->name
);
1438 file
->print_name
= pname
;
1441 int print_stat_summary(FILE *fp
, int files
, int insertions
, int deletions
)
1443 struct strbuf sb
= STRBUF_INIT
;
1447 assert(insertions
== 0 && deletions
== 0);
1448 return fprintf(fp
, "%s\n", " 0 files changed");
1452 (files
== 1) ? " %d file changed" : " %d files changed",
1456 * For binary diff, the caller may want to print "x files
1457 * changed" with insertions == 0 && deletions == 0.
1459 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1460 * is probably less confusing (i.e skip over "2 files changed
1461 * but nothing about added/removed lines? Is this a bug in Git?").
1463 if (insertions
|| deletions
== 0) {
1465 (insertions
== 1) ? ", %d insertion(+)" : ", %d insertions(+)",
1469 if (deletions
|| insertions
== 0) {
1471 (deletions
== 1) ? ", %d deletion(-)" : ", %d deletions(-)",
1474 strbuf_addch(&sb
, '\n');
1475 ret
= fputs(sb
.buf
, fp
);
1476 strbuf_release(&sb
);
1480 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
1482 int i
, len
, add
, del
, adds
= 0, dels
= 0;
1483 uintmax_t max_change
= 0, max_len
= 0;
1484 int total_files
= data
->nr
, count
;
1485 int width
, name_width
, graph_width
, number_width
= 0, bin_width
= 0;
1486 const char *reset
, *add_c
, *del_c
;
1487 const char *line_prefix
= "";
1488 int extra_shown
= 0;
1493 line_prefix
= diff_line_prefix(options
);
1494 count
= options
->stat_count
? options
->stat_count
: data
->nr
;
1496 reset
= diff_get_color_opt(options
, DIFF_RESET
);
1497 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
1498 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
1501 * Find the longest filename and max number of changes
1503 for (i
= 0; (i
< count
) && (i
< data
->nr
); i
++) {
1504 struct diffstat_file
*file
= data
->files
[i
];
1505 uintmax_t change
= file
->added
+ file
->deleted
;
1507 if (!file
->is_interesting
&& (change
== 0)) {
1508 count
++; /* not shown == room for one more */
1511 fill_print_name(file
);
1512 len
= strlen(file
->print_name
);
1516 if (file
->is_unmerged
) {
1517 /* "Unmerged" is 8 characters */
1518 bin_width
= bin_width
< 8 ? 8 : bin_width
;
1521 if (file
->is_binary
) {
1522 /* "Bin XXX -> YYY bytes" */
1523 int w
= 14 + decimal_width(file
->added
)
1524 + decimal_width(file
->deleted
);
1525 bin_width
= bin_width
< w
? w
: bin_width
;
1526 /* Display change counts aligned with "Bin" */
1531 if (max_change
< change
)
1532 max_change
= change
;
1534 count
= i
; /* where we can stop scanning in data->files[] */
1537 * We have width = stat_width or term_columns() columns total.
1538 * We want a maximum of min(max_len, stat_name_width) for the name part.
1539 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1540 * We also need 1 for " " and 4 + decimal_width(max_change)
1541 * for " | NNNN " and one the empty column at the end, altogether
1542 * 6 + decimal_width(max_change).
1544 * If there's not enough space, we will use the smaller of
1545 * stat_name_width (if set) and 5/8*width for the filename,
1546 * and the rest for constant elements + graph part, but no more
1547 * than stat_graph_width for the graph part.
1548 * (5/8 gives 50 for filename and 30 for the constant parts + graph
1549 * for the standard terminal size).
1551 * In other words: stat_width limits the maximum width, and
1552 * stat_name_width fixes the maximum width of the filename,
1553 * and is also used to divide available columns if there
1556 * Binary files are displayed with "Bin XXX -> YYY bytes"
1557 * instead of the change count and graph. This part is treated
1558 * similarly to the graph part, except that it is not
1559 * "scaled". If total width is too small to accommodate the
1560 * guaranteed minimum width of the filename part and the
1561 * separators and this message, this message will "overflow"
1562 * making the line longer than the maximum width.
1565 if (options
->stat_width
== -1)
1566 width
= term_columns() - options
->output_prefix_length
;
1568 width
= options
->stat_width
? options
->stat_width
: 80;
1569 number_width
= decimal_width(max_change
) > number_width
?
1570 decimal_width(max_change
) : number_width
;
1572 if (options
->stat_graph_width
== -1)
1573 options
->stat_graph_width
= diff_stat_graph_width
;
1576 * Guarantee 3/8*16==6 for the graph part
1577 * and 5/8*16==10 for the filename part
1579 if (width
< 16 + 6 + number_width
)
1580 width
= 16 + 6 + number_width
;
1583 * First assign sizes that are wanted, ignoring available width.
1584 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1585 * starting from "XXX" should fit in graph_width.
1587 graph_width
= max_change
+ 4 > bin_width
? max_change
: bin_width
- 4;
1588 if (options
->stat_graph_width
&&
1589 options
->stat_graph_width
< graph_width
)
1590 graph_width
= options
->stat_graph_width
;
1592 name_width
= (options
->stat_name_width
> 0 &&
1593 options
->stat_name_width
< max_len
) ?
1594 options
->stat_name_width
: max_len
;
1597 * Adjust adjustable widths not to exceed maximum width
1599 if (name_width
+ number_width
+ 6 + graph_width
> width
) {
1600 if (graph_width
> width
* 3/8 - number_width
- 6) {
1601 graph_width
= width
* 3/8 - number_width
- 6;
1602 if (graph_width
< 6)
1606 if (options
->stat_graph_width
&&
1607 graph_width
> options
->stat_graph_width
)
1608 graph_width
= options
->stat_graph_width
;
1609 if (name_width
> width
- number_width
- 6 - graph_width
)
1610 name_width
= width
- number_width
- 6 - graph_width
;
1612 graph_width
= width
- number_width
- 6 - name_width
;
1616 * From here name_width is the width of the name area,
1617 * and graph_width is the width of the graph area.
1618 * max_change is used to scale graph properly.
1620 for (i
= 0; i
< count
; i
++) {
1621 const char *prefix
= "";
1622 struct diffstat_file
*file
= data
->files
[i
];
1623 char *name
= file
->print_name
;
1624 uintmax_t added
= file
->added
;
1625 uintmax_t deleted
= file
->deleted
;
1628 if (!file
->is_interesting
&& (added
+ deleted
== 0))
1632 * "scale" the filename
1635 name_len
= strlen(name
);
1636 if (name_width
< name_len
) {
1640 name
+= name_len
- len
;
1641 slash
= strchr(name
, '/');
1646 if (file
->is_binary
) {
1647 fprintf(options
->file
, "%s", line_prefix
);
1648 show_name(options
->file
, prefix
, name
, len
);
1649 fprintf(options
->file
, " %*s", number_width
, "Bin");
1650 if (!added
&& !deleted
) {
1651 putc('\n', options
->file
);
1654 fprintf(options
->file
, " %s%"PRIuMAX
"%s",
1655 del_c
, deleted
, reset
);
1656 fprintf(options
->file
, " -> ");
1657 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1658 add_c
, added
, reset
);
1659 fprintf(options
->file
, " bytes");
1660 fprintf(options
->file
, "\n");
1663 else if (file
->is_unmerged
) {
1664 fprintf(options
->file
, "%s", line_prefix
);
1665 show_name(options
->file
, prefix
, name
, len
);
1666 fprintf(options
->file
, " Unmerged\n");
1671 * scale the add/delete
1676 if (graph_width
<= max_change
) {
1677 int total
= scale_linear(add
+ del
, graph_width
, max_change
);
1678 if (total
< 2 && add
&& del
)
1679 /* width >= 2 due to the sanity check */
1682 add
= scale_linear(add
, graph_width
, max_change
);
1685 del
= scale_linear(del
, graph_width
, max_change
);
1689 fprintf(options
->file
, "%s", line_prefix
);
1690 show_name(options
->file
, prefix
, name
, len
);
1691 fprintf(options
->file
, " %*"PRIuMAX
"%s",
1692 number_width
, added
+ deleted
,
1693 added
+ deleted
? " " : "");
1694 show_graph(options
->file
, '+', add
, add_c
, reset
);
1695 show_graph(options
->file
, '-', del
, del_c
, reset
);
1696 fprintf(options
->file
, "\n");
1699 for (i
= 0; i
< data
->nr
; i
++) {
1700 struct diffstat_file
*file
= data
->files
[i
];
1701 uintmax_t added
= file
->added
;
1702 uintmax_t deleted
= file
->deleted
;
1704 if (file
->is_unmerged
||
1705 (!file
->is_interesting
&& (added
+ deleted
== 0))) {
1710 if (!file
->is_binary
) {
1717 fprintf(options
->file
, "%s ...\n", line_prefix
);
1720 fprintf(options
->file
, "%s", line_prefix
);
1721 print_stat_summary(options
->file
, total_files
, adds
, dels
);
1724 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
1726 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
1731 for (i
= 0; i
< data
->nr
; i
++) {
1732 int added
= data
->files
[i
]->added
;
1733 int deleted
= data
->files
[i
]->deleted
;
1735 if (data
->files
[i
]->is_unmerged
||
1736 (!data
->files
[i
]->is_interesting
&& (added
+ deleted
== 0))) {
1738 } else if (!data
->files
[i
]->is_binary
) { /* don't count bytes */
1743 fprintf(options
->file
, "%s", diff_line_prefix(options
));
1744 print_stat_summary(options
->file
, total_files
, adds
, dels
);
1747 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
1754 for (i
= 0; i
< data
->nr
; i
++) {
1755 struct diffstat_file
*file
= data
->files
[i
];
1757 fprintf(options
->file
, "%s", diff_line_prefix(options
));
1759 if (file
->is_binary
)
1760 fprintf(options
->file
, "-\t-\t");
1762 fprintf(options
->file
,
1763 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
1764 file
->added
, file
->deleted
);
1765 if (options
->line_termination
) {
1766 fill_print_name(file
);
1767 if (!file
->is_renamed
)
1768 write_name_quoted(file
->name
, options
->file
,
1769 options
->line_termination
);
1771 fputs(file
->print_name
, options
->file
);
1772 putc(options
->line_termination
, options
->file
);
1775 if (file
->is_renamed
) {
1776 putc('\0', options
->file
);
1777 write_name_quoted(file
->from_name
, options
->file
, '\0');
1779 write_name_quoted(file
->name
, options
->file
, '\0');
1784 struct dirstat_file
{
1786 unsigned long changed
;
1789 struct dirstat_dir
{
1790 struct dirstat_file
*files
;
1791 int alloc
, nr
, permille
, cumulative
;
1794 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
1795 unsigned long changed
, const char *base
, int baselen
)
1797 unsigned long this_dir
= 0;
1798 unsigned int sources
= 0;
1799 const char *line_prefix
= diff_line_prefix(opt
);
1802 struct dirstat_file
*f
= dir
->files
;
1803 int namelen
= strlen(f
->name
);
1807 if (namelen
< baselen
)
1809 if (memcmp(f
->name
, base
, baselen
))
1811 slash
= strchr(f
->name
+ baselen
, '/');
1813 int newbaselen
= slash
+ 1 - f
->name
;
1814 this = gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
1826 * We don't report dirstat's for
1828 * - or cases where everything came from a single directory
1829 * under this directory (sources == 1).
1831 if (baselen
&& sources
!= 1) {
1833 int permille
= this_dir
* 1000 / changed
;
1834 if (permille
>= dir
->permille
) {
1835 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
1836 permille
/ 10, permille
% 10, baselen
, base
);
1837 if (!dir
->cumulative
)
1845 static int dirstat_compare(const void *_a
, const void *_b
)
1847 const struct dirstat_file
*a
= _a
;
1848 const struct dirstat_file
*b
= _b
;
1849 return strcmp(a
->name
, b
->name
);
1852 static void show_dirstat(struct diff_options
*options
)
1855 unsigned long changed
;
1856 struct dirstat_dir dir
;
1857 struct diff_queue_struct
*q
= &diff_queued_diff
;
1862 dir
.permille
= options
->dirstat_permille
;
1863 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1866 for (i
= 0; i
< q
->nr
; i
++) {
1867 struct diff_filepair
*p
= q
->queue
[i
];
1869 unsigned long copied
, added
, damage
;
1870 int content_changed
;
1872 name
= p
->two
->path
? p
->two
->path
: p
->one
->path
;
1874 if (p
->one
->sha1_valid
&& p
->two
->sha1_valid
)
1875 content_changed
= hashcmp(p
->one
->sha1
, p
->two
->sha1
);
1877 content_changed
= 1;
1879 if (!content_changed
) {
1881 * The SHA1 has not changed, so pre-/post-content is
1882 * identical. We can therefore skip looking at the
1883 * file contents altogether.
1889 if (DIFF_OPT_TST(options
, DIRSTAT_BY_FILE
)) {
1891 * In --dirstat-by-file mode, we don't really need to
1892 * look at the actual file contents at all.
1893 * The fact that the SHA1 changed is enough for us to
1894 * add this file to the list of results
1895 * (with each file contributing equal damage).
1901 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1902 diff_populate_filespec(p
->one
, 0);
1903 diff_populate_filespec(p
->two
, 0);
1904 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1906 diff_free_filespec_data(p
->one
);
1907 diff_free_filespec_data(p
->two
);
1908 } else if (DIFF_FILE_VALID(p
->one
)) {
1909 diff_populate_filespec(p
->one
, 1);
1911 diff_free_filespec_data(p
->one
);
1912 } else if (DIFF_FILE_VALID(p
->two
)) {
1913 diff_populate_filespec(p
->two
, 1);
1915 added
= p
->two
->size
;
1916 diff_free_filespec_data(p
->two
);
1921 * Original minus copied is the removed material,
1922 * added is the new material. They are both damages
1923 * made to the preimage.
1924 * If the resulting damage is zero, we know that
1925 * diffcore_count_changes() considers the two entries to
1926 * be identical, but since content_changed is true, we
1927 * know that there must have been _some_ kind of change,
1928 * so we force all entries to have damage > 0.
1930 damage
= (p
->one
->size
- copied
) + added
;
1935 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1936 dir
.files
[dir
.nr
].name
= name
;
1937 dir
.files
[dir
.nr
].changed
= damage
;
1942 /* This can happen even with many files, if everything was renames */
1946 /* Show all directories with more than x% of the changes */
1947 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1948 gather_dirstat(options
, &dir
, changed
, "", 0);
1951 static void show_dirstat_by_line(struct diffstat_t
*data
, struct diff_options
*options
)
1954 unsigned long changed
;
1955 struct dirstat_dir dir
;
1963 dir
.permille
= options
->dirstat_permille
;
1964 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1967 for (i
= 0; i
< data
->nr
; i
++) {
1968 struct diffstat_file
*file
= data
->files
[i
];
1969 unsigned long damage
= file
->added
+ file
->deleted
;
1970 if (file
->is_binary
)
1972 * binary files counts bytes, not lines. Must find some
1973 * way to normalize binary bytes vs. textual lines.
1974 * The following heuristic assumes that there are 64
1976 * This is stupid and ugly, but very cheap...
1978 damage
= (damage
+ 63) / 64;
1979 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1980 dir
.files
[dir
.nr
].name
= file
->name
;
1981 dir
.files
[dir
.nr
].changed
= damage
;
1986 /* This can happen even with many files, if everything was renames */
1990 /* Show all directories with more than x% of the changes */
1991 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1992 gather_dirstat(options
, &dir
, changed
, "", 0);
1995 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1998 for (i
= 0; i
< diffstat
->nr
; i
++) {
1999 struct diffstat_file
*f
= diffstat
->files
[i
];
2000 if (f
->name
!= f
->print_name
)
2001 free(f
->print_name
);
2006 free(diffstat
->files
);
2009 struct checkdiff_t
{
2010 const char *filename
;
2012 int conflict_marker_size
;
2013 struct diff_options
*o
;
2018 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
2023 if (len
< marker_size
+ 1)
2025 firstchar
= line
[0];
2026 switch (firstchar
) {
2027 case '=': case '>': case '<': case '|':
2032 for (cnt
= 1; cnt
< marker_size
; cnt
++)
2033 if (line
[cnt
] != firstchar
)
2035 /* line[1] thru line[marker_size-1] are same as firstchar */
2036 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
2041 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
2043 struct checkdiff_t
*data
= priv
;
2044 int marker_size
= data
->conflict_marker_size
;
2045 const char *ws
= diff_get_color(data
->o
->use_color
, DIFF_WHITESPACE
);
2046 const char *reset
= diff_get_color(data
->o
->use_color
, DIFF_RESET
);
2047 const char *set
= diff_get_color(data
->o
->use_color
, DIFF_FILE_NEW
);
2049 const char *line_prefix
;
2052 line_prefix
= diff_line_prefix(data
->o
);
2054 if (line
[0] == '+') {
2057 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
2059 fprintf(data
->o
->file
,
2060 "%s%s:%d: leftover conflict marker\n",
2061 line_prefix
, data
->filename
, data
->lineno
);
2063 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
2066 data
->status
|= bad
;
2067 err
= whitespace_error_string(bad
);
2068 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
2069 line_prefix
, data
->filename
, data
->lineno
, err
);
2071 emit_line(data
->o
, set
, reset
, line
, 1);
2072 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
2073 data
->o
->file
, set
, reset
, ws
);
2074 } else if (line
[0] == ' ') {
2076 } else if (line
[0] == '@') {
2077 char *plus
= strchr(line
, '+');
2079 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
2081 die("invalid diff");
2085 static unsigned char *deflate_it(char *data
,
2087 unsigned long *result_size
)
2090 unsigned char *deflated
;
2093 memset(&stream
, 0, sizeof(stream
));
2094 git_deflate_init(&stream
, zlib_compression_level
);
2095 bound
= git_deflate_bound(&stream
, size
);
2096 deflated
= xmalloc(bound
);
2097 stream
.next_out
= deflated
;
2098 stream
.avail_out
= bound
;
2100 stream
.next_in
= (unsigned char *)data
;
2101 stream
.avail_in
= size
;
2102 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
2104 git_deflate_end(&stream
);
2105 *result_size
= stream
.total_out
;
2109 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
,
2116 unsigned long orig_size
;
2117 unsigned long delta_size
;
2118 unsigned long deflate_size
;
2119 unsigned long data_size
;
2121 /* We could do deflated delta, or we could do just deflated two,
2122 * whichever is smaller.
2125 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
2126 if (one
->size
&& two
->size
) {
2127 delta
= diff_delta(one
->ptr
, one
->size
,
2128 two
->ptr
, two
->size
,
2129 &delta_size
, deflate_size
);
2131 void *to_free
= delta
;
2132 orig_size
= delta_size
;
2133 delta
= deflate_it(delta
, delta_size
, &delta_size
);
2138 if (delta
&& delta_size
< deflate_size
) {
2139 fprintf(file
, "%sdelta %lu\n", prefix
, orig_size
);
2142 data_size
= delta_size
;
2145 fprintf(file
, "%sliteral %lu\n", prefix
, two
->size
);
2148 data_size
= deflate_size
;
2151 /* emit data encoded in base85 */
2154 int bytes
= (52 < data_size
) ? 52 : data_size
;
2158 line
[0] = bytes
+ 'A' - 1;
2160 line
[0] = bytes
- 26 + 'a' - 1;
2161 encode_85(line
+ 1, cp
, bytes
);
2162 cp
= (char *) cp
+ bytes
;
2163 fprintf(file
, "%s", prefix
);
2167 fprintf(file
, "%s\n", prefix
);
2171 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
,
2174 fprintf(file
, "%sGIT binary patch\n", prefix
);
2175 emit_binary_diff_body(file
, one
, two
, prefix
);
2176 emit_binary_diff_body(file
, two
, one
, prefix
);
2179 int diff_filespec_is_binary(struct diff_filespec
*one
)
2181 if (one
->is_binary
== -1) {
2182 diff_filespec_load_driver(one
);
2183 if (one
->driver
->binary
!= -1)
2184 one
->is_binary
= one
->driver
->binary
;
2186 if (!one
->data
&& DIFF_FILE_VALID(one
))
2187 diff_populate_filespec(one
, 0);
2189 one
->is_binary
= buffer_is_binary(one
->data
,
2191 if (one
->is_binary
== -1)
2195 return one
->is_binary
;
2198 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
2200 diff_filespec_load_driver(one
);
2201 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
2204 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
2206 if (!options
->a_prefix
)
2207 options
->a_prefix
= a
;
2208 if (!options
->b_prefix
)
2209 options
->b_prefix
= b
;
2212 struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
2214 if (!DIFF_FILE_VALID(one
))
2217 diff_filespec_load_driver(one
);
2218 return userdiff_get_textconv(one
->driver
);
2221 static void builtin_diff(const char *name_a
,
2223 struct diff_filespec
*one
,
2224 struct diff_filespec
*two
,
2225 const char *xfrm_msg
,
2226 int must_show_header
,
2227 struct diff_options
*o
,
2228 int complete_rewrite
)
2232 char *a_one
, *b_two
;
2233 const char *meta
= diff_get_color_opt(o
, DIFF_METAINFO
);
2234 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
2235 const char *a_prefix
, *b_prefix
;
2236 struct userdiff_driver
*textconv_one
= NULL
;
2237 struct userdiff_driver
*textconv_two
= NULL
;
2238 struct strbuf header
= STRBUF_INIT
;
2239 const char *line_prefix
= diff_line_prefix(o
);
2241 if (DIFF_OPT_TST(o
, SUBMODULE_LOG
) &&
2242 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
2243 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
2244 const char *del
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2245 const char *add
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2246 show_submodule_summary(o
->file
, one
->path
? one
->path
: two
->path
,
2248 one
->sha1
, two
->sha1
, two
->dirty_submodule
,
2249 meta
, del
, add
, reset
);
2253 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
2254 textconv_one
= get_textconv(one
);
2255 textconv_two
= get_textconv(two
);
2258 diff_set_mnemonic_prefix(o
, "a/", "b/");
2259 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
2260 a_prefix
= o
->b_prefix
;
2261 b_prefix
= o
->a_prefix
;
2263 a_prefix
= o
->a_prefix
;
2264 b_prefix
= o
->b_prefix
;
2267 /* Never use a non-valid filename anywhere if at all possible */
2268 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
2269 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
2271 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
2272 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
2273 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
2274 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
2275 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, meta
, a_one
, b_two
, reset
);
2276 if (lbl
[0][0] == '/') {
2278 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
2280 strbuf_addstr(&header
, xfrm_msg
);
2281 must_show_header
= 1;
2283 else if (lbl
[1][0] == '/') {
2284 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
2286 strbuf_addstr(&header
, xfrm_msg
);
2287 must_show_header
= 1;
2290 if (one
->mode
!= two
->mode
) {
2291 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, meta
, one
->mode
, reset
);
2292 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, meta
, two
->mode
, reset
);
2293 must_show_header
= 1;
2296 strbuf_addstr(&header
, xfrm_msg
);
2299 * we do not run diff between different kind
2302 if ((one
->mode
^ two
->mode
) & S_IFMT
)
2303 goto free_ab_and_return
;
2304 if (complete_rewrite
&&
2305 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
2306 (textconv_two
|| !diff_filespec_is_binary(two
))) {
2307 fprintf(o
->file
, "%s", header
.buf
);
2308 strbuf_reset(&header
);
2309 emit_rewrite_diff(name_a
, name_b
, one
, two
,
2310 textconv_one
, textconv_two
, o
);
2311 o
->found_changes
= 1;
2312 goto free_ab_and_return
;
2316 if (o
->irreversible_delete
&& lbl
[1][0] == '/') {
2317 fprintf(o
->file
, "%s", header
.buf
);
2318 strbuf_reset(&header
);
2319 goto free_ab_and_return
;
2320 } else if (!DIFF_OPT_TST(o
, TEXT
) &&
2321 ( (!textconv_one
&& diff_filespec_is_binary(one
)) ||
2322 (!textconv_two
&& diff_filespec_is_binary(two
)) )) {
2323 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2324 die("unable to read files to diff");
2325 /* Quite common confusing case */
2326 if (mf1
.size
== mf2
.size
&&
2327 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
2328 if (must_show_header
)
2329 fprintf(o
->file
, "%s", header
.buf
);
2330 goto free_ab_and_return
;
2332 fprintf(o
->file
, "%s", header
.buf
);
2333 strbuf_reset(&header
);
2334 if (DIFF_OPT_TST(o
, BINARY
))
2335 emit_binary_diff(o
->file
, &mf1
, &mf2
, line_prefix
);
2337 fprintf(o
->file
, "%sBinary files %s and %s differ\n",
2338 line_prefix
, lbl
[0], lbl
[1]);
2339 o
->found_changes
= 1;
2341 /* Crazy xdl interfaces.. */
2342 const char *diffopts
= getenv("GIT_DIFF_OPTS");
2345 struct emit_callback ecbdata
;
2346 const struct userdiff_funcname
*pe
;
2348 if (must_show_header
) {
2349 fprintf(o
->file
, "%s", header
.buf
);
2350 strbuf_reset(&header
);
2353 mf1
.size
= fill_textconv(textconv_one
, one
, &mf1
.ptr
);
2354 mf2
.size
= fill_textconv(textconv_two
, two
, &mf2
.ptr
);
2356 pe
= diff_funcname_pattern(one
);
2358 pe
= diff_funcname_pattern(two
);
2360 memset(&xpp
, 0, sizeof(xpp
));
2361 memset(&xecfg
, 0, sizeof(xecfg
));
2362 memset(&ecbdata
, 0, sizeof(ecbdata
));
2363 ecbdata
.label_path
= lbl
;
2364 ecbdata
.color_diff
= want_color(o
->use_color
);
2365 ecbdata
.found_changesp
= &o
->found_changes
;
2366 ecbdata
.ws_rule
= whitespace_rule(name_b
);
2367 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
2368 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2370 ecbdata
.header
= header
.len
? &header
: NULL
;
2371 xpp
.flags
= o
->xdl_opts
;
2372 xecfg
.ctxlen
= o
->context
;
2373 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2374 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2375 if (DIFF_OPT_TST(o
, FUNCCONTEXT
))
2376 xecfg
.flags
|= XDL_EMIT_FUNCCONTEXT
;
2378 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
2381 else if (starts_with(diffopts
, "--unified="))
2382 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
2383 else if (starts_with(diffopts
, "-u"))
2384 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
2386 init_diff_words_data(&ecbdata
, o
, one
, two
);
2387 xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
2390 free_diff_words_data(&ecbdata
);
2395 xdiff_clear_find_func(&xecfg
);
2399 strbuf_release(&header
);
2400 diff_free_filespec_data(one
);
2401 diff_free_filespec_data(two
);
2407 static void builtin_diffstat(const char *name_a
, const char *name_b
,
2408 struct diff_filespec
*one
,
2409 struct diff_filespec
*two
,
2410 struct diffstat_t
*diffstat
,
2411 struct diff_options
*o
,
2412 struct diff_filepair
*p
)
2415 struct diffstat_file
*data
;
2417 int complete_rewrite
= 0;
2419 if (!DIFF_PAIR_UNMERGED(p
)) {
2420 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2421 complete_rewrite
= 1;
2424 data
= diffstat_add(diffstat
, name_a
, name_b
);
2425 data
->is_interesting
= p
->status
!= DIFF_STATUS_UNKNOWN
;
2428 data
->is_unmerged
= 1;
2432 same_contents
= !hashcmp(one
->sha1
, two
->sha1
);
2434 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
2435 data
->is_binary
= 1;
2436 if (same_contents
) {
2440 data
->added
= diff_filespec_size(two
);
2441 data
->deleted
= diff_filespec_size(one
);
2445 else if (complete_rewrite
) {
2446 diff_populate_filespec(one
, 0);
2447 diff_populate_filespec(two
, 0);
2448 data
->deleted
= count_lines(one
->data
, one
->size
);
2449 data
->added
= count_lines(two
->data
, two
->size
);
2452 else if (!same_contents
) {
2453 /* Crazy xdl interfaces.. */
2457 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2458 die("unable to read files to diff");
2460 memset(&xpp
, 0, sizeof(xpp
));
2461 memset(&xecfg
, 0, sizeof(xecfg
));
2462 xpp
.flags
= o
->xdl_opts
;
2463 xecfg
.ctxlen
= o
->context
;
2464 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2465 xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
2469 diff_free_filespec_data(one
);
2470 diff_free_filespec_data(two
);
2473 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
2474 const char *attr_path
,
2475 struct diff_filespec
*one
,
2476 struct diff_filespec
*two
,
2477 struct diff_options
*o
)
2480 struct checkdiff_t data
;
2485 memset(&data
, 0, sizeof(data
));
2486 data
.filename
= name_b
? name_b
: name_a
;
2489 data
.ws_rule
= whitespace_rule(attr_path
);
2490 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
2492 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2493 die("unable to read files to diff");
2496 * All the other codepaths check both sides, but not checking
2497 * the "old" side here is deliberate. We are checking the newly
2498 * introduced changes, and as long as the "new" side is text, we
2499 * can and should check what it introduces.
2501 if (diff_filespec_is_binary(two
))
2502 goto free_and_return
;
2504 /* Crazy xdl interfaces.. */
2508 memset(&xpp
, 0, sizeof(xpp
));
2509 memset(&xecfg
, 0, sizeof(xecfg
));
2510 xecfg
.ctxlen
= 1; /* at least one context line */
2512 xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
2515 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
2516 struct emit_callback ecbdata
;
2519 ecbdata
.ws_rule
= data
.ws_rule
;
2520 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2521 blank_at_eof
= ecbdata
.blank_at_eof_in_postimage
;
2526 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
2527 fprintf(o
->file
, "%s:%d: %s.\n",
2528 data
.filename
, blank_at_eof
, err
);
2529 data
.status
= 1; /* report errors */
2534 diff_free_filespec_data(one
);
2535 diff_free_filespec_data(two
);
2537 DIFF_OPT_SET(o
, CHECK_FAILED
);
2540 struct diff_filespec
*alloc_filespec(const char *path
)
2542 int namelen
= strlen(path
);
2543 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
2545 memset(spec
, 0, sizeof(*spec
));
2546 spec
->path
= (char *)(spec
+ 1);
2547 memcpy(spec
->path
, path
, namelen
+1);
2549 spec
->is_binary
= -1;
2553 void free_filespec(struct diff_filespec
*spec
)
2555 if (!--spec
->count
) {
2556 diff_free_filespec_data(spec
);
2561 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
2562 int sha1_valid
, unsigned short mode
)
2565 spec
->mode
= canon_mode(mode
);
2566 hashcpy(spec
->sha1
, sha1
);
2567 spec
->sha1_valid
= sha1_valid
;
2572 * Given a name and sha1 pair, if the index tells us the file in
2573 * the work tree has that object contents, return true, so that
2574 * prepare_temp_file() does not have to inflate and extract.
2576 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
2578 const struct cache_entry
*ce
;
2583 * We do not read the cache ourselves here, because the
2584 * benchmark with my previous version that always reads cache
2585 * shows that it makes things worse for diff-tree comparing
2586 * two linux-2.6 kernel trees in an already checked out work
2587 * tree. This is because most diff-tree comparisons deal with
2588 * only a small number of files, while reading the cache is
2589 * expensive for a large project, and its cost outweighs the
2590 * savings we get by not inflating the object to a temporary
2591 * file. Practically, this code only helps when we are used
2592 * by diff-cache --cached, which does read the cache before
2598 /* We want to avoid the working directory if our caller
2599 * doesn't need the data in a normal file, this system
2600 * is rather slow with its stat/open/mmap/close syscalls,
2601 * and the object is contained in a pack file. The pack
2602 * is probably already open and will be faster to obtain
2603 * the data through than the working directory. Loose
2604 * objects however would tend to be slower as they need
2605 * to be individually opened and inflated.
2607 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
))
2611 pos
= cache_name_pos(name
, len
);
2614 ce
= active_cache
[pos
];
2617 * This is not the sha1 we are looking for, or
2618 * unreusable because it is not a regular file.
2620 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
2624 * If ce is marked as "assume unchanged", there is no
2625 * guarantee that work tree matches what we are looking for.
2627 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
2631 * If ce matches the file in the work tree, we can reuse it.
2633 if (ce_uptodate(ce
) ||
2634 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
2640 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
2643 char *data
= xmalloc(100), *dirty
= "";
2645 /* Are we looking at the work tree? */
2646 if (s
->dirty_submodule
)
2649 len
= snprintf(data
, 100,
2650 "Subproject commit %s%s\n", sha1_to_hex(s
->sha1
), dirty
);
2662 * While doing rename detection and pickaxe operation, we may need to
2663 * grab the data for the blob (or file) for our own in-core comparison.
2664 * diff_filespec has data and size fields for this purpose.
2666 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
2670 * demote FAIL to WARN to allow inspecting the situation
2671 * instead of refusing.
2673 enum safe_crlf crlf_warn
= (safe_crlf
== SAFE_CRLF_FAIL
2677 if (!DIFF_FILE_VALID(s
))
2678 die("internal error: asking to populate invalid file.");
2679 if (S_ISDIR(s
->mode
))
2685 if (size_only
&& 0 < s
->size
)
2688 if (S_ISGITLINK(s
->mode
))
2689 return diff_populate_gitlink(s
, size_only
);
2691 if (!s
->sha1_valid
||
2692 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
2693 struct strbuf buf
= STRBUF_INIT
;
2697 if (lstat(s
->path
, &st
) < 0) {
2698 if (errno
== ENOENT
) {
2702 s
->data
= (char *)"";
2707 s
->size
= xsize_t(st
.st_size
);
2710 if (S_ISLNK(st
.st_mode
)) {
2711 struct strbuf sb
= STRBUF_INIT
;
2713 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
2716 s
->data
= strbuf_detach(&sb
, NULL
);
2722 fd
= open(s
->path
, O_RDONLY
);
2725 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2727 s
->should_munmap
= 1;
2730 * Convert from working tree format to canonical git format
2732 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, crlf_warn
)) {
2734 munmap(s
->data
, s
->size
);
2735 s
->should_munmap
= 0;
2736 s
->data
= strbuf_detach(&buf
, &size
);
2742 enum object_type type
;
2744 type
= sha1_object_info(s
->sha1
, &s
->size
);
2746 die("unable to read %s", sha1_to_hex(s
->sha1
));
2748 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
2750 die("unable to read %s", sha1_to_hex(s
->sha1
));
2757 void diff_free_filespec_blob(struct diff_filespec
*s
)
2761 else if (s
->should_munmap
)
2762 munmap(s
->data
, s
->size
);
2764 if (s
->should_free
|| s
->should_munmap
) {
2765 s
->should_free
= s
->should_munmap
= 0;
2770 void diff_free_filespec_data(struct diff_filespec
*s
)
2772 diff_free_filespec_blob(s
);
2777 static void prep_temp_blob(const char *path
, struct diff_tempfile
*temp
,
2780 const unsigned char *sha1
,
2784 struct strbuf buf
= STRBUF_INIT
;
2785 struct strbuf
template = STRBUF_INIT
;
2786 char *path_dup
= xstrdup(path
);
2787 const char *base
= basename(path_dup
);
2789 /* Generate "XXXXXX_basename.ext" */
2790 strbuf_addstr(&template, "XXXXXX_");
2791 strbuf_addstr(&template, base
);
2793 fd
= git_mkstemps(temp
->tmp_path
, PATH_MAX
, template.buf
,
2796 die_errno("unable to create temp-file");
2797 if (convert_to_working_tree(path
,
2798 (const char *)blob
, (size_t)size
, &buf
)) {
2802 if (write_in_full(fd
, blob
, size
) != size
)
2803 die_errno("unable to write temp-file");
2805 temp
->name
= temp
->tmp_path
;
2806 strcpy(temp
->hex
, sha1_to_hex(sha1
));
2808 sprintf(temp
->mode
, "%06o", mode
);
2809 strbuf_release(&buf
);
2810 strbuf_release(&template);
2814 static struct diff_tempfile
*prepare_temp_file(const char *name
,
2815 struct diff_filespec
*one
)
2817 struct diff_tempfile
*temp
= claim_diff_tempfile();
2819 if (!DIFF_FILE_VALID(one
)) {
2821 /* A '-' entry produces this for file-2, and
2822 * a '+' entry produces this for file-1.
2824 temp
->name
= "/dev/null";
2825 strcpy(temp
->hex
, ".");
2826 strcpy(temp
->mode
, ".");
2830 if (!remove_tempfile_installed
) {
2831 atexit(remove_tempfile
);
2832 sigchain_push_common(remove_tempfile_on_signal
);
2833 remove_tempfile_installed
= 1;
2836 if (!S_ISGITLINK(one
->mode
) &&
2837 (!one
->sha1_valid
||
2838 reuse_worktree_file(name
, one
->sha1
, 1))) {
2840 if (lstat(name
, &st
) < 0) {
2841 if (errno
== ENOENT
)
2842 goto not_a_valid_file
;
2843 die_errno("stat(%s)", name
);
2845 if (S_ISLNK(st
.st_mode
)) {
2846 struct strbuf sb
= STRBUF_INIT
;
2847 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
2848 die_errno("readlink(%s)", name
);
2849 prep_temp_blob(name
, temp
, sb
.buf
, sb
.len
,
2851 one
->sha1
: null_sha1
),
2853 one
->mode
: S_IFLNK
));
2854 strbuf_release(&sb
);
2857 /* we can borrow from the file in the work tree */
2859 if (!one
->sha1_valid
)
2860 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
2862 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
2863 /* Even though we may sometimes borrow the
2864 * contents from the work tree, we always want
2865 * one->mode. mode is trustworthy even when
2866 * !(one->sha1_valid), as long as
2867 * DIFF_FILE_VALID(one).
2869 sprintf(temp
->mode
, "%06o", one
->mode
);
2874 if (diff_populate_filespec(one
, 0))
2875 die("cannot read data blob for %s", one
->path
);
2876 prep_temp_blob(name
, temp
, one
->data
, one
->size
,
2877 one
->sha1
, one
->mode
);
2882 /* An external diff command takes:
2884 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2885 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2888 static void run_external_diff(const char *pgm
,
2891 struct diff_filespec
*one
,
2892 struct diff_filespec
*two
,
2893 const char *xfrm_msg
,
2894 int complete_rewrite
,
2895 struct diff_options
*o
)
2897 const char *spawn_arg
[10];
2899 const char **arg
= &spawn_arg
[0];
2900 struct diff_queue_struct
*q
= &diff_queued_diff
;
2901 const char *env
[3] = { NULL
};
2902 char env_counter
[50];
2906 struct diff_tempfile
*temp_one
, *temp_two
;
2907 const char *othername
= (other
? other
: name
);
2908 temp_one
= prepare_temp_file(name
, one
);
2909 temp_two
= prepare_temp_file(othername
, two
);
2912 *arg
++ = temp_one
->name
;
2913 *arg
++ = temp_one
->hex
;
2914 *arg
++ = temp_one
->mode
;
2915 *arg
++ = temp_two
->name
;
2916 *arg
++ = temp_two
->hex
;
2917 *arg
++ = temp_two
->mode
;
2929 env
[0] = env_counter
;
2930 snprintf(env_counter
, sizeof(env_counter
), "GIT_DIFF_PATH_COUNTER=%d",
2931 ++o
->diff_path_counter
);
2933 snprintf(env_total
, sizeof(env_total
), "GIT_DIFF_PATH_TOTAL=%d", q
->nr
);
2935 retval
= run_command_v_opt_cd_env(spawn_arg
, RUN_USING_SHELL
, NULL
, env
);
2938 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2943 static int similarity_index(struct diff_filepair
*p
)
2945 return p
->score
* 100 / MAX_SCORE
;
2948 static void fill_metainfo(struct strbuf
*msg
,
2951 struct diff_filespec
*one
,
2952 struct diff_filespec
*two
,
2953 struct diff_options
*o
,
2954 struct diff_filepair
*p
,
2955 int *must_show_header
,
2958 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
2959 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
2960 const char *line_prefix
= diff_line_prefix(o
);
2962 *must_show_header
= 1;
2963 strbuf_init(msg
, PATH_MAX
* 2 + 300);
2964 switch (p
->status
) {
2965 case DIFF_STATUS_COPIED
:
2966 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2967 line_prefix
, set
, similarity_index(p
));
2968 strbuf_addf(msg
, "%s\n%s%scopy from ",
2969 reset
, line_prefix
, set
);
2970 quote_c_style(name
, msg
, NULL
, 0);
2971 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
2972 quote_c_style(other
, msg
, NULL
, 0);
2973 strbuf_addf(msg
, "%s\n", reset
);
2975 case DIFF_STATUS_RENAMED
:
2976 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2977 line_prefix
, set
, similarity_index(p
));
2978 strbuf_addf(msg
, "%s\n%s%srename from ",
2979 reset
, line_prefix
, set
);
2980 quote_c_style(name
, msg
, NULL
, 0);
2981 strbuf_addf(msg
, "%s\n%s%srename to ",
2982 reset
, line_prefix
, set
);
2983 quote_c_style(other
, msg
, NULL
, 0);
2984 strbuf_addf(msg
, "%s\n", reset
);
2986 case DIFF_STATUS_MODIFIED
:
2988 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
2990 set
, similarity_index(p
), reset
);
2995 *must_show_header
= 0;
2997 if (one
&& two
&& hashcmp(one
->sha1
, two
->sha1
)) {
2998 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
3000 if (DIFF_OPT_TST(o
, BINARY
)) {
3002 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
3003 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
3006 strbuf_addf(msg
, "%s%sindex %s..", line_prefix
, set
,
3007 find_unique_abbrev(one
->sha1
, abbrev
));
3008 strbuf_addstr(msg
, find_unique_abbrev(two
->sha1
, abbrev
));
3009 if (one
->mode
== two
->mode
)
3010 strbuf_addf(msg
, " %06o", one
->mode
);
3011 strbuf_addf(msg
, "%s\n", reset
);
3015 static void run_diff_cmd(const char *pgm
,
3018 const char *attr_path
,
3019 struct diff_filespec
*one
,
3020 struct diff_filespec
*two
,
3022 struct diff_options
*o
,
3023 struct diff_filepair
*p
)
3025 const char *xfrm_msg
= NULL
;
3026 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
3027 int must_show_header
= 0;
3030 if (DIFF_OPT_TST(o
, ALLOW_EXTERNAL
)) {
3031 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
3032 if (drv
&& drv
->external
)
3033 pgm
= drv
->external
;
3038 * don't use colors when the header is intended for an
3039 * external diff driver
3041 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
3043 want_color(o
->use_color
) && !pgm
);
3044 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
3048 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
3049 complete_rewrite
, o
);
3053 builtin_diff(name
, other
? other
: name
,
3054 one
, two
, xfrm_msg
, must_show_header
,
3055 o
, complete_rewrite
);
3057 fprintf(o
->file
, "* Unmerged path %s\n", name
);
3060 static void diff_fill_sha1_info(struct diff_filespec
*one
)
3062 if (DIFF_FILE_VALID(one
)) {
3063 if (!one
->sha1_valid
) {
3065 if (one
->is_stdin
) {
3066 hashcpy(one
->sha1
, null_sha1
);
3069 if (lstat(one
->path
, &st
) < 0)
3070 die_errno("stat '%s'", one
->path
);
3071 if (index_path(one
->sha1
, one
->path
, &st
, 0))
3072 die("cannot hash %s", one
->path
);
3079 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
3081 /* Strip the prefix but do not molest /dev/null and absolute paths */
3082 if (*namep
&& **namep
!= '/') {
3083 *namep
+= prefix_length
;
3087 if (*otherp
&& **otherp
!= '/') {
3088 *otherp
+= prefix_length
;
3089 if (**otherp
== '/')
3094 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
3096 const char *pgm
= external_diff();
3098 struct diff_filespec
*one
= p
->one
;
3099 struct diff_filespec
*two
= p
->two
;
3102 const char *attr_path
;
3104 name
= p
->one
->path
;
3105 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3107 if (o
->prefix_length
)
3108 strip_prefix(o
->prefix_length
, &name
, &other
);
3110 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
3113 if (DIFF_PAIR_UNMERGED(p
)) {
3114 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
3115 NULL
, NULL
, NULL
, o
, p
);
3119 diff_fill_sha1_info(one
);
3120 diff_fill_sha1_info(two
);
3123 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
3124 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
3126 * a filepair that changes between file and symlink
3127 * needs to be split into deletion and creation.
3129 struct diff_filespec
*null
= alloc_filespec(two
->path
);
3130 run_diff_cmd(NULL
, name
, other
, attr_path
,
3131 one
, null
, &msg
, o
, p
);
3133 strbuf_release(&msg
);
3135 null
= alloc_filespec(one
->path
);
3136 run_diff_cmd(NULL
, name
, other
, attr_path
,
3137 null
, two
, &msg
, o
, p
);
3141 run_diff_cmd(pgm
, name
, other
, attr_path
,
3142 one
, two
, &msg
, o
, p
);
3144 strbuf_release(&msg
);
3147 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
3148 struct diffstat_t
*diffstat
)
3153 if (DIFF_PAIR_UNMERGED(p
)) {
3155 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, p
);
3159 name
= p
->one
->path
;
3160 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3162 if (o
->prefix_length
)
3163 strip_prefix(o
->prefix_length
, &name
, &other
);
3165 diff_fill_sha1_info(p
->one
);
3166 diff_fill_sha1_info(p
->two
);
3168 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, p
);
3171 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
3175 const char *attr_path
;
3177 if (DIFF_PAIR_UNMERGED(p
)) {
3182 name
= p
->one
->path
;
3183 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3184 attr_path
= other
? other
: name
;
3186 if (o
->prefix_length
)
3187 strip_prefix(o
->prefix_length
, &name
, &other
);
3189 diff_fill_sha1_info(p
->one
);
3190 diff_fill_sha1_info(p
->two
);
3192 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
3195 void diff_setup(struct diff_options
*options
)
3197 memcpy(options
, &default_diff_options
, sizeof(*options
));
3199 options
->file
= stdout
;
3201 options
->line_termination
= '\n';
3202 options
->break_opt
= -1;
3203 options
->rename_limit
= -1;
3204 options
->dirstat_permille
= diff_dirstat_permille_default
;
3205 options
->context
= diff_context_default
;
3206 DIFF_OPT_SET(options
, RENAME_EMPTY
);
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;
3330 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
3340 if (c
== arg_short
) {
3344 if (val
&& isdigit(c
)) {
3346 int n
= strtoul(arg
, &end
, 10);
3357 eq
= strchrnul(arg
, '=');
3359 if (!len
|| strncmp(arg
, arg_long
, len
))
3364 if (!isdigit(*++eq
))
3366 n
= strtoul(eq
, &end
, 10);
3374 static int diff_scoreopt_parse(const char *opt
);
3376 static inline int short_opt(char opt
, const char **argv
,
3377 const char **optarg
)
3379 const char *arg
= argv
[0];
3380 if (arg
[0] != '-' || arg
[1] != opt
)
3382 if (arg
[2] != '\0') {
3387 die("Option '%c' requires a value", opt
);
3392 int parse_long_opt(const char *opt
, const char **argv
,
3393 const char **optarg
)
3395 const char *arg
= argv
[0];
3396 if (arg
[0] != '-' || arg
[1] != '-')
3398 arg
+= strlen("--");
3399 if (!starts_with(arg
, opt
))
3402 if (*arg
== '=') { /* stuck form: --option=value */
3408 /* separate form: --option value */
3410 die("Option '--%s' requires a value", opt
);
3415 static int stat_opt(struct diff_options
*options
, const char **av
)
3417 const char *arg
= av
[0];
3419 int width
= options
->stat_width
;
3420 int name_width
= options
->stat_name_width
;
3421 int graph_width
= options
->stat_graph_width
;
3422 int count
= options
->stat_count
;
3425 arg
+= strlen("--stat");
3430 if (starts_with(arg
, "-width")) {
3431 arg
+= strlen("-width");
3433 width
= strtoul(arg
+ 1, &end
, 10);
3434 else if (!*arg
&& !av
[1])
3435 die("Option '--stat-width' requires a value");
3437 width
= strtoul(av
[1], &end
, 10);
3440 } else if (starts_with(arg
, "-name-width")) {
3441 arg
+= strlen("-name-width");
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 (starts_with(arg
, "-graph-width")) {
3451 arg
+= strlen("-graph-width");
3453 graph_width
= strtoul(arg
+ 1, &end
, 10);
3454 else if (!*arg
&& !av
[1])
3455 die("Option '--stat-graph-width' requires a value");
3457 graph_width
= strtoul(av
[1], &end
, 10);
3460 } else if (starts_with(arg
, "-count")) {
3461 arg
+= strlen("-count");
3463 count
= strtoul(arg
+ 1, &end
, 10);
3464 else if (!*arg
&& !av
[1])
3465 die("Option '--stat-count' requires a value");
3467 count
= strtoul(av
[1], &end
, 10);
3473 width
= strtoul(arg
+1, &end
, 10);
3475 name_width
= strtoul(end
+1, &end
, 10);
3477 count
= strtoul(end
+1, &end
, 10);
3480 /* Important! This checks all the error cases! */
3483 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
3484 options
->stat_name_width
= name_width
;
3485 options
->stat_graph_width
= graph_width
;
3486 options
->stat_width
= width
;
3487 options
->stat_count
= count
;
3491 static int parse_dirstat_opt(struct diff_options
*options
, const char *params
)
3493 struct strbuf errmsg
= STRBUF_INIT
;
3494 if (parse_dirstat_params(options
, params
, &errmsg
))
3495 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3497 strbuf_release(&errmsg
);
3499 * The caller knows a dirstat-related option is given from the command
3500 * line; allow it to say "return this_function();"
3502 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
3506 static int parse_submodule_opt(struct diff_options
*options
, const char *value
)
3508 if (parse_submodule_params(options
, value
))
3509 die(_("Failed to parse --submodule option parameter: '%s'"),
3514 static const char diff_status_letters
[] = {
3517 DIFF_STATUS_DELETED
,
3518 DIFF_STATUS_MODIFIED
,
3519 DIFF_STATUS_RENAMED
,
3520 DIFF_STATUS_TYPE_CHANGED
,
3521 DIFF_STATUS_UNKNOWN
,
3522 DIFF_STATUS_UNMERGED
,
3523 DIFF_STATUS_FILTER_AON
,
3524 DIFF_STATUS_FILTER_BROKEN
,
3528 static unsigned int filter_bit
['Z' + 1];
3530 static void prepare_filter_bits(void)
3534 if (!filter_bit
[DIFF_STATUS_ADDED
]) {
3535 for (i
= 0; diff_status_letters
[i
]; i
++)
3536 filter_bit
[(int) diff_status_letters
[i
]] = (1 << i
);
3540 static unsigned filter_bit_tst(char status
, const struct diff_options
*opt
)
3542 return opt
->filter
& filter_bit
[(int) status
];
3545 static int parse_diff_filter_opt(const char *optarg
, struct diff_options
*opt
)
3549 prepare_filter_bits();
3552 * If there is a negation e.g. 'd' in the input, and we haven't
3553 * initialized the filter field with another --diff-filter, start
3554 * from full set of bits, except for AON.
3557 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
3558 if (optch
< 'a' || 'z' < optch
)
3560 opt
->filter
= (1 << (ARRAY_SIZE(diff_status_letters
) - 1)) - 1;
3561 opt
->filter
&= ~filter_bit
[DIFF_STATUS_FILTER_AON
];
3566 for (i
= 0; (optch
= optarg
[i
]) != '\0'; i
++) {
3570 if ('a' <= optch
&& optch
<= 'z') {
3572 optch
= toupper(optch
);
3577 bit
= (0 <= optch
&& optch
<= 'Z') ? filter_bit
[optch
] : 0;
3581 opt
->filter
&= ~bit
;
3588 static void enable_patch_output(int *fmt
) {
3589 *fmt
&= ~DIFF_FORMAT_NO_OUTPUT
;
3590 *fmt
|= DIFF_FORMAT_PATCH
;
3593 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
3595 const char *arg
= av
[0];
3599 /* Output format options */
3600 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch")
3601 || opt_arg(arg
, 'U', "unified", &options
->context
))
3602 enable_patch_output(&options
->output_format
);
3603 else if (!strcmp(arg
, "--raw"))
3604 options
->output_format
|= DIFF_FORMAT_RAW
;
3605 else if (!strcmp(arg
, "--patch-with-raw")) {
3606 enable_patch_output(&options
->output_format
);
3607 options
->output_format
|= DIFF_FORMAT_RAW
;
3608 } else if (!strcmp(arg
, "--numstat"))
3609 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
3610 else if (!strcmp(arg
, "--shortstat"))
3611 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
3612 else if (!strcmp(arg
, "-X") || !strcmp(arg
, "--dirstat"))
3613 return parse_dirstat_opt(options
, "");
3614 else if (starts_with(arg
, "-X"))
3615 return parse_dirstat_opt(options
, arg
+ 2);
3616 else if (starts_with(arg
, "--dirstat="))
3617 return parse_dirstat_opt(options
, arg
+ 10);
3618 else if (!strcmp(arg
, "--cumulative"))
3619 return parse_dirstat_opt(options
, "cumulative");
3620 else if (!strcmp(arg
, "--dirstat-by-file"))
3621 return parse_dirstat_opt(options
, "files");
3622 else if (starts_with(arg
, "--dirstat-by-file=")) {
3623 parse_dirstat_opt(options
, "files");
3624 return parse_dirstat_opt(options
, arg
+ 18);
3626 else if (!strcmp(arg
, "--check"))
3627 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
3628 else if (!strcmp(arg
, "--summary"))
3629 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
3630 else if (!strcmp(arg
, "--patch-with-stat")) {
3631 enable_patch_output(&options
->output_format
);
3632 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
3633 } else if (!strcmp(arg
, "--name-only"))
3634 options
->output_format
|= DIFF_FORMAT_NAME
;
3635 else if (!strcmp(arg
, "--name-status"))
3636 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
3637 else if (!strcmp(arg
, "-s") || !strcmp(arg
, "--no-patch"))
3638 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
3639 else if (starts_with(arg
, "--stat"))
3640 /* --stat, --stat-width, --stat-name-width, or --stat-count */
3641 return stat_opt(options
, av
);
3643 /* renames options */
3644 else if (starts_with(arg
, "-B") || starts_with(arg
, "--break-rewrites=") ||
3645 !strcmp(arg
, "--break-rewrites")) {
3646 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
3647 return error("invalid argument to -B: %s", arg
+2);
3649 else if (starts_with(arg
, "-M") || starts_with(arg
, "--find-renames=") ||
3650 !strcmp(arg
, "--find-renames")) {
3651 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3652 return error("invalid argument to -M: %s", arg
+2);
3653 options
->detect_rename
= DIFF_DETECT_RENAME
;
3655 else if (!strcmp(arg
, "-D") || !strcmp(arg
, "--irreversible-delete")) {
3656 options
->irreversible_delete
= 1;
3658 else if (starts_with(arg
, "-C") || starts_with(arg
, "--find-copies=") ||
3659 !strcmp(arg
, "--find-copies")) {
3660 if (options
->detect_rename
== DIFF_DETECT_COPY
)
3661 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3662 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3663 return error("invalid argument to -C: %s", arg
+2);
3664 options
->detect_rename
= DIFF_DETECT_COPY
;
3666 else if (!strcmp(arg
, "--no-renames"))
3667 options
->detect_rename
= 0;
3668 else if (!strcmp(arg
, "--rename-empty"))
3669 DIFF_OPT_SET(options
, RENAME_EMPTY
);
3670 else if (!strcmp(arg
, "--no-rename-empty"))
3671 DIFF_OPT_CLR(options
, RENAME_EMPTY
);
3672 else if (!strcmp(arg
, "--relative"))
3673 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3674 else if (starts_with(arg
, "--relative=")) {
3675 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3676 options
->prefix
= arg
+ 11;
3680 else if (!strcmp(arg
, "--minimal"))
3681 DIFF_XDL_SET(options
, NEED_MINIMAL
);
3682 else if (!strcmp(arg
, "--no-minimal"))
3683 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
3684 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
3685 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
3686 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
3687 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
3688 else if (!strcmp(arg
, "--ignore-space-at-eol"))
3689 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
3690 else if (!strcmp(arg
, "--ignore-blank-lines"))
3691 DIFF_XDL_SET(options
, IGNORE_BLANK_LINES
);
3692 else if (!strcmp(arg
, "--patience"))
3693 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
3694 else if (!strcmp(arg
, "--histogram"))
3695 options
->xdl_opts
= DIFF_WITH_ALG(options
, HISTOGRAM_DIFF
);
3696 else if ((argcount
= parse_long_opt("diff-algorithm", av
, &optarg
))) {
3697 long value
= parse_algorithm_value(optarg
);
3699 return error("option diff-algorithm accepts \"myers\", "
3700 "\"minimal\", \"patience\" and \"histogram\"");
3701 /* clear out previous settings */
3702 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
3703 options
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
3704 options
->xdl_opts
|= value
;
3709 else if (!strcmp(arg
, "--binary")) {
3710 enable_patch_output(&options
->output_format
);
3711 DIFF_OPT_SET(options
, BINARY
);
3713 else if (!strcmp(arg
, "--full-index"))
3714 DIFF_OPT_SET(options
, FULL_INDEX
);
3715 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
3716 DIFF_OPT_SET(options
, TEXT
);
3717 else if (!strcmp(arg
, "-R"))
3718 DIFF_OPT_SET(options
, REVERSE_DIFF
);
3719 else if (!strcmp(arg
, "--find-copies-harder"))
3720 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3721 else if (!strcmp(arg
, "--follow"))
3722 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
3723 else if (!strcmp(arg
, "--no-follow"))
3724 DIFF_OPT_CLR(options
, FOLLOW_RENAMES
);
3725 else if (!strcmp(arg
, "--color"))
3726 options
->use_color
= 1;
3727 else if (starts_with(arg
, "--color=")) {
3728 int value
= git_config_colorbool(NULL
, arg
+8);
3730 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3731 options
->use_color
= value
;
3733 else if (!strcmp(arg
, "--no-color"))
3734 options
->use_color
= 0;
3735 else if (!strcmp(arg
, "--color-words")) {
3736 options
->use_color
= 1;
3737 options
->word_diff
= DIFF_WORDS_COLOR
;
3739 else if (starts_with(arg
, "--color-words=")) {
3740 options
->use_color
= 1;
3741 options
->word_diff
= DIFF_WORDS_COLOR
;
3742 options
->word_regex
= arg
+ 14;
3744 else if (!strcmp(arg
, "--word-diff")) {
3745 if (options
->word_diff
== DIFF_WORDS_NONE
)
3746 options
->word_diff
= DIFF_WORDS_PLAIN
;
3748 else if (starts_with(arg
, "--word-diff=")) {
3749 const char *type
= arg
+ 12;
3750 if (!strcmp(type
, "plain"))
3751 options
->word_diff
= DIFF_WORDS_PLAIN
;
3752 else if (!strcmp(type
, "color")) {
3753 options
->use_color
= 1;
3754 options
->word_diff
= DIFF_WORDS_COLOR
;
3756 else if (!strcmp(type
, "porcelain"))
3757 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
3758 else if (!strcmp(type
, "none"))
3759 options
->word_diff
= DIFF_WORDS_NONE
;
3761 die("bad --word-diff argument: %s", type
);
3763 else if ((argcount
= parse_long_opt("word-diff-regex", av
, &optarg
))) {
3764 if (options
->word_diff
== DIFF_WORDS_NONE
)
3765 options
->word_diff
= DIFF_WORDS_PLAIN
;
3766 options
->word_regex
= optarg
;
3769 else if (!strcmp(arg
, "--exit-code"))
3770 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3771 else if (!strcmp(arg
, "--quiet"))
3772 DIFF_OPT_SET(options
, QUICK
);
3773 else if (!strcmp(arg
, "--ext-diff"))
3774 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
3775 else if (!strcmp(arg
, "--no-ext-diff"))
3776 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
3777 else if (!strcmp(arg
, "--textconv"))
3778 DIFF_OPT_SET(options
, ALLOW_TEXTCONV
);
3779 else if (!strcmp(arg
, "--no-textconv"))
3780 DIFF_OPT_CLR(options
, ALLOW_TEXTCONV
);
3781 else if (!strcmp(arg
, "--ignore-submodules")) {
3782 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3783 handle_ignore_submodules_arg(options
, "all");
3784 } else if (starts_with(arg
, "--ignore-submodules=")) {
3785 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3786 handle_ignore_submodules_arg(options
, arg
+ 20);
3787 } else if (!strcmp(arg
, "--submodule"))
3788 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
3789 else if (starts_with(arg
, "--submodule="))
3790 return parse_submodule_opt(options
, arg
+ 12);
3793 else if (!strcmp(arg
, "-z"))
3794 options
->line_termination
= 0;
3795 else if ((argcount
= short_opt('l', av
, &optarg
))) {
3796 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
3799 else if ((argcount
= short_opt('S', av
, &optarg
))) {
3800 options
->pickaxe
= optarg
;
3801 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_S
;
3803 } else if ((argcount
= short_opt('G', av
, &optarg
))) {
3804 options
->pickaxe
= optarg
;
3805 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_G
;
3808 else if (!strcmp(arg
, "--pickaxe-all"))
3809 options
->pickaxe_opts
|= DIFF_PICKAXE_ALL
;
3810 else if (!strcmp(arg
, "--pickaxe-regex"))
3811 options
->pickaxe_opts
|= DIFF_PICKAXE_REGEX
;
3812 else if ((argcount
= short_opt('O', av
, &optarg
))) {
3813 options
->orderfile
= optarg
;
3816 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
3817 int offending
= parse_diff_filter_opt(optarg
, options
);
3819 die("unknown change class '%c' in --diff-filter=%s",
3823 else if (!strcmp(arg
, "--abbrev"))
3824 options
->abbrev
= DEFAULT_ABBREV
;
3825 else if (starts_with(arg
, "--abbrev=")) {
3826 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
3827 if (options
->abbrev
< MINIMUM_ABBREV
)
3828 options
->abbrev
= MINIMUM_ABBREV
;
3829 else if (40 < options
->abbrev
)
3830 options
->abbrev
= 40;
3832 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
3833 options
->a_prefix
= optarg
;
3836 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
3837 options
->b_prefix
= optarg
;
3840 else if (!strcmp(arg
, "--no-prefix"))
3841 options
->a_prefix
= options
->b_prefix
= "";
3842 else if (opt_arg(arg
, '\0', "inter-hunk-context",
3843 &options
->interhunkcontext
))
3845 else if (!strcmp(arg
, "-W"))
3846 DIFF_OPT_SET(options
, FUNCCONTEXT
);
3847 else if (!strcmp(arg
, "--function-context"))
3848 DIFF_OPT_SET(options
, FUNCCONTEXT
);
3849 else if (!strcmp(arg
, "--no-function-context"))
3850 DIFF_OPT_CLR(options
, FUNCCONTEXT
);
3851 else if ((argcount
= parse_long_opt("output", av
, &optarg
))) {
3852 options
->file
= fopen(optarg
, "w");
3854 die_errno("Could not open '%s'", optarg
);
3855 options
->close_file
= 1;
3862 int parse_rename_score(const char **cp_p
)
3864 unsigned long num
, scale
;
3866 const char *cp
= *cp_p
;
3873 if ( !dot
&& ch
== '.' ) {
3876 } else if ( ch
== '%' ) {
3877 scale
= dot
? scale
*100 : 100;
3878 cp
++; /* % is always at the end */
3880 } else if ( ch
>= '0' && ch
<= '9' ) {
3881 if ( scale
< 100000 ) {
3883 num
= (num
*10) + (ch
-'0');
3892 /* user says num divided by scale and we say internally that
3893 * is MAX_SCORE * num / scale.
3895 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
3898 static int diff_scoreopt_parse(const char *opt
)
3900 int opt1
, opt2
, cmd
;
3906 /* convert the long-form arguments into short-form versions */
3907 if (starts_with(opt
, "break-rewrites")) {
3908 opt
+= strlen("break-rewrites");
3909 if (*opt
== 0 || *opt
++ == '=')
3911 } else if (starts_with(opt
, "find-copies")) {
3912 opt
+= strlen("find-copies");
3913 if (*opt
== 0 || *opt
++ == '=')
3915 } else if (starts_with(opt
, "find-renames")) {
3916 opt
+= strlen("find-renames");
3917 if (*opt
== 0 || *opt
++ == '=')
3921 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
3922 return -1; /* that is not a -M, -C, or -B option */
3924 opt1
= parse_rename_score(&opt
);
3930 else if (*opt
!= '/')
3931 return -1; /* we expect -B80/99 or -B80 */
3934 opt2
= parse_rename_score(&opt
);
3939 return opt1
| (opt2
<< 16);
3942 struct diff_queue_struct diff_queued_diff
;
3944 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
3946 ALLOC_GROW(queue
->queue
, queue
->nr
+ 1, queue
->alloc
);
3947 queue
->queue
[queue
->nr
++] = dp
;
3950 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
3951 struct diff_filespec
*one
,
3952 struct diff_filespec
*two
)
3954 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
3962 void diff_free_filepair(struct diff_filepair
*p
)
3964 free_filespec(p
->one
);
3965 free_filespec(p
->two
);
3969 /* This is different from find_unique_abbrev() in that
3970 * it stuffs the result with dots for alignment.
3972 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
3977 return sha1_to_hex(sha1
);
3979 abbrev
= find_unique_abbrev(sha1
, len
);
3980 abblen
= strlen(abbrev
);
3982 static char hex
[41];
3983 if (len
< abblen
&& abblen
<= len
+ 2)
3984 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
3986 sprintf(hex
, "%s...", abbrev
);
3989 return sha1_to_hex(sha1
);
3992 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
3994 int line_termination
= opt
->line_termination
;
3995 int inter_name_termination
= line_termination
? '\t' : '\0';
3997 fprintf(opt
->file
, "%s", diff_line_prefix(opt
));
3998 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
3999 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
4000 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
4001 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
4004 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
4005 inter_name_termination
);
4007 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
4010 if (p
->status
== DIFF_STATUS_COPIED
||
4011 p
->status
== DIFF_STATUS_RENAMED
) {
4012 const char *name_a
, *name_b
;
4013 name_a
= p
->one
->path
;
4014 name_b
= p
->two
->path
;
4015 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4016 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
4017 write_name_quoted(name_b
, opt
->file
, line_termination
);
4019 const char *name_a
, *name_b
;
4020 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
4022 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4023 write_name_quoted(name_a
, opt
->file
, line_termination
);
4027 int diff_unmodified_pair(struct diff_filepair
*p
)
4029 /* This function is written stricter than necessary to support
4030 * the currently implemented transformers, but the idea is to
4031 * let transformers to produce diff_filepairs any way they want,
4032 * and filter and clean them up here before producing the output.
4034 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
4036 if (DIFF_PAIR_UNMERGED(p
))
4037 return 0; /* unmerged is interesting */
4039 /* deletion, addition, mode or type change
4040 * and rename are all interesting.
4042 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
4043 DIFF_PAIR_MODE_CHANGED(p
) ||
4044 strcmp(one
->path
, two
->path
))
4047 /* both are valid and point at the same path. that is, we are
4048 * dealing with a change.
4050 if (one
->sha1_valid
&& two
->sha1_valid
&&
4051 !hashcmp(one
->sha1
, two
->sha1
) &&
4052 !one
->dirty_submodule
&& !two
->dirty_submodule
)
4053 return 1; /* no change */
4054 if (!one
->sha1_valid
&& !two
->sha1_valid
)
4055 return 1; /* both look at the same file on the filesystem. */
4059 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
4061 if (diff_unmodified_pair(p
))
4064 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4065 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4066 return; /* no tree diffs in patch format */
4071 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
4072 struct diffstat_t
*diffstat
)
4074 if (diff_unmodified_pair(p
))
4077 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4078 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4079 return; /* no useful stat for tree diffs */
4081 run_diffstat(p
, o
, diffstat
);
4084 static void diff_flush_checkdiff(struct diff_filepair
*p
,
4085 struct diff_options
*o
)
4087 if (diff_unmodified_pair(p
))
4090 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4091 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4092 return; /* nothing to check in tree diffs */
4094 run_checkdiff(p
, o
);
4097 int diff_queue_is_empty(void)
4099 struct diff_queue_struct
*q
= &diff_queued_diff
;
4101 for (i
= 0; i
< q
->nr
; i
++)
4102 if (!diff_unmodified_pair(q
->queue
[i
]))
4108 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
4110 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
4113 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
4115 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
4116 fprintf(stderr
, "queue[%d] %s size %lu\n",
4121 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
4123 diff_debug_filespec(p
->one
, i
, "one");
4124 diff_debug_filespec(p
->two
, i
, "two");
4125 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
4126 p
->score
, p
->status
? p
->status
: '?',
4127 p
->one
->rename_used
, p
->broken_pair
);
4130 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
4134 fprintf(stderr
, "%s\n", msg
);
4135 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
4136 for (i
= 0; i
< q
->nr
; i
++) {
4137 struct diff_filepair
*p
= q
->queue
[i
];
4138 diff_debug_filepair(p
, i
);
4143 static void diff_resolve_rename_copy(void)
4146 struct diff_filepair
*p
;
4147 struct diff_queue_struct
*q
= &diff_queued_diff
;
4149 diff_debug_queue("resolve-rename-copy", q
);
4151 for (i
= 0; i
< q
->nr
; i
++) {
4153 p
->status
= 0; /* undecided */
4154 if (DIFF_PAIR_UNMERGED(p
))
4155 p
->status
= DIFF_STATUS_UNMERGED
;
4156 else if (!DIFF_FILE_VALID(p
->one
))
4157 p
->status
= DIFF_STATUS_ADDED
;
4158 else if (!DIFF_FILE_VALID(p
->two
))
4159 p
->status
= DIFF_STATUS_DELETED
;
4160 else if (DIFF_PAIR_TYPE_CHANGED(p
))
4161 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
4163 /* from this point on, we are dealing with a pair
4164 * whose both sides are valid and of the same type, i.e.
4165 * either in-place edit or rename/copy edit.
4167 else if (DIFF_PAIR_RENAME(p
)) {
4169 * A rename might have re-connected a broken
4170 * pair up, causing the pathnames to be the
4171 * same again. If so, that's not a rename at
4172 * all, just a modification..
4174 * Otherwise, see if this source was used for
4175 * multiple renames, in which case we decrement
4176 * the count, and call it a copy.
4178 if (!strcmp(p
->one
->path
, p
->two
->path
))
4179 p
->status
= DIFF_STATUS_MODIFIED
;
4180 else if (--p
->one
->rename_used
> 0)
4181 p
->status
= DIFF_STATUS_COPIED
;
4183 p
->status
= DIFF_STATUS_RENAMED
;
4185 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
4186 p
->one
->mode
!= p
->two
->mode
||
4187 p
->one
->dirty_submodule
||
4188 p
->two
->dirty_submodule
||
4189 is_null_sha1(p
->one
->sha1
))
4190 p
->status
= DIFF_STATUS_MODIFIED
;
4192 /* This is a "no-change" entry and should not
4193 * happen anymore, but prepare for broken callers.
4195 error("feeding unmodified %s to diffcore",
4197 p
->status
= DIFF_STATUS_UNKNOWN
;
4200 diff_debug_queue("resolve-rename-copy done", q
);
4203 static int check_pair_status(struct diff_filepair
*p
)
4205 switch (p
->status
) {
4206 case DIFF_STATUS_UNKNOWN
:
4209 die("internal error in diff-resolve-rename-copy");
4215 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
4217 int fmt
= opt
->output_format
;
4219 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
4220 diff_flush_checkdiff(p
, opt
);
4221 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
4222 diff_flush_raw(p
, opt
);
4223 else if (fmt
& DIFF_FORMAT_NAME
) {
4224 const char *name_a
, *name_b
;
4225 name_a
= p
->two
->path
;
4227 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4228 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
4232 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
4235 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
4237 fprintf(file
, " %s ", newdelete
);
4238 write_name_quoted(fs
->path
, file
, '\n');
4242 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
,
4243 const char *line_prefix
)
4245 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
4246 fprintf(file
, "%s mode change %06o => %06o%c", line_prefix
, p
->one
->mode
,
4247 p
->two
->mode
, show_name
? ' ' : '\n');
4249 write_name_quoted(p
->two
->path
, file
, '\n');
4254 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
,
4255 const char *line_prefix
)
4257 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
4259 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
4261 show_mode_change(file
, p
, 0, line_prefix
);
4264 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
4266 FILE *file
= opt
->file
;
4267 const char *line_prefix
= diff_line_prefix(opt
);
4270 case DIFF_STATUS_DELETED
:
4271 fputs(line_prefix
, file
);
4272 show_file_mode_name(file
, "delete", p
->one
);
4274 case DIFF_STATUS_ADDED
:
4275 fputs(line_prefix
, file
);
4276 show_file_mode_name(file
, "create", p
->two
);
4278 case DIFF_STATUS_COPIED
:
4279 fputs(line_prefix
, file
);
4280 show_rename_copy(file
, "copy", p
, line_prefix
);
4282 case DIFF_STATUS_RENAMED
:
4283 fputs(line_prefix
, file
);
4284 show_rename_copy(file
, "rename", p
, line_prefix
);
4288 fprintf(file
, "%s rewrite ", line_prefix
);
4289 write_name_quoted(p
->two
->path
, file
, ' ');
4290 fprintf(file
, "(%d%%)\n", similarity_index(p
));
4292 show_mode_change(file
, p
, !p
->score
, line_prefix
);
4302 static int remove_space(char *line
, int len
)
4308 for (i
= 0; i
< len
; i
++)
4309 if (!isspace((c
= line
[i
])))
4315 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
4317 struct patch_id_t
*data
= priv
;
4320 /* Ignore line numbers when computing the SHA1 of the patch */
4321 if (starts_with(line
, "@@ -"))
4324 new_len
= remove_space(line
, len
);
4326 git_SHA1_Update(data
->ctx
, line
, new_len
);
4327 data
->patchlen
+= new_len
;
4330 /* returns 0 upon success, and writes result into sha1 */
4331 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
4333 struct diff_queue_struct
*q
= &diff_queued_diff
;
4336 struct patch_id_t data
;
4337 char buffer
[PATH_MAX
* 4 + 20];
4339 git_SHA1_Init(&ctx
);
4340 memset(&data
, 0, sizeof(struct patch_id_t
));
4343 for (i
= 0; i
< q
->nr
; i
++) {
4347 struct diff_filepair
*p
= q
->queue
[i
];
4350 memset(&xpp
, 0, sizeof(xpp
));
4351 memset(&xecfg
, 0, sizeof(xecfg
));
4353 return error("internal diff status error");
4354 if (p
->status
== DIFF_STATUS_UNKNOWN
)
4356 if (diff_unmodified_pair(p
))
4358 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4359 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4361 if (DIFF_PAIR_UNMERGED(p
))
4364 diff_fill_sha1_info(p
->one
);
4365 diff_fill_sha1_info(p
->two
);
4366 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
4367 fill_mmfile(&mf2
, p
->two
) < 0)
4368 return error("unable to read files to diff");
4370 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
4371 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
4372 if (p
->one
->mode
== 0)
4373 len1
= snprintf(buffer
, sizeof(buffer
),
4374 "diff--gita/%.*sb/%.*s"
4381 len2
, p
->two
->path
);
4382 else if (p
->two
->mode
== 0)
4383 len1
= snprintf(buffer
, sizeof(buffer
),
4384 "diff--gita/%.*sb/%.*s"
4385 "deletedfilemode%06o"
4391 len1
, p
->one
->path
);
4393 len1
= snprintf(buffer
, sizeof(buffer
),
4394 "diff--gita/%.*sb/%.*s"
4400 len2
, p
->two
->path
);
4401 git_SHA1_Update(&ctx
, buffer
, len1
);
4403 if (diff_filespec_is_binary(p
->one
) ||
4404 diff_filespec_is_binary(p
->two
)) {
4405 git_SHA1_Update(&ctx
, sha1_to_hex(p
->one
->sha1
), 40);
4406 git_SHA1_Update(&ctx
, sha1_to_hex(p
->two
->sha1
), 40);
4413 xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
4417 git_SHA1_Final(sha1
, &ctx
);
4421 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
4423 struct diff_queue_struct
*q
= &diff_queued_diff
;
4425 int result
= diff_get_patch_id(options
, sha1
);
4427 for (i
= 0; i
< q
->nr
; i
++)
4428 diff_free_filepair(q
->queue
[i
]);
4431 DIFF_QUEUE_CLEAR(q
);
4436 static int is_summary_empty(const struct diff_queue_struct
*q
)
4440 for (i
= 0; i
< q
->nr
; i
++) {
4441 const struct diff_filepair
*p
= q
->queue
[i
];
4443 switch (p
->status
) {
4444 case DIFF_STATUS_DELETED
:
4445 case DIFF_STATUS_ADDED
:
4446 case DIFF_STATUS_COPIED
:
4447 case DIFF_STATUS_RENAMED
:
4452 if (p
->one
->mode
&& p
->two
->mode
&&
4453 p
->one
->mode
!= p
->two
->mode
)
4461 static const char rename_limit_warning
[] =
4462 "inexact rename detection was skipped due to too many files.";
4464 static const char degrade_cc_to_c_warning
[] =
4465 "only found copies from modified paths due to too many files.";
4467 static const char rename_limit_advice
[] =
4468 "you may want to set your %s variable to at least "
4469 "%d and retry the command.";
4471 void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
)
4474 warning(degrade_cc_to_c_warning
);
4476 warning(rename_limit_warning
);
4479 if (0 < needed
&& needed
< 32767)
4480 warning(rename_limit_advice
, varname
, needed
);
4483 void diff_flush(struct diff_options
*options
)
4485 struct diff_queue_struct
*q
= &diff_queued_diff
;
4486 int i
, output_format
= options
->output_format
;
4488 int dirstat_by_line
= 0;
4491 * Order: raw, stat, summary, patch
4492 * or: name/name-status/checkdiff (other bits clear)
4497 if (output_format
& (DIFF_FORMAT_RAW
|
4499 DIFF_FORMAT_NAME_STATUS
|
4500 DIFF_FORMAT_CHECKDIFF
)) {
4501 for (i
= 0; i
< q
->nr
; i
++) {
4502 struct diff_filepair
*p
= q
->queue
[i
];
4503 if (check_pair_status(p
))
4504 flush_one_pair(p
, options
);
4509 if (output_format
& DIFF_FORMAT_DIRSTAT
&& DIFF_OPT_TST(options
, DIRSTAT_BY_LINE
))
4510 dirstat_by_line
= 1;
4512 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
) ||
4514 struct diffstat_t diffstat
;
4516 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
4517 for (i
= 0; i
< q
->nr
; i
++) {
4518 struct diff_filepair
*p
= q
->queue
[i
];
4519 if (check_pair_status(p
))
4520 diff_flush_stat(p
, options
, &diffstat
);
4522 if (output_format
& DIFF_FORMAT_NUMSTAT
)
4523 show_numstat(&diffstat
, options
);
4524 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
4525 show_stats(&diffstat
, options
);
4526 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
4527 show_shortstats(&diffstat
, options
);
4528 if (output_format
& DIFF_FORMAT_DIRSTAT
)
4529 show_dirstat_by_line(&diffstat
, options
);
4530 free_diffstat_info(&diffstat
);
4533 if ((output_format
& DIFF_FORMAT_DIRSTAT
) && !dirstat_by_line
)
4534 show_dirstat(options
);
4536 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
4537 for (i
= 0; i
< q
->nr
; i
++) {
4538 diff_summary(options
, q
->queue
[i
]);
4543 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
4544 DIFF_OPT_TST(options
, EXIT_WITH_STATUS
) &&
4545 DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4547 * run diff_flush_patch for the exit status. setting
4548 * options->file to /dev/null should be safe, because we
4549 * aren't supposed to produce any output anyway.
4551 if (options
->close_file
)
4552 fclose(options
->file
);
4553 options
->file
= fopen("/dev/null", "w");
4555 die_errno("Could not open /dev/null");
4556 options
->close_file
= 1;
4557 for (i
= 0; i
< q
->nr
; i
++) {
4558 struct diff_filepair
*p
= q
->queue
[i
];
4559 if (check_pair_status(p
))
4560 diff_flush_patch(p
, options
);
4561 if (options
->found_changes
)
4566 if (output_format
& DIFF_FORMAT_PATCH
) {
4568 fprintf(options
->file
, "%s%c",
4569 diff_line_prefix(options
),
4570 options
->line_termination
);
4571 if (options
->stat_sep
) {
4572 /* attach patch instead of inline */
4573 fputs(options
->stat_sep
, options
->file
);
4577 for (i
= 0; i
< q
->nr
; i
++) {
4578 struct diff_filepair
*p
= q
->queue
[i
];
4579 if (check_pair_status(p
))
4580 diff_flush_patch(p
, options
);
4584 if (output_format
& DIFF_FORMAT_CALLBACK
)
4585 options
->format_callback(q
, options
, options
->format_callback_data
);
4587 for (i
= 0; i
< q
->nr
; i
++)
4588 diff_free_filepair(q
->queue
[i
]);
4591 DIFF_QUEUE_CLEAR(q
);
4592 if (options
->close_file
)
4593 fclose(options
->file
);
4596 * Report the content-level differences with HAS_CHANGES;
4597 * diff_addremove/diff_change does not set the bit when
4598 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4600 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4601 if (options
->found_changes
)
4602 DIFF_OPT_SET(options
, HAS_CHANGES
);
4604 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4608 static int match_filter(const struct diff_options
*options
, const struct diff_filepair
*p
)
4610 return (((p
->status
== DIFF_STATUS_MODIFIED
) &&
4612 filter_bit_tst(DIFF_STATUS_FILTER_BROKEN
, options
)) ||
4614 filter_bit_tst(DIFF_STATUS_MODIFIED
, options
)))) ||
4615 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
4616 filter_bit_tst(p
->status
, options
)));
4619 static void diffcore_apply_filter(struct diff_options
*options
)
4622 struct diff_queue_struct
*q
= &diff_queued_diff
;
4623 struct diff_queue_struct outq
;
4625 DIFF_QUEUE_CLEAR(&outq
);
4627 if (!options
->filter
)
4630 if (filter_bit_tst(DIFF_STATUS_FILTER_AON
, options
)) {
4632 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
4633 if (match_filter(options
, q
->queue
[i
]))
4639 /* otherwise we will clear the whole queue
4640 * by copying the empty outq at the end of this
4641 * function, but first clear the current entries
4644 for (i
= 0; i
< q
->nr
; i
++)
4645 diff_free_filepair(q
->queue
[i
]);
4648 /* Only the matching ones */
4649 for (i
= 0; i
< q
->nr
; i
++) {
4650 struct diff_filepair
*p
= q
->queue
[i
];
4651 if (match_filter(options
, p
))
4654 diff_free_filepair(p
);
4661 /* Check whether two filespecs with the same mode and size are identical */
4662 static int diff_filespec_is_identical(struct diff_filespec
*one
,
4663 struct diff_filespec
*two
)
4665 if (S_ISGITLINK(one
->mode
))
4667 if (diff_populate_filespec(one
, 0))
4669 if (diff_populate_filespec(two
, 0))
4671 return !memcmp(one
->data
, two
->data
, one
->size
);
4674 static int diff_filespec_check_stat_unmatch(struct diff_filepair
*p
)
4676 if (p
->done_skip_stat_unmatch
)
4677 return p
->skip_stat_unmatch_result
;
4679 p
->done_skip_stat_unmatch
= 1;
4680 p
->skip_stat_unmatch_result
= 0;
4682 * 1. Entries that come from stat info dirtiness
4683 * always have both sides (iow, not create/delete),
4684 * one side of the object name is unknown, with
4685 * the same mode and size. Keep the ones that
4686 * do not match these criteria. They have real
4689 * 2. At this point, the file is known to be modified,
4690 * with the same mode and size, and the object
4691 * name of one side is unknown. Need to inspect
4692 * the identical contents.
4694 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
4695 !DIFF_FILE_VALID(p
->two
) ||
4696 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
4697 (p
->one
->mode
!= p
->two
->mode
) ||
4698 diff_populate_filespec(p
->one
, 1) ||
4699 diff_populate_filespec(p
->two
, 1) ||
4700 (p
->one
->size
!= p
->two
->size
) ||
4701 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
4702 p
->skip_stat_unmatch_result
= 1;
4703 return p
->skip_stat_unmatch_result
;
4706 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
4709 struct diff_queue_struct
*q
= &diff_queued_diff
;
4710 struct diff_queue_struct outq
;
4711 DIFF_QUEUE_CLEAR(&outq
);
4713 for (i
= 0; i
< q
->nr
; i
++) {
4714 struct diff_filepair
*p
= q
->queue
[i
];
4716 if (diff_filespec_check_stat_unmatch(p
))
4720 * The caller can subtract 1 from skip_stat_unmatch
4721 * to determine how many paths were dirty only
4722 * due to stat info mismatch.
4724 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
4725 diffopt
->skip_stat_unmatch
++;
4726 diff_free_filepair(p
);
4733 static int diffnamecmp(const void *a_
, const void *b_
)
4735 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
4736 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
4737 const char *name_a
, *name_b
;
4739 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
4740 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
4741 return strcmp(name_a
, name_b
);
4744 void diffcore_fix_diff_index(struct diff_options
*options
)
4746 struct diff_queue_struct
*q
= &diff_queued_diff
;
4747 qsort(q
->queue
, q
->nr
, sizeof(q
->queue
[0]), diffnamecmp
);
4750 void diffcore_std(struct diff_options
*options
)
4752 if (options
->skip_stat_unmatch
)
4753 diffcore_skip_stat_unmatch(options
);
4754 if (!options
->found_follow
) {
4755 /* See try_to_follow_renames() in tree-diff.c */
4756 if (options
->break_opt
!= -1)
4757 diffcore_break(options
->break_opt
);
4758 if (options
->detect_rename
)
4759 diffcore_rename(options
);
4760 if (options
->break_opt
!= -1)
4761 diffcore_merge_broken();
4763 if (options
->pickaxe
)
4764 diffcore_pickaxe(options
);
4765 if (options
->orderfile
)
4766 diffcore_order(options
->orderfile
);
4767 if (!options
->found_follow
)
4768 /* See try_to_follow_renames() in tree-diff.c */
4769 diff_resolve_rename_copy();
4770 diffcore_apply_filter(options
);
4772 if (diff_queued_diff
.nr
&& !DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4773 DIFF_OPT_SET(options
, HAS_CHANGES
);
4775 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4777 options
->found_follow
= 0;
4780 int diff_result_code(struct diff_options
*opt
, int status
)
4784 diff_warn_rename_limit("diff.renameLimit",
4785 opt
->needed_rename_limit
,
4786 opt
->degraded_cc_to_c
);
4787 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4788 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
4790 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4791 DIFF_OPT_TST(opt
, HAS_CHANGES
))
4793 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
4794 DIFF_OPT_TST(opt
, CHECK_FAILED
))
4799 int diff_can_quit_early(struct diff_options
*opt
)
4801 return (DIFF_OPT_TST(opt
, QUICK
) &&
4803 DIFF_OPT_TST(opt
, HAS_CHANGES
));
4807 * Shall changes to this submodule be ignored?
4809 * Submodule changes can be configured to be ignored separately for each path,
4810 * but that configuration can be overridden from the command line.
4812 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
4815 unsigned orig_flags
= options
->flags
;
4816 if (!DIFF_OPT_TST(options
, OVERRIDE_SUBMODULE_CONFIG
))
4817 set_diffopt_flags_from_submodule_config(options
, path
);
4818 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
))
4820 options
->flags
= orig_flags
;
4824 void diff_addremove(struct diff_options
*options
,
4825 int addremove
, unsigned mode
,
4826 const unsigned char *sha1
,
4828 const char *concatpath
, unsigned dirty_submodule
)
4830 struct diff_filespec
*one
, *two
;
4832 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
4835 /* This may look odd, but it is a preparation for
4836 * feeding "there are unchanged files which should
4837 * not produce diffs, but when you are doing copy
4838 * detection you would need them, so here they are"
4839 * entries to the diff-core. They will be prefixed
4840 * with something like '=' or '*' (I haven't decided
4841 * which but should not make any difference).
4842 * Feeding the same new and old to diff_change()
4843 * also has the same effect.
4844 * Before the final output happens, they are pruned after
4845 * merged into rename/copy pairs as appropriate.
4847 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
4848 addremove
= (addremove
== '+' ? '-' :
4849 addremove
== '-' ? '+' : addremove
);
4851 if (options
->prefix
&&
4852 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4855 one
= alloc_filespec(concatpath
);
4856 two
= alloc_filespec(concatpath
);
4858 if (addremove
!= '+')
4859 fill_filespec(one
, sha1
, sha1_valid
, mode
);
4860 if (addremove
!= '-') {
4861 fill_filespec(two
, sha1
, sha1_valid
, mode
);
4862 two
->dirty_submodule
= dirty_submodule
;
4865 diff_queue(&diff_queued_diff
, one
, two
);
4866 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4867 DIFF_OPT_SET(options
, HAS_CHANGES
);
4870 void diff_change(struct diff_options
*options
,
4871 unsigned old_mode
, unsigned new_mode
,
4872 const unsigned char *old_sha1
,
4873 const unsigned char *new_sha1
,
4874 int old_sha1_valid
, int new_sha1_valid
,
4875 const char *concatpath
,
4876 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
4878 struct diff_filespec
*one
, *two
;
4879 struct diff_filepair
*p
;
4881 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
4882 is_submodule_ignored(concatpath
, options
))
4885 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
4887 const unsigned char *tmp_c
;
4888 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
4889 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
4890 tmp
= old_sha1_valid
; old_sha1_valid
= new_sha1_valid
;
4891 new_sha1_valid
= tmp
;
4892 tmp
= old_dirty_submodule
; old_dirty_submodule
= new_dirty_submodule
;
4893 new_dirty_submodule
= tmp
;
4896 if (options
->prefix
&&
4897 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4900 one
= alloc_filespec(concatpath
);
4901 two
= alloc_filespec(concatpath
);
4902 fill_filespec(one
, old_sha1
, old_sha1_valid
, old_mode
);
4903 fill_filespec(two
, new_sha1
, new_sha1_valid
, new_mode
);
4904 one
->dirty_submodule
= old_dirty_submodule
;
4905 two
->dirty_submodule
= new_dirty_submodule
;
4906 p
= diff_queue(&diff_queued_diff
, one
, two
);
4908 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4911 if (DIFF_OPT_TST(options
, QUICK
) && options
->skip_stat_unmatch
&&
4912 !diff_filespec_check_stat_unmatch(p
))
4915 DIFF_OPT_SET(options
, HAS_CHANGES
);
4918 struct diff_filepair
*diff_unmerge(struct diff_options
*options
, const char *path
)
4920 struct diff_filepair
*pair
;
4921 struct diff_filespec
*one
, *two
;
4923 if (options
->prefix
&&
4924 strncmp(path
, options
->prefix
, options
->prefix_length
))
4927 one
= alloc_filespec(path
);
4928 two
= alloc_filespec(path
);
4929 pair
= diff_queue(&diff_queued_diff
, one
, two
);
4930 pair
->is_unmerged
= 1;
4934 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
4937 struct diff_tempfile
*temp
;
4938 const char *argv
[3];
4939 const char **arg
= argv
;
4940 struct child_process child
;
4941 struct strbuf buf
= STRBUF_INIT
;
4944 temp
= prepare_temp_file(spec
->path
, spec
);
4946 *arg
++ = temp
->name
;
4949 memset(&child
, 0, sizeof(child
));
4950 child
.use_shell
= 1;
4953 if (start_command(&child
)) {
4958 if (strbuf_read(&buf
, child
.out
, 0) < 0)
4959 err
= error("error reading from textconv command '%s'", pgm
);
4962 if (finish_command(&child
) || err
) {
4963 strbuf_release(&buf
);
4969 return strbuf_detach(&buf
, outsize
);
4972 size_t fill_textconv(struct userdiff_driver
*driver
,
4973 struct diff_filespec
*df
,
4978 if (!driver
|| !driver
->textconv
) {
4979 if (!DIFF_FILE_VALID(df
)) {
4983 if (diff_populate_filespec(df
, 0))
4984 die("unable to read files to diff");
4989 if (driver
->textconv_cache
&& df
->sha1_valid
) {
4990 *outbuf
= notes_cache_get(driver
->textconv_cache
, df
->sha1
,
4996 *outbuf
= run_textconv(driver
->textconv
, df
, &size
);
4998 die("unable to read files to diff");
5000 if (driver
->textconv_cache
&& df
->sha1_valid
) {
5001 /* ignore errors, as we might be in a readonly repository */
5002 notes_cache_put(driver
->textconv_cache
, df
->sha1
, *outbuf
,
5005 * we could save up changes and flush them all at the end,
5006 * but we would need an extra call after all diffing is done.
5007 * Since generating a cache entry is the slow path anyway,
5008 * this extra overhead probably isn't a big deal.
5010 notes_cache_write(driver
->textconv_cache
);
5016 void setup_diff_pager(struct diff_options
*opt
)
5019 * If the user asked for our exit code, then either they want --quiet
5020 * or --exit-code. We should definitely not bother with a pager in the
5021 * former case, as we will generate no output. Since we still properly
5022 * report our exit code even when a pager is run, we _could_ run a
5023 * pager with --exit-code. But since we have not done so historically,
5024 * and because it is easy to find people oneline advising "git diff
5025 * --exit-code" in hooks and other scripts, we do not do so.
5027 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
5028 check_pager_config("diff") != 0)