2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
16 #include "submodule.h"
19 #ifdef NO_FAST_WORKING_DIRECTORY
20 #define FAST_WORKING_DIRECTORY 0
22 #define FAST_WORKING_DIRECTORY 1
25 static int diff_detect_rename_default
;
26 static int diff_rename_limit_default
= 400;
27 static int diff_suppress_blank_empty
;
28 static int diff_use_color_default
= -1;
29 static const char *diff_word_regex_cfg
;
30 static const char *external_diff_cmd_cfg
;
31 int diff_auto_refresh_index
= 1;
32 static int diff_mnemonic_prefix
;
33 static int diff_no_prefix
;
34 static int diff_stat_graph_width
;
35 static int diff_dirstat_permille_default
= 30;
36 static struct diff_options default_diff_options
;
38 static char diff_colors
[][COLOR_MAXLEN
] = {
40 GIT_COLOR_NORMAL
, /* PLAIN */
41 GIT_COLOR_BOLD
, /* METAINFO */
42 GIT_COLOR_CYAN
, /* FRAGINFO */
43 GIT_COLOR_RED
, /* OLD */
44 GIT_COLOR_GREEN
, /* NEW */
45 GIT_COLOR_YELLOW
, /* COMMIT */
46 GIT_COLOR_BG_RED
, /* WHITESPACE */
47 GIT_COLOR_NORMAL
, /* FUNCINFO */
50 static int parse_diff_color_slot(const char *var
, int ofs
)
52 if (!strcasecmp(var
+ofs
, "plain"))
54 if (!strcasecmp(var
+ofs
, "meta"))
56 if (!strcasecmp(var
+ofs
, "frag"))
58 if (!strcasecmp(var
+ofs
, "old"))
60 if (!strcasecmp(var
+ofs
, "new"))
62 if (!strcasecmp(var
+ofs
, "commit"))
64 if (!strcasecmp(var
+ofs
, "whitespace"))
65 return DIFF_WHITESPACE
;
66 if (!strcasecmp(var
+ofs
, "func"))
71 static int parse_dirstat_params(struct diff_options
*options
, const char *params
,
72 struct strbuf
*errmsg
)
74 const char *p
= params
;
78 p_len
= strchrnul(p
, ',') - p
;
79 if (!memcmp(p
, "changes", p_len
)) {
80 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
81 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
82 } else if (!memcmp(p
, "lines", p_len
)) {
83 DIFF_OPT_SET(options
, DIRSTAT_BY_LINE
);
84 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
85 } else if (!memcmp(p
, "files", p_len
)) {
86 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
87 DIFF_OPT_SET(options
, DIRSTAT_BY_FILE
);
88 } else if (!memcmp(p
, "noncumulative", p_len
)) {
89 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
90 } else if (!memcmp(p
, "cumulative", p_len
)) {
91 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
92 } else if (isdigit(*p
)) {
94 int permille
= strtoul(p
, &end
, 10) * 10;
95 if (*end
== '.' && isdigit(*++end
)) {
96 /* only use first digit */
97 permille
+= *end
- '0';
98 /* .. and ignore any further digits */
99 while (isdigit(*++end
))
102 if (end
- p
== p_len
)
103 options
->dirstat_permille
= permille
;
105 strbuf_addf(errmsg
, _(" Failed to parse dirstat cut-off percentage '%.*s'\n"),
110 strbuf_addf(errmsg
, _(" Unknown dirstat parameter '%.*s'\n"),
118 p
++; /* more parameters, swallow separator */
123 static int git_config_rename(const char *var
, const char *value
)
126 return DIFF_DETECT_RENAME
;
127 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
128 return DIFF_DETECT_COPY
;
129 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
133 * These are to give UI layer defaults.
134 * The core-level commands such as git-diff-files should
135 * never be affected by the setting of diff.renames
136 * the user happens to have in the configuration file.
138 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
140 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
141 diff_use_color_default
= git_config_colorbool(var
, value
);
144 if (!strcmp(var
, "diff.renames")) {
145 diff_detect_rename_default
= git_config_rename(var
, value
);
148 if (!strcmp(var
, "diff.autorefreshindex")) {
149 diff_auto_refresh_index
= git_config_bool(var
, value
);
152 if (!strcmp(var
, "diff.mnemonicprefix")) {
153 diff_mnemonic_prefix
= git_config_bool(var
, value
);
156 if (!strcmp(var
, "diff.noprefix")) {
157 diff_no_prefix
= git_config_bool(var
, value
);
160 if (!strcmp(var
, "diff.statgraphwidth")) {
161 diff_stat_graph_width
= git_config_int(var
, value
);
164 if (!strcmp(var
, "diff.external"))
165 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
166 if (!strcmp(var
, "diff.wordregex"))
167 return git_config_string(&diff_word_regex_cfg
, var
, value
);
169 if (!strcmp(var
, "diff.ignoresubmodules"))
170 handle_ignore_submodules_arg(&default_diff_options
, value
);
172 if (git_color_config(var
, value
, cb
) < 0)
175 return git_diff_basic_config(var
, value
, cb
);
178 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
180 if (!strcmp(var
, "diff.renamelimit")) {
181 diff_rename_limit_default
= git_config_int(var
, value
);
185 if (userdiff_config(var
, value
) < 0)
188 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
189 int slot
= parse_diff_color_slot(var
, 11);
193 return config_error_nonbool(var
);
194 color_parse(value
, var
, diff_colors
[slot
]);
198 /* like GNU diff's --suppress-blank-empty option */
199 if (!strcmp(var
, "diff.suppressblankempty") ||
200 /* for backwards compatibility */
201 !strcmp(var
, "diff.suppress-blank-empty")) {
202 diff_suppress_blank_empty
= git_config_bool(var
, value
);
206 if (!strcmp(var
, "diff.dirstat")) {
207 struct strbuf errmsg
= STRBUF_INIT
;
208 default_diff_options
.dirstat_permille
= diff_dirstat_permille_default
;
209 if (parse_dirstat_params(&default_diff_options
, value
, &errmsg
))
210 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
212 strbuf_release(&errmsg
);
213 diff_dirstat_permille_default
= default_diff_options
.dirstat_permille
;
217 if (!prefixcmp(var
, "submodule."))
218 return parse_submodule_config_option(var
, value
);
220 return git_default_config(var
, value
, cb
);
223 static char *quote_two(const char *one
, const char *two
)
225 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
226 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
227 struct strbuf res
= STRBUF_INIT
;
229 if (need_one
+ need_two
) {
230 strbuf_addch(&res
, '"');
231 quote_c_style(one
, &res
, NULL
, 1);
232 quote_c_style(two
, &res
, NULL
, 1);
233 strbuf_addch(&res
, '"');
235 strbuf_addstr(&res
, one
);
236 strbuf_addstr(&res
, two
);
238 return strbuf_detach(&res
, NULL
);
241 static const char *external_diff(void)
243 static const char *external_diff_cmd
= NULL
;
244 static int done_preparing
= 0;
247 return external_diff_cmd
;
248 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
249 if (!external_diff_cmd
)
250 external_diff_cmd
= external_diff_cmd_cfg
;
252 return external_diff_cmd
;
255 static struct diff_tempfile
{
256 const char *name
; /* filename external diff should read from */
259 char tmp_path
[PATH_MAX
];
262 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
264 struct emit_callback
{
267 int blank_at_eof_in_preimage
;
268 int blank_at_eof_in_postimage
;
270 int lno_in_postimage
;
271 sane_truncate_fn truncate
;
272 const char **label_path
;
273 struct diff_words_data
*diff_words
;
274 struct diff_options
*opt
;
276 struct strbuf
*header
;
279 static int count_lines(const char *data
, int size
)
281 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
288 completely_empty
= 0;
292 completely_empty
= 0;
295 if (completely_empty
)
298 count
++; /* no trailing newline */
302 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
304 if (!DIFF_FILE_VALID(one
)) {
305 mf
->ptr
= (char *)""; /* does not matter */
309 else if (diff_populate_filespec(one
, 0))
313 mf
->size
= one
->size
;
317 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
318 static unsigned long diff_filespec_size(struct diff_filespec
*one
)
320 if (!DIFF_FILE_VALID(one
))
322 diff_populate_filespec(one
, 1);
326 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
329 long size
= mf
->size
;
334 ptr
+= size
- 1; /* pointing at the very end */
336 ; /* incomplete line */
338 ptr
--; /* skip the last LF */
339 while (mf
->ptr
< ptr
) {
341 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
342 if (*prev_eol
== '\n')
344 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
352 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
353 struct emit_callback
*ecbdata
)
356 unsigned ws_rule
= ecbdata
->ws_rule
;
357 l1
= count_trailing_blank(mf1
, ws_rule
);
358 l2
= count_trailing_blank(mf2
, ws_rule
);
360 ecbdata
->blank_at_eof_in_preimage
= 0;
361 ecbdata
->blank_at_eof_in_postimage
= 0;
364 at
= count_lines(mf1
->ptr
, mf1
->size
);
365 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
367 at
= count_lines(mf2
->ptr
, mf2
->size
);
368 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
371 static void emit_line_0(struct diff_options
*o
, const char *set
, const char *reset
,
372 int first
, const char *line
, int len
)
374 int has_trailing_newline
, has_trailing_carriage_return
;
376 FILE *file
= o
->file
;
378 if (o
->output_prefix
) {
379 struct strbuf
*msg
= NULL
;
380 msg
= o
->output_prefix(o
, o
->output_prefix_data
);
382 fwrite(msg
->buf
, msg
->len
, 1, file
);
386 has_trailing_newline
= (first
== '\n');
387 has_trailing_carriage_return
= (!has_trailing_newline
&&
389 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
391 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
392 if (has_trailing_newline
)
394 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
395 if (has_trailing_carriage_return
)
400 if (len
|| !nofirst
) {
404 fwrite(line
, len
, 1, file
);
407 if (has_trailing_carriage_return
)
409 if (has_trailing_newline
)
413 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
414 const char *line
, int len
)
416 emit_line_0(o
, set
, reset
, line
[0], line
+1, len
-1);
419 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
421 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
422 ecbdata
->blank_at_eof_in_preimage
&&
423 ecbdata
->blank_at_eof_in_postimage
&&
424 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
425 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
427 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
430 static void emit_add_line(const char *reset
,
431 struct emit_callback
*ecbdata
,
432 const char *line
, int len
)
434 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
435 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
438 emit_line_0(ecbdata
->opt
, set
, reset
, '+', line
, len
);
439 else if (new_blank_line_at_eof(ecbdata
, line
, len
))
440 /* Blank line at EOF - paint '+' as well */
441 emit_line_0(ecbdata
->opt
, ws
, reset
, '+', line
, len
);
443 /* Emit just the prefix, then the rest. */
444 emit_line_0(ecbdata
->opt
, set
, reset
, '+', "", 0);
445 ws_check_emit(line
, len
, ecbdata
->ws_rule
,
446 ecbdata
->opt
->file
, set
, reset
, ws
);
450 static void emit_hunk_header(struct emit_callback
*ecbdata
,
451 const char *line
, int len
)
453 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
454 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
455 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
456 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
457 static const char atat
[2] = { '@', '@' };
459 struct strbuf msgbuf
= STRBUF_INIT
;
464 * As a hunk header must begin with "@@ -<old>, +<new> @@",
465 * it always is at least 10 bytes long.
468 memcmp(line
, atat
, 2) ||
469 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
470 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
473 ep
+= 2; /* skip over @@ */
475 /* The hunk header in fraginfo color */
476 strbuf_add(&msgbuf
, frag
, strlen(frag
));
477 strbuf_add(&msgbuf
, line
, ep
- line
);
478 strbuf_add(&msgbuf
, reset
, strlen(reset
));
484 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
487 /* blank before the func header */
488 for (cp
= ep
; ep
- line
< len
; ep
++)
489 if (*ep
!= ' ' && *ep
!= '\t')
492 strbuf_add(&msgbuf
, plain
, strlen(plain
));
493 strbuf_add(&msgbuf
, cp
, ep
- cp
);
494 strbuf_add(&msgbuf
, reset
, strlen(reset
));
497 if (ep
< line
+ len
) {
498 strbuf_add(&msgbuf
, func
, strlen(func
));
499 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
500 strbuf_add(&msgbuf
, reset
, strlen(reset
));
503 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
504 emit_line(ecbdata
->opt
, "", "", msgbuf
.buf
, msgbuf
.len
);
505 strbuf_release(&msgbuf
);
508 static struct diff_tempfile
*claim_diff_tempfile(void) {
510 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
511 if (!diff_temp
[i
].name
)
512 return diff_temp
+ i
;
513 die("BUG: diff is failing to clean up its tempfiles");
516 static int remove_tempfile_installed
;
518 static void remove_tempfile(void)
521 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
522 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
)
523 unlink_or_warn(diff_temp
[i
].name
);
524 diff_temp
[i
].name
= NULL
;
528 static void remove_tempfile_on_signal(int signo
)
535 static void print_line_count(FILE *file
, int count
)
539 fprintf(file
, "0,0");
545 fprintf(file
, "1,%d", count
);
550 static void emit_rewrite_lines(struct emit_callback
*ecb
,
551 int prefix
, const char *data
, int size
)
553 const char *endp
= NULL
;
554 static const char *nneof
= " No newline at end of file\n";
555 const char *old
= diff_get_color(ecb
->color_diff
, DIFF_FILE_OLD
);
556 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
561 endp
= memchr(data
, '\n', size
);
562 len
= endp
? (endp
- data
+ 1) : size
;
564 ecb
->lno_in_preimage
++;
565 emit_line_0(ecb
->opt
, old
, reset
, '-',
568 ecb
->lno_in_postimage
++;
569 emit_add_line(reset
, ecb
, data
, len
);
575 const char *plain
= diff_get_color(ecb
->color_diff
,
577 putc('\n', ecb
->opt
->file
);
578 emit_line_0(ecb
->opt
, plain
, reset
, '\\',
579 nneof
, strlen(nneof
));
583 static void emit_rewrite_diff(const char *name_a
,
585 struct diff_filespec
*one
,
586 struct diff_filespec
*two
,
587 struct userdiff_driver
*textconv_one
,
588 struct userdiff_driver
*textconv_two
,
589 struct diff_options
*o
)
592 const char *name_a_tab
, *name_b_tab
;
593 const char *metainfo
= diff_get_color(o
->use_color
, DIFF_METAINFO
);
594 const char *fraginfo
= diff_get_color(o
->use_color
, DIFF_FRAGINFO
);
595 const char *reset
= diff_get_color(o
->use_color
, DIFF_RESET
);
596 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
597 const char *a_prefix
, *b_prefix
;
598 char *data_one
, *data_two
;
599 size_t size_one
, size_two
;
600 struct emit_callback ecbdata
;
601 char *line_prefix
= "";
602 struct strbuf
*msgbuf
;
604 if (o
&& o
->output_prefix
) {
605 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
606 line_prefix
= msgbuf
->buf
;
609 if (diff_mnemonic_prefix
&& DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
610 a_prefix
= o
->b_prefix
;
611 b_prefix
= o
->a_prefix
;
613 a_prefix
= o
->a_prefix
;
614 b_prefix
= o
->b_prefix
;
617 name_a
+= (*name_a
== '/');
618 name_b
+= (*name_b
== '/');
619 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
620 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
622 strbuf_reset(&a_name
);
623 strbuf_reset(&b_name
);
624 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
625 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
627 size_one
= fill_textconv(textconv_one
, one
, &data_one
);
628 size_two
= fill_textconv(textconv_two
, two
, &data_two
);
630 memset(&ecbdata
, 0, sizeof(ecbdata
));
631 ecbdata
.color_diff
= want_color(o
->use_color
);
632 ecbdata
.found_changesp
= &o
->found_changes
;
633 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
635 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
637 mf1
.ptr
= (char *)data_one
;
638 mf2
.ptr
= (char *)data_two
;
641 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
643 ecbdata
.lno_in_preimage
= 1;
644 ecbdata
.lno_in_postimage
= 1;
646 lc_a
= count_lines(data_one
, size_one
);
647 lc_b
= count_lines(data_two
, size_two
);
649 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
650 line_prefix
, metainfo
, a_name
.buf
, name_a_tab
, reset
,
651 line_prefix
, metainfo
, b_name
.buf
, name_b_tab
, reset
,
652 line_prefix
, fraginfo
);
653 if (!o
->irreversible_delete
)
654 print_line_count(o
->file
, lc_a
);
656 fprintf(o
->file
, "?,?");
657 fprintf(o
->file
, " +");
658 print_line_count(o
->file
, lc_b
);
659 fprintf(o
->file
, " @@%s\n", reset
);
660 if (lc_a
&& !o
->irreversible_delete
)
661 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
663 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
665 free((char *)data_one
);
667 free((char *)data_two
);
670 struct diff_words_buffer
{
673 struct diff_words_orig
{
674 const char *begin
, *end
;
676 int orig_nr
, orig_alloc
;
679 static void diff_words_append(char *line
, unsigned long len
,
680 struct diff_words_buffer
*buffer
)
682 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
685 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
686 buffer
->text
.size
+= len
;
687 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
690 struct diff_words_style_elem
{
693 const char *color
; /* NULL; filled in by the setup code if
694 * color is enabled */
697 struct diff_words_style
{
698 enum diff_words_type type
;
699 struct diff_words_style_elem
new, old
, ctx
;
703 static struct diff_words_style diff_words_styles
[] = {
704 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
705 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
706 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
709 struct diff_words_data
{
710 struct diff_words_buffer minus
, plus
;
711 const char *current_plus
;
713 struct diff_options
*opt
;
715 enum diff_words_type type
;
716 struct diff_words_style
*style
;
719 static int fn_out_diff_words_write_helper(FILE *fp
,
720 struct diff_words_style_elem
*st_el
,
722 size_t count
, const char *buf
,
723 const char *line_prefix
)
728 char *p
= memchr(buf
, '\n', count
);
730 fputs(line_prefix
, fp
);
732 if (st_el
->color
&& fputs(st_el
->color
, fp
) < 0)
734 if (fputs(st_el
->prefix
, fp
) < 0 ||
735 fwrite(buf
, p
? p
- buf
: count
, 1, fp
) != 1 ||
736 fputs(st_el
->suffix
, fp
) < 0)
738 if (st_el
->color
&& *st_el
->color
739 && fputs(GIT_COLOR_RESET
, fp
) < 0)
744 if (fputs(newline
, fp
) < 0)
746 count
-= p
+ 1 - buf
;
754 * '--color-words' algorithm can be described as:
756 * 1. collect a the minus/plus lines of a diff hunk, divided into
757 * minus-lines and plus-lines;
759 * 2. break both minus-lines and plus-lines into words and
760 * place them into two mmfile_t with one word for each line;
762 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
764 * And for the common parts of the both file, we output the plus side text.
765 * diff_words->current_plus is used to trace the current position of the plus file
766 * which printed. diff_words->last_minus is used to trace the last minus word
769 * For '--graph' to work with '--color-words', we need to output the graph prefix
770 * on each line of color words output. Generally, there are two conditions on
771 * which we should output the prefix.
773 * 1. diff_words->last_minus == 0 &&
774 * diff_words->current_plus == diff_words->plus.text.ptr
776 * that is: the plus text must start as a new line, and if there is no minus
777 * word printed, a graph prefix must be printed.
779 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
780 * *(diff_words->current_plus - 1) == '\n'
782 * that is: a graph prefix must be printed following a '\n'
784 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
786 if ((diff_words
->last_minus
== 0 &&
787 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
788 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
789 *(diff_words
->current_plus
- 1) == '\n')) {
796 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
798 struct diff_words_data
*diff_words
= priv
;
799 struct diff_words_style
*style
= diff_words
->style
;
800 int minus_first
, minus_len
, plus_first
, plus_len
;
801 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
802 struct diff_options
*opt
= diff_words
->opt
;
803 struct strbuf
*msgbuf
;
804 char *line_prefix
= "";
806 if (line
[0] != '@' || parse_hunk_header(line
, len
,
807 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
811 if (opt
->output_prefix
) {
812 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
813 line_prefix
= msgbuf
->buf
;
816 /* POSIX requires that first be decremented by one if len == 0... */
818 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
820 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
822 minus_begin
= minus_end
=
823 diff_words
->minus
.orig
[minus_first
].end
;
826 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
827 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
829 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
831 if (color_words_output_graph_prefix(diff_words
)) {
832 fputs(line_prefix
, diff_words
->opt
->file
);
834 if (diff_words
->current_plus
!= plus_begin
) {
835 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
836 &style
->ctx
, style
->newline
,
837 plus_begin
- diff_words
->current_plus
,
838 diff_words
->current_plus
, line_prefix
);
839 if (*(plus_begin
- 1) == '\n')
840 fputs(line_prefix
, diff_words
->opt
->file
);
842 if (minus_begin
!= minus_end
) {
843 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
844 &style
->old
, style
->newline
,
845 minus_end
- minus_begin
, minus_begin
,
848 if (plus_begin
!= plus_end
) {
849 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
850 &style
->new, style
->newline
,
851 plus_end
- plus_begin
, plus_begin
,
855 diff_words
->current_plus
= plus_end
;
856 diff_words
->last_minus
= minus_first
;
859 /* This function starts looking at *begin, and returns 0 iff a word was found. */
860 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
861 int *begin
, int *end
)
863 if (word_regex
&& *begin
< buffer
->size
) {
865 if (!regexec(word_regex
, buffer
->ptr
+ *begin
, 1, match
, 0)) {
866 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
867 '\n', match
[0].rm_eo
- match
[0].rm_so
);
868 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
869 *begin
+= match
[0].rm_so
;
870 return *begin
>= *end
;
875 /* find the next word */
876 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
878 if (*begin
>= buffer
->size
)
881 /* find the end of the word */
883 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
890 * This function splits the words in buffer->text, stores the list with
891 * newline separator into out, and saves the offsets of the original words
894 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
903 /* fake an empty "0th" word */
904 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
905 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
908 for (i
= 0; i
< buffer
->text
.size
; i
++) {
909 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
912 /* store original boundaries */
913 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
915 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
916 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
920 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
921 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
922 out
->ptr
[out
->size
+ j
- i
] = '\n';
923 out
->size
+= j
- i
+ 1;
929 /* this executes the word diff on the accumulated buffers */
930 static void diff_words_show(struct diff_words_data
*diff_words
)
934 mmfile_t minus
, plus
;
935 struct diff_words_style
*style
= diff_words
->style
;
937 struct diff_options
*opt
= diff_words
->opt
;
938 struct strbuf
*msgbuf
;
939 char *line_prefix
= "";
942 if (opt
->output_prefix
) {
943 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
944 line_prefix
= msgbuf
->buf
;
947 /* special case: only removal */
948 if (!diff_words
->plus
.text
.size
) {
949 fputs(line_prefix
, diff_words
->opt
->file
);
950 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
951 &style
->old
, style
->newline
,
952 diff_words
->minus
.text
.size
,
953 diff_words
->minus
.text
.ptr
, line_prefix
);
954 diff_words
->minus
.text
.size
= 0;
958 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
959 diff_words
->last_minus
= 0;
961 memset(&xpp
, 0, sizeof(xpp
));
962 memset(&xecfg
, 0, sizeof(xecfg
));
963 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
964 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
966 /* as only the hunk header will be parsed, we need a 0-context */
968 xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
972 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
973 diff_words
->plus
.text
.size
) {
974 if (color_words_output_graph_prefix(diff_words
))
975 fputs(line_prefix
, diff_words
->opt
->file
);
976 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
977 &style
->ctx
, style
->newline
,
978 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
979 - diff_words
->current_plus
, diff_words
->current_plus
,
982 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
985 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
986 static void diff_words_flush(struct emit_callback
*ecbdata
)
988 if (ecbdata
->diff_words
->minus
.text
.size
||
989 ecbdata
->diff_words
->plus
.text
.size
)
990 diff_words_show(ecbdata
->diff_words
);
993 static void diff_filespec_load_driver(struct diff_filespec
*one
)
995 /* Use already-loaded driver */
999 if (S_ISREG(one
->mode
))
1000 one
->driver
= userdiff_find_by_path(one
->path
);
1002 /* Fallback to default settings */
1004 one
->driver
= userdiff_find_by_name("default");
1007 static const char *userdiff_word_regex(struct diff_filespec
*one
)
1009 diff_filespec_load_driver(one
);
1010 return one
->driver
->word_regex
;
1013 static void init_diff_words_data(struct emit_callback
*ecbdata
,
1014 struct diff_options
*orig_opts
,
1015 struct diff_filespec
*one
,
1016 struct diff_filespec
*two
)
1019 struct diff_options
*o
= xmalloc(sizeof(struct diff_options
));
1020 memcpy(o
, orig_opts
, sizeof(struct diff_options
));
1022 ecbdata
->diff_words
=
1023 xcalloc(1, sizeof(struct diff_words_data
));
1024 ecbdata
->diff_words
->type
= o
->word_diff
;
1025 ecbdata
->diff_words
->opt
= o
;
1027 o
->word_regex
= userdiff_word_regex(one
);
1029 o
->word_regex
= userdiff_word_regex(two
);
1031 o
->word_regex
= diff_word_regex_cfg
;
1032 if (o
->word_regex
) {
1033 ecbdata
->diff_words
->word_regex
= (regex_t
*)
1034 xmalloc(sizeof(regex_t
));
1035 if (regcomp(ecbdata
->diff_words
->word_regex
,
1037 REG_EXTENDED
| REG_NEWLINE
))
1038 die ("Invalid regular expression: %s",
1041 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
1042 if (o
->word_diff
== diff_words_styles
[i
].type
) {
1043 ecbdata
->diff_words
->style
=
1044 &diff_words_styles
[i
];
1048 if (want_color(o
->use_color
)) {
1049 struct diff_words_style
*st
= ecbdata
->diff_words
->style
;
1050 st
->old
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1051 st
->new.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1052 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_PLAIN
);
1056 static void free_diff_words_data(struct emit_callback
*ecbdata
)
1058 if (ecbdata
->diff_words
) {
1059 diff_words_flush(ecbdata
);
1060 free (ecbdata
->diff_words
->opt
);
1061 free (ecbdata
->diff_words
->minus
.text
.ptr
);
1062 free (ecbdata
->diff_words
->minus
.orig
);
1063 free (ecbdata
->diff_words
->plus
.text
.ptr
);
1064 free (ecbdata
->diff_words
->plus
.orig
);
1065 if (ecbdata
->diff_words
->word_regex
) {
1066 regfree(ecbdata
->diff_words
->word_regex
);
1067 free(ecbdata
->diff_words
->word_regex
);
1069 free(ecbdata
->diff_words
);
1070 ecbdata
->diff_words
= NULL
;
1074 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
1076 if (want_color(diff_use_color
))
1077 return diff_colors
[ix
];
1081 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
1084 unsigned long allot
;
1088 return ecb
->truncate(line
, len
);
1092 (void) utf8_width(&cp
, &l
);
1094 break; /* truncated in the middle? */
1099 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
1102 ecbdata
->lno_in_preimage
= 0;
1103 ecbdata
->lno_in_postimage
= 0;
1104 p
= strchr(line
, '-');
1106 return; /* cannot happen */
1107 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
1110 return; /* cannot happen */
1111 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
1114 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
1116 struct emit_callback
*ecbdata
= priv
;
1117 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
1118 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
1119 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1120 struct diff_options
*o
= ecbdata
->opt
;
1121 char *line_prefix
= "";
1122 struct strbuf
*msgbuf
;
1124 if (o
&& o
->output_prefix
) {
1125 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
1126 line_prefix
= msgbuf
->buf
;
1129 if (ecbdata
->header
) {
1130 fprintf(ecbdata
->opt
->file
, "%s", ecbdata
->header
->buf
);
1131 strbuf_reset(ecbdata
->header
);
1132 ecbdata
->header
= NULL
;
1134 *(ecbdata
->found_changesp
) = 1;
1136 if (ecbdata
->label_path
[0]) {
1137 const char *name_a_tab
, *name_b_tab
;
1139 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
1140 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
1142 fprintf(ecbdata
->opt
->file
, "%s%s--- %s%s%s\n",
1143 line_prefix
, meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
1144 fprintf(ecbdata
->opt
->file
, "%s%s+++ %s%s%s\n",
1145 line_prefix
, meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
1146 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
1149 if (diff_suppress_blank_empty
1150 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
1155 if (line
[0] == '@') {
1156 if (ecbdata
->diff_words
)
1157 diff_words_flush(ecbdata
);
1158 len
= sane_truncate_line(ecbdata
, line
, len
);
1159 find_lno(line
, ecbdata
);
1160 emit_hunk_header(ecbdata
, line
, len
);
1161 if (line
[len
-1] != '\n')
1162 putc('\n', ecbdata
->opt
->file
);
1167 emit_line(ecbdata
->opt
, reset
, reset
, line
, len
);
1168 if (ecbdata
->diff_words
1169 && ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
)
1170 fputs("~\n", ecbdata
->opt
->file
);
1174 if (ecbdata
->diff_words
) {
1175 if (line
[0] == '-') {
1176 diff_words_append(line
, len
,
1177 &ecbdata
->diff_words
->minus
);
1179 } else if (line
[0] == '+') {
1180 diff_words_append(line
, len
,
1181 &ecbdata
->diff_words
->plus
);
1183 } else if (!prefixcmp(line
, "\\ ")) {
1185 * Eat the "no newline at eof" marker as if we
1186 * saw a "+" or "-" line with nothing on it,
1187 * and return without diff_words_flush() to
1188 * defer processing. If this is the end of
1189 * preimage, more "+" lines may come after it.
1193 diff_words_flush(ecbdata
);
1194 if (ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
) {
1195 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
1196 fputs("~\n", ecbdata
->opt
->file
);
1199 * Skip the prefix character, if any. With
1200 * diff_suppress_blank_empty, there may be
1203 if (line
[0] != '\n') {
1207 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
1212 if (line
[0] != '+') {
1214 diff_get_color(ecbdata
->color_diff
,
1215 line
[0] == '-' ? DIFF_FILE_OLD
: DIFF_PLAIN
);
1216 ecbdata
->lno_in_preimage
++;
1218 ecbdata
->lno_in_postimage
++;
1219 emit_line(ecbdata
->opt
, color
, reset
, line
, len
);
1221 ecbdata
->lno_in_postimage
++;
1222 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
1226 static char *pprint_rename(const char *a
, const char *b
)
1228 const char *old
= a
;
1229 const char *new = b
;
1230 struct strbuf name
= STRBUF_INIT
;
1231 int pfx_length
, sfx_length
;
1232 int len_a
= strlen(a
);
1233 int len_b
= strlen(b
);
1234 int a_midlen
, b_midlen
;
1235 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
1236 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
1238 if (qlen_a
|| qlen_b
) {
1239 quote_c_style(a
, &name
, NULL
, 0);
1240 strbuf_addstr(&name
, " => ");
1241 quote_c_style(b
, &name
, NULL
, 0);
1242 return strbuf_detach(&name
, NULL
);
1245 /* Find common prefix */
1247 while (*old
&& *new && *old
== *new) {
1249 pfx_length
= old
- a
+ 1;
1254 /* Find common suffix */
1258 while (a
<= old
&& b
<= new && *old
== *new) {
1260 sfx_length
= len_a
- (old
- a
);
1266 * pfx{mid-a => mid-b}sfx
1267 * {pfx-a => pfx-b}sfx
1268 * pfx{sfx-a => sfx-b}
1271 a_midlen
= len_a
- pfx_length
- sfx_length
;
1272 b_midlen
= len_b
- pfx_length
- sfx_length
;
1278 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
1279 if (pfx_length
+ sfx_length
) {
1280 strbuf_add(&name
, a
, pfx_length
);
1281 strbuf_addch(&name
, '{');
1283 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
1284 strbuf_addstr(&name
, " => ");
1285 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
1286 if (pfx_length
+ sfx_length
) {
1287 strbuf_addch(&name
, '}');
1288 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
1290 return strbuf_detach(&name
, NULL
);
1296 struct diffstat_file
{
1300 unsigned is_unmerged
:1;
1301 unsigned is_binary
:1;
1302 unsigned is_renamed
:1;
1303 unsigned is_interesting
:1;
1304 uintmax_t added
, deleted
;
1308 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
1312 struct diffstat_file
*x
;
1313 x
= xcalloc(sizeof (*x
), 1);
1314 if (diffstat
->nr
== diffstat
->alloc
) {
1315 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
1316 diffstat
->files
= xrealloc(diffstat
->files
,
1317 diffstat
->alloc
* sizeof(x
));
1319 diffstat
->files
[diffstat
->nr
++] = x
;
1321 x
->from_name
= xstrdup(name_a
);
1322 x
->name
= xstrdup(name_b
);
1326 x
->from_name
= NULL
;
1327 x
->name
= xstrdup(name_a
);
1332 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
1334 struct diffstat_t
*diffstat
= priv
;
1335 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
1339 else if (line
[0] == '-')
1343 const char mime_boundary_leader
[] = "------------";
1345 static int scale_linear(int it
, int width
, int max_change
)
1350 * make sure that at least one '-' or '+' is printed if
1351 * there is any change to this path. The easiest way is to
1352 * scale linearly as if the alloted width is one column shorter
1353 * than it is, and then add 1 to the result.
1355 return 1 + (it
* (width
- 1) / max_change
);
1358 static void show_name(FILE *file
,
1359 const char *prefix
, const char *name
, int len
)
1361 fprintf(file
, " %s%-*s |", prefix
, len
, name
);
1364 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
1368 fprintf(file
, "%s", set
);
1371 fprintf(file
, "%s", reset
);
1374 static void fill_print_name(struct diffstat_file
*file
)
1378 if (file
->print_name
)
1381 if (!file
->is_renamed
) {
1382 struct strbuf buf
= STRBUF_INIT
;
1383 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
1384 pname
= strbuf_detach(&buf
, NULL
);
1387 strbuf_release(&buf
);
1390 pname
= pprint_rename(file
->from_name
, file
->name
);
1392 file
->print_name
= pname
;
1395 int print_stat_summary(FILE *fp
, int files
, int insertions
, int deletions
)
1397 struct strbuf sb
= STRBUF_INIT
;
1401 assert(insertions
== 0 && deletions
== 0);
1402 return fprintf(fp
, "%s\n", " 0 files changed");
1406 (files
== 1) ? " %d file changed" : " %d files changed",
1410 * For binary diff, the caller may want to print "x files
1411 * changed" with insertions == 0 && deletions == 0.
1413 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1414 * is probably less confusing (i.e skip over "2 files changed
1415 * but nothing about added/removed lines? Is this a bug in Git?").
1417 if (insertions
|| deletions
== 0) {
1419 * TRANSLATORS: "+" in (+) is a line addition marker;
1420 * do not translate it.
1423 (insertions
== 1) ? ", %d insertion(+)" : ", %d insertions(+)",
1427 if (deletions
|| insertions
== 0) {
1429 * TRANSLATORS: "-" in (-) is a line removal marker;
1430 * do not translate it.
1433 (deletions
== 1) ? ", %d deletion(-)" : ", %d deletions(-)",
1436 strbuf_addch(&sb
, '\n');
1437 ret
= fputs(sb
.buf
, fp
);
1438 strbuf_release(&sb
);
1442 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
1444 int i
, len
, add
, del
, adds
= 0, dels
= 0;
1445 uintmax_t max_change
= 0, max_len
= 0;
1446 int total_files
= data
->nr
, count
;
1447 int width
, name_width
, graph_width
, number_width
= 0, bin_width
= 0;
1448 const char *reset
, *add_c
, *del_c
;
1449 const char *line_prefix
= "";
1450 int extra_shown
= 0;
1451 struct strbuf
*msg
= NULL
;
1456 if (options
->output_prefix
) {
1457 msg
= options
->output_prefix(options
, options
->output_prefix_data
);
1458 line_prefix
= msg
->buf
;
1461 count
= options
->stat_count
? options
->stat_count
: data
->nr
;
1463 reset
= diff_get_color_opt(options
, DIFF_RESET
);
1464 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
1465 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
1468 * Find the longest filename and max number of changes
1470 for (i
= 0; (i
< count
) && (i
< data
->nr
); i
++) {
1471 struct diffstat_file
*file
= data
->files
[i
];
1472 uintmax_t change
= file
->added
+ file
->deleted
;
1474 if (!file
->is_interesting
&& (change
== 0)) {
1475 count
++; /* not shown == room for one more */
1478 fill_print_name(file
);
1479 len
= strlen(file
->print_name
);
1483 if (file
->is_unmerged
) {
1484 /* "Unmerged" is 8 characters */
1485 bin_width
= bin_width
< 8 ? 8 : bin_width
;
1488 if (file
->is_binary
) {
1489 /* "Bin XXX -> YYY bytes" */
1490 int w
= 14 + decimal_width(file
->added
)
1491 + decimal_width(file
->deleted
);
1492 bin_width
= bin_width
< w
? w
: bin_width
;
1493 /* Display change counts aligned with "Bin" */
1498 if (max_change
< change
)
1499 max_change
= change
;
1501 count
= i
; /* where we can stop scanning in data->files[] */
1504 * We have width = stat_width or term_columns() columns total.
1505 * We want a maximum of min(max_len, stat_name_width) for the name part.
1506 * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1507 * We also need 1 for " " and 4 + decimal_width(max_change)
1508 * for " | NNNN " and one the empty column at the end, altogether
1509 * 6 + decimal_width(max_change).
1511 * If there's not enough space, we will use the smaller of
1512 * stat_name_width (if set) and 5/8*width for the filename,
1513 * and the rest for constant elements + graph part, but no more
1514 * than stat_graph_width for the graph part.
1515 * (5/8 gives 50 for filename and 30 for the constant parts + graph
1516 * for the standard terminal size).
1518 * In other words: stat_width limits the maximum width, and
1519 * stat_name_width fixes the maximum width of the filename,
1520 * and is also used to divide available columns if there
1523 * Binary files are displayed with "Bin XXX -> YYY bytes"
1524 * instead of the change count and graph. This part is treated
1525 * similarly to the graph part, except that it is not
1526 * "scaled". If total width is too small to accomodate the
1527 * guaranteed minimum width of the filename part and the
1528 * separators and this message, this message will "overflow"
1529 * making the line longer than the maximum width.
1532 if (options
->stat_width
== -1)
1533 width
= term_columns() - options
->output_prefix_length
;
1535 width
= options
->stat_width
? options
->stat_width
: 80;
1536 number_width
= decimal_width(max_change
) > number_width
?
1537 decimal_width(max_change
) : number_width
;
1539 if (options
->stat_graph_width
== -1)
1540 options
->stat_graph_width
= diff_stat_graph_width
;
1543 * Guarantee 3/8*16==6 for the graph part
1544 * and 5/8*16==10 for the filename part
1546 if (width
< 16 + 6 + number_width
)
1547 width
= 16 + 6 + number_width
;
1550 * First assign sizes that are wanted, ignoring available width.
1551 * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1552 * starting from "XXX" should fit in graph_width.
1554 graph_width
= max_change
+ 4 > bin_width
? max_change
: bin_width
- 4;
1555 if (options
->stat_graph_width
&&
1556 options
->stat_graph_width
< graph_width
)
1557 graph_width
= options
->stat_graph_width
;
1559 name_width
= (options
->stat_name_width
> 0 &&
1560 options
->stat_name_width
< max_len
) ?
1561 options
->stat_name_width
: max_len
;
1564 * Adjust adjustable widths not to exceed maximum width
1566 if (name_width
+ number_width
+ 6 + graph_width
> width
) {
1567 if (graph_width
> width
* 3/8 - number_width
- 6) {
1568 graph_width
= width
* 3/8 - number_width
- 6;
1569 if (graph_width
< 6)
1573 if (options
->stat_graph_width
&&
1574 graph_width
> options
->stat_graph_width
)
1575 graph_width
= options
->stat_graph_width
;
1576 if (name_width
> width
- number_width
- 6 - graph_width
)
1577 name_width
= width
- number_width
- 6 - graph_width
;
1579 graph_width
= width
- number_width
- 6 - name_width
;
1583 * From here name_width is the width of the name area,
1584 * and graph_width is the width of the graph area.
1585 * max_change is used to scale graph properly.
1587 for (i
= 0; i
< count
; i
++) {
1588 const char *prefix
= "";
1589 struct diffstat_file
*file
= data
->files
[i
];
1590 char *name
= file
->print_name
;
1591 uintmax_t added
= file
->added
;
1592 uintmax_t deleted
= file
->deleted
;
1595 if (!file
->is_interesting
&& (added
+ deleted
== 0))
1599 * "scale" the filename
1602 name_len
= strlen(name
);
1603 if (name_width
< name_len
) {
1607 name
+= name_len
- len
;
1608 slash
= strchr(name
, '/');
1613 if (file
->is_binary
) {
1614 fprintf(options
->file
, "%s", line_prefix
);
1615 show_name(options
->file
, prefix
, name
, len
);
1616 fprintf(options
->file
, " %*s", number_width
, "Bin");
1617 if (!added
&& !deleted
) {
1618 putc('\n', options
->file
);
1621 fprintf(options
->file
, " %s%"PRIuMAX
"%s",
1622 del_c
, deleted
, reset
);
1623 fprintf(options
->file
, " -> ");
1624 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1625 add_c
, added
, reset
);
1626 fprintf(options
->file
, " bytes");
1627 fprintf(options
->file
, "\n");
1630 else if (file
->is_unmerged
) {
1631 fprintf(options
->file
, "%s", line_prefix
);
1632 show_name(options
->file
, prefix
, name
, len
);
1633 fprintf(options
->file
, " Unmerged\n");
1638 * scale the add/delete
1643 if (graph_width
<= max_change
) {
1644 int total
= add
+ del
;
1646 total
= scale_linear(add
+ del
, graph_width
, max_change
);
1647 if (total
< 2 && add
&& del
)
1648 /* width >= 2 due to the sanity check */
1651 add
= scale_linear(add
, graph_width
, max_change
);
1654 del
= scale_linear(del
, graph_width
, max_change
);
1658 fprintf(options
->file
, "%s", line_prefix
);
1659 show_name(options
->file
, prefix
, name
, len
);
1660 fprintf(options
->file
, " %*"PRIuMAX
"%s",
1661 number_width
, added
+ deleted
,
1662 added
+ deleted
? " " : "");
1663 show_graph(options
->file
, '+', add
, add_c
, reset
);
1664 show_graph(options
->file
, '-', del
, del_c
, reset
);
1665 fprintf(options
->file
, "\n");
1668 for (i
= 0; i
< data
->nr
; i
++) {
1669 struct diffstat_file
*file
= data
->files
[i
];
1670 uintmax_t added
= file
->added
;
1671 uintmax_t deleted
= file
->deleted
;
1673 if (file
->is_unmerged
||
1674 (!file
->is_interesting
&& (added
+ deleted
== 0))) {
1679 if (!file
->is_binary
) {
1686 fprintf(options
->file
, "%s ...\n", line_prefix
);
1689 fprintf(options
->file
, "%s", line_prefix
);
1690 print_stat_summary(options
->file
, total_files
, adds
, dels
);
1693 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
1695 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
1700 for (i
= 0; i
< data
->nr
; i
++) {
1701 int added
= data
->files
[i
]->added
;
1702 int deleted
= data
->files
[i
]->deleted
;
1704 if (data
->files
[i
]->is_unmerged
||
1705 (!data
->files
[i
]->is_interesting
&& (added
+ deleted
== 0))) {
1707 } else if (!data
->files
[i
]->is_binary
) { /* don't count bytes */
1712 if (options
->output_prefix
) {
1713 struct strbuf
*msg
= NULL
;
1714 msg
= options
->output_prefix(options
,
1715 options
->output_prefix_data
);
1716 fprintf(options
->file
, "%s", msg
->buf
);
1718 print_stat_summary(options
->file
, total_files
, adds
, dels
);
1721 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
1728 for (i
= 0; i
< data
->nr
; i
++) {
1729 struct diffstat_file
*file
= data
->files
[i
];
1731 if (options
->output_prefix
) {
1732 struct strbuf
*msg
= NULL
;
1733 msg
= options
->output_prefix(options
,
1734 options
->output_prefix_data
);
1735 fprintf(options
->file
, "%s", msg
->buf
);
1738 if (file
->is_binary
)
1739 fprintf(options
->file
, "-\t-\t");
1741 fprintf(options
->file
,
1742 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
1743 file
->added
, file
->deleted
);
1744 if (options
->line_termination
) {
1745 fill_print_name(file
);
1746 if (!file
->is_renamed
)
1747 write_name_quoted(file
->name
, options
->file
,
1748 options
->line_termination
);
1750 fputs(file
->print_name
, options
->file
);
1751 putc(options
->line_termination
, options
->file
);
1754 if (file
->is_renamed
) {
1755 putc('\0', options
->file
);
1756 write_name_quoted(file
->from_name
, options
->file
, '\0');
1758 write_name_quoted(file
->name
, options
->file
, '\0');
1763 struct dirstat_file
{
1765 unsigned long changed
;
1768 struct dirstat_dir
{
1769 struct dirstat_file
*files
;
1770 int alloc
, nr
, permille
, cumulative
;
1773 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
1774 unsigned long changed
, const char *base
, int baselen
)
1776 unsigned long this_dir
= 0;
1777 unsigned int sources
= 0;
1778 const char *line_prefix
= "";
1779 struct strbuf
*msg
= NULL
;
1781 if (opt
->output_prefix
) {
1782 msg
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
1783 line_prefix
= msg
->buf
;
1787 struct dirstat_file
*f
= dir
->files
;
1788 int namelen
= strlen(f
->name
);
1792 if (namelen
< baselen
)
1794 if (memcmp(f
->name
, base
, baselen
))
1796 slash
= strchr(f
->name
+ baselen
, '/');
1798 int newbaselen
= slash
+ 1 - f
->name
;
1799 this = gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
1811 * We don't report dirstat's for
1813 * - or cases where everything came from a single directory
1814 * under this directory (sources == 1).
1816 if (baselen
&& sources
!= 1) {
1818 int permille
= this_dir
* 1000 / changed
;
1819 if (permille
>= dir
->permille
) {
1820 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
1821 permille
/ 10, permille
% 10, baselen
, base
);
1822 if (!dir
->cumulative
)
1830 static int dirstat_compare(const void *_a
, const void *_b
)
1832 const struct dirstat_file
*a
= _a
;
1833 const struct dirstat_file
*b
= _b
;
1834 return strcmp(a
->name
, b
->name
);
1837 static void show_dirstat(struct diff_options
*options
)
1840 unsigned long changed
;
1841 struct dirstat_dir dir
;
1842 struct diff_queue_struct
*q
= &diff_queued_diff
;
1847 dir
.permille
= options
->dirstat_permille
;
1848 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1851 for (i
= 0; i
< q
->nr
; i
++) {
1852 struct diff_filepair
*p
= q
->queue
[i
];
1854 unsigned long copied
, added
, damage
;
1855 int content_changed
;
1857 name
= p
->two
->path
? p
->two
->path
: p
->one
->path
;
1859 if (p
->one
->sha1_valid
&& p
->two
->sha1_valid
)
1860 content_changed
= hashcmp(p
->one
->sha1
, p
->two
->sha1
);
1862 content_changed
= 1;
1864 if (!content_changed
) {
1866 * The SHA1 has not changed, so pre-/post-content is
1867 * identical. We can therefore skip looking at the
1868 * file contents altogether.
1874 if (DIFF_OPT_TST(options
, DIRSTAT_BY_FILE
)) {
1876 * In --dirstat-by-file mode, we don't really need to
1877 * look at the actual file contents at all.
1878 * The fact that the SHA1 changed is enough for us to
1879 * add this file to the list of results
1880 * (with each file contributing equal damage).
1886 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1887 diff_populate_filespec(p
->one
, 0);
1888 diff_populate_filespec(p
->two
, 0);
1889 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1891 diff_free_filespec_data(p
->one
);
1892 diff_free_filespec_data(p
->two
);
1893 } else if (DIFF_FILE_VALID(p
->one
)) {
1894 diff_populate_filespec(p
->one
, 1);
1896 diff_free_filespec_data(p
->one
);
1897 } else if (DIFF_FILE_VALID(p
->two
)) {
1898 diff_populate_filespec(p
->two
, 1);
1900 added
= p
->two
->size
;
1901 diff_free_filespec_data(p
->two
);
1906 * Original minus copied is the removed material,
1907 * added is the new material. They are both damages
1908 * made to the preimage.
1909 * If the resulting damage is zero, we know that
1910 * diffcore_count_changes() considers the two entries to
1911 * be identical, but since content_changed is true, we
1912 * know that there must have been _some_ kind of change,
1913 * so we force all entries to have damage > 0.
1915 damage
= (p
->one
->size
- copied
) + added
;
1920 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1921 dir
.files
[dir
.nr
].name
= name
;
1922 dir
.files
[dir
.nr
].changed
= damage
;
1927 /* This can happen even with many files, if everything was renames */
1931 /* Show all directories with more than x% of the changes */
1932 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1933 gather_dirstat(options
, &dir
, changed
, "", 0);
1936 static void show_dirstat_by_line(struct diffstat_t
*data
, struct diff_options
*options
)
1939 unsigned long changed
;
1940 struct dirstat_dir dir
;
1948 dir
.permille
= options
->dirstat_permille
;
1949 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1952 for (i
= 0; i
< data
->nr
; i
++) {
1953 struct diffstat_file
*file
= data
->files
[i
];
1954 unsigned long damage
= file
->added
+ file
->deleted
;
1955 if (file
->is_binary
)
1957 * binary files counts bytes, not lines. Must find some
1958 * way to normalize binary bytes vs. textual lines.
1959 * The following heuristic assumes that there are 64
1961 * This is stupid and ugly, but very cheap...
1963 damage
= (damage
+ 63) / 64;
1964 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1965 dir
.files
[dir
.nr
].name
= file
->name
;
1966 dir
.files
[dir
.nr
].changed
= damage
;
1971 /* This can happen even with many files, if everything was renames */
1975 /* Show all directories with more than x% of the changes */
1976 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1977 gather_dirstat(options
, &dir
, changed
, "", 0);
1980 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1983 for (i
= 0; i
< diffstat
->nr
; i
++) {
1984 struct diffstat_file
*f
= diffstat
->files
[i
];
1985 if (f
->name
!= f
->print_name
)
1986 free(f
->print_name
);
1991 free(diffstat
->files
);
1994 struct checkdiff_t
{
1995 const char *filename
;
1997 int conflict_marker_size
;
1998 struct diff_options
*o
;
2003 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
2008 if (len
< marker_size
+ 1)
2010 firstchar
= line
[0];
2011 switch (firstchar
) {
2012 case '=': case '>': case '<': case '|':
2017 for (cnt
= 1; cnt
< marker_size
; cnt
++)
2018 if (line
[cnt
] != firstchar
)
2020 /* line[1] thru line[marker_size-1] are same as firstchar */
2021 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
2026 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
2028 struct checkdiff_t
*data
= priv
;
2029 int marker_size
= data
->conflict_marker_size
;
2030 const char *ws
= diff_get_color(data
->o
->use_color
, DIFF_WHITESPACE
);
2031 const char *reset
= diff_get_color(data
->o
->use_color
, DIFF_RESET
);
2032 const char *set
= diff_get_color(data
->o
->use_color
, DIFF_FILE_NEW
);
2034 char *line_prefix
= "";
2035 struct strbuf
*msgbuf
;
2038 if (data
->o
->output_prefix
) {
2039 msgbuf
= data
->o
->output_prefix(data
->o
,
2040 data
->o
->output_prefix_data
);
2041 line_prefix
= msgbuf
->buf
;
2044 if (line
[0] == '+') {
2047 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
2049 fprintf(data
->o
->file
,
2050 "%s%s:%d: leftover conflict marker\n",
2051 line_prefix
, data
->filename
, data
->lineno
);
2053 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
2056 data
->status
|= bad
;
2057 err
= whitespace_error_string(bad
);
2058 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
2059 line_prefix
, data
->filename
, data
->lineno
, err
);
2061 emit_line(data
->o
, set
, reset
, line
, 1);
2062 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
2063 data
->o
->file
, set
, reset
, ws
);
2064 } else if (line
[0] == ' ') {
2066 } else if (line
[0] == '@') {
2067 char *plus
= strchr(line
, '+');
2069 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
2071 die("invalid diff");
2075 static unsigned char *deflate_it(char *data
,
2077 unsigned long *result_size
)
2080 unsigned char *deflated
;
2083 memset(&stream
, 0, sizeof(stream
));
2084 git_deflate_init(&stream
, zlib_compression_level
);
2085 bound
= git_deflate_bound(&stream
, size
);
2086 deflated
= xmalloc(bound
);
2087 stream
.next_out
= deflated
;
2088 stream
.avail_out
= bound
;
2090 stream
.next_in
= (unsigned char *)data
;
2091 stream
.avail_in
= size
;
2092 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
2094 git_deflate_end(&stream
);
2095 *result_size
= stream
.total_out
;
2099 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
, char *prefix
)
2105 unsigned long orig_size
;
2106 unsigned long delta_size
;
2107 unsigned long deflate_size
;
2108 unsigned long data_size
;
2110 /* We could do deflated delta, or we could do just deflated two,
2111 * whichever is smaller.
2114 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
2115 if (one
->size
&& two
->size
) {
2116 delta
= diff_delta(one
->ptr
, one
->size
,
2117 two
->ptr
, two
->size
,
2118 &delta_size
, deflate_size
);
2120 void *to_free
= delta
;
2121 orig_size
= delta_size
;
2122 delta
= deflate_it(delta
, delta_size
, &delta_size
);
2127 if (delta
&& delta_size
< deflate_size
) {
2128 fprintf(file
, "%sdelta %lu\n", prefix
, orig_size
);
2131 data_size
= delta_size
;
2134 fprintf(file
, "%sliteral %lu\n", prefix
, two
->size
);
2137 data_size
= deflate_size
;
2140 /* emit data encoded in base85 */
2143 int bytes
= (52 < data_size
) ? 52 : data_size
;
2147 line
[0] = bytes
+ 'A' - 1;
2149 line
[0] = bytes
- 26 + 'a' - 1;
2150 encode_85(line
+ 1, cp
, bytes
);
2151 cp
= (char *) cp
+ bytes
;
2152 fprintf(file
, "%s", prefix
);
2156 fprintf(file
, "%s\n", prefix
);
2160 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
, char *prefix
)
2162 fprintf(file
, "%sGIT binary patch\n", prefix
);
2163 emit_binary_diff_body(file
, one
, two
, prefix
);
2164 emit_binary_diff_body(file
, two
, one
, prefix
);
2167 int diff_filespec_is_binary(struct diff_filespec
*one
)
2169 if (one
->is_binary
== -1) {
2170 diff_filespec_load_driver(one
);
2171 if (one
->driver
->binary
!= -1)
2172 one
->is_binary
= one
->driver
->binary
;
2174 if (!one
->data
&& DIFF_FILE_VALID(one
))
2175 diff_populate_filespec(one
, 0);
2177 one
->is_binary
= buffer_is_binary(one
->data
,
2179 if (one
->is_binary
== -1)
2183 return one
->is_binary
;
2186 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
2188 diff_filespec_load_driver(one
);
2189 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
2192 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
2194 if (!options
->a_prefix
)
2195 options
->a_prefix
= a
;
2196 if (!options
->b_prefix
)
2197 options
->b_prefix
= b
;
2200 struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
2202 if (!DIFF_FILE_VALID(one
))
2205 diff_filespec_load_driver(one
);
2206 return userdiff_get_textconv(one
->driver
);
2209 static void builtin_diff(const char *name_a
,
2211 struct diff_filespec
*one
,
2212 struct diff_filespec
*two
,
2213 const char *xfrm_msg
,
2214 int must_show_header
,
2215 struct diff_options
*o
,
2216 int complete_rewrite
)
2220 char *a_one
, *b_two
;
2221 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
2222 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
2223 const char *a_prefix
, *b_prefix
;
2224 struct userdiff_driver
*textconv_one
= NULL
;
2225 struct userdiff_driver
*textconv_two
= NULL
;
2226 struct strbuf header
= STRBUF_INIT
;
2227 struct strbuf
*msgbuf
;
2228 char *line_prefix
= "";
2230 if (o
->output_prefix
) {
2231 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
2232 line_prefix
= msgbuf
->buf
;
2235 if (DIFF_OPT_TST(o
, SUBMODULE_LOG
) &&
2236 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
2237 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
2238 const char *del
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2239 const char *add
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2240 show_submodule_summary(o
->file
, one
? one
->path
: two
->path
,
2241 one
->sha1
, two
->sha1
, two
->dirty_submodule
,
2246 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
2247 textconv_one
= get_textconv(one
);
2248 textconv_two
= get_textconv(two
);
2251 diff_set_mnemonic_prefix(o
, "a/", "b/");
2252 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
2253 a_prefix
= o
->b_prefix
;
2254 b_prefix
= o
->a_prefix
;
2256 a_prefix
= o
->a_prefix
;
2257 b_prefix
= o
->b_prefix
;
2260 /* Never use a non-valid filename anywhere if at all possible */
2261 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
2262 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
2264 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
2265 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
2266 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
2267 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
2268 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, set
, a_one
, b_two
, reset
);
2269 if (lbl
[0][0] == '/') {
2271 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, set
, two
->mode
, reset
);
2273 strbuf_addstr(&header
, xfrm_msg
);
2274 must_show_header
= 1;
2276 else if (lbl
[1][0] == '/') {
2277 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, set
, one
->mode
, reset
);
2279 strbuf_addstr(&header
, xfrm_msg
);
2280 must_show_header
= 1;
2283 if (one
->mode
!= two
->mode
) {
2284 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, set
, one
->mode
, reset
);
2285 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, set
, two
->mode
, reset
);
2286 must_show_header
= 1;
2289 strbuf_addstr(&header
, xfrm_msg
);
2292 * we do not run diff between different kind
2295 if ((one
->mode
^ two
->mode
) & S_IFMT
)
2296 goto free_ab_and_return
;
2297 if (complete_rewrite
&&
2298 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
2299 (textconv_two
|| !diff_filespec_is_binary(two
))) {
2300 fprintf(o
->file
, "%s", header
.buf
);
2301 strbuf_reset(&header
);
2302 emit_rewrite_diff(name_a
, name_b
, one
, two
,
2303 textconv_one
, textconv_two
, o
);
2304 o
->found_changes
= 1;
2305 goto free_ab_and_return
;
2309 if (o
->irreversible_delete
&& lbl
[1][0] == '/') {
2310 fprintf(o
->file
, "%s", header
.buf
);
2311 strbuf_reset(&header
);
2312 goto free_ab_and_return
;
2313 } else if (!DIFF_OPT_TST(o
, TEXT
) &&
2314 ( (!textconv_one
&& diff_filespec_is_binary(one
)) ||
2315 (!textconv_two
&& diff_filespec_is_binary(two
)) )) {
2316 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2317 die("unable to read files to diff");
2318 /* Quite common confusing case */
2319 if (mf1
.size
== mf2
.size
&&
2320 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
2321 if (must_show_header
)
2322 fprintf(o
->file
, "%s", header
.buf
);
2323 goto free_ab_and_return
;
2325 fprintf(o
->file
, "%s", header
.buf
);
2326 strbuf_reset(&header
);
2327 if (DIFF_OPT_TST(o
, BINARY
))
2328 emit_binary_diff(o
->file
, &mf1
, &mf2
, line_prefix
);
2330 fprintf(o
->file
, "%sBinary files %s and %s differ\n",
2331 line_prefix
, lbl
[0], lbl
[1]);
2332 o
->found_changes
= 1;
2334 /* Crazy xdl interfaces.. */
2335 const char *diffopts
= getenv("GIT_DIFF_OPTS");
2338 struct emit_callback ecbdata
;
2339 const struct userdiff_funcname
*pe
;
2341 if (must_show_header
) {
2342 fprintf(o
->file
, "%s", header
.buf
);
2343 strbuf_reset(&header
);
2346 mf1
.size
= fill_textconv(textconv_one
, one
, &mf1
.ptr
);
2347 mf2
.size
= fill_textconv(textconv_two
, two
, &mf2
.ptr
);
2349 pe
= diff_funcname_pattern(one
);
2351 pe
= diff_funcname_pattern(two
);
2353 memset(&xpp
, 0, sizeof(xpp
));
2354 memset(&xecfg
, 0, sizeof(xecfg
));
2355 memset(&ecbdata
, 0, sizeof(ecbdata
));
2356 ecbdata
.label_path
= lbl
;
2357 ecbdata
.color_diff
= want_color(o
->use_color
);
2358 ecbdata
.found_changesp
= &o
->found_changes
;
2359 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
2360 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
2361 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2363 ecbdata
.header
= header
.len
? &header
: NULL
;
2364 xpp
.flags
= o
->xdl_opts
;
2365 xecfg
.ctxlen
= o
->context
;
2366 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2367 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2368 if (DIFF_OPT_TST(o
, FUNCCONTEXT
))
2369 xecfg
.flags
|= XDL_EMIT_FUNCCONTEXT
;
2371 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
2374 else if (!prefixcmp(diffopts
, "--unified="))
2375 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
2376 else if (!prefixcmp(diffopts
, "-u"))
2377 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
2379 init_diff_words_data(&ecbdata
, o
, one
, two
);
2380 xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
2383 free_diff_words_data(&ecbdata
);
2388 xdiff_clear_find_func(&xecfg
);
2392 strbuf_release(&header
);
2393 diff_free_filespec_data(one
);
2394 diff_free_filespec_data(two
);
2400 static void builtin_diffstat(const char *name_a
, const char *name_b
,
2401 struct diff_filespec
*one
,
2402 struct diff_filespec
*two
,
2403 struct diffstat_t
*diffstat
,
2404 struct diff_options
*o
,
2405 struct diff_filepair
*p
)
2408 struct diffstat_file
*data
;
2410 int complete_rewrite
= 0;
2412 if (!DIFF_PAIR_UNMERGED(p
)) {
2413 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2414 complete_rewrite
= 1;
2417 data
= diffstat_add(diffstat
, name_a
, name_b
);
2418 data
->is_interesting
= p
->status
!= DIFF_STATUS_UNKNOWN
;
2421 data
->is_unmerged
= 1;
2425 same_contents
= !hashcmp(one
->sha1
, two
->sha1
);
2427 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
2428 data
->is_binary
= 1;
2429 if (same_contents
) {
2433 data
->added
= diff_filespec_size(two
);
2434 data
->deleted
= diff_filespec_size(one
);
2438 else if (complete_rewrite
) {
2439 diff_populate_filespec(one
, 0);
2440 diff_populate_filespec(two
, 0);
2441 data
->deleted
= count_lines(one
->data
, one
->size
);
2442 data
->added
= count_lines(two
->data
, two
->size
);
2445 else if (!same_contents
) {
2446 /* Crazy xdl interfaces.. */
2450 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2451 die("unable to read files to diff");
2453 memset(&xpp
, 0, sizeof(xpp
));
2454 memset(&xecfg
, 0, sizeof(xecfg
));
2455 xpp
.flags
= o
->xdl_opts
;
2456 xecfg
.ctxlen
= o
->context
;
2457 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2458 xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
2462 diff_free_filespec_data(one
);
2463 diff_free_filespec_data(two
);
2466 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
2467 const char *attr_path
,
2468 struct diff_filespec
*one
,
2469 struct diff_filespec
*two
,
2470 struct diff_options
*o
)
2473 struct checkdiff_t data
;
2478 memset(&data
, 0, sizeof(data
));
2479 data
.filename
= name_b
? name_b
: name_a
;
2482 data
.ws_rule
= whitespace_rule(attr_path
);
2483 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
2485 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2486 die("unable to read files to diff");
2489 * All the other codepaths check both sides, but not checking
2490 * the "old" side here is deliberate. We are checking the newly
2491 * introduced changes, and as long as the "new" side is text, we
2492 * can and should check what it introduces.
2494 if (diff_filespec_is_binary(two
))
2495 goto free_and_return
;
2497 /* Crazy xdl interfaces.. */
2501 memset(&xpp
, 0, sizeof(xpp
));
2502 memset(&xecfg
, 0, sizeof(xecfg
));
2503 xecfg
.ctxlen
= 1; /* at least one context line */
2505 xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
2508 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
2509 struct emit_callback ecbdata
;
2512 ecbdata
.ws_rule
= data
.ws_rule
;
2513 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2514 blank_at_eof
= ecbdata
.blank_at_eof_in_postimage
;
2519 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
2520 fprintf(o
->file
, "%s:%d: %s.\n",
2521 data
.filename
, blank_at_eof
, err
);
2522 data
.status
= 1; /* report errors */
2527 diff_free_filespec_data(one
);
2528 diff_free_filespec_data(two
);
2530 DIFF_OPT_SET(o
, CHECK_FAILED
);
2533 struct diff_filespec
*alloc_filespec(const char *path
)
2535 int namelen
= strlen(path
);
2536 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
2538 memset(spec
, 0, sizeof(*spec
));
2539 spec
->path
= (char *)(spec
+ 1);
2540 memcpy(spec
->path
, path
, namelen
+1);
2542 spec
->is_binary
= -1;
2546 void free_filespec(struct diff_filespec
*spec
)
2548 if (!--spec
->count
) {
2549 diff_free_filespec_data(spec
);
2554 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
2555 int sha1_valid
, unsigned short mode
)
2558 spec
->mode
= canon_mode(mode
);
2559 hashcpy(spec
->sha1
, sha1
);
2560 spec
->sha1_valid
= sha1_valid
;
2565 * Given a name and sha1 pair, if the index tells us the file in
2566 * the work tree has that object contents, return true, so that
2567 * prepare_temp_file() does not have to inflate and extract.
2569 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
2571 struct cache_entry
*ce
;
2576 * We do not read the cache ourselves here, because the
2577 * benchmark with my previous version that always reads cache
2578 * shows that it makes things worse for diff-tree comparing
2579 * two linux-2.6 kernel trees in an already checked out work
2580 * tree. This is because most diff-tree comparisons deal with
2581 * only a small number of files, while reading the cache is
2582 * expensive for a large project, and its cost outweighs the
2583 * savings we get by not inflating the object to a temporary
2584 * file. Practically, this code only helps when we are used
2585 * by diff-cache --cached, which does read the cache before
2591 /* We want to avoid the working directory if our caller
2592 * doesn't need the data in a normal file, this system
2593 * is rather slow with its stat/open/mmap/close syscalls,
2594 * and the object is contained in a pack file. The pack
2595 * is probably already open and will be faster to obtain
2596 * the data through than the working directory. Loose
2597 * objects however would tend to be slower as they need
2598 * to be individually opened and inflated.
2600 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
))
2604 pos
= cache_name_pos(name
, len
);
2607 ce
= active_cache
[pos
];
2610 * This is not the sha1 we are looking for, or
2611 * unreusable because it is not a regular file.
2613 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
2617 * If ce is marked as "assume unchanged", there is no
2618 * guarantee that work tree matches what we are looking for.
2620 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
2624 * If ce matches the file in the work tree, we can reuse it.
2626 if (ce_uptodate(ce
) ||
2627 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
2633 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
2636 char *data
= xmalloc(100), *dirty
= "";
2638 /* Are we looking at the work tree? */
2639 if (s
->dirty_submodule
)
2642 len
= snprintf(data
, 100,
2643 "Subproject commit %s%s\n", sha1_to_hex(s
->sha1
), dirty
);
2655 * While doing rename detection and pickaxe operation, we may need to
2656 * grab the data for the blob (or file) for our own in-core comparison.
2657 * diff_filespec has data and size fields for this purpose.
2659 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
2662 if (!DIFF_FILE_VALID(s
))
2663 die("internal error: asking to populate invalid file.");
2664 if (S_ISDIR(s
->mode
))
2670 if (size_only
&& 0 < s
->size
)
2673 if (S_ISGITLINK(s
->mode
))
2674 return diff_populate_gitlink(s
, size_only
);
2676 if (!s
->sha1_valid
||
2677 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
2678 struct strbuf buf
= STRBUF_INIT
;
2682 if (lstat(s
->path
, &st
) < 0) {
2683 if (errno
== ENOENT
) {
2687 s
->data
= (char *)"";
2692 s
->size
= xsize_t(st
.st_size
);
2695 if (S_ISLNK(st
.st_mode
)) {
2696 struct strbuf sb
= STRBUF_INIT
;
2698 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
2701 s
->data
= strbuf_detach(&sb
, NULL
);
2707 fd
= open(s
->path
, O_RDONLY
);
2710 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2712 s
->should_munmap
= 1;
2715 * Convert from working tree format to canonical git format
2717 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
2719 munmap(s
->data
, s
->size
);
2720 s
->should_munmap
= 0;
2721 s
->data
= strbuf_detach(&buf
, &size
);
2727 enum object_type type
;
2729 type
= sha1_object_info(s
->sha1
, &s
->size
);
2731 die("unable to read %s", sha1_to_hex(s
->sha1
));
2733 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
2735 die("unable to read %s", sha1_to_hex(s
->sha1
));
2742 void diff_free_filespec_blob(struct diff_filespec
*s
)
2746 else if (s
->should_munmap
)
2747 munmap(s
->data
, s
->size
);
2749 if (s
->should_free
|| s
->should_munmap
) {
2750 s
->should_free
= s
->should_munmap
= 0;
2755 void diff_free_filespec_data(struct diff_filespec
*s
)
2757 diff_free_filespec_blob(s
);
2762 static void prep_temp_blob(const char *path
, struct diff_tempfile
*temp
,
2765 const unsigned char *sha1
,
2769 struct strbuf buf
= STRBUF_INIT
;
2770 struct strbuf
template = STRBUF_INIT
;
2771 char *path_dup
= xstrdup(path
);
2772 const char *base
= basename(path_dup
);
2774 /* Generate "XXXXXX_basename.ext" */
2775 strbuf_addstr(&template, "XXXXXX_");
2776 strbuf_addstr(&template, base
);
2778 fd
= git_mkstemps(temp
->tmp_path
, PATH_MAX
, template.buf
,
2781 die_errno("unable to create temp-file");
2782 if (convert_to_working_tree(path
,
2783 (const char *)blob
, (size_t)size
, &buf
)) {
2787 if (write_in_full(fd
, blob
, size
) != size
)
2788 die_errno("unable to write temp-file");
2790 temp
->name
= temp
->tmp_path
;
2791 strcpy(temp
->hex
, sha1_to_hex(sha1
));
2793 sprintf(temp
->mode
, "%06o", mode
);
2794 strbuf_release(&buf
);
2795 strbuf_release(&template);
2799 static struct diff_tempfile
*prepare_temp_file(const char *name
,
2800 struct diff_filespec
*one
)
2802 struct diff_tempfile
*temp
= claim_diff_tempfile();
2804 if (!DIFF_FILE_VALID(one
)) {
2806 /* A '-' entry produces this for file-2, and
2807 * a '+' entry produces this for file-1.
2809 temp
->name
= "/dev/null";
2810 strcpy(temp
->hex
, ".");
2811 strcpy(temp
->mode
, ".");
2815 if (!remove_tempfile_installed
) {
2816 atexit(remove_tempfile
);
2817 sigchain_push_common(remove_tempfile_on_signal
);
2818 remove_tempfile_installed
= 1;
2821 if (!one
->sha1_valid
||
2822 reuse_worktree_file(name
, one
->sha1
, 1)) {
2824 if (lstat(name
, &st
) < 0) {
2825 if (errno
== ENOENT
)
2826 goto not_a_valid_file
;
2827 die_errno("stat(%s)", name
);
2829 if (S_ISLNK(st
.st_mode
)) {
2830 struct strbuf sb
= STRBUF_INIT
;
2831 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
2832 die_errno("readlink(%s)", name
);
2833 prep_temp_blob(name
, temp
, sb
.buf
, sb
.len
,
2835 one
->sha1
: null_sha1
),
2837 one
->mode
: S_IFLNK
));
2838 strbuf_release(&sb
);
2841 /* we can borrow from the file in the work tree */
2843 if (!one
->sha1_valid
)
2844 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
2846 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
2847 /* Even though we may sometimes borrow the
2848 * contents from the work tree, we always want
2849 * one->mode. mode is trustworthy even when
2850 * !(one->sha1_valid), as long as
2851 * DIFF_FILE_VALID(one).
2853 sprintf(temp
->mode
, "%06o", one
->mode
);
2858 if (diff_populate_filespec(one
, 0))
2859 die("cannot read data blob for %s", one
->path
);
2860 prep_temp_blob(name
, temp
, one
->data
, one
->size
,
2861 one
->sha1
, one
->mode
);
2866 /* An external diff command takes:
2868 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2869 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2872 static void run_external_diff(const char *pgm
,
2875 struct diff_filespec
*one
,
2876 struct diff_filespec
*two
,
2877 const char *xfrm_msg
,
2878 int complete_rewrite
)
2880 const char *spawn_arg
[10];
2882 const char **arg
= &spawn_arg
[0];
2885 struct diff_tempfile
*temp_one
, *temp_two
;
2886 const char *othername
= (other
? other
: name
);
2887 temp_one
= prepare_temp_file(name
, one
);
2888 temp_two
= prepare_temp_file(othername
, two
);
2891 *arg
++ = temp_one
->name
;
2892 *arg
++ = temp_one
->hex
;
2893 *arg
++ = temp_one
->mode
;
2894 *arg
++ = temp_two
->name
;
2895 *arg
++ = temp_two
->hex
;
2896 *arg
++ = temp_two
->mode
;
2907 retval
= run_command_v_opt(spawn_arg
, RUN_USING_SHELL
);
2910 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2915 static int similarity_index(struct diff_filepair
*p
)
2917 return p
->score
* 100 / MAX_SCORE
;
2920 static void fill_metainfo(struct strbuf
*msg
,
2923 struct diff_filespec
*one
,
2924 struct diff_filespec
*two
,
2925 struct diff_options
*o
,
2926 struct diff_filepair
*p
,
2927 int *must_show_header
,
2930 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
2931 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
2932 struct strbuf
*msgbuf
;
2933 char *line_prefix
= "";
2935 *must_show_header
= 1;
2936 if (o
->output_prefix
) {
2937 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
2938 line_prefix
= msgbuf
->buf
;
2940 strbuf_init(msg
, PATH_MAX
* 2 + 300);
2941 switch (p
->status
) {
2942 case DIFF_STATUS_COPIED
:
2943 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2944 line_prefix
, set
, similarity_index(p
));
2945 strbuf_addf(msg
, "%s\n%s%scopy from ",
2946 reset
, line_prefix
, set
);
2947 quote_c_style(name
, msg
, NULL
, 0);
2948 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
2949 quote_c_style(other
, msg
, NULL
, 0);
2950 strbuf_addf(msg
, "%s\n", reset
);
2952 case DIFF_STATUS_RENAMED
:
2953 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2954 line_prefix
, set
, similarity_index(p
));
2955 strbuf_addf(msg
, "%s\n%s%srename from ",
2956 reset
, line_prefix
, set
);
2957 quote_c_style(name
, msg
, NULL
, 0);
2958 strbuf_addf(msg
, "%s\n%s%srename to ",
2959 reset
, line_prefix
, set
);
2960 quote_c_style(other
, msg
, NULL
, 0);
2961 strbuf_addf(msg
, "%s\n", reset
);
2963 case DIFF_STATUS_MODIFIED
:
2965 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
2967 set
, similarity_index(p
), reset
);
2972 *must_show_header
= 0;
2974 if (one
&& two
&& hashcmp(one
->sha1
, two
->sha1
)) {
2975 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2977 if (DIFF_OPT_TST(o
, BINARY
)) {
2979 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2980 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2983 strbuf_addf(msg
, "%s%sindex %s..", line_prefix
, set
,
2984 find_unique_abbrev(one
->sha1
, abbrev
));
2985 strbuf_addstr(msg
, find_unique_abbrev(two
->sha1
, abbrev
));
2986 if (one
->mode
== two
->mode
)
2987 strbuf_addf(msg
, " %06o", one
->mode
);
2988 strbuf_addf(msg
, "%s\n", reset
);
2992 static void run_diff_cmd(const char *pgm
,
2995 const char *attr_path
,
2996 struct diff_filespec
*one
,
2997 struct diff_filespec
*two
,
2999 struct diff_options
*o
,
3000 struct diff_filepair
*p
)
3002 const char *xfrm_msg
= NULL
;
3003 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
3004 int must_show_header
= 0;
3007 if (DIFF_OPT_TST(o
, ALLOW_EXTERNAL
)) {
3008 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
3009 if (drv
&& drv
->external
)
3010 pgm
= drv
->external
;
3015 * don't use colors when the header is intended for an
3016 * external diff driver
3018 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
3020 want_color(o
->use_color
) && !pgm
);
3021 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
3025 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
3030 builtin_diff(name
, other
? other
: name
,
3031 one
, two
, xfrm_msg
, must_show_header
,
3032 o
, complete_rewrite
);
3034 fprintf(o
->file
, "* Unmerged path %s\n", name
);
3037 static void diff_fill_sha1_info(struct diff_filespec
*one
)
3039 if (DIFF_FILE_VALID(one
)) {
3040 if (!one
->sha1_valid
) {
3042 if (one
->is_stdin
) {
3043 hashcpy(one
->sha1
, null_sha1
);
3046 if (lstat(one
->path
, &st
) < 0)
3047 die_errno("stat '%s'", one
->path
);
3048 if (index_path(one
->sha1
, one
->path
, &st
, 0))
3049 die("cannot hash %s", one
->path
);
3056 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
3058 /* Strip the prefix but do not molest /dev/null and absolute paths */
3059 if (*namep
&& **namep
!= '/') {
3060 *namep
+= prefix_length
;
3064 if (*otherp
&& **otherp
!= '/') {
3065 *otherp
+= prefix_length
;
3066 if (**otherp
== '/')
3071 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
3073 const char *pgm
= external_diff();
3075 struct diff_filespec
*one
= p
->one
;
3076 struct diff_filespec
*two
= p
->two
;
3079 const char *attr_path
;
3081 name
= p
->one
->path
;
3082 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3084 if (o
->prefix_length
)
3085 strip_prefix(o
->prefix_length
, &name
, &other
);
3087 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
3090 if (DIFF_PAIR_UNMERGED(p
)) {
3091 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
3092 NULL
, NULL
, NULL
, o
, p
);
3096 diff_fill_sha1_info(one
);
3097 diff_fill_sha1_info(two
);
3100 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
3101 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
3103 * a filepair that changes between file and symlink
3104 * needs to be split into deletion and creation.
3106 struct diff_filespec
*null
= alloc_filespec(two
->path
);
3107 run_diff_cmd(NULL
, name
, other
, attr_path
,
3108 one
, null
, &msg
, o
, p
);
3110 strbuf_release(&msg
);
3112 null
= alloc_filespec(one
->path
);
3113 run_diff_cmd(NULL
, name
, other
, attr_path
,
3114 null
, two
, &msg
, o
, p
);
3118 run_diff_cmd(pgm
, name
, other
, attr_path
,
3119 one
, two
, &msg
, o
, p
);
3121 strbuf_release(&msg
);
3124 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
3125 struct diffstat_t
*diffstat
)
3130 if (DIFF_PAIR_UNMERGED(p
)) {
3132 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, p
);
3136 name
= p
->one
->path
;
3137 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3139 if (o
->prefix_length
)
3140 strip_prefix(o
->prefix_length
, &name
, &other
);
3142 diff_fill_sha1_info(p
->one
);
3143 diff_fill_sha1_info(p
->two
);
3145 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, p
);
3148 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
3152 const char *attr_path
;
3154 if (DIFF_PAIR_UNMERGED(p
)) {
3159 name
= p
->one
->path
;
3160 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
3161 attr_path
= other
? other
: name
;
3163 if (o
->prefix_length
)
3164 strip_prefix(o
->prefix_length
, &name
, &other
);
3166 diff_fill_sha1_info(p
->one
);
3167 diff_fill_sha1_info(p
->two
);
3169 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
3172 void diff_setup(struct diff_options
*options
)
3174 memcpy(options
, &default_diff_options
, sizeof(*options
));
3176 options
->file
= stdout
;
3178 options
->line_termination
= '\n';
3179 options
->break_opt
= -1;
3180 options
->rename_limit
= -1;
3181 options
->dirstat_permille
= diff_dirstat_permille_default
;
3182 options
->context
= 3;
3183 DIFF_OPT_SET(options
, RENAME_EMPTY
);
3185 options
->change
= diff_change
;
3186 options
->add_remove
= diff_addremove
;
3187 options
->use_color
= diff_use_color_default
;
3188 options
->detect_rename
= diff_detect_rename_default
;
3190 if (diff_no_prefix
) {
3191 options
->a_prefix
= options
->b_prefix
= "";
3192 } else if (!diff_mnemonic_prefix
) {
3193 options
->a_prefix
= "a/";
3194 options
->b_prefix
= "b/";
3198 void diff_setup_done(struct diff_options
*options
)
3202 if (options
->output_format
& DIFF_FORMAT_NAME
)
3204 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
3206 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
3208 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
3211 die("--name-only, --name-status, --check and -s are mutually exclusive");
3214 * Most of the time we can say "there are changes"
3215 * only by checking if there are changed paths, but
3216 * --ignore-whitespace* options force us to look
3220 if (DIFF_XDL_TST(options
, IGNORE_WHITESPACE
) ||
3221 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_CHANGE
) ||
3222 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_AT_EOL
))
3223 DIFF_OPT_SET(options
, DIFF_FROM_CONTENTS
);
3225 DIFF_OPT_CLR(options
, DIFF_FROM_CONTENTS
);
3227 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3228 options
->detect_rename
= DIFF_DETECT_COPY
;
3230 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
3231 options
->prefix
= NULL
;
3232 if (options
->prefix
)
3233 options
->prefix_length
= strlen(options
->prefix
);
3235 options
->prefix_length
= 0;
3237 if (options
->output_format
& (DIFF_FORMAT_NAME
|
3238 DIFF_FORMAT_NAME_STATUS
|
3239 DIFF_FORMAT_CHECKDIFF
|
3240 DIFF_FORMAT_NO_OUTPUT
))
3241 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
3242 DIFF_FORMAT_NUMSTAT
|
3243 DIFF_FORMAT_DIFFSTAT
|
3244 DIFF_FORMAT_SHORTSTAT
|
3245 DIFF_FORMAT_DIRSTAT
|
3246 DIFF_FORMAT_SUMMARY
|
3250 * These cases always need recursive; we do not drop caller-supplied
3251 * recursive bits for other formats here.
3253 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
3254 DIFF_FORMAT_NUMSTAT
|
3255 DIFF_FORMAT_DIFFSTAT
|
3256 DIFF_FORMAT_SHORTSTAT
|
3257 DIFF_FORMAT_DIRSTAT
|
3258 DIFF_FORMAT_SUMMARY
|
3259 DIFF_FORMAT_CHECKDIFF
))
3260 DIFF_OPT_SET(options
, RECURSIVE
);
3262 * Also pickaxe would not work very well if you do not say recursive
3264 if (options
->pickaxe
)
3265 DIFF_OPT_SET(options
, RECURSIVE
);
3267 * When patches are generated, submodules diffed against the work tree
3268 * must be checked for dirtiness too so it can be shown in the output
3270 if (options
->output_format
& DIFF_FORMAT_PATCH
)
3271 DIFF_OPT_SET(options
, DIRTY_SUBMODULES
);
3273 if (options
->detect_rename
&& options
->rename_limit
< 0)
3274 options
->rename_limit
= diff_rename_limit_default
;
3275 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
3277 /* read-cache does not die even when it fails
3278 * so it is safe for us to do this here. Also
3279 * it does not smudge active_cache or active_nr
3280 * when it fails, so we do not have to worry about
3281 * cleaning it up ourselves either.
3285 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
3286 options
->abbrev
= 40; /* full */
3289 * It does not make sense to show the first hit we happened
3290 * to have found. It does not make sense not to return with
3291 * exit code in such a case either.
3293 if (DIFF_OPT_TST(options
, QUICK
)) {
3294 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
3295 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3299 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
3309 if (c
== arg_short
) {
3313 if (val
&& isdigit(c
)) {
3315 int n
= strtoul(arg
, &end
, 10);
3326 eq
= strchr(arg
, '=');
3331 if (!len
|| strncmp(arg
, arg_long
, len
))
3336 if (!isdigit(*++eq
))
3338 n
= strtoul(eq
, &end
, 10);
3346 static int diff_scoreopt_parse(const char *opt
);
3348 static inline int short_opt(char opt
, const char **argv
,
3349 const char **optarg
)
3351 const char *arg
= argv
[0];
3352 if (arg
[0] != '-' || arg
[1] != opt
)
3354 if (arg
[2] != '\0') {
3359 die("Option '%c' requires a value", opt
);
3364 int parse_long_opt(const char *opt
, const char **argv
,
3365 const char **optarg
)
3367 const char *arg
= argv
[0];
3368 if (arg
[0] != '-' || arg
[1] != '-')
3370 arg
+= strlen("--");
3371 if (prefixcmp(arg
, opt
))
3374 if (*arg
== '=') { /* sticked form: --option=value */
3380 /* separate form: --option value */
3382 die("Option '--%s' requires a value", opt
);
3387 static int stat_opt(struct diff_options
*options
, const char **av
)
3389 const char *arg
= av
[0];
3391 int width
= options
->stat_width
;
3392 int name_width
= options
->stat_name_width
;
3393 int graph_width
= options
->stat_graph_width
;
3394 int count
= options
->stat_count
;
3397 arg
+= strlen("--stat");
3402 if (!prefixcmp(arg
, "-width")) {
3403 arg
+= strlen("-width");
3405 width
= strtoul(arg
+ 1, &end
, 10);
3406 else if (!*arg
&& !av
[1])
3407 die("Option '--stat-width' requires a value");
3409 width
= strtoul(av
[1], &end
, 10);
3412 } else if (!prefixcmp(arg
, "-name-width")) {
3413 arg
+= strlen("-name-width");
3415 name_width
= strtoul(arg
+ 1, &end
, 10);
3416 else if (!*arg
&& !av
[1])
3417 die("Option '--stat-name-width' requires a value");
3419 name_width
= strtoul(av
[1], &end
, 10);
3422 } else if (!prefixcmp(arg
, "-graph-width")) {
3423 arg
+= strlen("-graph-width");
3425 graph_width
= strtoul(arg
+ 1, &end
, 10);
3426 else if (!*arg
&& !av
[1])
3427 die("Option '--stat-graph-width' requires a value");
3429 graph_width
= strtoul(av
[1], &end
, 10);
3432 } else if (!prefixcmp(arg
, "-count")) {
3433 arg
+= strlen("-count");
3435 count
= strtoul(arg
+ 1, &end
, 10);
3436 else if (!*arg
&& !av
[1])
3437 die("Option '--stat-count' requires a value");
3439 count
= strtoul(av
[1], &end
, 10);
3445 width
= strtoul(arg
+1, &end
, 10);
3447 name_width
= strtoul(end
+1, &end
, 10);
3449 count
= strtoul(end
+1, &end
, 10);
3452 /* Important! This checks all the error cases! */
3455 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
3456 options
->stat_name_width
= name_width
;
3457 options
->stat_graph_width
= graph_width
;
3458 options
->stat_width
= width
;
3459 options
->stat_count
= count
;
3463 static int parse_dirstat_opt(struct diff_options
*options
, const char *params
)
3465 struct strbuf errmsg
= STRBUF_INIT
;
3466 if (parse_dirstat_params(options
, params
, &errmsg
))
3467 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3469 strbuf_release(&errmsg
);
3471 * The caller knows a dirstat-related option is given from the command
3472 * line; allow it to say "return this_function();"
3474 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
3478 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
3480 const char *arg
= av
[0];
3484 /* Output format options */
3485 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch"))
3486 options
->output_format
|= DIFF_FORMAT_PATCH
;
3487 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
3488 options
->output_format
|= DIFF_FORMAT_PATCH
;
3489 else if (!strcmp(arg
, "--raw"))
3490 options
->output_format
|= DIFF_FORMAT_RAW
;
3491 else if (!strcmp(arg
, "--patch-with-raw"))
3492 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
3493 else if (!strcmp(arg
, "--numstat"))
3494 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
3495 else if (!strcmp(arg
, "--shortstat"))
3496 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
3497 else if (!strcmp(arg
, "-X") || !strcmp(arg
, "--dirstat"))
3498 return parse_dirstat_opt(options
, "");
3499 else if (!prefixcmp(arg
, "-X"))
3500 return parse_dirstat_opt(options
, arg
+ 2);
3501 else if (!prefixcmp(arg
, "--dirstat="))
3502 return parse_dirstat_opt(options
, arg
+ 10);
3503 else if (!strcmp(arg
, "--cumulative"))
3504 return parse_dirstat_opt(options
, "cumulative");
3505 else if (!strcmp(arg
, "--dirstat-by-file"))
3506 return parse_dirstat_opt(options
, "files");
3507 else if (!prefixcmp(arg
, "--dirstat-by-file=")) {
3508 parse_dirstat_opt(options
, "files");
3509 return parse_dirstat_opt(options
, arg
+ 18);
3511 else if (!strcmp(arg
, "--check"))
3512 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
3513 else if (!strcmp(arg
, "--summary"))
3514 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
3515 else if (!strcmp(arg
, "--patch-with-stat"))
3516 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
3517 else if (!strcmp(arg
, "--name-only"))
3518 options
->output_format
|= DIFF_FORMAT_NAME
;
3519 else if (!strcmp(arg
, "--name-status"))
3520 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
3521 else if (!strcmp(arg
, "-s"))
3522 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
3523 else if (!prefixcmp(arg
, "--stat"))
3524 /* --stat, --stat-width, --stat-name-width, or --stat-count */
3525 return stat_opt(options
, av
);
3527 /* renames options */
3528 else if (!prefixcmp(arg
, "-B") || !prefixcmp(arg
, "--break-rewrites=") ||
3529 !strcmp(arg
, "--break-rewrites")) {
3530 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
3531 return error("invalid argument to -B: %s", arg
+2);
3533 else if (!prefixcmp(arg
, "-M") || !prefixcmp(arg
, "--find-renames=") ||
3534 !strcmp(arg
, "--find-renames")) {
3535 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3536 return error("invalid argument to -M: %s", arg
+2);
3537 options
->detect_rename
= DIFF_DETECT_RENAME
;
3539 else if (!strcmp(arg
, "-D") || !strcmp(arg
, "--irreversible-delete")) {
3540 options
->irreversible_delete
= 1;
3542 else if (!prefixcmp(arg
, "-C") || !prefixcmp(arg
, "--find-copies=") ||
3543 !strcmp(arg
, "--find-copies")) {
3544 if (options
->detect_rename
== DIFF_DETECT_COPY
)
3545 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3546 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3547 return error("invalid argument to -C: %s", arg
+2);
3548 options
->detect_rename
= DIFF_DETECT_COPY
;
3550 else if (!strcmp(arg
, "--no-renames"))
3551 options
->detect_rename
= 0;
3552 else if (!strcmp(arg
, "--rename-empty"))
3553 DIFF_OPT_SET(options
, RENAME_EMPTY
);
3554 else if (!strcmp(arg
, "--no-rename-empty"))
3555 DIFF_OPT_CLR(options
, RENAME_EMPTY
);
3556 else if (!strcmp(arg
, "--relative"))
3557 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3558 else if (!prefixcmp(arg
, "--relative=")) {
3559 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3560 options
->prefix
= arg
+ 11;
3564 else if (!strcmp(arg
, "--minimal"))
3565 DIFF_XDL_SET(options
, NEED_MINIMAL
);
3566 else if (!strcmp(arg
, "--no-minimal"))
3567 DIFF_XDL_CLR(options
, NEED_MINIMAL
);
3568 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
3569 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
3570 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
3571 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
3572 else if (!strcmp(arg
, "--ignore-space-at-eol"))
3573 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
3574 else if (!strcmp(arg
, "--patience"))
3575 options
->xdl_opts
= DIFF_WITH_ALG(options
, PATIENCE_DIFF
);
3576 else if (!strcmp(arg
, "--histogram"))
3577 options
->xdl_opts
= DIFF_WITH_ALG(options
, HISTOGRAM_DIFF
);
3580 else if (!strcmp(arg
, "--binary")) {
3581 options
->output_format
|= DIFF_FORMAT_PATCH
;
3582 DIFF_OPT_SET(options
, BINARY
);
3584 else if (!strcmp(arg
, "--full-index"))
3585 DIFF_OPT_SET(options
, FULL_INDEX
);
3586 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
3587 DIFF_OPT_SET(options
, TEXT
);
3588 else if (!strcmp(arg
, "-R"))
3589 DIFF_OPT_SET(options
, REVERSE_DIFF
);
3590 else if (!strcmp(arg
, "--find-copies-harder"))
3591 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3592 else if (!strcmp(arg
, "--follow"))
3593 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
3594 else if (!strcmp(arg
, "--color"))
3595 options
->use_color
= 1;
3596 else if (!prefixcmp(arg
, "--color=")) {
3597 int value
= git_config_colorbool(NULL
, arg
+8);
3599 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3600 options
->use_color
= value
;
3602 else if (!strcmp(arg
, "--no-color"))
3603 options
->use_color
= 0;
3604 else if (!strcmp(arg
, "--color-words")) {
3605 options
->use_color
= 1;
3606 options
->word_diff
= DIFF_WORDS_COLOR
;
3608 else if (!prefixcmp(arg
, "--color-words=")) {
3609 options
->use_color
= 1;
3610 options
->word_diff
= DIFF_WORDS_COLOR
;
3611 options
->word_regex
= arg
+ 14;
3613 else if (!strcmp(arg
, "--word-diff")) {
3614 if (options
->word_diff
== DIFF_WORDS_NONE
)
3615 options
->word_diff
= DIFF_WORDS_PLAIN
;
3617 else if (!prefixcmp(arg
, "--word-diff=")) {
3618 const char *type
= arg
+ 12;
3619 if (!strcmp(type
, "plain"))
3620 options
->word_diff
= DIFF_WORDS_PLAIN
;
3621 else if (!strcmp(type
, "color")) {
3622 options
->use_color
= 1;
3623 options
->word_diff
= DIFF_WORDS_COLOR
;
3625 else if (!strcmp(type
, "porcelain"))
3626 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
3627 else if (!strcmp(type
, "none"))
3628 options
->word_diff
= DIFF_WORDS_NONE
;
3630 die("bad --word-diff argument: %s", type
);
3632 else if ((argcount
= parse_long_opt("word-diff-regex", av
, &optarg
))) {
3633 if (options
->word_diff
== DIFF_WORDS_NONE
)
3634 options
->word_diff
= DIFF_WORDS_PLAIN
;
3635 options
->word_regex
= optarg
;
3638 else if (!strcmp(arg
, "--exit-code"))
3639 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3640 else if (!strcmp(arg
, "--quiet"))
3641 DIFF_OPT_SET(options
, QUICK
);
3642 else if (!strcmp(arg
, "--ext-diff"))
3643 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
3644 else if (!strcmp(arg
, "--no-ext-diff"))
3645 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
3646 else if (!strcmp(arg
, "--textconv"))
3647 DIFF_OPT_SET(options
, ALLOW_TEXTCONV
);
3648 else if (!strcmp(arg
, "--no-textconv"))
3649 DIFF_OPT_CLR(options
, ALLOW_TEXTCONV
);
3650 else if (!strcmp(arg
, "--ignore-submodules")) {
3651 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3652 handle_ignore_submodules_arg(options
, "all");
3653 } else if (!prefixcmp(arg
, "--ignore-submodules=")) {
3654 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3655 handle_ignore_submodules_arg(options
, arg
+ 20);
3656 } else if (!strcmp(arg
, "--submodule"))
3657 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
3658 else if (!prefixcmp(arg
, "--submodule=")) {
3659 if (!strcmp(arg
+ 12, "log"))
3660 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
3664 else if (!strcmp(arg
, "-z"))
3665 options
->line_termination
= 0;
3666 else if ((argcount
= short_opt('l', av
, &optarg
))) {
3667 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
3670 else if ((argcount
= short_opt('S', av
, &optarg
))) {
3671 options
->pickaxe
= optarg
;
3672 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_S
;
3674 } else if ((argcount
= short_opt('G', av
, &optarg
))) {
3675 options
->pickaxe
= optarg
;
3676 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_G
;
3679 else if (!strcmp(arg
, "--pickaxe-all"))
3680 options
->pickaxe_opts
|= DIFF_PICKAXE_ALL
;
3681 else if (!strcmp(arg
, "--pickaxe-regex"))
3682 options
->pickaxe_opts
|= DIFF_PICKAXE_REGEX
;
3683 else if ((argcount
= short_opt('O', av
, &optarg
))) {
3684 options
->orderfile
= optarg
;
3687 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
3688 options
->filter
= optarg
;
3691 else if (!strcmp(arg
, "--abbrev"))
3692 options
->abbrev
= DEFAULT_ABBREV
;
3693 else if (!prefixcmp(arg
, "--abbrev=")) {
3694 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
3695 if (options
->abbrev
< MINIMUM_ABBREV
)
3696 options
->abbrev
= MINIMUM_ABBREV
;
3697 else if (40 < options
->abbrev
)
3698 options
->abbrev
= 40;
3700 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
3701 options
->a_prefix
= optarg
;
3704 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
3705 options
->b_prefix
= optarg
;
3708 else if (!strcmp(arg
, "--no-prefix"))
3709 options
->a_prefix
= options
->b_prefix
= "";
3710 else if (opt_arg(arg
, '\0', "inter-hunk-context",
3711 &options
->interhunkcontext
))
3713 else if (!strcmp(arg
, "-W"))
3714 DIFF_OPT_SET(options
, FUNCCONTEXT
);
3715 else if (!strcmp(arg
, "--function-context"))
3716 DIFF_OPT_SET(options
, FUNCCONTEXT
);
3717 else if (!strcmp(arg
, "--no-function-context"))
3718 DIFF_OPT_CLR(options
, FUNCCONTEXT
);
3719 else if ((argcount
= parse_long_opt("output", av
, &optarg
))) {
3720 options
->file
= fopen(optarg
, "w");
3722 die_errno("Could not open '%s'", optarg
);
3723 options
->close_file
= 1;
3730 int parse_rename_score(const char **cp_p
)
3732 unsigned long num
, scale
;
3734 const char *cp
= *cp_p
;
3741 if ( !dot
&& ch
== '.' ) {
3744 } else if ( ch
== '%' ) {
3745 scale
= dot
? scale
*100 : 100;
3746 cp
++; /* % is always at the end */
3748 } else if ( ch
>= '0' && ch
<= '9' ) {
3749 if ( scale
< 100000 ) {
3751 num
= (num
*10) + (ch
-'0');
3760 /* user says num divided by scale and we say internally that
3761 * is MAX_SCORE * num / scale.
3763 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
3766 static int diff_scoreopt_parse(const char *opt
)
3768 int opt1
, opt2
, cmd
;
3774 /* convert the long-form arguments into short-form versions */
3775 if (!prefixcmp(opt
, "break-rewrites")) {
3776 opt
+= strlen("break-rewrites");
3777 if (*opt
== 0 || *opt
++ == '=')
3779 } else if (!prefixcmp(opt
, "find-copies")) {
3780 opt
+= strlen("find-copies");
3781 if (*opt
== 0 || *opt
++ == '=')
3783 } else if (!prefixcmp(opt
, "find-renames")) {
3784 opt
+= strlen("find-renames");
3785 if (*opt
== 0 || *opt
++ == '=')
3789 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
3790 return -1; /* that is not a -M, -C nor -B option */
3792 opt1
= parse_rename_score(&opt
);
3798 else if (*opt
!= '/')
3799 return -1; /* we expect -B80/99 or -B80 */
3802 opt2
= parse_rename_score(&opt
);
3807 return opt1
| (opt2
<< 16);
3810 struct diff_queue_struct diff_queued_diff
;
3812 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
3814 if (queue
->alloc
<= queue
->nr
) {
3815 queue
->alloc
= alloc_nr(queue
->alloc
);
3816 queue
->queue
= xrealloc(queue
->queue
,
3817 sizeof(dp
) * queue
->alloc
);
3819 queue
->queue
[queue
->nr
++] = dp
;
3822 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
3823 struct diff_filespec
*one
,
3824 struct diff_filespec
*two
)
3826 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
3834 void diff_free_filepair(struct diff_filepair
*p
)
3836 free_filespec(p
->one
);
3837 free_filespec(p
->two
);
3841 /* This is different from find_unique_abbrev() in that
3842 * it stuffs the result with dots for alignment.
3844 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
3849 return sha1_to_hex(sha1
);
3851 abbrev
= find_unique_abbrev(sha1
, len
);
3852 abblen
= strlen(abbrev
);
3854 static char hex
[41];
3855 if (len
< abblen
&& abblen
<= len
+ 2)
3856 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
3858 sprintf(hex
, "%s...", abbrev
);
3861 return sha1_to_hex(sha1
);
3864 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
3866 int line_termination
= opt
->line_termination
;
3867 int inter_name_termination
= line_termination
? '\t' : '\0';
3868 if (opt
->output_prefix
) {
3869 struct strbuf
*msg
= NULL
;
3870 msg
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
3871 fprintf(opt
->file
, "%s", msg
->buf
);
3874 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
3875 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
3876 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
3877 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
3880 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
3881 inter_name_termination
);
3883 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
3886 if (p
->status
== DIFF_STATUS_COPIED
||
3887 p
->status
== DIFF_STATUS_RENAMED
) {
3888 const char *name_a
, *name_b
;
3889 name_a
= p
->one
->path
;
3890 name_b
= p
->two
->path
;
3891 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3892 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
3893 write_name_quoted(name_b
, opt
->file
, line_termination
);
3895 const char *name_a
, *name_b
;
3896 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
3898 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3899 write_name_quoted(name_a
, opt
->file
, line_termination
);
3903 int diff_unmodified_pair(struct diff_filepair
*p
)
3905 /* This function is written stricter than necessary to support
3906 * the currently implemented transformers, but the idea is to
3907 * let transformers to produce diff_filepairs any way they want,
3908 * and filter and clean them up here before producing the output.
3910 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
3912 if (DIFF_PAIR_UNMERGED(p
))
3913 return 0; /* unmerged is interesting */
3915 /* deletion, addition, mode or type change
3916 * and rename are all interesting.
3918 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
3919 DIFF_PAIR_MODE_CHANGED(p
) ||
3920 strcmp(one
->path
, two
->path
))
3923 /* both are valid and point at the same path. that is, we are
3924 * dealing with a change.
3926 if (one
->sha1_valid
&& two
->sha1_valid
&&
3927 !hashcmp(one
->sha1
, two
->sha1
) &&
3928 !one
->dirty_submodule
&& !two
->dirty_submodule
)
3929 return 1; /* no change */
3930 if (!one
->sha1_valid
&& !two
->sha1_valid
)
3931 return 1; /* both look at the same file on the filesystem. */
3935 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
3937 if (diff_unmodified_pair(p
))
3940 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3941 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3942 return; /* no tree diffs in patch format */
3947 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
3948 struct diffstat_t
*diffstat
)
3950 if (diff_unmodified_pair(p
))
3953 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3954 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3955 return; /* no useful stat for tree diffs */
3957 run_diffstat(p
, o
, diffstat
);
3960 static void diff_flush_checkdiff(struct diff_filepair
*p
,
3961 struct diff_options
*o
)
3963 if (diff_unmodified_pair(p
))
3966 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3967 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3968 return; /* nothing to check in tree diffs */
3970 run_checkdiff(p
, o
);
3973 int diff_queue_is_empty(void)
3975 struct diff_queue_struct
*q
= &diff_queued_diff
;
3977 for (i
= 0; i
< q
->nr
; i
++)
3978 if (!diff_unmodified_pair(q
->queue
[i
]))
3984 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
3986 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
3989 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
3991 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
3992 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
3994 s
->size
, s
->xfrm_flags
);
3997 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
3999 diff_debug_filespec(p
->one
, i
, "one");
4000 diff_debug_filespec(p
->two
, i
, "two");
4001 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
4002 p
->score
, p
->status
? p
->status
: '?',
4003 p
->one
->rename_used
, p
->broken_pair
);
4006 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
4010 fprintf(stderr
, "%s\n", msg
);
4011 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
4012 for (i
= 0; i
< q
->nr
; i
++) {
4013 struct diff_filepair
*p
= q
->queue
[i
];
4014 diff_debug_filepair(p
, i
);
4019 static void diff_resolve_rename_copy(void)
4022 struct diff_filepair
*p
;
4023 struct diff_queue_struct
*q
= &diff_queued_diff
;
4025 diff_debug_queue("resolve-rename-copy", q
);
4027 for (i
= 0; i
< q
->nr
; i
++) {
4029 p
->status
= 0; /* undecided */
4030 if (DIFF_PAIR_UNMERGED(p
))
4031 p
->status
= DIFF_STATUS_UNMERGED
;
4032 else if (!DIFF_FILE_VALID(p
->one
))
4033 p
->status
= DIFF_STATUS_ADDED
;
4034 else if (!DIFF_FILE_VALID(p
->two
))
4035 p
->status
= DIFF_STATUS_DELETED
;
4036 else if (DIFF_PAIR_TYPE_CHANGED(p
))
4037 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
4039 /* from this point on, we are dealing with a pair
4040 * whose both sides are valid and of the same type, i.e.
4041 * either in-place edit or rename/copy edit.
4043 else if (DIFF_PAIR_RENAME(p
)) {
4045 * A rename might have re-connected a broken
4046 * pair up, causing the pathnames to be the
4047 * same again. If so, that's not a rename at
4048 * all, just a modification..
4050 * Otherwise, see if this source was used for
4051 * multiple renames, in which case we decrement
4052 * the count, and call it a copy.
4054 if (!strcmp(p
->one
->path
, p
->two
->path
))
4055 p
->status
= DIFF_STATUS_MODIFIED
;
4056 else if (--p
->one
->rename_used
> 0)
4057 p
->status
= DIFF_STATUS_COPIED
;
4059 p
->status
= DIFF_STATUS_RENAMED
;
4061 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
4062 p
->one
->mode
!= p
->two
->mode
||
4063 p
->one
->dirty_submodule
||
4064 p
->two
->dirty_submodule
||
4065 is_null_sha1(p
->one
->sha1
))
4066 p
->status
= DIFF_STATUS_MODIFIED
;
4068 /* This is a "no-change" entry and should not
4069 * happen anymore, but prepare for broken callers.
4071 error("feeding unmodified %s to diffcore",
4073 p
->status
= DIFF_STATUS_UNKNOWN
;
4076 diff_debug_queue("resolve-rename-copy done", q
);
4079 static int check_pair_status(struct diff_filepair
*p
)
4081 switch (p
->status
) {
4082 case DIFF_STATUS_UNKNOWN
:
4085 die("internal error in diff-resolve-rename-copy");
4091 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
4093 int fmt
= opt
->output_format
;
4095 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
4096 diff_flush_checkdiff(p
, opt
);
4097 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
4098 diff_flush_raw(p
, opt
);
4099 else if (fmt
& DIFF_FORMAT_NAME
) {
4100 const char *name_a
, *name_b
;
4101 name_a
= p
->two
->path
;
4103 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
4104 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
4108 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
4111 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
4113 fprintf(file
, " %s ", newdelete
);
4114 write_name_quoted(fs
->path
, file
, '\n');
4118 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
,
4119 const char *line_prefix
)
4121 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
4122 fprintf(file
, "%s mode change %06o => %06o%c", line_prefix
, p
->one
->mode
,
4123 p
->two
->mode
, show_name
? ' ' : '\n');
4125 write_name_quoted(p
->two
->path
, file
, '\n');
4130 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
,
4131 const char *line_prefix
)
4133 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
4135 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
4137 show_mode_change(file
, p
, 0, line_prefix
);
4140 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
4142 FILE *file
= opt
->file
;
4143 char *line_prefix
= "";
4145 if (opt
->output_prefix
) {
4146 struct strbuf
*buf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
4147 line_prefix
= buf
->buf
;
4151 case DIFF_STATUS_DELETED
:
4152 fputs(line_prefix
, file
);
4153 show_file_mode_name(file
, "delete", p
->one
);
4155 case DIFF_STATUS_ADDED
:
4156 fputs(line_prefix
, file
);
4157 show_file_mode_name(file
, "create", p
->two
);
4159 case DIFF_STATUS_COPIED
:
4160 fputs(line_prefix
, file
);
4161 show_rename_copy(file
, "copy", p
, line_prefix
);
4163 case DIFF_STATUS_RENAMED
:
4164 fputs(line_prefix
, file
);
4165 show_rename_copy(file
, "rename", p
, line_prefix
);
4169 fprintf(file
, "%s rewrite ", line_prefix
);
4170 write_name_quoted(p
->two
->path
, file
, ' ');
4171 fprintf(file
, "(%d%%)\n", similarity_index(p
));
4173 show_mode_change(file
, p
, !p
->score
, line_prefix
);
4183 static int remove_space(char *line
, int len
)
4189 for (i
= 0; i
< len
; i
++)
4190 if (!isspace((c
= line
[i
])))
4196 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
4198 struct patch_id_t
*data
= priv
;
4201 /* Ignore line numbers when computing the SHA1 of the patch */
4202 if (!prefixcmp(line
, "@@ -"))
4205 new_len
= remove_space(line
, len
);
4207 git_SHA1_Update(data
->ctx
, line
, new_len
);
4208 data
->patchlen
+= new_len
;
4211 /* returns 0 upon success, and writes result into sha1 */
4212 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
4214 struct diff_queue_struct
*q
= &diff_queued_diff
;
4217 struct patch_id_t data
;
4218 char buffer
[PATH_MAX
* 4 + 20];
4220 git_SHA1_Init(&ctx
);
4221 memset(&data
, 0, sizeof(struct patch_id_t
));
4224 for (i
= 0; i
< q
->nr
; i
++) {
4228 struct diff_filepair
*p
= q
->queue
[i
];
4231 memset(&xpp
, 0, sizeof(xpp
));
4232 memset(&xecfg
, 0, sizeof(xecfg
));
4234 return error("internal diff status error");
4235 if (p
->status
== DIFF_STATUS_UNKNOWN
)
4237 if (diff_unmodified_pair(p
))
4239 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4240 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4242 if (DIFF_PAIR_UNMERGED(p
))
4245 diff_fill_sha1_info(p
->one
);
4246 diff_fill_sha1_info(p
->two
);
4247 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
4248 fill_mmfile(&mf2
, p
->two
) < 0)
4249 return error("unable to read files to diff");
4251 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
4252 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
4253 if (p
->one
->mode
== 0)
4254 len1
= snprintf(buffer
, sizeof(buffer
),
4255 "diff--gita/%.*sb/%.*s"
4262 len2
, p
->two
->path
);
4263 else if (p
->two
->mode
== 0)
4264 len1
= snprintf(buffer
, sizeof(buffer
),
4265 "diff--gita/%.*sb/%.*s"
4266 "deletedfilemode%06o"
4272 len1
, p
->one
->path
);
4274 len1
= snprintf(buffer
, sizeof(buffer
),
4275 "diff--gita/%.*sb/%.*s"
4281 len2
, p
->two
->path
);
4282 git_SHA1_Update(&ctx
, buffer
, len1
);
4284 if (diff_filespec_is_binary(p
->one
) ||
4285 diff_filespec_is_binary(p
->two
)) {
4286 git_SHA1_Update(&ctx
, sha1_to_hex(p
->one
->sha1
), 40);
4287 git_SHA1_Update(&ctx
, sha1_to_hex(p
->two
->sha1
), 40);
4294 xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
4298 git_SHA1_Final(sha1
, &ctx
);
4302 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
4304 struct diff_queue_struct
*q
= &diff_queued_diff
;
4306 int result
= diff_get_patch_id(options
, sha1
);
4308 for (i
= 0; i
< q
->nr
; i
++)
4309 diff_free_filepair(q
->queue
[i
]);
4312 DIFF_QUEUE_CLEAR(q
);
4317 static int is_summary_empty(const struct diff_queue_struct
*q
)
4321 for (i
= 0; i
< q
->nr
; i
++) {
4322 const struct diff_filepair
*p
= q
->queue
[i
];
4324 switch (p
->status
) {
4325 case DIFF_STATUS_DELETED
:
4326 case DIFF_STATUS_ADDED
:
4327 case DIFF_STATUS_COPIED
:
4328 case DIFF_STATUS_RENAMED
:
4333 if (p
->one
->mode
&& p
->two
->mode
&&
4334 p
->one
->mode
!= p
->two
->mode
)
4342 static const char rename_limit_warning
[] =
4343 "inexact rename detection was skipped due to too many files.";
4345 static const char degrade_cc_to_c_warning
[] =
4346 "only found copies from modified paths due to too many files.";
4348 static const char rename_limit_advice
[] =
4349 "you may want to set your %s variable to at least "
4350 "%d and retry the command.";
4352 void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
)
4355 warning(degrade_cc_to_c_warning
);
4357 warning(rename_limit_warning
);
4360 if (0 < needed
&& needed
< 32767)
4361 warning(rename_limit_advice
, varname
, needed
);
4364 void diff_flush(struct diff_options
*options
)
4366 struct diff_queue_struct
*q
= &diff_queued_diff
;
4367 int i
, output_format
= options
->output_format
;
4369 int dirstat_by_line
= 0;
4372 * Order: raw, stat, summary, patch
4373 * or: name/name-status/checkdiff (other bits clear)
4378 if (output_format
& (DIFF_FORMAT_RAW
|
4380 DIFF_FORMAT_NAME_STATUS
|
4381 DIFF_FORMAT_CHECKDIFF
)) {
4382 for (i
= 0; i
< q
->nr
; i
++) {
4383 struct diff_filepair
*p
= q
->queue
[i
];
4384 if (check_pair_status(p
))
4385 flush_one_pair(p
, options
);
4390 if (output_format
& DIFF_FORMAT_DIRSTAT
&& DIFF_OPT_TST(options
, DIRSTAT_BY_LINE
))
4391 dirstat_by_line
= 1;
4393 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
) ||
4395 struct diffstat_t diffstat
;
4397 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
4398 for (i
= 0; i
< q
->nr
; i
++) {
4399 struct diff_filepair
*p
= q
->queue
[i
];
4400 if (check_pair_status(p
))
4401 diff_flush_stat(p
, options
, &diffstat
);
4403 if (output_format
& DIFF_FORMAT_NUMSTAT
)
4404 show_numstat(&diffstat
, options
);
4405 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
4406 show_stats(&diffstat
, options
);
4407 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
4408 show_shortstats(&diffstat
, options
);
4409 if (output_format
& DIFF_FORMAT_DIRSTAT
)
4410 show_dirstat_by_line(&diffstat
, options
);
4411 free_diffstat_info(&diffstat
);
4414 if ((output_format
& DIFF_FORMAT_DIRSTAT
) && !dirstat_by_line
)
4415 show_dirstat(options
);
4417 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
4418 for (i
= 0; i
< q
->nr
; i
++) {
4419 diff_summary(options
, q
->queue
[i
]);
4424 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
4425 DIFF_OPT_TST(options
, EXIT_WITH_STATUS
) &&
4426 DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4428 * run diff_flush_patch for the exit status. setting
4429 * options->file to /dev/null should be safe, becaue we
4430 * aren't supposed to produce any output anyway.
4432 if (options
->close_file
)
4433 fclose(options
->file
);
4434 options
->file
= fopen("/dev/null", "w");
4436 die_errno("Could not open /dev/null");
4437 options
->close_file
= 1;
4438 for (i
= 0; i
< q
->nr
; i
++) {
4439 struct diff_filepair
*p
= q
->queue
[i
];
4440 if (check_pair_status(p
))
4441 diff_flush_patch(p
, options
);
4442 if (options
->found_changes
)
4447 if (output_format
& DIFF_FORMAT_PATCH
) {
4449 if (options
->output_prefix
) {
4450 struct strbuf
*msg
= NULL
;
4451 msg
= options
->output_prefix(options
,
4452 options
->output_prefix_data
);
4453 fwrite(msg
->buf
, msg
->len
, 1, stdout
);
4455 putc(options
->line_termination
, options
->file
);
4456 if (options
->stat_sep
) {
4457 /* attach patch instead of inline */
4458 fputs(options
->stat_sep
, options
->file
);
4462 for (i
= 0; i
< q
->nr
; i
++) {
4463 struct diff_filepair
*p
= q
->queue
[i
];
4464 if (check_pair_status(p
))
4465 diff_flush_patch(p
, options
);
4469 if (output_format
& DIFF_FORMAT_CALLBACK
)
4470 options
->format_callback(q
, options
, options
->format_callback_data
);
4472 for (i
= 0; i
< q
->nr
; i
++)
4473 diff_free_filepair(q
->queue
[i
]);
4476 DIFF_QUEUE_CLEAR(q
);
4477 if (options
->close_file
)
4478 fclose(options
->file
);
4481 * Report the content-level differences with HAS_CHANGES;
4482 * diff_addremove/diff_change does not set the bit when
4483 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4485 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4486 if (options
->found_changes
)
4487 DIFF_OPT_SET(options
, HAS_CHANGES
);
4489 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4493 static void diffcore_apply_filter(const char *filter
)
4496 struct diff_queue_struct
*q
= &diff_queued_diff
;
4497 struct diff_queue_struct outq
;
4498 DIFF_QUEUE_CLEAR(&outq
);
4503 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
4505 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
4506 struct diff_filepair
*p
= q
->queue
[i
];
4507 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
4509 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
4511 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
4512 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
4513 strchr(filter
, p
->status
)))
4519 /* otherwise we will clear the whole queue
4520 * by copying the empty outq at the end of this
4521 * function, but first clear the current entries
4524 for (i
= 0; i
< q
->nr
; i
++)
4525 diff_free_filepair(q
->queue
[i
]);
4528 /* Only the matching ones */
4529 for (i
= 0; i
< q
->nr
; i
++) {
4530 struct diff_filepair
*p
= q
->queue
[i
];
4532 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
4534 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
4536 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
4537 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
4538 strchr(filter
, p
->status
)))
4541 diff_free_filepair(p
);
4548 /* Check whether two filespecs with the same mode and size are identical */
4549 static int diff_filespec_is_identical(struct diff_filespec
*one
,
4550 struct diff_filespec
*two
)
4552 if (S_ISGITLINK(one
->mode
))
4554 if (diff_populate_filespec(one
, 0))
4556 if (diff_populate_filespec(two
, 0))
4558 return !memcmp(one
->data
, two
->data
, one
->size
);
4561 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
4564 struct diff_queue_struct
*q
= &diff_queued_diff
;
4565 struct diff_queue_struct outq
;
4566 DIFF_QUEUE_CLEAR(&outq
);
4568 for (i
= 0; i
< q
->nr
; i
++) {
4569 struct diff_filepair
*p
= q
->queue
[i
];
4572 * 1. Entries that come from stat info dirtiness
4573 * always have both sides (iow, not create/delete),
4574 * one side of the object name is unknown, with
4575 * the same mode and size. Keep the ones that
4576 * do not match these criteria. They have real
4579 * 2. At this point, the file is known to be modified,
4580 * with the same mode and size, and the object
4581 * name of one side is unknown. Need to inspect
4582 * the identical contents.
4584 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
4585 !DIFF_FILE_VALID(p
->two
) ||
4586 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
4587 (p
->one
->mode
!= p
->two
->mode
) ||
4588 diff_populate_filespec(p
->one
, 1) ||
4589 diff_populate_filespec(p
->two
, 1) ||
4590 (p
->one
->size
!= p
->two
->size
) ||
4591 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
4595 * The caller can subtract 1 from skip_stat_unmatch
4596 * to determine how many paths were dirty only
4597 * due to stat info mismatch.
4599 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
4600 diffopt
->skip_stat_unmatch
++;
4601 diff_free_filepair(p
);
4608 static int diffnamecmp(const void *a_
, const void *b_
)
4610 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
4611 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
4612 const char *name_a
, *name_b
;
4614 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
4615 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
4616 return strcmp(name_a
, name_b
);
4619 void diffcore_fix_diff_index(struct diff_options
*options
)
4621 struct diff_queue_struct
*q
= &diff_queued_diff
;
4622 qsort(q
->queue
, q
->nr
, sizeof(q
->queue
[0]), diffnamecmp
);
4625 void diffcore_std(struct diff_options
*options
)
4627 if (options
->skip_stat_unmatch
)
4628 diffcore_skip_stat_unmatch(options
);
4629 if (!options
->found_follow
) {
4630 /* See try_to_follow_renames() in tree-diff.c */
4631 if (options
->break_opt
!= -1)
4632 diffcore_break(options
->break_opt
);
4633 if (options
->detect_rename
)
4634 diffcore_rename(options
);
4635 if (options
->break_opt
!= -1)
4636 diffcore_merge_broken();
4638 if (options
->pickaxe
)
4639 diffcore_pickaxe(options
);
4640 if (options
->orderfile
)
4641 diffcore_order(options
->orderfile
);
4642 if (!options
->found_follow
)
4643 /* See try_to_follow_renames() in tree-diff.c */
4644 diff_resolve_rename_copy();
4645 diffcore_apply_filter(options
->filter
);
4647 if (diff_queued_diff
.nr
&& !DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4648 DIFF_OPT_SET(options
, HAS_CHANGES
);
4650 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4652 options
->found_follow
= 0;
4655 int diff_result_code(struct diff_options
*opt
, int status
)
4659 diff_warn_rename_limit("diff.renamelimit",
4660 opt
->needed_rename_limit
,
4661 opt
->degraded_cc_to_c
);
4662 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4663 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
4665 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4666 DIFF_OPT_TST(opt
, HAS_CHANGES
))
4668 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
4669 DIFF_OPT_TST(opt
, CHECK_FAILED
))
4674 int diff_can_quit_early(struct diff_options
*opt
)
4676 return (DIFF_OPT_TST(opt
, QUICK
) &&
4678 DIFF_OPT_TST(opt
, HAS_CHANGES
));
4682 * Shall changes to this submodule be ignored?
4684 * Submodule changes can be configured to be ignored separately for each path,
4685 * but that configuration can be overridden from the command line.
4687 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
4690 unsigned orig_flags
= options
->flags
;
4691 if (!DIFF_OPT_TST(options
, OVERRIDE_SUBMODULE_CONFIG
))
4692 set_diffopt_flags_from_submodule_config(options
, path
);
4693 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
))
4695 options
->flags
= orig_flags
;
4699 void diff_addremove(struct diff_options
*options
,
4700 int addremove
, unsigned mode
,
4701 const unsigned char *sha1
,
4703 const char *concatpath
, unsigned dirty_submodule
)
4705 struct diff_filespec
*one
, *two
;
4707 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
4710 /* This may look odd, but it is a preparation for
4711 * feeding "there are unchanged files which should
4712 * not produce diffs, but when you are doing copy
4713 * detection you would need them, so here they are"
4714 * entries to the diff-core. They will be prefixed
4715 * with something like '=' or '*' (I haven't decided
4716 * which but should not make any difference).
4717 * Feeding the same new and old to diff_change()
4718 * also has the same effect.
4719 * Before the final output happens, they are pruned after
4720 * merged into rename/copy pairs as appropriate.
4722 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
4723 addremove
= (addremove
== '+' ? '-' :
4724 addremove
== '-' ? '+' : addremove
);
4726 if (options
->prefix
&&
4727 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4730 one
= alloc_filespec(concatpath
);
4731 two
= alloc_filespec(concatpath
);
4733 if (addremove
!= '+')
4734 fill_filespec(one
, sha1
, sha1_valid
, mode
);
4735 if (addremove
!= '-') {
4736 fill_filespec(two
, sha1
, sha1_valid
, mode
);
4737 two
->dirty_submodule
= dirty_submodule
;
4740 diff_queue(&diff_queued_diff
, one
, two
);
4741 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4742 DIFF_OPT_SET(options
, HAS_CHANGES
);
4745 void diff_change(struct diff_options
*options
,
4746 unsigned old_mode
, unsigned new_mode
,
4747 const unsigned char *old_sha1
,
4748 const unsigned char *new_sha1
,
4749 int old_sha1_valid
, int new_sha1_valid
,
4750 const char *concatpath
,
4751 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
4753 struct diff_filespec
*one
, *two
;
4755 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
4756 is_submodule_ignored(concatpath
, options
))
4759 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
4761 const unsigned char *tmp_c
;
4762 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
4763 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
4764 tmp
= old_sha1_valid
; old_sha1_valid
= new_sha1_valid
;
4765 new_sha1_valid
= tmp
;
4766 tmp
= old_dirty_submodule
; old_dirty_submodule
= new_dirty_submodule
;
4767 new_dirty_submodule
= tmp
;
4770 if (options
->prefix
&&
4771 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4774 one
= alloc_filespec(concatpath
);
4775 two
= alloc_filespec(concatpath
);
4776 fill_filespec(one
, old_sha1
, old_sha1_valid
, old_mode
);
4777 fill_filespec(two
, new_sha1
, new_sha1_valid
, new_mode
);
4778 one
->dirty_submodule
= old_dirty_submodule
;
4779 two
->dirty_submodule
= new_dirty_submodule
;
4781 diff_queue(&diff_queued_diff
, one
, two
);
4782 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4783 DIFF_OPT_SET(options
, HAS_CHANGES
);
4786 struct diff_filepair
*diff_unmerge(struct diff_options
*options
, const char *path
)
4788 struct diff_filepair
*pair
;
4789 struct diff_filespec
*one
, *two
;
4791 if (options
->prefix
&&
4792 strncmp(path
, options
->prefix
, options
->prefix_length
))
4795 one
= alloc_filespec(path
);
4796 two
= alloc_filespec(path
);
4797 pair
= diff_queue(&diff_queued_diff
, one
, two
);
4798 pair
->is_unmerged
= 1;
4802 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
4805 struct diff_tempfile
*temp
;
4806 const char *argv
[3];
4807 const char **arg
= argv
;
4808 struct child_process child
;
4809 struct strbuf buf
= STRBUF_INIT
;
4812 temp
= prepare_temp_file(spec
->path
, spec
);
4814 *arg
++ = temp
->name
;
4817 memset(&child
, 0, sizeof(child
));
4818 child
.use_shell
= 1;
4821 if (start_command(&child
)) {
4826 if (strbuf_read(&buf
, child
.out
, 0) < 0)
4827 err
= error("error reading from textconv command '%s'", pgm
);
4830 if (finish_command(&child
) || err
) {
4831 strbuf_release(&buf
);
4837 return strbuf_detach(&buf
, outsize
);
4840 size_t fill_textconv(struct userdiff_driver
*driver
,
4841 struct diff_filespec
*df
,
4846 if (!driver
|| !driver
->textconv
) {
4847 if (!DIFF_FILE_VALID(df
)) {
4851 if (diff_populate_filespec(df
, 0))
4852 die("unable to read files to diff");
4857 if (driver
->textconv_cache
&& df
->sha1_valid
) {
4858 *outbuf
= notes_cache_get(driver
->textconv_cache
, df
->sha1
,
4864 *outbuf
= run_textconv(driver
->textconv
, df
, &size
);
4866 die("unable to read files to diff");
4868 if (driver
->textconv_cache
&& df
->sha1_valid
) {
4869 /* ignore errors, as we might be in a readonly repository */
4870 notes_cache_put(driver
->textconv_cache
, df
->sha1
, *outbuf
,
4873 * we could save up changes and flush them all at the end,
4874 * but we would need an extra call after all diffing is done.
4875 * Since generating a cache entry is the slow path anyway,
4876 * this extra overhead probably isn't a big deal.
4878 notes_cache_write(driver
->textconv_cache
);