2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
16 #ifdef NO_FAST_WORKING_DIRECTORY
17 #define FAST_WORKING_DIRECTORY 0
19 #define FAST_WORKING_DIRECTORY 1
22 static int diff_detect_rename_default
;
23 static int diff_rename_limit_default
= 200;
24 static int diff_suppress_blank_empty
;
25 int diff_use_color_default
= -1;
26 static const char *external_diff_cmd_cfg
;
27 int diff_auto_refresh_index
= 1;
28 static int diff_mnemonic_prefix
;
30 static char diff_colors
[][COLOR_MAXLEN
] = {
32 "", /* PLAIN (normal) */
33 "\033[1m", /* METAINFO (bold) */
34 "\033[36m", /* FRAGINFO (cyan) */
35 "\033[31m", /* OLD (red) */
36 "\033[32m", /* NEW (green) */
37 "\033[33m", /* COMMIT (yellow) */
38 "\033[41m", /* WHITESPACE (red background) */
41 static void diff_filespec_load_driver(struct diff_filespec
*one
);
42 static char *run_textconv(const char *, struct diff_filespec
*, size_t *);
44 static int parse_diff_color_slot(const char *var
, int ofs
)
46 if (!strcasecmp(var
+ofs
, "plain"))
48 if (!strcasecmp(var
+ofs
, "meta"))
50 if (!strcasecmp(var
+ofs
, "frag"))
52 if (!strcasecmp(var
+ofs
, "old"))
54 if (!strcasecmp(var
+ofs
, "new"))
56 if (!strcasecmp(var
+ofs
, "commit"))
58 if (!strcasecmp(var
+ofs
, "whitespace"))
59 return DIFF_WHITESPACE
;
60 die("bad config variable '%s'", var
);
64 * These are to give UI layer defaults.
65 * The core-level commands such as git-diff-files should
66 * never be affected by the setting of diff.renames
67 * the user happens to have in the configuration file.
69 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
71 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
72 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
75 if (!strcmp(var
, "diff.renames")) {
77 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
78 else if (!strcasecmp(value
, "copies") ||
79 !strcasecmp(value
, "copy"))
80 diff_detect_rename_default
= DIFF_DETECT_COPY
;
81 else if (git_config_bool(var
,value
))
82 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
85 if (!strcmp(var
, "diff.autorefreshindex")) {
86 diff_auto_refresh_index
= git_config_bool(var
, value
);
89 if (!strcmp(var
, "diff.mnemonicprefix")) {
90 diff_mnemonic_prefix
= git_config_bool(var
, value
);
93 if (!strcmp(var
, "diff.external"))
94 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
96 return git_diff_basic_config(var
, value
, cb
);
99 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
101 if (!strcmp(var
, "diff.renamelimit")) {
102 diff_rename_limit_default
= git_config_int(var
, value
);
106 switch (userdiff_config(var
, value
)) {
112 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
113 int slot
= parse_diff_color_slot(var
, 11);
115 return config_error_nonbool(var
);
116 color_parse(value
, var
, diff_colors
[slot
]);
120 /* like GNU diff's --suppress-blank-empty option */
121 if (!strcmp(var
, "diff.suppress-blank-empty")) {
122 diff_suppress_blank_empty
= git_config_bool(var
, value
);
126 return git_color_default_config(var
, value
, cb
);
129 static char *quote_two(const char *one
, const char *two
)
131 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
132 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
133 struct strbuf res
= STRBUF_INIT
;
135 if (need_one
+ need_two
) {
136 strbuf_addch(&res
, '"');
137 quote_c_style(one
, &res
, NULL
, 1);
138 quote_c_style(two
, &res
, NULL
, 1);
139 strbuf_addch(&res
, '"');
141 strbuf_addstr(&res
, one
);
142 strbuf_addstr(&res
, two
);
144 return strbuf_detach(&res
, NULL
);
147 static const char *external_diff(void)
149 static const char *external_diff_cmd
= NULL
;
150 static int done_preparing
= 0;
153 return external_diff_cmd
;
154 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
155 if (!external_diff_cmd
)
156 external_diff_cmd
= external_diff_cmd_cfg
;
158 return external_diff_cmd
;
161 static struct diff_tempfile
{
162 const char *name
; /* filename external diff should read from */
165 char tmp_path
[PATH_MAX
];
168 static int count_lines(const char *data
, int size
)
170 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
177 completely_empty
= 0;
181 completely_empty
= 0;
184 if (completely_empty
)
187 count
++; /* no trailing newline */
191 static void print_line_count(FILE *file
, int count
)
195 fprintf(file
, "0,0");
201 fprintf(file
, "1,%d", count
);
206 static void copy_file_with_prefix(FILE *file
,
207 int prefix
, const char *data
, int size
,
208 const char *set
, const char *reset
)
210 int ch
, nl_just_seen
= 1;
225 fprintf(file
, "%s\n\\ No newline at end of file\n", reset
);
228 static void emit_rewrite_diff(const char *name_a
,
230 struct diff_filespec
*one
,
231 struct diff_filespec
*two
,
232 const char *textconv_one
,
233 const char *textconv_two
,
234 struct diff_options
*o
)
237 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
238 const char *name_a_tab
, *name_b_tab
;
239 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
240 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
241 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
242 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
243 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
244 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
245 const char *a_prefix
, *b_prefix
;
246 const char *data_one
, *data_two
;
247 size_t size_one
, size_two
;
249 if (diff_mnemonic_prefix
&& DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
250 a_prefix
= o
->b_prefix
;
251 b_prefix
= o
->a_prefix
;
253 a_prefix
= o
->a_prefix
;
254 b_prefix
= o
->b_prefix
;
257 name_a
+= (*name_a
== '/');
258 name_b
+= (*name_b
== '/');
259 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
260 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
262 strbuf_reset(&a_name
);
263 strbuf_reset(&b_name
);
264 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
265 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
267 diff_populate_filespec(one
, 0);
268 diff_populate_filespec(two
, 0);
270 data_one
= run_textconv(textconv_one
, one
, &size_one
);
272 die("unable to read files to diff");
275 data_one
= one
->data
;
276 size_one
= one
->size
;
279 data_two
= run_textconv(textconv_two
, two
, &size_two
);
281 die("unable to read files to diff");
284 data_two
= two
->data
;
285 size_two
= two
->size
;
288 lc_a
= count_lines(data_one
, size_one
);
289 lc_b
= count_lines(data_two
, size_two
);
291 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
292 metainfo
, a_name
.buf
, name_a_tab
, reset
,
293 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
294 print_line_count(o
->file
, lc_a
);
295 fprintf(o
->file
, " +");
296 print_line_count(o
->file
, lc_b
);
297 fprintf(o
->file
, " @@%s\n", reset
);
299 copy_file_with_prefix(o
->file
, '-', data_one
, size_one
, old
, reset
);
301 copy_file_with_prefix(o
->file
, '+', data_two
, size_two
, new, reset
);
304 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
306 if (!DIFF_FILE_VALID(one
)) {
307 mf
->ptr
= (char *)""; /* does not matter */
311 else if (diff_populate_filespec(one
, 0))
315 mf
->size
= one
->size
;
319 struct diff_words_buffer
{
322 struct diff_words_orig
{
323 const char *begin
, *end
;
325 int orig_nr
, orig_alloc
;
328 static void diff_words_append(char *line
, unsigned long len
,
329 struct diff_words_buffer
*buffer
)
331 ALLOC_GROW(buffer
->text
.ptr
, buffer
->text
.size
+ len
, buffer
->alloc
);
334 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
335 buffer
->text
.size
+= len
;
336 buffer
->text
.ptr
[buffer
->text
.size
] = '\0';
339 struct diff_words_data
{
340 struct diff_words_buffer minus
, plus
;
341 const char *current_plus
;
346 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
348 struct diff_words_data
*diff_words
= priv
;
349 int minus_first
, minus_len
, plus_first
, plus_len
;
350 const char *minus_begin
, *minus_end
, *plus_begin
, *plus_end
;
352 if (line
[0] != '@' || parse_hunk_header(line
, len
,
353 &minus_first
, &minus_len
, &plus_first
, &plus_len
))
356 /* POSIX requires that first be decremented by one if len == 0... */
358 minus_begin
= diff_words
->minus
.orig
[minus_first
].begin
;
360 diff_words
->minus
.orig
[minus_first
+ minus_len
- 1].end
;
362 minus_begin
= minus_end
=
363 diff_words
->minus
.orig
[minus_first
].end
;
366 plus_begin
= diff_words
->plus
.orig
[plus_first
].begin
;
367 plus_end
= diff_words
->plus
.orig
[plus_first
+ plus_len
- 1].end
;
369 plus_begin
= plus_end
= diff_words
->plus
.orig
[plus_first
].end
;
371 if (diff_words
->current_plus
!= plus_begin
)
372 fwrite(diff_words
->current_plus
,
373 plus_begin
- diff_words
->current_plus
, 1,
375 if (minus_begin
!= minus_end
)
376 color_fwrite_lines(diff_words
->file
,
377 diff_get_color(1, DIFF_FILE_OLD
),
378 minus_end
- minus_begin
, minus_begin
);
379 if (plus_begin
!= plus_end
)
380 color_fwrite_lines(diff_words
->file
,
381 diff_get_color(1, DIFF_FILE_NEW
),
382 plus_end
- plus_begin
, plus_begin
);
384 diff_words
->current_plus
= plus_end
;
387 /* This function starts looking at *begin, and returns 0 iff a word was found. */
388 static int find_word_boundaries(mmfile_t
*buffer
, regex_t
*word_regex
,
389 int *begin
, int *end
)
391 if (word_regex
&& *begin
< buffer
->size
) {
393 if (!regexec(word_regex
, buffer
->ptr
+ *begin
, 1, match
, 0)) {
394 char *p
= memchr(buffer
->ptr
+ *begin
+ match
[0].rm_so
,
395 '\n', match
[0].rm_eo
- match
[0].rm_so
);
396 *end
= p
? p
- buffer
->ptr
: match
[0].rm_eo
+ *begin
;
397 *begin
+= match
[0].rm_so
;
398 return *begin
>= *end
;
403 /* find the next word */
404 while (*begin
< buffer
->size
&& isspace(buffer
->ptr
[*begin
]))
406 if (*begin
>= buffer
->size
)
409 /* find the end of the word */
411 while (*end
< buffer
->size
&& !isspace(buffer
->ptr
[*end
]))
418 * This function splits the words in buffer->text, stores the list with
419 * newline separator into out, and saves the offsets of the original words
422 static void diff_words_fill(struct diff_words_buffer
*buffer
, mmfile_t
*out
,
431 /* fake an empty "0th" word */
432 ALLOC_GROW(buffer
->orig
, 1, buffer
->orig_alloc
);
433 buffer
->orig
[0].begin
= buffer
->orig
[0].end
= buffer
->text
.ptr
;
436 for (i
= 0; i
< buffer
->text
.size
; i
++) {
437 if (find_word_boundaries(&buffer
->text
, word_regex
, &i
, &j
))
440 /* store original boundaries */
441 ALLOC_GROW(buffer
->orig
, buffer
->orig_nr
+ 1,
443 buffer
->orig
[buffer
->orig_nr
].begin
= buffer
->text
.ptr
+ i
;
444 buffer
->orig
[buffer
->orig_nr
].end
= buffer
->text
.ptr
+ j
;
448 ALLOC_GROW(out
->ptr
, out
->size
+ j
- i
+ 1, alloc
);
449 memcpy(out
->ptr
+ out
->size
, buffer
->text
.ptr
+ i
, j
- i
);
450 out
->ptr
[out
->size
+ j
- i
] = '\n';
451 out
->size
+= j
- i
+ 1;
457 /* this executes the word diff on the accumulated buffers */
458 static void diff_words_show(struct diff_words_data
*diff_words
)
463 mmfile_t minus
, plus
;
465 /* special case: only removal */
466 if (!diff_words
->plus
.text
.size
) {
467 color_fwrite_lines(diff_words
->file
,
468 diff_get_color(1, DIFF_FILE_OLD
),
469 diff_words
->minus
.text
.size
, diff_words
->minus
.text
.ptr
);
470 diff_words
->minus
.text
.size
= 0;
474 diff_words
->current_plus
= diff_words
->plus
.text
.ptr
;
476 memset(&xpp
, 0, sizeof(xpp
));
477 memset(&xecfg
, 0, sizeof(xecfg
));
478 diff_words_fill(&diff_words
->minus
, &minus
, diff_words
->word_regex
);
479 diff_words_fill(&diff_words
->plus
, &plus
, diff_words
->word_regex
);
480 xpp
.flags
= XDF_NEED_MINIMAL
;
481 /* as only the hunk header will be parsed, we need a 0-context */
483 xdi_diff_outf(&minus
, &plus
, fn_out_diff_words_aux
, diff_words
,
487 if (diff_words
->current_plus
!= diff_words
->plus
.text
.ptr
+
488 diff_words
->plus
.text
.size
)
489 fwrite(diff_words
->current_plus
,
490 diff_words
->plus
.text
.ptr
+ diff_words
->plus
.text
.size
491 - diff_words
->current_plus
, 1,
493 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
496 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
498 struct emit_callback
{
499 int nparents
, color_diff
;
501 sane_truncate_fn truncate
;
502 const char **label_path
;
503 struct diff_words_data
*diff_words
;
508 static void free_diff_words_data(struct emit_callback
*ecbdata
)
510 if (ecbdata
->diff_words
) {
512 if (ecbdata
->diff_words
->minus
.text
.size
||
513 ecbdata
->diff_words
->plus
.text
.size
)
514 diff_words_show(ecbdata
->diff_words
);
516 free (ecbdata
->diff_words
->minus
.text
.ptr
);
517 free (ecbdata
->diff_words
->minus
.orig
);
518 free (ecbdata
->diff_words
->plus
.text
.ptr
);
519 free (ecbdata
->diff_words
->plus
.orig
);
520 free(ecbdata
->diff_words
->word_regex
);
521 free(ecbdata
->diff_words
);
522 ecbdata
->diff_words
= NULL
;
526 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
529 return diff_colors
[ix
];
533 static void emit_line(FILE *file
, const char *set
, const char *reset
, const char *line
, int len
)
535 int has_trailing_newline
, has_trailing_carriage_return
;
537 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
538 if (has_trailing_newline
)
540 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
541 if (has_trailing_carriage_return
)
545 fwrite(line
, len
, 1, file
);
547 if (has_trailing_carriage_return
)
549 if (has_trailing_newline
)
553 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
555 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
556 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
559 emit_line(ecbdata
->file
, set
, reset
, line
, len
);
561 /* Emit just the prefix, then the rest. */
562 emit_line(ecbdata
->file
, set
, reset
, line
, ecbdata
->nparents
);
563 ws_check_emit(line
+ ecbdata
->nparents
,
564 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
565 ecbdata
->file
, set
, reset
, ws
);
569 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
576 return ecb
->truncate(line
, len
);
580 (void) utf8_width(&cp
, &l
);
582 break; /* truncated in the middle? */
587 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
591 struct emit_callback
*ecbdata
= priv
;
592 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
593 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
594 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
596 *(ecbdata
->found_changesp
) = 1;
598 if (ecbdata
->label_path
[0]) {
599 const char *name_a_tab
, *name_b_tab
;
601 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
602 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
604 fprintf(ecbdata
->file
, "%s--- %s%s%s\n",
605 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
606 fprintf(ecbdata
->file
, "%s+++ %s%s%s\n",
607 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
608 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
611 if (diff_suppress_blank_empty
612 && len
== 2 && line
[0] == ' ' && line
[1] == '\n') {
617 /* This is not really necessary for now because
618 * this codepath only deals with two-way diffs.
620 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
622 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
623 ecbdata
->nparents
= i
- 1;
624 len
= sane_truncate_line(ecbdata
, line
, len
);
625 emit_line(ecbdata
->file
,
626 diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
628 if (line
[len
-1] != '\n')
629 putc('\n', ecbdata
->file
);
633 if (len
< ecbdata
->nparents
) {
634 emit_line(ecbdata
->file
, reset
, reset
, line
, len
);
639 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
640 /* fall back to normal diff */
641 free_diff_words_data(ecbdata
);
642 if (ecbdata
->diff_words
) {
643 if (line
[0] == '-') {
644 diff_words_append(line
, len
,
645 &ecbdata
->diff_words
->minus
);
647 } else if (line
[0] == '+') {
648 diff_words_append(line
, len
,
649 &ecbdata
->diff_words
->plus
);
652 if (ecbdata
->diff_words
->minus
.text
.size
||
653 ecbdata
->diff_words
->plus
.text
.size
)
654 diff_words_show(ecbdata
->diff_words
);
657 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
660 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
662 color
= DIFF_FILE_OLD
;
663 else if (line
[i
] == '+')
664 color
= DIFF_FILE_NEW
;
667 if (color
!= DIFF_FILE_NEW
) {
668 emit_line(ecbdata
->file
,
669 diff_get_color(ecbdata
->color_diff
, color
),
673 emit_add_line(reset
, ecbdata
, line
, len
);
676 static char *pprint_rename(const char *a
, const char *b
)
680 struct strbuf name
= STRBUF_INIT
;
681 int pfx_length
, sfx_length
;
682 int len_a
= strlen(a
);
683 int len_b
= strlen(b
);
684 int a_midlen
, b_midlen
;
685 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
686 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
688 if (qlen_a
|| qlen_b
) {
689 quote_c_style(a
, &name
, NULL
, 0);
690 strbuf_addstr(&name
, " => ");
691 quote_c_style(b
, &name
, NULL
, 0);
692 return strbuf_detach(&name
, NULL
);
695 /* Find common prefix */
697 while (*old
&& *new && *old
== *new) {
699 pfx_length
= old
- a
+ 1;
704 /* Find common suffix */
708 while (a
<= old
&& b
<= new && *old
== *new) {
710 sfx_length
= len_a
- (old
- a
);
716 * pfx{mid-a => mid-b}sfx
717 * {pfx-a => pfx-b}sfx
718 * pfx{sfx-a => sfx-b}
721 a_midlen
= len_a
- pfx_length
- sfx_length
;
722 b_midlen
= len_b
- pfx_length
- sfx_length
;
728 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
729 if (pfx_length
+ sfx_length
) {
730 strbuf_add(&name
, a
, pfx_length
);
731 strbuf_addch(&name
, '{');
733 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
734 strbuf_addstr(&name
, " => ");
735 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
736 if (pfx_length
+ sfx_length
) {
737 strbuf_addch(&name
, '}');
738 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
740 return strbuf_detach(&name
, NULL
);
746 struct diffstat_file
{
750 unsigned is_unmerged
:1;
751 unsigned is_binary
:1;
752 unsigned is_renamed
:1;
753 unsigned int added
, deleted
;
757 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
761 struct diffstat_file
*x
;
762 x
= xcalloc(sizeof (*x
), 1);
763 if (diffstat
->nr
== diffstat
->alloc
) {
764 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
765 diffstat
->files
= xrealloc(diffstat
->files
,
766 diffstat
->alloc
* sizeof(x
));
768 diffstat
->files
[diffstat
->nr
++] = x
;
770 x
->from_name
= xstrdup(name_a
);
771 x
->name
= xstrdup(name_b
);
776 x
->name
= xstrdup(name_a
);
781 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
783 struct diffstat_t
*diffstat
= priv
;
784 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
788 else if (line
[0] == '-')
792 const char mime_boundary_leader
[] = "------------";
794 static int scale_linear(int it
, int width
, int max_change
)
797 * make sure that at least one '-' is printed if there were deletions,
798 * and likewise for '+'.
802 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
805 static void show_name(FILE *file
,
806 const char *prefix
, const char *name
, int len
,
807 const char *reset
, const char *set
)
809 fprintf(file
, " %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
812 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
816 fprintf(file
, "%s", set
);
819 fprintf(file
, "%s", reset
);
822 static void fill_print_name(struct diffstat_file
*file
)
826 if (file
->print_name
)
829 if (!file
->is_renamed
) {
830 struct strbuf buf
= STRBUF_INIT
;
831 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
832 pname
= strbuf_detach(&buf
, NULL
);
835 strbuf_release(&buf
);
838 pname
= pprint_rename(file
->from_name
, file
->name
);
840 file
->print_name
= pname
;
843 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
845 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
846 int max_change
= 0, max_len
= 0;
847 int total_files
= data
->nr
;
848 int width
, name_width
;
849 const char *reset
, *set
, *add_c
, *del_c
;
854 width
= options
->stat_width
? options
->stat_width
: 80;
855 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
857 /* Sanity: give at least 5 columns to the graph,
858 * but leave at least 10 columns for the name.
864 else if (width
< name_width
+ 15)
865 name_width
= width
- 15;
867 /* Find the longest filename and max number of changes */
868 reset
= diff_get_color_opt(options
, DIFF_RESET
);
869 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
870 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
871 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
873 for (i
= 0; i
< data
->nr
; i
++) {
874 struct diffstat_file
*file
= data
->files
[i
];
875 int change
= file
->added
+ file
->deleted
;
876 fill_print_name(file
);
877 len
= strlen(file
->print_name
);
881 if (file
->is_binary
|| file
->is_unmerged
)
883 if (max_change
< change
)
887 /* Compute the width of the graph part;
888 * 10 is for one blank at the beginning of the line plus
889 * " | count " between the name and the graph.
891 * From here on, name_width is the width of the name area,
892 * and width is the width of the graph area.
894 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
895 if (width
< (name_width
+ 10) + max_change
)
896 width
= width
- (name_width
+ 10);
900 for (i
= 0; i
< data
->nr
; i
++) {
901 const char *prefix
= "";
902 char *name
= data
->files
[i
]->print_name
;
903 int added
= data
->files
[i
]->added
;
904 int deleted
= data
->files
[i
]->deleted
;
908 * "scale" the filename
911 name_len
= strlen(name
);
912 if (name_width
< name_len
) {
916 name
+= name_len
- len
;
917 slash
= strchr(name
, '/');
922 if (data
->files
[i
]->is_binary
) {
923 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
924 fprintf(options
->file
, " Bin ");
925 fprintf(options
->file
, "%s%d%s", del_c
, deleted
, reset
);
926 fprintf(options
->file
, " -> ");
927 fprintf(options
->file
, "%s%d%s", add_c
, added
, reset
);
928 fprintf(options
->file
, " bytes");
929 fprintf(options
->file
, "\n");
932 else if (data
->files
[i
]->is_unmerged
) {
933 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
934 fprintf(options
->file
, " Unmerged\n");
937 else if (!data
->files
[i
]->is_renamed
&&
938 (added
+ deleted
== 0)) {
944 * scale the add/delete
952 if (width
<= max_change
) {
953 add
= scale_linear(add
, width
, max_change
);
954 del
= scale_linear(del
, width
, max_change
);
957 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
958 fprintf(options
->file
, "%5d%s", added
+ deleted
,
959 added
+ deleted
? " " : "");
960 show_graph(options
->file
, '+', add
, add_c
, reset
);
961 show_graph(options
->file
, '-', del
, del_c
, reset
);
962 fprintf(options
->file
, "\n");
964 fprintf(options
->file
,
965 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
966 set
, total_files
, adds
, dels
, reset
);
969 static void show_shortstats(struct diffstat_t
* data
, struct diff_options
*options
)
971 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
976 for (i
= 0; i
< data
->nr
; i
++) {
977 if (!data
->files
[i
]->is_binary
&&
978 !data
->files
[i
]->is_unmerged
) {
979 int added
= data
->files
[i
]->added
;
980 int deleted
= data
->files
[i
]->deleted
;
981 if (!data
->files
[i
]->is_renamed
&&
982 (added
+ deleted
== 0)) {
990 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
991 total_files
, adds
, dels
);
994 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
1001 for (i
= 0; i
< data
->nr
; i
++) {
1002 struct diffstat_file
*file
= data
->files
[i
];
1004 if (file
->is_binary
)
1005 fprintf(options
->file
, "-\t-\t");
1007 fprintf(options
->file
,
1008 "%d\t%d\t", file
->added
, file
->deleted
);
1009 if (options
->line_termination
) {
1010 fill_print_name(file
);
1011 if (!file
->is_renamed
)
1012 write_name_quoted(file
->name
, options
->file
,
1013 options
->line_termination
);
1015 fputs(file
->print_name
, options
->file
);
1016 putc(options
->line_termination
, options
->file
);
1019 if (file
->is_renamed
) {
1020 putc('\0', options
->file
);
1021 write_name_quoted(file
->from_name
, options
->file
, '\0');
1023 write_name_quoted(file
->name
, options
->file
, '\0');
1028 struct dirstat_file
{
1030 unsigned long changed
;
1033 struct dirstat_dir
{
1034 struct dirstat_file
*files
;
1035 int alloc
, nr
, percent
, cumulative
;
1038 static long gather_dirstat(FILE *file
, struct dirstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1040 unsigned long this_dir
= 0;
1041 unsigned int sources
= 0;
1044 struct dirstat_file
*f
= dir
->files
;
1045 int namelen
= strlen(f
->name
);
1049 if (namelen
< baselen
)
1051 if (memcmp(f
->name
, base
, baselen
))
1053 slash
= strchr(f
->name
+ baselen
, '/');
1055 int newbaselen
= slash
+ 1 - f
->name
;
1056 this = gather_dirstat(file
, dir
, changed
, f
->name
, newbaselen
);
1068 * We don't report dirstat's for
1070 * - or cases where everything came from a single directory
1071 * under this directory (sources == 1).
1073 if (baselen
&& sources
!= 1) {
1074 int permille
= this_dir
* 1000 / changed
;
1076 int percent
= permille
/ 10;
1077 if (percent
>= dir
->percent
) {
1078 fprintf(file
, "%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1079 if (!dir
->cumulative
)
1087 static int dirstat_compare(const void *_a
, const void *_b
)
1089 const struct dirstat_file
*a
= _a
;
1090 const struct dirstat_file
*b
= _b
;
1091 return strcmp(a
->name
, b
->name
);
1094 static void show_dirstat(struct diff_options
*options
)
1097 unsigned long changed
;
1098 struct dirstat_dir dir
;
1099 struct diff_queue_struct
*q
= &diff_queued_diff
;
1104 dir
.percent
= options
->dirstat_percent
;
1105 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1108 for (i
= 0; i
< q
->nr
; i
++) {
1109 struct diff_filepair
*p
= q
->queue
[i
];
1111 unsigned long copied
, added
, damage
;
1113 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1115 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1116 diff_populate_filespec(p
->one
, 0);
1117 diff_populate_filespec(p
->two
, 0);
1118 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1120 diff_free_filespec_data(p
->one
);
1121 diff_free_filespec_data(p
->two
);
1122 } else if (DIFF_FILE_VALID(p
->one
)) {
1123 diff_populate_filespec(p
->one
, 1);
1125 diff_free_filespec_data(p
->one
);
1126 } else if (DIFF_FILE_VALID(p
->two
)) {
1127 diff_populate_filespec(p
->two
, 1);
1129 added
= p
->two
->size
;
1130 diff_free_filespec_data(p
->two
);
1135 * Original minus copied is the removed material,
1136 * added is the new material. They are both damages
1137 * made to the preimage. In --dirstat-by-file mode, count
1138 * damaged files, not damaged lines. This is done by
1139 * counting only a single damaged line per file.
1141 damage
= (p
->one
->size
- copied
) + added
;
1142 if (DIFF_OPT_TST(options
, DIRSTAT_BY_FILE
) && damage
> 0)
1145 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1146 dir
.files
[dir
.nr
].name
= name
;
1147 dir
.files
[dir
.nr
].changed
= damage
;
1152 /* This can happen even with many files, if everything was renames */
1156 /* Show all directories with more than x% of the changes */
1157 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1158 gather_dirstat(options
->file
, &dir
, changed
, "", 0);
1161 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1164 for (i
= 0; i
< diffstat
->nr
; i
++) {
1165 struct diffstat_file
*f
= diffstat
->files
[i
];
1166 if (f
->name
!= f
->print_name
)
1167 free(f
->print_name
);
1172 free(diffstat
->files
);
1175 struct checkdiff_t
{
1176 const char *filename
;
1178 struct diff_options
*o
;
1181 int trailing_blanks_start
;
1184 static int is_conflict_marker(const char *line
, unsigned long len
)
1191 firstchar
= line
[0];
1192 switch (firstchar
) {
1193 case '=': case '>': case '<':
1198 for (cnt
= 1; cnt
< 7; cnt
++)
1199 if (line
[cnt
] != firstchar
)
1201 /* line[0] thru line[6] are same as firstchar */
1202 if (firstchar
== '=') {
1203 /* divider between ours and theirs? */
1204 if (len
!= 8 || line
[7] != '\n')
1206 } else if (len
< 8 || !isspace(line
[7])) {
1207 /* not divider before ours nor after theirs */
1213 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1215 struct checkdiff_t
*data
= priv
;
1216 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1217 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1218 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1219 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1222 if (line
[0] == '+') {
1225 if (!ws_blank_line(line
+ 1, len
- 1, data
->ws_rule
))
1226 data
->trailing_blanks_start
= 0;
1227 else if (!data
->trailing_blanks_start
)
1228 data
->trailing_blanks_start
= data
->lineno
;
1229 if (is_conflict_marker(line
+ 1, len
- 1)) {
1231 fprintf(data
->o
->file
,
1232 "%s:%d: leftover conflict marker\n",
1233 data
->filename
, data
->lineno
);
1235 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1238 data
->status
|= bad
;
1239 err
= whitespace_error_string(bad
);
1240 fprintf(data
->o
->file
, "%s:%d: %s.\n",
1241 data
->filename
, data
->lineno
, err
);
1243 emit_line(data
->o
->file
, set
, reset
, line
, 1);
1244 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1245 data
->o
->file
, set
, reset
, ws
);
1246 } else if (line
[0] == ' ') {
1248 data
->trailing_blanks_start
= 0;
1249 } else if (line
[0] == '@') {
1250 char *plus
= strchr(line
, '+');
1252 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1254 die("invalid diff");
1255 data
->trailing_blanks_start
= 0;
1259 static unsigned char *deflate_it(char *data
,
1261 unsigned long *result_size
)
1264 unsigned char *deflated
;
1267 memset(&stream
, 0, sizeof(stream
));
1268 deflateInit(&stream
, zlib_compression_level
);
1269 bound
= deflateBound(&stream
, size
);
1270 deflated
= xmalloc(bound
);
1271 stream
.next_out
= deflated
;
1272 stream
.avail_out
= bound
;
1274 stream
.next_in
= (unsigned char *)data
;
1275 stream
.avail_in
= size
;
1276 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1278 deflateEnd(&stream
);
1279 *result_size
= stream
.total_out
;
1283 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1289 unsigned long orig_size
;
1290 unsigned long delta_size
;
1291 unsigned long deflate_size
;
1292 unsigned long data_size
;
1294 /* We could do deflated delta, or we could do just deflated two,
1295 * whichever is smaller.
1298 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1299 if (one
->size
&& two
->size
) {
1300 delta
= diff_delta(one
->ptr
, one
->size
,
1301 two
->ptr
, two
->size
,
1302 &delta_size
, deflate_size
);
1304 void *to_free
= delta
;
1305 orig_size
= delta_size
;
1306 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1311 if (delta
&& delta_size
< deflate_size
) {
1312 fprintf(file
, "delta %lu\n", orig_size
);
1315 data_size
= delta_size
;
1318 fprintf(file
, "literal %lu\n", two
->size
);
1321 data_size
= deflate_size
;
1324 /* emit data encoded in base85 */
1327 int bytes
= (52 < data_size
) ? 52 : data_size
;
1331 line
[0] = bytes
+ 'A' - 1;
1333 line
[0] = bytes
- 26 + 'a' - 1;
1334 encode_85(line
+ 1, cp
, bytes
);
1335 cp
= (char *) cp
+ bytes
;
1339 fprintf(file
, "\n");
1343 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1345 fprintf(file
, "GIT binary patch\n");
1346 emit_binary_diff_body(file
, one
, two
);
1347 emit_binary_diff_body(file
, two
, one
);
1350 static void diff_filespec_load_driver(struct diff_filespec
*one
)
1353 one
->driver
= userdiff_find_by_path(one
->path
);
1355 one
->driver
= userdiff_find_by_name("default");
1358 int diff_filespec_is_binary(struct diff_filespec
*one
)
1360 if (one
->is_binary
== -1) {
1361 diff_filespec_load_driver(one
);
1362 if (one
->driver
->binary
!= -1)
1363 one
->is_binary
= one
->driver
->binary
;
1365 if (!one
->data
&& DIFF_FILE_VALID(one
))
1366 diff_populate_filespec(one
, 0);
1368 one
->is_binary
= buffer_is_binary(one
->data
,
1370 if (one
->is_binary
== -1)
1374 return one
->is_binary
;
1377 static const struct userdiff_funcname
*diff_funcname_pattern(struct diff_filespec
*one
)
1379 diff_filespec_load_driver(one
);
1380 return one
->driver
->funcname
.pattern
? &one
->driver
->funcname
: NULL
;
1383 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
1385 if (!options
->a_prefix
)
1386 options
->a_prefix
= a
;
1387 if (!options
->b_prefix
)
1388 options
->b_prefix
= b
;
1391 static const char *get_textconv(struct diff_filespec
*one
)
1393 if (!DIFF_FILE_VALID(one
))
1395 if (!S_ISREG(one
->mode
))
1397 diff_filespec_load_driver(one
);
1398 return one
->driver
->textconv
;
1401 static void builtin_diff(const char *name_a
,
1403 struct diff_filespec
*one
,
1404 struct diff_filespec
*two
,
1405 const char *xfrm_msg
,
1406 struct diff_options
*o
,
1407 int complete_rewrite
)
1411 char *a_one
, *b_two
;
1412 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1413 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1414 const char *a_prefix
, *b_prefix
;
1415 const char *textconv_one
= NULL
, *textconv_two
= NULL
;
1417 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
1418 textconv_one
= get_textconv(one
);
1419 textconv_two
= get_textconv(two
);
1422 diff_set_mnemonic_prefix(o
, "a/", "b/");
1423 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
1424 a_prefix
= o
->b_prefix
;
1425 b_prefix
= o
->a_prefix
;
1427 a_prefix
= o
->a_prefix
;
1428 b_prefix
= o
->b_prefix
;
1431 /* Never use a non-valid filename anywhere if at all possible */
1432 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
1433 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
1435 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
1436 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
1437 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1438 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1439 fprintf(o
->file
, "%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1440 if (lbl
[0][0] == '/') {
1442 fprintf(o
->file
, "%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1443 if (xfrm_msg
&& xfrm_msg
[0])
1444 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1446 else if (lbl
[1][0] == '/') {
1447 fprintf(o
->file
, "%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1448 if (xfrm_msg
&& xfrm_msg
[0])
1449 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1452 if (one
->mode
!= two
->mode
) {
1453 fprintf(o
->file
, "%sold mode %06o%s\n", set
, one
->mode
, reset
);
1454 fprintf(o
->file
, "%snew mode %06o%s\n", set
, two
->mode
, reset
);
1456 if (xfrm_msg
&& xfrm_msg
[0])
1457 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1459 * we do not run diff between different kind
1462 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1463 goto free_ab_and_return
;
1464 if (complete_rewrite
&&
1465 (textconv_one
|| !diff_filespec_is_binary(one
)) &&
1466 (textconv_two
|| !diff_filespec_is_binary(two
))) {
1467 emit_rewrite_diff(name_a
, name_b
, one
, two
,
1468 textconv_one
, textconv_two
, o
);
1469 o
->found_changes
= 1;
1470 goto free_ab_and_return
;
1474 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1475 die("unable to read files to diff");
1477 if (!DIFF_OPT_TST(o
, TEXT
) &&
1478 ( (diff_filespec_is_binary(one
) && !textconv_one
) ||
1479 (diff_filespec_is_binary(two
) && !textconv_two
) )) {
1480 /* Quite common confusing case */
1481 if (mf1
.size
== mf2
.size
&&
1482 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1483 goto free_ab_and_return
;
1484 if (DIFF_OPT_TST(o
, BINARY
))
1485 emit_binary_diff(o
->file
, &mf1
, &mf2
);
1487 fprintf(o
->file
, "Binary files %s and %s differ\n",
1489 o
->found_changes
= 1;
1492 /* Crazy xdl interfaces.. */
1493 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1497 struct emit_callback ecbdata
;
1498 const struct userdiff_funcname
*pe
;
1502 mf1
.ptr
= run_textconv(textconv_one
, one
, &size
);
1504 die("unable to read files to diff");
1509 mf2
.ptr
= run_textconv(textconv_two
, two
, &size
);
1511 die("unable to read files to diff");
1515 pe
= diff_funcname_pattern(one
);
1517 pe
= diff_funcname_pattern(two
);
1519 memset(&xpp
, 0, sizeof(xpp
));
1520 memset(&xecfg
, 0, sizeof(xecfg
));
1521 memset(&ecbdata
, 0, sizeof(ecbdata
));
1522 ecbdata
.label_path
= lbl
;
1523 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1524 ecbdata
.found_changesp
= &o
->found_changes
;
1525 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1526 ecbdata
.file
= o
->file
;
1527 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1528 xecfg
.ctxlen
= o
->context
;
1529 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
1530 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1532 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
1535 else if (!prefixcmp(diffopts
, "--unified="))
1536 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1537 else if (!prefixcmp(diffopts
, "-u"))
1538 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1539 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
)) {
1540 ecbdata
.diff_words
=
1541 xcalloc(1, sizeof(struct diff_words_data
));
1542 ecbdata
.diff_words
->file
= o
->file
;
1543 if (o
->word_regex
) {
1544 ecbdata
.diff_words
->word_regex
= (regex_t
*)
1545 xmalloc(sizeof(regex_t
));
1546 if (regcomp(ecbdata
.diff_words
->word_regex
,
1548 REG_EXTENDED
| REG_NEWLINE
))
1549 die ("Invalid regular expression: %s",
1553 xdi_diff_outf(&mf1
, &mf2
, fn_out_consume
, &ecbdata
,
1554 &xpp
, &xecfg
, &ecb
);
1555 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1556 free_diff_words_data(&ecbdata
);
1564 diff_free_filespec_data(one
);
1565 diff_free_filespec_data(two
);
1571 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1572 struct diff_filespec
*one
,
1573 struct diff_filespec
*two
,
1574 struct diffstat_t
*diffstat
,
1575 struct diff_options
*o
,
1576 int complete_rewrite
)
1579 struct diffstat_file
*data
;
1581 data
= diffstat_add(diffstat
, name_a
, name_b
);
1584 data
->is_unmerged
= 1;
1587 if (complete_rewrite
) {
1588 diff_populate_filespec(one
, 0);
1589 diff_populate_filespec(two
, 0);
1590 data
->deleted
= count_lines(one
->data
, one
->size
);
1591 data
->added
= count_lines(two
->data
, two
->size
);
1592 goto free_and_return
;
1594 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1595 die("unable to read files to diff");
1597 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1598 data
->is_binary
= 1;
1599 data
->added
= mf2
.size
;
1600 data
->deleted
= mf1
.size
;
1602 /* Crazy xdl interfaces.. */
1607 memset(&xpp
, 0, sizeof(xpp
));
1608 memset(&xecfg
, 0, sizeof(xecfg
));
1609 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1610 xdi_diff_outf(&mf1
, &mf2
, diffstat_consume
, diffstat
,
1611 &xpp
, &xecfg
, &ecb
);
1615 diff_free_filespec_data(one
);
1616 diff_free_filespec_data(two
);
1619 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1620 const char *attr_path
,
1621 struct diff_filespec
*one
,
1622 struct diff_filespec
*two
,
1623 struct diff_options
*o
)
1626 struct checkdiff_t data
;
1631 memset(&data
, 0, sizeof(data
));
1632 data
.filename
= name_b
? name_b
: name_a
;
1635 data
.ws_rule
= whitespace_rule(attr_path
);
1637 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1638 die("unable to read files to diff");
1641 * All the other codepaths check both sides, but not checking
1642 * the "old" side here is deliberate. We are checking the newly
1643 * introduced changes, and as long as the "new" side is text, we
1644 * can and should check what it introduces.
1646 if (diff_filespec_is_binary(two
))
1647 goto free_and_return
;
1649 /* Crazy xdl interfaces.. */
1654 memset(&xpp
, 0, sizeof(xpp
));
1655 memset(&xecfg
, 0, sizeof(xecfg
));
1656 xecfg
.ctxlen
= 1; /* at least one context line */
1657 xpp
.flags
= XDF_NEED_MINIMAL
;
1658 xdi_diff_outf(&mf1
, &mf2
, checkdiff_consume
, &data
,
1659 &xpp
, &xecfg
, &ecb
);
1661 if ((data
.ws_rule
& WS_TRAILING_SPACE
) &&
1662 data
.trailing_blanks_start
) {
1663 fprintf(o
->file
, "%s:%d: ends with blank lines.\n",
1664 data
.filename
, data
.trailing_blanks_start
);
1665 data
.status
= 1; /* report errors */
1669 diff_free_filespec_data(one
);
1670 diff_free_filespec_data(two
);
1672 DIFF_OPT_SET(o
, CHECK_FAILED
);
1675 struct diff_filespec
*alloc_filespec(const char *path
)
1677 int namelen
= strlen(path
);
1678 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1680 memset(spec
, 0, sizeof(*spec
));
1681 spec
->path
= (char *)(spec
+ 1);
1682 memcpy(spec
->path
, path
, namelen
+1);
1684 spec
->is_binary
= -1;
1688 void free_filespec(struct diff_filespec
*spec
)
1690 if (!--spec
->count
) {
1691 diff_free_filespec_data(spec
);
1696 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1697 unsigned short mode
)
1700 spec
->mode
= canon_mode(mode
);
1701 hashcpy(spec
->sha1
, sha1
);
1702 spec
->sha1_valid
= !is_null_sha1(sha1
);
1707 * Given a name and sha1 pair, if the index tells us the file in
1708 * the work tree has that object contents, return true, so that
1709 * prepare_temp_file() does not have to inflate and extract.
1711 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1713 struct cache_entry
*ce
;
1717 /* We do not read the cache ourselves here, because the
1718 * benchmark with my previous version that always reads cache
1719 * shows that it makes things worse for diff-tree comparing
1720 * two linux-2.6 kernel trees in an already checked out work
1721 * tree. This is because most diff-tree comparisons deal with
1722 * only a small number of files, while reading the cache is
1723 * expensive for a large project, and its cost outweighs the
1724 * savings we get by not inflating the object to a temporary
1725 * file. Practically, this code only helps when we are used
1726 * by diff-cache --cached, which does read the cache before
1732 /* We want to avoid the working directory if our caller
1733 * doesn't need the data in a normal file, this system
1734 * is rather slow with its stat/open/mmap/close syscalls,
1735 * and the object is contained in a pack file. The pack
1736 * is probably already open and will be faster to obtain
1737 * the data through than the working directory. Loose
1738 * objects however would tend to be slower as they need
1739 * to be individually opened and inflated.
1741 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1745 pos
= cache_name_pos(name
, len
);
1748 ce
= active_cache
[pos
];
1751 * This is not the sha1 we are looking for, or
1752 * unreusable because it is not a regular file.
1754 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1758 * If ce matches the file in the work tree, we can reuse it.
1760 if (ce_uptodate(ce
) ||
1761 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1767 static int populate_from_stdin(struct diff_filespec
*s
)
1769 struct strbuf buf
= STRBUF_INIT
;
1772 if (strbuf_read(&buf
, 0, 0) < 0)
1773 return error("error while reading from stdin %s",
1776 s
->should_munmap
= 0;
1777 s
->data
= strbuf_detach(&buf
, &size
);
1783 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1786 char *data
= xmalloc(100);
1787 len
= snprintf(data
, 100,
1788 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1800 * While doing rename detection and pickaxe operation, we may need to
1801 * grab the data for the blob (or file) for our own in-core comparison.
1802 * diff_filespec has data and size fields for this purpose.
1804 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1807 if (!DIFF_FILE_VALID(s
))
1808 die("internal error: asking to populate invalid file.");
1809 if (S_ISDIR(s
->mode
))
1815 if (size_only
&& 0 < s
->size
)
1818 if (S_ISGITLINK(s
->mode
))
1819 return diff_populate_gitlink(s
, size_only
);
1821 if (!s
->sha1_valid
||
1822 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1823 struct strbuf buf
= STRBUF_INIT
;
1827 if (!strcmp(s
->path
, "-"))
1828 return populate_from_stdin(s
);
1830 if (lstat(s
->path
, &st
) < 0) {
1831 if (errno
== ENOENT
) {
1835 s
->data
= (char *)"";
1840 s
->size
= xsize_t(st
.st_size
);
1843 if (S_ISLNK(st
.st_mode
)) {
1844 struct strbuf sb
= STRBUF_INIT
;
1846 if (strbuf_readlink(&sb
, s
->path
, s
->size
))
1849 s
->data
= strbuf_detach(&sb
, NULL
);
1855 fd
= open(s
->path
, O_RDONLY
);
1858 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1860 s
->should_munmap
= 1;
1863 * Convert from working tree format to canonical git format
1865 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
1867 munmap(s
->data
, s
->size
);
1868 s
->should_munmap
= 0;
1869 s
->data
= strbuf_detach(&buf
, &size
);
1875 enum object_type type
;
1877 type
= sha1_object_info(s
->sha1
, &s
->size
);
1879 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1886 void diff_free_filespec_blob(struct diff_filespec
*s
)
1890 else if (s
->should_munmap
)
1891 munmap(s
->data
, s
->size
);
1893 if (s
->should_free
|| s
->should_munmap
) {
1894 s
->should_free
= s
->should_munmap
= 0;
1899 void diff_free_filespec_data(struct diff_filespec
*s
)
1901 diff_free_filespec_blob(s
);
1906 static void prep_temp_blob(struct diff_tempfile
*temp
,
1909 const unsigned char *sha1
,
1914 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1916 die("unable to create temp-file: %s", strerror(errno
));
1917 if (write_in_full(fd
, blob
, size
) != size
)
1918 die("unable to write temp-file");
1920 temp
->name
= temp
->tmp_path
;
1921 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1923 sprintf(temp
->mode
, "%06o", mode
);
1926 static void prepare_temp_file(const char *name
,
1927 struct diff_tempfile
*temp
,
1928 struct diff_filespec
*one
)
1930 if (!DIFF_FILE_VALID(one
)) {
1932 /* A '-' entry produces this for file-2, and
1933 * a '+' entry produces this for file-1.
1935 temp
->name
= "/dev/null";
1936 strcpy(temp
->hex
, ".");
1937 strcpy(temp
->mode
, ".");
1941 if (!one
->sha1_valid
||
1942 reuse_worktree_file(name
, one
->sha1
, 1)) {
1944 if (lstat(name
, &st
) < 0) {
1945 if (errno
== ENOENT
)
1946 goto not_a_valid_file
;
1947 die("stat(%s): %s", name
, strerror(errno
));
1949 if (S_ISLNK(st
.st_mode
)) {
1951 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1952 ret
= readlink(name
, buf
, sizeof(buf
));
1954 die("readlink(%s)", name
);
1955 if (ret
== sizeof(buf
))
1956 die("symlink too long: %s", name
);
1957 prep_temp_blob(temp
, buf
, ret
,
1959 one
->sha1
: null_sha1
),
1961 one
->mode
: S_IFLNK
));
1964 /* we can borrow from the file in the work tree */
1966 if (!one
->sha1_valid
)
1967 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1969 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1970 /* Even though we may sometimes borrow the
1971 * contents from the work tree, we always want
1972 * one->mode. mode is trustworthy even when
1973 * !(one->sha1_valid), as long as
1974 * DIFF_FILE_VALID(one).
1976 sprintf(temp
->mode
, "%06o", one
->mode
);
1981 if (diff_populate_filespec(one
, 0))
1982 die("cannot read data blob for %s", one
->path
);
1983 prep_temp_blob(temp
, one
->data
, one
->size
,
1984 one
->sha1
, one
->mode
);
1988 static void remove_tempfile(void)
1992 for (i
= 0; i
< 2; i
++)
1993 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1994 unlink(diff_temp
[i
].name
);
1995 diff_temp
[i
].name
= NULL
;
1999 static void remove_tempfile_on_signal(int signo
)
2002 signal(SIGINT
, SIG_DFL
);
2006 /* An external diff command takes:
2008 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2009 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2012 static void run_external_diff(const char *pgm
,
2015 struct diff_filespec
*one
,
2016 struct diff_filespec
*two
,
2017 const char *xfrm_msg
,
2018 int complete_rewrite
)
2020 const char *spawn_arg
[10];
2021 struct diff_tempfile
*temp
= diff_temp
;
2023 static int atexit_asked
= 0;
2024 const char *othername
;
2025 const char **arg
= &spawn_arg
[0];
2027 othername
= (other
? other
: name
);
2029 prepare_temp_file(name
, &temp
[0], one
);
2030 prepare_temp_file(othername
, &temp
[1], two
);
2031 if (! atexit_asked
&&
2032 (temp
[0].name
== temp
[0].tmp_path
||
2033 temp
[1].name
== temp
[1].tmp_path
)) {
2035 atexit(remove_tempfile
);
2037 signal(SIGINT
, remove_tempfile_on_signal
);
2043 *arg
++ = temp
[0].name
;
2044 *arg
++ = temp
[0].hex
;
2045 *arg
++ = temp
[0].mode
;
2046 *arg
++ = temp
[1].name
;
2047 *arg
++ = temp
[1].hex
;
2048 *arg
++ = temp
[1].mode
;
2059 retval
= run_command_v_opt(spawn_arg
, 0);
2062 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2067 static void run_diff_cmd(const char *pgm
,
2070 const char *attr_path
,
2071 struct diff_filespec
*one
,
2072 struct diff_filespec
*two
,
2073 const char *xfrm_msg
,
2074 struct diff_options
*o
,
2075 int complete_rewrite
)
2077 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2080 struct userdiff_driver
*drv
= userdiff_find_by_path(attr_path
);
2081 if (drv
&& drv
->external
)
2082 pgm
= drv
->external
;
2086 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2091 builtin_diff(name
, other
? other
: name
,
2092 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2094 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2097 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2099 if (DIFF_FILE_VALID(one
)) {
2100 if (!one
->sha1_valid
) {
2102 if (!strcmp(one
->path
, "-")) {
2103 hashcpy(one
->sha1
, null_sha1
);
2106 if (lstat(one
->path
, &st
) < 0)
2107 die("stat %s", one
->path
);
2108 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2109 die("cannot hash %s", one
->path
);
2116 static int similarity_index(struct diff_filepair
*p
)
2118 return p
->score
* 100 / MAX_SCORE
;
2121 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2123 /* Strip the prefix but do not molest /dev/null and absolute paths */
2124 if (*namep
&& **namep
!= '/')
2125 *namep
+= prefix_length
;
2126 if (*otherp
&& **otherp
!= '/')
2127 *otherp
+= prefix_length
;
2130 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2132 const char *pgm
= external_diff();
2135 struct diff_filespec
*one
= p
->one
;
2136 struct diff_filespec
*two
= p
->two
;
2139 const char *attr_path
;
2140 int complete_rewrite
= 0;
2142 name
= p
->one
->path
;
2143 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2145 if (o
->prefix_length
)
2146 strip_prefix(o
->prefix_length
, &name
, &other
);
2148 if (DIFF_PAIR_UNMERGED(p
)) {
2149 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2150 NULL
, NULL
, NULL
, o
, 0);
2154 diff_fill_sha1_info(one
);
2155 diff_fill_sha1_info(two
);
2157 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
2158 switch (p
->status
) {
2159 case DIFF_STATUS_COPIED
:
2160 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2161 strbuf_addstr(&msg
, "\ncopy from ");
2162 quote_c_style(name
, &msg
, NULL
, 0);
2163 strbuf_addstr(&msg
, "\ncopy to ");
2164 quote_c_style(other
, &msg
, NULL
, 0);
2165 strbuf_addch(&msg
, '\n');
2167 case DIFF_STATUS_RENAMED
:
2168 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2169 strbuf_addstr(&msg
, "\nrename from ");
2170 quote_c_style(name
, &msg
, NULL
, 0);
2171 strbuf_addstr(&msg
, "\nrename to ");
2172 quote_c_style(other
, &msg
, NULL
, 0);
2173 strbuf_addch(&msg
, '\n');
2175 case DIFF_STATUS_MODIFIED
:
2177 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
2178 similarity_index(p
));
2179 complete_rewrite
= 1;
2188 if (hashcmp(one
->sha1
, two
->sha1
)) {
2189 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2191 if (DIFF_OPT_TST(o
, BINARY
)) {
2193 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2194 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2197 strbuf_addf(&msg
, "index %.*s..%.*s",
2198 abbrev
, sha1_to_hex(one
->sha1
),
2199 abbrev
, sha1_to_hex(two
->sha1
));
2200 if (one
->mode
== two
->mode
)
2201 strbuf_addf(&msg
, " %06o", one
->mode
);
2202 strbuf_addch(&msg
, '\n');
2206 strbuf_setlen(&msg
, msg
.len
- 1);
2207 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
2210 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2211 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2212 /* a filepair that changes between file and symlink
2213 * needs to be split into deletion and creation.
2215 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2216 run_diff_cmd(NULL
, name
, other
, attr_path
,
2217 one
, null
, xfrm_msg
, o
, 0);
2219 null
= alloc_filespec(one
->path
);
2220 run_diff_cmd(NULL
, name
, other
, attr_path
,
2221 null
, two
, xfrm_msg
, o
, 0);
2225 run_diff_cmd(pgm
, name
, other
, attr_path
,
2226 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2228 strbuf_release(&msg
);
2231 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2232 struct diffstat_t
*diffstat
)
2236 int complete_rewrite
= 0;
2238 if (DIFF_PAIR_UNMERGED(p
)) {
2240 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2244 name
= p
->one
->path
;
2245 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2247 if (o
->prefix_length
)
2248 strip_prefix(o
->prefix_length
, &name
, &other
);
2250 diff_fill_sha1_info(p
->one
);
2251 diff_fill_sha1_info(p
->two
);
2253 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2254 complete_rewrite
= 1;
2255 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2258 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2262 const char *attr_path
;
2264 if (DIFF_PAIR_UNMERGED(p
)) {
2269 name
= p
->one
->path
;
2270 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2271 attr_path
= other
? other
: name
;
2273 if (o
->prefix_length
)
2274 strip_prefix(o
->prefix_length
, &name
, &other
);
2276 diff_fill_sha1_info(p
->one
);
2277 diff_fill_sha1_info(p
->two
);
2279 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2282 void diff_setup(struct diff_options
*options
)
2284 memset(options
, 0, sizeof(*options
));
2286 options
->file
= stdout
;
2288 options
->line_termination
= '\n';
2289 options
->break_opt
= -1;
2290 options
->rename_limit
= -1;
2291 options
->dirstat_percent
= 3;
2292 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
2293 options
->context
= 3;
2295 options
->change
= diff_change
;
2296 options
->add_remove
= diff_addremove
;
2297 if (diff_use_color_default
> 0)
2298 DIFF_OPT_SET(options
, COLOR_DIFF
);
2300 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2301 options
->detect_rename
= diff_detect_rename_default
;
2303 if (!diff_mnemonic_prefix
) {
2304 options
->a_prefix
= "a/";
2305 options
->b_prefix
= "b/";
2309 int diff_setup_done(struct diff_options
*options
)
2313 if (options
->output_format
& DIFF_FORMAT_NAME
)
2315 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2317 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2319 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2322 die("--name-only, --name-status, --check and -s are mutually exclusive");
2324 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2325 options
->detect_rename
= DIFF_DETECT_COPY
;
2327 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2328 options
->prefix
= NULL
;
2329 if (options
->prefix
)
2330 options
->prefix_length
= strlen(options
->prefix
);
2332 options
->prefix_length
= 0;
2334 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2335 DIFF_FORMAT_NAME_STATUS
|
2336 DIFF_FORMAT_CHECKDIFF
|
2337 DIFF_FORMAT_NO_OUTPUT
))
2338 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2339 DIFF_FORMAT_NUMSTAT
|
2340 DIFF_FORMAT_DIFFSTAT
|
2341 DIFF_FORMAT_SHORTSTAT
|
2342 DIFF_FORMAT_DIRSTAT
|
2343 DIFF_FORMAT_SUMMARY
|
2347 * These cases always need recursive; we do not drop caller-supplied
2348 * recursive bits for other formats here.
2350 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2351 DIFF_FORMAT_NUMSTAT
|
2352 DIFF_FORMAT_DIFFSTAT
|
2353 DIFF_FORMAT_SHORTSTAT
|
2354 DIFF_FORMAT_DIRSTAT
|
2355 DIFF_FORMAT_SUMMARY
|
2356 DIFF_FORMAT_CHECKDIFF
))
2357 DIFF_OPT_SET(options
, RECURSIVE
);
2359 * Also pickaxe would not work very well if you do not say recursive
2361 if (options
->pickaxe
)
2362 DIFF_OPT_SET(options
, RECURSIVE
);
2364 if (options
->detect_rename
&& options
->rename_limit
< 0)
2365 options
->rename_limit
= diff_rename_limit_default
;
2366 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2368 /* read-cache does not die even when it fails
2369 * so it is safe for us to do this here. Also
2370 * it does not smudge active_cache or active_nr
2371 * when it fails, so we do not have to worry about
2372 * cleaning it up ourselves either.
2376 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2377 options
->abbrev
= 40; /* full */
2380 * It does not make sense to show the first hit we happened
2381 * to have found. It does not make sense not to return with
2382 * exit code in such a case either.
2384 if (DIFF_OPT_TST(options
, QUIET
)) {
2385 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2386 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2392 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2402 if (c
== arg_short
) {
2406 if (val
&& isdigit(c
)) {
2408 int n
= strtoul(arg
, &end
, 10);
2419 eq
= strchr(arg
, '=');
2424 if (!len
|| strncmp(arg
, arg_long
, len
))
2429 if (!isdigit(*++eq
))
2431 n
= strtoul(eq
, &end
, 10);
2439 static int diff_scoreopt_parse(const char *opt
);
2441 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2443 const char *arg
= av
[0];
2445 /* Output format options */
2446 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2447 options
->output_format
|= DIFF_FORMAT_PATCH
;
2448 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2449 options
->output_format
|= DIFF_FORMAT_PATCH
;
2450 else if (!strcmp(arg
, "--raw"))
2451 options
->output_format
|= DIFF_FORMAT_RAW
;
2452 else if (!strcmp(arg
, "--patch-with-raw"))
2453 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2454 else if (!strcmp(arg
, "--numstat"))
2455 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2456 else if (!strcmp(arg
, "--shortstat"))
2457 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2458 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2459 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2460 else if (!strcmp(arg
, "--cumulative")) {
2461 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2462 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
2463 } else if (opt_arg(arg
, 0, "dirstat-by-file",
2464 &options
->dirstat_percent
)) {
2465 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2466 DIFF_OPT_SET(options
, DIRSTAT_BY_FILE
);
2468 else if (!strcmp(arg
, "--check"))
2469 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2470 else if (!strcmp(arg
, "--summary"))
2471 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2472 else if (!strcmp(arg
, "--patch-with-stat"))
2473 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2474 else if (!strcmp(arg
, "--name-only"))
2475 options
->output_format
|= DIFF_FORMAT_NAME
;
2476 else if (!strcmp(arg
, "--name-status"))
2477 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2478 else if (!strcmp(arg
, "-s"))
2479 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2480 else if (!prefixcmp(arg
, "--stat")) {
2482 int width
= options
->stat_width
;
2483 int name_width
= options
->stat_name_width
;
2489 if (!prefixcmp(arg
, "-width="))
2490 width
= strtoul(arg
+ 7, &end
, 10);
2491 else if (!prefixcmp(arg
, "-name-width="))
2492 name_width
= strtoul(arg
+ 12, &end
, 10);
2495 width
= strtoul(arg
+1, &end
, 10);
2497 name_width
= strtoul(end
+1, &end
, 10);
2500 /* Important! This checks all the error cases! */
2503 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2504 options
->stat_name_width
= name_width
;
2505 options
->stat_width
= width
;
2508 /* renames options */
2509 else if (!prefixcmp(arg
, "-B")) {
2510 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2513 else if (!prefixcmp(arg
, "-M")) {
2514 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2516 options
->detect_rename
= DIFF_DETECT_RENAME
;
2518 else if (!prefixcmp(arg
, "-C")) {
2519 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2520 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2521 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2523 options
->detect_rename
= DIFF_DETECT_COPY
;
2525 else if (!strcmp(arg
, "--no-renames"))
2526 options
->detect_rename
= 0;
2527 else if (!strcmp(arg
, "--relative"))
2528 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2529 else if (!prefixcmp(arg
, "--relative=")) {
2530 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2531 options
->prefix
= arg
+ 11;
2535 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2536 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2537 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2538 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2539 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2540 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2543 else if (!strcmp(arg
, "--binary")) {
2544 options
->output_format
|= DIFF_FORMAT_PATCH
;
2545 DIFF_OPT_SET(options
, BINARY
);
2547 else if (!strcmp(arg
, "--full-index"))
2548 DIFF_OPT_SET(options
, FULL_INDEX
);
2549 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2550 DIFF_OPT_SET(options
, TEXT
);
2551 else if (!strcmp(arg
, "-R"))
2552 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2553 else if (!strcmp(arg
, "--find-copies-harder"))
2554 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2555 else if (!strcmp(arg
, "--follow"))
2556 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2557 else if (!strcmp(arg
, "--color"))
2558 DIFF_OPT_SET(options
, COLOR_DIFF
);
2559 else if (!strcmp(arg
, "--no-color"))
2560 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2561 else if (!strcmp(arg
, "--color-words"))
2562 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2563 else if (!prefixcmp(arg
, "--color-words=")) {
2564 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2565 options
->word_regex
= arg
+ 14;
2567 else if (!strcmp(arg
, "--exit-code"))
2568 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2569 else if (!strcmp(arg
, "--quiet"))
2570 DIFF_OPT_SET(options
, QUIET
);
2571 else if (!strcmp(arg
, "--ext-diff"))
2572 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2573 else if (!strcmp(arg
, "--no-ext-diff"))
2574 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2575 else if (!strcmp(arg
, "--textconv"))
2576 DIFF_OPT_SET(options
, ALLOW_TEXTCONV
);
2577 else if (!strcmp(arg
, "--no-textconv"))
2578 DIFF_OPT_CLR(options
, ALLOW_TEXTCONV
);
2579 else if (!strcmp(arg
, "--ignore-submodules"))
2580 DIFF_OPT_SET(options
, IGNORE_SUBMODULES
);
2583 else if (!strcmp(arg
, "-z"))
2584 options
->line_termination
= 0;
2585 else if (!prefixcmp(arg
, "-l"))
2586 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2587 else if (!prefixcmp(arg
, "-S"))
2588 options
->pickaxe
= arg
+ 2;
2589 else if (!strcmp(arg
, "--pickaxe-all"))
2590 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2591 else if (!strcmp(arg
, "--pickaxe-regex"))
2592 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2593 else if (!prefixcmp(arg
, "-O"))
2594 options
->orderfile
= arg
+ 2;
2595 else if (!prefixcmp(arg
, "--diff-filter="))
2596 options
->filter
= arg
+ 14;
2597 else if (!strcmp(arg
, "--abbrev"))
2598 options
->abbrev
= DEFAULT_ABBREV
;
2599 else if (!prefixcmp(arg
, "--abbrev=")) {
2600 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2601 if (options
->abbrev
< MINIMUM_ABBREV
)
2602 options
->abbrev
= MINIMUM_ABBREV
;
2603 else if (40 < options
->abbrev
)
2604 options
->abbrev
= 40;
2606 else if (!prefixcmp(arg
, "--src-prefix="))
2607 options
->a_prefix
= arg
+ 13;
2608 else if (!prefixcmp(arg
, "--dst-prefix="))
2609 options
->b_prefix
= arg
+ 13;
2610 else if (!strcmp(arg
, "--no-prefix"))
2611 options
->a_prefix
= options
->b_prefix
= "";
2612 else if (opt_arg(arg
, '\0', "inter-hunk-context",
2613 &options
->interhunkcontext
))
2615 else if (!prefixcmp(arg
, "--output=")) {
2616 options
->file
= fopen(arg
+ strlen("--output="), "w");
2617 options
->close_file
= 1;
2623 static int parse_num(const char **cp_p
)
2625 unsigned long num
, scale
;
2627 const char *cp
= *cp_p
;
2634 if ( !dot
&& ch
== '.' ) {
2637 } else if ( ch
== '%' ) {
2638 scale
= dot
? scale
*100 : 100;
2639 cp
++; /* % is always at the end */
2641 } else if ( ch
>= '0' && ch
<= '9' ) {
2642 if ( scale
< 100000 ) {
2644 num
= (num
*10) + (ch
-'0');
2653 /* user says num divided by scale and we say internally that
2654 * is MAX_SCORE * num / scale.
2656 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2659 static int diff_scoreopt_parse(const char *opt
)
2661 int opt1
, opt2
, cmd
;
2666 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2667 return -1; /* that is not a -M, -C nor -B option */
2669 opt1
= parse_num(&opt
);
2675 else if (*opt
!= '/')
2676 return -1; /* we expect -B80/99 or -B80 */
2679 opt2
= parse_num(&opt
);
2684 return opt1
| (opt2
<< 16);
2687 struct diff_queue_struct diff_queued_diff
;
2689 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2691 if (queue
->alloc
<= queue
->nr
) {
2692 queue
->alloc
= alloc_nr(queue
->alloc
);
2693 queue
->queue
= xrealloc(queue
->queue
,
2694 sizeof(dp
) * queue
->alloc
);
2696 queue
->queue
[queue
->nr
++] = dp
;
2699 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2700 struct diff_filespec
*one
,
2701 struct diff_filespec
*two
)
2703 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2711 void diff_free_filepair(struct diff_filepair
*p
)
2713 free_filespec(p
->one
);
2714 free_filespec(p
->two
);
2718 /* This is different from find_unique_abbrev() in that
2719 * it stuffs the result with dots for alignment.
2721 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2726 return sha1_to_hex(sha1
);
2728 abbrev
= find_unique_abbrev(sha1
, len
);
2729 abblen
= strlen(abbrev
);
2731 static char hex
[41];
2732 if (len
< abblen
&& abblen
<= len
+ 2)
2733 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2735 sprintf(hex
, "%s...", abbrev
);
2738 return sha1_to_hex(sha1
);
2741 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2743 int line_termination
= opt
->line_termination
;
2744 int inter_name_termination
= line_termination
? '\t' : '\0';
2746 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2747 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2748 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2749 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2752 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
2753 inter_name_termination
);
2755 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
2758 if (p
->status
== DIFF_STATUS_COPIED
||
2759 p
->status
== DIFF_STATUS_RENAMED
) {
2760 const char *name_a
, *name_b
;
2761 name_a
= p
->one
->path
;
2762 name_b
= p
->two
->path
;
2763 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2764 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
2765 write_name_quoted(name_b
, opt
->file
, line_termination
);
2767 const char *name_a
, *name_b
;
2768 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2770 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2771 write_name_quoted(name_a
, opt
->file
, line_termination
);
2775 int diff_unmodified_pair(struct diff_filepair
*p
)
2777 /* This function is written stricter than necessary to support
2778 * the currently implemented transformers, but the idea is to
2779 * let transformers to produce diff_filepairs any way they want,
2780 * and filter and clean them up here before producing the output.
2782 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2784 if (DIFF_PAIR_UNMERGED(p
))
2785 return 0; /* unmerged is interesting */
2787 /* deletion, addition, mode or type change
2788 * and rename are all interesting.
2790 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2791 DIFF_PAIR_MODE_CHANGED(p
) ||
2792 strcmp(one
->path
, two
->path
))
2795 /* both are valid and point at the same path. that is, we are
2796 * dealing with a change.
2798 if (one
->sha1_valid
&& two
->sha1_valid
&&
2799 !hashcmp(one
->sha1
, two
->sha1
))
2800 return 1; /* no change */
2801 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2802 return 1; /* both look at the same file on the filesystem. */
2806 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2808 if (diff_unmodified_pair(p
))
2811 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2812 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2813 return; /* no tree diffs in patch format */
2818 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2819 struct diffstat_t
*diffstat
)
2821 if (diff_unmodified_pair(p
))
2824 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2825 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2826 return; /* no tree diffs in patch format */
2828 run_diffstat(p
, o
, diffstat
);
2831 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2832 struct diff_options
*o
)
2834 if (diff_unmodified_pair(p
))
2837 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2838 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2839 return; /* no tree diffs in patch format */
2841 run_checkdiff(p
, o
);
2844 int diff_queue_is_empty(void)
2846 struct diff_queue_struct
*q
= &diff_queued_diff
;
2848 for (i
= 0; i
< q
->nr
; i
++)
2849 if (!diff_unmodified_pair(q
->queue
[i
]))
2855 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2857 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2860 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2862 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2863 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2865 s
->size
, s
->xfrm_flags
);
2868 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2870 diff_debug_filespec(p
->one
, i
, "one");
2871 diff_debug_filespec(p
->two
, i
, "two");
2872 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2873 p
->score
, p
->status
? p
->status
: '?',
2874 p
->one
->rename_used
, p
->broken_pair
);
2877 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2881 fprintf(stderr
, "%s\n", msg
);
2882 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2883 for (i
= 0; i
< q
->nr
; i
++) {
2884 struct diff_filepair
*p
= q
->queue
[i
];
2885 diff_debug_filepair(p
, i
);
2890 static void diff_resolve_rename_copy(void)
2893 struct diff_filepair
*p
;
2894 struct diff_queue_struct
*q
= &diff_queued_diff
;
2896 diff_debug_queue("resolve-rename-copy", q
);
2898 for (i
= 0; i
< q
->nr
; i
++) {
2900 p
->status
= 0; /* undecided */
2901 if (DIFF_PAIR_UNMERGED(p
))
2902 p
->status
= DIFF_STATUS_UNMERGED
;
2903 else if (!DIFF_FILE_VALID(p
->one
))
2904 p
->status
= DIFF_STATUS_ADDED
;
2905 else if (!DIFF_FILE_VALID(p
->two
))
2906 p
->status
= DIFF_STATUS_DELETED
;
2907 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2908 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2910 /* from this point on, we are dealing with a pair
2911 * whose both sides are valid and of the same type, i.e.
2912 * either in-place edit or rename/copy edit.
2914 else if (DIFF_PAIR_RENAME(p
)) {
2916 * A rename might have re-connected a broken
2917 * pair up, causing the pathnames to be the
2918 * same again. If so, that's not a rename at
2919 * all, just a modification..
2921 * Otherwise, see if this source was used for
2922 * multiple renames, in which case we decrement
2923 * the count, and call it a copy.
2925 if (!strcmp(p
->one
->path
, p
->two
->path
))
2926 p
->status
= DIFF_STATUS_MODIFIED
;
2927 else if (--p
->one
->rename_used
> 0)
2928 p
->status
= DIFF_STATUS_COPIED
;
2930 p
->status
= DIFF_STATUS_RENAMED
;
2932 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2933 p
->one
->mode
!= p
->two
->mode
||
2934 is_null_sha1(p
->one
->sha1
))
2935 p
->status
= DIFF_STATUS_MODIFIED
;
2937 /* This is a "no-change" entry and should not
2938 * happen anymore, but prepare for broken callers.
2940 error("feeding unmodified %s to diffcore",
2942 p
->status
= DIFF_STATUS_UNKNOWN
;
2945 diff_debug_queue("resolve-rename-copy done", q
);
2948 static int check_pair_status(struct diff_filepair
*p
)
2950 switch (p
->status
) {
2951 case DIFF_STATUS_UNKNOWN
:
2954 die("internal error in diff-resolve-rename-copy");
2960 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2962 int fmt
= opt
->output_format
;
2964 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2965 diff_flush_checkdiff(p
, opt
);
2966 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2967 diff_flush_raw(p
, opt
);
2968 else if (fmt
& DIFF_FORMAT_NAME
) {
2969 const char *name_a
, *name_b
;
2970 name_a
= p
->two
->path
;
2972 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2973 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
2977 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
2980 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
2982 fprintf(file
, " %s ", newdelete
);
2983 write_name_quoted(fs
->path
, file
, '\n');
2987 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
)
2989 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2990 fprintf(file
, " mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2991 show_name
? ' ' : '\n');
2993 write_name_quoted(p
->two
->path
, file
, '\n');
2998 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
)
3000 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
3002 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
3004 show_mode_change(file
, p
, 0);
3007 static void diff_summary(FILE *file
, struct diff_filepair
*p
)
3010 case DIFF_STATUS_DELETED
:
3011 show_file_mode_name(file
, "delete", p
->one
);
3013 case DIFF_STATUS_ADDED
:
3014 show_file_mode_name(file
, "create", p
->two
);
3016 case DIFF_STATUS_COPIED
:
3017 show_rename_copy(file
, "copy", p
);
3019 case DIFF_STATUS_RENAMED
:
3020 show_rename_copy(file
, "rename", p
);
3024 fputs(" rewrite ", file
);
3025 write_name_quoted(p
->two
->path
, file
, ' ');
3026 fprintf(file
, "(%d%%)\n", similarity_index(p
));
3028 show_mode_change(file
, p
, !p
->score
);
3038 static int remove_space(char *line
, int len
)
3044 for (i
= 0; i
< len
; i
++)
3045 if (!isspace((c
= line
[i
])))
3051 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3053 struct patch_id_t
*data
= priv
;
3056 /* Ignore line numbers when computing the SHA1 of the patch */
3057 if (!prefixcmp(line
, "@@ -"))
3060 new_len
= remove_space(line
, len
);
3062 git_SHA1_Update(data
->ctx
, line
, new_len
);
3063 data
->patchlen
+= new_len
;
3066 /* returns 0 upon success, and writes result into sha1 */
3067 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3069 struct diff_queue_struct
*q
= &diff_queued_diff
;
3072 struct patch_id_t data
;
3073 char buffer
[PATH_MAX
* 4 + 20];
3075 git_SHA1_Init(&ctx
);
3076 memset(&data
, 0, sizeof(struct patch_id_t
));
3079 for (i
= 0; i
< q
->nr
; i
++) {
3084 struct diff_filepair
*p
= q
->queue
[i
];
3087 memset(&xpp
, 0, sizeof(xpp
));
3088 memset(&xecfg
, 0, sizeof(xecfg
));
3090 return error("internal diff status error");
3091 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3093 if (diff_unmodified_pair(p
))
3095 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3096 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3098 if (DIFF_PAIR_UNMERGED(p
))
3101 diff_fill_sha1_info(p
->one
);
3102 diff_fill_sha1_info(p
->two
);
3103 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3104 fill_mmfile(&mf2
, p
->two
) < 0)
3105 return error("unable to read files to diff");
3107 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3108 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3109 if (p
->one
->mode
== 0)
3110 len1
= snprintf(buffer
, sizeof(buffer
),
3111 "diff--gita/%.*sb/%.*s"
3118 len2
, p
->two
->path
);
3119 else if (p
->two
->mode
== 0)
3120 len1
= snprintf(buffer
, sizeof(buffer
),
3121 "diff--gita/%.*sb/%.*s"
3122 "deletedfilemode%06o"
3128 len1
, p
->one
->path
);
3130 len1
= snprintf(buffer
, sizeof(buffer
),
3131 "diff--gita/%.*sb/%.*s"
3137 len2
, p
->two
->path
);
3138 git_SHA1_Update(&ctx
, buffer
, len1
);
3140 xpp
.flags
= XDF_NEED_MINIMAL
;
3142 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3143 xdi_diff_outf(&mf1
, &mf2
, patch_id_consume
, &data
,
3144 &xpp
, &xecfg
, &ecb
);
3147 git_SHA1_Final(sha1
, &ctx
);
3151 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3153 struct diff_queue_struct
*q
= &diff_queued_diff
;
3155 int result
= diff_get_patch_id(options
, sha1
);
3157 for (i
= 0; i
< q
->nr
; i
++)
3158 diff_free_filepair(q
->queue
[i
]);
3162 q
->nr
= q
->alloc
= 0;
3167 static int is_summary_empty(const struct diff_queue_struct
*q
)
3171 for (i
= 0; i
< q
->nr
; i
++) {
3172 const struct diff_filepair
*p
= q
->queue
[i
];
3174 switch (p
->status
) {
3175 case DIFF_STATUS_DELETED
:
3176 case DIFF_STATUS_ADDED
:
3177 case DIFF_STATUS_COPIED
:
3178 case DIFF_STATUS_RENAMED
:
3183 if (p
->one
->mode
&& p
->two
->mode
&&
3184 p
->one
->mode
!= p
->two
->mode
)
3192 void diff_flush(struct diff_options
*options
)
3194 struct diff_queue_struct
*q
= &diff_queued_diff
;
3195 int i
, output_format
= options
->output_format
;
3199 * Order: raw, stat, summary, patch
3200 * or: name/name-status/checkdiff (other bits clear)
3205 if (output_format
& (DIFF_FORMAT_RAW
|
3207 DIFF_FORMAT_NAME_STATUS
|
3208 DIFF_FORMAT_CHECKDIFF
)) {
3209 for (i
= 0; i
< q
->nr
; i
++) {
3210 struct diff_filepair
*p
= q
->queue
[i
];
3211 if (check_pair_status(p
))
3212 flush_one_pair(p
, options
);
3217 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3218 struct diffstat_t diffstat
;
3220 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3221 for (i
= 0; i
< q
->nr
; i
++) {
3222 struct diff_filepair
*p
= q
->queue
[i
];
3223 if (check_pair_status(p
))
3224 diff_flush_stat(p
, options
, &diffstat
);
3226 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3227 show_numstat(&diffstat
, options
);
3228 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3229 show_stats(&diffstat
, options
);
3230 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3231 show_shortstats(&diffstat
, options
);
3232 free_diffstat_info(&diffstat
);
3235 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3236 show_dirstat(options
);
3238 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3239 for (i
= 0; i
< q
->nr
; i
++)
3240 diff_summary(options
->file
, q
->queue
[i
]);
3244 if (output_format
& DIFF_FORMAT_PATCH
) {
3246 putc(options
->line_termination
, options
->file
);
3247 if (options
->stat_sep
) {
3248 /* attach patch instead of inline */
3249 fputs(options
->stat_sep
, options
->file
);
3253 for (i
= 0; i
< q
->nr
; i
++) {
3254 struct diff_filepair
*p
= q
->queue
[i
];
3255 if (check_pair_status(p
))
3256 diff_flush_patch(p
, options
);
3260 if (output_format
& DIFF_FORMAT_CALLBACK
)
3261 options
->format_callback(q
, options
, options
->format_callback_data
);
3263 for (i
= 0; i
< q
->nr
; i
++)
3264 diff_free_filepair(q
->queue
[i
]);
3268 q
->nr
= q
->alloc
= 0;
3269 if (options
->close_file
)
3270 fclose(options
->file
);
3273 static void diffcore_apply_filter(const char *filter
)
3276 struct diff_queue_struct
*q
= &diff_queued_diff
;
3277 struct diff_queue_struct outq
;
3279 outq
.nr
= outq
.alloc
= 0;
3284 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3286 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3287 struct diff_filepair
*p
= q
->queue
[i
];
3288 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3290 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3292 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3293 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3294 strchr(filter
, p
->status
)))
3300 /* otherwise we will clear the whole queue
3301 * by copying the empty outq at the end of this
3302 * function, but first clear the current entries
3305 for (i
= 0; i
< q
->nr
; i
++)
3306 diff_free_filepair(q
->queue
[i
]);
3309 /* Only the matching ones */
3310 for (i
= 0; i
< q
->nr
; i
++) {
3311 struct diff_filepair
*p
= q
->queue
[i
];
3313 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3315 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3317 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3318 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3319 strchr(filter
, p
->status
)))
3322 diff_free_filepair(p
);
3329 /* Check whether two filespecs with the same mode and size are identical */
3330 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3331 struct diff_filespec
*two
)
3333 if (S_ISGITLINK(one
->mode
))
3335 if (diff_populate_filespec(one
, 0))
3337 if (diff_populate_filespec(two
, 0))
3339 return !memcmp(one
->data
, two
->data
, one
->size
);
3342 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3345 struct diff_queue_struct
*q
= &diff_queued_diff
;
3346 struct diff_queue_struct outq
;
3348 outq
.nr
= outq
.alloc
= 0;
3350 for (i
= 0; i
< q
->nr
; i
++) {
3351 struct diff_filepair
*p
= q
->queue
[i
];
3354 * 1. Entries that come from stat info dirtyness
3355 * always have both sides (iow, not create/delete),
3356 * one side of the object name is unknown, with
3357 * the same mode and size. Keep the ones that
3358 * do not match these criteria. They have real
3361 * 2. At this point, the file is known to be modified,
3362 * with the same mode and size, and the object
3363 * name of one side is unknown. Need to inspect
3364 * the identical contents.
3366 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3367 !DIFF_FILE_VALID(p
->two
) ||
3368 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3369 (p
->one
->mode
!= p
->two
->mode
) ||
3370 diff_populate_filespec(p
->one
, 1) ||
3371 diff_populate_filespec(p
->two
, 1) ||
3372 (p
->one
->size
!= p
->two
->size
) ||
3373 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3377 * The caller can subtract 1 from skip_stat_unmatch
3378 * to determine how many paths were dirty only
3379 * due to stat info mismatch.
3381 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3382 diffopt
->skip_stat_unmatch
++;
3383 diff_free_filepair(p
);
3390 void diffcore_std(struct diff_options
*options
)
3392 if (options
->skip_stat_unmatch
)
3393 diffcore_skip_stat_unmatch(options
);
3394 if (options
->break_opt
!= -1)
3395 diffcore_break(options
->break_opt
);
3396 if (options
->detect_rename
)
3397 diffcore_rename(options
);
3398 if (options
->break_opt
!= -1)
3399 diffcore_merge_broken();
3400 if (options
->pickaxe
)
3401 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3402 if (options
->orderfile
)
3403 diffcore_order(options
->orderfile
);
3404 diff_resolve_rename_copy();
3405 diffcore_apply_filter(options
->filter
);
3407 if (diff_queued_diff
.nr
)
3408 DIFF_OPT_SET(options
, HAS_CHANGES
);
3410 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3413 int diff_result_code(struct diff_options
*opt
, int status
)
3416 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3417 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3419 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3420 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3422 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3423 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3428 void diff_addremove(struct diff_options
*options
,
3429 int addremove
, unsigned mode
,
3430 const unsigned char *sha1
,
3431 const char *concatpath
)
3433 struct diff_filespec
*one
, *two
;
3435 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(mode
))
3438 /* This may look odd, but it is a preparation for
3439 * feeding "there are unchanged files which should
3440 * not produce diffs, but when you are doing copy
3441 * detection you would need them, so here they are"
3442 * entries to the diff-core. They will be prefixed
3443 * with something like '=' or '*' (I haven't decided
3444 * which but should not make any difference).
3445 * Feeding the same new and old to diff_change()
3446 * also has the same effect.
3447 * Before the final output happens, they are pruned after
3448 * merged into rename/copy pairs as appropriate.
3450 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3451 addremove
= (addremove
== '+' ? '-' :
3452 addremove
== '-' ? '+' : addremove
);
3454 if (options
->prefix
&&
3455 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3458 one
= alloc_filespec(concatpath
);
3459 two
= alloc_filespec(concatpath
);
3461 if (addremove
!= '+')
3462 fill_filespec(one
, sha1
, mode
);
3463 if (addremove
!= '-')
3464 fill_filespec(two
, sha1
, mode
);
3466 diff_queue(&diff_queued_diff
, one
, two
);
3467 DIFF_OPT_SET(options
, HAS_CHANGES
);
3470 void diff_change(struct diff_options
*options
,
3471 unsigned old_mode
, unsigned new_mode
,
3472 const unsigned char *old_sha1
,
3473 const unsigned char *new_sha1
,
3474 const char *concatpath
)
3476 struct diff_filespec
*one
, *two
;
3478 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(old_mode
)
3479 && S_ISGITLINK(new_mode
))
3482 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3484 const unsigned char *tmp_c
;
3485 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3486 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3489 if (options
->prefix
&&
3490 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3493 one
= alloc_filespec(concatpath
);
3494 two
= alloc_filespec(concatpath
);
3495 fill_filespec(one
, old_sha1
, old_mode
);
3496 fill_filespec(two
, new_sha1
, new_mode
);
3498 diff_queue(&diff_queued_diff
, one
, two
);
3499 DIFF_OPT_SET(options
, HAS_CHANGES
);
3502 void diff_unmerge(struct diff_options
*options
,
3504 unsigned mode
, const unsigned char *sha1
)
3506 struct diff_filespec
*one
, *two
;
3508 if (options
->prefix
&&
3509 strncmp(path
, options
->prefix
, options
->prefix_length
))
3512 one
= alloc_filespec(path
);
3513 two
= alloc_filespec(path
);
3514 fill_filespec(one
, sha1
, mode
);
3515 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;
3518 static char *run_textconv(const char *pgm
, struct diff_filespec
*spec
,
3521 struct diff_tempfile temp
;
3522 const char *argv
[3];
3523 const char **arg
= argv
;
3524 struct child_process child
;
3525 struct strbuf buf
= STRBUF_INIT
;
3527 prepare_temp_file(spec
->path
, &temp
, spec
);
3532 memset(&child
, 0, sizeof(child
));
3535 if (start_command(&child
) != 0 ||
3536 strbuf_read(&buf
, child
.out
, 0) < 0 ||
3537 finish_command(&child
) != 0) {
3538 if (temp
.name
== temp
.tmp_path
)
3540 error("error running textconv command '%s'", pgm
);
3543 if (temp
.name
== temp
.tmp_path
)
3546 return strbuf_detach(&buf
, outsize
);