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
= 200;
27 static int diff_suppress_blank_empty
;
28 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 struct diff_options default_diff_options
;
36 static char diff_colors
[][COLOR_MAXLEN
] = {
38 GIT_COLOR_NORMAL
, /* PLAIN */
39 GIT_COLOR_BOLD
, /* METAINFO */
40 GIT_COLOR_CYAN
, /* FRAGINFO */
41 GIT_COLOR_RED
, /* OLD */
42 GIT_COLOR_GREEN
, /* NEW */
43 GIT_COLOR_YELLOW
, /* COMMIT */
44 GIT_COLOR_BG_RED
, /* WHITESPACE */
45 GIT_COLOR_NORMAL
, /* FUNCINFO */
48 static int parse_diff_color_slot(const char *var
, int ofs
)
50 if (!strcasecmp(var
+ofs
, "plain"))
52 if (!strcasecmp(var
+ofs
, "meta"))
54 if (!strcasecmp(var
+ofs
, "frag"))
56 if (!strcasecmp(var
+ofs
, "old"))
58 if (!strcasecmp(var
+ofs
, "new"))
60 if (!strcasecmp(var
+ofs
, "commit"))
62 if (!strcasecmp(var
+ofs
, "whitespace"))
63 return DIFF_WHITESPACE
;
64 if (!strcasecmp(var
+ofs
, "func"))
69 static int git_config_rename(const char *var
, const char *value
)
72 return DIFF_DETECT_RENAME
;
73 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
74 return DIFF_DETECT_COPY
;
75 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
79 * These are to give UI layer defaults.
80 * The core-level commands such as git-diff-files should
81 * never be affected by the setting of diff.renames
82 * the user happens to have in the configuration file.
84 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
86 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
87 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
90 if (!strcmp(var
, "diff.renames")) {
91 diff_detect_rename_default
= git_config_rename(var
, value
);
94 if (!strcmp(var
, "diff.autorefreshindex")) {
95 diff_auto_refresh_index
= git_config_bool(var
, value
);
98 if (!strcmp(var
, "diff.mnemonicprefix")) {
99 diff_mnemonic_prefix
= git_config_bool(var
, value
);
102 if (!strcmp(var
, "diff.noprefix")) {
103 diff_no_prefix
= git_config_bool(var
, value
);
106 if (!strcmp(var
, "diff.external"))
107 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
108 if (!strcmp(var
, "diff.wordregex"))
109 return git_config_string(&diff_word_regex_cfg
, var
, value
);
111 if (!strcmp(var
, "diff.ignoresubmodules"))
112 handle_ignore_submodules_arg(&default_diff_options
, value
);
114 return git_diff_basic_config(var
, value
, cb
);
117 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
119 if (!strcmp(var
, "diff.renamelimit")) {
120 diff_rename_limit_default
= git_config_int(var
, value
);
124 switch (userdiff_config(var
, value
)) {
130 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
131 int slot
= parse_diff_color_slot(var
, 11);
135 return config_error_nonbool(var
);
136 color_parse(value
, var
, diff_colors
[slot
]);
140 /* like GNU diff's --suppress-blank-empty option */
141 if (!strcmp(var
, "diff.suppressblankempty") ||
142 /* for backwards compatibility */
143 !strcmp(var
, "diff.suppress-blank-empty")) {
144 diff_suppress_blank_empty
= git_config_bool(var
, value
);
148 if (!prefixcmp(var
, "submodule."))
149 return parse_submodule_config_option(var
, value
);
151 return git_color_default_config(var
, value
, cb
);
154 static char *quote_two(const char *one
, const char *two
)
156 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
157 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
158 struct strbuf res
= STRBUF_INIT
;
160 if (need_one
+ need_two
) {
161 strbuf_addch(&res
, '"');
162 quote_c_style(one
, &res
, NULL
, 1);
163 quote_c_style(two
, &res
, NULL
, 1);
164 strbuf_addch(&res
, '"');
166 strbuf_addstr(&res
, one
);
167 strbuf_addstr(&res
, two
);
169 return strbuf_detach(&res
, NULL
);
172 static const char *external_diff(void)
174 static const char *external_diff_cmd
= NULL
;
175 static int done_preparing
= 0;
178 return external_diff_cmd
;
179 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
180 if (!external_diff_cmd
)
181 external_diff_cmd
= external_diff_cmd_cfg
;
183 return external_diff_cmd
;
186 static struct diff_tempfile
{
187 const char *name
; /* filename external diff should read from */
190 char tmp_path
[PATH_MAX
];
193 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
195 struct emit_callback
{
198 int blank_at_eof_in_preimage
;
199 int blank_at_eof_in_postimage
;
201 int lno_in_postimage
;
202 sane_truncate_fn truncate
;
203 const char **label_path
;
204 struct diff_words_data
*diff_words
;
205 struct diff_options
*opt
;
207 struct strbuf
*header
;
210 static int count_lines(const char *data
, int size
)
212 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
219 completely_empty
= 0;
223 completely_empty
= 0;
226 if (completely_empty
)
229 count
++; /* no trailing newline */
233 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
235 if (!DIFF_FILE_VALID(one
)) {
236 mf
->ptr
= (char *)""; /* does not matter */
240 else if (diff_populate_filespec(one
, 0))
244 mf
->size
= one
->size
;
248 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
251 long size
= mf
->size
;
256 ptr
+= size
- 1; /* pointing at the very end */
258 ; /* incomplete line */
260 ptr
--; /* skip the last LF */
261 while (mf
->ptr
< ptr
) {
263 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
264 if (*prev_eol
== '\n')
266 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
274 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
275 struct emit_callback
*ecbdata
)
278 unsigned ws_rule
= ecbdata
->ws_rule
;
279 l1
= count_trailing_blank(mf1
, ws_rule
);
280 l2
= count_trailing_blank(mf2
, ws_rule
);
282 ecbdata
->blank_at_eof_in_preimage
= 0;
283 ecbdata
->blank_at_eof_in_postimage
= 0;
286 at
= count_lines(mf1
->ptr
, mf1
->size
);
287 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
289 at
= count_lines(mf2
->ptr
, mf2
->size
);
290 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
293 static void emit_line_0(struct diff_options
*o
, const char *set
, const char *reset
,
294 int first
, const char *line
, int len
)
296 int has_trailing_newline
, has_trailing_carriage_return
;
298 FILE *file
= o
->file
;
300 if (o
->output_prefix
) {
301 struct strbuf
*msg
= NULL
;
302 msg
= o
->output_prefix(o
, o
->output_prefix_data
);
304 fwrite(msg
->buf
, msg
->len
, 1, file
);
308 has_trailing_newline
= (first
== '\n');
309 has_trailing_carriage_return
= (!has_trailing_newline
&&
311 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
313 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
314 if (has_trailing_newline
)
316 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
317 if (has_trailing_carriage_return
)
322 if (len
|| !nofirst
) {
326 fwrite(line
, len
, 1, file
);
329 if (has_trailing_carriage_return
)
331 if (has_trailing_newline
)
335 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
336 const char *line
, int len
)
338 emit_line_0(o
, set
, reset
, line
[0], line
+1, len
-1);
341 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
343 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
344 ecbdata
->blank_at_eof_in_preimage
&&
345 ecbdata
->blank_at_eof_in_postimage
&&
346 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
347 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
349 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
352 static void emit_add_line(const char *reset
,
353 struct emit_callback
*ecbdata
,
354 const char *line
, int len
)
356 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
357 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
360 emit_line_0(ecbdata
->opt
, set
, reset
, '+', line
, len
);
361 else if (new_blank_line_at_eof(ecbdata
, line
, len
))
362 /* Blank line at EOF - paint '+' as well */
363 emit_line_0(ecbdata
->opt
, ws
, reset
, '+', line
, len
);
365 /* Emit just the prefix, then the rest. */
366 emit_line_0(ecbdata
->opt
, set
, reset
, '+', "", 0);
367 ws_check_emit(line
, len
, ecbdata
->ws_rule
,
368 ecbdata
->opt
->file
, set
, reset
, ws
);
372 static void emit_hunk_header(struct emit_callback
*ecbdata
,
373 const char *line
, int len
)
375 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
376 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
377 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
378 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
379 static const char atat
[2] = { '@', '@' };
381 struct strbuf msgbuf
= STRBUF_INIT
;
386 * As a hunk header must begin with "@@ -<old>, +<new> @@",
387 * it always is at least 10 bytes long.
390 memcmp(line
, atat
, 2) ||
391 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
392 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
395 ep
+= 2; /* skip over @@ */
397 /* The hunk header in fraginfo color */
398 strbuf_add(&msgbuf
, frag
, strlen(frag
));
399 strbuf_add(&msgbuf
, line
, ep
- line
);
400 strbuf_add(&msgbuf
, reset
, strlen(reset
));
406 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
409 /* blank before the func header */
410 for (cp
= ep
; ep
- line
< len
; ep
++)
411 if (*ep
!= ' ' && *ep
!= '\t')
414 strbuf_add(&msgbuf
, plain
, strlen(plain
));
415 strbuf_add(&msgbuf
, cp
, ep
- cp
);
416 strbuf_add(&msgbuf
, reset
, strlen(reset
));
419 if (ep
< line
+ len
) {
420 strbuf_add(&msgbuf
, func
, strlen(func
));
421 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
422 strbuf_add(&msgbuf
, reset
, strlen(reset
));
425 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
426 emit_line(ecbdata
->opt
, "", "", msgbuf
.buf
, msgbuf
.len
);
427 strbuf_release(&msgbuf
);
430 static struct diff_tempfile
*claim_diff_tempfile(void) {
432 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
433 if (!diff_temp
[i
].name
)
434 return diff_temp
+ i
;
435 die("BUG: diff is failing to clean up its tempfiles");
438 static int remove_tempfile_installed
;
440 static void remove_tempfile(void)
443 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
444 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
)
445 unlink_or_warn(diff_temp
[i
].name
);
446 diff_temp
[i
].name
= NULL
;
450 static void remove_tempfile_on_signal(int signo
)
457 static void print_line_count(FILE *file
, int count
)
461 fprintf(file
, "0,0");
467 fprintf(file
, "1,%d", count
);
472 static void emit_rewrite_lines(struct emit_callback
*ecb
,
473 int prefix
, const char *data
, int size
)
475 const char *endp
= NULL
;
476 static const char *nneof
= " No newline at end of file\n";
477 const char *old
= diff_get_color(ecb
->color_diff
, DIFF_FILE_OLD
);
478 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
483 endp
= memchr(data
, '\n', size
);
484 len
= endp
? (endp
- data
+ 1) : size
;
486 ecb
->lno_in_preimage
++;
487 emit_line_0(ecb
->opt
, old
, reset
, '-',
490 ecb
->lno_in_postimage
++;
491 emit_add_line(reset
, ecb
, data
, len
);
497 const char *plain
= diff_get_color(ecb
->color_diff
,
499 emit_line_0(ecb
->opt
, plain
, reset
, '\\',
500 nneof
, strlen(nneof
));
504 static void emit_rewrite_diff(const char *name_a
,
506 struct diff_filespec
*one
,
507 struct diff_filespec
*two
,
508 struct userdiff_driver
*textconv_one
,
509 struct userdiff_driver
*textconv_two
,
510 struct diff_options
*o
)
513 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
514 const char *name_a_tab
, *name_b_tab
;
515 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
516 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
517 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
518 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
519 const char *a_prefix
, *b_prefix
;
520 char *data_one
, *data_two
;
521 size_t size_one
, size_two
;
522 struct emit_callback ecbdata
;
523 char *line_prefix
= "";
524 struct strbuf
*msgbuf
;
526 if (o
&& o
->output_prefix
) {
527 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
528 line_prefix
= msgbuf
->buf
;
531 if (diff_mnemonic_prefix
&& DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
532 a_prefix
= o
->b_prefix
;
533 b_prefix
= o
->a_prefix
;
535 a_prefix
= o
->a_prefix
;
536 b_prefix
= o
->b_prefix
;
539 name_a
+= (*name_a
== '/');
540 name_b
+= (*name_b
== '/');
541 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
542 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
544 strbuf_reset(&a_name
);
545 strbuf_reset(&b_name
);
546 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
547 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
549 size_one
= fill_textconv(textconv_one
, one
, &data_one
);
550 size_two
= fill_textconv(textconv_two
, two
, &data_two
);
552 memset(&ecbdata
, 0, sizeof(ecbdata
));
553 ecbdata
.color_diff
= color_diff
;
554 ecbdata
.found_changesp
= &o
->found_changes
;
555 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
557 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
559 mf1
.ptr
= (char *)data_one
;
560 mf2
.ptr
= (char *)data_two
;
563 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
565 ecbdata
.lno_in_preimage
= 1;
566 ecbdata
.lno_in_postimage
= 1;
568 lc_a
= count_lines(data_one
, size_one
);
569 lc_b
= count_lines(data_two
, size_two
);
571 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
572 line_prefix
, metainfo
, a_name
.buf
, name_a_tab
, reset
,
573 line_prefix
, metainfo
, b_name
.buf
, name_b_tab
, reset
,
574 line_prefix
, fraginfo
);
575 print_line_count(o
->file
, lc_a
);
576 fprintf(o
->file
, " +");
577 print_line_count(o
->file
, lc_b
);
578 fprintf(o
->file
, " @@%s\n", reset
);
580 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
582 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
584 free((char *)data_one
);
586 free((char *)data_two
);
589 struct diff_words_buffer
{
592 struct diff_words_orig
{
593 const char *begin
, *end
;
595 int orig_nr
, orig_alloc
;
598 static void diff_words_append(char *line
, unsigned long len
,
599 struct diff_words_buffer
*buffer
)
601 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
604 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
605 buffer
->text
.size
+= len
;
606 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
609 struct diff_words_style_elem
613 const char *color
; /* NULL; filled in by the setup code if
614 * color is enabled */
617 struct diff_words_style
619 enum diff_words_type type
;
620 struct diff_words_style_elem
new, old
, ctx
;
624 struct diff_words_style diff_words_styles
[] = {
625 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
626 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
627 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
630 struct diff_words_data
{
631 struct diff_words_buffer minus
, plus
;
632 const char *current_plus
;
634 struct diff_options
*opt
;
636 enum diff_words_type type
;
637 struct diff_words_style
*style
;
640 static int fn_out_diff_words_write_helper(FILE *fp
,
641 struct diff_words_style_elem
*st_el
,
643 size_t count
, const char *buf
,
644 const char *line_prefix
)
649 char *p
= memchr(buf
, '\n', count
);
651 fputs(line_prefix
, fp
);
653 if (st_el
->color
&& fputs(st_el
->color
, fp
) < 0)
655 if (fputs(st_el
->prefix
, fp
) < 0 ||
656 fwrite(buf
, p
? p
- buf
: count
, 1, fp
) != 1 ||
657 fputs(st_el
->suffix
, fp
) < 0)
659 if (st_el
->color
&& *st_el
->color
660 && fputs(GIT_COLOR_RESET
, fp
) < 0)
665 if (fputs(newline
, fp
) < 0)
667 count
-= p
+ 1 - buf
;
675 * '--color-words' algorithm can be described as:
677 * 1. collect a the minus/plus lines of a diff hunk, divided into
678 * minus-lines and plus-lines;
680 * 2. break both minus-lines and plus-lines into words and
681 * place them into two mmfile_t with one word for each line;
683 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
685 * And for the common parts of the both file, we output the plus side text.
686 * diff_words->current_plus is used to trace the current position of the plus file
687 * which printed. diff_words->last_minus is used to trace the last minus word
690 * For '--graph' to work with '--color-words', we need to output the graph prefix
691 * on each line of color words output. Generally, there are two conditions on
692 * which we should output the prefix.
694 * 1. diff_words->last_minus == 0 &&
695 * diff_words->current_plus == diff_words->plus.text.ptr
697 * that is: the plus text must start as a new line, and if there is no minus
698 * word printed, a graph prefix must be printed.
700 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
701 * *(diff_words->current_plus - 1) == '\n'
703 * that is: a graph prefix must be printed following a '\n'
705 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
707 if ((diff_words
->last_minus
== 0 &&
708 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
709 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
710 *(diff_words
->current_plus
- 1) == '\n')) {
717 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
719 struct diff_words_data
*diff_words
= priv
;
720 struct diff_words_style
*style
= diff_words
->style
;
721 int minus_first
, minus_len
, plus_first
, plus_len
;
722 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
723 struct diff_options
*opt
= diff_words
->opt
;
724 struct strbuf
*msgbuf
;
725 char *line_prefix
= "";
727 if (line
[0] != '@' || parse_hunk_header(line
, len
,
728 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
732 if (opt
->output_prefix
) {
733 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
734 line_prefix
= msgbuf
->buf
;
737 /* POSIX requires that first be decremented by one if len == 0... */
739 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
741 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
743 minus_begin
= minus_end
=
744 diff_words
->minus
.orig
[minus_first
].end
;
747 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
748 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
750 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
752 if (color_words_output_graph_prefix(diff_words
)) {
753 fputs(line_prefix
, diff_words
->opt
->file
);
755 if (diff_words
->current_plus
!= plus_begin
) {
756 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
757 &style
->ctx
, style
->newline
,
758 plus_begin
- diff_words
->current_plus
,
759 diff_words
->current_plus
, line_prefix
);
760 if (*(plus_begin
- 1) == '\n')
761 fputs(line_prefix
, diff_words
->opt
->file
);
763 if (minus_begin
!= minus_end
) {
764 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
765 &style
->old
, style
->newline
,
766 minus_end
- minus_begin
, minus_begin
,
769 if (plus_begin
!= plus_end
) {
770 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
771 &style
->new, style
->newline
,
772 plus_end
- plus_begin
, plus_begin
,
776 diff_words
->current_plus
= plus_end
;
777 diff_words
->last_minus
= minus_first
;
780 /* This function starts looking at *begin, and returns 0 iff a word was found. */
781 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
782 int *begin
, int *end
)
784 if (word_regex
&& *begin
< buffer
->size
) {
786 if (!regexec(word_regex
, buffer
->ptr
+ *begin
, 1, match
, 0)) {
787 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
788 '\n', match
[0].rm_eo
- match
[0].rm_so
);
789 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
790 *begin
+= match
[0].rm_so
;
791 return *begin
>= *end
;
796 /* find the next word */
797 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
799 if (*begin
>= buffer
->size
)
802 /* find the end of the word */
804 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
811 * This function splits the words in buffer->text, stores the list with
812 * newline separator into out, and saves the offsets of the original words
815 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
824 /* fake an empty "0th" word */
825 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
826 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
829 for (i
= 0; i
< buffer
->text
.size
; i
++) {
830 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
833 /* store original boundaries */
834 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
836 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
837 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
841 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
842 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
843 out
->ptr
[out
->size
+ j
- i
] = '\n';
844 out
->size
+= j
- i
+ 1;
850 /* this executes the word diff on the accumulated buffers */
851 static void diff_words_show(struct diff_words_data
*diff_words
)
855 mmfile_t minus
, plus
;
856 struct diff_words_style
*style
= diff_words
->style
;
858 struct diff_options
*opt
= diff_words
->opt
;
859 struct strbuf
*msgbuf
;
860 char *line_prefix
= "";
863 if (opt
->output_prefix
) {
864 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
865 line_prefix
= msgbuf
->buf
;
868 /* special case: only removal */
869 if (!diff_words
->plus
.text
.size
) {
870 fputs(line_prefix
, diff_words
->opt
->file
);
871 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
872 &style
->old
, style
->newline
,
873 diff_words
->minus
.text
.size
,
874 diff_words
->minus
.text
.ptr
, line_prefix
);
875 diff_words
->minus
.text
.size
= 0;
879 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
880 diff_words
->last_minus
= 0;
882 memset(&xpp
, 0, sizeof(xpp
));
883 memset(&xecfg
, 0, sizeof(xecfg
));
884 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
885 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
887 /* as only the hunk header will be parsed, we need a 0-context */
889 xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
893 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
894 diff_words
->plus
.text
.size
) {
895 if (color_words_output_graph_prefix(diff_words
))
896 fputs(line_prefix
, diff_words
->opt
->file
);
897 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
898 &style
->ctx
, style
->newline
,
899 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
900 - diff_words
->current_plus
, diff_words
->current_plus
,
903 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
906 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
907 static void diff_words_flush(struct emit_callback
*ecbdata
)
909 if (ecbdata
->diff_words
->minus
.text
.size
||
910 ecbdata
->diff_words
->plus
.text
.size
)
911 diff_words_show(ecbdata
->diff_words
);
914 static void free_diff_words_data(struct emit_callback
*ecbdata
)
916 if (ecbdata
->diff_words
) {
917 diff_words_flush(ecbdata
);
918 free (ecbdata
->diff_words
->minus
.text
.ptr
);
919 free (ecbdata
->diff_words
->minus
.orig
);
920 free (ecbdata
->diff_words
->plus
.text
.ptr
);
921 free (ecbdata
->diff_words
->plus
.orig
);
922 if (ecbdata
->diff_words
->word_regex
) {
923 regfree(ecbdata
->diff_words
->word_regex
);
924 free(ecbdata
->diff_words
->word_regex
);
926 free(ecbdata
->diff_words
);
927 ecbdata
->diff_words
= NULL
;
931 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
934 return diff_colors
[ix
];
938 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
945 return ecb
->truncate(line
, len
);
949 (void) utf8_width(&cp
, &l
);
951 break; /* truncated in the middle? */
956 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
959 ecbdata
->lno_in_preimage
= 0;
960 ecbdata
->lno_in_postimage
= 0;
961 p
= strchr(line
, '-');
963 return; /* cannot happen */
964 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
967 return; /* cannot happen */
968 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
971 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
973 struct emit_callback
*ecbdata
= priv
;
974 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
975 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
976 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
977 struct diff_options
*o
= ecbdata
->opt
;
978 char *line_prefix
= "";
979 struct strbuf
*msgbuf
;
981 if (o
&& o
->output_prefix
) {
982 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
983 line_prefix
= msgbuf
->buf
;
986 if (ecbdata
->header
) {
987 fprintf(ecbdata
->opt
->file
, "%s", ecbdata
->header
->buf
);
988 strbuf_reset(ecbdata
->header
);
989 ecbdata
->header
= NULL
;
991 *(ecbdata
->found_changesp
) = 1;
993 if (ecbdata
->label_path
[0]) {
994 const char *name_a_tab
, *name_b_tab
;
996 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
997 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
999 fprintf(ecbdata
->opt
->file
, "%s%s--- %s%s%s\n",
1000 line_prefix
, meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
1001 fprintf(ecbdata
->opt
->file
, "%s%s+++ %s%s%s\n",
1002 line_prefix
, meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
1003 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
1006 if (diff_suppress_blank_empty
1007 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
1012 if (line
[0] == '@') {
1013 if (ecbdata
->diff_words
)
1014 diff_words_flush(ecbdata
);
1015 len
= sane_truncate_line(ecbdata
, line
, len
);
1016 find_lno(line
, ecbdata
);
1017 emit_hunk_header(ecbdata
, line
, len
);
1018 if (line
[len
-1] != '\n')
1019 putc('\n', ecbdata
->opt
->file
);
1024 emit_line(ecbdata
->opt
, reset
, reset
, line
, len
);
1025 if (ecbdata
->diff_words
1026 && ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
)
1027 fputs("~\n", ecbdata
->opt
->file
);
1031 if (ecbdata
->diff_words
) {
1032 if (line
[0] == '-') {
1033 diff_words_append(line
, len
,
1034 &ecbdata
->diff_words
->minus
);
1036 } else if (line
[0] == '+') {
1037 diff_words_append(line
, len
,
1038 &ecbdata
->diff_words
->plus
);
1041 diff_words_flush(ecbdata
);
1042 if (ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
) {
1043 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
1044 fputs("~\n", ecbdata
->opt
->file
);
1046 /* don't print the prefix character */
1047 emit_line(ecbdata
->opt
, plain
, reset
, line
+1, len
-1);
1052 if (line
[0] != '+') {
1054 diff_get_color(ecbdata
->color_diff
,
1055 line
[0] == '-' ? DIFF_FILE_OLD
: DIFF_PLAIN
);
1056 ecbdata
->lno_in_preimage
++;
1058 ecbdata
->lno_in_postimage
++;
1059 emit_line(ecbdata
->opt
, color
, reset
, line
, len
);
1061 ecbdata
->lno_in_postimage
++;
1062 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
1066 static char *pprint_rename(const char *a
, const char *b
)
1068 const char *old
= a
;
1069 const char *new = b
;
1070 struct strbuf name
= STRBUF_INIT
;
1071 int pfx_length
, sfx_length
;
1072 int len_a
= strlen(a
);
1073 int len_b
= strlen(b
);
1074 int a_midlen
, b_midlen
;
1075 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
1076 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
1078 if (qlen_a
|| qlen_b
) {
1079 quote_c_style(a
, &name
, NULL
, 0);
1080 strbuf_addstr(&name
, " => ");
1081 quote_c_style(b
, &name
, NULL
, 0);
1082 return strbuf_detach(&name
, NULL
);
1085 /* Find common prefix */
1087 while (*old
&& *new && *old
== *new) {
1089 pfx_length
= old
- a
+ 1;
1094 /* Find common suffix */
1098 while (a
<= old
&& b
<= new && *old
== *new) {
1100 sfx_length
= len_a
- (old
- a
);
1106 * pfx{mid-a => mid-b}sfx
1107 * {pfx-a => pfx-b}sfx
1108 * pfx{sfx-a => sfx-b}
1111 a_midlen
= len_a
- pfx_length
- sfx_length
;
1112 b_midlen
= len_b
- pfx_length
- sfx_length
;
1118 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
1119 if (pfx_length
+ sfx_length
) {
1120 strbuf_add(&name
, a
, pfx_length
);
1121 strbuf_addch(&name
, '{');
1123 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
1124 strbuf_addstr(&name
, " => ");
1125 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
1126 if (pfx_length
+ sfx_length
) {
1127 strbuf_addch(&name
, '}');
1128 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
1130 return strbuf_detach(&name
, NULL
);
1136 struct diffstat_file
{
1140 unsigned is_unmerged
:1;
1141 unsigned is_binary
:1;
1142 unsigned is_renamed
:1;
1143 uintmax_t added
, deleted
;
1147 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
1151 struct diffstat_file
*x
;
1152 x
= xcalloc(sizeof (*x
), 1);
1153 if (diffstat
->nr
== diffstat
->alloc
) {
1154 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
1155 diffstat
->files
= xrealloc(diffstat
->files
,
1156 diffstat
->alloc
* sizeof(x
));
1158 diffstat
->files
[diffstat
->nr
++] = x
;
1160 x
->from_name
= xstrdup(name_a
);
1161 x
->name
= xstrdup(name_b
);
1165 x
->from_name
= NULL
;
1166 x
->name
= xstrdup(name_a
);
1171 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
1173 struct diffstat_t
*diffstat
= priv
;
1174 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
1178 else if (line
[0] == '-')
1182 const char mime_boundary_leader
[] = "------------";
1184 static int scale_linear(int it
, int width
, int max_change
)
1187 * make sure that at least one '-' is printed if there were deletions,
1188 * and likewise for '+'.
1192 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
1195 static void show_name(FILE *file
,
1196 const char *prefix
, const char *name
, int len
)
1198 fprintf(file
, " %s%-*s |", prefix
, len
, name
);
1201 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
1205 fprintf(file
, "%s", set
);
1208 fprintf(file
, "%s", reset
);
1211 static void fill_print_name(struct diffstat_file
*file
)
1215 if (file
->print_name
)
1218 if (!file
->is_renamed
) {
1219 struct strbuf buf
= STRBUF_INIT
;
1220 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
1221 pname
= strbuf_detach(&buf
, NULL
);
1224 strbuf_release(&buf
);
1227 pname
= pprint_rename(file
->from_name
, file
->name
);
1229 file
->print_name
= pname
;
1232 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
1234 int i
, len
, add
, del
, adds
= 0, dels
= 0;
1235 uintmax_t max_change
= 0, max_len
= 0;
1236 int total_files
= data
->nr
;
1237 int width
, name_width
;
1238 const char *reset
, *set
, *add_c
, *del_c
;
1239 const char *line_prefix
= "";
1240 struct strbuf
*msg
= NULL
;
1245 if (options
->output_prefix
) {
1246 msg
= options
->output_prefix(options
, options
->output_prefix_data
);
1247 line_prefix
= msg
->buf
;
1250 width
= options
->stat_width
? options
->stat_width
: 80;
1251 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
1253 /* Sanity: give at least 5 columns to the graph,
1254 * but leave at least 10 columns for the name.
1258 if (name_width
< 10)
1260 else if (width
< name_width
+ 15)
1261 name_width
= width
- 15;
1263 /* Find the longest filename and max number of changes */
1264 reset
= diff_get_color_opt(options
, DIFF_RESET
);
1265 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
1266 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
1267 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
1269 for (i
= 0; i
< data
->nr
; i
++) {
1270 struct diffstat_file
*file
= data
->files
[i
];
1271 uintmax_t change
= file
->added
+ file
->deleted
;
1272 fill_print_name(file
);
1273 len
= strlen(file
->print_name
);
1277 if (file
->is_binary
|| file
->is_unmerged
)
1279 if (max_change
< change
)
1280 max_change
= change
;
1283 /* Compute the width of the graph part;
1284 * 10 is for one blank at the beginning of the line plus
1285 * " | count " between the name and the graph.
1287 * From here on, name_width is the width of the name area,
1288 * and width is the width of the graph area.
1290 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
1291 if (width
< (name_width
+ 10) + max_change
)
1292 width
= width
- (name_width
+ 10);
1296 for (i
= 0; i
< data
->nr
; i
++) {
1297 const char *prefix
= "";
1298 char *name
= data
->files
[i
]->print_name
;
1299 uintmax_t added
= data
->files
[i
]->added
;
1300 uintmax_t deleted
= data
->files
[i
]->deleted
;
1304 * "scale" the filename
1307 name_len
= strlen(name
);
1308 if (name_width
< name_len
) {
1312 name
+= name_len
- len
;
1313 slash
= strchr(name
, '/');
1318 if (data
->files
[i
]->is_binary
) {
1319 fprintf(options
->file
, "%s", line_prefix
);
1320 show_name(options
->file
, prefix
, name
, len
);
1321 fprintf(options
->file
, " Bin ");
1322 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1323 del_c
, deleted
, reset
);
1324 fprintf(options
->file
, " -> ");
1325 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1326 add_c
, added
, reset
);
1327 fprintf(options
->file
, " bytes");
1328 fprintf(options
->file
, "\n");
1331 else if (data
->files
[i
]->is_unmerged
) {
1332 fprintf(options
->file
, "%s", line_prefix
);
1333 show_name(options
->file
, prefix
, name
, len
);
1334 fprintf(options
->file
, " Unmerged\n");
1337 else if (!data
->files
[i
]->is_renamed
&&
1338 (added
+ deleted
== 0)) {
1344 * scale the add/delete
1351 if (width
<= max_change
) {
1352 add
= scale_linear(add
, width
, max_change
);
1353 del
= scale_linear(del
, width
, max_change
);
1355 fprintf(options
->file
, "%s", line_prefix
);
1356 show_name(options
->file
, prefix
, name
, len
);
1357 fprintf(options
->file
, "%5"PRIuMAX
"%s", added
+ deleted
,
1358 added
+ deleted
? " " : "");
1359 show_graph(options
->file
, '+', add
, add_c
, reset
);
1360 show_graph(options
->file
, '-', del
, del_c
, reset
);
1361 fprintf(options
->file
, "\n");
1363 fprintf(options
->file
, "%s", line_prefix
);
1364 fprintf(options
->file
,
1365 " %d files changed, %d insertions(+), %d deletions(-)\n",
1366 total_files
, adds
, dels
);
1369 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
1371 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
1376 for (i
= 0; i
< data
->nr
; i
++) {
1377 if (!data
->files
[i
]->is_binary
&&
1378 !data
->files
[i
]->is_unmerged
) {
1379 int added
= data
->files
[i
]->added
;
1380 int deleted
= data
->files
[i
]->deleted
;
1381 if (!data
->files
[i
]->is_renamed
&&
1382 (added
+ deleted
== 0)) {
1390 if (options
->output_prefix
) {
1391 struct strbuf
*msg
= NULL
;
1392 msg
= options
->output_prefix(options
,
1393 options
->output_prefix_data
);
1394 fprintf(options
->file
, "%s", msg
->buf
);
1396 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
1397 total_files
, adds
, dels
);
1400 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
1407 for (i
= 0; i
< data
->nr
; i
++) {
1408 struct diffstat_file
*file
= data
->files
[i
];
1410 if (options
->output_prefix
) {
1411 struct strbuf
*msg
= NULL
;
1412 msg
= options
->output_prefix(options
,
1413 options
->output_prefix_data
);
1414 fprintf(options
->file
, "%s", msg
->buf
);
1417 if (file
->is_binary
)
1418 fprintf(options
->file
, "-\t-\t");
1420 fprintf(options
->file
,
1421 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
1422 file
->added
, file
->deleted
);
1423 if (options
->line_termination
) {
1424 fill_print_name(file
);
1425 if (!file
->is_renamed
)
1426 write_name_quoted(file
->name
, options
->file
,
1427 options
->line_termination
);
1429 fputs(file
->print_name
, options
->file
);
1430 putc(options
->line_termination
, options
->file
);
1433 if (file
->is_renamed
) {
1434 putc('\0', options
->file
);
1435 write_name_quoted(file
->from_name
, options
->file
, '\0');
1437 write_name_quoted(file
->name
, options
->file
, '\0');
1442 struct dirstat_file
{
1444 unsigned long changed
;
1447 struct dirstat_dir
{
1448 struct dirstat_file
*files
;
1449 int alloc
, nr
, percent
, cumulative
;
1452 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
1453 unsigned long changed
, const char *base
, int baselen
)
1455 unsigned long this_dir
= 0;
1456 unsigned int sources
= 0;
1457 const char *line_prefix
= "";
1458 struct strbuf
*msg
= NULL
;
1460 if (opt
->output_prefix
) {
1461 msg
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
1462 line_prefix
= msg
->buf
;
1466 struct dirstat_file
*f
= dir
->files
;
1467 int namelen
= strlen(f
->name
);
1471 if (namelen
< baselen
)
1473 if (memcmp(f
->name
, base
, baselen
))
1475 slash
= strchr(f
->name
+ baselen
, '/');
1477 int newbaselen
= slash
+ 1 - f
->name
;
1478 this = gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
1490 * We don't report dirstat's for
1492 * - or cases where everything came from a single directory
1493 * under this directory (sources == 1).
1495 if (baselen
&& sources
!= 1) {
1496 int permille
= this_dir
* 1000 / changed
;
1498 int percent
= permille
/ 10;
1499 if (percent
>= dir
->percent
) {
1500 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
1501 percent
, permille
% 10, baselen
, base
);
1502 if (!dir
->cumulative
)
1510 static int dirstat_compare(const void *_a
, const void *_b
)
1512 const struct dirstat_file
*a
= _a
;
1513 const struct dirstat_file
*b
= _b
;
1514 return strcmp(a
->name
, b
->name
);
1517 static void show_dirstat(struct diff_options
*options
)
1520 unsigned long changed
;
1521 struct dirstat_dir dir
;
1522 struct diff_queue_struct
*q
= &diff_queued_diff
;
1527 dir
.percent
= options
->dirstat_percent
;
1528 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1531 for (i
= 0; i
< q
->nr
; i
++) {
1532 struct diff_filepair
*p
= q
->queue
[i
];
1534 unsigned long copied
, added
, damage
;
1536 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1538 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1539 diff_populate_filespec(p
->one
, 0);
1540 diff_populate_filespec(p
->two
, 0);
1541 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1543 diff_free_filespec_data(p
->one
);
1544 diff_free_filespec_data(p
->two
);
1545 } else if (DIFF_FILE_VALID(p
->one
)) {
1546 diff_populate_filespec(p
->one
, 1);
1548 diff_free_filespec_data(p
->one
);
1549 } else if (DIFF_FILE_VALID(p
->two
)) {
1550 diff_populate_filespec(p
->two
, 1);
1552 added
= p
->two
->size
;
1553 diff_free_filespec_data(p
->two
);
1558 * Original minus copied is the removed material,
1559 * added is the new material. They are both damages
1560 * made to the preimage. In --dirstat-by-file mode, count
1561 * damaged files, not damaged lines. This is done by
1562 * counting only a single damaged line per file.
1564 damage
= (p
->one
->size
- copied
) + added
;
1565 if (DIFF_OPT_TST(options
, DIRSTAT_BY_FILE
) && damage
> 0)
1568 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1569 dir
.files
[dir
.nr
].name
= name
;
1570 dir
.files
[dir
.nr
].changed
= damage
;
1575 /* This can happen even with many files, if everything was renames */
1579 /* Show all directories with more than x% of the changes */
1580 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1581 gather_dirstat(options
, &dir
, changed
, "", 0);
1584 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1587 for (i
= 0; i
< diffstat
->nr
; i
++) {
1588 struct diffstat_file
*f
= diffstat
->files
[i
];
1589 if (f
->name
!= f
->print_name
)
1590 free(f
->print_name
);
1595 free(diffstat
->files
);
1598 struct checkdiff_t
{
1599 const char *filename
;
1601 int conflict_marker_size
;
1602 struct diff_options
*o
;
1607 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
1612 if (len
< marker_size
+ 1)
1614 firstchar
= line
[0];
1615 switch (firstchar
) {
1616 case '=': case '>': case '<': case '|':
1621 for (cnt
= 1; cnt
< marker_size
; cnt
++)
1622 if (line
[cnt
] != firstchar
)
1624 /* line[1] thru line[marker_size-1] are same as firstchar */
1625 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
1630 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1632 struct checkdiff_t
*data
= priv
;
1633 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1634 int marker_size
= data
->conflict_marker_size
;
1635 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1636 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1637 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1639 char *line_prefix
= "";
1640 struct strbuf
*msgbuf
;
1643 if (data
->o
->output_prefix
) {
1644 msgbuf
= data
->o
->output_prefix(data
->o
,
1645 data
->o
->output_prefix_data
);
1646 line_prefix
= msgbuf
->buf
;
1649 if (line
[0] == '+') {
1652 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
1654 fprintf(data
->o
->file
,
1655 "%s%s:%d: leftover conflict marker\n",
1656 line_prefix
, data
->filename
, data
->lineno
);
1658 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1661 data
->status
|= bad
;
1662 err
= whitespace_error_string(bad
);
1663 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
1664 line_prefix
, data
->filename
, data
->lineno
, err
);
1666 emit_line(data
->o
, set
, reset
, line
, 1);
1667 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1668 data
->o
->file
, set
, reset
, ws
);
1669 } else if (line
[0] == ' ') {
1671 } else if (line
[0] == '@') {
1672 char *plus
= strchr(line
, '+');
1674 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1676 die("invalid diff");
1680 static unsigned char *deflate_it(char *data
,
1682 unsigned long *result_size
)
1685 unsigned char *deflated
;
1688 memset(&stream
, 0, sizeof(stream
));
1689 deflateInit(&stream
, zlib_compression_level
);
1690 bound
= deflateBound(&stream
, size
);
1691 deflated
= xmalloc(bound
);
1692 stream
.next_out
= deflated
;
1693 stream
.avail_out
= bound
;
1695 stream
.next_in
= (unsigned char *)data
;
1696 stream
.avail_in
= size
;
1697 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1699 deflateEnd(&stream
);
1700 *result_size
= stream
.total_out
;
1704 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
, char *prefix
)
1710 unsigned long orig_size
;
1711 unsigned long delta_size
;
1712 unsigned long deflate_size
;
1713 unsigned long data_size
;
1715 /* We could do deflated delta, or we could do just deflated two,
1716 * whichever is smaller.
1719 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1720 if (one
->size
&& two
->size
) {
1721 delta
= diff_delta(one
->ptr
, one
->size
,
1722 two
->ptr
, two
->size
,
1723 &delta_size
, deflate_size
);
1725 void *to_free
= delta
;
1726 orig_size
= delta_size
;
1727 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1732 if (delta
&& delta_size
< deflate_size
) {
1733 fprintf(file
, "%sdelta %lu\n", prefix
, orig_size
);
1736 data_size
= delta_size
;
1739 fprintf(file
, "%sliteral %lu\n", prefix
, two
->size
);
1742 data_size
= deflate_size
;
1745 /* emit data encoded in base85 */
1748 int bytes
= (52 < data_size
) ? 52 : data_size
;
1752 line
[0] = bytes
+ 'A' - 1;
1754 line
[0] = bytes
- 26 + 'a' - 1;
1755 encode_85(line
+ 1, cp
, bytes
);
1756 cp
= (char *) cp
+ bytes
;
1757 fprintf(file
, "%s", prefix
);
1761 fprintf(file
, "%s\n", prefix
);
1765 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
, char *prefix
)
1767 fprintf(file
, "%sGIT binary patch\n", prefix
);
1768 emit_binary_diff_body(file
, one
, two
, prefix
);
1769 emit_binary_diff_body(file
, two
, one
, prefix
);
1772 static void diff_filespec_load_driver(struct diff_filespec
*one
)
1775 one
->driver
= userdiff_find_by_path(one
->path
);
1777 one
->driver
= userdiff_find_by_name("default");
1780 int diff_filespec_is_binary(struct diff_filespec
*one
)
1782 if (one
->is_binary
== -1) {
1783 diff_filespec_load_driver(one
);
1784 if (one
->driver
->binary
!= -1)
1785 one
->is_binary
= one
->driver
->binary
;
1787 if (!one
->data
&& DIFF_FILE_VALID(one
))
1788 diff_populate_filespec(one
, 0);
1790 one
->is_binary
= buffer_is_binary(one
->data
,
1792 if (one
->is_binary
== -1)
1796 return one
->is_binary
;
1799 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
1801 diff_filespec_load_driver(one
);
1802 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
1805 static const char *userdiff_word_regex(struct diff_filespec
*one
)
1807 diff_filespec_load_driver(one
);
1808 return one
->driver
->word_regex
;
1811 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
1813 if (!options
->a_prefix
)
1814 options
->a_prefix
= a
;
1815 if (!options
->b_prefix
)
1816 options
->b_prefix
= b
;
1819 struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
1821 if (!DIFF_FILE_VALID(one
))
1823 if (!S_ISREG(one
->mode
))
1825 diff_filespec_load_driver(one
);
1826 if (!one
->driver
->textconv
)
1829 if (one
->driver
->textconv_want_cache
&& !one
->driver
->textconv_cache
) {
1830 struct notes_cache
*c
= xmalloc(sizeof(*c
));
1831 struct strbuf name
= STRBUF_INIT
;
1833 strbuf_addf(&name
, "textconv/%s", one
->driver
->name
);
1834 notes_cache_init(c
, name
.buf
, one
->driver
->textconv
);
1835 one
->driver
->textconv_cache
= c
;
1841 static void builtin_diff(const char *name_a
,
1843 struct diff_filespec
*one
,
1844 struct diff_filespec
*two
,
1845 const char *xfrm_msg
,
1846 int must_show_header
,
1847 struct diff_options
*o
,
1848 int complete_rewrite
)
1852 char *a_one
, *b_two
;
1853 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1854 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1855 const char *a_prefix
, *b_prefix
;
1856 struct userdiff_driver
*textconv_one
= NULL
;
1857 struct userdiff_driver
*textconv_two
= NULL
;
1858 struct strbuf header
= STRBUF_INIT
;
1859 struct strbuf
*msgbuf
;
1860 char *line_prefix
= "";
1862 if (o
->output_prefix
) {
1863 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
1864 line_prefix
= msgbuf
->buf
;
1867 if (DIFF_OPT_TST(o
, SUBMODULE_LOG
) &&
1868 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
1869 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
1870 const char *del
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1871 const char *add
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1872 show_submodule_summary(o
->file
, one
? one
->path
: two
->path
,
1873 one
->sha1
, two
->sha1
, two
->dirty_submodule
,
1878 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
1879 textconv_one
= get_textconv(one
);
1880 textconv_two
= get_textconv(two
);
1883 diff_set_mnemonic_prefix(o
, "a/", "b/");
1884 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
1885 a_prefix
= o
->b_prefix
;
1886 b_prefix
= o
->a_prefix
;
1888 a_prefix
= o
->a_prefix
;
1889 b_prefix
= o
->b_prefix
;
1892 /* Never use a non-valid filename anywhere if at all possible */
1893 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
1894 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
1896 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
1897 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
1898 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1899 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1900 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, set
, a_one
, b_two
, reset
);
1901 if (lbl
[0][0] == '/') {
1903 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, set
, two
->mode
, reset
);
1905 strbuf_addstr(&header
, xfrm_msg
);
1906 must_show_header
= 1;
1908 else if (lbl
[1][0] == '/') {
1909 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, set
, one
->mode
, reset
);
1911 strbuf_addstr(&header
, xfrm_msg
);
1912 must_show_header
= 1;
1915 if (one
->mode
!= two
->mode
) {
1916 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, set
, one
->mode
, reset
);
1917 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, set
, two
->mode
, reset
);
1918 must_show_header
= 1;
1921 strbuf_addstr(&header
, xfrm_msg
);
1924 * we do not run diff between different kind
1927 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1928 goto free_ab_and_return
;
1929 if (complete_rewrite
&&
1930 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
1931 (textconv_two
|| !diff_filespec_is_binary(two
))) {
1932 fprintf(o
->file
, "%s", header
.buf
);
1933 strbuf_reset(&header
);
1934 emit_rewrite_diff(name_a
, name_b
, one
, two
,
1935 textconv_one
, textconv_two
, o
);
1936 o
->found_changes
= 1;
1937 goto free_ab_and_return
;
1941 if (!DIFF_OPT_TST(o
, TEXT
) &&
1942 ( (!textconv_one
&& diff_filespec_is_binary(one
)) ||
1943 (!textconv_two
&& diff_filespec_is_binary(two
)) )) {
1944 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1945 die("unable to read files to diff");
1946 /* Quite common confusing case */
1947 if (mf1
.size
== mf2
.size
&&
1948 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
1949 if (must_show_header
)
1950 fprintf(o
->file
, "%s", header
.buf
);
1951 goto free_ab_and_return
;
1953 fprintf(o
->file
, "%s", header
.buf
);
1954 strbuf_reset(&header
);
1955 if (DIFF_OPT_TST(o
, BINARY
))
1956 emit_binary_diff(o
->file
, &mf1
, &mf2
, line_prefix
);
1958 fprintf(o
->file
, "%sBinary files %s and %s differ\n",
1959 line_prefix
, lbl
[0], lbl
[1]);
1960 o
->found_changes
= 1;
1963 /* Crazy xdl interfaces.. */
1964 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1967 struct emit_callback ecbdata
;
1968 const struct userdiff_funcname
*pe
;
1970 if (!DIFF_XDL_TST(o
, WHITESPACE_FLAGS
) || must_show_header
) {
1971 fprintf(o
->file
, "%s", header
.buf
);
1972 strbuf_reset(&header
);
1975 mf1
.size
= fill_textconv(textconv_one
, one
, &mf1
.ptr
);
1976 mf2
.size
= fill_textconv(textconv_two
, two
, &mf2
.ptr
);
1978 pe
= diff_funcname_pattern(one
);
1980 pe
= diff_funcname_pattern(two
);
1982 memset(&xpp
, 0, sizeof(xpp
));
1983 memset(&xecfg
, 0, sizeof(xecfg
));
1984 memset(&ecbdata
, 0, sizeof(ecbdata
));
1985 ecbdata
.label_path
= lbl
;
1986 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1987 ecbdata
.found_changesp
= &o
->found_changes
;
1988 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1989 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
1990 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1992 ecbdata
.header
= header
.len
? &header
: NULL
;
1993 xpp
.flags
= o
->xdl_opts
;
1994 xecfg
.ctxlen
= o
->context
;
1995 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
1996 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1998 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
2001 else if (!prefixcmp(diffopts
, "--unified="))
2002 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
2003 else if (!prefixcmp(diffopts
, "-u"))
2004 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
2008 ecbdata
.diff_words
=
2009 xcalloc(1, sizeof(struct diff_words_data
));
2010 ecbdata
.diff_words
->type
= o
->word_diff
;
2011 ecbdata
.diff_words
->opt
= o
;
2013 o
->word_regex
= userdiff_word_regex(one
);
2015 o
->word_regex
= userdiff_word_regex(two
);
2017 o
->word_regex
= diff_word_regex_cfg
;
2018 if (o
->word_regex
) {
2019 ecbdata
.diff_words
->word_regex
= (regex_t
*)
2020 xmalloc(sizeof(regex_t
));
2021 if (regcomp(ecbdata
.diff_words
->word_regex
,
2023 REG_EXTENDED
| REG_NEWLINE
))
2024 die ("Invalid regular expression: %s",
2027 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
2028 if (o
->word_diff
== diff_words_styles
[i
].type
) {
2029 ecbdata
.diff_words
->style
=
2030 &diff_words_styles
[i
];
2034 if (DIFF_OPT_TST(o
, COLOR_DIFF
)) {
2035 struct diff_words_style
*st
= ecbdata
.diff_words
->style
;
2036 st
->old
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2037 st
->new.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2038 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_PLAIN
);
2041 xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
2044 free_diff_words_data(&ecbdata
);
2049 xdiff_clear_find_func(&xecfg
);
2053 strbuf_release(&header
);
2054 diff_free_filespec_data(one
);
2055 diff_free_filespec_data(two
);
2061 static void builtin_diffstat(const char *name_a
, const char *name_b
,
2062 struct diff_filespec
*one
,
2063 struct diff_filespec
*two
,
2064 struct diffstat_t
*diffstat
,
2065 struct diff_options
*o
,
2066 int complete_rewrite
)
2069 struct diffstat_file
*data
;
2071 data
= diffstat_add(diffstat
, name_a
, name_b
);
2074 data
->is_unmerged
= 1;
2077 if (complete_rewrite
) {
2078 diff_populate_filespec(one
, 0);
2079 diff_populate_filespec(two
, 0);
2080 data
->deleted
= count_lines(one
->data
, one
->size
);
2081 data
->added
= count_lines(two
->data
, two
->size
);
2082 goto free_and_return
;
2084 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2085 die("unable to read files to diff");
2087 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
2088 data
->is_binary
= 1;
2089 data
->added
= mf2
.size
;
2090 data
->deleted
= mf1
.size
;
2092 /* Crazy xdl interfaces.. */
2096 memset(&xpp
, 0, sizeof(xpp
));
2097 memset(&xecfg
, 0, sizeof(xecfg
));
2098 xpp
.flags
= o
->xdl_opts
;
2099 xecfg
.ctxlen
= o
->context
;
2100 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2101 xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
2106 diff_free_filespec_data(one
);
2107 diff_free_filespec_data(two
);
2110 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
2111 const char *attr_path
,
2112 struct diff_filespec
*one
,
2113 struct diff_filespec
*two
,
2114 struct diff_options
*o
)
2117 struct checkdiff_t data
;
2122 memset(&data
, 0, sizeof(data
));
2123 data
.filename
= name_b
? name_b
: name_a
;
2126 data
.ws_rule
= whitespace_rule(attr_path
);
2127 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
2129 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2130 die("unable to read files to diff");
2133 * All the other codepaths check both sides, but not checking
2134 * the "old" side here is deliberate. We are checking the newly
2135 * introduced changes, and as long as the "new" side is text, we
2136 * can and should check what it introduces.
2138 if (diff_filespec_is_binary(two
))
2139 goto free_and_return
;
2141 /* Crazy xdl interfaces.. */
2145 memset(&xpp
, 0, sizeof(xpp
));
2146 memset(&xecfg
, 0, sizeof(xecfg
));
2147 xecfg
.ctxlen
= 1; /* at least one context line */
2149 xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
2152 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
2153 struct emit_callback ecbdata
;
2156 ecbdata
.ws_rule
= data
.ws_rule
;
2157 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2158 blank_at_eof
= ecbdata
.blank_at_eof_in_preimage
;
2163 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
2164 fprintf(o
->file
, "%s:%d: %s.\n",
2165 data
.filename
, blank_at_eof
, err
);
2166 data
.status
= 1; /* report errors */
2171 diff_free_filespec_data(one
);
2172 diff_free_filespec_data(two
);
2174 DIFF_OPT_SET(o
, CHECK_FAILED
);
2177 struct diff_filespec
*alloc_filespec(const char *path
)
2179 int namelen
= strlen(path
);
2180 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
2182 memset(spec
, 0, sizeof(*spec
));
2183 spec
->path
= (char *)(spec
+ 1);
2184 memcpy(spec
->path
, path
, namelen
+1);
2186 spec
->is_binary
= -1;
2190 void free_filespec(struct diff_filespec
*spec
)
2192 if (!--spec
->count
) {
2193 diff_free_filespec_data(spec
);
2198 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
2199 unsigned short mode
)
2202 spec
->mode
= canon_mode(mode
);
2203 hashcpy(spec
->sha1
, sha1
);
2204 spec
->sha1_valid
= !is_null_sha1(sha1
);
2209 * Given a name and sha1 pair, if the index tells us the file in
2210 * the work tree has that object contents, return true, so that
2211 * prepare_temp_file() does not have to inflate and extract.
2213 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
2215 struct cache_entry
*ce
;
2220 * We do not read the cache ourselves here, because the
2221 * benchmark with my previous version that always reads cache
2222 * shows that it makes things worse for diff-tree comparing
2223 * two linux-2.6 kernel trees in an already checked out work
2224 * tree. This is because most diff-tree comparisons deal with
2225 * only a small number of files, while reading the cache is
2226 * expensive for a large project, and its cost outweighs the
2227 * savings we get by not inflating the object to a temporary
2228 * file. Practically, this code only helps when we are used
2229 * by diff-cache --cached, which does read the cache before
2235 /* We want to avoid the working directory if our caller
2236 * doesn't need the data in a normal file, this system
2237 * is rather slow with its stat/open/mmap/close syscalls,
2238 * and the object is contained in a pack file. The pack
2239 * is probably already open and will be faster to obtain
2240 * the data through than the working directory. Loose
2241 * objects however would tend to be slower as they need
2242 * to be individually opened and inflated.
2244 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
))
2248 pos
= cache_name_pos(name
, len
);
2251 ce
= active_cache
[pos
];
2254 * This is not the sha1 we are looking for, or
2255 * unreusable because it is not a regular file.
2257 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
2261 * If ce is marked as "assume unchanged", there is no
2262 * guarantee that work tree matches what we are looking for.
2264 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
2268 * If ce matches the file in the work tree, we can reuse it.
2270 if (ce_uptodate(ce
) ||
2271 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
2277 static int populate_from_stdin(struct diff_filespec
*s
)
2279 struct strbuf buf
= STRBUF_INIT
;
2282 if (strbuf_read(&buf
, 0, 0) < 0)
2283 return error("error while reading from stdin %s",
2286 s
->should_munmap
= 0;
2287 s
->data
= strbuf_detach(&buf
, &size
);
2293 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
2296 char *data
= xmalloc(100), *dirty
= "";
2298 /* Are we looking at the work tree? */
2299 if (s
->dirty_submodule
)
2302 len
= snprintf(data
, 100,
2303 "Subproject commit %s%s\n", sha1_to_hex(s
->sha1
), dirty
);
2315 * While doing rename detection and pickaxe operation, we may need to
2316 * grab the data for the blob (or file) for our own in-core comparison.
2317 * diff_filespec has data and size fields for this purpose.
2319 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
2322 if (!DIFF_FILE_VALID(s
))
2323 die("internal error: asking to populate invalid file.");
2324 if (S_ISDIR(s
->mode
))
2330 if (size_only
&& 0 < s
->size
)
2333 if (S_ISGITLINK(s
->mode
))
2334 return diff_populate_gitlink(s
, size_only
);
2336 if (!s
->sha1_valid
||
2337 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
2338 struct strbuf buf
= STRBUF_INIT
;
2342 if (!strcmp(s
->path
, "-"))
2343 return populate_from_stdin(s
);
2345 if (lstat(s
->path
, &st
) < 0) {
2346 if (errno
== ENOENT
) {
2350 s
->data
= (char *)"";
2355 s
->size
= xsize_t(st
.st_size
);
2358 if (S_ISLNK(st
.st_mode
)) {
2359 struct strbuf sb
= STRBUF_INIT
;
2361 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
2364 s
->data
= strbuf_detach(&sb
, NULL
);
2370 fd
= open(s
->path
, O_RDONLY
);
2373 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2375 s
->should_munmap
= 1;
2378 * Convert from working tree format to canonical git format
2380 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
2382 munmap(s
->data
, s
->size
);
2383 s
->should_munmap
= 0;
2384 s
->data
= strbuf_detach(&buf
, &size
);
2390 enum object_type type
;
2392 type
= sha1_object_info(s
->sha1
, &s
->size
);
2394 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
2401 void diff_free_filespec_blob(struct diff_filespec
*s
)
2405 else if (s
->should_munmap
)
2406 munmap(s
->data
, s
->size
);
2408 if (s
->should_free
|| s
->should_munmap
) {
2409 s
->should_free
= s
->should_munmap
= 0;
2414 void diff_free_filespec_data(struct diff_filespec
*s
)
2416 diff_free_filespec_blob(s
);
2421 static void prep_temp_blob(const char *path
, struct diff_tempfile
*temp
,
2424 const unsigned char *sha1
,
2428 struct strbuf buf
= STRBUF_INIT
;
2429 struct strbuf
template = STRBUF_INIT
;
2430 char *path_dup
= xstrdup(path
);
2431 const char *base
= basename(path_dup
);
2433 /* Generate "XXXXXX_basename.ext" */
2434 strbuf_addstr(&template, "XXXXXX_");
2435 strbuf_addstr(&template, base
);
2437 fd
= git_mkstemps(temp
->tmp_path
, PATH_MAX
, template.buf
,
2440 die_errno("unable to create temp-file");
2441 if (convert_to_working_tree(path
,
2442 (const char *)blob
, (size_t)size
, &buf
)) {
2446 if (write_in_full(fd
, blob
, size
) != size
)
2447 die_errno("unable to write temp-file");
2449 temp
->name
= temp
->tmp_path
;
2450 strcpy(temp
->hex
, sha1_to_hex(sha1
));
2452 sprintf(temp
->mode
, "%06o", mode
);
2453 strbuf_release(&buf
);
2454 strbuf_release(&template);
2458 static struct diff_tempfile
*prepare_temp_file(const char *name
,
2459 struct diff_filespec
*one
)
2461 struct diff_tempfile
*temp
= claim_diff_tempfile();
2463 if (!DIFF_FILE_VALID(one
)) {
2465 /* A '-' entry produces this for file-2, and
2466 * a '+' entry produces this for file-1.
2468 temp
->name
= "/dev/null";
2469 strcpy(temp
->hex
, ".");
2470 strcpy(temp
->mode
, ".");
2474 if (!remove_tempfile_installed
) {
2475 atexit(remove_tempfile
);
2476 sigchain_push_common(remove_tempfile_on_signal
);
2477 remove_tempfile_installed
= 1;
2480 if (!one
->sha1_valid
||
2481 reuse_worktree_file(name
, one
->sha1
, 1)) {
2483 if (lstat(name
, &st
) < 0) {
2484 if (errno
== ENOENT
)
2485 goto not_a_valid_file
;
2486 die_errno("stat(%s)", name
);
2488 if (S_ISLNK(st
.st_mode
)) {
2489 struct strbuf sb
= STRBUF_INIT
;
2490 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
2491 die_errno("readlink(%s)", name
);
2492 prep_temp_blob(name
, temp
, sb
.buf
, sb
.len
,
2494 one
->sha1
: null_sha1
),
2496 one
->mode
: S_IFLNK
));
2497 strbuf_release(&sb
);
2500 /* we can borrow from the file in the work tree */
2502 if (!one
->sha1_valid
)
2503 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
2505 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
2506 /* Even though we may sometimes borrow the
2507 * contents from the work tree, we always want
2508 * one->mode. mode is trustworthy even when
2509 * !(one->sha1_valid), as long as
2510 * DIFF_FILE_VALID(one).
2512 sprintf(temp
->mode
, "%06o", one
->mode
);
2517 if (diff_populate_filespec(one
, 0))
2518 die("cannot read data blob for %s", one
->path
);
2519 prep_temp_blob(name
, temp
, one
->data
, one
->size
,
2520 one
->sha1
, one
->mode
);
2525 /* An external diff command takes:
2527 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2528 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2531 static void run_external_diff(const char *pgm
,
2534 struct diff_filespec
*one
,
2535 struct diff_filespec
*two
,
2536 const char *xfrm_msg
,
2537 int complete_rewrite
)
2539 const char *spawn_arg
[10];
2541 const char **arg
= &spawn_arg
[0];
2544 struct diff_tempfile
*temp_one
, *temp_two
;
2545 const char *othername
= (other
? other
: name
);
2546 temp_one
= prepare_temp_file(name
, one
);
2547 temp_two
= prepare_temp_file(othername
, two
);
2550 *arg
++ = temp_one
->name
;
2551 *arg
++ = temp_one
->hex
;
2552 *arg
++ = temp_one
->mode
;
2553 *arg
++ = temp_two
->name
;
2554 *arg
++ = temp_two
->hex
;
2555 *arg
++ = temp_two
->mode
;
2566 retval
= run_command_v_opt(spawn_arg
, RUN_USING_SHELL
);
2569 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2574 static int similarity_index(struct diff_filepair
*p
)
2576 return p
->score
* 100 / MAX_SCORE
;
2579 static void fill_metainfo(struct strbuf
*msg
,
2582 struct diff_filespec
*one
,
2583 struct diff_filespec
*two
,
2584 struct diff_options
*o
,
2585 struct diff_filepair
*p
,
2586 int *must_show_header
,
2589 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
2590 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
2591 struct strbuf
*msgbuf
;
2592 char *line_prefix
= "";
2594 *must_show_header
= 1;
2595 if (o
->output_prefix
) {
2596 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
2597 line_prefix
= msgbuf
->buf
;
2599 strbuf_init(msg
, PATH_MAX
* 2 + 300);
2600 switch (p
->status
) {
2601 case DIFF_STATUS_COPIED
:
2602 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2603 line_prefix
, set
, similarity_index(p
));
2604 strbuf_addf(msg
, "%s\n%s%scopy from ",
2605 reset
, line_prefix
, set
);
2606 quote_c_style(name
, msg
, NULL
, 0);
2607 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
2608 quote_c_style(other
, msg
, NULL
, 0);
2609 strbuf_addf(msg
, "%s\n", reset
);
2611 case DIFF_STATUS_RENAMED
:
2612 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2613 line_prefix
, set
, similarity_index(p
));
2614 strbuf_addf(msg
, "%s\n%s%srename from ",
2615 reset
, line_prefix
, set
);
2616 quote_c_style(name
, msg
, NULL
, 0);
2617 strbuf_addf(msg
, "%s\n%s%srename to ",
2618 reset
, line_prefix
, set
);
2619 quote_c_style(other
, msg
, NULL
, 0);
2620 strbuf_addf(msg
, "%s\n", reset
);
2622 case DIFF_STATUS_MODIFIED
:
2624 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
2626 set
, similarity_index(p
), reset
);
2631 *must_show_header
= 0;
2633 if (one
&& two
&& hashcmp(one
->sha1
, two
->sha1
)) {
2634 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2636 if (DIFF_OPT_TST(o
, BINARY
)) {
2638 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2639 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2642 strbuf_addf(msg
, "%s%sindex %s..", line_prefix
, set
,
2643 find_unique_abbrev(one
->sha1
, abbrev
));
2644 strbuf_addstr(msg
, find_unique_abbrev(two
->sha1
, abbrev
));
2645 if (one
->mode
== two
->mode
)
2646 strbuf_addf(msg
, " %06o", one
->mode
);
2647 strbuf_addf(msg
, "%s\n", reset
);
2651 static void run_diff_cmd(const char *pgm
,
2654 const char *attr_path
,
2655 struct diff_filespec
*one
,
2656 struct diff_filespec
*two
,
2658 struct diff_options
*o
,
2659 struct diff_filepair
*p
)
2661 const char *xfrm_msg
= NULL
;
2662 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
2663 int must_show_header
= 0;
2665 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2668 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
2669 if (drv
&& drv
->external
)
2670 pgm
= drv
->external
;
2675 * don't use colors when the header is intended for an
2676 * external diff driver
2678 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
2680 DIFF_OPT_TST(o
, COLOR_DIFF
) && !pgm
);
2681 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
2685 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2690 builtin_diff(name
, other
? other
: name
,
2691 one
, two
, xfrm_msg
, must_show_header
,
2692 o
, complete_rewrite
);
2694 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2697 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2699 if (DIFF_FILE_VALID(one
)) {
2700 if (!one
->sha1_valid
) {
2702 if (!strcmp(one
->path
, "-")) {
2703 hashcpy(one
->sha1
, null_sha1
);
2706 if (lstat(one
->path
, &st
) < 0)
2707 die_errno("stat '%s'", one
->path
);
2708 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2709 die("cannot hash %s", one
->path
);
2716 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2718 /* Strip the prefix but do not molest /dev/null and absolute paths */
2719 if (*namep
&& **namep
!= '/') {
2720 *namep
+= prefix_length
;
2724 if (*otherp
&& **otherp
!= '/') {
2725 *otherp
+= prefix_length
;
2726 if (**otherp
== '/')
2731 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2733 const char *pgm
= external_diff();
2735 struct diff_filespec
*one
= p
->one
;
2736 struct diff_filespec
*two
= p
->two
;
2739 const char *attr_path
;
2741 name
= p
->one
->path
;
2742 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2744 if (o
->prefix_length
)
2745 strip_prefix(o
->prefix_length
, &name
, &other
);
2747 if (DIFF_PAIR_UNMERGED(p
)) {
2748 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2749 NULL
, NULL
, NULL
, o
, p
);
2753 diff_fill_sha1_info(one
);
2754 diff_fill_sha1_info(two
);
2757 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2758 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2760 * a filepair that changes between file and symlink
2761 * needs to be split into deletion and creation.
2763 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2764 run_diff_cmd(NULL
, name
, other
, attr_path
,
2765 one
, null
, &msg
, o
, p
);
2767 strbuf_release(&msg
);
2769 null
= alloc_filespec(one
->path
);
2770 run_diff_cmd(NULL
, name
, other
, attr_path
,
2771 null
, two
, &msg
, o
, p
);
2775 run_diff_cmd(pgm
, name
, other
, attr_path
,
2776 one
, two
, &msg
, o
, p
);
2778 strbuf_release(&msg
);
2781 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2782 struct diffstat_t
*diffstat
)
2786 int complete_rewrite
= 0;
2788 if (DIFF_PAIR_UNMERGED(p
)) {
2790 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2794 name
= p
->one
->path
;
2795 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2797 if (o
->prefix_length
)
2798 strip_prefix(o
->prefix_length
, &name
, &other
);
2800 diff_fill_sha1_info(p
->one
);
2801 diff_fill_sha1_info(p
->two
);
2803 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2804 complete_rewrite
= 1;
2805 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2808 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2812 const char *attr_path
;
2814 if (DIFF_PAIR_UNMERGED(p
)) {
2819 name
= p
->one
->path
;
2820 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2821 attr_path
= other
? other
: name
;
2823 if (o
->prefix_length
)
2824 strip_prefix(o
->prefix_length
, &name
, &other
);
2826 diff_fill_sha1_info(p
->one
);
2827 diff_fill_sha1_info(p
->two
);
2829 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2832 void diff_setup(struct diff_options
*options
)
2834 memcpy(options
, &default_diff_options
, sizeof(*options
));
2836 options
->file
= stdout
;
2838 options
->line_termination
= '\n';
2839 options
->break_opt
= -1;
2840 options
->rename_limit
= -1;
2841 options
->dirstat_percent
= 3;
2842 options
->context
= 3;
2844 options
->change
= diff_change
;
2845 options
->add_remove
= diff_addremove
;
2846 if (diff_use_color_default
> 0)
2847 DIFF_OPT_SET(options
, COLOR_DIFF
);
2848 options
->detect_rename
= diff_detect_rename_default
;
2850 if (diff_no_prefix
) {
2851 options
->a_prefix
= options
->b_prefix
= "";
2852 } else if (!diff_mnemonic_prefix
) {
2853 options
->a_prefix
= "a/";
2854 options
->b_prefix
= "b/";
2858 int diff_setup_done(struct diff_options
*options
)
2862 if (options
->output_format
& DIFF_FORMAT_NAME
)
2864 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2866 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2868 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2871 die("--name-only, --name-status, --check and -s are mutually exclusive");
2874 * Most of the time we can say "there are changes"
2875 * only by checking if there are changed paths, but
2876 * --ignore-whitespace* options force us to look
2880 if (DIFF_XDL_TST(options
, IGNORE_WHITESPACE
) ||
2881 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_CHANGE
) ||
2882 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_AT_EOL
))
2883 DIFF_OPT_SET(options
, DIFF_FROM_CONTENTS
);
2885 DIFF_OPT_CLR(options
, DIFF_FROM_CONTENTS
);
2887 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2888 options
->detect_rename
= DIFF_DETECT_COPY
;
2890 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2891 options
->prefix
= NULL
;
2892 if (options
->prefix
)
2893 options
->prefix_length
= strlen(options
->prefix
);
2895 options
->prefix_length
= 0;
2897 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2898 DIFF_FORMAT_NAME_STATUS
|
2899 DIFF_FORMAT_CHECKDIFF
|
2900 DIFF_FORMAT_NO_OUTPUT
))
2901 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2902 DIFF_FORMAT_NUMSTAT
|
2903 DIFF_FORMAT_DIFFSTAT
|
2904 DIFF_FORMAT_SHORTSTAT
|
2905 DIFF_FORMAT_DIRSTAT
|
2906 DIFF_FORMAT_SUMMARY
|
2910 * These cases always need recursive; we do not drop caller-supplied
2911 * recursive bits for other formats here.
2913 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2914 DIFF_FORMAT_NUMSTAT
|
2915 DIFF_FORMAT_DIFFSTAT
|
2916 DIFF_FORMAT_SHORTSTAT
|
2917 DIFF_FORMAT_DIRSTAT
|
2918 DIFF_FORMAT_SUMMARY
|
2919 DIFF_FORMAT_CHECKDIFF
))
2920 DIFF_OPT_SET(options
, RECURSIVE
);
2922 * Also pickaxe would not work very well if you do not say recursive
2924 if (options
->pickaxe
)
2925 DIFF_OPT_SET(options
, RECURSIVE
);
2927 * When patches are generated, submodules diffed against the work tree
2928 * must be checked for dirtiness too so it can be shown in the output
2930 if (options
->output_format
& DIFF_FORMAT_PATCH
)
2931 DIFF_OPT_SET(options
, DIRTY_SUBMODULES
);
2933 if (options
->detect_rename
&& options
->rename_limit
< 0)
2934 options
->rename_limit
= diff_rename_limit_default
;
2935 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2937 /* read-cache does not die even when it fails
2938 * so it is safe for us to do this here. Also
2939 * it does not smudge active_cache or active_nr
2940 * when it fails, so we do not have to worry about
2941 * cleaning it up ourselves either.
2945 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2946 options
->abbrev
= 40; /* full */
2949 * It does not make sense to show the first hit we happened
2950 * to have found. It does not make sense not to return with
2951 * exit code in such a case either.
2953 if (DIFF_OPT_TST(options
, QUICK
)) {
2954 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2955 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2961 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2971 if (c
== arg_short
) {
2975 if (val
&& isdigit(c
)) {
2977 int n
= strtoul(arg
, &end
, 10);
2988 eq
= strchr(arg
, '=');
2993 if (!len
|| strncmp(arg
, arg_long
, len
))
2998 if (!isdigit(*++eq
))
3000 n
= strtoul(eq
, &end
, 10);
3008 static int diff_scoreopt_parse(const char *opt
);
3010 static inline int short_opt(char opt
, const char **argv
,
3011 const char **optarg
)
3013 const char *arg
= argv
[0];
3014 if (arg
[0] != '-' || arg
[1] != opt
)
3016 if (arg
[2] != '\0') {
3021 die("Option '%c' requires a value", opt
);
3026 int parse_long_opt(const char *opt
, const char **argv
,
3027 const char **optarg
)
3029 const char *arg
= argv
[0];
3030 if (arg
[0] != '-' || arg
[1] != '-')
3032 arg
+= strlen("--");
3033 if (prefixcmp(arg
, opt
))
3036 if (*arg
== '=') { /* sticked form: --option=value */
3042 /* separate form: --option value */
3044 die("Option '--%s' requires a value", opt
);
3049 static int stat_opt(struct diff_options
*options
, const char **av
)
3051 const char *arg
= av
[0];
3053 int width
= options
->stat_width
;
3054 int name_width
= options
->stat_name_width
;
3057 arg
+= strlen("--stat");
3062 if (!prefixcmp(arg
, "-width")) {
3063 arg
+= strlen("-width");
3065 width
= strtoul(arg
+ 1, &end
, 10);
3066 else if (!*arg
&& !av
[1])
3067 die("Option '--stat-width' requires a value");
3069 width
= strtoul(av
[1], &end
, 10);
3072 } else if (!prefixcmp(arg
, "-name-width")) {
3073 arg
+= strlen("-name-width");
3075 name_width
= strtoul(arg
+ 1, &end
, 10);
3076 else if (!*arg
&& !av
[1])
3077 die("Option '--stat-name-width' requires a value");
3079 name_width
= strtoul(av
[1], &end
, 10);
3085 width
= strtoul(arg
+1, &end
, 10);
3087 name_width
= strtoul(end
+1, &end
, 10);
3090 /* Important! This checks all the error cases! */
3093 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
3094 options
->stat_name_width
= name_width
;
3095 options
->stat_width
= width
;
3099 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
3101 const char *arg
= av
[0];
3105 /* Output format options */
3106 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch"))
3107 options
->output_format
|= DIFF_FORMAT_PATCH
;
3108 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
3109 options
->output_format
|= DIFF_FORMAT_PATCH
;
3110 else if (!strcmp(arg
, "--raw"))
3111 options
->output_format
|= DIFF_FORMAT_RAW
;
3112 else if (!strcmp(arg
, "--patch-with-raw"))
3113 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
3114 else if (!strcmp(arg
, "--numstat"))
3115 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
3116 else if (!strcmp(arg
, "--shortstat"))
3117 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
3118 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
3119 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
3120 else if (!strcmp(arg
, "--cumulative")) {
3121 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
3122 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
3123 } else if (opt_arg(arg
, 0, "dirstat-by-file",
3124 &options
->dirstat_percent
)) {
3125 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
3126 DIFF_OPT_SET(options
, DIRSTAT_BY_FILE
);
3128 else if (!strcmp(arg
, "--check"))
3129 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
3130 else if (!strcmp(arg
, "--summary"))
3131 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
3132 else if (!strcmp(arg
, "--patch-with-stat"))
3133 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
3134 else if (!strcmp(arg
, "--name-only"))
3135 options
->output_format
|= DIFF_FORMAT_NAME
;
3136 else if (!strcmp(arg
, "--name-status"))
3137 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
3138 else if (!strcmp(arg
, "-s"))
3139 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
3140 else if (!prefixcmp(arg
, "--stat"))
3141 /* --stat, --stat-width, or --stat-name-width */
3142 return stat_opt(options
, av
);
3144 /* renames options */
3145 else if (!prefixcmp(arg
, "-B")) {
3146 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
3149 else if (!prefixcmp(arg
, "-M")) {
3150 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3152 options
->detect_rename
= DIFF_DETECT_RENAME
;
3154 else if (!prefixcmp(arg
, "-C")) {
3155 if (options
->detect_rename
== DIFF_DETECT_COPY
)
3156 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3157 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3159 options
->detect_rename
= DIFF_DETECT_COPY
;
3161 else if (!strcmp(arg
, "--no-renames"))
3162 options
->detect_rename
= 0;
3163 else if (!strcmp(arg
, "--relative"))
3164 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3165 else if (!prefixcmp(arg
, "--relative=")) {
3166 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3167 options
->prefix
= arg
+ 11;
3171 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
3172 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
3173 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
3174 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
3175 else if (!strcmp(arg
, "--ignore-space-at-eol"))
3176 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
3177 else if (!strcmp(arg
, "--patience"))
3178 DIFF_XDL_SET(options
, PATIENCE_DIFF
);
3181 else if (!strcmp(arg
, "--binary")) {
3182 options
->output_format
|= DIFF_FORMAT_PATCH
;
3183 DIFF_OPT_SET(options
, BINARY
);
3185 else if (!strcmp(arg
, "--full-index"))
3186 DIFF_OPT_SET(options
, FULL_INDEX
);
3187 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
3188 DIFF_OPT_SET(options
, TEXT
);
3189 else if (!strcmp(arg
, "-R"))
3190 DIFF_OPT_SET(options
, REVERSE_DIFF
);
3191 else if (!strcmp(arg
, "--find-copies-harder"))
3192 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3193 else if (!strcmp(arg
, "--follow"))
3194 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
3195 else if (!strcmp(arg
, "--color"))
3196 DIFF_OPT_SET(options
, COLOR_DIFF
);
3197 else if (!prefixcmp(arg
, "--color=")) {
3198 int value
= git_config_colorbool(NULL
, arg
+8, -1);
3200 DIFF_OPT_CLR(options
, COLOR_DIFF
);
3202 DIFF_OPT_SET(options
, COLOR_DIFF
);
3204 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3206 else if (!strcmp(arg
, "--no-color"))
3207 DIFF_OPT_CLR(options
, COLOR_DIFF
);
3208 else if (!strcmp(arg
, "--color-words")) {
3209 DIFF_OPT_SET(options
, COLOR_DIFF
);
3210 options
->word_diff
= DIFF_WORDS_COLOR
;
3212 else if (!prefixcmp(arg
, "--color-words=")) {
3213 DIFF_OPT_SET(options
, COLOR_DIFF
);
3214 options
->word_diff
= DIFF_WORDS_COLOR
;
3215 options
->word_regex
= arg
+ 14;
3217 else if (!strcmp(arg
, "--word-diff")) {
3218 if (options
->word_diff
== DIFF_WORDS_NONE
)
3219 options
->word_diff
= DIFF_WORDS_PLAIN
;
3221 else if (!prefixcmp(arg
, "--word-diff=")) {
3222 const char *type
= arg
+ 12;
3223 if (!strcmp(type
, "plain"))
3224 options
->word_diff
= DIFF_WORDS_PLAIN
;
3225 else if (!strcmp(type
, "color")) {
3226 DIFF_OPT_SET(options
, COLOR_DIFF
);
3227 options
->word_diff
= DIFF_WORDS_COLOR
;
3229 else if (!strcmp(type
, "porcelain"))
3230 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
3231 else if (!strcmp(type
, "none"))
3232 options
->word_diff
= DIFF_WORDS_NONE
;
3234 die("bad --word-diff argument: %s", type
);
3236 else if ((argcount
= parse_long_opt("word-diff-regex", av
, &optarg
))) {
3237 if (options
->word_diff
== DIFF_WORDS_NONE
)
3238 options
->word_diff
= DIFF_WORDS_PLAIN
;
3239 options
->word_regex
= optarg
;
3242 else if (!strcmp(arg
, "--exit-code"))
3243 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3244 else if (!strcmp(arg
, "--quiet"))
3245 DIFF_OPT_SET(options
, QUICK
);
3246 else if (!strcmp(arg
, "--ext-diff"))
3247 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
3248 else if (!strcmp(arg
, "--no-ext-diff"))
3249 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
3250 else if (!strcmp(arg
, "--textconv"))
3251 DIFF_OPT_SET(options
, ALLOW_TEXTCONV
);
3252 else if (!strcmp(arg
, "--no-textconv"))
3253 DIFF_OPT_CLR(options
, ALLOW_TEXTCONV
);
3254 else if (!strcmp(arg
, "--ignore-submodules")) {
3255 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3256 handle_ignore_submodules_arg(options
, "all");
3257 } else if (!prefixcmp(arg
, "--ignore-submodules=")) {
3258 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3259 handle_ignore_submodules_arg(options
, arg
+ 20);
3260 } else if (!strcmp(arg
, "--submodule"))
3261 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
3262 else if (!prefixcmp(arg
, "--submodule=")) {
3263 if (!strcmp(arg
+ 12, "log"))
3264 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
3268 else if (!strcmp(arg
, "-z"))
3269 options
->line_termination
= 0;
3270 else if ((argcount
= short_opt('l', av
, &optarg
))) {
3271 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
3274 else if ((argcount
= short_opt('S', av
, &optarg
))) {
3275 options
->pickaxe
= optarg
;
3278 else if (!strcmp(arg
, "--pickaxe-all"))
3279 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
3280 else if (!strcmp(arg
, "--pickaxe-regex"))
3281 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
3282 else if ((argcount
= short_opt('O', av
, &optarg
))) {
3283 options
->orderfile
= optarg
;
3286 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
3287 options
->filter
= optarg
;
3290 else if (!strcmp(arg
, "--abbrev"))
3291 options
->abbrev
= DEFAULT_ABBREV
;
3292 else if (!prefixcmp(arg
, "--abbrev=")) {
3293 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
3294 if (options
->abbrev
< MINIMUM_ABBREV
)
3295 options
->abbrev
= MINIMUM_ABBREV
;
3296 else if (40 < options
->abbrev
)
3297 options
->abbrev
= 40;
3299 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
3300 options
->a_prefix
= optarg
;
3303 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
3304 options
->b_prefix
= optarg
;
3307 else if (!strcmp(arg
, "--no-prefix"))
3308 options
->a_prefix
= options
->b_prefix
= "";
3309 else if (opt_arg(arg
, '\0', "inter-hunk-context",
3310 &options
->interhunkcontext
))
3312 else if ((argcount
= parse_long_opt("output", av
, &optarg
))) {
3313 options
->file
= fopen(optarg
, "w");
3315 die_errno("Could not open '%s'", arg
+ strlen("--output="));
3316 options
->close_file
= 1;
3323 static int parse_num(const char **cp_p
)
3325 unsigned long num
, scale
;
3327 const char *cp
= *cp_p
;
3334 if ( !dot
&& ch
== '.' ) {
3337 } else if ( ch
== '%' ) {
3338 scale
= dot
? scale
*100 : 100;
3339 cp
++; /* % is always at the end */
3341 } else if ( ch
>= '0' && ch
<= '9' ) {
3342 if ( scale
< 100000 ) {
3344 num
= (num
*10) + (ch
-'0');
3353 /* user says num divided by scale and we say internally that
3354 * is MAX_SCORE * num / scale.
3356 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
3359 static int diff_scoreopt_parse(const char *opt
)
3361 int opt1
, opt2
, cmd
;
3366 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
3367 return -1; /* that is not a -M, -C nor -B option */
3369 opt1
= parse_num(&opt
);
3375 else if (*opt
!= '/')
3376 return -1; /* we expect -B80/99 or -B80 */
3379 opt2
= parse_num(&opt
);
3384 return opt1
| (opt2
<< 16);
3387 struct diff_queue_struct diff_queued_diff
;
3389 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
3391 if (queue
->alloc
<= queue
->nr
) {
3392 queue
->alloc
= alloc_nr(queue
->alloc
);
3393 queue
->queue
= xrealloc(queue
->queue
,
3394 sizeof(dp
) * queue
->alloc
);
3396 queue
->queue
[queue
->nr
++] = dp
;
3399 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
3400 struct diff_filespec
*one
,
3401 struct diff_filespec
*two
)
3403 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
3411 void diff_free_filepair(struct diff_filepair
*p
)
3413 free_filespec(p
->one
);
3414 free_filespec(p
->two
);
3418 /* This is different from find_unique_abbrev() in that
3419 * it stuffs the result with dots for alignment.
3421 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
3426 return sha1_to_hex(sha1
);
3428 abbrev
= find_unique_abbrev(sha1
, len
);
3429 abblen
= strlen(abbrev
);
3431 static char hex
[41];
3432 if (len
< abblen
&& abblen
<= len
+ 2)
3433 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
3435 sprintf(hex
, "%s...", abbrev
);
3438 return sha1_to_hex(sha1
);
3441 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
3443 int line_termination
= opt
->line_termination
;
3444 int inter_name_termination
= line_termination
? '\t' : '\0';
3445 if (opt
->output_prefix
) {
3446 struct strbuf
*msg
= NULL
;
3447 msg
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
3448 fprintf(opt
->file
, "%s", msg
->buf
);
3451 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
3452 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
3453 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
3454 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
3457 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
3458 inter_name_termination
);
3460 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
3463 if (p
->status
== DIFF_STATUS_COPIED
||
3464 p
->status
== DIFF_STATUS_RENAMED
) {
3465 const char *name_a
, *name_b
;
3466 name_a
= p
->one
->path
;
3467 name_b
= p
->two
->path
;
3468 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3469 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
3470 write_name_quoted(name_b
, opt
->file
, line_termination
);
3472 const char *name_a
, *name_b
;
3473 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
3475 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3476 write_name_quoted(name_a
, opt
->file
, line_termination
);
3480 int diff_unmodified_pair(struct diff_filepair
*p
)
3482 /* This function is written stricter than necessary to support
3483 * the currently implemented transformers, but the idea is to
3484 * let transformers to produce diff_filepairs any way they want,
3485 * and filter and clean them up here before producing the output.
3487 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
3489 if (DIFF_PAIR_UNMERGED(p
))
3490 return 0; /* unmerged is interesting */
3492 /* deletion, addition, mode or type change
3493 * and rename are all interesting.
3495 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
3496 DIFF_PAIR_MODE_CHANGED(p
) ||
3497 strcmp(one
->path
, two
->path
))
3500 /* both are valid and point at the same path. that is, we are
3501 * dealing with a change.
3503 if (one
->sha1_valid
&& two
->sha1_valid
&&
3504 !hashcmp(one
->sha1
, two
->sha1
) &&
3505 !one
->dirty_submodule
&& !two
->dirty_submodule
)
3506 return 1; /* no change */
3507 if (!one
->sha1_valid
&& !two
->sha1_valid
)
3508 return 1; /* both look at the same file on the filesystem. */
3512 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
3514 if (diff_unmodified_pair(p
))
3517 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3518 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3519 return; /* no tree diffs in patch format */
3524 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
3525 struct diffstat_t
*diffstat
)
3527 if (diff_unmodified_pair(p
))
3530 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3531 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3532 return; /* no tree diffs in patch format */
3534 run_diffstat(p
, o
, diffstat
);
3537 static void diff_flush_checkdiff(struct diff_filepair
*p
,
3538 struct diff_options
*o
)
3540 if (diff_unmodified_pair(p
))
3543 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3544 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3545 return; /* no tree diffs in patch format */
3547 run_checkdiff(p
, o
);
3550 int diff_queue_is_empty(void)
3552 struct diff_queue_struct
*q
= &diff_queued_diff
;
3554 for (i
= 0; i
< q
->nr
; i
++)
3555 if (!diff_unmodified_pair(q
->queue
[i
]))
3561 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
3563 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
3566 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
3568 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
3569 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
3571 s
->size
, s
->xfrm_flags
);
3574 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
3576 diff_debug_filespec(p
->one
, i
, "one");
3577 diff_debug_filespec(p
->two
, i
, "two");
3578 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
3579 p
->score
, p
->status
? p
->status
: '?',
3580 p
->one
->rename_used
, p
->broken_pair
);
3583 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
3587 fprintf(stderr
, "%s\n", msg
);
3588 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
3589 for (i
= 0; i
< q
->nr
; i
++) {
3590 struct diff_filepair
*p
= q
->queue
[i
];
3591 diff_debug_filepair(p
, i
);
3596 static void diff_resolve_rename_copy(void)
3599 struct diff_filepair
*p
;
3600 struct diff_queue_struct
*q
= &diff_queued_diff
;
3602 diff_debug_queue("resolve-rename-copy", q
);
3604 for (i
= 0; i
< q
->nr
; i
++) {
3606 p
->status
= 0; /* undecided */
3607 if (DIFF_PAIR_UNMERGED(p
))
3608 p
->status
= DIFF_STATUS_UNMERGED
;
3609 else if (!DIFF_FILE_VALID(p
->one
))
3610 p
->status
= DIFF_STATUS_ADDED
;
3611 else if (!DIFF_FILE_VALID(p
->two
))
3612 p
->status
= DIFF_STATUS_DELETED
;
3613 else if (DIFF_PAIR_TYPE_CHANGED(p
))
3614 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
3616 /* from this point on, we are dealing with a pair
3617 * whose both sides are valid and of the same type, i.e.
3618 * either in-place edit or rename/copy edit.
3620 else if (DIFF_PAIR_RENAME(p
)) {
3622 * A rename might have re-connected a broken
3623 * pair up, causing the pathnames to be the
3624 * same again. If so, that's not a rename at
3625 * all, just a modification..
3627 * Otherwise, see if this source was used for
3628 * multiple renames, in which case we decrement
3629 * the count, and call it a copy.
3631 if (!strcmp(p
->one
->path
, p
->two
->path
))
3632 p
->status
= DIFF_STATUS_MODIFIED
;
3633 else if (--p
->one
->rename_used
> 0)
3634 p
->status
= DIFF_STATUS_COPIED
;
3636 p
->status
= DIFF_STATUS_RENAMED
;
3638 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
3639 p
->one
->mode
!= p
->two
->mode
||
3640 p
->one
->dirty_submodule
||
3641 p
->two
->dirty_submodule
||
3642 is_null_sha1(p
->one
->sha1
))
3643 p
->status
= DIFF_STATUS_MODIFIED
;
3645 /* This is a "no-change" entry and should not
3646 * happen anymore, but prepare for broken callers.
3648 error("feeding unmodified %s to diffcore",
3650 p
->status
= DIFF_STATUS_UNKNOWN
;
3653 diff_debug_queue("resolve-rename-copy done", q
);
3656 static int check_pair_status(struct diff_filepair
*p
)
3658 switch (p
->status
) {
3659 case DIFF_STATUS_UNKNOWN
:
3662 die("internal error in diff-resolve-rename-copy");
3668 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
3670 int fmt
= opt
->output_format
;
3672 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
3673 diff_flush_checkdiff(p
, opt
);
3674 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
3675 diff_flush_raw(p
, opt
);
3676 else if (fmt
& DIFF_FORMAT_NAME
) {
3677 const char *name_a
, *name_b
;
3678 name_a
= p
->two
->path
;
3680 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3681 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
3685 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
3688 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
3690 fprintf(file
, " %s ", newdelete
);
3691 write_name_quoted(fs
->path
, file
, '\n');
3695 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
,
3696 const char *line_prefix
)
3698 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
3699 fprintf(file
, "%s mode change %06o => %06o%c", line_prefix
, p
->one
->mode
,
3700 p
->two
->mode
, show_name
? ' ' : '\n');
3702 write_name_quoted(p
->two
->path
, file
, '\n');
3707 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
,
3708 const char *line_prefix
)
3710 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
3712 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
3714 show_mode_change(file
, p
, 0, line_prefix
);
3717 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
3719 FILE *file
= opt
->file
;
3720 char *line_prefix
= "";
3722 if (opt
->output_prefix
) {
3723 struct strbuf
*buf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
3724 line_prefix
= buf
->buf
;
3728 case DIFF_STATUS_DELETED
:
3729 fputs(line_prefix
, file
);
3730 show_file_mode_name(file
, "delete", p
->one
);
3732 case DIFF_STATUS_ADDED
:
3733 fputs(line_prefix
, file
);
3734 show_file_mode_name(file
, "create", p
->two
);
3736 case DIFF_STATUS_COPIED
:
3737 fputs(line_prefix
, file
);
3738 show_rename_copy(file
, "copy", p
, line_prefix
);
3740 case DIFF_STATUS_RENAMED
:
3741 fputs(line_prefix
, file
);
3742 show_rename_copy(file
, "rename", p
, line_prefix
);
3746 fprintf(file
, "%s rewrite ", line_prefix
);
3747 write_name_quoted(p
->two
->path
, file
, ' ');
3748 fprintf(file
, "(%d%%)\n", similarity_index(p
));
3750 show_mode_change(file
, p
, !p
->score
, line_prefix
);
3760 static int remove_space(char *line
, int len
)
3766 for (i
= 0; i
< len
; i
++)
3767 if (!isspace((c
= line
[i
])))
3773 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3775 struct patch_id_t
*data
= priv
;
3778 /* Ignore line numbers when computing the SHA1 of the patch */
3779 if (!prefixcmp(line
, "@@ -"))
3782 new_len
= remove_space(line
, len
);
3784 git_SHA1_Update(data
->ctx
, line
, new_len
);
3785 data
->patchlen
+= new_len
;
3788 /* returns 0 upon success, and writes result into sha1 */
3789 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3791 struct diff_queue_struct
*q
= &diff_queued_diff
;
3794 struct patch_id_t data
;
3795 char buffer
[PATH_MAX
* 4 + 20];
3797 git_SHA1_Init(&ctx
);
3798 memset(&data
, 0, sizeof(struct patch_id_t
));
3801 for (i
= 0; i
< q
->nr
; i
++) {
3805 struct diff_filepair
*p
= q
->queue
[i
];
3808 memset(&xpp
, 0, sizeof(xpp
));
3809 memset(&xecfg
, 0, sizeof(xecfg
));
3811 return error("internal diff status error");
3812 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3814 if (diff_unmodified_pair(p
))
3816 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3817 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3819 if (DIFF_PAIR_UNMERGED(p
))
3822 diff_fill_sha1_info(p
->one
);
3823 diff_fill_sha1_info(p
->two
);
3824 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3825 fill_mmfile(&mf2
, p
->two
) < 0)
3826 return error("unable to read files to diff");
3828 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3829 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3830 if (p
->one
->mode
== 0)
3831 len1
= snprintf(buffer
, sizeof(buffer
),
3832 "diff--gita/%.*sb/%.*s"
3839 len2
, p
->two
->path
);
3840 else if (p
->two
->mode
== 0)
3841 len1
= snprintf(buffer
, sizeof(buffer
),
3842 "diff--gita/%.*sb/%.*s"
3843 "deletedfilemode%06o"
3849 len1
, p
->one
->path
);
3851 len1
= snprintf(buffer
, sizeof(buffer
),
3852 "diff--gita/%.*sb/%.*s"
3858 len2
, p
->two
->path
);
3859 git_SHA1_Update(&ctx
, buffer
, len1
);
3861 if (diff_filespec_is_binary(p
->one
) ||
3862 diff_filespec_is_binary(p
->two
)) {
3863 git_SHA1_Update(&ctx
, sha1_to_hex(p
->one
->sha1
), 40);
3864 git_SHA1_Update(&ctx
, sha1_to_hex(p
->two
->sha1
), 40);
3870 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3871 xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
3875 git_SHA1_Final(sha1
, &ctx
);
3879 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3881 struct diff_queue_struct
*q
= &diff_queued_diff
;
3883 int result
= diff_get_patch_id(options
, sha1
);
3885 for (i
= 0; i
< q
->nr
; i
++)
3886 diff_free_filepair(q
->queue
[i
]);
3889 DIFF_QUEUE_CLEAR(q
);
3894 static int is_summary_empty(const struct diff_queue_struct
*q
)
3898 for (i
= 0; i
< q
->nr
; i
++) {
3899 const struct diff_filepair
*p
= q
->queue
[i
];
3901 switch (p
->status
) {
3902 case DIFF_STATUS_DELETED
:
3903 case DIFF_STATUS_ADDED
:
3904 case DIFF_STATUS_COPIED
:
3905 case DIFF_STATUS_RENAMED
:
3910 if (p
->one
->mode
&& p
->two
->mode
&&
3911 p
->one
->mode
!= p
->two
->mode
)
3919 void diff_flush(struct diff_options
*options
)
3921 struct diff_queue_struct
*q
= &diff_queued_diff
;
3922 int i
, output_format
= options
->output_format
;
3926 * Order: raw, stat, summary, patch
3927 * or: name/name-status/checkdiff (other bits clear)
3932 if (output_format
& (DIFF_FORMAT_RAW
|
3934 DIFF_FORMAT_NAME_STATUS
|
3935 DIFF_FORMAT_CHECKDIFF
)) {
3936 for (i
= 0; i
< q
->nr
; i
++) {
3937 struct diff_filepair
*p
= q
->queue
[i
];
3938 if (check_pair_status(p
))
3939 flush_one_pair(p
, options
);
3944 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3945 struct diffstat_t diffstat
;
3947 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3948 for (i
= 0; i
< q
->nr
; i
++) {
3949 struct diff_filepair
*p
= q
->queue
[i
];
3950 if (check_pair_status(p
))
3951 diff_flush_stat(p
, options
, &diffstat
);
3953 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3954 show_numstat(&diffstat
, options
);
3955 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3956 show_stats(&diffstat
, options
);
3957 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3958 show_shortstats(&diffstat
, options
);
3959 free_diffstat_info(&diffstat
);
3962 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3963 show_dirstat(options
);
3965 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3966 for (i
= 0; i
< q
->nr
; i
++) {
3967 diff_summary(options
, q
->queue
[i
]);
3972 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
3973 DIFF_OPT_TST(options
, EXIT_WITH_STATUS
) &&
3974 DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
3976 * run diff_flush_patch for the exit status. setting
3977 * options->file to /dev/null should be safe, becaue we
3978 * aren't supposed to produce any output anyway.
3980 if (options
->close_file
)
3981 fclose(options
->file
);
3982 options
->file
= fopen("/dev/null", "w");
3984 die_errno("Could not open /dev/null");
3985 options
->close_file
= 1;
3986 for (i
= 0; i
< q
->nr
; i
++) {
3987 struct diff_filepair
*p
= q
->queue
[i
];
3988 if (check_pair_status(p
))
3989 diff_flush_patch(p
, options
);
3990 if (options
->found_changes
)
3995 if (output_format
& DIFF_FORMAT_PATCH
) {
3997 putc(options
->line_termination
, options
->file
);
3998 if (options
->stat_sep
) {
3999 /* attach patch instead of inline */
4000 fputs(options
->stat_sep
, options
->file
);
4004 for (i
= 0; i
< q
->nr
; i
++) {
4005 struct diff_filepair
*p
= q
->queue
[i
];
4006 if (check_pair_status(p
))
4007 diff_flush_patch(p
, options
);
4011 if (output_format
& DIFF_FORMAT_CALLBACK
)
4012 options
->format_callback(q
, options
, options
->format_callback_data
);
4014 for (i
= 0; i
< q
->nr
; i
++)
4015 diff_free_filepair(q
->queue
[i
]);
4018 DIFF_QUEUE_CLEAR(q
);
4019 if (options
->close_file
)
4020 fclose(options
->file
);
4023 * Report the content-level differences with HAS_CHANGES;
4024 * diff_addremove/diff_change does not set the bit when
4025 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4027 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4028 if (options
->found_changes
)
4029 DIFF_OPT_SET(options
, HAS_CHANGES
);
4031 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4035 static void diffcore_apply_filter(const char *filter
)
4038 struct diff_queue_struct
*q
= &diff_queued_diff
;
4039 struct diff_queue_struct outq
;
4040 DIFF_QUEUE_CLEAR(&outq
);
4045 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
4047 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
4048 struct diff_filepair
*p
= q
->queue
[i
];
4049 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
4051 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
4053 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
4054 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
4055 strchr(filter
, p
->status
)))
4061 /* otherwise we will clear the whole queue
4062 * by copying the empty outq at the end of this
4063 * function, but first clear the current entries
4066 for (i
= 0; i
< q
->nr
; i
++)
4067 diff_free_filepair(q
->queue
[i
]);
4070 /* Only the matching ones */
4071 for (i
= 0; i
< q
->nr
; i
++) {
4072 struct diff_filepair
*p
= q
->queue
[i
];
4074 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
4076 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
4078 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
4079 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
4080 strchr(filter
, p
->status
)))
4083 diff_free_filepair(p
);
4090 /* Check whether two filespecs with the same mode and size are identical */
4091 static int diff_filespec_is_identical(struct diff_filespec
*one
,
4092 struct diff_filespec
*two
)
4094 if (S_ISGITLINK(one
->mode
))
4096 if (diff_populate_filespec(one
, 0))
4098 if (diff_populate_filespec(two
, 0))
4100 return !memcmp(one
->data
, two
->data
, one
->size
);
4103 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
4106 struct diff_queue_struct
*q
= &diff_queued_diff
;
4107 struct diff_queue_struct outq
;
4108 DIFF_QUEUE_CLEAR(&outq
);
4110 for (i
= 0; i
< q
->nr
; i
++) {
4111 struct diff_filepair
*p
= q
->queue
[i
];
4114 * 1. Entries that come from stat info dirtiness
4115 * always have both sides (iow, not create/delete),
4116 * one side of the object name is unknown, with
4117 * the same mode and size. Keep the ones that
4118 * do not match these criteria. They have real
4121 * 2. At this point, the file is known to be modified,
4122 * with the same mode and size, and the object
4123 * name of one side is unknown. Need to inspect
4124 * the identical contents.
4126 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
4127 !DIFF_FILE_VALID(p
->two
) ||
4128 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
4129 (p
->one
->mode
!= p
->two
->mode
) ||
4130 diff_populate_filespec(p
->one
, 1) ||
4131 diff_populate_filespec(p
->two
, 1) ||
4132 (p
->one
->size
!= p
->two
->size
) ||
4133 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
4137 * The caller can subtract 1 from skip_stat_unmatch
4138 * to determine how many paths were dirty only
4139 * due to stat info mismatch.
4141 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
4142 diffopt
->skip_stat_unmatch
++;
4143 diff_free_filepair(p
);
4150 static int diffnamecmp(const void *a_
, const void *b_
)
4152 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
4153 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
4154 const char *name_a
, *name_b
;
4156 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
4157 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
4158 return strcmp(name_a
, name_b
);
4161 void diffcore_fix_diff_index(struct diff_options
*options
)
4163 struct diff_queue_struct
*q
= &diff_queued_diff
;
4164 qsort(q
->queue
, q
->nr
, sizeof(q
->queue
[0]), diffnamecmp
);
4167 void diffcore_std(struct diff_options
*options
)
4169 if (options
->skip_stat_unmatch
)
4170 diffcore_skip_stat_unmatch(options
);
4171 if (!options
->found_follow
) {
4172 /* See try_to_follow_renames() in tree-diff.c */
4173 if (options
->break_opt
!= -1)
4174 diffcore_break(options
->break_opt
);
4175 if (options
->detect_rename
)
4176 diffcore_rename(options
);
4177 if (options
->break_opt
!= -1)
4178 diffcore_merge_broken();
4180 if (options
->pickaxe
)
4181 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
4182 if (options
->orderfile
)
4183 diffcore_order(options
->orderfile
);
4184 if (!options
->found_follow
)
4185 /* See try_to_follow_renames() in tree-diff.c */
4186 diff_resolve_rename_copy();
4187 diffcore_apply_filter(options
->filter
);
4189 if (diff_queued_diff
.nr
&& !DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4190 DIFF_OPT_SET(options
, HAS_CHANGES
);
4192 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4194 options
->found_follow
= 0;
4197 int diff_result_code(struct diff_options
*opt
, int status
)
4200 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4201 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
4203 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4204 DIFF_OPT_TST(opt
, HAS_CHANGES
))
4206 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
4207 DIFF_OPT_TST(opt
, CHECK_FAILED
))
4213 * Shall changes to this submodule be ignored?
4215 * Submodule changes can be configured to be ignored separately for each path,
4216 * but that configuration can be overridden from the command line.
4218 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
4221 unsigned orig_flags
= options
->flags
;
4222 if (!DIFF_OPT_TST(options
, OVERRIDE_SUBMODULE_CONFIG
))
4223 set_diffopt_flags_from_submodule_config(options
, path
);
4224 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
))
4226 options
->flags
= orig_flags
;
4230 void diff_addremove(struct diff_options
*options
,
4231 int addremove
, unsigned mode
,
4232 const unsigned char *sha1
,
4233 const char *concatpath
, unsigned dirty_submodule
)
4235 struct diff_filespec
*one
, *two
;
4237 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
4240 /* This may look odd, but it is a preparation for
4241 * feeding "there are unchanged files which should
4242 * not produce diffs, but when you are doing copy
4243 * detection you would need them, so here they are"
4244 * entries to the diff-core. They will be prefixed
4245 * with something like '=' or '*' (I haven't decided
4246 * which but should not make any difference).
4247 * Feeding the same new and old to diff_change()
4248 * also has the same effect.
4249 * Before the final output happens, they are pruned after
4250 * merged into rename/copy pairs as appropriate.
4252 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
4253 addremove
= (addremove
== '+' ? '-' :
4254 addremove
== '-' ? '+' : addremove
);
4256 if (options
->prefix
&&
4257 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4260 one
= alloc_filespec(concatpath
);
4261 two
= alloc_filespec(concatpath
);
4263 if (addremove
!= '+')
4264 fill_filespec(one
, sha1
, mode
);
4265 if (addremove
!= '-') {
4266 fill_filespec(two
, sha1
, mode
);
4267 two
->dirty_submodule
= dirty_submodule
;
4270 diff_queue(&diff_queued_diff
, one
, two
);
4271 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4272 DIFF_OPT_SET(options
, HAS_CHANGES
);
4275 void diff_change(struct diff_options
*options
,
4276 unsigned old_mode
, unsigned new_mode
,
4277 const unsigned char *old_sha1
,
4278 const unsigned char *new_sha1
,
4279 const char *concatpath
,
4280 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
4282 struct diff_filespec
*one
, *two
;
4284 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
4285 is_submodule_ignored(concatpath
, options
))
4288 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
4290 const unsigned char *tmp_c
;
4291 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
4292 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
4293 tmp
= old_dirty_submodule
; old_dirty_submodule
= new_dirty_submodule
;
4294 new_dirty_submodule
= tmp
;
4297 if (options
->prefix
&&
4298 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4301 one
= alloc_filespec(concatpath
);
4302 two
= alloc_filespec(concatpath
);
4303 fill_filespec(one
, old_sha1
, old_mode
);
4304 fill_filespec(two
, new_sha1
, new_mode
);
4305 one
->dirty_submodule
= old_dirty_submodule
;
4306 two
->dirty_submodule
= new_dirty_submodule
;
4308 diff_queue(&diff_queued_diff
, one
, two
);
4309 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4310 DIFF_OPT_SET(options
, HAS_CHANGES
);
4313 void diff_unmerge(struct diff_options
*options
,
4315 unsigned mode
, const unsigned char *sha1
)
4317 struct diff_filespec
*one
, *two
;
4319 if (options
->prefix
&&
4320 strncmp(path
, options
->prefix
, options
->prefix_length
))
4323 one
= alloc_filespec(path
);
4324 two
= alloc_filespec(path
);
4325 fill_filespec(one
, sha1
, mode
);
4326 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;
4329 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
4332 struct diff_tempfile
*temp
;
4333 const char *argv
[3];
4334 const char **arg
= argv
;
4335 struct child_process child
;
4336 struct strbuf buf
= STRBUF_INIT
;
4339 temp
= prepare_temp_file(spec
->path
, spec
);
4341 *arg
++ = temp
->name
;
4344 memset(&child
, 0, sizeof(child
));
4345 child
.use_shell
= 1;
4348 if (start_command(&child
)) {
4353 if (strbuf_read(&buf
, child
.out
, 0) < 0)
4354 err
= error("error reading from textconv command '%s'", pgm
);
4357 if (finish_command(&child
) || err
) {
4358 strbuf_release(&buf
);
4364 return strbuf_detach(&buf
, outsize
);
4367 size_t fill_textconv(struct userdiff_driver
*driver
,
4368 struct diff_filespec
*df
,
4373 if (!driver
|| !driver
->textconv
) {
4374 if (!DIFF_FILE_VALID(df
)) {
4378 if (diff_populate_filespec(df
, 0))
4379 die("unable to read files to diff");
4384 if (driver
->textconv_cache
) {
4385 *outbuf
= notes_cache_get(driver
->textconv_cache
, df
->sha1
,
4391 *outbuf
= run_textconv(driver
->textconv
, df
, &size
);
4393 die("unable to read files to diff");
4395 if (driver
->textconv_cache
) {
4396 /* ignore errors, as we might be in a readonly repository */
4397 notes_cache_put(driver
->textconv_cache
, df
->sha1
, *outbuf
,
4400 * we could save up changes and flush them all at the end,
4401 * but we would need an extra call after all diffing is done.
4402 * Since generating a cache entry is the slow path anyway,
4403 * this extra overhead probably isn't a big deal.
4405 notes_cache_write(driver
->textconv_cache
);