2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
16 #include "submodule.h"
19 #ifdef NO_FAST_WORKING_DIRECTORY
20 #define FAST_WORKING_DIRECTORY 0
22 #define FAST_WORKING_DIRECTORY 1
25 static int diff_detect_rename_default
;
26 static int diff_rename_limit_default
= 400;
27 static int diff_suppress_blank_empty
;
28 int diff_use_color_default
= -1;
29 static const char *diff_word_regex_cfg
;
30 static const char *external_diff_cmd_cfg
;
31 int diff_auto_refresh_index
= 1;
32 static int diff_mnemonic_prefix
;
33 static int diff_no_prefix
;
34 static int diff_dirstat_permille_default
= 30;
35 static struct diff_options default_diff_options
;
37 static char diff_colors
[][COLOR_MAXLEN
] = {
39 GIT_COLOR_NORMAL
, /* PLAIN */
40 GIT_COLOR_BOLD
, /* METAINFO */
41 GIT_COLOR_CYAN
, /* FRAGINFO */
42 GIT_COLOR_RED
, /* OLD */
43 GIT_COLOR_GREEN
, /* NEW */
44 GIT_COLOR_YELLOW
, /* COMMIT */
45 GIT_COLOR_BG_RED
, /* WHITESPACE */
46 GIT_COLOR_NORMAL
, /* FUNCINFO */
49 static int parse_diff_color_slot(const char *var
, int ofs
)
51 if (!strcasecmp(var
+ofs
, "plain"))
53 if (!strcasecmp(var
+ofs
, "meta"))
55 if (!strcasecmp(var
+ofs
, "frag"))
57 if (!strcasecmp(var
+ofs
, "old"))
59 if (!strcasecmp(var
+ofs
, "new"))
61 if (!strcasecmp(var
+ofs
, "commit"))
63 if (!strcasecmp(var
+ofs
, "whitespace"))
64 return DIFF_WHITESPACE
;
65 if (!strcasecmp(var
+ofs
, "func"))
70 static int parse_dirstat_params(struct diff_options
*options
, const char *params
,
71 struct strbuf
*errmsg
)
73 const char *p
= params
;
77 p_len
= strchrnul(p
, ',') - p
;
78 if (!memcmp(p
, "changes", p_len
)) {
79 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
80 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
81 } else if (!memcmp(p
, "lines", p_len
)) {
82 DIFF_OPT_SET(options
, DIRSTAT_BY_LINE
);
83 DIFF_OPT_CLR(options
, DIRSTAT_BY_FILE
);
84 } else if (!memcmp(p
, "files", p_len
)) {
85 DIFF_OPT_CLR(options
, DIRSTAT_BY_LINE
);
86 DIFF_OPT_SET(options
, DIRSTAT_BY_FILE
);
87 } else if (!memcmp(p
, "noncumulative", p_len
)) {
88 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
89 } else if (!memcmp(p
, "cumulative", p_len
)) {
90 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
91 } else if (isdigit(*p
)) {
93 int permille
= strtoul(p
, &end
, 10) * 10;
94 if (*end
== '.' && isdigit(*++end
)) {
95 /* only use first digit */
96 permille
+= *end
- '0';
97 /* .. and ignore any further digits */
98 while (isdigit(*++end
))
101 if (end
- p
== p_len
)
102 options
->dirstat_permille
= permille
;
104 strbuf_addf(errmsg
, _(" Failed to parse dirstat cut-off percentage '%.*s'\n"),
109 strbuf_addf(errmsg
, _(" Unknown dirstat parameter '%.*s'\n"),
117 p
++; /* more parameters, swallow separator */
122 static int git_config_rename(const char *var
, const char *value
)
125 return DIFF_DETECT_RENAME
;
126 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
127 return DIFF_DETECT_COPY
;
128 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
132 * These are to give UI layer defaults.
133 * The core-level commands such as git-diff-files should
134 * never be affected by the setting of diff.renames
135 * the user happens to have in the configuration file.
137 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
139 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
140 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
143 if (!strcmp(var
, "diff.renames")) {
144 diff_detect_rename_default
= git_config_rename(var
, value
);
147 if (!strcmp(var
, "diff.autorefreshindex")) {
148 diff_auto_refresh_index
= git_config_bool(var
, value
);
151 if (!strcmp(var
, "diff.mnemonicprefix")) {
152 diff_mnemonic_prefix
= git_config_bool(var
, value
);
155 if (!strcmp(var
, "diff.noprefix")) {
156 diff_no_prefix
= git_config_bool(var
, value
);
159 if (!strcmp(var
, "diff.external"))
160 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
161 if (!strcmp(var
, "diff.wordregex"))
162 return git_config_string(&diff_word_regex_cfg
, var
, value
);
164 if (!strcmp(var
, "diff.ignoresubmodules"))
165 handle_ignore_submodules_arg(&default_diff_options
, value
);
167 return git_diff_basic_config(var
, value
, cb
);
170 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
172 if (!strcmp(var
, "diff.renamelimit")) {
173 diff_rename_limit_default
= git_config_int(var
, value
);
177 switch (userdiff_config(var
, value
)) {
183 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
184 int slot
= parse_diff_color_slot(var
, 11);
188 return config_error_nonbool(var
);
189 color_parse(value
, var
, diff_colors
[slot
]);
193 /* like GNU diff's --suppress-blank-empty option */
194 if (!strcmp(var
, "diff.suppressblankempty") ||
195 /* for backwards compatibility */
196 !strcmp(var
, "diff.suppress-blank-empty")) {
197 diff_suppress_blank_empty
= git_config_bool(var
, value
);
201 if (!strcmp(var
, "diff.dirstat")) {
202 struct strbuf errmsg
= STRBUF_INIT
;
203 default_diff_options
.dirstat_permille
= diff_dirstat_permille_default
;
204 if (parse_dirstat_params(&default_diff_options
, value
, &errmsg
))
205 warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
207 strbuf_release(&errmsg
);
208 diff_dirstat_permille_default
= default_diff_options
.dirstat_permille
;
212 if (!prefixcmp(var
, "submodule."))
213 return parse_submodule_config_option(var
, value
);
215 return git_color_default_config(var
, value
, cb
);
218 static char *quote_two(const char *one
, const char *two
)
220 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
221 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
222 struct strbuf res
= STRBUF_INIT
;
224 if (need_one
+ need_two
) {
225 strbuf_addch(&res
, '"');
226 quote_c_style(one
, &res
, NULL
, 1);
227 quote_c_style(two
, &res
, NULL
, 1);
228 strbuf_addch(&res
, '"');
230 strbuf_addstr(&res
, one
);
231 strbuf_addstr(&res
, two
);
233 return strbuf_detach(&res
, NULL
);
236 static const char *external_diff(void)
238 static const char *external_diff_cmd
= NULL
;
239 static int done_preparing
= 0;
242 return external_diff_cmd
;
243 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
244 if (!external_diff_cmd
)
245 external_diff_cmd
= external_diff_cmd_cfg
;
247 return external_diff_cmd
;
250 static struct diff_tempfile
{
251 const char *name
; /* filename external diff should read from */
254 char tmp_path
[PATH_MAX
];
257 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
259 struct emit_callback
{
262 int blank_at_eof_in_preimage
;
263 int blank_at_eof_in_postimage
;
265 int lno_in_postimage
;
266 sane_truncate_fn truncate
;
267 const char **label_path
;
268 struct diff_words_data
*diff_words
;
269 struct diff_options
*opt
;
271 struct strbuf
*header
;
274 static int count_lines(const char *data
, int size
)
276 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
283 completely_empty
= 0;
287 completely_empty
= 0;
290 if (completely_empty
)
293 count
++; /* no trailing newline */
297 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
299 if (!DIFF_FILE_VALID(one
)) {
300 mf
->ptr
= (char *)""; /* does not matter */
304 else if (diff_populate_filespec(one
, 0))
308 mf
->size
= one
->size
;
312 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
313 static unsigned long diff_filespec_size(struct diff_filespec
*one
)
315 if (!DIFF_FILE_VALID(one
))
317 diff_populate_filespec(one
, 1);
321 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
324 long size
= mf
->size
;
329 ptr
+= size
- 1; /* pointing at the very end */
331 ; /* incomplete line */
333 ptr
--; /* skip the last LF */
334 while (mf
->ptr
< ptr
) {
336 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
337 if (*prev_eol
== '\n')
339 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
347 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
348 struct emit_callback
*ecbdata
)
351 unsigned ws_rule
= ecbdata
->ws_rule
;
352 l1
= count_trailing_blank(mf1
, ws_rule
);
353 l2
= count_trailing_blank(mf2
, ws_rule
);
355 ecbdata
->blank_at_eof_in_preimage
= 0;
356 ecbdata
->blank_at_eof_in_postimage
= 0;
359 at
= count_lines(mf1
->ptr
, mf1
->size
);
360 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
362 at
= count_lines(mf2
->ptr
, mf2
->size
);
363 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
366 static void emit_line_0(struct diff_options
*o
, const char *set
, const char *reset
,
367 int first
, const char *line
, int len
)
369 int has_trailing_newline
, has_trailing_carriage_return
;
371 FILE *file
= o
->file
;
373 if (o
->output_prefix
) {
374 struct strbuf
*msg
= NULL
;
375 msg
= o
->output_prefix(o
, o
->output_prefix_data
);
377 fwrite(msg
->buf
, msg
->len
, 1, file
);
381 has_trailing_newline
= (first
== '\n');
382 has_trailing_carriage_return
= (!has_trailing_newline
&&
384 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
386 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
387 if (has_trailing_newline
)
389 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
390 if (has_trailing_carriage_return
)
395 if (len
|| !nofirst
) {
399 fwrite(line
, len
, 1, file
);
402 if (has_trailing_carriage_return
)
404 if (has_trailing_newline
)
408 static void emit_line(struct diff_options
*o
, const char *set
, const char *reset
,
409 const char *line
, int len
)
411 emit_line_0(o
, set
, reset
, line
[0], line
+1, len
-1);
414 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
416 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
417 ecbdata
->blank_at_eof_in_preimage
&&
418 ecbdata
->blank_at_eof_in_postimage
&&
419 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
420 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
422 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
425 static void emit_add_line(const char *reset
,
426 struct emit_callback
*ecbdata
,
427 const char *line
, int len
)
429 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
430 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
433 emit_line_0(ecbdata
->opt
, set
, reset
, '+', line
, len
);
434 else if (new_blank_line_at_eof(ecbdata
, line
, len
))
435 /* Blank line at EOF - paint '+' as well */
436 emit_line_0(ecbdata
->opt
, ws
, reset
, '+', line
, len
);
438 /* Emit just the prefix, then the rest. */
439 emit_line_0(ecbdata
->opt
, set
, reset
, '+', "", 0);
440 ws_check_emit(line
, len
, ecbdata
->ws_rule
,
441 ecbdata
->opt
->file
, set
, reset
, ws
);
445 static void emit_hunk_header(struct emit_callback
*ecbdata
,
446 const char *line
, int len
)
448 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
449 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
450 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
451 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
452 static const char atat
[2] = { '@', '@' };
454 struct strbuf msgbuf
= STRBUF_INIT
;
459 * As a hunk header must begin with "@@ -<old>, +<new> @@",
460 * it always is at least 10 bytes long.
463 memcmp(line
, atat
, 2) ||
464 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
465 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
468 ep
+= 2; /* skip over @@ */
470 /* The hunk header in fraginfo color */
471 strbuf_add(&msgbuf
, frag
, strlen(frag
));
472 strbuf_add(&msgbuf
, line
, ep
- line
);
473 strbuf_add(&msgbuf
, reset
, strlen(reset
));
479 if (line
[len
- i
] == '\r' || line
[len
- i
] == '\n')
482 /* blank before the func header */
483 for (cp
= ep
; ep
- line
< len
; ep
++)
484 if (*ep
!= ' ' && *ep
!= '\t')
487 strbuf_add(&msgbuf
, plain
, strlen(plain
));
488 strbuf_add(&msgbuf
, cp
, ep
- cp
);
489 strbuf_add(&msgbuf
, reset
, strlen(reset
));
492 if (ep
< line
+ len
) {
493 strbuf_add(&msgbuf
, func
, strlen(func
));
494 strbuf_add(&msgbuf
, ep
, line
+ len
- ep
);
495 strbuf_add(&msgbuf
, reset
, strlen(reset
));
498 strbuf_add(&msgbuf
, line
+ len
, org_len
- len
);
499 emit_line(ecbdata
->opt
, "", "", msgbuf
.buf
, msgbuf
.len
);
500 strbuf_release(&msgbuf
);
503 static struct diff_tempfile
*claim_diff_tempfile(void) {
505 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
506 if (!diff_temp
[i
].name
)
507 return diff_temp
+ i
;
508 die("BUG: diff is failing to clean up its tempfiles");
511 static int remove_tempfile_installed
;
513 static void remove_tempfile(void)
516 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
517 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
)
518 unlink_or_warn(diff_temp
[i
].name
);
519 diff_temp
[i
].name
= NULL
;
523 static void remove_tempfile_on_signal(int signo
)
530 static void print_line_count(FILE *file
, int count
)
534 fprintf(file
, "0,0");
540 fprintf(file
, "1,%d", count
);
545 static void emit_rewrite_lines(struct emit_callback
*ecb
,
546 int prefix
, const char *data
, int size
)
548 const char *endp
= NULL
;
549 static const char *nneof
= " No newline at end of file\n";
550 const char *old
= diff_get_color(ecb
->color_diff
, DIFF_FILE_OLD
);
551 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
556 endp
= memchr(data
, '\n', size
);
557 len
= endp
? (endp
- data
+ 1) : size
;
559 ecb
->lno_in_preimage
++;
560 emit_line_0(ecb
->opt
, old
, reset
, '-',
563 ecb
->lno_in_postimage
++;
564 emit_add_line(reset
, ecb
, data
, len
);
570 const char *plain
= diff_get_color(ecb
->color_diff
,
572 emit_line_0(ecb
->opt
, plain
, reset
, '\\',
573 nneof
, strlen(nneof
));
577 static void emit_rewrite_diff(const char *name_a
,
579 struct diff_filespec
*one
,
580 struct diff_filespec
*two
,
581 struct userdiff_driver
*textconv_one
,
582 struct userdiff_driver
*textconv_two
,
583 struct diff_options
*o
)
586 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
587 const char *name_a_tab
, *name_b_tab
;
588 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
589 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
590 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
591 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
592 const char *a_prefix
, *b_prefix
;
593 char *data_one
, *data_two
;
594 size_t size_one
, size_two
;
595 struct emit_callback ecbdata
;
596 char *line_prefix
= "";
597 struct strbuf
*msgbuf
;
599 if (o
&& o
->output_prefix
) {
600 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
601 line_prefix
= msgbuf
->buf
;
604 if (diff_mnemonic_prefix
&& DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
605 a_prefix
= o
->b_prefix
;
606 b_prefix
= o
->a_prefix
;
608 a_prefix
= o
->a_prefix
;
609 b_prefix
= o
->b_prefix
;
612 name_a
+= (*name_a
== '/');
613 name_b
+= (*name_b
== '/');
614 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
615 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
617 strbuf_reset(&a_name
);
618 strbuf_reset(&b_name
);
619 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
620 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
622 size_one
= fill_textconv(textconv_one
, one
, &data_one
);
623 size_two
= fill_textconv(textconv_two
, two
, &data_two
);
625 memset(&ecbdata
, 0, sizeof(ecbdata
));
626 ecbdata
.color_diff
= color_diff
;
627 ecbdata
.found_changesp
= &o
->found_changes
;
628 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
630 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
632 mf1
.ptr
= (char *)data_one
;
633 mf2
.ptr
= (char *)data_two
;
636 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
638 ecbdata
.lno_in_preimage
= 1;
639 ecbdata
.lno_in_postimage
= 1;
641 lc_a
= count_lines(data_one
, size_one
);
642 lc_b
= count_lines(data_two
, size_two
);
644 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
645 line_prefix
, metainfo
, a_name
.buf
, name_a_tab
, reset
,
646 line_prefix
, metainfo
, b_name
.buf
, name_b_tab
, reset
,
647 line_prefix
, fraginfo
);
648 if (!o
->irreversible_delete
)
649 print_line_count(o
->file
, lc_a
);
651 fprintf(o
->file
, "?,?");
652 fprintf(o
->file
, " +");
653 print_line_count(o
->file
, lc_b
);
654 fprintf(o
->file
, " @@%s\n", reset
);
655 if (lc_a
&& !o
->irreversible_delete
)
656 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
658 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
660 free((char *)data_one
);
662 free((char *)data_two
);
665 struct diff_words_buffer
{
668 struct diff_words_orig
{
669 const char *begin
, *end
;
671 int orig_nr
, orig_alloc
;
674 static void diff_words_append(char *line
, unsigned long len
,
675 struct diff_words_buffer
*buffer
)
677 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
680 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
681 buffer
->text
.size
+= len
;
682 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
685 struct diff_words_style_elem
{
688 const char *color
; /* NULL; filled in by the setup code if
689 * color is enabled */
692 struct diff_words_style
{
693 enum diff_words_type type
;
694 struct diff_words_style_elem
new, old
, ctx
;
698 static struct diff_words_style diff_words_styles
[] = {
699 { DIFF_WORDS_PORCELAIN
, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
700 { DIFF_WORDS_PLAIN
, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
701 { DIFF_WORDS_COLOR
, {"", ""}, {"", ""}, {"", ""}, "\n" }
704 struct diff_words_data
{
705 struct diff_words_buffer minus
, plus
;
706 const char *current_plus
;
708 struct diff_options
*opt
;
710 enum diff_words_type type
;
711 struct diff_words_style
*style
;
714 static int fn_out_diff_words_write_helper(FILE *fp
,
715 struct diff_words_style_elem
*st_el
,
717 size_t count
, const char *buf
,
718 const char *line_prefix
)
723 char *p
= memchr(buf
, '\n', count
);
725 fputs(line_prefix
, fp
);
727 if (st_el
->color
&& fputs(st_el
->color
, fp
) < 0)
729 if (fputs(st_el
->prefix
, fp
) < 0 ||
730 fwrite(buf
, p
? p
- buf
: count
, 1, fp
) != 1 ||
731 fputs(st_el
->suffix
, fp
) < 0)
733 if (st_el
->color
&& *st_el
->color
734 && fputs(GIT_COLOR_RESET
, fp
) < 0)
739 if (fputs(newline
, fp
) < 0)
741 count
-= p
+ 1 - buf
;
749 * '--color-words' algorithm can be described as:
751 * 1. collect a the minus/plus lines of a diff hunk, divided into
752 * minus-lines and plus-lines;
754 * 2. break both minus-lines and plus-lines into words and
755 * place them into two mmfile_t with one word for each line;
757 * 3. use xdiff to run diff on the two mmfile_t to get the words level diff;
759 * And for the common parts of the both file, we output the plus side text.
760 * diff_words->current_plus is used to trace the current position of the plus file
761 * which printed. diff_words->last_minus is used to trace the last minus word
764 * For '--graph' to work with '--color-words', we need to output the graph prefix
765 * on each line of color words output. Generally, there are two conditions on
766 * which we should output the prefix.
768 * 1. diff_words->last_minus == 0 &&
769 * diff_words->current_plus == diff_words->plus.text.ptr
771 * that is: the plus text must start as a new line, and if there is no minus
772 * word printed, a graph prefix must be printed.
774 * 2. diff_words->current_plus > diff_words->plus.text.ptr &&
775 * *(diff_words->current_plus - 1) == '\n'
777 * that is: a graph prefix must be printed following a '\n'
779 static int color_words_output_graph_prefix(struct diff_words_data
*diff_words
)
781 if ((diff_words
->last_minus
== 0 &&
782 diff_words
->current_plus
== diff_words
->plus
.text
.ptr
) ||
783 (diff_words
->current_plus
> diff_words
->plus
.text
.ptr
&&
784 *(diff_words
->current_plus
- 1) == '\n')) {
791 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
793 struct diff_words_data
*diff_words
= priv
;
794 struct diff_words_style
*style
= diff_words
->style
;
795 int minus_first
, minus_len
, plus_first
, plus_len
;
796 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
797 struct diff_options
*opt
= diff_words
->opt
;
798 struct strbuf
*msgbuf
;
799 char *line_prefix
= "";
801 if (line
[0] != '@' || parse_hunk_header(line
, len
,
802 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
806 if (opt
->output_prefix
) {
807 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
808 line_prefix
= msgbuf
->buf
;
811 /* POSIX requires that first be decremented by one if len == 0... */
813 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
815 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
817 minus_begin
= minus_end
=
818 diff_words
->minus
.orig
[minus_first
].end
;
821 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
822 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
824 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
826 if (color_words_output_graph_prefix(diff_words
)) {
827 fputs(line_prefix
, diff_words
->opt
->file
);
829 if (diff_words
->current_plus
!= plus_begin
) {
830 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
831 &style
->ctx
, style
->newline
,
832 plus_begin
- diff_words
->current_plus
,
833 diff_words
->current_plus
, line_prefix
);
834 if (*(plus_begin
- 1) == '\n')
835 fputs(line_prefix
, diff_words
->opt
->file
);
837 if (minus_begin
!= minus_end
) {
838 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
839 &style
->old
, style
->newline
,
840 minus_end
- minus_begin
, minus_begin
,
843 if (plus_begin
!= plus_end
) {
844 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
845 &style
->new, style
->newline
,
846 plus_end
- plus_begin
, plus_begin
,
850 diff_words
->current_plus
= plus_end
;
851 diff_words
->last_minus
= minus_first
;
854 /* This function starts looking at *begin, and returns 0 iff a word was found. */
855 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
856 int *begin
, int *end
)
858 if (word_regex
&& *begin
< buffer
->size
) {
860 if (!regexec(word_regex
, buffer
->ptr
+ *begin
, 1, match
, 0)) {
861 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
862 '\n', match
[0].rm_eo
- match
[0].rm_so
);
863 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
864 *begin
+= match
[0].rm_so
;
865 return *begin
>= *end
;
870 /* find the next word */
871 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
873 if (*begin
>= buffer
->size
)
876 /* find the end of the word */
878 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
885 * This function splits the words in buffer->text, stores the list with
886 * newline separator into out, and saves the offsets of the original words
889 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
898 /* fake an empty "0th" word */
899 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
900 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
903 for (i
= 0; i
< buffer
->text
.size
; i
++) {
904 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
907 /* store original boundaries */
908 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
910 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
911 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
915 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
916 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
917 out
->ptr
[out
->size
+ j
- i
] = '\n';
918 out
->size
+= j
- i
+ 1;
924 /* this executes the word diff on the accumulated buffers */
925 static void diff_words_show(struct diff_words_data
*diff_words
)
929 mmfile_t minus
, plus
;
930 struct diff_words_style
*style
= diff_words
->style
;
932 struct diff_options
*opt
= diff_words
->opt
;
933 struct strbuf
*msgbuf
;
934 char *line_prefix
= "";
937 if (opt
->output_prefix
) {
938 msgbuf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
939 line_prefix
= msgbuf
->buf
;
942 /* special case: only removal */
943 if (!diff_words
->plus
.text
.size
) {
944 fputs(line_prefix
, diff_words
->opt
->file
);
945 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
946 &style
->old
, style
->newline
,
947 diff_words
->minus
.text
.size
,
948 diff_words
->minus
.text
.ptr
, line_prefix
);
949 diff_words
->minus
.text
.size
= 0;
953 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
954 diff_words
->last_minus
= 0;
956 memset(&xpp
, 0, sizeof(xpp
));
957 memset(&xecfg
, 0, sizeof(xecfg
));
958 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
959 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
961 /* as only the hunk header will be parsed, we need a 0-context */
963 xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
967 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
968 diff_words
->plus
.text
.size
) {
969 if (color_words_output_graph_prefix(diff_words
))
970 fputs(line_prefix
, diff_words
->opt
->file
);
971 fn_out_diff_words_write_helper(diff_words
->opt
->file
,
972 &style
->ctx
, style
->newline
,
973 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
974 - diff_words
->current_plus
, diff_words
->current_plus
,
977 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
980 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
981 static void diff_words_flush(struct emit_callback
*ecbdata
)
983 if (ecbdata
->diff_words
->minus
.text
.size
||
984 ecbdata
->diff_words
->plus
.text
.size
)
985 diff_words_show(ecbdata
->diff_words
);
988 static void free_diff_words_data(struct emit_callback
*ecbdata
)
990 if (ecbdata
->diff_words
) {
991 diff_words_flush(ecbdata
);
992 free (ecbdata
->diff_words
->minus
.text
.ptr
);
993 free (ecbdata
->diff_words
->minus
.orig
);
994 free (ecbdata
->diff_words
->plus
.text
.ptr
);
995 free (ecbdata
->diff_words
->plus
.orig
);
996 if (ecbdata
->diff_words
->word_regex
) {
997 regfree(ecbdata
->diff_words
->word_regex
);
998 free(ecbdata
->diff_words
->word_regex
);
1000 free(ecbdata
->diff_words
);
1001 ecbdata
->diff_words
= NULL
;
1005 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
1008 return diff_colors
[ix
];
1012 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
1015 unsigned long allot
;
1019 return ecb
->truncate(line
, len
);
1023 (void) utf8_width(&cp
, &l
);
1025 break; /* truncated in the middle? */
1030 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
1033 ecbdata
->lno_in_preimage
= 0;
1034 ecbdata
->lno_in_postimage
= 0;
1035 p
= strchr(line
, '-');
1037 return; /* cannot happen */
1038 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
1041 return; /* cannot happen */
1042 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
1045 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
1047 struct emit_callback
*ecbdata
= priv
;
1048 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
1049 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
1050 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
1051 struct diff_options
*o
= ecbdata
->opt
;
1052 char *line_prefix
= "";
1053 struct strbuf
*msgbuf
;
1055 if (o
&& o
->output_prefix
) {
1056 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
1057 line_prefix
= msgbuf
->buf
;
1060 if (ecbdata
->header
) {
1061 fprintf(ecbdata
->opt
->file
, "%s", ecbdata
->header
->buf
);
1062 strbuf_reset(ecbdata
->header
);
1063 ecbdata
->header
= NULL
;
1065 *(ecbdata
->found_changesp
) = 1;
1067 if (ecbdata
->label_path
[0]) {
1068 const char *name_a_tab
, *name_b_tab
;
1070 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
1071 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
1073 fprintf(ecbdata
->opt
->file
, "%s%s--- %s%s%s\n",
1074 line_prefix
, meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
1075 fprintf(ecbdata
->opt
->file
, "%s%s+++ %s%s%s\n",
1076 line_prefix
, meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
1077 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
1080 if (diff_suppress_blank_empty
1081 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
1086 if (line
[0] == '@') {
1087 if (ecbdata
->diff_words
)
1088 diff_words_flush(ecbdata
);
1089 len
= sane_truncate_line(ecbdata
, line
, len
);
1090 find_lno(line
, ecbdata
);
1091 emit_hunk_header(ecbdata
, line
, len
);
1092 if (line
[len
-1] != '\n')
1093 putc('\n', ecbdata
->opt
->file
);
1098 emit_line(ecbdata
->opt
, reset
, reset
, line
, len
);
1099 if (ecbdata
->diff_words
1100 && ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
)
1101 fputs("~\n", ecbdata
->opt
->file
);
1105 if (ecbdata
->diff_words
) {
1106 if (line
[0] == '-') {
1107 diff_words_append(line
, len
,
1108 &ecbdata
->diff_words
->minus
);
1110 } else if (line
[0] == '+') {
1111 diff_words_append(line
, len
,
1112 &ecbdata
->diff_words
->plus
);
1115 diff_words_flush(ecbdata
);
1116 if (ecbdata
->diff_words
->type
== DIFF_WORDS_PORCELAIN
) {
1117 emit_line(ecbdata
->opt
, plain
, reset
, line
, len
);
1118 fputs("~\n", ecbdata
->opt
->file
);
1120 /* don't print the prefix character */
1121 emit_line(ecbdata
->opt
, plain
, reset
, line
+1, len
-1);
1126 if (line
[0] != '+') {
1128 diff_get_color(ecbdata
->color_diff
,
1129 line
[0] == '-' ? DIFF_FILE_OLD
: DIFF_PLAIN
);
1130 ecbdata
->lno_in_preimage
++;
1132 ecbdata
->lno_in_postimage
++;
1133 emit_line(ecbdata
->opt
, color
, reset
, line
, len
);
1135 ecbdata
->lno_in_postimage
++;
1136 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
1140 static char *pprint_rename(const char *a
, const char *b
)
1142 const char *old
= a
;
1143 const char *new = b
;
1144 struct strbuf name
= STRBUF_INIT
;
1145 int pfx_length
, sfx_length
;
1146 int len_a
= strlen(a
);
1147 int len_b
= strlen(b
);
1148 int a_midlen
, b_midlen
;
1149 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
1150 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
1152 if (qlen_a
|| qlen_b
) {
1153 quote_c_style(a
, &name
, NULL
, 0);
1154 strbuf_addstr(&name
, " => ");
1155 quote_c_style(b
, &name
, NULL
, 0);
1156 return strbuf_detach(&name
, NULL
);
1159 /* Find common prefix */
1161 while (*old
&& *new && *old
== *new) {
1163 pfx_length
= old
- a
+ 1;
1168 /* Find common suffix */
1172 while (a
<= old
&& b
<= new && *old
== *new) {
1174 sfx_length
= len_a
- (old
- a
);
1180 * pfx{mid-a => mid-b}sfx
1181 * {pfx-a => pfx-b}sfx
1182 * pfx{sfx-a => sfx-b}
1185 a_midlen
= len_a
- pfx_length
- sfx_length
;
1186 b_midlen
= len_b
- pfx_length
- sfx_length
;
1192 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
1193 if (pfx_length
+ sfx_length
) {
1194 strbuf_add(&name
, a
, pfx_length
);
1195 strbuf_addch(&name
, '{');
1197 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
1198 strbuf_addstr(&name
, " => ");
1199 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
1200 if (pfx_length
+ sfx_length
) {
1201 strbuf_addch(&name
, '}');
1202 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
1204 return strbuf_detach(&name
, NULL
);
1210 struct diffstat_file
{
1214 unsigned is_unmerged
:1;
1215 unsigned is_binary
:1;
1216 unsigned is_renamed
:1;
1217 uintmax_t added
, deleted
;
1221 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
1225 struct diffstat_file
*x
;
1226 x
= xcalloc(sizeof (*x
), 1);
1227 if (diffstat
->nr
== diffstat
->alloc
) {
1228 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
1229 diffstat
->files
= xrealloc(diffstat
->files
,
1230 diffstat
->alloc
* sizeof(x
));
1232 diffstat
->files
[diffstat
->nr
++] = x
;
1234 x
->from_name
= xstrdup(name_a
);
1235 x
->name
= xstrdup(name_b
);
1239 x
->from_name
= NULL
;
1240 x
->name
= xstrdup(name_a
);
1245 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
1247 struct diffstat_t
*diffstat
= priv
;
1248 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
1252 else if (line
[0] == '-')
1256 const char mime_boundary_leader
[] = "------------";
1258 static int scale_linear(int it
, int width
, int max_change
)
1261 * make sure that at least one '-' is printed if there were deletions,
1262 * and likewise for '+'.
1266 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
1269 static void show_name(FILE *file
,
1270 const char *prefix
, const char *name
, int len
)
1272 fprintf(file
, " %s%-*s |", prefix
, len
, name
);
1275 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
1279 fprintf(file
, "%s", set
);
1282 fprintf(file
, "%s", reset
);
1285 static void fill_print_name(struct diffstat_file
*file
)
1289 if (file
->print_name
)
1292 if (!file
->is_renamed
) {
1293 struct strbuf buf
= STRBUF_INIT
;
1294 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
1295 pname
= strbuf_detach(&buf
, NULL
);
1298 strbuf_release(&buf
);
1301 pname
= pprint_rename(file
->from_name
, file
->name
);
1303 file
->print_name
= pname
;
1306 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
1308 int i
, len
, add
, del
, adds
= 0, dels
= 0;
1309 uintmax_t max_change
= 0, max_len
= 0;
1310 int total_files
= data
->nr
;
1311 int width
, name_width
;
1312 const char *reset
, *add_c
, *del_c
;
1313 const char *line_prefix
= "";
1314 struct strbuf
*msg
= NULL
;
1319 if (options
->output_prefix
) {
1320 msg
= options
->output_prefix(options
, options
->output_prefix_data
);
1321 line_prefix
= msg
->buf
;
1324 width
= options
->stat_width
? options
->stat_width
: 80;
1325 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
1327 /* Sanity: give at least 5 columns to the graph,
1328 * but leave at least 10 columns for the name.
1332 if (name_width
< 10)
1334 else if (width
< name_width
+ 15)
1335 name_width
= width
- 15;
1337 /* Find the longest filename and max number of changes */
1338 reset
= diff_get_color_opt(options
, DIFF_RESET
);
1339 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
1340 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
1342 for (i
= 0; i
< data
->nr
; i
++) {
1343 struct diffstat_file
*file
= data
->files
[i
];
1344 uintmax_t change
= file
->added
+ file
->deleted
;
1345 fill_print_name(file
);
1346 len
= strlen(file
->print_name
);
1350 if (file
->is_binary
|| file
->is_unmerged
)
1352 if (max_change
< change
)
1353 max_change
= change
;
1356 /* Compute the width of the graph part;
1357 * 10 is for one blank at the beginning of the line plus
1358 * " | count " between the name and the graph.
1360 * From here on, name_width is the width of the name area,
1361 * and width is the width of the graph area.
1363 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
1364 if (width
< (name_width
+ 10) + max_change
)
1365 width
= width
- (name_width
+ 10);
1369 for (i
= 0; i
< data
->nr
; i
++) {
1370 const char *prefix
= "";
1371 char *name
= data
->files
[i
]->print_name
;
1372 uintmax_t added
= data
->files
[i
]->added
;
1373 uintmax_t deleted
= data
->files
[i
]->deleted
;
1377 * "scale" the filename
1380 name_len
= strlen(name
);
1381 if (name_width
< name_len
) {
1385 name
+= name_len
- len
;
1386 slash
= strchr(name
, '/');
1391 if (data
->files
[i
]->is_binary
) {
1392 fprintf(options
->file
, "%s", line_prefix
);
1393 show_name(options
->file
, prefix
, name
, len
);
1394 fprintf(options
->file
, " Bin ");
1395 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1396 del_c
, deleted
, reset
);
1397 fprintf(options
->file
, " -> ");
1398 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1399 add_c
, added
, reset
);
1400 fprintf(options
->file
, " bytes");
1401 fprintf(options
->file
, "\n");
1404 else if (data
->files
[i
]->is_unmerged
) {
1405 fprintf(options
->file
, "%s", line_prefix
);
1406 show_name(options
->file
, prefix
, name
, len
);
1407 fprintf(options
->file
, " Unmerged\n");
1410 else if (!data
->files
[i
]->is_renamed
&&
1411 (added
+ deleted
== 0)) {
1417 * scale the add/delete
1424 if (width
<= max_change
) {
1425 add
= scale_linear(add
, width
, max_change
);
1426 del
= scale_linear(del
, width
, max_change
);
1428 fprintf(options
->file
, "%s", line_prefix
);
1429 show_name(options
->file
, prefix
, name
, len
);
1430 fprintf(options
->file
, "%5"PRIuMAX
"%s", added
+ deleted
,
1431 added
+ deleted
? " " : "");
1432 show_graph(options
->file
, '+', add
, add_c
, reset
);
1433 show_graph(options
->file
, '-', del
, del_c
, reset
);
1434 fprintf(options
->file
, "\n");
1436 fprintf(options
->file
, "%s", line_prefix
);
1437 fprintf(options
->file
,
1438 " %d files changed, %d insertions(+), %d deletions(-)\n",
1439 total_files
, adds
, dels
);
1442 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
1444 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
1449 for (i
= 0; i
< data
->nr
; i
++) {
1450 if (!data
->files
[i
]->is_binary
&&
1451 !data
->files
[i
]->is_unmerged
) {
1452 int added
= data
->files
[i
]->added
;
1453 int deleted
= data
->files
[i
]->deleted
;
1454 if (!data
->files
[i
]->is_renamed
&&
1455 (added
+ deleted
== 0)) {
1463 if (options
->output_prefix
) {
1464 struct strbuf
*msg
= NULL
;
1465 msg
= options
->output_prefix(options
,
1466 options
->output_prefix_data
);
1467 fprintf(options
->file
, "%s", msg
->buf
);
1469 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
1470 total_files
, adds
, dels
);
1473 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
1480 for (i
= 0; i
< data
->nr
; i
++) {
1481 struct diffstat_file
*file
= data
->files
[i
];
1483 if (options
->output_prefix
) {
1484 struct strbuf
*msg
= NULL
;
1485 msg
= options
->output_prefix(options
,
1486 options
->output_prefix_data
);
1487 fprintf(options
->file
, "%s", msg
->buf
);
1490 if (file
->is_binary
)
1491 fprintf(options
->file
, "-\t-\t");
1493 fprintf(options
->file
,
1494 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
1495 file
->added
, file
->deleted
);
1496 if (options
->line_termination
) {
1497 fill_print_name(file
);
1498 if (!file
->is_renamed
)
1499 write_name_quoted(file
->name
, options
->file
,
1500 options
->line_termination
);
1502 fputs(file
->print_name
, options
->file
);
1503 putc(options
->line_termination
, options
->file
);
1506 if (file
->is_renamed
) {
1507 putc('\0', options
->file
);
1508 write_name_quoted(file
->from_name
, options
->file
, '\0');
1510 write_name_quoted(file
->name
, options
->file
, '\0');
1515 struct dirstat_file
{
1517 unsigned long changed
;
1520 struct dirstat_dir
{
1521 struct dirstat_file
*files
;
1522 int alloc
, nr
, permille
, cumulative
;
1525 static long gather_dirstat(struct diff_options
*opt
, struct dirstat_dir
*dir
,
1526 unsigned long changed
, const char *base
, int baselen
)
1528 unsigned long this_dir
= 0;
1529 unsigned int sources
= 0;
1530 const char *line_prefix
= "";
1531 struct strbuf
*msg
= NULL
;
1533 if (opt
->output_prefix
) {
1534 msg
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
1535 line_prefix
= msg
->buf
;
1539 struct dirstat_file
*f
= dir
->files
;
1540 int namelen
= strlen(f
->name
);
1544 if (namelen
< baselen
)
1546 if (memcmp(f
->name
, base
, baselen
))
1548 slash
= strchr(f
->name
+ baselen
, '/');
1550 int newbaselen
= slash
+ 1 - f
->name
;
1551 this = gather_dirstat(opt
, dir
, changed
, f
->name
, newbaselen
);
1563 * We don't report dirstat's for
1565 * - or cases where everything came from a single directory
1566 * under this directory (sources == 1).
1568 if (baselen
&& sources
!= 1) {
1570 int permille
= this_dir
* 1000 / changed
;
1571 if (permille
>= dir
->permille
) {
1572 fprintf(opt
->file
, "%s%4d.%01d%% %.*s\n", line_prefix
,
1573 permille
/ 10, permille
% 10, baselen
, base
);
1574 if (!dir
->cumulative
)
1582 static int dirstat_compare(const void *_a
, const void *_b
)
1584 const struct dirstat_file
*a
= _a
;
1585 const struct dirstat_file
*b
= _b
;
1586 return strcmp(a
->name
, b
->name
);
1589 static void show_dirstat(struct diff_options
*options
)
1592 unsigned long changed
;
1593 struct dirstat_dir dir
;
1594 struct diff_queue_struct
*q
= &diff_queued_diff
;
1599 dir
.permille
= options
->dirstat_permille
;
1600 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1603 for (i
= 0; i
< q
->nr
; i
++) {
1604 struct diff_filepair
*p
= q
->queue
[i
];
1606 unsigned long copied
, added
, damage
;
1607 int content_changed
;
1609 name
= p
->two
->path
? p
->two
->path
: p
->one
->path
;
1611 if (p
->one
->sha1_valid
&& p
->two
->sha1_valid
)
1612 content_changed
= hashcmp(p
->one
->sha1
, p
->two
->sha1
);
1614 content_changed
= 1;
1616 if (!content_changed
) {
1618 * The SHA1 has not changed, so pre-/post-content is
1619 * identical. We can therefore skip looking at the
1620 * file contents altogether.
1626 if (DIFF_OPT_TST(options
, DIRSTAT_BY_FILE
)) {
1628 * In --dirstat-by-file mode, we don't really need to
1629 * look at the actual file contents at all.
1630 * The fact that the SHA1 changed is enough for us to
1631 * add this file to the list of results
1632 * (with each file contributing equal damage).
1638 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1639 diff_populate_filespec(p
->one
, 0);
1640 diff_populate_filespec(p
->two
, 0);
1641 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1643 diff_free_filespec_data(p
->one
);
1644 diff_free_filespec_data(p
->two
);
1645 } else if (DIFF_FILE_VALID(p
->one
)) {
1646 diff_populate_filespec(p
->one
, 1);
1648 diff_free_filespec_data(p
->one
);
1649 } else if (DIFF_FILE_VALID(p
->two
)) {
1650 diff_populate_filespec(p
->two
, 1);
1652 added
= p
->two
->size
;
1653 diff_free_filespec_data(p
->two
);
1658 * Original minus copied is the removed material,
1659 * added is the new material. They are both damages
1660 * made to the preimage.
1661 * If the resulting damage is zero, we know that
1662 * diffcore_count_changes() considers the two entries to
1663 * be identical, but since content_changed is true, we
1664 * know that there must have been _some_ kind of change,
1665 * so we force all entries to have damage > 0.
1667 damage
= (p
->one
->size
- copied
) + added
;
1672 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1673 dir
.files
[dir
.nr
].name
= name
;
1674 dir
.files
[dir
.nr
].changed
= damage
;
1679 /* This can happen even with many files, if everything was renames */
1683 /* Show all directories with more than x% of the changes */
1684 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1685 gather_dirstat(options
, &dir
, changed
, "", 0);
1688 static void show_dirstat_by_line(struct diffstat_t
*data
, struct diff_options
*options
)
1691 unsigned long changed
;
1692 struct dirstat_dir dir
;
1700 dir
.permille
= options
->dirstat_permille
;
1701 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1704 for (i
= 0; i
< data
->nr
; i
++) {
1705 struct diffstat_file
*file
= data
->files
[i
];
1706 unsigned long damage
= file
->added
+ file
->deleted
;
1707 if (file
->is_binary
)
1709 * binary files counts bytes, not lines. Must find some
1710 * way to normalize binary bytes vs. textual lines.
1711 * The following heuristic assumes that there are 64
1713 * This is stupid and ugly, but very cheap...
1715 damage
= (damage
+ 63) / 64;
1716 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1717 dir
.files
[dir
.nr
].name
= file
->name
;
1718 dir
.files
[dir
.nr
].changed
= damage
;
1723 /* This can happen even with many files, if everything was renames */
1727 /* Show all directories with more than x% of the changes */
1728 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1729 gather_dirstat(options
, &dir
, changed
, "", 0);
1732 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1735 for (i
= 0; i
< diffstat
->nr
; i
++) {
1736 struct diffstat_file
*f
= diffstat
->files
[i
];
1737 if (f
->name
!= f
->print_name
)
1738 free(f
->print_name
);
1743 free(diffstat
->files
);
1746 struct checkdiff_t
{
1747 const char *filename
;
1749 int conflict_marker_size
;
1750 struct diff_options
*o
;
1755 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
1760 if (len
< marker_size
+ 1)
1762 firstchar
= line
[0];
1763 switch (firstchar
) {
1764 case '=': case '>': case '<': case '|':
1769 for (cnt
= 1; cnt
< marker_size
; cnt
++)
1770 if (line
[cnt
] != firstchar
)
1772 /* line[1] thru line[marker_size-1] are same as firstchar */
1773 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
1778 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1780 struct checkdiff_t
*data
= priv
;
1781 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1782 int marker_size
= data
->conflict_marker_size
;
1783 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1784 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1785 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1787 char *line_prefix
= "";
1788 struct strbuf
*msgbuf
;
1791 if (data
->o
->output_prefix
) {
1792 msgbuf
= data
->o
->output_prefix(data
->o
,
1793 data
->o
->output_prefix_data
);
1794 line_prefix
= msgbuf
->buf
;
1797 if (line
[0] == '+') {
1800 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
1802 fprintf(data
->o
->file
,
1803 "%s%s:%d: leftover conflict marker\n",
1804 line_prefix
, data
->filename
, data
->lineno
);
1806 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1809 data
->status
|= bad
;
1810 err
= whitespace_error_string(bad
);
1811 fprintf(data
->o
->file
, "%s%s:%d: %s.\n",
1812 line_prefix
, data
->filename
, data
->lineno
, err
);
1814 emit_line(data
->o
, set
, reset
, line
, 1);
1815 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1816 data
->o
->file
, set
, reset
, ws
);
1817 } else if (line
[0] == ' ') {
1819 } else if (line
[0] == '@') {
1820 char *plus
= strchr(line
, '+');
1822 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1824 die("invalid diff");
1828 static unsigned char *deflate_it(char *data
,
1830 unsigned long *result_size
)
1833 unsigned char *deflated
;
1836 memset(&stream
, 0, sizeof(stream
));
1837 deflateInit(&stream
, zlib_compression_level
);
1838 bound
= deflateBound(&stream
, size
);
1839 deflated
= xmalloc(bound
);
1840 stream
.next_out
= deflated
;
1841 stream
.avail_out
= bound
;
1843 stream
.next_in
= (unsigned char *)data
;
1844 stream
.avail_in
= size
;
1845 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1847 deflateEnd(&stream
);
1848 *result_size
= stream
.total_out
;
1852 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
, char *prefix
)
1858 unsigned long orig_size
;
1859 unsigned long delta_size
;
1860 unsigned long deflate_size
;
1861 unsigned long data_size
;
1863 /* We could do deflated delta, or we could do just deflated two,
1864 * whichever is smaller.
1867 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1868 if (one
->size
&& two
->size
) {
1869 delta
= diff_delta(one
->ptr
, one
->size
,
1870 two
->ptr
, two
->size
,
1871 &delta_size
, deflate_size
);
1873 void *to_free
= delta
;
1874 orig_size
= delta_size
;
1875 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1880 if (delta
&& delta_size
< deflate_size
) {
1881 fprintf(file
, "%sdelta %lu\n", prefix
, orig_size
);
1884 data_size
= delta_size
;
1887 fprintf(file
, "%sliteral %lu\n", prefix
, two
->size
);
1890 data_size
= deflate_size
;
1893 /* emit data encoded in base85 */
1896 int bytes
= (52 < data_size
) ? 52 : data_size
;
1900 line
[0] = bytes
+ 'A' - 1;
1902 line
[0] = bytes
- 26 + 'a' - 1;
1903 encode_85(line
+ 1, cp
, bytes
);
1904 cp
= (char *) cp
+ bytes
;
1905 fprintf(file
, "%s", prefix
);
1909 fprintf(file
, "%s\n", prefix
);
1913 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
, char *prefix
)
1915 fprintf(file
, "%sGIT binary patch\n", prefix
);
1916 emit_binary_diff_body(file
, one
, two
, prefix
);
1917 emit_binary_diff_body(file
, two
, one
, prefix
);
1920 static void diff_filespec_load_driver(struct diff_filespec
*one
)
1922 /* Use already-loaded driver */
1926 if (S_ISREG(one
->mode
))
1927 one
->driver
= userdiff_find_by_path(one
->path
);
1929 /* Fallback to default settings */
1931 one
->driver
= userdiff_find_by_name("default");
1934 int diff_filespec_is_binary(struct diff_filespec
*one
)
1936 if (one
->is_binary
== -1) {
1937 diff_filespec_load_driver(one
);
1938 if (one
->driver
->binary
!= -1)
1939 one
->is_binary
= one
->driver
->binary
;
1941 if (!one
->data
&& DIFF_FILE_VALID(one
))
1942 diff_populate_filespec(one
, 0);
1944 one
->is_binary
= buffer_is_binary(one
->data
,
1946 if (one
->is_binary
== -1)
1950 return one
->is_binary
;
1953 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
1955 diff_filespec_load_driver(one
);
1956 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
1959 static const char *userdiff_word_regex(struct diff_filespec
*one
)
1961 diff_filespec_load_driver(one
);
1962 return one
->driver
->word_regex
;
1965 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
1967 if (!options
->a_prefix
)
1968 options
->a_prefix
= a
;
1969 if (!options
->b_prefix
)
1970 options
->b_prefix
= b
;
1973 struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
1975 if (!DIFF_FILE_VALID(one
))
1978 diff_filespec_load_driver(one
);
1979 return userdiff_get_textconv(one
->driver
);
1982 static void builtin_diff(const char *name_a
,
1984 struct diff_filespec
*one
,
1985 struct diff_filespec
*two
,
1986 const char *xfrm_msg
,
1987 int must_show_header
,
1988 struct diff_options
*o
,
1989 int complete_rewrite
)
1993 char *a_one
, *b_two
;
1994 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1995 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1996 const char *a_prefix
, *b_prefix
;
1997 struct userdiff_driver
*textconv_one
= NULL
;
1998 struct userdiff_driver
*textconv_two
= NULL
;
1999 struct strbuf header
= STRBUF_INIT
;
2000 struct strbuf
*msgbuf
;
2001 char *line_prefix
= "";
2003 if (o
->output_prefix
) {
2004 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
2005 line_prefix
= msgbuf
->buf
;
2008 if (DIFF_OPT_TST(o
, SUBMODULE_LOG
) &&
2009 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
2010 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
2011 const char *del
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2012 const char *add
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2013 show_submodule_summary(o
->file
, one
? one
->path
: two
->path
,
2014 one
->sha1
, two
->sha1
, two
->dirty_submodule
,
2019 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
2020 textconv_one
= get_textconv(one
);
2021 textconv_two
= get_textconv(two
);
2024 diff_set_mnemonic_prefix(o
, "a/", "b/");
2025 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
2026 a_prefix
= o
->b_prefix
;
2027 b_prefix
= o
->a_prefix
;
2029 a_prefix
= o
->a_prefix
;
2030 b_prefix
= o
->b_prefix
;
2033 /* Never use a non-valid filename anywhere if at all possible */
2034 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
2035 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
2037 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
2038 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
2039 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
2040 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
2041 strbuf_addf(&header
, "%s%sdiff --git %s %s%s\n", line_prefix
, set
, a_one
, b_two
, reset
);
2042 if (lbl
[0][0] == '/') {
2044 strbuf_addf(&header
, "%s%snew file mode %06o%s\n", line_prefix
, set
, two
->mode
, reset
);
2046 strbuf_addstr(&header
, xfrm_msg
);
2047 must_show_header
= 1;
2049 else if (lbl
[1][0] == '/') {
2050 strbuf_addf(&header
, "%s%sdeleted file mode %06o%s\n", line_prefix
, set
, one
->mode
, reset
);
2052 strbuf_addstr(&header
, xfrm_msg
);
2053 must_show_header
= 1;
2056 if (one
->mode
!= two
->mode
) {
2057 strbuf_addf(&header
, "%s%sold mode %06o%s\n", line_prefix
, set
, one
->mode
, reset
);
2058 strbuf_addf(&header
, "%s%snew mode %06o%s\n", line_prefix
, set
, two
->mode
, reset
);
2059 must_show_header
= 1;
2062 strbuf_addstr(&header
, xfrm_msg
);
2065 * we do not run diff between different kind
2068 if ((one
->mode
^ two
->mode
) & S_IFMT
)
2069 goto free_ab_and_return
;
2070 if (complete_rewrite
&&
2071 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
2072 (textconv_two
|| !diff_filespec_is_binary(two
))) {
2073 fprintf(o
->file
, "%s", header
.buf
);
2074 strbuf_reset(&header
);
2075 emit_rewrite_diff(name_a
, name_b
, one
, two
,
2076 textconv_one
, textconv_two
, o
);
2077 o
->found_changes
= 1;
2078 goto free_ab_and_return
;
2082 if (o
->irreversible_delete
&& lbl
[1][0] == '/') {
2083 fprintf(o
->file
, "%s", header
.buf
);
2084 strbuf_reset(&header
);
2085 goto free_ab_and_return
;
2086 } else if (!DIFF_OPT_TST(o
, TEXT
) &&
2087 ( (!textconv_one
&& diff_filespec_is_binary(one
)) ||
2088 (!textconv_two
&& diff_filespec_is_binary(two
)) )) {
2089 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2090 die("unable to read files to diff");
2091 /* Quite common confusing case */
2092 if (mf1
.size
== mf2
.size
&&
2093 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
)) {
2094 if (must_show_header
)
2095 fprintf(o
->file
, "%s", header
.buf
);
2096 goto free_ab_and_return
;
2098 fprintf(o
->file
, "%s", header
.buf
);
2099 strbuf_reset(&header
);
2100 if (DIFF_OPT_TST(o
, BINARY
))
2101 emit_binary_diff(o
->file
, &mf1
, &mf2
, line_prefix
);
2103 fprintf(o
->file
, "%sBinary files %s and %s differ\n",
2104 line_prefix
, lbl
[0], lbl
[1]);
2105 o
->found_changes
= 1;
2107 /* Crazy xdl interfaces.. */
2108 const char *diffopts
= getenv("GIT_DIFF_OPTS");
2111 struct emit_callback ecbdata
;
2112 const struct userdiff_funcname
*pe
;
2114 if (!DIFF_XDL_TST(o
, WHITESPACE_FLAGS
) || must_show_header
) {
2115 fprintf(o
->file
, "%s", header
.buf
);
2116 strbuf_reset(&header
);
2119 mf1
.size
= fill_textconv(textconv_one
, one
, &mf1
.ptr
);
2120 mf2
.size
= fill_textconv(textconv_two
, two
, &mf2
.ptr
);
2122 pe
= diff_funcname_pattern(one
);
2124 pe
= diff_funcname_pattern(two
);
2126 memset(&xpp
, 0, sizeof(xpp
));
2127 memset(&xecfg
, 0, sizeof(xecfg
));
2128 memset(&ecbdata
, 0, sizeof(ecbdata
));
2129 ecbdata
.label_path
= lbl
;
2130 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
2131 ecbdata
.found_changesp
= &o
->found_changes
;
2132 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
2133 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
2134 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2136 ecbdata
.header
= header
.len
? &header
: NULL
;
2137 xpp
.flags
= o
->xdl_opts
;
2138 xecfg
.ctxlen
= o
->context
;
2139 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
2140 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2142 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
2145 else if (!prefixcmp(diffopts
, "--unified="))
2146 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
2147 else if (!prefixcmp(diffopts
, "-u"))
2148 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
2152 ecbdata
.diff_words
=
2153 xcalloc(1, sizeof(struct diff_words_data
));
2154 ecbdata
.diff_words
->type
= o
->word_diff
;
2155 ecbdata
.diff_words
->opt
= o
;
2157 o
->word_regex
= userdiff_word_regex(one
);
2159 o
->word_regex
= userdiff_word_regex(two
);
2161 o
->word_regex
= diff_word_regex_cfg
;
2162 if (o
->word_regex
) {
2163 ecbdata
.diff_words
->word_regex
= (regex_t
*)
2164 xmalloc(sizeof(regex_t
));
2165 if (regcomp(ecbdata
.diff_words
->word_regex
,
2167 REG_EXTENDED
| REG_NEWLINE
))
2168 die ("Invalid regular expression: %s",
2171 for (i
= 0; i
< ARRAY_SIZE(diff_words_styles
); i
++) {
2172 if (o
->word_diff
== diff_words_styles
[i
].type
) {
2173 ecbdata
.diff_words
->style
=
2174 &diff_words_styles
[i
];
2178 if (DIFF_OPT_TST(o
, COLOR_DIFF
)) {
2179 struct diff_words_style
*st
= ecbdata
.diff_words
->style
;
2180 st
->old
.color
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
2181 st
->new.color
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
2182 st
->ctx
.color
= diff_get_color_opt(o
, DIFF_PLAIN
);
2185 xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
2188 free_diff_words_data(&ecbdata
);
2193 xdiff_clear_find_func(&xecfg
);
2197 strbuf_release(&header
);
2198 diff_free_filespec_data(one
);
2199 diff_free_filespec_data(two
);
2205 static void builtin_diffstat(const char *name_a
, const char *name_b
,
2206 struct diff_filespec
*one
,
2207 struct diff_filespec
*two
,
2208 struct diffstat_t
*diffstat
,
2209 struct diff_options
*o
,
2210 int complete_rewrite
)
2213 struct diffstat_file
*data
;
2215 data
= diffstat_add(diffstat
, name_a
, name_b
);
2218 data
->is_unmerged
= 1;
2222 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
2223 data
->is_binary
= 1;
2224 data
->added
= diff_filespec_size(two
);
2225 data
->deleted
= diff_filespec_size(one
);
2228 else if (complete_rewrite
) {
2229 diff_populate_filespec(one
, 0);
2230 diff_populate_filespec(two
, 0);
2231 data
->deleted
= count_lines(one
->data
, one
->size
);
2232 data
->added
= count_lines(two
->data
, two
->size
);
2236 /* Crazy xdl interfaces.. */
2240 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2241 die("unable to read files to diff");
2243 memset(&xpp
, 0, sizeof(xpp
));
2244 memset(&xecfg
, 0, sizeof(xecfg
));
2245 xpp
.flags
= o
->xdl_opts
;
2246 xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
2250 diff_free_filespec_data(one
);
2251 diff_free_filespec_data(two
);
2254 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
2255 const char *attr_path
,
2256 struct diff_filespec
*one
,
2257 struct diff_filespec
*two
,
2258 struct diff_options
*o
)
2261 struct checkdiff_t data
;
2266 memset(&data
, 0, sizeof(data
));
2267 data
.filename
= name_b
? name_b
: name_a
;
2270 data
.ws_rule
= whitespace_rule(attr_path
);
2271 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
2273 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
2274 die("unable to read files to diff");
2277 * All the other codepaths check both sides, but not checking
2278 * the "old" side here is deliberate. We are checking the newly
2279 * introduced changes, and as long as the "new" side is text, we
2280 * can and should check what it introduces.
2282 if (diff_filespec_is_binary(two
))
2283 goto free_and_return
;
2285 /* Crazy xdl interfaces.. */
2289 memset(&xpp
, 0, sizeof(xpp
));
2290 memset(&xecfg
, 0, sizeof(xecfg
));
2291 xecfg
.ctxlen
= 1; /* at least one context line */
2293 xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
2296 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
2297 struct emit_callback ecbdata
;
2300 ecbdata
.ws_rule
= data
.ws_rule
;
2301 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
2302 blank_at_eof
= ecbdata
.blank_at_eof_in_postimage
;
2307 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
2308 fprintf(o
->file
, "%s:%d: %s.\n",
2309 data
.filename
, blank_at_eof
, err
);
2310 data
.status
= 1; /* report errors */
2315 diff_free_filespec_data(one
);
2316 diff_free_filespec_data(two
);
2318 DIFF_OPT_SET(o
, CHECK_FAILED
);
2321 struct diff_filespec
*alloc_filespec(const char *path
)
2323 int namelen
= strlen(path
);
2324 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
2326 memset(spec
, 0, sizeof(*spec
));
2327 spec
->path
= (char *)(spec
+ 1);
2328 memcpy(spec
->path
, path
, namelen
+1);
2330 spec
->is_binary
= -1;
2334 void free_filespec(struct diff_filespec
*spec
)
2336 if (!--spec
->count
) {
2337 diff_free_filespec_data(spec
);
2342 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
2343 unsigned short mode
)
2346 spec
->mode
= canon_mode(mode
);
2347 hashcpy(spec
->sha1
, sha1
);
2348 spec
->sha1_valid
= !is_null_sha1(sha1
);
2353 * Given a name and sha1 pair, if the index tells us the file in
2354 * the work tree has that object contents, return true, so that
2355 * prepare_temp_file() does not have to inflate and extract.
2357 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
2359 struct cache_entry
*ce
;
2364 * We do not read the cache ourselves here, because the
2365 * benchmark with my previous version that always reads cache
2366 * shows that it makes things worse for diff-tree comparing
2367 * two linux-2.6 kernel trees in an already checked out work
2368 * tree. This is because most diff-tree comparisons deal with
2369 * only a small number of files, while reading the cache is
2370 * expensive for a large project, and its cost outweighs the
2371 * savings we get by not inflating the object to a temporary
2372 * file. Practically, this code only helps when we are used
2373 * by diff-cache --cached, which does read the cache before
2379 /* We want to avoid the working directory if our caller
2380 * doesn't need the data in a normal file, this system
2381 * is rather slow with its stat/open/mmap/close syscalls,
2382 * and the object is contained in a pack file. The pack
2383 * is probably already open and will be faster to obtain
2384 * the data through than the working directory. Loose
2385 * objects however would tend to be slower as they need
2386 * to be individually opened and inflated.
2388 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
))
2392 pos
= cache_name_pos(name
, len
);
2395 ce
= active_cache
[pos
];
2398 * This is not the sha1 we are looking for, or
2399 * unreusable because it is not a regular file.
2401 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
2405 * If ce is marked as "assume unchanged", there is no
2406 * guarantee that work tree matches what we are looking for.
2408 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
2412 * If ce matches the file in the work tree, we can reuse it.
2414 if (ce_uptodate(ce
) ||
2415 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
2421 static int populate_from_stdin(struct diff_filespec
*s
)
2423 struct strbuf buf
= STRBUF_INIT
;
2426 if (strbuf_read(&buf
, 0, 0) < 0)
2427 return error("error while reading from stdin %s",
2430 s
->should_munmap
= 0;
2431 s
->data
= strbuf_detach(&buf
, &size
);
2437 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
2440 char *data
= xmalloc(100), *dirty
= "";
2442 /* Are we looking at the work tree? */
2443 if (s
->dirty_submodule
)
2446 len
= snprintf(data
, 100,
2447 "Subproject commit %s%s\n", sha1_to_hex(s
->sha1
), dirty
);
2459 * While doing rename detection and pickaxe operation, we may need to
2460 * grab the data for the blob (or file) for our own in-core comparison.
2461 * diff_filespec has data and size fields for this purpose.
2463 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
2466 if (!DIFF_FILE_VALID(s
))
2467 die("internal error: asking to populate invalid file.");
2468 if (S_ISDIR(s
->mode
))
2474 if (size_only
&& 0 < s
->size
)
2477 if (S_ISGITLINK(s
->mode
))
2478 return diff_populate_gitlink(s
, size_only
);
2480 if (!s
->sha1_valid
||
2481 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
2482 struct strbuf buf
= STRBUF_INIT
;
2486 if (!strcmp(s
->path
, "-"))
2487 return populate_from_stdin(s
);
2489 if (lstat(s
->path
, &st
) < 0) {
2490 if (errno
== ENOENT
) {
2494 s
->data
= (char *)"";
2499 s
->size
= xsize_t(st
.st_size
);
2502 if (S_ISLNK(st
.st_mode
)) {
2503 struct strbuf sb
= STRBUF_INIT
;
2505 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
2508 s
->data
= strbuf_detach(&sb
, NULL
);
2514 fd
= open(s
->path
, O_RDONLY
);
2517 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2519 s
->should_munmap
= 1;
2522 * Convert from working tree format to canonical git format
2524 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
2526 munmap(s
->data
, s
->size
);
2527 s
->should_munmap
= 0;
2528 s
->data
= strbuf_detach(&buf
, &size
);
2534 enum object_type type
;
2536 type
= sha1_object_info(s
->sha1
, &s
->size
);
2538 die("unable to read %s", sha1_to_hex(s
->sha1
));
2540 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
2542 die("unable to read %s", sha1_to_hex(s
->sha1
));
2549 void diff_free_filespec_blob(struct diff_filespec
*s
)
2553 else if (s
->should_munmap
)
2554 munmap(s
->data
, s
->size
);
2556 if (s
->should_free
|| s
->should_munmap
) {
2557 s
->should_free
= s
->should_munmap
= 0;
2562 void diff_free_filespec_data(struct diff_filespec
*s
)
2564 diff_free_filespec_blob(s
);
2569 static void prep_temp_blob(const char *path
, struct diff_tempfile
*temp
,
2572 const unsigned char *sha1
,
2576 struct strbuf buf
= STRBUF_INIT
;
2577 struct strbuf
template = STRBUF_INIT
;
2578 char *path_dup
= xstrdup(path
);
2579 const char *base
= basename(path_dup
);
2581 /* Generate "XXXXXX_basename.ext" */
2582 strbuf_addstr(&template, "XXXXXX_");
2583 strbuf_addstr(&template, base
);
2585 fd
= git_mkstemps(temp
->tmp_path
, PATH_MAX
, template.buf
,
2588 die_errno("unable to create temp-file");
2589 if (convert_to_working_tree(path
,
2590 (const char *)blob
, (size_t)size
, &buf
)) {
2594 if (write_in_full(fd
, blob
, size
) != size
)
2595 die_errno("unable to write temp-file");
2597 temp
->name
= temp
->tmp_path
;
2598 strcpy(temp
->hex
, sha1_to_hex(sha1
));
2600 sprintf(temp
->mode
, "%06o", mode
);
2601 strbuf_release(&buf
);
2602 strbuf_release(&template);
2606 static struct diff_tempfile
*prepare_temp_file(const char *name
,
2607 struct diff_filespec
*one
)
2609 struct diff_tempfile
*temp
= claim_diff_tempfile();
2611 if (!DIFF_FILE_VALID(one
)) {
2613 /* A '-' entry produces this for file-2, and
2614 * a '+' entry produces this for file-1.
2616 temp
->name
= "/dev/null";
2617 strcpy(temp
->hex
, ".");
2618 strcpy(temp
->mode
, ".");
2622 if (!remove_tempfile_installed
) {
2623 atexit(remove_tempfile
);
2624 sigchain_push_common(remove_tempfile_on_signal
);
2625 remove_tempfile_installed
= 1;
2628 if (!one
->sha1_valid
||
2629 reuse_worktree_file(name
, one
->sha1
, 1)) {
2631 if (lstat(name
, &st
) < 0) {
2632 if (errno
== ENOENT
)
2633 goto not_a_valid_file
;
2634 die_errno("stat(%s)", name
);
2636 if (S_ISLNK(st
.st_mode
)) {
2637 struct strbuf sb
= STRBUF_INIT
;
2638 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
2639 die_errno("readlink(%s)", name
);
2640 prep_temp_blob(name
, temp
, sb
.buf
, sb
.len
,
2642 one
->sha1
: null_sha1
),
2644 one
->mode
: S_IFLNK
));
2645 strbuf_release(&sb
);
2648 /* we can borrow from the file in the work tree */
2650 if (!one
->sha1_valid
)
2651 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
2653 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
2654 /* Even though we may sometimes borrow the
2655 * contents from the work tree, we always want
2656 * one->mode. mode is trustworthy even when
2657 * !(one->sha1_valid), as long as
2658 * DIFF_FILE_VALID(one).
2660 sprintf(temp
->mode
, "%06o", one
->mode
);
2665 if (diff_populate_filespec(one
, 0))
2666 die("cannot read data blob for %s", one
->path
);
2667 prep_temp_blob(name
, temp
, one
->data
, one
->size
,
2668 one
->sha1
, one
->mode
);
2673 /* An external diff command takes:
2675 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2676 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2679 static void run_external_diff(const char *pgm
,
2682 struct diff_filespec
*one
,
2683 struct diff_filespec
*two
,
2684 const char *xfrm_msg
,
2685 int complete_rewrite
)
2687 const char *spawn_arg
[10];
2689 const char **arg
= &spawn_arg
[0];
2692 struct diff_tempfile
*temp_one
, *temp_two
;
2693 const char *othername
= (other
? other
: name
);
2694 temp_one
= prepare_temp_file(name
, one
);
2695 temp_two
= prepare_temp_file(othername
, two
);
2698 *arg
++ = temp_one
->name
;
2699 *arg
++ = temp_one
->hex
;
2700 *arg
++ = temp_one
->mode
;
2701 *arg
++ = temp_two
->name
;
2702 *arg
++ = temp_two
->hex
;
2703 *arg
++ = temp_two
->mode
;
2714 retval
= run_command_v_opt(spawn_arg
, RUN_USING_SHELL
);
2717 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2722 static int similarity_index(struct diff_filepair
*p
)
2724 return p
->score
* 100 / MAX_SCORE
;
2727 static void fill_metainfo(struct strbuf
*msg
,
2730 struct diff_filespec
*one
,
2731 struct diff_filespec
*two
,
2732 struct diff_options
*o
,
2733 struct diff_filepair
*p
,
2734 int *must_show_header
,
2737 const char *set
= diff_get_color(use_color
, DIFF_METAINFO
);
2738 const char *reset
= diff_get_color(use_color
, DIFF_RESET
);
2739 struct strbuf
*msgbuf
;
2740 char *line_prefix
= "";
2742 *must_show_header
= 1;
2743 if (o
->output_prefix
) {
2744 msgbuf
= o
->output_prefix(o
, o
->output_prefix_data
);
2745 line_prefix
= msgbuf
->buf
;
2747 strbuf_init(msg
, PATH_MAX
* 2 + 300);
2748 switch (p
->status
) {
2749 case DIFF_STATUS_COPIED
:
2750 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2751 line_prefix
, set
, similarity_index(p
));
2752 strbuf_addf(msg
, "%s\n%s%scopy from ",
2753 reset
, line_prefix
, set
);
2754 quote_c_style(name
, msg
, NULL
, 0);
2755 strbuf_addf(msg
, "%s\n%s%scopy to ", reset
, line_prefix
, set
);
2756 quote_c_style(other
, msg
, NULL
, 0);
2757 strbuf_addf(msg
, "%s\n", reset
);
2759 case DIFF_STATUS_RENAMED
:
2760 strbuf_addf(msg
, "%s%ssimilarity index %d%%",
2761 line_prefix
, set
, similarity_index(p
));
2762 strbuf_addf(msg
, "%s\n%s%srename from ",
2763 reset
, line_prefix
, set
);
2764 quote_c_style(name
, msg
, NULL
, 0);
2765 strbuf_addf(msg
, "%s\n%s%srename to ",
2766 reset
, line_prefix
, set
);
2767 quote_c_style(other
, msg
, NULL
, 0);
2768 strbuf_addf(msg
, "%s\n", reset
);
2770 case DIFF_STATUS_MODIFIED
:
2772 strbuf_addf(msg
, "%s%sdissimilarity index %d%%%s\n",
2774 set
, similarity_index(p
), reset
);
2779 *must_show_header
= 0;
2781 if (one
&& two
&& hashcmp(one
->sha1
, two
->sha1
)) {
2782 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2784 if (DIFF_OPT_TST(o
, BINARY
)) {
2786 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2787 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2790 strbuf_addf(msg
, "%s%sindex %s..", line_prefix
, set
,
2791 find_unique_abbrev(one
->sha1
, abbrev
));
2792 strbuf_addstr(msg
, find_unique_abbrev(two
->sha1
, abbrev
));
2793 if (one
->mode
== two
->mode
)
2794 strbuf_addf(msg
, " %06o", one
->mode
);
2795 strbuf_addf(msg
, "%s\n", reset
);
2799 static void run_diff_cmd(const char *pgm
,
2802 const char *attr_path
,
2803 struct diff_filespec
*one
,
2804 struct diff_filespec
*two
,
2806 struct diff_options
*o
,
2807 struct diff_filepair
*p
)
2809 const char *xfrm_msg
= NULL
;
2810 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
2811 int must_show_header
= 0;
2813 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2816 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
2817 if (drv
&& drv
->external
)
2818 pgm
= drv
->external
;
2823 * don't use colors when the header is intended for an
2824 * external diff driver
2826 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
,
2828 DIFF_OPT_TST(o
, COLOR_DIFF
) && !pgm
);
2829 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
2833 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2838 builtin_diff(name
, other
? other
: name
,
2839 one
, two
, xfrm_msg
, must_show_header
,
2840 o
, complete_rewrite
);
2842 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2845 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2847 if (DIFF_FILE_VALID(one
)) {
2848 if (!one
->sha1_valid
) {
2850 if (!strcmp(one
->path
, "-")) {
2851 hashcpy(one
->sha1
, null_sha1
);
2854 if (lstat(one
->path
, &st
) < 0)
2855 die_errno("stat '%s'", one
->path
);
2856 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2857 die("cannot hash %s", one
->path
);
2864 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2866 /* Strip the prefix but do not molest /dev/null and absolute paths */
2867 if (*namep
&& **namep
!= '/') {
2868 *namep
+= prefix_length
;
2872 if (*otherp
&& **otherp
!= '/') {
2873 *otherp
+= prefix_length
;
2874 if (**otherp
== '/')
2879 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2881 const char *pgm
= external_diff();
2883 struct diff_filespec
*one
= p
->one
;
2884 struct diff_filespec
*two
= p
->two
;
2887 const char *attr_path
;
2889 name
= p
->one
->path
;
2890 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2892 if (o
->prefix_length
)
2893 strip_prefix(o
->prefix_length
, &name
, &other
);
2895 if (DIFF_PAIR_UNMERGED(p
)) {
2896 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2897 NULL
, NULL
, NULL
, o
, p
);
2901 diff_fill_sha1_info(one
);
2902 diff_fill_sha1_info(two
);
2905 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2906 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2908 * a filepair that changes between file and symlink
2909 * needs to be split into deletion and creation.
2911 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2912 run_diff_cmd(NULL
, name
, other
, attr_path
,
2913 one
, null
, &msg
, o
, p
);
2915 strbuf_release(&msg
);
2917 null
= alloc_filespec(one
->path
);
2918 run_diff_cmd(NULL
, name
, other
, attr_path
,
2919 null
, two
, &msg
, o
, p
);
2923 run_diff_cmd(pgm
, name
, other
, attr_path
,
2924 one
, two
, &msg
, o
, p
);
2926 strbuf_release(&msg
);
2929 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2930 struct diffstat_t
*diffstat
)
2934 int complete_rewrite
= 0;
2936 if (DIFF_PAIR_UNMERGED(p
)) {
2938 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2942 name
= p
->one
->path
;
2943 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2945 if (o
->prefix_length
)
2946 strip_prefix(o
->prefix_length
, &name
, &other
);
2948 diff_fill_sha1_info(p
->one
);
2949 diff_fill_sha1_info(p
->two
);
2951 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2952 complete_rewrite
= 1;
2953 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2956 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2960 const char *attr_path
;
2962 if (DIFF_PAIR_UNMERGED(p
)) {
2967 name
= p
->one
->path
;
2968 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2969 attr_path
= other
? other
: name
;
2971 if (o
->prefix_length
)
2972 strip_prefix(o
->prefix_length
, &name
, &other
);
2974 diff_fill_sha1_info(p
->one
);
2975 diff_fill_sha1_info(p
->two
);
2977 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2980 void diff_setup(struct diff_options
*options
)
2982 memcpy(options
, &default_diff_options
, sizeof(*options
));
2984 options
->file
= stdout
;
2986 options
->line_termination
= '\n';
2987 options
->break_opt
= -1;
2988 options
->rename_limit
= -1;
2989 options
->dirstat_permille
= diff_dirstat_permille_default
;
2990 options
->context
= 3;
2992 options
->change
= diff_change
;
2993 options
->add_remove
= diff_addremove
;
2994 if (diff_use_color_default
> 0)
2995 DIFF_OPT_SET(options
, COLOR_DIFF
);
2996 options
->detect_rename
= diff_detect_rename_default
;
2998 if (diff_no_prefix
) {
2999 options
->a_prefix
= options
->b_prefix
= "";
3000 } else if (!diff_mnemonic_prefix
) {
3001 options
->a_prefix
= "a/";
3002 options
->b_prefix
= "b/";
3006 int diff_setup_done(struct diff_options
*options
)
3010 if (options
->output_format
& DIFF_FORMAT_NAME
)
3012 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
3014 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
3016 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
3019 die("--name-only, --name-status, --check and -s are mutually exclusive");
3022 * Most of the time we can say "there are changes"
3023 * only by checking if there are changed paths, but
3024 * --ignore-whitespace* options force us to look
3028 if (DIFF_XDL_TST(options
, IGNORE_WHITESPACE
) ||
3029 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_CHANGE
) ||
3030 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_AT_EOL
))
3031 DIFF_OPT_SET(options
, DIFF_FROM_CONTENTS
);
3033 DIFF_OPT_CLR(options
, DIFF_FROM_CONTENTS
);
3035 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3036 options
->detect_rename
= DIFF_DETECT_COPY
;
3038 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
3039 options
->prefix
= NULL
;
3040 if (options
->prefix
)
3041 options
->prefix_length
= strlen(options
->prefix
);
3043 options
->prefix_length
= 0;
3045 if (options
->output_format
& (DIFF_FORMAT_NAME
|
3046 DIFF_FORMAT_NAME_STATUS
|
3047 DIFF_FORMAT_CHECKDIFF
|
3048 DIFF_FORMAT_NO_OUTPUT
))
3049 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
3050 DIFF_FORMAT_NUMSTAT
|
3051 DIFF_FORMAT_DIFFSTAT
|
3052 DIFF_FORMAT_SHORTSTAT
|
3053 DIFF_FORMAT_DIRSTAT
|
3054 DIFF_FORMAT_SUMMARY
|
3058 * These cases always need recursive; we do not drop caller-supplied
3059 * recursive bits for other formats here.
3061 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
3062 DIFF_FORMAT_NUMSTAT
|
3063 DIFF_FORMAT_DIFFSTAT
|
3064 DIFF_FORMAT_SHORTSTAT
|
3065 DIFF_FORMAT_DIRSTAT
|
3066 DIFF_FORMAT_SUMMARY
|
3067 DIFF_FORMAT_CHECKDIFF
))
3068 DIFF_OPT_SET(options
, RECURSIVE
);
3070 * Also pickaxe would not work very well if you do not say recursive
3072 if (options
->pickaxe
)
3073 DIFF_OPT_SET(options
, RECURSIVE
);
3075 * When patches are generated, submodules diffed against the work tree
3076 * must be checked for dirtiness too so it can be shown in the output
3078 if (options
->output_format
& DIFF_FORMAT_PATCH
)
3079 DIFF_OPT_SET(options
, DIRTY_SUBMODULES
);
3081 if (options
->detect_rename
&& options
->rename_limit
< 0)
3082 options
->rename_limit
= diff_rename_limit_default
;
3083 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
3085 /* read-cache does not die even when it fails
3086 * so it is safe for us to do this here. Also
3087 * it does not smudge active_cache or active_nr
3088 * when it fails, so we do not have to worry about
3089 * cleaning it up ourselves either.
3093 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
3094 options
->abbrev
= 40; /* full */
3097 * It does not make sense to show the first hit we happened
3098 * to have found. It does not make sense not to return with
3099 * exit code in such a case either.
3101 if (DIFF_OPT_TST(options
, QUICK
)) {
3102 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
3103 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3109 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
3119 if (c
== arg_short
) {
3123 if (val
&& isdigit(c
)) {
3125 int n
= strtoul(arg
, &end
, 10);
3136 eq
= strchr(arg
, '=');
3141 if (!len
|| strncmp(arg
, arg_long
, len
))
3146 if (!isdigit(*++eq
))
3148 n
= strtoul(eq
, &end
, 10);
3156 static int diff_scoreopt_parse(const char *opt
);
3158 static inline int short_opt(char opt
, const char **argv
,
3159 const char **optarg
)
3161 const char *arg
= argv
[0];
3162 if (arg
[0] != '-' || arg
[1] != opt
)
3164 if (arg
[2] != '\0') {
3169 die("Option '%c' requires a value", opt
);
3174 int parse_long_opt(const char *opt
, const char **argv
,
3175 const char **optarg
)
3177 const char *arg
= argv
[0];
3178 if (arg
[0] != '-' || arg
[1] != '-')
3180 arg
+= strlen("--");
3181 if (prefixcmp(arg
, opt
))
3184 if (*arg
== '=') { /* sticked form: --option=value */
3190 /* separate form: --option value */
3192 die("Option '--%s' requires a value", opt
);
3197 static int stat_opt(struct diff_options
*options
, const char **av
)
3199 const char *arg
= av
[0];
3201 int width
= options
->stat_width
;
3202 int name_width
= options
->stat_name_width
;
3205 arg
+= strlen("--stat");
3210 if (!prefixcmp(arg
, "-width")) {
3211 arg
+= strlen("-width");
3213 width
= strtoul(arg
+ 1, &end
, 10);
3214 else if (!*arg
&& !av
[1])
3215 die("Option '--stat-width' requires a value");
3217 width
= strtoul(av
[1], &end
, 10);
3220 } else if (!prefixcmp(arg
, "-name-width")) {
3221 arg
+= strlen("-name-width");
3223 name_width
= strtoul(arg
+ 1, &end
, 10);
3224 else if (!*arg
&& !av
[1])
3225 die("Option '--stat-name-width' requires a value");
3227 name_width
= strtoul(av
[1], &end
, 10);
3233 width
= strtoul(arg
+1, &end
, 10);
3235 name_width
= strtoul(end
+1, &end
, 10);
3238 /* Important! This checks all the error cases! */
3241 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
3242 options
->stat_name_width
= name_width
;
3243 options
->stat_width
= width
;
3247 static int parse_dirstat_opt(struct diff_options
*options
, const char *params
)
3249 struct strbuf errmsg
= STRBUF_INIT
;
3250 if (parse_dirstat_params(options
, params
, &errmsg
))
3251 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3253 strbuf_release(&errmsg
);
3255 * The caller knows a dirstat-related option is given from the command
3256 * line; allow it to say "return this_function();"
3258 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
3262 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
3264 const char *arg
= av
[0];
3268 /* Output format options */
3269 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch"))
3270 options
->output_format
|= DIFF_FORMAT_PATCH
;
3271 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
3272 options
->output_format
|= DIFF_FORMAT_PATCH
;
3273 else if (!strcmp(arg
, "--raw"))
3274 options
->output_format
|= DIFF_FORMAT_RAW
;
3275 else if (!strcmp(arg
, "--patch-with-raw"))
3276 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
3277 else if (!strcmp(arg
, "--numstat"))
3278 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
3279 else if (!strcmp(arg
, "--shortstat"))
3280 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
3281 else if (!strcmp(arg
, "-X") || !strcmp(arg
, "--dirstat"))
3282 return parse_dirstat_opt(options
, "");
3283 else if (!prefixcmp(arg
, "-X"))
3284 return parse_dirstat_opt(options
, arg
+ 2);
3285 else if (!prefixcmp(arg
, "--dirstat="))
3286 return parse_dirstat_opt(options
, arg
+ 10);
3287 else if (!strcmp(arg
, "--cumulative"))
3288 return parse_dirstat_opt(options
, "cumulative");
3289 else if (!strcmp(arg
, "--dirstat-by-file"))
3290 return parse_dirstat_opt(options
, "files");
3291 else if (!prefixcmp(arg
, "--dirstat-by-file=")) {
3292 parse_dirstat_opt(options
, "files");
3293 return parse_dirstat_opt(options
, arg
+ 18);
3295 else if (!strcmp(arg
, "--check"))
3296 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
3297 else if (!strcmp(arg
, "--summary"))
3298 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
3299 else if (!strcmp(arg
, "--patch-with-stat"))
3300 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
3301 else if (!strcmp(arg
, "--name-only"))
3302 options
->output_format
|= DIFF_FORMAT_NAME
;
3303 else if (!strcmp(arg
, "--name-status"))
3304 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
3305 else if (!strcmp(arg
, "-s"))
3306 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
3307 else if (!prefixcmp(arg
, "--stat"))
3308 /* --stat, --stat-width, or --stat-name-width */
3309 return stat_opt(options
, av
);
3311 /* renames options */
3312 else if (!prefixcmp(arg
, "-B") || !prefixcmp(arg
, "--break-rewrites=") ||
3313 !strcmp(arg
, "--break-rewrites")) {
3314 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
3315 return error("invalid argument to -B: %s", arg
+2);
3317 else if (!prefixcmp(arg
, "-M") || !prefixcmp(arg
, "--find-renames=") ||
3318 !strcmp(arg
, "--find-renames")) {
3319 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3320 return error("invalid argument to -M: %s", arg
+2);
3321 options
->detect_rename
= DIFF_DETECT_RENAME
;
3323 else if (!strcmp(arg
, "-D") || !strcmp(arg
, "--irreversible-delete")) {
3324 options
->irreversible_delete
= 1;
3326 else if (!prefixcmp(arg
, "-C") || !prefixcmp(arg
, "--find-copies=") ||
3327 !strcmp(arg
, "--find-copies")) {
3328 if (options
->detect_rename
== DIFF_DETECT_COPY
)
3329 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3330 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
3331 return error("invalid argument to -C: %s", arg
+2);
3332 options
->detect_rename
= DIFF_DETECT_COPY
;
3334 else if (!strcmp(arg
, "--no-renames"))
3335 options
->detect_rename
= 0;
3336 else if (!strcmp(arg
, "--relative"))
3337 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3338 else if (!prefixcmp(arg
, "--relative=")) {
3339 DIFF_OPT_SET(options
, RELATIVE_NAME
);
3340 options
->prefix
= arg
+ 11;
3344 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
3345 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
3346 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
3347 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
3348 else if (!strcmp(arg
, "--ignore-space-at-eol"))
3349 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
3350 else if (!strcmp(arg
, "--patience"))
3351 DIFF_XDL_SET(options
, PATIENCE_DIFF
);
3354 else if (!strcmp(arg
, "--binary")) {
3355 options
->output_format
|= DIFF_FORMAT_PATCH
;
3356 DIFF_OPT_SET(options
, BINARY
);
3358 else if (!strcmp(arg
, "--full-index"))
3359 DIFF_OPT_SET(options
, FULL_INDEX
);
3360 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
3361 DIFF_OPT_SET(options
, TEXT
);
3362 else if (!strcmp(arg
, "-R"))
3363 DIFF_OPT_SET(options
, REVERSE_DIFF
);
3364 else if (!strcmp(arg
, "--find-copies-harder"))
3365 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
3366 else if (!strcmp(arg
, "--follow"))
3367 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
3368 else if (!strcmp(arg
, "--color"))
3369 DIFF_OPT_SET(options
, COLOR_DIFF
);
3370 else if (!prefixcmp(arg
, "--color=")) {
3371 int value
= git_config_colorbool(NULL
, arg
+8, -1);
3373 DIFF_OPT_CLR(options
, COLOR_DIFF
);
3375 DIFF_OPT_SET(options
, COLOR_DIFF
);
3377 return error("option `color' expects \"always\", \"auto\", or \"never\"");
3379 else if (!strcmp(arg
, "--no-color"))
3380 DIFF_OPT_CLR(options
, COLOR_DIFF
);
3381 else if (!strcmp(arg
, "--color-words")) {
3382 DIFF_OPT_SET(options
, COLOR_DIFF
);
3383 options
->word_diff
= DIFF_WORDS_COLOR
;
3385 else if (!prefixcmp(arg
, "--color-words=")) {
3386 DIFF_OPT_SET(options
, COLOR_DIFF
);
3387 options
->word_diff
= DIFF_WORDS_COLOR
;
3388 options
->word_regex
= arg
+ 14;
3390 else if (!strcmp(arg
, "--word-diff")) {
3391 if (options
->word_diff
== DIFF_WORDS_NONE
)
3392 options
->word_diff
= DIFF_WORDS_PLAIN
;
3394 else if (!prefixcmp(arg
, "--word-diff=")) {
3395 const char *type
= arg
+ 12;
3396 if (!strcmp(type
, "plain"))
3397 options
->word_diff
= DIFF_WORDS_PLAIN
;
3398 else if (!strcmp(type
, "color")) {
3399 DIFF_OPT_SET(options
, COLOR_DIFF
);
3400 options
->word_diff
= DIFF_WORDS_COLOR
;
3402 else if (!strcmp(type
, "porcelain"))
3403 options
->word_diff
= DIFF_WORDS_PORCELAIN
;
3404 else if (!strcmp(type
, "none"))
3405 options
->word_diff
= DIFF_WORDS_NONE
;
3407 die("bad --word-diff argument: %s", type
);
3409 else if ((argcount
= parse_long_opt("word-diff-regex", av
, &optarg
))) {
3410 if (options
->word_diff
== DIFF_WORDS_NONE
)
3411 options
->word_diff
= DIFF_WORDS_PLAIN
;
3412 options
->word_regex
= optarg
;
3415 else if (!strcmp(arg
, "--exit-code"))
3416 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
3417 else if (!strcmp(arg
, "--quiet"))
3418 DIFF_OPT_SET(options
, QUICK
);
3419 else if (!strcmp(arg
, "--ext-diff"))
3420 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
3421 else if (!strcmp(arg
, "--no-ext-diff"))
3422 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
3423 else if (!strcmp(arg
, "--textconv"))
3424 DIFF_OPT_SET(options
, ALLOW_TEXTCONV
);
3425 else if (!strcmp(arg
, "--no-textconv"))
3426 DIFF_OPT_CLR(options
, ALLOW_TEXTCONV
);
3427 else if (!strcmp(arg
, "--ignore-submodules")) {
3428 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3429 handle_ignore_submodules_arg(options
, "all");
3430 } else if (!prefixcmp(arg
, "--ignore-submodules=")) {
3431 DIFF_OPT_SET(options
, OVERRIDE_SUBMODULE_CONFIG
);
3432 handle_ignore_submodules_arg(options
, arg
+ 20);
3433 } else if (!strcmp(arg
, "--submodule"))
3434 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
3435 else if (!prefixcmp(arg
, "--submodule=")) {
3436 if (!strcmp(arg
+ 12, "log"))
3437 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
3441 else if (!strcmp(arg
, "-z"))
3442 options
->line_termination
= 0;
3443 else if ((argcount
= short_opt('l', av
, &optarg
))) {
3444 options
->rename_limit
= strtoul(optarg
, NULL
, 10);
3447 else if ((argcount
= short_opt('S', av
, &optarg
))) {
3448 options
->pickaxe
= optarg
;
3449 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_S
;
3451 } else if ((argcount
= short_opt('G', av
, &optarg
))) {
3452 options
->pickaxe
= optarg
;
3453 options
->pickaxe_opts
|= DIFF_PICKAXE_KIND_G
;
3456 else if (!strcmp(arg
, "--pickaxe-all"))
3457 options
->pickaxe_opts
|= DIFF_PICKAXE_ALL
;
3458 else if (!strcmp(arg
, "--pickaxe-regex"))
3459 options
->pickaxe_opts
|= DIFF_PICKAXE_REGEX
;
3460 else if ((argcount
= short_opt('O', av
, &optarg
))) {
3461 options
->orderfile
= optarg
;
3464 else if ((argcount
= parse_long_opt("diff-filter", av
, &optarg
))) {
3465 options
->filter
= optarg
;
3468 else if (!strcmp(arg
, "--abbrev"))
3469 options
->abbrev
= DEFAULT_ABBREV
;
3470 else if (!prefixcmp(arg
, "--abbrev=")) {
3471 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
3472 if (options
->abbrev
< MINIMUM_ABBREV
)
3473 options
->abbrev
= MINIMUM_ABBREV
;
3474 else if (40 < options
->abbrev
)
3475 options
->abbrev
= 40;
3477 else if ((argcount
= parse_long_opt("src-prefix", av
, &optarg
))) {
3478 options
->a_prefix
= optarg
;
3481 else if ((argcount
= parse_long_opt("dst-prefix", av
, &optarg
))) {
3482 options
->b_prefix
= optarg
;
3485 else if (!strcmp(arg
, "--no-prefix"))
3486 options
->a_prefix
= options
->b_prefix
= "";
3487 else if (opt_arg(arg
, '\0', "inter-hunk-context",
3488 &options
->interhunkcontext
))
3490 else if ((argcount
= parse_long_opt("output", av
, &optarg
))) {
3491 options
->file
= fopen(optarg
, "w");
3493 die_errno("Could not open '%s'", optarg
);
3494 options
->close_file
= 1;
3501 int parse_rename_score(const char **cp_p
)
3503 unsigned long num
, scale
;
3505 const char *cp
= *cp_p
;
3512 if ( !dot
&& ch
== '.' ) {
3515 } else if ( ch
== '%' ) {
3516 scale
= dot
? scale
*100 : 100;
3517 cp
++; /* % is always at the end */
3519 } else if ( ch
>= '0' && ch
<= '9' ) {
3520 if ( scale
< 100000 ) {
3522 num
= (num
*10) + (ch
-'0');
3531 /* user says num divided by scale and we say internally that
3532 * is MAX_SCORE * num / scale.
3534 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
3537 static int diff_scoreopt_parse(const char *opt
)
3539 int opt1
, opt2
, cmd
;
3545 /* convert the long-form arguments into short-form versions */
3546 if (!prefixcmp(opt
, "break-rewrites")) {
3547 opt
+= strlen("break-rewrites");
3548 if (*opt
== 0 || *opt
++ == '=')
3550 } else if (!prefixcmp(opt
, "find-copies")) {
3551 opt
+= strlen("find-copies");
3552 if (*opt
== 0 || *opt
++ == '=')
3554 } else if (!prefixcmp(opt
, "find-renames")) {
3555 opt
+= strlen("find-renames");
3556 if (*opt
== 0 || *opt
++ == '=')
3560 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
3561 return -1; /* that is not a -M, -C nor -B option */
3563 opt1
= parse_rename_score(&opt
);
3569 else if (*opt
!= '/')
3570 return -1; /* we expect -B80/99 or -B80 */
3573 opt2
= parse_rename_score(&opt
);
3578 return opt1
| (opt2
<< 16);
3581 struct diff_queue_struct diff_queued_diff
;
3583 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
3585 if (queue
->alloc
<= queue
->nr
) {
3586 queue
->alloc
= alloc_nr(queue
->alloc
);
3587 queue
->queue
= xrealloc(queue
->queue
,
3588 sizeof(dp
) * queue
->alloc
);
3590 queue
->queue
[queue
->nr
++] = dp
;
3593 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
3594 struct diff_filespec
*one
,
3595 struct diff_filespec
*two
)
3597 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
3605 void diff_free_filepair(struct diff_filepair
*p
)
3607 free_filespec(p
->one
);
3608 free_filespec(p
->two
);
3612 /* This is different from find_unique_abbrev() in that
3613 * it stuffs the result with dots for alignment.
3615 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
3620 return sha1_to_hex(sha1
);
3622 abbrev
= find_unique_abbrev(sha1
, len
);
3623 abblen
= strlen(abbrev
);
3625 static char hex
[41];
3626 if (len
< abblen
&& abblen
<= len
+ 2)
3627 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
3629 sprintf(hex
, "%s...", abbrev
);
3632 return sha1_to_hex(sha1
);
3635 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
3637 int line_termination
= opt
->line_termination
;
3638 int inter_name_termination
= line_termination
? '\t' : '\0';
3639 if (opt
->output_prefix
) {
3640 struct strbuf
*msg
= NULL
;
3641 msg
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
3642 fprintf(opt
->file
, "%s", msg
->buf
);
3645 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
3646 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
3647 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
3648 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
3651 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
3652 inter_name_termination
);
3654 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
3657 if (p
->status
== DIFF_STATUS_COPIED
||
3658 p
->status
== DIFF_STATUS_RENAMED
) {
3659 const char *name_a
, *name_b
;
3660 name_a
= p
->one
->path
;
3661 name_b
= p
->two
->path
;
3662 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3663 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
3664 write_name_quoted(name_b
, opt
->file
, line_termination
);
3666 const char *name_a
, *name_b
;
3667 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
3669 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3670 write_name_quoted(name_a
, opt
->file
, line_termination
);
3674 int diff_unmodified_pair(struct diff_filepair
*p
)
3676 /* This function is written stricter than necessary to support
3677 * the currently implemented transformers, but the idea is to
3678 * let transformers to produce diff_filepairs any way they want,
3679 * and filter and clean them up here before producing the output.
3681 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
3683 if (DIFF_PAIR_UNMERGED(p
))
3684 return 0; /* unmerged is interesting */
3686 /* deletion, addition, mode or type change
3687 * and rename are all interesting.
3689 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
3690 DIFF_PAIR_MODE_CHANGED(p
) ||
3691 strcmp(one
->path
, two
->path
))
3694 /* both are valid and point at the same path. that is, we are
3695 * dealing with a change.
3697 if (one
->sha1_valid
&& two
->sha1_valid
&&
3698 !hashcmp(one
->sha1
, two
->sha1
) &&
3699 !one
->dirty_submodule
&& !two
->dirty_submodule
)
3700 return 1; /* no change */
3701 if (!one
->sha1_valid
&& !two
->sha1_valid
)
3702 return 1; /* both look at the same file on the filesystem. */
3706 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
3708 if (diff_unmodified_pair(p
))
3711 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3712 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3713 return; /* no tree diffs in patch format */
3718 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
3719 struct diffstat_t
*diffstat
)
3721 if (diff_unmodified_pair(p
))
3724 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3725 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3726 return; /* no useful stat for tree diffs */
3728 run_diffstat(p
, o
, diffstat
);
3731 static void diff_flush_checkdiff(struct diff_filepair
*p
,
3732 struct diff_options
*o
)
3734 if (diff_unmodified_pair(p
))
3737 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3738 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3739 return; /* nothing to check in tree diffs */
3741 run_checkdiff(p
, o
);
3744 int diff_queue_is_empty(void)
3746 struct diff_queue_struct
*q
= &diff_queued_diff
;
3748 for (i
= 0; i
< q
->nr
; i
++)
3749 if (!diff_unmodified_pair(q
->queue
[i
]))
3755 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
3757 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
3760 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
3762 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
3763 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
3765 s
->size
, s
->xfrm_flags
);
3768 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
3770 diff_debug_filespec(p
->one
, i
, "one");
3771 diff_debug_filespec(p
->two
, i
, "two");
3772 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
3773 p
->score
, p
->status
? p
->status
: '?',
3774 p
->one
->rename_used
, p
->broken_pair
);
3777 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
3781 fprintf(stderr
, "%s\n", msg
);
3782 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
3783 for (i
= 0; i
< q
->nr
; i
++) {
3784 struct diff_filepair
*p
= q
->queue
[i
];
3785 diff_debug_filepair(p
, i
);
3790 static void diff_resolve_rename_copy(void)
3793 struct diff_filepair
*p
;
3794 struct diff_queue_struct
*q
= &diff_queued_diff
;
3796 diff_debug_queue("resolve-rename-copy", q
);
3798 for (i
= 0; i
< q
->nr
; i
++) {
3800 p
->status
= 0; /* undecided */
3801 if (DIFF_PAIR_UNMERGED(p
))
3802 p
->status
= DIFF_STATUS_UNMERGED
;
3803 else if (!DIFF_FILE_VALID(p
->one
))
3804 p
->status
= DIFF_STATUS_ADDED
;
3805 else if (!DIFF_FILE_VALID(p
->two
))
3806 p
->status
= DIFF_STATUS_DELETED
;
3807 else if (DIFF_PAIR_TYPE_CHANGED(p
))
3808 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
3810 /* from this point on, we are dealing with a pair
3811 * whose both sides are valid and of the same type, i.e.
3812 * either in-place edit or rename/copy edit.
3814 else if (DIFF_PAIR_RENAME(p
)) {
3816 * A rename might have re-connected a broken
3817 * pair up, causing the pathnames to be the
3818 * same again. If so, that's not a rename at
3819 * all, just a modification..
3821 * Otherwise, see if this source was used for
3822 * multiple renames, in which case we decrement
3823 * the count, and call it a copy.
3825 if (!strcmp(p
->one
->path
, p
->two
->path
))
3826 p
->status
= DIFF_STATUS_MODIFIED
;
3827 else if (--p
->one
->rename_used
> 0)
3828 p
->status
= DIFF_STATUS_COPIED
;
3830 p
->status
= DIFF_STATUS_RENAMED
;
3832 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
3833 p
->one
->mode
!= p
->two
->mode
||
3834 p
->one
->dirty_submodule
||
3835 p
->two
->dirty_submodule
||
3836 is_null_sha1(p
->one
->sha1
))
3837 p
->status
= DIFF_STATUS_MODIFIED
;
3839 /* This is a "no-change" entry and should not
3840 * happen anymore, but prepare for broken callers.
3842 error("feeding unmodified %s to diffcore",
3844 p
->status
= DIFF_STATUS_UNKNOWN
;
3847 diff_debug_queue("resolve-rename-copy done", q
);
3850 static int check_pair_status(struct diff_filepair
*p
)
3852 switch (p
->status
) {
3853 case DIFF_STATUS_UNKNOWN
:
3856 die("internal error in diff-resolve-rename-copy");
3862 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
3864 int fmt
= opt
->output_format
;
3866 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
3867 diff_flush_checkdiff(p
, opt
);
3868 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
3869 diff_flush_raw(p
, opt
);
3870 else if (fmt
& DIFF_FORMAT_NAME
) {
3871 const char *name_a
, *name_b
;
3872 name_a
= p
->two
->path
;
3874 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3875 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
3879 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
3882 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
3884 fprintf(file
, " %s ", newdelete
);
3885 write_name_quoted(fs
->path
, file
, '\n');
3889 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
,
3890 const char *line_prefix
)
3892 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
3893 fprintf(file
, "%s mode change %06o => %06o%c", line_prefix
, p
->one
->mode
,
3894 p
->two
->mode
, show_name
? ' ' : '\n');
3896 write_name_quoted(p
->two
->path
, file
, '\n');
3901 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
,
3902 const char *line_prefix
)
3904 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
3906 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
3908 show_mode_change(file
, p
, 0, line_prefix
);
3911 static void diff_summary(struct diff_options
*opt
, struct diff_filepair
*p
)
3913 FILE *file
= opt
->file
;
3914 char *line_prefix
= "";
3916 if (opt
->output_prefix
) {
3917 struct strbuf
*buf
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
3918 line_prefix
= buf
->buf
;
3922 case DIFF_STATUS_DELETED
:
3923 fputs(line_prefix
, file
);
3924 show_file_mode_name(file
, "delete", p
->one
);
3926 case DIFF_STATUS_ADDED
:
3927 fputs(line_prefix
, file
);
3928 show_file_mode_name(file
, "create", p
->two
);
3930 case DIFF_STATUS_COPIED
:
3931 fputs(line_prefix
, file
);
3932 show_rename_copy(file
, "copy", p
, line_prefix
);
3934 case DIFF_STATUS_RENAMED
:
3935 fputs(line_prefix
, file
);
3936 show_rename_copy(file
, "rename", p
, line_prefix
);
3940 fprintf(file
, "%s rewrite ", line_prefix
);
3941 write_name_quoted(p
->two
->path
, file
, ' ');
3942 fprintf(file
, "(%d%%)\n", similarity_index(p
));
3944 show_mode_change(file
, p
, !p
->score
, line_prefix
);
3954 static int remove_space(char *line
, int len
)
3960 for (i
= 0; i
< len
; i
++)
3961 if (!isspace((c
= line
[i
])))
3967 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3969 struct patch_id_t
*data
= priv
;
3972 /* Ignore line numbers when computing the SHA1 of the patch */
3973 if (!prefixcmp(line
, "@@ -"))
3976 new_len
= remove_space(line
, len
);
3978 git_SHA1_Update(data
->ctx
, line
, new_len
);
3979 data
->patchlen
+= new_len
;
3982 /* returns 0 upon success, and writes result into sha1 */
3983 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3985 struct diff_queue_struct
*q
= &diff_queued_diff
;
3988 struct patch_id_t data
;
3989 char buffer
[PATH_MAX
* 4 + 20];
3991 git_SHA1_Init(&ctx
);
3992 memset(&data
, 0, sizeof(struct patch_id_t
));
3995 for (i
= 0; i
< q
->nr
; i
++) {
3999 struct diff_filepair
*p
= q
->queue
[i
];
4002 memset(&xpp
, 0, sizeof(xpp
));
4003 memset(&xecfg
, 0, sizeof(xecfg
));
4005 return error("internal diff status error");
4006 if (p
->status
== DIFF_STATUS_UNKNOWN
)
4008 if (diff_unmodified_pair(p
))
4010 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
4011 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
4013 if (DIFF_PAIR_UNMERGED(p
))
4016 diff_fill_sha1_info(p
->one
);
4017 diff_fill_sha1_info(p
->two
);
4018 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
4019 fill_mmfile(&mf2
, p
->two
) < 0)
4020 return error("unable to read files to diff");
4022 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
4023 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
4024 if (p
->one
->mode
== 0)
4025 len1
= snprintf(buffer
, sizeof(buffer
),
4026 "diff--gita/%.*sb/%.*s"
4033 len2
, p
->two
->path
);
4034 else if (p
->two
->mode
== 0)
4035 len1
= snprintf(buffer
, sizeof(buffer
),
4036 "diff--gita/%.*sb/%.*s"
4037 "deletedfilemode%06o"
4043 len1
, p
->one
->path
);
4045 len1
= snprintf(buffer
, sizeof(buffer
),
4046 "diff--gita/%.*sb/%.*s"
4052 len2
, p
->two
->path
);
4053 git_SHA1_Update(&ctx
, buffer
, len1
);
4055 if (diff_filespec_is_binary(p
->one
) ||
4056 diff_filespec_is_binary(p
->two
)) {
4057 git_SHA1_Update(&ctx
, sha1_to_hex(p
->one
->sha1
), 40);
4058 git_SHA1_Update(&ctx
, sha1_to_hex(p
->two
->sha1
), 40);
4065 xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
4069 git_SHA1_Final(sha1
, &ctx
);
4073 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
4075 struct diff_queue_struct
*q
= &diff_queued_diff
;
4077 int result
= diff_get_patch_id(options
, sha1
);
4079 for (i
= 0; i
< q
->nr
; i
++)
4080 diff_free_filepair(q
->queue
[i
]);
4083 DIFF_QUEUE_CLEAR(q
);
4088 static int is_summary_empty(const struct diff_queue_struct
*q
)
4092 for (i
= 0; i
< q
->nr
; i
++) {
4093 const struct diff_filepair
*p
= q
->queue
[i
];
4095 switch (p
->status
) {
4096 case DIFF_STATUS_DELETED
:
4097 case DIFF_STATUS_ADDED
:
4098 case DIFF_STATUS_COPIED
:
4099 case DIFF_STATUS_RENAMED
:
4104 if (p
->one
->mode
&& p
->two
->mode
&&
4105 p
->one
->mode
!= p
->two
->mode
)
4113 static const char rename_limit_warning
[] =
4114 "inexact rename detection was skipped due to too many files.";
4116 static const char degrade_cc_to_c_warning
[] =
4117 "only found copies from modified paths due to too many files.";
4119 static const char rename_limit_advice
[] =
4120 "you may want to set your %s variable to at least "
4121 "%d and retry the command.";
4123 void diff_warn_rename_limit(const char *varname
, int needed
, int degraded_cc
)
4126 warning(degrade_cc_to_c_warning
);
4128 warning(rename_limit_warning
);
4131 if (0 < needed
&& needed
< 32767)
4132 warning(rename_limit_advice
, varname
, needed
);
4135 void diff_flush(struct diff_options
*options
)
4137 struct diff_queue_struct
*q
= &diff_queued_diff
;
4138 int i
, output_format
= options
->output_format
;
4140 int dirstat_by_line
= 0;
4143 * Order: raw, stat, summary, patch
4144 * or: name/name-status/checkdiff (other bits clear)
4149 if (output_format
& (DIFF_FORMAT_RAW
|
4151 DIFF_FORMAT_NAME_STATUS
|
4152 DIFF_FORMAT_CHECKDIFF
)) {
4153 for (i
= 0; i
< q
->nr
; i
++) {
4154 struct diff_filepair
*p
= q
->queue
[i
];
4155 if (check_pair_status(p
))
4156 flush_one_pair(p
, options
);
4161 if (output_format
& DIFF_FORMAT_DIRSTAT
&& DIFF_OPT_TST(options
, DIRSTAT_BY_LINE
))
4162 dirstat_by_line
= 1;
4164 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
) ||
4166 struct diffstat_t diffstat
;
4168 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
4169 for (i
= 0; i
< q
->nr
; i
++) {
4170 struct diff_filepair
*p
= q
->queue
[i
];
4171 if (check_pair_status(p
))
4172 diff_flush_stat(p
, options
, &diffstat
);
4174 if (output_format
& DIFF_FORMAT_NUMSTAT
)
4175 show_numstat(&diffstat
, options
);
4176 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
4177 show_stats(&diffstat
, options
);
4178 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
4179 show_shortstats(&diffstat
, options
);
4180 if (output_format
& DIFF_FORMAT_DIRSTAT
)
4181 show_dirstat_by_line(&diffstat
, options
);
4182 free_diffstat_info(&diffstat
);
4185 if ((output_format
& DIFF_FORMAT_DIRSTAT
) && !dirstat_by_line
)
4186 show_dirstat(options
);
4188 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
4189 for (i
= 0; i
< q
->nr
; i
++) {
4190 diff_summary(options
, q
->queue
[i
]);
4195 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
4196 DIFF_OPT_TST(options
, EXIT_WITH_STATUS
) &&
4197 DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4199 * run diff_flush_patch for the exit status. setting
4200 * options->file to /dev/null should be safe, becaue we
4201 * aren't supposed to produce any output anyway.
4203 if (options
->close_file
)
4204 fclose(options
->file
);
4205 options
->file
= fopen("/dev/null", "w");
4207 die_errno("Could not open /dev/null");
4208 options
->close_file
= 1;
4209 for (i
= 0; i
< q
->nr
; i
++) {
4210 struct diff_filepair
*p
= q
->queue
[i
];
4211 if (check_pair_status(p
))
4212 diff_flush_patch(p
, options
);
4213 if (options
->found_changes
)
4218 if (output_format
& DIFF_FORMAT_PATCH
) {
4220 putc(options
->line_termination
, options
->file
);
4221 if (options
->stat_sep
) {
4222 /* attach patch instead of inline */
4223 fputs(options
->stat_sep
, options
->file
);
4227 for (i
= 0; i
< q
->nr
; i
++) {
4228 struct diff_filepair
*p
= q
->queue
[i
];
4229 if (check_pair_status(p
))
4230 diff_flush_patch(p
, options
);
4234 if (output_format
& DIFF_FORMAT_CALLBACK
)
4235 options
->format_callback(q
, options
, options
->format_callback_data
);
4237 for (i
= 0; i
< q
->nr
; i
++)
4238 diff_free_filepair(q
->queue
[i
]);
4241 DIFF_QUEUE_CLEAR(q
);
4242 if (options
->close_file
)
4243 fclose(options
->file
);
4246 * Report the content-level differences with HAS_CHANGES;
4247 * diff_addremove/diff_change does not set the bit when
4248 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4250 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
4251 if (options
->found_changes
)
4252 DIFF_OPT_SET(options
, HAS_CHANGES
);
4254 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4258 static void diffcore_apply_filter(const char *filter
)
4261 struct diff_queue_struct
*q
= &diff_queued_diff
;
4262 struct diff_queue_struct outq
;
4263 DIFF_QUEUE_CLEAR(&outq
);
4268 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
4270 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
4271 struct diff_filepair
*p
= q
->queue
[i
];
4272 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
4274 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
4276 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
4277 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
4278 strchr(filter
, p
->status
)))
4284 /* otherwise we will clear the whole queue
4285 * by copying the empty outq at the end of this
4286 * function, but first clear the current entries
4289 for (i
= 0; i
< q
->nr
; i
++)
4290 diff_free_filepair(q
->queue
[i
]);
4293 /* Only the matching ones */
4294 for (i
= 0; i
< q
->nr
; i
++) {
4295 struct diff_filepair
*p
= q
->queue
[i
];
4297 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
4299 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
4301 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
4302 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
4303 strchr(filter
, p
->status
)))
4306 diff_free_filepair(p
);
4313 /* Check whether two filespecs with the same mode and size are identical */
4314 static int diff_filespec_is_identical(struct diff_filespec
*one
,
4315 struct diff_filespec
*two
)
4317 if (S_ISGITLINK(one
->mode
))
4319 if (diff_populate_filespec(one
, 0))
4321 if (diff_populate_filespec(two
, 0))
4323 return !memcmp(one
->data
, two
->data
, one
->size
);
4326 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
4329 struct diff_queue_struct
*q
= &diff_queued_diff
;
4330 struct diff_queue_struct outq
;
4331 DIFF_QUEUE_CLEAR(&outq
);
4333 for (i
= 0; i
< q
->nr
; i
++) {
4334 struct diff_filepair
*p
= q
->queue
[i
];
4337 * 1. Entries that come from stat info dirtiness
4338 * always have both sides (iow, not create/delete),
4339 * one side of the object name is unknown, with
4340 * the same mode and size. Keep the ones that
4341 * do not match these criteria. They have real
4344 * 2. At this point, the file is known to be modified,
4345 * with the same mode and size, and the object
4346 * name of one side is unknown. Need to inspect
4347 * the identical contents.
4349 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
4350 !DIFF_FILE_VALID(p
->two
) ||
4351 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
4352 (p
->one
->mode
!= p
->two
->mode
) ||
4353 diff_populate_filespec(p
->one
, 1) ||
4354 diff_populate_filespec(p
->two
, 1) ||
4355 (p
->one
->size
!= p
->two
->size
) ||
4356 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
4360 * The caller can subtract 1 from skip_stat_unmatch
4361 * to determine how many paths were dirty only
4362 * due to stat info mismatch.
4364 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
4365 diffopt
->skip_stat_unmatch
++;
4366 diff_free_filepair(p
);
4373 static int diffnamecmp(const void *a_
, const void *b_
)
4375 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
4376 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
4377 const char *name_a
, *name_b
;
4379 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
4380 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
4381 return strcmp(name_a
, name_b
);
4384 void diffcore_fix_diff_index(struct diff_options
*options
)
4386 struct diff_queue_struct
*q
= &diff_queued_diff
;
4387 qsort(q
->queue
, q
->nr
, sizeof(q
->queue
[0]), diffnamecmp
);
4390 void diffcore_std(struct diff_options
*options
)
4392 if (options
->skip_stat_unmatch
)
4393 diffcore_skip_stat_unmatch(options
);
4394 if (!options
->found_follow
) {
4395 /* See try_to_follow_renames() in tree-diff.c */
4396 if (options
->break_opt
!= -1)
4397 diffcore_break(options
->break_opt
);
4398 if (options
->detect_rename
)
4399 diffcore_rename(options
);
4400 if (options
->break_opt
!= -1)
4401 diffcore_merge_broken();
4403 if (options
->pickaxe
)
4404 diffcore_pickaxe(options
);
4405 if (options
->orderfile
)
4406 diffcore_order(options
->orderfile
);
4407 if (!options
->found_follow
)
4408 /* See try_to_follow_renames() in tree-diff.c */
4409 diff_resolve_rename_copy();
4410 diffcore_apply_filter(options
->filter
);
4412 if (diff_queued_diff
.nr
&& !DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4413 DIFF_OPT_SET(options
, HAS_CHANGES
);
4415 DIFF_OPT_CLR(options
, HAS_CHANGES
);
4417 options
->found_follow
= 0;
4420 int diff_result_code(struct diff_options
*opt
, int status
)
4424 diff_warn_rename_limit("diff.renamelimit",
4425 opt
->needed_rename_limit
,
4426 opt
->degraded_cc_to_c
);
4427 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4428 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
4430 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
4431 DIFF_OPT_TST(opt
, HAS_CHANGES
))
4433 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
4434 DIFF_OPT_TST(opt
, CHECK_FAILED
))
4440 * Shall changes to this submodule be ignored?
4442 * Submodule changes can be configured to be ignored separately for each path,
4443 * but that configuration can be overridden from the command line.
4445 static int is_submodule_ignored(const char *path
, struct diff_options
*options
)
4448 unsigned orig_flags
= options
->flags
;
4449 if (!DIFF_OPT_TST(options
, OVERRIDE_SUBMODULE_CONFIG
))
4450 set_diffopt_flags_from_submodule_config(options
, path
);
4451 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
))
4453 options
->flags
= orig_flags
;
4457 void diff_addremove(struct diff_options
*options
,
4458 int addremove
, unsigned mode
,
4459 const unsigned char *sha1
,
4460 const char *concatpath
, unsigned dirty_submodule
)
4462 struct diff_filespec
*one
, *two
;
4464 if (S_ISGITLINK(mode
) && is_submodule_ignored(concatpath
, options
))
4467 /* This may look odd, but it is a preparation for
4468 * feeding "there are unchanged files which should
4469 * not produce diffs, but when you are doing copy
4470 * detection you would need them, so here they are"
4471 * entries to the diff-core. They will be prefixed
4472 * with something like '=' or '*' (I haven't decided
4473 * which but should not make any difference).
4474 * Feeding the same new and old to diff_change()
4475 * also has the same effect.
4476 * Before the final output happens, they are pruned after
4477 * merged into rename/copy pairs as appropriate.
4479 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
4480 addremove
= (addremove
== '+' ? '-' :
4481 addremove
== '-' ? '+' : addremove
);
4483 if (options
->prefix
&&
4484 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4487 one
= alloc_filespec(concatpath
);
4488 two
= alloc_filespec(concatpath
);
4490 if (addremove
!= '+')
4491 fill_filespec(one
, sha1
, mode
);
4492 if (addremove
!= '-') {
4493 fill_filespec(two
, sha1
, mode
);
4494 two
->dirty_submodule
= dirty_submodule
;
4497 diff_queue(&diff_queued_diff
, one
, two
);
4498 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4499 DIFF_OPT_SET(options
, HAS_CHANGES
);
4502 void diff_change(struct diff_options
*options
,
4503 unsigned old_mode
, unsigned new_mode
,
4504 const unsigned char *old_sha1
,
4505 const unsigned char *new_sha1
,
4506 const char *concatpath
,
4507 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
4509 struct diff_filespec
*one
, *two
;
4511 if (S_ISGITLINK(old_mode
) && S_ISGITLINK(new_mode
) &&
4512 is_submodule_ignored(concatpath
, options
))
4515 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
4517 const unsigned char *tmp_c
;
4518 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
4519 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
4520 tmp
= old_dirty_submodule
; old_dirty_submodule
= new_dirty_submodule
;
4521 new_dirty_submodule
= tmp
;
4524 if (options
->prefix
&&
4525 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
4528 one
= alloc_filespec(concatpath
);
4529 two
= alloc_filespec(concatpath
);
4530 fill_filespec(one
, old_sha1
, old_mode
);
4531 fill_filespec(two
, new_sha1
, new_mode
);
4532 one
->dirty_submodule
= old_dirty_submodule
;
4533 two
->dirty_submodule
= new_dirty_submodule
;
4535 diff_queue(&diff_queued_diff
, one
, two
);
4536 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
4537 DIFF_OPT_SET(options
, HAS_CHANGES
);
4540 struct diff_filepair
*diff_unmerge(struct diff_options
*options
, const char *path
)
4542 struct diff_filepair
*pair
;
4543 struct diff_filespec
*one
, *two
;
4545 if (options
->prefix
&&
4546 strncmp(path
, options
->prefix
, options
->prefix_length
))
4549 one
= alloc_filespec(path
);
4550 two
= alloc_filespec(path
);
4551 pair
= diff_queue(&diff_queued_diff
, one
, two
);
4552 pair
->is_unmerged
= 1;
4556 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
4559 struct diff_tempfile
*temp
;
4560 const char *argv
[3];
4561 const char **arg
= argv
;
4562 struct child_process child
;
4563 struct strbuf buf
= STRBUF_INIT
;
4566 temp
= prepare_temp_file(spec
->path
, spec
);
4568 *arg
++ = temp
->name
;
4571 memset(&child
, 0, sizeof(child
));
4572 child
.use_shell
= 1;
4575 if (start_command(&child
)) {
4580 if (strbuf_read(&buf
, child
.out
, 0) < 0)
4581 err
= error("error reading from textconv command '%s'", pgm
);
4584 if (finish_command(&child
) || err
) {
4585 strbuf_release(&buf
);
4591 return strbuf_detach(&buf
, outsize
);
4594 size_t fill_textconv(struct userdiff_driver
*driver
,
4595 struct diff_filespec
*df
,
4600 if (!driver
|| !driver
->textconv
) {
4601 if (!DIFF_FILE_VALID(df
)) {
4605 if (diff_populate_filespec(df
, 0))
4606 die("unable to read files to diff");
4611 if (driver
->textconv_cache
&& df
->sha1_valid
) {
4612 *outbuf
= notes_cache_get(driver
->textconv_cache
, df
->sha1
,
4618 *outbuf
= run_textconv(driver
->textconv
, df
, &size
);
4620 die("unable to read files to diff");
4622 if (driver
->textconv_cache
&& df
->sha1_valid
) {
4623 /* ignore errors, as we might be in a readonly repository */
4624 notes_cache_put(driver
->textconv_cache
, df
->sha1
, *outbuf
,
4627 * we could save up changes and flush them all at the end,
4628 * but we would need an extra call after all diffing is done.
4629 * Since generating a cache entry is the slow path anyway,
4630 * this extra overhead probably isn't a big deal.
4632 notes_cache_write(driver
->textconv_cache
);