2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
16 #include "submodule.h"
19 #ifdef NO_FAST_WORKING_DIRECTORY
20 #define FAST_WORKING_DIRECTORY 0
22 #define FAST_WORKING_DIRECTORY 1
25 static int diff_detect_rename_default
;
26 static int diff_rename_limit_default
= 200;
27 static int diff_suppress_blank_empty
;
28 int diff_use_color_default
= -1;
29 static const char *diff_word_regex_cfg
;
30 static const char *external_diff_cmd_cfg
;
31 int diff_auto_refresh_index
= 1;
32 static int diff_mnemonic_prefix
;
34 static char diff_colors
[][COLOR_MAXLEN
] = {
36 GIT_COLOR_NORMAL
, /* PLAIN */
37 GIT_COLOR_BOLD
, /* METAINFO */
38 GIT_COLOR_CYAN
, /* FRAGINFO */
39 GIT_COLOR_RED
, /* OLD */
40 GIT_COLOR_GREEN
, /* NEW */
41 GIT_COLOR_YELLOW
, /* COMMIT */
42 GIT_COLOR_BG_RED
, /* WHITESPACE */
43 GIT_COLOR_NORMAL
, /* FUNCINFO */
46 static void diff_filespec_load_driver(struct diff_filespec
*one
);
47 static size_t fill_textconv(struct userdiff_driver
*driver
,
48 struct diff_filespec
*df
, char **outbuf
);
50 static int parse_diff_color_slot(const char *var
, int ofs
)
52 if (!strcasecmp(var
+ofs
, "plain"))
54 if (!strcasecmp(var
+ofs
, "meta"))
56 if (!strcasecmp(var
+ofs
, "frag"))
58 if (!strcasecmp(var
+ofs
, "old"))
60 if (!strcasecmp(var
+ofs
, "new"))
62 if (!strcasecmp(var
+ofs
, "commit"))
64 if (!strcasecmp(var
+ofs
, "whitespace"))
65 return DIFF_WHITESPACE
;
66 if (!strcasecmp(var
+ofs
, "func"))
71 static int git_config_rename(const char *var
, const char *value
)
74 return DIFF_DETECT_RENAME
;
75 if (!strcasecmp(value
, "copies") || !strcasecmp(value
, "copy"))
76 return DIFF_DETECT_COPY
;
77 return git_config_bool(var
,value
) ? DIFF_DETECT_RENAME
: 0;
81 * These are to give UI layer defaults.
82 * The core-level commands such as git-diff-files should
83 * never be affected by the setting of diff.renames
84 * the user happens to have in the configuration file.
86 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
88 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
89 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
92 if (!strcmp(var
, "diff.renames")) {
93 diff_detect_rename_default
= git_config_rename(var
, value
);
96 if (!strcmp(var
, "diff.autorefreshindex")) {
97 diff_auto_refresh_index
= git_config_bool(var
, value
);
100 if (!strcmp(var
, "diff.mnemonicprefix")) {
101 diff_mnemonic_prefix
= git_config_bool(var
, value
);
104 if (!strcmp(var
, "diff.external"))
105 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
106 if (!strcmp(var
, "diff.wordregex"))
107 return git_config_string(&diff_word_regex_cfg
, var
, value
);
109 return git_diff_basic_config(var
, value
, cb
);
112 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
114 if (!strcmp(var
, "diff.renamelimit")) {
115 diff_rename_limit_default
= git_config_int(var
, value
);
119 switch (userdiff_config(var
, value
)) {
125 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
126 int slot
= parse_diff_color_slot(var
, 11);
130 return config_error_nonbool(var
);
131 color_parse(value
, var
, diff_colors
[slot
]);
135 /* like GNU diff's --suppress-blank-empty option */
136 if (!strcmp(var
, "diff.suppressblankempty") ||
137 /* for backwards compatibility */
138 !strcmp(var
, "diff.suppress-blank-empty")) {
139 diff_suppress_blank_empty
= git_config_bool(var
, value
);
143 return git_color_default_config(var
, value
, cb
);
146 static char *quote_two(const char *one
, const char *two
)
148 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
149 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
150 struct strbuf res
= STRBUF_INIT
;
152 if (need_one
+ need_two
) {
153 strbuf_addch(&res
, '"');
154 quote_c_style(one
, &res
, NULL
, 1);
155 quote_c_style(two
, &res
, NULL
, 1);
156 strbuf_addch(&res
, '"');
158 strbuf_addstr(&res
, one
);
159 strbuf_addstr(&res
, two
);
161 return strbuf_detach(&res
, NULL
);
164 static const char *external_diff(void)
166 static const char *external_diff_cmd
= NULL
;
167 static int done_preparing
= 0;
170 return external_diff_cmd
;
171 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
172 if (!external_diff_cmd
)
173 external_diff_cmd
= external_diff_cmd_cfg
;
175 return external_diff_cmd
;
178 static struct diff_tempfile
{
179 const char *name
; /* filename external diff should read from */
182 char tmp_path
[PATH_MAX
];
185 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
187 struct emit_callback
{
190 int blank_at_eof_in_preimage
;
191 int blank_at_eof_in_postimage
;
193 int lno_in_postimage
;
194 sane_truncate_fn truncate
;
195 const char **label_path
;
196 struct diff_words_data
*diff_words
;
199 struct strbuf
*header
;
202 static int count_lines(const char *data
, int size
)
204 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
211 completely_empty
= 0;
215 completely_empty
= 0;
218 if (completely_empty
)
221 count
++; /* no trailing newline */
225 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
227 if (!DIFF_FILE_VALID(one
)) {
228 mf
->ptr
= (char *)""; /* does not matter */
232 else if (diff_populate_filespec(one
, 0))
236 mf
->size
= one
->size
;
240 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
243 long size
= mf
->size
;
248 ptr
+= size
- 1; /* pointing at the very end */
250 ; /* incomplete line */
252 ptr
--; /* skip the last LF */
253 while (mf
->ptr
< ptr
) {
255 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
256 if (*prev_eol
== '\n')
258 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
266 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
267 struct emit_callback
*ecbdata
)
270 unsigned ws_rule
= ecbdata
->ws_rule
;
271 l1
= count_trailing_blank(mf1
, ws_rule
);
272 l2
= count_trailing_blank(mf2
, ws_rule
);
274 ecbdata
->blank_at_eof_in_preimage
= 0;
275 ecbdata
->blank_at_eof_in_postimage
= 0;
278 at
= count_lines(mf1
->ptr
, mf1
->size
);
279 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
281 at
= count_lines(mf2
->ptr
, mf2
->size
);
282 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
285 static void emit_line_0(FILE *file
, const char *set
, const char *reset
,
286 int first
, const char *line
, int len
)
288 int has_trailing_newline
, has_trailing_carriage_return
;
292 has_trailing_newline
= (first
== '\n');
293 has_trailing_carriage_return
= (!has_trailing_newline
&&
295 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
297 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
298 if (has_trailing_newline
)
300 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
301 if (has_trailing_carriage_return
)
306 if (len
|| !nofirst
) {
310 fwrite(line
, len
, 1, file
);
313 if (has_trailing_carriage_return
)
315 if (has_trailing_newline
)
319 static void emit_line(FILE *file
, const char *set
, const char *reset
,
320 const char *line
, int len
)
322 emit_line_0(file
, set
, reset
, line
[0], line
+1, len
-1);
325 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
327 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
328 ecbdata
->blank_at_eof_in_preimage
&&
329 ecbdata
->blank_at_eof_in_postimage
&&
330 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
331 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
333 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
336 static void emit_add_line(const char *reset
,
337 struct emit_callback
*ecbdata
,
338 const char *line
, int len
)
340 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
341 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
344 emit_line_0(ecbdata
->file
, set
, reset
, '+', line
, len
);
345 else if (new_blank_line_at_eof(ecbdata
, line
, len
))
346 /* Blank line at EOF - paint '+' as well */
347 emit_line_0(ecbdata
->file
, ws
, reset
, '+', line
, len
);
349 /* Emit just the prefix, then the rest. */
350 emit_line_0(ecbdata
->file
, set
, reset
, '+', "", 0);
351 ws_check_emit(line
, len
, ecbdata
->ws_rule
,
352 ecbdata
->file
, set
, reset
, ws
);
356 static void emit_hunk_header(struct emit_callback
*ecbdata
,
357 const char *line
, int len
)
359 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
360 const char *frag
= diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
);
361 const char *func
= diff_get_color(ecbdata
->color_diff
, DIFF_FUNCINFO
);
362 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
363 static const char atat
[2] = { '@', '@' };
367 * As a hunk header must begin with "@@ -<old>, +<new> @@",
368 * it always is at least 10 bytes long.
371 memcmp(line
, atat
, 2) ||
372 !(ep
= memmem(line
+ 2, len
- 2, atat
, 2))) {
373 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
376 ep
+= 2; /* skip over @@ */
378 /* The hunk header in fraginfo color */
379 emit_line(ecbdata
->file
, frag
, reset
, line
, ep
- line
);
381 /* blank before the func header */
382 for (cp
= ep
; ep
- line
< len
; ep
++)
383 if (*ep
!= ' ' && *ep
!= '\t')
386 emit_line(ecbdata
->file
, plain
, reset
, cp
, ep
- cp
);
389 emit_line(ecbdata
->file
, func
, reset
, ep
, line
+ len
- ep
);
392 static struct diff_tempfile
*claim_diff_tempfile(void) {
394 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++)
395 if (!diff_temp
[i
].name
)
396 return diff_temp
+ i
;
397 die("BUG: diff is failing to clean up its tempfiles");
400 static int remove_tempfile_installed
;
402 static void remove_tempfile(void)
405 for (i
= 0; i
< ARRAY_SIZE(diff_temp
); i
++) {
406 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
)
407 unlink_or_warn(diff_temp
[i
].name
);
408 diff_temp
[i
].name
= NULL
;
412 static void remove_tempfile_on_signal(int signo
)
419 static void print_line_count(FILE *file
, int count
)
423 fprintf(file
, "0,0");
429 fprintf(file
, "1,%d", count
);
434 static void emit_rewrite_lines(struct emit_callback
*ecb
,
435 int prefix
, const char *data
, int size
)
437 const char *endp
= NULL
;
438 static const char *nneof
= " No newline at end of file\n";
439 const char *old
= diff_get_color(ecb
->color_diff
, DIFF_FILE_OLD
);
440 const char *reset
= diff_get_color(ecb
->color_diff
, DIFF_RESET
);
445 endp
= memchr(data
, '\n', size
);
446 len
= endp
? (endp
- data
+ 1) : size
;
448 ecb
->lno_in_preimage
++;
449 emit_line_0(ecb
->file
, old
, reset
, '-',
452 ecb
->lno_in_postimage
++;
453 emit_add_line(reset
, ecb
, data
, len
);
459 const char *plain
= diff_get_color(ecb
->color_diff
,
461 emit_line_0(ecb
->file
, plain
, reset
, '\\',
462 nneof
, strlen(nneof
));
466 static void emit_rewrite_diff(const char *name_a
,
468 struct diff_filespec
*one
,
469 struct diff_filespec
*two
,
470 struct userdiff_driver
*textconv_one
,
471 struct userdiff_driver
*textconv_two
,
472 struct diff_options
*o
)
475 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
476 const char *name_a_tab
, *name_b_tab
;
477 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
478 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
479 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
480 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
481 const char *a_prefix
, *b_prefix
;
482 char *data_one
, *data_two
;
483 size_t size_one
, size_two
;
484 struct emit_callback ecbdata
;
486 if (diff_mnemonic_prefix
&& DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
487 a_prefix
= o
->b_prefix
;
488 b_prefix
= o
->a_prefix
;
490 a_prefix
= o
->a_prefix
;
491 b_prefix
= o
->b_prefix
;
494 name_a
+= (*name_a
== '/');
495 name_b
+= (*name_b
== '/');
496 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
497 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
499 strbuf_reset(&a_name
);
500 strbuf_reset(&b_name
);
501 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
502 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
504 size_one
= fill_textconv(textconv_one
, one
, &data_one
);
505 size_two
= fill_textconv(textconv_two
, two
, &data_two
);
507 memset(&ecbdata
, 0, sizeof(ecbdata
));
508 ecbdata
.color_diff
= color_diff
;
509 ecbdata
.found_changesp
= &o
->found_changes
;
510 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
511 ecbdata
.file
= o
->file
;
512 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
) {
514 mf1
.ptr
= (char *)data_one
;
515 mf2
.ptr
= (char *)data_two
;
518 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
520 ecbdata
.lno_in_preimage
= 1;
521 ecbdata
.lno_in_postimage
= 1;
523 lc_a
= count_lines(data_one
, size_one
);
524 lc_b
= count_lines(data_two
, size_two
);
526 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
527 metainfo
, a_name
.buf
, name_a_tab
, reset
,
528 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
529 print_line_count(o
->file
, lc_a
);
530 fprintf(o
->file
, " +");
531 print_line_count(o
->file
, lc_b
);
532 fprintf(o
->file
, " @@%s\n", reset
);
534 emit_rewrite_lines(&ecbdata
, '-', data_one
, size_one
);
536 emit_rewrite_lines(&ecbdata
, '+', data_two
, size_two
);
538 free((char *)data_one
);
540 free((char *)data_two
);
543 struct diff_words_buffer
{
546 struct diff_words_orig
{
547 const char *begin
, *end
;
549 int orig_nr
, orig_alloc
;
552 static void diff_words_append(char *line
, unsigned long len
,
553 struct diff_words_buffer
*buffer
)
555 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
558 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
559 buffer
->text
.size
+= len
;
560 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
563 struct diff_words_data
{
564 struct diff_words_buffer minus
, plus
;
565 const char *current_plus
;
570 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
572 struct diff_words_data
*diff_words
= priv
;
573 int minus_first
, minus_len
, plus_first
, plus_len
;
574 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
576 if (line
[0] != '@' || parse_hunk_header(line
, len
,
577 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
580 /* POSIX requires that first be decremented by one if len == 0... */
582 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
584 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
586 minus_begin
= minus_end
=
587 diff_words
->minus
.orig
[minus_first
].end
;
590 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
591 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
593 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
595 if (diff_words
->current_plus
!= plus_begin
)
596 fwrite(diff_words
->current_plus
,
597 plus_begin
- diff_words
->current_plus
, 1,
599 if (minus_begin
!= minus_end
)
600 color_fwrite_lines(diff_words
->file
,
601 diff_get_color(1, DIFF_FILE_OLD
),
602 minus_end
- minus_begin
, minus_begin
);
603 if (plus_begin
!= plus_end
)
604 color_fwrite_lines(diff_words
->file
,
605 diff_get_color(1, DIFF_FILE_NEW
),
606 plus_end
- plus_begin
, plus_begin
);
608 diff_words
->current_plus
= plus_end
;
611 /* This function starts looking at *begin, and returns 0 iff a word was found. */
612 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
613 int *begin
, int *end
)
615 if (word_regex
&& *begin
< buffer
->size
) {
617 if (!regexec(word_regex
, buffer
->ptr
+ *begin
, 1, match
, 0)) {
618 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
619 '\n', match
[0].rm_eo
- match
[0].rm_so
);
620 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
621 *begin
+= match
[0].rm_so
;
622 return *begin
>= *end
;
627 /* find the next word */
628 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
630 if (*begin
>= buffer
->size
)
633 /* find the end of the word */
635 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
642 * This function splits the words in buffer->text, stores the list with
643 * newline separator into out, and saves the offsets of the original words
646 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
655 /* fake an empty "0th" word */
656 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
657 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
660 for (i
= 0; i
< buffer
->text
.size
; i
++) {
661 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
664 /* store original boundaries */
665 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
667 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
668 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
672 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
673 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
674 out
->ptr
[out
->size
+ j
- i
] = '\n';
675 out
->size
+= j
- i
+ 1;
681 /* this executes the word diff on the accumulated buffers */
682 static void diff_words_show(struct diff_words_data
*diff_words
)
686 mmfile_t minus
, plus
;
688 /* special case: only removal */
689 if (!diff_words
->plus
.text
.size
) {
690 color_fwrite_lines(diff_words
->file
,
691 diff_get_color(1, DIFF_FILE_OLD
),
692 diff_words
->minus
.text
.size
, diff_words
->minus
.text
.ptr
);
693 diff_words
->minus
.text
.size
= 0;
697 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
699 memset(&xpp
, 0, sizeof(xpp
));
700 memset(&xecfg
, 0, sizeof(xecfg
));
701 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
702 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
703 xpp
.flags
= XDF_NEED_MINIMAL
;
704 /* as only the hunk header will be parsed, we need a 0-context */
706 xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
710 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
711 diff_words
->plus
.text
.size
)
712 fwrite(diff_words
->current_plus
,
713 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
714 - diff_words
->current_plus
, 1,
716 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
719 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
720 static void diff_words_flush(struct emit_callback
*ecbdata
)
722 if (ecbdata
->diff_words
->minus
.text
.size
||
723 ecbdata
->diff_words
->plus
.text
.size
)
724 diff_words_show(ecbdata
->diff_words
);
727 static void free_diff_words_data(struct emit_callback
*ecbdata
)
729 if (ecbdata
->diff_words
) {
730 diff_words_flush(ecbdata
);
731 free (ecbdata
->diff_words
->minus
.text
.ptr
);
732 free (ecbdata
->diff_words
->minus
.orig
);
733 free (ecbdata
->diff_words
->plus
.text
.ptr
);
734 free (ecbdata
->diff_words
->plus
.orig
);
735 free(ecbdata
->diff_words
->word_regex
);
736 free(ecbdata
->diff_words
);
737 ecbdata
->diff_words
= NULL
;
741 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
744 return diff_colors
[ix
];
748 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
755 return ecb
->truncate(line
, len
);
759 (void) utf8_width(&cp
, &l
);
761 break; /* truncated in the middle? */
766 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
769 ecbdata
->lno_in_preimage
= 0;
770 ecbdata
->lno_in_postimage
= 0;
771 p
= strchr(line
, '-');
773 return; /* cannot happen */
774 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
777 return; /* cannot happen */
778 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
781 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
783 struct emit_callback
*ecbdata
= priv
;
784 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
785 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
786 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
788 if (ecbdata
->header
) {
789 fprintf(ecbdata
->file
, "%s", ecbdata
->header
->buf
);
790 strbuf_reset(ecbdata
->header
);
791 ecbdata
->header
= NULL
;
793 *(ecbdata
->found_changesp
) = 1;
795 if (ecbdata
->label_path
[0]) {
796 const char *name_a_tab
, *name_b_tab
;
798 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
799 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
801 fprintf(ecbdata
->file
, "%s--- %s%s%s\n",
802 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
803 fprintf(ecbdata
->file
, "%s+++ %s%s%s\n",
804 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
805 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
808 if (diff_suppress_blank_empty
809 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
814 if (line
[0] == '@') {
815 if (ecbdata
->diff_words
)
816 diff_words_flush(ecbdata
);
817 len
= sane_truncate_line(ecbdata
, line
, len
);
818 find_lno(line
, ecbdata
);
819 emit_hunk_header(ecbdata
, line
, len
);
820 if (line
[len
-1] != '\n')
821 putc('\n', ecbdata
->file
);
826 emit_line(ecbdata
->file
, reset
, reset
, line
, len
);
830 if (ecbdata
->diff_words
) {
831 if (line
[0] == '-') {
832 diff_words_append(line
, len
,
833 &ecbdata
->diff_words
->minus
);
835 } else if (line
[0] == '+') {
836 diff_words_append(line
, len
,
837 &ecbdata
->diff_words
->plus
);
840 diff_words_flush(ecbdata
);
843 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
847 if (line
[0] != '+') {
849 diff_get_color(ecbdata
->color_diff
,
850 line
[0] == '-' ? DIFF_FILE_OLD
: DIFF_PLAIN
);
851 ecbdata
->lno_in_preimage
++;
853 ecbdata
->lno_in_postimage
++;
854 emit_line(ecbdata
->file
, color
, reset
, line
, len
);
856 ecbdata
->lno_in_postimage
++;
857 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
861 static char *pprint_rename(const char *a
, const char *b
)
865 struct strbuf name
= STRBUF_INIT
;
866 int pfx_length
, sfx_length
;
867 int len_a
= strlen(a
);
868 int len_b
= strlen(b
);
869 int a_midlen
, b_midlen
;
870 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
871 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
873 if (qlen_a
|| qlen_b
) {
874 quote_c_style(a
, &name
, NULL
, 0);
875 strbuf_addstr(&name
, " => ");
876 quote_c_style(b
, &name
, NULL
, 0);
877 return strbuf_detach(&name
, NULL
);
880 /* Find common prefix */
882 while (*old
&& *new && *old
== *new) {
884 pfx_length
= old
- a
+ 1;
889 /* Find common suffix */
893 while (a
<= old
&& b
<= new && *old
== *new) {
895 sfx_length
= len_a
- (old
- a
);
901 * pfx{mid-a => mid-b}sfx
902 * {pfx-a => pfx-b}sfx
903 * pfx{sfx-a => sfx-b}
906 a_midlen
= len_a
- pfx_length
- sfx_length
;
907 b_midlen
= len_b
- pfx_length
- sfx_length
;
913 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
914 if (pfx_length
+ sfx_length
) {
915 strbuf_add(&name
, a
, pfx_length
);
916 strbuf_addch(&name
, '{');
918 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
919 strbuf_addstr(&name
, " => ");
920 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
921 if (pfx_length
+ sfx_length
) {
922 strbuf_addch(&name
, '}');
923 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
925 return strbuf_detach(&name
, NULL
);
931 struct diffstat_file
{
935 unsigned is_unmerged
:1;
936 unsigned is_binary
:1;
937 unsigned is_renamed
:1;
938 uintmax_t added
, deleted
;
942 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
946 struct diffstat_file
*x
;
947 x
= xcalloc(sizeof (*x
), 1);
948 if (diffstat
->nr
== diffstat
->alloc
) {
949 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
950 diffstat
->files
= xrealloc(diffstat
->files
,
951 diffstat
->alloc
* sizeof(x
));
953 diffstat
->files
[diffstat
->nr
++] = x
;
955 x
->from_name
= xstrdup(name_a
);
956 x
->name
= xstrdup(name_b
);
961 x
->name
= xstrdup(name_a
);
966 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
968 struct diffstat_t
*diffstat
= priv
;
969 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
973 else if (line
[0] == '-')
977 const char mime_boundary_leader
[] = "------------";
979 static int scale_linear(int it
, int width
, int max_change
)
982 * make sure that at least one '-' is printed if there were deletions,
983 * and likewise for '+'.
987 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
990 static void show_name(FILE *file
,
991 const char *prefix
, const char *name
, int len
)
993 fprintf(file
, " %s%-*s |", prefix
, len
, name
);
996 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
1000 fprintf(file
, "%s", set
);
1003 fprintf(file
, "%s", reset
);
1006 static void fill_print_name(struct diffstat_file
*file
)
1010 if (file
->print_name
)
1013 if (!file
->is_renamed
) {
1014 struct strbuf buf
= STRBUF_INIT
;
1015 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
1016 pname
= strbuf_detach(&buf
, NULL
);
1019 strbuf_release(&buf
);
1022 pname
= pprint_rename(file
->from_name
, file
->name
);
1024 file
->print_name
= pname
;
1027 static void show_stats(struct diffstat_t
*data
, struct diff_options
*options
)
1029 int i
, len
, add
, del
, adds
= 0, dels
= 0;
1030 uintmax_t max_change
= 0, max_len
= 0;
1031 int total_files
= data
->nr
;
1032 int width
, name_width
;
1033 const char *reset
, *set
, *add_c
, *del_c
;
1038 width
= options
->stat_width
? options
->stat_width
: 80;
1039 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
1041 /* Sanity: give at least 5 columns to the graph,
1042 * but leave at least 10 columns for the name.
1046 if (name_width
< 10)
1048 else if (width
< name_width
+ 15)
1049 name_width
= width
- 15;
1051 /* Find the longest filename and max number of changes */
1052 reset
= diff_get_color_opt(options
, DIFF_RESET
);
1053 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
1054 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
1055 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
1057 for (i
= 0; i
< data
->nr
; i
++) {
1058 struct diffstat_file
*file
= data
->files
[i
];
1059 uintmax_t change
= file
->added
+ file
->deleted
;
1060 fill_print_name(file
);
1061 len
= strlen(file
->print_name
);
1065 if (file
->is_binary
|| file
->is_unmerged
)
1067 if (max_change
< change
)
1068 max_change
= change
;
1071 /* Compute the width of the graph part;
1072 * 10 is for one blank at the beginning of the line plus
1073 * " | count " between the name and the graph.
1075 * From here on, name_width is the width of the name area,
1076 * and width is the width of the graph area.
1078 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
1079 if (width
< (name_width
+ 10) + max_change
)
1080 width
= width
- (name_width
+ 10);
1084 for (i
= 0; i
< data
->nr
; i
++) {
1085 const char *prefix
= "";
1086 char *name
= data
->files
[i
]->print_name
;
1087 uintmax_t added
= data
->files
[i
]->added
;
1088 uintmax_t deleted
= data
->files
[i
]->deleted
;
1092 * "scale" the filename
1095 name_len
= strlen(name
);
1096 if (name_width
< name_len
) {
1100 name
+= name_len
- len
;
1101 slash
= strchr(name
, '/');
1106 if (data
->files
[i
]->is_binary
) {
1107 show_name(options
->file
, prefix
, name
, len
);
1108 fprintf(options
->file
, " Bin ");
1109 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1110 del_c
, deleted
, reset
);
1111 fprintf(options
->file
, " -> ");
1112 fprintf(options
->file
, "%s%"PRIuMAX
"%s",
1113 add_c
, added
, reset
);
1114 fprintf(options
->file
, " bytes");
1115 fprintf(options
->file
, "\n");
1118 else if (data
->files
[i
]->is_unmerged
) {
1119 show_name(options
->file
, prefix
, name
, len
);
1120 fprintf(options
->file
, " Unmerged\n");
1123 else if (!data
->files
[i
]->is_renamed
&&
1124 (added
+ deleted
== 0)) {
1130 * scale the add/delete
1137 if (width
<= max_change
) {
1138 add
= scale_linear(add
, width
, max_change
);
1139 del
= scale_linear(del
, width
, max_change
);
1141 show_name(options
->file
, prefix
, name
, len
);
1142 fprintf(options
->file
, "%5"PRIuMAX
"%s", added
+ deleted
,
1143 added
+ deleted
? " " : "");
1144 show_graph(options
->file
, '+', add
, add_c
, reset
);
1145 show_graph(options
->file
, '-', del
, del_c
, reset
);
1146 fprintf(options
->file
, "\n");
1148 fprintf(options
->file
,
1149 " %d files changed, %d insertions(+), %d deletions(-)\n",
1150 total_files
, adds
, dels
);
1153 static void show_shortstats(struct diffstat_t
*data
, struct diff_options
*options
)
1155 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
1160 for (i
= 0; i
< data
->nr
; i
++) {
1161 if (!data
->files
[i
]->is_binary
&&
1162 !data
->files
[i
]->is_unmerged
) {
1163 int added
= data
->files
[i
]->added
;
1164 int deleted
= data
->files
[i
]->deleted
;
1165 if (!data
->files
[i
]->is_renamed
&&
1166 (added
+ deleted
== 0)) {
1174 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
1175 total_files
, adds
, dels
);
1178 static void show_numstat(struct diffstat_t
*data
, struct diff_options
*options
)
1185 for (i
= 0; i
< data
->nr
; i
++) {
1186 struct diffstat_file
*file
= data
->files
[i
];
1188 if (file
->is_binary
)
1189 fprintf(options
->file
, "-\t-\t");
1191 fprintf(options
->file
,
1192 "%"PRIuMAX
"\t%"PRIuMAX
"\t",
1193 file
->added
, file
->deleted
);
1194 if (options
->line_termination
) {
1195 fill_print_name(file
);
1196 if (!file
->is_renamed
)
1197 write_name_quoted(file
->name
, options
->file
,
1198 options
->line_termination
);
1200 fputs(file
->print_name
, options
->file
);
1201 putc(options
->line_termination
, options
->file
);
1204 if (file
->is_renamed
) {
1205 putc('\0', options
->file
);
1206 write_name_quoted(file
->from_name
, options
->file
, '\0');
1208 write_name_quoted(file
->name
, options
->file
, '\0');
1213 struct dirstat_file
{
1215 unsigned long changed
;
1218 struct dirstat_dir
{
1219 struct dirstat_file
*files
;
1220 int alloc
, nr
, percent
, cumulative
;
1223 static long gather_dirstat(FILE *file
, struct dirstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1225 unsigned long this_dir
= 0;
1226 unsigned int sources
= 0;
1229 struct dirstat_file
*f
= dir
->files
;
1230 int namelen
= strlen(f
->name
);
1234 if (namelen
< baselen
)
1236 if (memcmp(f
->name
, base
, baselen
))
1238 slash
= strchr(f
->name
+ baselen
, '/');
1240 int newbaselen
= slash
+ 1 - f
->name
;
1241 this = gather_dirstat(file
, dir
, changed
, f
->name
, newbaselen
);
1253 * We don't report dirstat's for
1255 * - or cases where everything came from a single directory
1256 * under this directory (sources == 1).
1258 if (baselen
&& sources
!= 1) {
1259 int permille
= this_dir
* 1000 / changed
;
1261 int percent
= permille
/ 10;
1262 if (percent
>= dir
->percent
) {
1263 fprintf(file
, "%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1264 if (!dir
->cumulative
)
1272 static int dirstat_compare(const void *_a
, const void *_b
)
1274 const struct dirstat_file
*a
= _a
;
1275 const struct dirstat_file
*b
= _b
;
1276 return strcmp(a
->name
, b
->name
);
1279 static void show_dirstat(struct diff_options
*options
)
1282 unsigned long changed
;
1283 struct dirstat_dir dir
;
1284 struct diff_queue_struct
*q
= &diff_queued_diff
;
1289 dir
.percent
= options
->dirstat_percent
;
1290 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1293 for (i
= 0; i
< q
->nr
; i
++) {
1294 struct diff_filepair
*p
= q
->queue
[i
];
1296 unsigned long copied
, added
, damage
;
1298 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1300 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1301 diff_populate_filespec(p
->one
, 0);
1302 diff_populate_filespec(p
->two
, 0);
1303 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1305 diff_free_filespec_data(p
->one
);
1306 diff_free_filespec_data(p
->two
);
1307 } else if (DIFF_FILE_VALID(p
->one
)) {
1308 diff_populate_filespec(p
->one
, 1);
1310 diff_free_filespec_data(p
->one
);
1311 } else if (DIFF_FILE_VALID(p
->two
)) {
1312 diff_populate_filespec(p
->two
, 1);
1314 added
= p
->two
->size
;
1315 diff_free_filespec_data(p
->two
);
1320 * Original minus copied is the removed material,
1321 * added is the new material. They are both damages
1322 * made to the preimage. In --dirstat-by-file mode, count
1323 * damaged files, not damaged lines. This is done by
1324 * counting only a single damaged line per file.
1326 damage
= (p
->one
->size
- copied
) + added
;
1327 if (DIFF_OPT_TST(options
, DIRSTAT_BY_FILE
) && damage
> 0)
1330 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1331 dir
.files
[dir
.nr
].name
= name
;
1332 dir
.files
[dir
.nr
].changed
= damage
;
1337 /* This can happen even with many files, if everything was renames */
1341 /* Show all directories with more than x% of the changes */
1342 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1343 gather_dirstat(options
->file
, &dir
, changed
, "", 0);
1346 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1349 for (i
= 0; i
< diffstat
->nr
; i
++) {
1350 struct diffstat_file
*f
= diffstat
->files
[i
];
1351 if (f
->name
!= f
->print_name
)
1352 free(f
->print_name
);
1357 free(diffstat
->files
);
1360 struct checkdiff_t
{
1361 const char *filename
;
1363 int conflict_marker_size
;
1364 struct diff_options
*o
;
1369 static int is_conflict_marker(const char *line
, int marker_size
, unsigned long len
)
1374 if (len
< marker_size
+ 1)
1376 firstchar
= line
[0];
1377 switch (firstchar
) {
1378 case '=': case '>': case '<': case '|':
1383 for (cnt
= 1; cnt
< marker_size
; cnt
++)
1384 if (line
[cnt
] != firstchar
)
1386 /* line[1] thru line[marker_size-1] are same as firstchar */
1387 if (len
< marker_size
+ 1 || !isspace(line
[marker_size
]))
1392 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1394 struct checkdiff_t
*data
= priv
;
1395 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1396 int marker_size
= data
->conflict_marker_size
;
1397 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1398 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1399 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1402 if (line
[0] == '+') {
1405 if (is_conflict_marker(line
+ 1, marker_size
, len
- 1)) {
1407 fprintf(data
->o
->file
,
1408 "%s:%d: leftover conflict marker\n",
1409 data
->filename
, data
->lineno
);
1411 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1414 data
->status
|= bad
;
1415 err
= whitespace_error_string(bad
);
1416 fprintf(data
->o
->file
, "%s:%d: %s.\n",
1417 data
->filename
, data
->lineno
, err
);
1419 emit_line(data
->o
->file
, set
, reset
, line
, 1);
1420 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1421 data
->o
->file
, set
, reset
, ws
);
1422 } else if (line
[0] == ' ') {
1424 } else if (line
[0] == '@') {
1425 char *plus
= strchr(line
, '+');
1427 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1429 die("invalid diff");
1433 static unsigned char *deflate_it(char *data
,
1435 unsigned long *result_size
)
1438 unsigned char *deflated
;
1441 memset(&stream
, 0, sizeof(stream
));
1442 deflateInit(&stream
, zlib_compression_level
);
1443 bound
= deflateBound(&stream
, size
);
1444 deflated
= xmalloc(bound
);
1445 stream
.next_out
= deflated
;
1446 stream
.avail_out
= bound
;
1448 stream
.next_in
= (unsigned char *)data
;
1449 stream
.avail_in
= size
;
1450 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1452 deflateEnd(&stream
);
1453 *result_size
= stream
.total_out
;
1457 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1463 unsigned long orig_size
;
1464 unsigned long delta_size
;
1465 unsigned long deflate_size
;
1466 unsigned long data_size
;
1468 /* We could do deflated delta, or we could do just deflated two,
1469 * whichever is smaller.
1472 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1473 if (one
->size
&& two
->size
) {
1474 delta
= diff_delta(one
->ptr
, one
->size
,
1475 two
->ptr
, two
->size
,
1476 &delta_size
, deflate_size
);
1478 void *to_free
= delta
;
1479 orig_size
= delta_size
;
1480 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1485 if (delta
&& delta_size
< deflate_size
) {
1486 fprintf(file
, "delta %lu\n", orig_size
);
1489 data_size
= delta_size
;
1492 fprintf(file
, "literal %lu\n", two
->size
);
1495 data_size
= deflate_size
;
1498 /* emit data encoded in base85 */
1501 int bytes
= (52 < data_size
) ? 52 : data_size
;
1505 line
[0] = bytes
+ 'A' - 1;
1507 line
[0] = bytes
- 26 + 'a' - 1;
1508 encode_85(line
+ 1, cp
, bytes
);
1509 cp
= (char *) cp
+ bytes
;
1513 fprintf(file
, "\n");
1517 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1519 fprintf(file
, "GIT binary patch\n");
1520 emit_binary_diff_body(file
, one
, two
);
1521 emit_binary_diff_body(file
, two
, one
);
1524 static void diff_filespec_load_driver(struct diff_filespec
*one
)
1527 one
->driver
= userdiff_find_by_path(one
->path
);
1529 one
->driver
= userdiff_find_by_name("default");
1532 int diff_filespec_is_binary(struct diff_filespec
*one
)
1534 if (one
->is_binary
== -1) {
1535 diff_filespec_load_driver(one
);
1536 if (one
->driver
->binary
!= -1)
1537 one
->is_binary
= one
->driver
->binary
;
1539 if (!one
->data
&& DIFF_FILE_VALID(one
))
1540 diff_populate_filespec(one
, 0);
1542 one
->is_binary
= buffer_is_binary(one
->data
,
1544 if (one
->is_binary
== -1)
1548 return one
->is_binary
;
1551 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
1553 diff_filespec_load_driver(one
);
1554 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
1557 static const char *userdiff_word_regex(struct diff_filespec
*one
)
1559 diff_filespec_load_driver(one
);
1560 return one
->driver
->word_regex
;
1563 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
1565 if (!options
->a_prefix
)
1566 options
->a_prefix
= a
;
1567 if (!options
->b_prefix
)
1568 options
->b_prefix
= b
;
1571 static struct userdiff_driver
*get_textconv(struct diff_filespec
*one
)
1573 if (!DIFF_FILE_VALID(one
))
1575 if (!S_ISREG(one
->mode
))
1577 diff_filespec_load_driver(one
);
1578 if (!one
->driver
->textconv
)
1581 if (one
->driver
->textconv_want_cache
&& !one
->driver
->textconv_cache
) {
1582 struct notes_cache
*c
= xmalloc(sizeof(*c
));
1583 struct strbuf name
= STRBUF_INIT
;
1585 strbuf_addf(&name
, "textconv/%s", one
->driver
->name
);
1586 notes_cache_init(c
, name
.buf
, one
->driver
->textconv
);
1587 one
->driver
->textconv_cache
= c
;
1593 static void builtin_diff(const char *name_a
,
1595 struct diff_filespec
*one
,
1596 struct diff_filespec
*two
,
1597 const char *xfrm_msg
,
1598 struct diff_options
*o
,
1599 int complete_rewrite
)
1603 char *a_one
, *b_two
;
1604 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1605 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1606 const char *a_prefix
, *b_prefix
;
1607 struct userdiff_driver
*textconv_one
= NULL
;
1608 struct userdiff_driver
*textconv_two
= NULL
;
1609 struct strbuf header
= STRBUF_INIT
;
1611 if (DIFF_OPT_TST(o
, SUBMODULE_LOG
) &&
1612 (!one
->mode
|| S_ISGITLINK(one
->mode
)) &&
1613 (!two
->mode
|| S_ISGITLINK(two
->mode
))) {
1614 const char *del
= diff_get_color_opt(o
, DIFF_FILE_OLD
);
1615 const char *add
= diff_get_color_opt(o
, DIFF_FILE_NEW
);
1616 show_submodule_summary(o
->file
, one
? one
->path
: two
->path
,
1617 one
->sha1
, two
->sha1
, two
->dirty_submodule
,
1622 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
1623 textconv_one
= get_textconv(one
);
1624 textconv_two
= get_textconv(two
);
1627 diff_set_mnemonic_prefix(o
, "a/", "b/");
1628 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
1629 a_prefix
= o
->b_prefix
;
1630 b_prefix
= o
->a_prefix
;
1632 a_prefix
= o
->a_prefix
;
1633 b_prefix
= o
->b_prefix
;
1636 /* Never use a non-valid filename anywhere if at all possible */
1637 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
1638 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
1640 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
1641 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
1642 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1643 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1644 strbuf_addf(&header
, "%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1645 if (lbl
[0][0] == '/') {
1647 strbuf_addf(&header
, "%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1648 if (xfrm_msg
&& xfrm_msg
[0])
1649 strbuf_addf(&header
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1651 else if (lbl
[1][0] == '/') {
1652 strbuf_addf(&header
, "%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1653 if (xfrm_msg
&& xfrm_msg
[0])
1654 strbuf_addf(&header
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1657 if (one
->mode
!= two
->mode
) {
1658 strbuf_addf(&header
, "%sold mode %06o%s\n", set
, one
->mode
, reset
);
1659 strbuf_addf(&header
, "%snew mode %06o%s\n", set
, two
->mode
, reset
);
1661 if (xfrm_msg
&& xfrm_msg
[0])
1662 strbuf_addf(&header
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1665 * we do not run diff between different kind
1668 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1669 goto free_ab_and_return
;
1670 if (complete_rewrite
&&
1671 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
1672 (textconv_two
|| !diff_filespec_is_binary(two
))) {
1673 fprintf(o
->file
, "%s", header
.buf
);
1674 strbuf_reset(&header
);
1675 emit_rewrite_diff(name_a
, name_b
, one
, two
,
1676 textconv_one
, textconv_two
, o
);
1677 o
->found_changes
= 1;
1678 goto free_ab_and_return
;
1682 if (!DIFF_OPT_TST(o
, TEXT
) &&
1683 ( (!textconv_one
&& diff_filespec_is_binary(one
)) ||
1684 (!textconv_two
&& diff_filespec_is_binary(two
)) )) {
1685 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1686 die("unable to read files to diff");
1687 /* Quite common confusing case */
1688 if (mf1
.size
== mf2
.size
&&
1689 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1690 goto free_ab_and_return
;
1691 fprintf(o
->file
, "%s", header
.buf
);
1692 strbuf_reset(&header
);
1693 if (DIFF_OPT_TST(o
, BINARY
))
1694 emit_binary_diff(o
->file
, &mf1
, &mf2
);
1696 fprintf(o
->file
, "Binary files %s and %s differ\n",
1698 o
->found_changes
= 1;
1701 /* Crazy xdl interfaces.. */
1702 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1705 struct emit_callback ecbdata
;
1706 const struct userdiff_funcname
*pe
;
1708 if (!DIFF_XDL_TST(o
, WHITESPACE_FLAGS
)) {
1709 fprintf(o
->file
, "%s", header
.buf
);
1710 strbuf_reset(&header
);
1713 mf1
.size
= fill_textconv(textconv_one
, one
, &mf1
.ptr
);
1714 mf2
.size
= fill_textconv(textconv_two
, two
, &mf2
.ptr
);
1716 pe
= diff_funcname_pattern(one
);
1718 pe
= diff_funcname_pattern(two
);
1720 memset(&xpp
, 0, sizeof(xpp
));
1721 memset(&xecfg
, 0, sizeof(xecfg
));
1722 memset(&ecbdata
, 0, sizeof(ecbdata
));
1723 ecbdata
.label_path
= lbl
;
1724 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1725 ecbdata
.found_changesp
= &o
->found_changes
;
1726 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1727 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
1728 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1729 ecbdata
.file
= o
->file
;
1730 ecbdata
.header
= header
.len
? &header
: NULL
;
1731 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1732 xecfg
.ctxlen
= o
->context
;
1733 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
1734 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1736 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
1739 else if (!prefixcmp(diffopts
, "--unified="))
1740 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1741 else if (!prefixcmp(diffopts
, "-u"))
1742 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1743 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
)) {
1744 ecbdata
.diff_words
=
1745 xcalloc(1, sizeof(struct diff_words_data
));
1746 ecbdata
.diff_words
->file
= o
->file
;
1748 o
->word_regex
= userdiff_word_regex(one
);
1750 o
->word_regex
= userdiff_word_regex(two
);
1752 o
->word_regex
= diff_word_regex_cfg
;
1753 if (o
->word_regex
) {
1754 ecbdata
.diff_words
->word_regex
= (regex_t
*)
1755 xmalloc(sizeof(regex_t
));
1756 if (regcomp(ecbdata
.diff_words
->word_regex
,
1758 REG_EXTENDED
| REG_NEWLINE
))
1759 die ("Invalid regular expression: %s",
1763 xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
1765 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1766 free_diff_words_data(&ecbdata
);
1771 xdiff_clear_find_func(&xecfg
);
1775 strbuf_release(&header
);
1776 diff_free_filespec_data(one
);
1777 diff_free_filespec_data(two
);
1783 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1784 struct diff_filespec
*one
,
1785 struct diff_filespec
*two
,
1786 struct diffstat_t
*diffstat
,
1787 struct diff_options
*o
,
1788 int complete_rewrite
)
1791 struct diffstat_file
*data
;
1793 data
= diffstat_add(diffstat
, name_a
, name_b
);
1796 data
->is_unmerged
= 1;
1799 if (complete_rewrite
) {
1800 diff_populate_filespec(one
, 0);
1801 diff_populate_filespec(two
, 0);
1802 data
->deleted
= count_lines(one
->data
, one
->size
);
1803 data
->added
= count_lines(two
->data
, two
->size
);
1804 goto free_and_return
;
1806 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1807 die("unable to read files to diff");
1809 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1810 data
->is_binary
= 1;
1811 data
->added
= mf2
.size
;
1812 data
->deleted
= mf1
.size
;
1814 /* Crazy xdl interfaces.. */
1818 memset(&xpp
, 0, sizeof(xpp
));
1819 memset(&xecfg
, 0, sizeof(xecfg
));
1820 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1821 xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
1826 diff_free_filespec_data(one
);
1827 diff_free_filespec_data(two
);
1830 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1831 const char *attr_path
,
1832 struct diff_filespec
*one
,
1833 struct diff_filespec
*two
,
1834 struct diff_options
*o
)
1837 struct checkdiff_t data
;
1842 memset(&data
, 0, sizeof(data
));
1843 data
.filename
= name_b
? name_b
: name_a
;
1846 data
.ws_rule
= whitespace_rule(attr_path
);
1847 data
.conflict_marker_size
= ll_merge_marker_size(attr_path
);
1849 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1850 die("unable to read files to diff");
1853 * All the other codepaths check both sides, but not checking
1854 * the "old" side here is deliberate. We are checking the newly
1855 * introduced changes, and as long as the "new" side is text, we
1856 * can and should check what it introduces.
1858 if (diff_filespec_is_binary(two
))
1859 goto free_and_return
;
1861 /* Crazy xdl interfaces.. */
1865 memset(&xpp
, 0, sizeof(xpp
));
1866 memset(&xecfg
, 0, sizeof(xecfg
));
1867 xecfg
.ctxlen
= 1; /* at least one context line */
1868 xpp
.flags
= XDF_NEED_MINIMAL
;
1869 xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
1872 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
1873 struct emit_callback ecbdata
;
1876 ecbdata
.ws_rule
= data
.ws_rule
;
1877 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1878 blank_at_eof
= ecbdata
.blank_at_eof_in_preimage
;
1883 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
1884 fprintf(o
->file
, "%s:%d: %s.\n",
1885 data
.filename
, blank_at_eof
, err
);
1886 data
.status
= 1; /* report errors */
1891 diff_free_filespec_data(one
);
1892 diff_free_filespec_data(two
);
1894 DIFF_OPT_SET(o
, CHECK_FAILED
);
1897 struct diff_filespec
*alloc_filespec(const char *path
)
1899 int namelen
= strlen(path
);
1900 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1902 memset(spec
, 0, sizeof(*spec
));
1903 spec
->path
= (char *)(spec
+ 1);
1904 memcpy(spec
->path
, path
, namelen
+1);
1906 spec
->is_binary
= -1;
1910 void free_filespec(struct diff_filespec
*spec
)
1912 if (!--spec
->count
) {
1913 diff_free_filespec_data(spec
);
1918 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1919 unsigned short mode
)
1922 spec
->mode
= canon_mode(mode
);
1923 hashcpy(spec
->sha1
, sha1
);
1924 spec
->sha1_valid
= !is_null_sha1(sha1
);
1929 * Given a name and sha1 pair, if the index tells us the file in
1930 * the work tree has that object contents, return true, so that
1931 * prepare_temp_file() does not have to inflate and extract.
1933 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1935 struct cache_entry
*ce
;
1940 * We do not read the cache ourselves here, because the
1941 * benchmark with my previous version that always reads cache
1942 * shows that it makes things worse for diff-tree comparing
1943 * two linux-2.6 kernel trees in an already checked out work
1944 * tree. This is because most diff-tree comparisons deal with
1945 * only a small number of files, while reading the cache is
1946 * expensive for a large project, and its cost outweighs the
1947 * savings we get by not inflating the object to a temporary
1948 * file. Practically, this code only helps when we are used
1949 * by diff-cache --cached, which does read the cache before
1955 /* We want to avoid the working directory if our caller
1956 * doesn't need the data in a normal file, this system
1957 * is rather slow with its stat/open/mmap/close syscalls,
1958 * and the object is contained in a pack file. The pack
1959 * is probably already open and will be faster to obtain
1960 * the data through than the working directory. Loose
1961 * objects however would tend to be slower as they need
1962 * to be individually opened and inflated.
1964 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
))
1968 pos
= cache_name_pos(name
, len
);
1971 ce
= active_cache
[pos
];
1974 * This is not the sha1 we are looking for, or
1975 * unreusable because it is not a regular file.
1977 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1981 * If ce is marked as "assume unchanged", there is no
1982 * guarantee that work tree matches what we are looking for.
1984 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1988 * If ce matches the file in the work tree, we can reuse it.
1990 if (ce_uptodate(ce
) ||
1991 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1997 static int populate_from_stdin(struct diff_filespec
*s
)
1999 struct strbuf buf
= STRBUF_INIT
;
2002 if (strbuf_read(&buf
, 0, 0) < 0)
2003 return error("error while reading from stdin %s",
2006 s
->should_munmap
= 0;
2007 s
->data
= strbuf_detach(&buf
, &size
);
2013 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
2016 char *data
= xmalloc(100), *dirty
= "";
2018 /* Are we looking at the work tree? */
2019 if (s
->dirty_submodule
)
2022 len
= snprintf(data
, 100,
2023 "Subproject commit %s%s\n", sha1_to_hex(s
->sha1
), dirty
);
2035 * While doing rename detection and pickaxe operation, we may need to
2036 * grab the data for the blob (or file) for our own in-core comparison.
2037 * diff_filespec has data and size fields for this purpose.
2039 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
2042 if (!DIFF_FILE_VALID(s
))
2043 die("internal error: asking to populate invalid file.");
2044 if (S_ISDIR(s
->mode
))
2050 if (size_only
&& 0 < s
->size
)
2053 if (S_ISGITLINK(s
->mode
))
2054 return diff_populate_gitlink(s
, size_only
);
2056 if (!s
->sha1_valid
||
2057 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
2058 struct strbuf buf
= STRBUF_INIT
;
2062 if (!strcmp(s
->path
, "-"))
2063 return populate_from_stdin(s
);
2065 if (lstat(s
->path
, &st
) < 0) {
2066 if (errno
== ENOENT
) {
2070 s
->data
= (char *)"";
2075 s
->size
= xsize_t(st
.st_size
);
2078 if (S_ISLNK(st
.st_mode
)) {
2079 struct strbuf sb
= STRBUF_INIT
;
2081 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
2084 s
->data
= strbuf_detach(&sb
, NULL
);
2090 fd
= open(s
->path
, O_RDONLY
);
2093 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
2095 s
->should_munmap
= 1;
2098 * Convert from working tree format to canonical git format
2100 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
2102 munmap(s
->data
, s
->size
);
2103 s
->should_munmap
= 0;
2104 s
->data
= strbuf_detach(&buf
, &size
);
2110 enum object_type type
;
2112 type
= sha1_object_info(s
->sha1
, &s
->size
);
2114 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
2121 void diff_free_filespec_blob(struct diff_filespec
*s
)
2125 else if (s
->should_munmap
)
2126 munmap(s
->data
, s
->size
);
2128 if (s
->should_free
|| s
->should_munmap
) {
2129 s
->should_free
= s
->should_munmap
= 0;
2134 void diff_free_filespec_data(struct diff_filespec
*s
)
2136 diff_free_filespec_blob(s
);
2141 static void prep_temp_blob(const char *path
, struct diff_tempfile
*temp
,
2144 const unsigned char *sha1
,
2148 struct strbuf buf
= STRBUF_INIT
;
2149 struct strbuf
template = STRBUF_INIT
;
2150 char *path_dup
= xstrdup(path
);
2151 const char *base
= basename(path_dup
);
2153 /* Generate "XXXXXX_basename.ext" */
2154 strbuf_addstr(&template, "XXXXXX_");
2155 strbuf_addstr(&template, base
);
2157 fd
= git_mkstemps(temp
->tmp_path
, PATH_MAX
, template.buf
,
2160 die_errno("unable to create temp-file");
2161 if (convert_to_working_tree(path
,
2162 (const char *)blob
, (size_t)size
, &buf
)) {
2166 if (write_in_full(fd
, blob
, size
) != size
)
2167 die_errno("unable to write temp-file");
2169 temp
->name
= temp
->tmp_path
;
2170 strcpy(temp
->hex
, sha1_to_hex(sha1
));
2172 sprintf(temp
->mode
, "%06o", mode
);
2173 strbuf_release(&buf
);
2174 strbuf_release(&template);
2178 static struct diff_tempfile
*prepare_temp_file(const char *name
,
2179 struct diff_filespec
*one
)
2181 struct diff_tempfile
*temp
= claim_diff_tempfile();
2183 if (!DIFF_FILE_VALID(one
)) {
2185 /* A '-' entry produces this for file-2, and
2186 * a '+' entry produces this for file-1.
2188 temp
->name
= "/dev/null";
2189 strcpy(temp
->hex
, ".");
2190 strcpy(temp
->mode
, ".");
2194 if (!remove_tempfile_installed
) {
2195 atexit(remove_tempfile
);
2196 sigchain_push_common(remove_tempfile_on_signal
);
2197 remove_tempfile_installed
= 1;
2200 if (!one
->sha1_valid
||
2201 reuse_worktree_file(name
, one
->sha1
, 1)) {
2203 if (lstat(name
, &st
) < 0) {
2204 if (errno
== ENOENT
)
2205 goto not_a_valid_file
;
2206 die_errno("stat(%s)", name
);
2208 if (S_ISLNK(st
.st_mode
)) {
2209 struct strbuf sb
= STRBUF_INIT
;
2210 if (strbuf_readlink(&sb
, name
, st
.st_size
) < 0)
2211 die_errno("readlink(%s)", name
);
2212 prep_temp_blob(name
, temp
, sb
.buf
, sb
.len
,
2214 one
->sha1
: null_sha1
),
2216 one
->mode
: S_IFLNK
));
2217 strbuf_release(&sb
);
2220 /* we can borrow from the file in the work tree */
2222 if (!one
->sha1_valid
)
2223 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
2225 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
2226 /* Even though we may sometimes borrow the
2227 * contents from the work tree, we always want
2228 * one->mode. mode is trustworthy even when
2229 * !(one->sha1_valid), as long as
2230 * DIFF_FILE_VALID(one).
2232 sprintf(temp
->mode
, "%06o", one
->mode
);
2237 if (diff_populate_filespec(one
, 0))
2238 die("cannot read data blob for %s", one
->path
);
2239 prep_temp_blob(name
, temp
, one
->data
, one
->size
,
2240 one
->sha1
, one
->mode
);
2245 /* An external diff command takes:
2247 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2248 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2251 static void run_external_diff(const char *pgm
,
2254 struct diff_filespec
*one
,
2255 struct diff_filespec
*two
,
2256 const char *xfrm_msg
,
2257 int complete_rewrite
)
2259 const char *spawn_arg
[10];
2261 const char **arg
= &spawn_arg
[0];
2264 struct diff_tempfile
*temp_one
, *temp_two
;
2265 const char *othername
= (other
? other
: name
);
2266 temp_one
= prepare_temp_file(name
, one
);
2267 temp_two
= prepare_temp_file(othername
, two
);
2270 *arg
++ = temp_one
->name
;
2271 *arg
++ = temp_one
->hex
;
2272 *arg
++ = temp_one
->mode
;
2273 *arg
++ = temp_two
->name
;
2274 *arg
++ = temp_two
->hex
;
2275 *arg
++ = temp_two
->mode
;
2286 retval
= run_command_v_opt(spawn_arg
, RUN_USING_SHELL
);
2289 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2294 static int similarity_index(struct diff_filepair
*p
)
2296 return p
->score
* 100 / MAX_SCORE
;
2299 static void fill_metainfo(struct strbuf
*msg
,
2302 struct diff_filespec
*one
,
2303 struct diff_filespec
*two
,
2304 struct diff_options
*o
,
2305 struct diff_filepair
*p
)
2307 strbuf_init(msg
, PATH_MAX
* 2 + 300);
2308 switch (p
->status
) {
2309 case DIFF_STATUS_COPIED
:
2310 strbuf_addf(msg
, "similarity index %d%%", similarity_index(p
));
2311 strbuf_addstr(msg
, "\ncopy from ");
2312 quote_c_style(name
, msg
, NULL
, 0);
2313 strbuf_addstr(msg
, "\ncopy to ");
2314 quote_c_style(other
, msg
, NULL
, 0);
2315 strbuf_addch(msg
, '\n');
2317 case DIFF_STATUS_RENAMED
:
2318 strbuf_addf(msg
, "similarity index %d%%", similarity_index(p
));
2319 strbuf_addstr(msg
, "\nrename from ");
2320 quote_c_style(name
, msg
, NULL
, 0);
2321 strbuf_addstr(msg
, "\nrename to ");
2322 quote_c_style(other
, msg
, NULL
, 0);
2323 strbuf_addch(msg
, '\n');
2325 case DIFF_STATUS_MODIFIED
:
2327 strbuf_addf(msg
, "dissimilarity index %d%%\n",
2328 similarity_index(p
));
2336 if (one
&& two
&& hashcmp(one
->sha1
, two
->sha1
)) {
2337 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2339 if (DIFF_OPT_TST(o
, BINARY
)) {
2341 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2342 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2345 strbuf_addf(msg
, "index %.*s..%.*s",
2346 abbrev
, sha1_to_hex(one
->sha1
),
2347 abbrev
, sha1_to_hex(two
->sha1
));
2348 if (one
->mode
== two
->mode
)
2349 strbuf_addf(msg
, " %06o", one
->mode
);
2350 strbuf_addch(msg
, '\n');
2353 strbuf_setlen(msg
, msg
->len
- 1);
2356 static void run_diff_cmd(const char *pgm
,
2359 const char *attr_path
,
2360 struct diff_filespec
*one
,
2361 struct diff_filespec
*two
,
2363 struct diff_options
*o
,
2364 struct diff_filepair
*p
)
2366 const char *xfrm_msg
= NULL
;
2367 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
2370 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
);
2371 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
2374 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2377 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
2378 if (drv
&& drv
->external
)
2379 pgm
= drv
->external
;
2383 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2388 builtin_diff(name
, other
? other
: name
,
2389 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2391 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2394 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2396 if (DIFF_FILE_VALID(one
)) {
2397 if (!one
->sha1_valid
) {
2399 if (!strcmp(one
->path
, "-")) {
2400 hashcpy(one
->sha1
, null_sha1
);
2403 if (lstat(one
->path
, &st
) < 0)
2404 die_errno("stat '%s'", one
->path
);
2405 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2406 die("cannot hash %s", one
->path
);
2413 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2415 /* Strip the prefix but do not molest /dev/null and absolute paths */
2416 if (*namep
&& **namep
!= '/')
2417 *namep
+= prefix_length
;
2418 if (*otherp
&& **otherp
!= '/')
2419 *otherp
+= prefix_length
;
2422 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2424 const char *pgm
= external_diff();
2426 struct diff_filespec
*one
= p
->one
;
2427 struct diff_filespec
*two
= p
->two
;
2430 const char *attr_path
;
2432 name
= p
->one
->path
;
2433 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2435 if (o
->prefix_length
)
2436 strip_prefix(o
->prefix_length
, &name
, &other
);
2438 if (DIFF_PAIR_UNMERGED(p
)) {
2439 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2440 NULL
, NULL
, NULL
, o
, p
);
2444 diff_fill_sha1_info(one
);
2445 diff_fill_sha1_info(two
);
2448 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2449 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2451 * a filepair that changes between file and symlink
2452 * needs to be split into deletion and creation.
2454 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2455 run_diff_cmd(NULL
, name
, other
, attr_path
,
2456 one
, null
, &msg
, o
, p
);
2458 strbuf_release(&msg
);
2460 null
= alloc_filespec(one
->path
);
2461 run_diff_cmd(NULL
, name
, other
, attr_path
,
2462 null
, two
, &msg
, o
, p
);
2466 run_diff_cmd(pgm
, name
, other
, attr_path
,
2467 one
, two
, &msg
, o
, p
);
2469 strbuf_release(&msg
);
2472 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2473 struct diffstat_t
*diffstat
)
2477 int complete_rewrite
= 0;
2479 if (DIFF_PAIR_UNMERGED(p
)) {
2481 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2485 name
= p
->one
->path
;
2486 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2488 if (o
->prefix_length
)
2489 strip_prefix(o
->prefix_length
, &name
, &other
);
2491 diff_fill_sha1_info(p
->one
);
2492 diff_fill_sha1_info(p
->two
);
2494 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2495 complete_rewrite
= 1;
2496 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2499 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2503 const char *attr_path
;
2505 if (DIFF_PAIR_UNMERGED(p
)) {
2510 name
= p
->one
->path
;
2511 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2512 attr_path
= other
? other
: name
;
2514 if (o
->prefix_length
)
2515 strip_prefix(o
->prefix_length
, &name
, &other
);
2517 diff_fill_sha1_info(p
->one
);
2518 diff_fill_sha1_info(p
->two
);
2520 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2523 void diff_setup(struct diff_options
*options
)
2525 memset(options
, 0, sizeof(*options
));
2527 options
->file
= stdout
;
2529 options
->line_termination
= '\n';
2530 options
->break_opt
= -1;
2531 options
->rename_limit
= -1;
2532 options
->dirstat_percent
= 3;
2533 options
->context
= 3;
2535 options
->change
= diff_change
;
2536 options
->add_remove
= diff_addremove
;
2537 if (diff_use_color_default
> 0)
2538 DIFF_OPT_SET(options
, COLOR_DIFF
);
2539 options
->detect_rename
= diff_detect_rename_default
;
2541 if (!diff_mnemonic_prefix
) {
2542 options
->a_prefix
= "a/";
2543 options
->b_prefix
= "b/";
2547 int diff_setup_done(struct diff_options
*options
)
2551 if (options
->output_format
& DIFF_FORMAT_NAME
)
2553 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2555 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2557 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2560 die("--name-only, --name-status, --check and -s are mutually exclusive");
2563 * Most of the time we can say "there are changes"
2564 * only by checking if there are changed paths, but
2565 * --ignore-whitespace* options force us to look
2569 if (DIFF_XDL_TST(options
, IGNORE_WHITESPACE
) ||
2570 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_CHANGE
) ||
2571 DIFF_XDL_TST(options
, IGNORE_WHITESPACE_AT_EOL
))
2572 DIFF_OPT_SET(options
, DIFF_FROM_CONTENTS
);
2574 DIFF_OPT_CLR(options
, DIFF_FROM_CONTENTS
);
2576 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2577 options
->detect_rename
= DIFF_DETECT_COPY
;
2579 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2580 options
->prefix
= NULL
;
2581 if (options
->prefix
)
2582 options
->prefix_length
= strlen(options
->prefix
);
2584 options
->prefix_length
= 0;
2586 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2587 DIFF_FORMAT_NAME_STATUS
|
2588 DIFF_FORMAT_CHECKDIFF
|
2589 DIFF_FORMAT_NO_OUTPUT
))
2590 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2591 DIFF_FORMAT_NUMSTAT
|
2592 DIFF_FORMAT_DIFFSTAT
|
2593 DIFF_FORMAT_SHORTSTAT
|
2594 DIFF_FORMAT_DIRSTAT
|
2595 DIFF_FORMAT_SUMMARY
|
2599 * These cases always need recursive; we do not drop caller-supplied
2600 * recursive bits for other formats here.
2602 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2603 DIFF_FORMAT_NUMSTAT
|
2604 DIFF_FORMAT_DIFFSTAT
|
2605 DIFF_FORMAT_SHORTSTAT
|
2606 DIFF_FORMAT_DIRSTAT
|
2607 DIFF_FORMAT_SUMMARY
|
2608 DIFF_FORMAT_CHECKDIFF
))
2609 DIFF_OPT_SET(options
, RECURSIVE
);
2611 * Also pickaxe would not work very well if you do not say recursive
2613 if (options
->pickaxe
)
2614 DIFF_OPT_SET(options
, RECURSIVE
);
2616 * When patches are generated, submodules diffed against the work tree
2617 * must be checked for dirtiness too so it can be shown in the output
2619 if (options
->output_format
& DIFF_FORMAT_PATCH
)
2620 DIFF_OPT_SET(options
, DIRTY_SUBMODULES
);
2622 if (options
->detect_rename
&& options
->rename_limit
< 0)
2623 options
->rename_limit
= diff_rename_limit_default
;
2624 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2626 /* read-cache does not die even when it fails
2627 * so it is safe for us to do this here. Also
2628 * it does not smudge active_cache or active_nr
2629 * when it fails, so we do not have to worry about
2630 * cleaning it up ourselves either.
2634 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2635 options
->abbrev
= 40; /* full */
2638 * It does not make sense to show the first hit we happened
2639 * to have found. It does not make sense not to return with
2640 * exit code in such a case either.
2642 if (DIFF_OPT_TST(options
, QUICK
)) {
2643 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2644 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2650 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2660 if (c
== arg_short
) {
2664 if (val
&& isdigit(c
)) {
2666 int n
= strtoul(arg
, &end
, 10);
2677 eq
= strchr(arg
, '=');
2682 if (!len
|| strncmp(arg
, arg_long
, len
))
2687 if (!isdigit(*++eq
))
2689 n
= strtoul(eq
, &end
, 10);
2697 static int diff_scoreopt_parse(const char *opt
);
2699 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2701 const char *arg
= av
[0];
2703 /* Output format options */
2704 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u") || !strcmp(arg
, "--patch"))
2705 options
->output_format
|= DIFF_FORMAT_PATCH
;
2706 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2707 options
->output_format
|= DIFF_FORMAT_PATCH
;
2708 else if (!strcmp(arg
, "--raw"))
2709 options
->output_format
|= DIFF_FORMAT_RAW
;
2710 else if (!strcmp(arg
, "--patch-with-raw"))
2711 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2712 else if (!strcmp(arg
, "--numstat"))
2713 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2714 else if (!strcmp(arg
, "--shortstat"))
2715 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2716 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2717 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2718 else if (!strcmp(arg
, "--cumulative")) {
2719 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2720 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
2721 } else if (opt_arg(arg
, 0, "dirstat-by-file",
2722 &options
->dirstat_percent
)) {
2723 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2724 DIFF_OPT_SET(options
, DIRSTAT_BY_FILE
);
2726 else if (!strcmp(arg
, "--check"))
2727 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2728 else if (!strcmp(arg
, "--summary"))
2729 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2730 else if (!strcmp(arg
, "--patch-with-stat"))
2731 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2732 else if (!strcmp(arg
, "--name-only"))
2733 options
->output_format
|= DIFF_FORMAT_NAME
;
2734 else if (!strcmp(arg
, "--name-status"))
2735 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2736 else if (!strcmp(arg
, "-s"))
2737 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2738 else if (!prefixcmp(arg
, "--stat")) {
2740 int width
= options
->stat_width
;
2741 int name_width
= options
->stat_name_width
;
2747 if (!prefixcmp(arg
, "-width="))
2748 width
= strtoul(arg
+ 7, &end
, 10);
2749 else if (!prefixcmp(arg
, "-name-width="))
2750 name_width
= strtoul(arg
+ 12, &end
, 10);
2753 width
= strtoul(arg
+1, &end
, 10);
2755 name_width
= strtoul(end
+1, &end
, 10);
2758 /* Important! This checks all the error cases! */
2761 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2762 options
->stat_name_width
= name_width
;
2763 options
->stat_width
= width
;
2766 /* renames options */
2767 else if (!prefixcmp(arg
, "-B")) {
2768 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2771 else if (!prefixcmp(arg
, "-M")) {
2772 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2774 options
->detect_rename
= DIFF_DETECT_RENAME
;
2776 else if (!prefixcmp(arg
, "-C")) {
2777 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2778 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2779 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2781 options
->detect_rename
= DIFF_DETECT_COPY
;
2783 else if (!strcmp(arg
, "--no-renames"))
2784 options
->detect_rename
= 0;
2785 else if (!strcmp(arg
, "--relative"))
2786 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2787 else if (!prefixcmp(arg
, "--relative=")) {
2788 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2789 options
->prefix
= arg
+ 11;
2793 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2794 DIFF_XDL_SET(options
, IGNORE_WHITESPACE
);
2795 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2796 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_CHANGE
);
2797 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2798 DIFF_XDL_SET(options
, IGNORE_WHITESPACE_AT_EOL
);
2799 else if (!strcmp(arg
, "--patience"))
2800 DIFF_XDL_SET(options
, PATIENCE_DIFF
);
2803 else if (!strcmp(arg
, "--binary")) {
2804 options
->output_format
|= DIFF_FORMAT_PATCH
;
2805 DIFF_OPT_SET(options
, BINARY
);
2807 else if (!strcmp(arg
, "--full-index"))
2808 DIFF_OPT_SET(options
, FULL_INDEX
);
2809 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2810 DIFF_OPT_SET(options
, TEXT
);
2811 else if (!strcmp(arg
, "-R"))
2812 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2813 else if (!strcmp(arg
, "--find-copies-harder"))
2814 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2815 else if (!strcmp(arg
, "--follow"))
2816 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2817 else if (!strcmp(arg
, "--color"))
2818 DIFF_OPT_SET(options
, COLOR_DIFF
);
2819 else if (!prefixcmp(arg
, "--color=")) {
2820 int value
= git_config_colorbool(NULL
, arg
+8, -1);
2822 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2824 DIFF_OPT_SET(options
, COLOR_DIFF
);
2826 return error("option `color' expects \"always\", \"auto\", or \"never\"");
2828 else if (!strcmp(arg
, "--no-color"))
2829 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2830 else if (!strcmp(arg
, "--color-words")) {
2831 DIFF_OPT_SET(options
, COLOR_DIFF
);
2832 DIFF_OPT_SET(options
, COLOR_DIFF_WORDS
);
2834 else if (!prefixcmp(arg
, "--color-words=")) {
2835 DIFF_OPT_SET(options
, COLOR_DIFF
);
2836 DIFF_OPT_SET(options
, COLOR_DIFF_WORDS
);
2837 options
->word_regex
= arg
+ 14;
2839 else if (!strcmp(arg
, "--exit-code"))
2840 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2841 else if (!strcmp(arg
, "--quiet"))
2842 DIFF_OPT_SET(options
, QUICK
);
2843 else if (!strcmp(arg
, "--ext-diff"))
2844 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2845 else if (!strcmp(arg
, "--no-ext-diff"))
2846 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2847 else if (!strcmp(arg
, "--textconv"))
2848 DIFF_OPT_SET(options
, ALLOW_TEXTCONV
);
2849 else if (!strcmp(arg
, "--no-textconv"))
2850 DIFF_OPT_CLR(options
, ALLOW_TEXTCONV
);
2851 else if (!strcmp(arg
, "--ignore-submodules"))
2852 DIFF_OPT_SET(options
, IGNORE_SUBMODULES
);
2853 else if (!strcmp(arg
, "--submodule"))
2854 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
2855 else if (!prefixcmp(arg
, "--submodule=")) {
2856 if (!strcmp(arg
+ 12, "log"))
2857 DIFF_OPT_SET(options
, SUBMODULE_LOG
);
2861 else if (!strcmp(arg
, "-z"))
2862 options
->line_termination
= 0;
2863 else if (!prefixcmp(arg
, "-l"))
2864 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2865 else if (!prefixcmp(arg
, "-S"))
2866 options
->pickaxe
= arg
+ 2;
2867 else if (!strcmp(arg
, "--pickaxe-all"))
2868 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2869 else if (!strcmp(arg
, "--pickaxe-regex"))
2870 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2871 else if (!prefixcmp(arg
, "-O"))
2872 options
->orderfile
= arg
+ 2;
2873 else if (!prefixcmp(arg
, "--diff-filter="))
2874 options
->filter
= arg
+ 14;
2875 else if (!strcmp(arg
, "--abbrev"))
2876 options
->abbrev
= DEFAULT_ABBREV
;
2877 else if (!prefixcmp(arg
, "--abbrev=")) {
2878 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2879 if (options
->abbrev
< MINIMUM_ABBREV
)
2880 options
->abbrev
= MINIMUM_ABBREV
;
2881 else if (40 < options
->abbrev
)
2882 options
->abbrev
= 40;
2884 else if (!prefixcmp(arg
, "--src-prefix="))
2885 options
->a_prefix
= arg
+ 13;
2886 else if (!prefixcmp(arg
, "--dst-prefix="))
2887 options
->b_prefix
= arg
+ 13;
2888 else if (!strcmp(arg
, "--no-prefix"))
2889 options
->a_prefix
= options
->b_prefix
= "";
2890 else if (opt_arg(arg
, '\0', "inter-hunk-context",
2891 &options
->interhunkcontext
))
2893 else if (!prefixcmp(arg
, "--output=")) {
2894 options
->file
= fopen(arg
+ strlen("--output="), "w");
2896 die_errno("Could not open '%s'", arg
+ strlen("--output="));
2897 options
->close_file
= 1;
2903 static int parse_num(const char **cp_p
)
2905 unsigned long num
, scale
;
2907 const char *cp
= *cp_p
;
2914 if ( !dot
&& ch
== '.' ) {
2917 } else if ( ch
== '%' ) {
2918 scale
= dot
? scale
*100 : 100;
2919 cp
++; /* % is always at the end */
2921 } else if ( ch
>= '0' && ch
<= '9' ) {
2922 if ( scale
< 100000 ) {
2924 num
= (num
*10) + (ch
-'0');
2933 /* user says num divided by scale and we say internally that
2934 * is MAX_SCORE * num / scale.
2936 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2939 static int diff_scoreopt_parse(const char *opt
)
2941 int opt1
, opt2
, cmd
;
2946 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2947 return -1; /* that is not a -M, -C nor -B option */
2949 opt1
= parse_num(&opt
);
2955 else if (*opt
!= '/')
2956 return -1; /* we expect -B80/99 or -B80 */
2959 opt2
= parse_num(&opt
);
2964 return opt1
| (opt2
<< 16);
2967 struct diff_queue_struct diff_queued_diff
;
2969 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2971 if (queue
->alloc
<= queue
->nr
) {
2972 queue
->alloc
= alloc_nr(queue
->alloc
);
2973 queue
->queue
= xrealloc(queue
->queue
,
2974 sizeof(dp
) * queue
->alloc
);
2976 queue
->queue
[queue
->nr
++] = dp
;
2979 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2980 struct diff_filespec
*one
,
2981 struct diff_filespec
*two
)
2983 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2991 void diff_free_filepair(struct diff_filepair
*p
)
2993 free_filespec(p
->one
);
2994 free_filespec(p
->two
);
2998 /* This is different from find_unique_abbrev() in that
2999 * it stuffs the result with dots for alignment.
3001 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
3006 return sha1_to_hex(sha1
);
3008 abbrev
= find_unique_abbrev(sha1
, len
);
3009 abblen
= strlen(abbrev
);
3011 static char hex
[41];
3012 if (len
< abblen
&& abblen
<= len
+ 2)
3013 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
3015 sprintf(hex
, "%s...", abbrev
);
3018 return sha1_to_hex(sha1
);
3021 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
3023 int line_termination
= opt
->line_termination
;
3024 int inter_name_termination
= line_termination
? '\t' : '\0';
3026 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
3027 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
3028 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
3029 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
3032 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
3033 inter_name_termination
);
3035 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
3038 if (p
->status
== DIFF_STATUS_COPIED
||
3039 p
->status
== DIFF_STATUS_RENAMED
) {
3040 const char *name_a
, *name_b
;
3041 name_a
= p
->one
->path
;
3042 name_b
= p
->two
->path
;
3043 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3044 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
3045 write_name_quoted(name_b
, opt
->file
, line_termination
);
3047 const char *name_a
, *name_b
;
3048 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
3050 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3051 write_name_quoted(name_a
, opt
->file
, line_termination
);
3055 int diff_unmodified_pair(struct diff_filepair
*p
)
3057 /* This function is written stricter than necessary to support
3058 * the currently implemented transformers, but the idea is to
3059 * let transformers to produce diff_filepairs any way they want,
3060 * and filter and clean them up here before producing the output.
3062 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
3064 if (DIFF_PAIR_UNMERGED(p
))
3065 return 0; /* unmerged is interesting */
3067 /* deletion, addition, mode or type change
3068 * and rename are all interesting.
3070 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
3071 DIFF_PAIR_MODE_CHANGED(p
) ||
3072 strcmp(one
->path
, two
->path
))
3075 /* both are valid and point at the same path. that is, we are
3076 * dealing with a change.
3078 if (one
->sha1_valid
&& two
->sha1_valid
&&
3079 !hashcmp(one
->sha1
, two
->sha1
) &&
3080 !one
->dirty_submodule
&& !two
->dirty_submodule
)
3081 return 1; /* no change */
3082 if (!one
->sha1_valid
&& !two
->sha1_valid
)
3083 return 1; /* both look at the same file on the filesystem. */
3087 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
3089 if (diff_unmodified_pair(p
))
3092 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3093 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3094 return; /* no tree diffs in patch format */
3099 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
3100 struct diffstat_t
*diffstat
)
3102 if (diff_unmodified_pair(p
))
3105 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3106 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3107 return; /* no tree diffs in patch format */
3109 run_diffstat(p
, o
, diffstat
);
3112 static void diff_flush_checkdiff(struct diff_filepair
*p
,
3113 struct diff_options
*o
)
3115 if (diff_unmodified_pair(p
))
3118 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3119 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3120 return; /* no tree diffs in patch format */
3122 run_checkdiff(p
, o
);
3125 int diff_queue_is_empty(void)
3127 struct diff_queue_struct
*q
= &diff_queued_diff
;
3129 for (i
= 0; i
< q
->nr
; i
++)
3130 if (!diff_unmodified_pair(q
->queue
[i
]))
3136 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
3138 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
3141 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
3143 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
3144 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
3146 s
->size
, s
->xfrm_flags
);
3149 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
3151 diff_debug_filespec(p
->one
, i
, "one");
3152 diff_debug_filespec(p
->two
, i
, "two");
3153 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
3154 p
->score
, p
->status
? p
->status
: '?',
3155 p
->one
->rename_used
, p
->broken_pair
);
3158 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
3162 fprintf(stderr
, "%s\n", msg
);
3163 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
3164 for (i
= 0; i
< q
->nr
; i
++) {
3165 struct diff_filepair
*p
= q
->queue
[i
];
3166 diff_debug_filepair(p
, i
);
3171 static void diff_resolve_rename_copy(void)
3174 struct diff_filepair
*p
;
3175 struct diff_queue_struct
*q
= &diff_queued_diff
;
3177 diff_debug_queue("resolve-rename-copy", q
);
3179 for (i
= 0; i
< q
->nr
; i
++) {
3181 p
->status
= 0; /* undecided */
3182 if (DIFF_PAIR_UNMERGED(p
))
3183 p
->status
= DIFF_STATUS_UNMERGED
;
3184 else if (!DIFF_FILE_VALID(p
->one
))
3185 p
->status
= DIFF_STATUS_ADDED
;
3186 else if (!DIFF_FILE_VALID(p
->two
))
3187 p
->status
= DIFF_STATUS_DELETED
;
3188 else if (DIFF_PAIR_TYPE_CHANGED(p
))
3189 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
3191 /* from this point on, we are dealing with a pair
3192 * whose both sides are valid and of the same type, i.e.
3193 * either in-place edit or rename/copy edit.
3195 else if (DIFF_PAIR_RENAME(p
)) {
3197 * A rename might have re-connected a broken
3198 * pair up, causing the pathnames to be the
3199 * same again. If so, that's not a rename at
3200 * all, just a modification..
3202 * Otherwise, see if this source was used for
3203 * multiple renames, in which case we decrement
3204 * the count, and call it a copy.
3206 if (!strcmp(p
->one
->path
, p
->two
->path
))
3207 p
->status
= DIFF_STATUS_MODIFIED
;
3208 else if (--p
->one
->rename_used
> 0)
3209 p
->status
= DIFF_STATUS_COPIED
;
3211 p
->status
= DIFF_STATUS_RENAMED
;
3213 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
3214 p
->one
->mode
!= p
->two
->mode
||
3215 p
->one
->dirty_submodule
||
3216 p
->two
->dirty_submodule
||
3217 is_null_sha1(p
->one
->sha1
))
3218 p
->status
= DIFF_STATUS_MODIFIED
;
3220 /* This is a "no-change" entry and should not
3221 * happen anymore, but prepare for broken callers.
3223 error("feeding unmodified %s to diffcore",
3225 p
->status
= DIFF_STATUS_UNKNOWN
;
3228 diff_debug_queue("resolve-rename-copy done", q
);
3231 static int check_pair_status(struct diff_filepair
*p
)
3233 switch (p
->status
) {
3234 case DIFF_STATUS_UNKNOWN
:
3237 die("internal error in diff-resolve-rename-copy");
3243 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
3245 int fmt
= opt
->output_format
;
3247 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
3248 diff_flush_checkdiff(p
, opt
);
3249 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
3250 diff_flush_raw(p
, opt
);
3251 else if (fmt
& DIFF_FORMAT_NAME
) {
3252 const char *name_a
, *name_b
;
3253 name_a
= p
->two
->path
;
3255 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3256 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
3260 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
3263 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
3265 fprintf(file
, " %s ", newdelete
);
3266 write_name_quoted(fs
->path
, file
, '\n');
3270 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
)
3272 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
3273 fprintf(file
, " mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
3274 show_name
? ' ' : '\n');
3276 write_name_quoted(p
->two
->path
, file
, '\n');
3281 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
)
3283 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
3285 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
3287 show_mode_change(file
, p
, 0);
3290 static void diff_summary(FILE *file
, struct diff_filepair
*p
)
3293 case DIFF_STATUS_DELETED
:
3294 show_file_mode_name(file
, "delete", p
->one
);
3296 case DIFF_STATUS_ADDED
:
3297 show_file_mode_name(file
, "create", p
->two
);
3299 case DIFF_STATUS_COPIED
:
3300 show_rename_copy(file
, "copy", p
);
3302 case DIFF_STATUS_RENAMED
:
3303 show_rename_copy(file
, "rename", p
);
3307 fputs(" rewrite ", file
);
3308 write_name_quoted(p
->two
->path
, file
, ' ');
3309 fprintf(file
, "(%d%%)\n", similarity_index(p
));
3311 show_mode_change(file
, p
, !p
->score
);
3321 static int remove_space(char *line
, int len
)
3327 for (i
= 0; i
< len
; i
++)
3328 if (!isspace((c
= line
[i
])))
3334 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3336 struct patch_id_t
*data
= priv
;
3339 /* Ignore line numbers when computing the SHA1 of the patch */
3340 if (!prefixcmp(line
, "@@ -"))
3343 new_len
= remove_space(line
, len
);
3345 git_SHA1_Update(data
->ctx
, line
, new_len
);
3346 data
->patchlen
+= new_len
;
3349 /* returns 0 upon success, and writes result into sha1 */
3350 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3352 struct diff_queue_struct
*q
= &diff_queued_diff
;
3355 struct patch_id_t data
;
3356 char buffer
[PATH_MAX
* 4 + 20];
3358 git_SHA1_Init(&ctx
);
3359 memset(&data
, 0, sizeof(struct patch_id_t
));
3362 for (i
= 0; i
< q
->nr
; i
++) {
3366 struct diff_filepair
*p
= q
->queue
[i
];
3369 memset(&xpp
, 0, sizeof(xpp
));
3370 memset(&xecfg
, 0, sizeof(xecfg
));
3372 return error("internal diff status error");
3373 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3375 if (diff_unmodified_pair(p
))
3377 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3378 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3380 if (DIFF_PAIR_UNMERGED(p
))
3383 diff_fill_sha1_info(p
->one
);
3384 diff_fill_sha1_info(p
->two
);
3385 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3386 fill_mmfile(&mf2
, p
->two
) < 0)
3387 return error("unable to read files to diff");
3389 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3390 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3391 if (p
->one
->mode
== 0)
3392 len1
= snprintf(buffer
, sizeof(buffer
),
3393 "diff--gita/%.*sb/%.*s"
3400 len2
, p
->two
->path
);
3401 else if (p
->two
->mode
== 0)
3402 len1
= snprintf(buffer
, sizeof(buffer
),
3403 "diff--gita/%.*sb/%.*s"
3404 "deletedfilemode%06o"
3410 len1
, p
->one
->path
);
3412 len1
= snprintf(buffer
, sizeof(buffer
),
3413 "diff--gita/%.*sb/%.*s"
3419 len2
, p
->two
->path
);
3420 git_SHA1_Update(&ctx
, buffer
, len1
);
3422 xpp
.flags
= XDF_NEED_MINIMAL
;
3424 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3425 xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
3429 git_SHA1_Final(sha1
, &ctx
);
3433 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3435 struct diff_queue_struct
*q
= &diff_queued_diff
;
3437 int result
= diff_get_patch_id(options
, sha1
);
3439 for (i
= 0; i
< q
->nr
; i
++)
3440 diff_free_filepair(q
->queue
[i
]);
3444 q
->nr
= q
->alloc
= 0;
3449 static int is_summary_empty(const struct diff_queue_struct
*q
)
3453 for (i
= 0; i
< q
->nr
; i
++) {
3454 const struct diff_filepair
*p
= q
->queue
[i
];
3456 switch (p
->status
) {
3457 case DIFF_STATUS_DELETED
:
3458 case DIFF_STATUS_ADDED
:
3459 case DIFF_STATUS_COPIED
:
3460 case DIFF_STATUS_RENAMED
:
3465 if (p
->one
->mode
&& p
->two
->mode
&&
3466 p
->one
->mode
!= p
->two
->mode
)
3474 void diff_flush(struct diff_options
*options
)
3476 struct diff_queue_struct
*q
= &diff_queued_diff
;
3477 int i
, output_format
= options
->output_format
;
3481 * Order: raw, stat, summary, patch
3482 * or: name/name-status/checkdiff (other bits clear)
3487 if (output_format
& (DIFF_FORMAT_RAW
|
3489 DIFF_FORMAT_NAME_STATUS
|
3490 DIFF_FORMAT_CHECKDIFF
)) {
3491 for (i
= 0; i
< q
->nr
; i
++) {
3492 struct diff_filepair
*p
= q
->queue
[i
];
3493 if (check_pair_status(p
))
3494 flush_one_pair(p
, options
);
3499 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3500 struct diffstat_t diffstat
;
3502 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3503 for (i
= 0; i
< q
->nr
; i
++) {
3504 struct diff_filepair
*p
= q
->queue
[i
];
3505 if (check_pair_status(p
))
3506 diff_flush_stat(p
, options
, &diffstat
);
3508 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3509 show_numstat(&diffstat
, options
);
3510 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3511 show_stats(&diffstat
, options
);
3512 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3513 show_shortstats(&diffstat
, options
);
3514 free_diffstat_info(&diffstat
);
3517 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3518 show_dirstat(options
);
3520 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3521 for (i
= 0; i
< q
->nr
; i
++)
3522 diff_summary(options
->file
, q
->queue
[i
]);
3526 if (output_format
& DIFF_FORMAT_NO_OUTPUT
&&
3527 DIFF_OPT_TST(options
, EXIT_WITH_STATUS
) &&
3528 DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
3530 * run diff_flush_patch for the exit status. setting
3531 * options->file to /dev/null should be safe, becaue we
3532 * aren't supposed to produce any output anyway.
3534 if (options
->close_file
)
3535 fclose(options
->file
);
3536 options
->file
= fopen("/dev/null", "w");
3538 die_errno("Could not open /dev/null");
3539 options
->close_file
= 1;
3540 for (i
= 0; i
< q
->nr
; i
++) {
3541 struct diff_filepair
*p
= q
->queue
[i
];
3542 if (check_pair_status(p
))
3543 diff_flush_patch(p
, options
);
3544 if (options
->found_changes
)
3549 if (output_format
& DIFF_FORMAT_PATCH
) {
3551 putc(options
->line_termination
, options
->file
);
3552 if (options
->stat_sep
) {
3553 /* attach patch instead of inline */
3554 fputs(options
->stat_sep
, options
->file
);
3558 for (i
= 0; i
< q
->nr
; i
++) {
3559 struct diff_filepair
*p
= q
->queue
[i
];
3560 if (check_pair_status(p
))
3561 diff_flush_patch(p
, options
);
3565 if (output_format
& DIFF_FORMAT_CALLBACK
)
3566 options
->format_callback(q
, options
, options
->format_callback_data
);
3568 for (i
= 0; i
< q
->nr
; i
++)
3569 diff_free_filepair(q
->queue
[i
]);
3573 q
->nr
= q
->alloc
= 0;
3574 if (options
->close_file
)
3575 fclose(options
->file
);
3578 * Report the content-level differences with HAS_CHANGES;
3579 * diff_addremove/diff_change does not set the bit when
3580 * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
3582 if (DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
)) {
3583 if (options
->found_changes
)
3584 DIFF_OPT_SET(options
, HAS_CHANGES
);
3586 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3590 static void diffcore_apply_filter(const char *filter
)
3593 struct diff_queue_struct
*q
= &diff_queued_diff
;
3594 struct diff_queue_struct outq
;
3596 outq
.nr
= outq
.alloc
= 0;
3601 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3603 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3604 struct diff_filepair
*p
= q
->queue
[i
];
3605 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3607 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3609 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3610 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3611 strchr(filter
, p
->status
)))
3617 /* otherwise we will clear the whole queue
3618 * by copying the empty outq at the end of this
3619 * function, but first clear the current entries
3622 for (i
= 0; i
< q
->nr
; i
++)
3623 diff_free_filepair(q
->queue
[i
]);
3626 /* Only the matching ones */
3627 for (i
= 0; i
< q
->nr
; i
++) {
3628 struct diff_filepair
*p
= q
->queue
[i
];
3630 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3632 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3634 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3635 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3636 strchr(filter
, p
->status
)))
3639 diff_free_filepair(p
);
3646 /* Check whether two filespecs with the same mode and size are identical */
3647 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3648 struct diff_filespec
*two
)
3650 if (S_ISGITLINK(one
->mode
))
3652 if (diff_populate_filespec(one
, 0))
3654 if (diff_populate_filespec(two
, 0))
3656 return !memcmp(one
->data
, two
->data
, one
->size
);
3659 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3662 struct diff_queue_struct
*q
= &diff_queued_diff
;
3663 struct diff_queue_struct outq
;
3665 outq
.nr
= outq
.alloc
= 0;
3667 for (i
= 0; i
< q
->nr
; i
++) {
3668 struct diff_filepair
*p
= q
->queue
[i
];
3671 * 1. Entries that come from stat info dirtiness
3672 * always have both sides (iow, not create/delete),
3673 * one side of the object name is unknown, with
3674 * the same mode and size. Keep the ones that
3675 * do not match these criteria. They have real
3678 * 2. At this point, the file is known to be modified,
3679 * with the same mode and size, and the object
3680 * name of one side is unknown. Need to inspect
3681 * the identical contents.
3683 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3684 !DIFF_FILE_VALID(p
->two
) ||
3685 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3686 (p
->one
->mode
!= p
->two
->mode
) ||
3687 diff_populate_filespec(p
->one
, 1) ||
3688 diff_populate_filespec(p
->two
, 1) ||
3689 (p
->one
->size
!= p
->two
->size
) ||
3690 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3694 * The caller can subtract 1 from skip_stat_unmatch
3695 * to determine how many paths were dirty only
3696 * due to stat info mismatch.
3698 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3699 diffopt
->skip_stat_unmatch
++;
3700 diff_free_filepair(p
);
3707 static int diffnamecmp(const void *a_
, const void *b_
)
3709 const struct diff_filepair
*a
= *((const struct diff_filepair
**)a_
);
3710 const struct diff_filepair
*b
= *((const struct diff_filepair
**)b_
);
3711 const char *name_a
, *name_b
;
3713 name_a
= a
->one
? a
->one
->path
: a
->two
->path
;
3714 name_b
= b
->one
? b
->one
->path
: b
->two
->path
;
3715 return strcmp(name_a
, name_b
);
3718 void diffcore_fix_diff_index(struct diff_options
*options
)
3720 struct diff_queue_struct
*q
= &diff_queued_diff
;
3721 qsort(q
->queue
, q
->nr
, sizeof(q
->queue
[0]), diffnamecmp
);
3724 void diffcore_std(struct diff_options
*options
)
3726 if (options
->skip_stat_unmatch
)
3727 diffcore_skip_stat_unmatch(options
);
3728 if (options
->break_opt
!= -1)
3729 diffcore_break(options
->break_opt
);
3730 if (options
->detect_rename
)
3731 diffcore_rename(options
);
3732 if (options
->break_opt
!= -1)
3733 diffcore_merge_broken();
3734 if (options
->pickaxe
)
3735 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3736 if (options
->orderfile
)
3737 diffcore_order(options
->orderfile
);
3738 diff_resolve_rename_copy();
3739 diffcore_apply_filter(options
->filter
);
3741 if (diff_queued_diff
.nr
&& !DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
3742 DIFF_OPT_SET(options
, HAS_CHANGES
);
3744 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3747 int diff_result_code(struct diff_options
*opt
, int status
)
3750 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3751 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3753 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3754 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3756 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3757 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3762 void diff_addremove(struct diff_options
*options
,
3763 int addremove
, unsigned mode
,
3764 const unsigned char *sha1
,
3765 const char *concatpath
, unsigned dirty_submodule
)
3767 struct diff_filespec
*one
, *two
;
3769 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(mode
))
3772 /* This may look odd, but it is a preparation for
3773 * feeding "there are unchanged files which should
3774 * not produce diffs, but when you are doing copy
3775 * detection you would need them, so here they are"
3776 * entries to the diff-core. They will be prefixed
3777 * with something like '=' or '*' (I haven't decided
3778 * which but should not make any difference).
3779 * Feeding the same new and old to diff_change()
3780 * also has the same effect.
3781 * Before the final output happens, they are pruned after
3782 * merged into rename/copy pairs as appropriate.
3784 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3785 addremove
= (addremove
== '+' ? '-' :
3786 addremove
== '-' ? '+' : addremove
);
3788 if (options
->prefix
&&
3789 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3792 one
= alloc_filespec(concatpath
);
3793 two
= alloc_filespec(concatpath
);
3795 if (addremove
!= '+')
3796 fill_filespec(one
, sha1
, mode
);
3797 if (addremove
!= '-') {
3798 fill_filespec(two
, sha1
, mode
);
3799 two
->dirty_submodule
= dirty_submodule
;
3802 diff_queue(&diff_queued_diff
, one
, two
);
3803 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
3804 DIFF_OPT_SET(options
, HAS_CHANGES
);
3807 void diff_change(struct diff_options
*options
,
3808 unsigned old_mode
, unsigned new_mode
,
3809 const unsigned char *old_sha1
,
3810 const unsigned char *new_sha1
,
3811 const char *concatpath
,
3812 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
3814 struct diff_filespec
*one
, *two
;
3816 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(old_mode
)
3817 && S_ISGITLINK(new_mode
))
3820 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3822 const unsigned char *tmp_c
;
3823 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3824 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3825 tmp
= old_dirty_submodule
; old_dirty_submodule
= new_dirty_submodule
;
3826 new_dirty_submodule
= tmp
;
3829 if (options
->prefix
&&
3830 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3833 one
= alloc_filespec(concatpath
);
3834 two
= alloc_filespec(concatpath
);
3835 fill_filespec(one
, old_sha1
, old_mode
);
3836 fill_filespec(two
, new_sha1
, new_mode
);
3837 one
->dirty_submodule
= old_dirty_submodule
;
3838 two
->dirty_submodule
= new_dirty_submodule
;
3840 diff_queue(&diff_queued_diff
, one
, two
);
3841 if (!DIFF_OPT_TST(options
, DIFF_FROM_CONTENTS
))
3842 DIFF_OPT_SET(options
, HAS_CHANGES
);
3845 void diff_unmerge(struct diff_options
*options
,
3847 unsigned mode
, const unsigned char *sha1
)
3849 struct diff_filespec
*one
, *two
;
3851 if (options
->prefix
&&
3852 strncmp(path
, options
->prefix
, options
->prefix_length
))
3855 one
= alloc_filespec(path
);
3856 two
= alloc_filespec(path
);
3857 fill_filespec(one
, sha1
, mode
);
3858 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;
3861 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
3864 struct diff_tempfile
*temp
;
3865 const char *argv
[3];
3866 const char **arg
= argv
;
3867 struct child_process child
;
3868 struct strbuf buf
= STRBUF_INIT
;
3871 temp
= prepare_temp_file(spec
->path
, spec
);
3873 *arg
++ = temp
->name
;
3876 memset(&child
, 0, sizeof(child
));
3877 child
.use_shell
= 1;
3880 if (start_command(&child
)) {
3885 if (strbuf_read(&buf
, child
.out
, 0) < 0)
3886 err
= error("error reading from textconv command '%s'", pgm
);
3889 if (finish_command(&child
) || err
) {
3890 strbuf_release(&buf
);
3896 return strbuf_detach(&buf
, outsize
);
3899 static size_t fill_textconv(struct userdiff_driver
*driver
,
3900 struct diff_filespec
*df
,
3905 if (!driver
|| !driver
->textconv
) {
3906 if (!DIFF_FILE_VALID(df
)) {
3910 if (diff_populate_filespec(df
, 0))
3911 die("unable to read files to diff");
3916 if (driver
->textconv_cache
) {
3917 *outbuf
= notes_cache_get(driver
->textconv_cache
, df
->sha1
,
3923 *outbuf
= run_textconv(driver
->textconv
, df
, &size
);
3925 die("unable to read files to diff");
3927 if (driver
->textconv_cache
) {
3928 /* ignore errors, as we might be in a readonly repository */
3929 notes_cache_put(driver
->textconv_cache
, df
->sha1
, *outbuf
,
3932 * we could save up changes and flush them all at the end,
3933 * but we would need an extra call after all diffing is done.
3934 * Since generating a cache entry is the slow path anyway,
3935 * this extra overhead probably isn't a big deal.
3937 notes_cache_write(driver
->textconv_cache
);