2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
15 #ifdef NO_FAST_WORKING_DIRECTORY
16 #define FAST_WORKING_DIRECTORY 0
18 #define FAST_WORKING_DIRECTORY 1
21 static int diff_detect_rename_default
;
22 static int diff_rename_limit_default
= 200;
23 int diff_use_color_default
= -1;
24 static const char *external_diff_cmd_cfg
;
25 int diff_auto_refresh_index
= 1;
27 static char diff_colors
[][COLOR_MAXLEN
] = {
29 "", /* PLAIN (normal) */
30 "\033[1m", /* METAINFO (bold) */
31 "\033[36m", /* FRAGINFO (cyan) */
32 "\033[31m", /* OLD (red) */
33 "\033[32m", /* NEW (green) */
34 "\033[33m", /* COMMIT (yellow) */
35 "\033[41m", /* WHITESPACE (red background) */
38 static int parse_diff_color_slot(const char *var
, int ofs
)
40 if (!strcasecmp(var
+ofs
, "plain"))
42 if (!strcasecmp(var
+ofs
, "meta"))
44 if (!strcasecmp(var
+ofs
, "frag"))
46 if (!strcasecmp(var
+ofs
, "old"))
48 if (!strcasecmp(var
+ofs
, "new"))
50 if (!strcasecmp(var
+ofs
, "commit"))
52 if (!strcasecmp(var
+ofs
, "whitespace"))
53 return DIFF_WHITESPACE
;
54 die("bad config variable '%s'", var
);
57 static struct ll_diff_driver
{
59 struct ll_diff_driver
*next
;
61 } *user_diff
, **user_diff_tail
;
64 * Currently there is only "diff.<drivername>.command" variable;
65 * because there are "diff.color.<slot>" variables, we are parsing
66 * this in a bit convoluted way to allow low level diff driver
69 static int parse_lldiff_command(const char *var
, const char *ep
, const char *value
)
73 struct ll_diff_driver
*drv
;
77 for (drv
= user_diff
; drv
; drv
= drv
->next
)
78 if (!strncmp(drv
->name
, name
, namelen
) && !drv
->name
[namelen
])
81 drv
= xcalloc(1, sizeof(struct ll_diff_driver
));
82 drv
->name
= xmemdupz(name
, namelen
);
84 user_diff_tail
= &user_diff
;
85 *user_diff_tail
= drv
;
86 user_diff_tail
= &(drv
->next
);
89 return git_config_string(&(drv
->cmd
), var
, value
);
93 * 'diff.<what>.funcname' attribute can be specified in the configuration
94 * to define a customized regexp to find the beginning of a function to
95 * be used for hunk header lines of "diff -p" style output.
97 struct funcname_pattern_entry
{
102 static struct funcname_pattern_list
{
103 struct funcname_pattern_list
*next
;
104 struct funcname_pattern_entry e
;
105 } *funcname_pattern_list
;
107 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
, int cflags
)
111 struct funcname_pattern_list
*pp
;
113 name
= var
+ 5; /* "diff." */
116 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
117 if (!strncmp(pp
->e
.name
, name
, namelen
) && !pp
->e
.name
[namelen
])
120 pp
= xcalloc(1, sizeof(*pp
));
121 pp
->e
.name
= xmemdupz(name
, namelen
);
122 pp
->next
= funcname_pattern_list
;
123 funcname_pattern_list
= pp
;
126 pp
->e
.pattern
= xstrdup(value
);
127 pp
->e
.cflags
= cflags
;
132 * These are to give UI layer defaults.
133 * The core-level commands such as git-diff-files should
134 * never be affected by the setting of diff.renames
135 * the user happens to have in the configuration file.
137 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
139 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
140 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
143 if (!strcmp(var
, "diff.renames")) {
145 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
146 else if (!strcasecmp(value
, "copies") ||
147 !strcasecmp(value
, "copy"))
148 diff_detect_rename_default
= DIFF_DETECT_COPY
;
149 else if (git_config_bool(var
,value
))
150 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
153 if (!strcmp(var
, "diff.autorefreshindex")) {
154 diff_auto_refresh_index
= git_config_bool(var
, value
);
157 if (!strcmp(var
, "diff.external"))
158 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
159 if (!prefixcmp(var
, "diff.")) {
160 const char *ep
= strrchr(var
, '.');
162 if (ep
!= var
+ 4 && !strcmp(ep
, ".command"))
163 return parse_lldiff_command(var
, ep
, value
);
166 return git_diff_basic_config(var
, value
, cb
);
169 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
171 if (!strcmp(var
, "diff.renamelimit")) {
172 diff_rename_limit_default
= git_config_int(var
, value
);
176 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
177 int slot
= parse_diff_color_slot(var
, 11);
179 return config_error_nonbool(var
);
180 color_parse(value
, var
, diff_colors
[slot
]);
184 if (!prefixcmp(var
, "diff.")) {
185 const char *ep
= strrchr(var
, '.');
187 if (!strcmp(ep
, ".funcname")) {
189 return config_error_nonbool(var
);
190 return parse_funcname_pattern(var
, ep
, value
,
192 } else if (!strcmp(ep
, ".xfuncname")) {
194 return config_error_nonbool(var
);
195 return parse_funcname_pattern(var
, ep
, value
,
201 return git_color_default_config(var
, value
, cb
);
204 static char *quote_two(const char *one
, const char *two
)
206 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
207 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
210 strbuf_init(&res
, 0);
211 if (need_one
+ need_two
) {
212 strbuf_addch(&res
, '"');
213 quote_c_style(one
, &res
, NULL
, 1);
214 quote_c_style(two
, &res
, NULL
, 1);
215 strbuf_addch(&res
, '"');
217 strbuf_addstr(&res
, one
);
218 strbuf_addstr(&res
, two
);
220 return strbuf_detach(&res
, NULL
);
223 static const char *external_diff(void)
225 static const char *external_diff_cmd
= NULL
;
226 static int done_preparing
= 0;
229 return external_diff_cmd
;
230 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
231 if (!external_diff_cmd
)
232 external_diff_cmd
= external_diff_cmd_cfg
;
234 return external_diff_cmd
;
237 static struct diff_tempfile
{
238 const char *name
; /* filename external diff should read from */
241 char tmp_path
[PATH_MAX
];
244 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
246 struct emit_callback
{
247 struct xdiff_emit_state xm
;
250 int blank_at_eof_in_preimage
;
251 int blank_at_eof_in_postimage
;
253 int lno_in_postimage
;
254 sane_truncate_fn truncate
;
255 const char **label_path
;
256 struct diff_words_data
*diff_words
;
261 static int count_lines(const char *data
, int size
)
263 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
270 completely_empty
= 0;
274 completely_empty
= 0;
277 if (completely_empty
)
280 count
++; /* no trailing newline */
284 static void print_line_count(FILE *file
, int count
)
288 fprintf(file
, "0,0");
294 fprintf(file
, "1,%d", count
);
299 static void copy_file_with_prefix(FILE *file
,
300 int prefix
, const char *data
, int size
,
301 const char *set
, const char *reset
)
303 int ch
, nl_just_seen
= 1;
318 fprintf(file
, "%s\n\\ No newline at end of file\n", reset
);
321 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
323 if (!DIFF_FILE_VALID(one
)) {
324 mf
->ptr
= (char *)""; /* does not matter */
328 else if (diff_populate_filespec(one
, 0))
331 mf
->size
= one
->size
;
335 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
338 long size
= mf
->size
;
343 ptr
+= size
- 1; /* pointing at the very end */
345 ; /* incomplete line */
347 ptr
--; /* skip the last LF */
348 while (mf
->ptr
< ptr
) {
350 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
351 if (*prev_eol
== '\n')
353 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
361 static void check_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
,
362 struct emit_callback
*ecbdata
)
365 unsigned ws_rule
= ecbdata
->ws_rule
;
366 l1
= count_trailing_blank(mf1
, ws_rule
);
367 l2
= count_trailing_blank(mf2
, ws_rule
);
369 ecbdata
->blank_at_eof_in_preimage
= 0;
370 ecbdata
->blank_at_eof_in_postimage
= 0;
373 at
= count_lines(mf1
->ptr
, mf1
->size
);
374 ecbdata
->blank_at_eof_in_preimage
= (at
- l1
) + 1;
376 at
= count_lines(mf2
->ptr
, mf2
->size
);
377 ecbdata
->blank_at_eof_in_postimage
= (at
- l2
) + 1;
380 static void emit_line_0(FILE *file
, const char *set
, const char *reset
,
381 int first
, const char *line
, int len
)
383 int has_trailing_newline
, has_trailing_carriage_return
;
387 has_trailing_newline
= (first
== '\n');
388 has_trailing_carriage_return
= (!has_trailing_newline
&&
390 nofirst
= has_trailing_newline
|| has_trailing_carriage_return
;
392 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
393 if (has_trailing_newline
)
395 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
396 if (has_trailing_carriage_return
)
405 fwrite(line
, len
, 1, file
);
407 if (has_trailing_carriage_return
)
409 if (has_trailing_newline
)
413 static void emit_line(FILE *file
, const char *set
, const char *reset
,
414 const char *line
, int len
)
416 emit_line_0(file
, set
, reset
, line
[0], line
+1, len
-1);
419 static int new_blank_line_at_eof(struct emit_callback
*ecbdata
, const char *line
, int len
)
421 if (!((ecbdata
->ws_rule
& WS_BLANK_AT_EOF
) &&
422 ecbdata
->blank_at_eof_in_preimage
&&
423 ecbdata
->blank_at_eof_in_postimage
&&
424 ecbdata
->blank_at_eof_in_preimage
<= ecbdata
->lno_in_preimage
&&
425 ecbdata
->blank_at_eof_in_postimage
<= ecbdata
->lno_in_postimage
))
427 return ws_blank_line(line
, len
, ecbdata
->ws_rule
);
430 static void emit_add_line(const char *reset
,
431 struct emit_callback
*ecbdata
,
432 const char *line
, int len
)
434 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
435 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
438 emit_line_0(ecbdata
->file
, set
, reset
, '+', line
, len
);
439 else if (new_blank_line_at_eof(ecbdata
, line
, len
))
440 /* Blank line at EOF - paint '+' as well */
441 emit_line_0(ecbdata
->file
, ws
, reset
, '+', line
, len
);
443 /* Emit just the prefix, then the rest. */
444 emit_line_0(ecbdata
->file
, set
, reset
, '+', "", 0);
445 ws_check_emit(line
, len
, ecbdata
->ws_rule
,
446 ecbdata
->file
, set
, reset
, ws
);
450 static void emit_rewrite_diff(const char *name_a
,
452 struct diff_filespec
*one
,
453 struct diff_filespec
*two
,
454 struct diff_options
*o
)
457 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
458 const char *name_a_tab
, *name_b_tab
;
459 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
460 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
461 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
462 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
463 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
464 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
466 name_a
+= (*name_a
== '/');
467 name_b
+= (*name_b
== '/');
468 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
469 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
471 strbuf_reset(&a_name
);
472 strbuf_reset(&b_name
);
473 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
474 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
476 diff_populate_filespec(one
, 0);
477 diff_populate_filespec(two
, 0);
478 lc_a
= count_lines(one
->data
, one
->size
);
479 lc_b
= count_lines(two
->data
, two
->size
);
481 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
482 metainfo
, a_name
.buf
, name_a_tab
, reset
,
483 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
484 print_line_count(o
->file
, lc_a
);
485 fprintf(o
->file
, " +");
486 print_line_count(o
->file
, lc_b
);
487 fprintf(o
->file
, " @@%s\n", reset
);
489 copy_file_with_prefix(o
->file
, '-', one
->data
, one
->size
, old
, reset
);
491 copy_file_with_prefix(o
->file
, '+', two
->data
, two
->size
, new, reset
);
494 struct diff_words_buffer
{
497 long current
; /* output pointer */
498 int suppressed_newline
;
501 static void diff_words_append(char *line
, unsigned long len
,
502 struct diff_words_buffer
*buffer
)
504 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
505 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
506 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
510 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
511 buffer
->text
.size
+= len
;
514 struct diff_words_data
{
515 struct xdiff_emit_state xm
;
516 struct diff_words_buffer minus
, plus
;
520 static void print_word(FILE *file
, struct diff_words_buffer
*buffer
, int len
, int color
,
521 int suppress_newline
)
529 ptr
= buffer
->text
.ptr
+ buffer
->current
;
530 buffer
->current
+= len
;
532 if (ptr
[len
- 1] == '\n') {
537 fputs(diff_get_color(1, color
), file
);
538 fwrite(ptr
, len
, 1, file
);
539 fputs(diff_get_color(1, DIFF_RESET
), file
);
542 if (suppress_newline
)
543 buffer
->suppressed_newline
= 1;
549 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
551 struct diff_words_data
*diff_words
= priv
;
553 if (diff_words
->minus
.suppressed_newline
) {
555 putc('\n', diff_words
->file
);
556 diff_words
->minus
.suppressed_newline
= 0;
562 print_word(diff_words
->file
,
563 &diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
566 print_word(diff_words
->file
,
567 &diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
570 print_word(diff_words
->file
,
571 &diff_words
->plus
, len
, DIFF_PLAIN
, 0);
572 diff_words
->minus
.current
+= len
;
577 /* this executes the word diff on the accumulated buffers */
578 static void diff_words_show(struct diff_words_data
*diff_words
)
583 mmfile_t minus
, plus
;
586 memset(&xecfg
, 0, sizeof(xecfg
));
587 minus
.size
= diff_words
->minus
.text
.size
;
588 minus
.ptr
= xmalloc(minus
.size
);
589 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
590 for (i
= 0; i
< minus
.size
; i
++)
591 if (isspace(minus
.ptr
[i
]))
593 diff_words
->minus
.current
= 0;
595 plus
.size
= diff_words
->plus
.text
.size
;
596 plus
.ptr
= xmalloc(plus
.size
);
597 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
598 for (i
= 0; i
< plus
.size
; i
++)
599 if (isspace(plus
.ptr
[i
]))
601 diff_words
->plus
.current
= 0;
603 xpp
.flags
= XDF_NEED_MINIMAL
;
604 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
605 ecb
.outf
= xdiff_outf
;
606 ecb
.priv
= diff_words
;
607 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
608 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
612 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
614 if (diff_words
->minus
.suppressed_newline
) {
615 putc('\n', diff_words
->file
);
616 diff_words
->minus
.suppressed_newline
= 0;
620 static void free_diff_words_data(struct emit_callback
*ecbdata
)
622 if (ecbdata
->diff_words
) {
624 if (ecbdata
->diff_words
->minus
.text
.size
||
625 ecbdata
->diff_words
->plus
.text
.size
)
626 diff_words_show(ecbdata
->diff_words
);
628 free (ecbdata
->diff_words
->minus
.text
.ptr
);
629 free (ecbdata
->diff_words
->plus
.text
.ptr
);
630 free(ecbdata
->diff_words
);
631 ecbdata
->diff_words
= NULL
;
635 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
638 return diff_colors
[ix
];
642 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
649 return ecb
->truncate(line
, len
);
653 (void) utf8_width(&cp
, &l
);
655 break; /* truncated in the middle? */
660 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
663 ecbdata
->lno_in_preimage
= 0;
664 ecbdata
->lno_in_postimage
= 0;
665 p
= strchr(line
, '-');
667 return; /* cannot happen */
668 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
671 return; /* cannot happen */
672 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
675 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
677 struct emit_callback
*ecbdata
= priv
;
678 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
679 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
680 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
682 *(ecbdata
->found_changesp
) = 1;
684 if (ecbdata
->label_path
[0]) {
685 const char *name_a_tab
, *name_b_tab
;
687 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
688 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
690 fprintf(ecbdata
->file
, "%s--- %s%s%s\n",
691 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
692 fprintf(ecbdata
->file
, "%s+++ %s%s%s\n",
693 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
694 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
697 if (line
[0] == '@') {
698 len
= sane_truncate_line(ecbdata
, line
, len
);
699 find_lno(line
, ecbdata
);
700 emit_line(ecbdata
->file
,
701 diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
703 if (line
[len
-1] != '\n')
704 putc('\n', ecbdata
->file
);
709 emit_line(ecbdata
->file
, reset
, reset
, line
, len
);
713 if (ecbdata
->diff_words
) {
714 if (line
[0] == '-') {
715 diff_words_append(line
, len
,
716 &ecbdata
->diff_words
->minus
);
718 } else if (line
[0] == '+') {
719 diff_words_append(line
, len
,
720 &ecbdata
->diff_words
->plus
);
723 if (ecbdata
->diff_words
->minus
.text
.size
||
724 ecbdata
->diff_words
->plus
.text
.size
)
725 diff_words_show(ecbdata
->diff_words
);
728 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
732 if (line
[0] != '+') {
734 diff_get_color(ecbdata
->color_diff
,
735 line
[0] == '-' ? DIFF_FILE_OLD
: DIFF_PLAIN
);
736 ecbdata
->lno_in_preimage
++;
738 ecbdata
->lno_in_postimage
++;
739 emit_line(ecbdata
->file
, color
, reset
, line
, len
);
741 ecbdata
->lno_in_postimage
++;
742 emit_add_line(reset
, ecbdata
, line
+ 1, len
- 1);
746 static char *pprint_rename(const char *a
, const char *b
)
751 int pfx_length
, sfx_length
;
752 int len_a
= strlen(a
);
753 int len_b
= strlen(b
);
754 int a_midlen
, b_midlen
;
755 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
756 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
758 strbuf_init(&name
, 0);
759 if (qlen_a
|| qlen_b
) {
760 quote_c_style(a
, &name
, NULL
, 0);
761 strbuf_addstr(&name
, " => ");
762 quote_c_style(b
, &name
, NULL
, 0);
763 return strbuf_detach(&name
, NULL
);
766 /* Find common prefix */
768 while (*old
&& *new && *old
== *new) {
770 pfx_length
= old
- a
+ 1;
775 /* Find common suffix */
779 while (a
<= old
&& b
<= new && *old
== *new) {
781 sfx_length
= len_a
- (old
- a
);
787 * pfx{mid-a => mid-b}sfx
788 * {pfx-a => pfx-b}sfx
789 * pfx{sfx-a => sfx-b}
792 a_midlen
= len_a
- pfx_length
- sfx_length
;
793 b_midlen
= len_b
- pfx_length
- sfx_length
;
799 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
800 if (pfx_length
+ sfx_length
) {
801 strbuf_add(&name
, a
, pfx_length
);
802 strbuf_addch(&name
, '{');
804 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
805 strbuf_addstr(&name
, " => ");
806 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
807 if (pfx_length
+ sfx_length
) {
808 strbuf_addch(&name
, '}');
809 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
811 return strbuf_detach(&name
, NULL
);
815 struct xdiff_emit_state xm
;
819 struct diffstat_file
{
823 unsigned is_unmerged
:1;
824 unsigned is_binary
:1;
825 unsigned is_renamed
:1;
826 unsigned int added
, deleted
;
830 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
834 struct diffstat_file
*x
;
835 x
= xcalloc(sizeof (*x
), 1);
836 if (diffstat
->nr
== diffstat
->alloc
) {
837 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
838 diffstat
->files
= xrealloc(diffstat
->files
,
839 diffstat
->alloc
* sizeof(x
));
841 diffstat
->files
[diffstat
->nr
++] = x
;
843 x
->from_name
= xstrdup(name_a
);
844 x
->name
= xstrdup(name_b
);
849 x
->name
= xstrdup(name_a
);
854 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
856 struct diffstat_t
*diffstat
= priv
;
857 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
861 else if (line
[0] == '-')
865 const char mime_boundary_leader
[] = "------------";
867 static int scale_linear(int it
, int width
, int max_change
)
870 * make sure that at least one '-' is printed if there were deletions,
871 * and likewise for '+'.
875 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
878 static void show_name(FILE *file
,
879 const char *prefix
, const char *name
, int len
,
880 const char *reset
, const char *set
)
882 fprintf(file
, " %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
885 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
889 fprintf(file
, "%s", set
);
892 fprintf(file
, "%s", reset
);
895 static void fill_print_name(struct diffstat_file
*file
)
899 if (file
->print_name
)
902 if (!file
->is_renamed
) {
904 strbuf_init(&buf
, 0);
905 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
906 pname
= strbuf_detach(&buf
, NULL
);
909 strbuf_release(&buf
);
912 pname
= pprint_rename(file
->from_name
, file
->name
);
914 file
->print_name
= pname
;
917 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
919 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
920 int max_change
= 0, max_len
= 0;
921 int total_files
= data
->nr
;
922 int width
, name_width
;
923 const char *reset
, *set
, *add_c
, *del_c
;
928 width
= options
->stat_width
? options
->stat_width
: 80;
929 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
931 /* Sanity: give at least 5 columns to the graph,
932 * but leave at least 10 columns for the name.
938 else if (width
< name_width
+ 15)
939 name_width
= width
- 15;
941 /* Find the longest filename and max number of changes */
942 reset
= diff_get_color_opt(options
, DIFF_RESET
);
943 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
944 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
945 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
947 for (i
= 0; i
< data
->nr
; i
++) {
948 struct diffstat_file
*file
= data
->files
[i
];
949 int change
= file
->added
+ file
->deleted
;
950 fill_print_name(file
);
951 len
= strlen(file
->print_name
);
955 if (file
->is_binary
|| file
->is_unmerged
)
957 if (max_change
< change
)
961 /* Compute the width of the graph part;
962 * 10 is for one blank at the beginning of the line plus
963 * " | count " between the name and the graph.
965 * From here on, name_width is the width of the name area,
966 * and width is the width of the graph area.
968 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
969 if (width
< (name_width
+ 10) + max_change
)
970 width
= width
- (name_width
+ 10);
974 for (i
= 0; i
< data
->nr
; i
++) {
975 const char *prefix
= "";
976 char *name
= data
->files
[i
]->print_name
;
977 int added
= data
->files
[i
]->added
;
978 int deleted
= data
->files
[i
]->deleted
;
982 * "scale" the filename
985 name_len
= strlen(name
);
986 if (name_width
< name_len
) {
990 name
+= name_len
- len
;
991 slash
= strchr(name
, '/');
996 if (data
->files
[i
]->is_binary
) {
997 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
998 fprintf(options
->file
, " Bin ");
999 fprintf(options
->file
, "%s%d%s", del_c
, deleted
, reset
);
1000 fprintf(options
->file
, " -> ");
1001 fprintf(options
->file
, "%s%d%s", add_c
, added
, reset
);
1002 fprintf(options
->file
, " bytes");
1003 fprintf(options
->file
, "\n");
1006 else if (data
->files
[i
]->is_unmerged
) {
1007 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
1008 fprintf(options
->file
, " Unmerged\n");
1011 else if (!data
->files
[i
]->is_renamed
&&
1012 (added
+ deleted
== 0)) {
1018 * scale the add/delete
1026 if (width
<= max_change
) {
1027 add
= scale_linear(add
, width
, max_change
);
1028 del
= scale_linear(del
, width
, max_change
);
1031 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
1032 fprintf(options
->file
, "%5d%s", added
+ deleted
,
1033 added
+ deleted
? " " : "");
1034 show_graph(options
->file
, '+', add
, add_c
, reset
);
1035 show_graph(options
->file
, '-', del
, del_c
, reset
);
1036 fprintf(options
->file
, "\n");
1038 fprintf(options
->file
,
1039 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
1040 set
, total_files
, adds
, dels
, reset
);
1043 static void show_shortstats(struct diffstat_t
* data
, struct diff_options
*options
)
1045 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
1050 for (i
= 0; i
< data
->nr
; i
++) {
1051 if (!data
->files
[i
]->is_binary
&&
1052 !data
->files
[i
]->is_unmerged
) {
1053 int added
= data
->files
[i
]->added
;
1054 int deleted
= data
->files
[i
]->deleted
;
1055 if (!data
->files
[i
]->is_renamed
&&
1056 (added
+ deleted
== 0)) {
1064 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
1065 total_files
, adds
, dels
);
1068 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
1075 for (i
= 0; i
< data
->nr
; i
++) {
1076 struct diffstat_file
*file
= data
->files
[i
];
1078 if (file
->is_binary
)
1079 fprintf(options
->file
, "-\t-\t");
1081 fprintf(options
->file
,
1082 "%d\t%d\t", file
->added
, file
->deleted
);
1083 if (options
->line_termination
) {
1084 fill_print_name(file
);
1085 if (!file
->is_renamed
)
1086 write_name_quoted(file
->name
, options
->file
,
1087 options
->line_termination
);
1089 fputs(file
->print_name
, options
->file
);
1090 putc(options
->line_termination
, options
->file
);
1093 if (file
->is_renamed
) {
1094 putc('\0', options
->file
);
1095 write_name_quoted(file
->from_name
, options
->file
, '\0');
1097 write_name_quoted(file
->name
, options
->file
, '\0');
1102 struct dirstat_file
{
1104 unsigned long changed
;
1107 struct dirstat_dir
{
1108 struct dirstat_file
*files
;
1109 int alloc
, nr
, percent
, cumulative
;
1112 static long gather_dirstat(FILE *file
, struct dirstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1114 unsigned long this_dir
= 0;
1115 unsigned int sources
= 0;
1118 struct dirstat_file
*f
= dir
->files
;
1119 int namelen
= strlen(f
->name
);
1123 if (namelen
< baselen
)
1125 if (memcmp(f
->name
, base
, baselen
))
1127 slash
= strchr(f
->name
+ baselen
, '/');
1129 int newbaselen
= slash
+ 1 - f
->name
;
1130 this = gather_dirstat(file
, dir
, changed
, f
->name
, newbaselen
);
1142 * We don't report dirstat's for
1144 * - or cases where everything came from a single directory
1145 * under this directory (sources == 1).
1147 if (baselen
&& sources
!= 1) {
1148 int permille
= this_dir
* 1000 / changed
;
1150 int percent
= permille
/ 10;
1151 if (percent
>= dir
->percent
) {
1152 fprintf(file
, "%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1153 if (!dir
->cumulative
)
1161 static int dirstat_compare(const void *_a
, const void *_b
)
1163 const struct dirstat_file
*a
= _a
;
1164 const struct dirstat_file
*b
= _b
;
1165 return strcmp(a
->name
, b
->name
);
1168 static void show_dirstat(struct diff_options
*options
)
1171 unsigned long changed
;
1172 struct dirstat_dir dir
;
1173 struct diff_queue_struct
*q
= &diff_queued_diff
;
1178 dir
.percent
= options
->dirstat_percent
;
1179 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1182 for (i
= 0; i
< q
->nr
; i
++) {
1183 struct diff_filepair
*p
= q
->queue
[i
];
1185 unsigned long copied
, added
, damage
;
1187 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1189 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1190 diff_populate_filespec(p
->one
, 0);
1191 diff_populate_filespec(p
->two
, 0);
1192 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1194 diff_free_filespec_data(p
->one
);
1195 diff_free_filespec_data(p
->two
);
1196 } else if (DIFF_FILE_VALID(p
->one
)) {
1197 diff_populate_filespec(p
->one
, 1);
1199 diff_free_filespec_data(p
->one
);
1200 } else if (DIFF_FILE_VALID(p
->two
)) {
1201 diff_populate_filespec(p
->two
, 1);
1203 added
= p
->two
->size
;
1204 diff_free_filespec_data(p
->two
);
1209 * Original minus copied is the removed material,
1210 * added is the new material. They are both damages
1211 * made to the preimage.
1213 damage
= (p
->one
->size
- copied
) + added
;
1215 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1216 dir
.files
[dir
.nr
].name
= name
;
1217 dir
.files
[dir
.nr
].changed
= damage
;
1222 /* This can happen even with many files, if everything was renames */
1226 /* Show all directories with more than x% of the changes */
1227 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1228 gather_dirstat(options
->file
, &dir
, changed
, "", 0);
1231 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1234 for (i
= 0; i
< diffstat
->nr
; i
++) {
1235 struct diffstat_file
*f
= diffstat
->files
[i
];
1236 if (f
->name
!= f
->print_name
)
1237 free(f
->print_name
);
1242 free(diffstat
->files
);
1245 struct checkdiff_t
{
1246 struct xdiff_emit_state xm
;
1247 const char *filename
;
1249 struct diff_options
*o
;
1254 static int is_conflict_marker(const char *line
, unsigned long len
)
1261 firstchar
= line
[0];
1262 switch (firstchar
) {
1263 case '=': case '>': case '<':
1268 for (cnt
= 1; cnt
< 7; cnt
++)
1269 if (line
[cnt
] != firstchar
)
1271 /* line[0] thru line[6] are same as firstchar */
1272 if (firstchar
== '=') {
1273 /* divider between ours and theirs? */
1274 if (len
!= 8 || line
[7] != '\n')
1276 } else if (len
< 8 || !isspace(line
[7])) {
1277 /* not divider before ours nor after theirs */
1283 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1285 struct checkdiff_t
*data
= priv
;
1286 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1287 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1288 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1289 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1292 if (line
[0] == '+') {
1295 if (is_conflict_marker(line
+ 1, len
- 1)) {
1297 fprintf(data
->o
->file
,
1298 "%s:%d: leftover conflict marker\n",
1299 data
->filename
, data
->lineno
);
1301 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1304 data
->status
|= bad
;
1305 err
= whitespace_error_string(bad
);
1306 fprintf(data
->o
->file
, "%s:%d: %s.\n",
1307 data
->filename
, data
->lineno
, err
);
1309 emit_line(data
->o
->file
, set
, reset
, line
, 1);
1310 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1311 data
->o
->file
, set
, reset
, ws
);
1312 } else if (line
[0] == ' ') {
1314 } else if (line
[0] == '@') {
1315 char *plus
= strchr(line
, '+');
1317 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1319 die("invalid diff");
1323 static unsigned char *deflate_it(char *data
,
1325 unsigned long *result_size
)
1328 unsigned char *deflated
;
1331 memset(&stream
, 0, sizeof(stream
));
1332 deflateInit(&stream
, zlib_compression_level
);
1333 bound
= deflateBound(&stream
, size
);
1334 deflated
= xmalloc(bound
);
1335 stream
.next_out
= deflated
;
1336 stream
.avail_out
= bound
;
1338 stream
.next_in
= (unsigned char *)data
;
1339 stream
.avail_in
= size
;
1340 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1342 deflateEnd(&stream
);
1343 *result_size
= stream
.total_out
;
1347 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1353 unsigned long orig_size
;
1354 unsigned long delta_size
;
1355 unsigned long deflate_size
;
1356 unsigned long data_size
;
1358 /* We could do deflated delta, or we could do just deflated two,
1359 * whichever is smaller.
1362 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1363 if (one
->size
&& two
->size
) {
1364 delta
= diff_delta(one
->ptr
, one
->size
,
1365 two
->ptr
, two
->size
,
1366 &delta_size
, deflate_size
);
1368 void *to_free
= delta
;
1369 orig_size
= delta_size
;
1370 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1375 if (delta
&& delta_size
< deflate_size
) {
1376 fprintf(file
, "delta %lu\n", orig_size
);
1379 data_size
= delta_size
;
1382 fprintf(file
, "literal %lu\n", two
->size
);
1385 data_size
= deflate_size
;
1388 /* emit data encoded in base85 */
1391 int bytes
= (52 < data_size
) ? 52 : data_size
;
1395 line
[0] = bytes
+ 'A' - 1;
1397 line
[0] = bytes
- 26 + 'a' - 1;
1398 encode_85(line
+ 1, cp
, bytes
);
1399 cp
= (char *) cp
+ bytes
;
1403 fprintf(file
, "\n");
1407 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1409 fprintf(file
, "GIT binary patch\n");
1410 emit_binary_diff_body(file
, one
, two
);
1411 emit_binary_diff_body(file
, two
, one
);
1414 static void setup_diff_attr_check(struct git_attr_check
*check
)
1416 static struct git_attr
*attr_diff
;
1419 attr_diff
= git_attr("diff", 4);
1421 check
[0].attr
= attr_diff
;
1424 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1426 struct git_attr_check attr_diff_check
;
1427 int check_from_data
= 0;
1429 if (one
->checked_attr
)
1432 setup_diff_attr_check(&attr_diff_check
);
1434 one
->funcname_pattern_ident
= NULL
;
1436 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1440 value
= attr_diff_check
.value
;
1441 if (ATTR_TRUE(value
))
1443 else if (ATTR_FALSE(value
))
1446 check_from_data
= 1;
1448 /* funcname pattern ident */
1449 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1452 one
->funcname_pattern_ident
= value
;
1455 if (check_from_data
) {
1456 if (!one
->data
&& DIFF_FILE_VALID(one
))
1457 diff_populate_filespec(one
, 0);
1460 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1464 int diff_filespec_is_binary(struct diff_filespec
*one
)
1466 diff_filespec_check_attr(one
);
1467 return one
->is_binary
;
1470 static const struct funcname_pattern_entry
*funcname_pattern(const char *ident
)
1472 struct funcname_pattern_list
*pp
;
1474 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1475 if (!strcmp(ident
, pp
->e
.name
))
1480 static const struct funcname_pattern_entry builtin_funcname_pattern
[] = {
1482 "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
1483 "^[ \t]*(([ \t]*[A-Za-z_][A-Za-z_0-9]*){2,}[ \t]*\\([^;]*)$",
1486 "^((procedure|function|constructor|destructor|interface|"
1487 "implementation|initialization|finalization)[ \t]*.*)$"
1489 "^(.*=[ \t]*(class|record).*)$",
1491 { "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
1494 "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
1496 { "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
1500 static const struct funcname_pattern_entry
*diff_funcname_pattern(struct diff_filespec
*one
)
1503 const struct funcname_pattern_entry
*pe
;
1506 diff_filespec_check_attr(one
);
1507 ident
= one
->funcname_pattern_ident
;
1511 * If the config file has "funcname.default" defined, that
1512 * regexp is used; otherwise NULL is returned and xemit uses
1513 * the built-in default.
1515 return funcname_pattern("default");
1517 /* Look up custom "funcname.$ident" regexp from config. */
1518 pe
= funcname_pattern(ident
);
1523 * And define built-in fallback patterns here. Note that
1524 * these can be overridden by the user's config settings.
1526 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1527 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1528 return &builtin_funcname_pattern
[i
];
1533 static void builtin_diff(const char *name_a
,
1535 struct diff_filespec
*one
,
1536 struct diff_filespec
*two
,
1537 const char *xfrm_msg
,
1538 struct diff_options
*o
,
1539 int complete_rewrite
)
1543 char *a_one
, *b_two
;
1544 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1545 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1547 /* Never use a non-valid filename anywhere if at all possible */
1548 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
1549 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
1551 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1552 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1553 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1554 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1555 fprintf(o
->file
, "%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1556 if (lbl
[0][0] == '/') {
1558 fprintf(o
->file
, "%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1559 if (xfrm_msg
&& xfrm_msg
[0])
1560 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1562 else if (lbl
[1][0] == '/') {
1563 fprintf(o
->file
, "%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1564 if (xfrm_msg
&& xfrm_msg
[0])
1565 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1568 if (one
->mode
!= two
->mode
) {
1569 fprintf(o
->file
, "%sold mode %06o%s\n", set
, one
->mode
, reset
);
1570 fprintf(o
->file
, "%snew mode %06o%s\n", set
, two
->mode
, reset
);
1572 if (xfrm_msg
&& xfrm_msg
[0])
1573 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1575 * we do not run diff between different kind
1578 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1579 goto free_ab_and_return
;
1580 if (complete_rewrite
) {
1581 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1582 o
->found_changes
= 1;
1583 goto free_ab_and_return
;
1587 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1588 die("unable to read files to diff");
1590 if (!DIFF_OPT_TST(o
, TEXT
) &&
1591 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1592 /* Quite common confusing case */
1593 if (mf1
.size
== mf2
.size
&&
1594 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1595 goto free_ab_and_return
;
1596 if (DIFF_OPT_TST(o
, BINARY
))
1597 emit_binary_diff(o
->file
, &mf1
, &mf2
);
1599 fprintf(o
->file
, "Binary files %s and %s differ\n",
1601 o
->found_changes
= 1;
1604 /* Crazy xdl interfaces.. */
1605 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1609 struct emit_callback ecbdata
;
1610 const struct funcname_pattern_entry
*pe
;
1612 pe
= diff_funcname_pattern(one
);
1614 pe
= diff_funcname_pattern(two
);
1616 memset(&xecfg
, 0, sizeof(xecfg
));
1617 memset(&ecbdata
, 0, sizeof(ecbdata
));
1618 ecbdata
.label_path
= lbl
;
1619 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1620 ecbdata
.found_changesp
= &o
->found_changes
;
1621 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1622 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
1623 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1624 ecbdata
.file
= o
->file
;
1625 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1626 xecfg
.ctxlen
= o
->context
;
1627 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1629 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
1632 else if (!prefixcmp(diffopts
, "--unified="))
1633 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1634 else if (!prefixcmp(diffopts
, "-u"))
1635 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1636 ecb
.outf
= xdiff_outf
;
1637 ecb
.priv
= &ecbdata
;
1638 ecbdata
.xm
.consume
= fn_out_consume
;
1639 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
)) {
1640 ecbdata
.diff_words
=
1641 xcalloc(1, sizeof(struct diff_words_data
));
1642 ecbdata
.diff_words
->file
= o
->file
;
1644 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1645 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1646 free_diff_words_data(&ecbdata
);
1650 diff_free_filespec_data(one
);
1651 diff_free_filespec_data(two
);
1657 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1658 struct diff_filespec
*one
,
1659 struct diff_filespec
*two
,
1660 struct diffstat_t
*diffstat
,
1661 struct diff_options
*o
,
1662 int complete_rewrite
)
1665 struct diffstat_file
*data
;
1667 data
= diffstat_add(diffstat
, name_a
, name_b
);
1670 data
->is_unmerged
= 1;
1673 if (complete_rewrite
) {
1674 diff_populate_filespec(one
, 0);
1675 diff_populate_filespec(two
, 0);
1676 data
->deleted
= count_lines(one
->data
, one
->size
);
1677 data
->added
= count_lines(two
->data
, two
->size
);
1678 goto free_and_return
;
1680 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1681 die("unable to read files to diff");
1683 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1684 data
->is_binary
= 1;
1685 data
->added
= mf2
.size
;
1686 data
->deleted
= mf1
.size
;
1688 /* Crazy xdl interfaces.. */
1693 memset(&xecfg
, 0, sizeof(xecfg
));
1694 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1695 ecb
.outf
= xdiff_outf
;
1696 ecb
.priv
= diffstat
;
1697 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1701 diff_free_filespec_data(one
);
1702 diff_free_filespec_data(two
);
1705 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1706 const char *attr_path
,
1707 struct diff_filespec
*one
,
1708 struct diff_filespec
*two
,
1709 struct diff_options
*o
)
1712 struct checkdiff_t data
;
1717 memset(&data
, 0, sizeof(data
));
1718 data
.xm
.consume
= checkdiff_consume
;
1719 data
.filename
= name_b
? name_b
: name_a
;
1722 data
.ws_rule
= whitespace_rule(attr_path
);
1724 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1725 die("unable to read files to diff");
1728 * All the other codepaths check both sides, but not checking
1729 * the "old" side here is deliberate. We are checking the newly
1730 * introduced changes, and as long as the "new" side is text, we
1731 * can and should check what it introduces.
1733 if (diff_filespec_is_binary(two
))
1734 goto free_and_return
;
1736 /* Crazy xdl interfaces.. */
1741 memset(&xecfg
, 0, sizeof(xecfg
));
1742 xecfg
.ctxlen
= 1; /* at least one context line */
1743 xpp
.flags
= XDF_NEED_MINIMAL
;
1744 ecb
.outf
= xdiff_outf
;
1746 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1748 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
1749 struct emit_callback ecbdata
;
1752 ecbdata
.ws_rule
= data
.ws_rule
;
1753 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1754 blank_at_eof
= ecbdata
.blank_at_eof_in_preimage
;
1759 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
1760 fprintf(o
->file
, "%s:%d: %s.\n",
1761 data
.filename
, blank_at_eof
, err
);
1762 data
.status
= 1; /* report errors */
1767 diff_free_filespec_data(one
);
1768 diff_free_filespec_data(two
);
1770 DIFF_OPT_SET(o
, CHECK_FAILED
);
1773 struct diff_filespec
*alloc_filespec(const char *path
)
1775 int namelen
= strlen(path
);
1776 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1778 memset(spec
, 0, sizeof(*spec
));
1779 spec
->path
= (char *)(spec
+ 1);
1780 memcpy(spec
->path
, path
, namelen
+1);
1785 void free_filespec(struct diff_filespec
*spec
)
1787 if (!--spec
->count
) {
1788 diff_free_filespec_data(spec
);
1793 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1794 unsigned short mode
)
1797 spec
->mode
= canon_mode(mode
);
1798 hashcpy(spec
->sha1
, sha1
);
1799 spec
->sha1_valid
= !is_null_sha1(sha1
);
1804 * Given a name and sha1 pair, if the index tells us the file in
1805 * the work tree has that object contents, return true, so that
1806 * prepare_temp_file() does not have to inflate and extract.
1808 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1810 struct cache_entry
*ce
;
1814 /* We do not read the cache ourselves here, because the
1815 * benchmark with my previous version that always reads cache
1816 * shows that it makes things worse for diff-tree comparing
1817 * two linux-2.6 kernel trees in an already checked out work
1818 * tree. This is because most diff-tree comparisons deal with
1819 * only a small number of files, while reading the cache is
1820 * expensive for a large project, and its cost outweighs the
1821 * savings we get by not inflating the object to a temporary
1822 * file. Practically, this code only helps when we are used
1823 * by diff-cache --cached, which does read the cache before
1829 /* We want to avoid the working directory if our caller
1830 * doesn't need the data in a normal file, this system
1831 * is rather slow with its stat/open/mmap/close syscalls,
1832 * and the object is contained in a pack file. The pack
1833 * is probably already open and will be faster to obtain
1834 * the data through than the working directory. Loose
1835 * objects however would tend to be slower as they need
1836 * to be individually opened and inflated.
1838 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1842 pos
= cache_name_pos(name
, len
);
1845 ce
= active_cache
[pos
];
1848 * This is not the sha1 we are looking for, or
1849 * unreusable because it is not a regular file.
1851 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1855 * If ce matches the file in the work tree, we can reuse it.
1857 if (ce_uptodate(ce
) ||
1858 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1864 static int populate_from_stdin(struct diff_filespec
*s
)
1869 strbuf_init(&buf
, 0);
1870 if (strbuf_read(&buf
, 0, 0) < 0)
1871 return error("error while reading from stdin %s",
1874 s
->should_munmap
= 0;
1875 s
->data
= strbuf_detach(&buf
, &size
);
1881 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1884 char *data
= xmalloc(100);
1885 len
= snprintf(data
, 100,
1886 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1898 * While doing rename detection and pickaxe operation, we may need to
1899 * grab the data for the blob (or file) for our own in-core comparison.
1900 * diff_filespec has data and size fields for this purpose.
1902 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1905 if (!DIFF_FILE_VALID(s
))
1906 die("internal error: asking to populate invalid file.");
1907 if (S_ISDIR(s
->mode
))
1913 if (size_only
&& 0 < s
->size
)
1916 if (S_ISGITLINK(s
->mode
))
1917 return diff_populate_gitlink(s
, size_only
);
1919 if (!s
->sha1_valid
||
1920 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1925 if (!strcmp(s
->path
, "-"))
1926 return populate_from_stdin(s
);
1928 if (lstat(s
->path
, &st
) < 0) {
1929 if (errno
== ENOENT
) {
1933 s
->data
= (char *)"";
1938 s
->size
= xsize_t(st
.st_size
);
1943 if (S_ISLNK(st
.st_mode
)) {
1945 s
->data
= xmalloc(s
->size
);
1947 ret
= readlink(s
->path
, s
->data
, s
->size
);
1954 fd
= open(s
->path
, O_RDONLY
);
1957 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1959 s
->should_munmap
= 1;
1962 * Convert from working tree format to canonical git format
1964 strbuf_init(&buf
, 0);
1965 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
1967 munmap(s
->data
, s
->size
);
1968 s
->should_munmap
= 0;
1969 s
->data
= strbuf_detach(&buf
, &size
);
1975 enum object_type type
;
1977 type
= sha1_object_info(s
->sha1
, &s
->size
);
1979 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1986 void diff_free_filespec_blob(struct diff_filespec
*s
)
1990 else if (s
->should_munmap
)
1991 munmap(s
->data
, s
->size
);
1993 if (s
->should_free
|| s
->should_munmap
) {
1994 s
->should_free
= s
->should_munmap
= 0;
1999 void diff_free_filespec_data(struct diff_filespec
*s
)
2001 diff_free_filespec_blob(s
);
2006 static void prep_temp_blob(struct diff_tempfile
*temp
,
2009 const unsigned char *sha1
,
2014 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
2016 die("unable to create temp-file: %s", strerror(errno
));
2017 if (write_in_full(fd
, blob
, size
) != size
)
2018 die("unable to write temp-file");
2020 temp
->name
= temp
->tmp_path
;
2021 strcpy(temp
->hex
, sha1_to_hex(sha1
));
2023 sprintf(temp
->mode
, "%06o", mode
);
2026 static void prepare_temp_file(const char *name
,
2027 struct diff_tempfile
*temp
,
2028 struct diff_filespec
*one
)
2030 if (!DIFF_FILE_VALID(one
)) {
2032 /* A '-' entry produces this for file-2, and
2033 * a '+' entry produces this for file-1.
2035 temp
->name
= "/dev/null";
2036 strcpy(temp
->hex
, ".");
2037 strcpy(temp
->mode
, ".");
2041 if (!one
->sha1_valid
||
2042 reuse_worktree_file(name
, one
->sha1
, 1)) {
2044 if (lstat(name
, &st
) < 0) {
2045 if (errno
== ENOENT
)
2046 goto not_a_valid_file
;
2047 die("stat(%s): %s", name
, strerror(errno
));
2049 if (S_ISLNK(st
.st_mode
)) {
2051 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
2052 size_t sz
= xsize_t(st
.st_size
);
2053 if (sizeof(buf
) <= st
.st_size
)
2054 die("symlink too long: %s", name
);
2055 ret
= readlink(name
, buf
, sz
);
2057 die("readlink(%s)", name
);
2058 prep_temp_blob(temp
, buf
, sz
,
2060 one
->sha1
: null_sha1
),
2062 one
->mode
: S_IFLNK
));
2065 /* we can borrow from the file in the work tree */
2067 if (!one
->sha1_valid
)
2068 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
2070 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
2071 /* Even though we may sometimes borrow the
2072 * contents from the work tree, we always want
2073 * one->mode. mode is trustworthy even when
2074 * !(one->sha1_valid), as long as
2075 * DIFF_FILE_VALID(one).
2077 sprintf(temp
->mode
, "%06o", one
->mode
);
2082 if (diff_populate_filespec(one
, 0))
2083 die("cannot read data blob for %s", one
->path
);
2084 prep_temp_blob(temp
, one
->data
, one
->size
,
2085 one
->sha1
, one
->mode
);
2089 static void remove_tempfile(void)
2093 for (i
= 0; i
< 2; i
++)
2094 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
2095 unlink(diff_temp
[i
].name
);
2096 diff_temp
[i
].name
= NULL
;
2100 static void remove_tempfile_on_signal(int signo
)
2103 signal(SIGINT
, SIG_DFL
);
2107 /* An external diff command takes:
2109 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2110 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2113 static void run_external_diff(const char *pgm
,
2116 struct diff_filespec
*one
,
2117 struct diff_filespec
*two
,
2118 const char *xfrm_msg
,
2119 int complete_rewrite
)
2121 const char *spawn_arg
[10];
2122 struct diff_tempfile
*temp
= diff_temp
;
2124 static int atexit_asked
= 0;
2125 const char *othername
;
2126 const char **arg
= &spawn_arg
[0];
2128 othername
= (other
? other
: name
);
2130 prepare_temp_file(name
, &temp
[0], one
);
2131 prepare_temp_file(othername
, &temp
[1], two
);
2132 if (! atexit_asked
&&
2133 (temp
[0].name
== temp
[0].tmp_path
||
2134 temp
[1].name
== temp
[1].tmp_path
)) {
2136 atexit(remove_tempfile
);
2138 signal(SIGINT
, remove_tempfile_on_signal
);
2144 *arg
++ = temp
[0].name
;
2145 *arg
++ = temp
[0].hex
;
2146 *arg
++ = temp
[0].mode
;
2147 *arg
++ = temp
[1].name
;
2148 *arg
++ = temp
[1].hex
;
2149 *arg
++ = temp
[1].mode
;
2160 retval
= run_command_v_opt(spawn_arg
, 0);
2163 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2168 static const char *external_diff_attr(const char *name
)
2170 struct git_attr_check attr_diff_check
;
2175 setup_diff_attr_check(&attr_diff_check
);
2176 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
2177 const char *value
= attr_diff_check
.value
;
2178 if (!ATTR_TRUE(value
) &&
2179 !ATTR_FALSE(value
) &&
2180 !ATTR_UNSET(value
)) {
2181 struct ll_diff_driver
*drv
;
2183 for (drv
= user_diff
; drv
; drv
= drv
->next
)
2184 if (!strcmp(drv
->name
, value
))
2191 static int similarity_index(struct diff_filepair
*p
)
2193 return p
->score
* 100 / MAX_SCORE
;
2196 static void fill_metainfo(struct strbuf
*msg
,
2199 struct diff_filespec
*one
,
2200 struct diff_filespec
*two
,
2201 struct diff_options
*o
,
2202 struct diff_filepair
*p
)
2204 strbuf_init(msg
, PATH_MAX
* 2 + 300);
2205 switch (p
->status
) {
2206 case DIFF_STATUS_COPIED
:
2207 strbuf_addf(msg
, "similarity index %d%%", similarity_index(p
));
2208 strbuf_addstr(msg
, "\ncopy from ");
2209 quote_c_style(name
, msg
, NULL
, 0);
2210 strbuf_addstr(msg
, "\ncopy to ");
2211 quote_c_style(other
, msg
, NULL
, 0);
2212 strbuf_addch(msg
, '\n');
2214 case DIFF_STATUS_RENAMED
:
2215 strbuf_addf(msg
, "similarity index %d%%", similarity_index(p
));
2216 strbuf_addstr(msg
, "\nrename from ");
2217 quote_c_style(name
, msg
, NULL
, 0);
2218 strbuf_addstr(msg
, "\nrename to ");
2219 quote_c_style(other
, msg
, NULL
, 0);
2220 strbuf_addch(msg
, '\n');
2222 case DIFF_STATUS_MODIFIED
:
2224 strbuf_addf(msg
, "dissimilarity index %d%%\n",
2225 similarity_index(p
));
2233 if (one
&& two
&& hashcmp(one
->sha1
, two
->sha1
)) {
2234 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2236 if (DIFF_OPT_TST(o
, BINARY
)) {
2238 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2239 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2242 strbuf_addf(msg
, "index %.*s..%.*s",
2243 abbrev
, sha1_to_hex(one
->sha1
),
2244 abbrev
, sha1_to_hex(two
->sha1
));
2245 if (one
->mode
== two
->mode
)
2246 strbuf_addf(msg
, " %06o", one
->mode
);
2247 strbuf_addch(msg
, '\n');
2250 strbuf_setlen(msg
, msg
->len
- 1);
2253 static void run_diff_cmd(const char *pgm
,
2256 const char *attr_path
,
2257 struct diff_filespec
*one
,
2258 struct diff_filespec
*two
,
2260 struct diff_options
*o
,
2261 struct diff_filepair
*p
)
2263 const char *xfrm_msg
= NULL
;
2264 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
2267 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
);
2268 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
2271 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2274 const char *cmd
= external_diff_attr(attr_path
);
2280 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2285 builtin_diff(name
, other
? other
: name
,
2286 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2288 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2291 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2293 if (DIFF_FILE_VALID(one
)) {
2294 if (!one
->sha1_valid
) {
2296 if (!strcmp(one
->path
, "-")) {
2297 hashcpy(one
->sha1
, null_sha1
);
2300 if (lstat(one
->path
, &st
) < 0)
2301 die("stat %s", one
->path
);
2302 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2303 die("cannot hash %s\n", one
->path
);
2310 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2312 /* Strip the prefix but do not molest /dev/null and absolute paths */
2313 if (*namep
&& **namep
!= '/')
2314 *namep
+= prefix_length
;
2315 if (*otherp
&& **otherp
!= '/')
2316 *otherp
+= prefix_length
;
2319 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2321 const char *pgm
= external_diff();
2323 struct diff_filespec
*one
= p
->one
;
2324 struct diff_filespec
*two
= p
->two
;
2327 const char *attr_path
;
2329 name
= p
->one
->path
;
2330 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2332 if (o
->prefix_length
)
2333 strip_prefix(o
->prefix_length
, &name
, &other
);
2335 if (DIFF_PAIR_UNMERGED(p
)) {
2336 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2337 NULL
, NULL
, NULL
, o
, p
);
2341 diff_fill_sha1_info(one
);
2342 diff_fill_sha1_info(two
);
2345 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2346 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2348 * a filepair that changes between file and symlink
2349 * needs to be split into deletion and creation.
2351 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2352 run_diff_cmd(NULL
, name
, other
, attr_path
,
2353 one
, null
, &msg
, o
, p
);
2355 strbuf_release(&msg
);
2357 null
= alloc_filespec(one
->path
);
2358 run_diff_cmd(NULL
, name
, other
, attr_path
,
2359 null
, two
, &msg
, o
, p
);
2363 run_diff_cmd(pgm
, name
, other
, attr_path
,
2364 one
, two
, &msg
, o
, p
);
2366 strbuf_release(&msg
);
2369 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2370 struct diffstat_t
*diffstat
)
2374 int complete_rewrite
= 0;
2376 if (DIFF_PAIR_UNMERGED(p
)) {
2378 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2382 name
= p
->one
->path
;
2383 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2385 if (o
->prefix_length
)
2386 strip_prefix(o
->prefix_length
, &name
, &other
);
2388 diff_fill_sha1_info(p
->one
);
2389 diff_fill_sha1_info(p
->two
);
2391 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2392 complete_rewrite
= 1;
2393 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2396 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2400 const char *attr_path
;
2402 if (DIFF_PAIR_UNMERGED(p
)) {
2407 name
= p
->one
->path
;
2408 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2409 attr_path
= other
? other
: name
;
2411 if (o
->prefix_length
)
2412 strip_prefix(o
->prefix_length
, &name
, &other
);
2414 diff_fill_sha1_info(p
->one
);
2415 diff_fill_sha1_info(p
->two
);
2417 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2420 void diff_setup(struct diff_options
*options
)
2422 memset(options
, 0, sizeof(*options
));
2424 options
->file
= stdout
;
2426 options
->line_termination
= '\n';
2427 options
->break_opt
= -1;
2428 options
->rename_limit
= -1;
2429 options
->dirstat_percent
= 3;
2430 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
2431 options
->context
= 3;
2433 options
->change
= diff_change
;
2434 options
->add_remove
= diff_addremove
;
2435 if (diff_use_color_default
> 0)
2436 DIFF_OPT_SET(options
, COLOR_DIFF
);
2438 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2439 options
->detect_rename
= diff_detect_rename_default
;
2441 options
->a_prefix
= "a/";
2442 options
->b_prefix
= "b/";
2445 int diff_setup_done(struct diff_options
*options
)
2449 if (options
->output_format
& DIFF_FORMAT_NAME
)
2451 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2453 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2455 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2458 die("--name-only, --name-status, --check and -s are mutually exclusive");
2460 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2461 options
->detect_rename
= DIFF_DETECT_COPY
;
2463 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2464 options
->prefix
= NULL
;
2465 if (options
->prefix
)
2466 options
->prefix_length
= strlen(options
->prefix
);
2468 options
->prefix_length
= 0;
2470 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2471 DIFF_FORMAT_NAME_STATUS
|
2472 DIFF_FORMAT_CHECKDIFF
|
2473 DIFF_FORMAT_NO_OUTPUT
))
2474 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2475 DIFF_FORMAT_NUMSTAT
|
2476 DIFF_FORMAT_DIFFSTAT
|
2477 DIFF_FORMAT_SHORTSTAT
|
2478 DIFF_FORMAT_DIRSTAT
|
2479 DIFF_FORMAT_SUMMARY
|
2483 * These cases always need recursive; we do not drop caller-supplied
2484 * recursive bits for other formats here.
2486 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2487 DIFF_FORMAT_NUMSTAT
|
2488 DIFF_FORMAT_DIFFSTAT
|
2489 DIFF_FORMAT_SHORTSTAT
|
2490 DIFF_FORMAT_DIRSTAT
|
2491 DIFF_FORMAT_SUMMARY
|
2492 DIFF_FORMAT_CHECKDIFF
))
2493 DIFF_OPT_SET(options
, RECURSIVE
);
2495 * Also pickaxe would not work very well if you do not say recursive
2497 if (options
->pickaxe
)
2498 DIFF_OPT_SET(options
, RECURSIVE
);
2500 if (options
->detect_rename
&& options
->rename_limit
< 0)
2501 options
->rename_limit
= diff_rename_limit_default
;
2502 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2504 /* read-cache does not die even when it fails
2505 * so it is safe for us to do this here. Also
2506 * it does not smudge active_cache or active_nr
2507 * when it fails, so we do not have to worry about
2508 * cleaning it up ourselves either.
2512 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2513 options
->abbrev
= 40; /* full */
2516 * It does not make sense to show the first hit we happened
2517 * to have found. It does not make sense not to return with
2518 * exit code in such a case either.
2520 if (DIFF_OPT_TST(options
, QUIET
)) {
2521 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2522 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2528 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2538 if (c
== arg_short
) {
2542 if (val
&& isdigit(c
)) {
2544 int n
= strtoul(arg
, &end
, 10);
2555 eq
= strchr(arg
, '=');
2560 if (!len
|| strncmp(arg
, arg_long
, len
))
2565 if (!isdigit(*++eq
))
2567 n
= strtoul(eq
, &end
, 10);
2575 static int diff_scoreopt_parse(const char *opt
);
2577 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2579 const char *arg
= av
[0];
2581 /* Output format options */
2582 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2583 options
->output_format
|= DIFF_FORMAT_PATCH
;
2584 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2585 options
->output_format
|= DIFF_FORMAT_PATCH
;
2586 else if (!strcmp(arg
, "--raw"))
2587 options
->output_format
|= DIFF_FORMAT_RAW
;
2588 else if (!strcmp(arg
, "--patch-with-raw"))
2589 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2590 else if (!strcmp(arg
, "--numstat"))
2591 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2592 else if (!strcmp(arg
, "--shortstat"))
2593 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2594 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2595 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2596 else if (!strcmp(arg
, "--cumulative")) {
2597 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2598 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
2600 else if (!strcmp(arg
, "--check"))
2601 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2602 else if (!strcmp(arg
, "--summary"))
2603 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2604 else if (!strcmp(arg
, "--patch-with-stat"))
2605 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2606 else if (!strcmp(arg
, "--name-only"))
2607 options
->output_format
|= DIFF_FORMAT_NAME
;
2608 else if (!strcmp(arg
, "--name-status"))
2609 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2610 else if (!strcmp(arg
, "-s"))
2611 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2612 else if (!prefixcmp(arg
, "--stat")) {
2614 int width
= options
->stat_width
;
2615 int name_width
= options
->stat_name_width
;
2621 if (!prefixcmp(arg
, "-width="))
2622 width
= strtoul(arg
+ 7, &end
, 10);
2623 else if (!prefixcmp(arg
, "-name-width="))
2624 name_width
= strtoul(arg
+ 12, &end
, 10);
2627 width
= strtoul(arg
+1, &end
, 10);
2629 name_width
= strtoul(end
+1, &end
, 10);
2632 /* Important! This checks all the error cases! */
2635 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2636 options
->stat_name_width
= name_width
;
2637 options
->stat_width
= width
;
2640 /* renames options */
2641 else if (!prefixcmp(arg
, "-B")) {
2642 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2645 else if (!prefixcmp(arg
, "-M")) {
2646 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2648 options
->detect_rename
= DIFF_DETECT_RENAME
;
2650 else if (!prefixcmp(arg
, "-C")) {
2651 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2652 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2653 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2655 options
->detect_rename
= DIFF_DETECT_COPY
;
2657 else if (!strcmp(arg
, "--no-renames"))
2658 options
->detect_rename
= 0;
2659 else if (!strcmp(arg
, "--relative"))
2660 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2661 else if (!prefixcmp(arg
, "--relative=")) {
2662 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2663 options
->prefix
= arg
+ 11;
2667 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2668 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2669 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2670 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2671 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2672 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2675 else if (!strcmp(arg
, "--binary")) {
2676 options
->output_format
|= DIFF_FORMAT_PATCH
;
2677 DIFF_OPT_SET(options
, BINARY
);
2679 else if (!strcmp(arg
, "--full-index"))
2680 DIFF_OPT_SET(options
, FULL_INDEX
);
2681 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2682 DIFF_OPT_SET(options
, TEXT
);
2683 else if (!strcmp(arg
, "-R"))
2684 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2685 else if (!strcmp(arg
, "--find-copies-harder"))
2686 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2687 else if (!strcmp(arg
, "--follow"))
2688 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2689 else if (!strcmp(arg
, "--color"))
2690 DIFF_OPT_SET(options
, COLOR_DIFF
);
2691 else if (!strcmp(arg
, "--no-color"))
2692 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2693 else if (!strcmp(arg
, "--color-words"))
2694 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2695 else if (!strcmp(arg
, "--exit-code"))
2696 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2697 else if (!strcmp(arg
, "--quiet"))
2698 DIFF_OPT_SET(options
, QUIET
);
2699 else if (!strcmp(arg
, "--ext-diff"))
2700 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2701 else if (!strcmp(arg
, "--no-ext-diff"))
2702 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2703 else if (!strcmp(arg
, "--ignore-submodules"))
2704 DIFF_OPT_SET(options
, IGNORE_SUBMODULES
);
2707 else if (!strcmp(arg
, "-z"))
2708 options
->line_termination
= 0;
2709 else if (!prefixcmp(arg
, "-l"))
2710 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2711 else if (!prefixcmp(arg
, "-S"))
2712 options
->pickaxe
= arg
+ 2;
2713 else if (!strcmp(arg
, "--pickaxe-all"))
2714 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2715 else if (!strcmp(arg
, "--pickaxe-regex"))
2716 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2717 else if (!prefixcmp(arg
, "-O"))
2718 options
->orderfile
= arg
+ 2;
2719 else if (!prefixcmp(arg
, "--diff-filter="))
2720 options
->filter
= arg
+ 14;
2721 else if (!strcmp(arg
, "--abbrev"))
2722 options
->abbrev
= DEFAULT_ABBREV
;
2723 else if (!prefixcmp(arg
, "--abbrev=")) {
2724 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2725 if (options
->abbrev
< MINIMUM_ABBREV
)
2726 options
->abbrev
= MINIMUM_ABBREV
;
2727 else if (40 < options
->abbrev
)
2728 options
->abbrev
= 40;
2730 else if (!prefixcmp(arg
, "--src-prefix="))
2731 options
->a_prefix
= arg
+ 13;
2732 else if (!prefixcmp(arg
, "--dst-prefix="))
2733 options
->b_prefix
= arg
+ 13;
2734 else if (!strcmp(arg
, "--no-prefix"))
2735 options
->a_prefix
= options
->b_prefix
= "";
2736 else if (!prefixcmp(arg
, "--output=")) {
2737 options
->file
= fopen(arg
+ strlen("--output="), "w");
2738 options
->close_file
= 1;
2744 static int parse_num(const char **cp_p
)
2746 unsigned long num
, scale
;
2748 const char *cp
= *cp_p
;
2755 if ( !dot
&& ch
== '.' ) {
2758 } else if ( ch
== '%' ) {
2759 scale
= dot
? scale
*100 : 100;
2760 cp
++; /* % is always at the end */
2762 } else if ( ch
>= '0' && ch
<= '9' ) {
2763 if ( scale
< 100000 ) {
2765 num
= (num
*10) + (ch
-'0');
2774 /* user says num divided by scale and we say internally that
2775 * is MAX_SCORE * num / scale.
2777 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2780 static int diff_scoreopt_parse(const char *opt
)
2782 int opt1
, opt2
, cmd
;
2787 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2788 return -1; /* that is not a -M, -C nor -B option */
2790 opt1
= parse_num(&opt
);
2796 else if (*opt
!= '/')
2797 return -1; /* we expect -B80/99 or -B80 */
2800 opt2
= parse_num(&opt
);
2805 return opt1
| (opt2
<< 16);
2808 struct diff_queue_struct diff_queued_diff
;
2810 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2812 if (queue
->alloc
<= queue
->nr
) {
2813 queue
->alloc
= alloc_nr(queue
->alloc
);
2814 queue
->queue
= xrealloc(queue
->queue
,
2815 sizeof(dp
) * queue
->alloc
);
2817 queue
->queue
[queue
->nr
++] = dp
;
2820 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2821 struct diff_filespec
*one
,
2822 struct diff_filespec
*two
)
2824 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2832 void diff_free_filepair(struct diff_filepair
*p
)
2834 free_filespec(p
->one
);
2835 free_filespec(p
->two
);
2839 /* This is different from find_unique_abbrev() in that
2840 * it stuffs the result with dots for alignment.
2842 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2847 return sha1_to_hex(sha1
);
2849 abbrev
= find_unique_abbrev(sha1
, len
);
2850 abblen
= strlen(abbrev
);
2852 static char hex
[41];
2853 if (len
< abblen
&& abblen
<= len
+ 2)
2854 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2856 sprintf(hex
, "%s...", abbrev
);
2859 return sha1_to_hex(sha1
);
2862 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2864 int line_termination
= opt
->line_termination
;
2865 int inter_name_termination
= line_termination
? '\t' : '\0';
2867 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2868 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2869 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2870 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2873 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
2874 inter_name_termination
);
2876 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
2879 if (p
->status
== DIFF_STATUS_COPIED
||
2880 p
->status
== DIFF_STATUS_RENAMED
) {
2881 const char *name_a
, *name_b
;
2882 name_a
= p
->one
->path
;
2883 name_b
= p
->two
->path
;
2884 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2885 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
2886 write_name_quoted(name_b
, opt
->file
, line_termination
);
2888 const char *name_a
, *name_b
;
2889 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2891 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2892 write_name_quoted(name_a
, opt
->file
, line_termination
);
2896 int diff_unmodified_pair(struct diff_filepair
*p
)
2898 /* This function is written stricter than necessary to support
2899 * the currently implemented transformers, but the idea is to
2900 * let transformers to produce diff_filepairs any way they want,
2901 * and filter and clean them up here before producing the output.
2903 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2905 if (DIFF_PAIR_UNMERGED(p
))
2906 return 0; /* unmerged is interesting */
2908 /* deletion, addition, mode or type change
2909 * and rename are all interesting.
2911 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2912 DIFF_PAIR_MODE_CHANGED(p
) ||
2913 strcmp(one
->path
, two
->path
))
2916 /* both are valid and point at the same path. that is, we are
2917 * dealing with a change.
2919 if (one
->sha1_valid
&& two
->sha1_valid
&&
2920 !hashcmp(one
->sha1
, two
->sha1
))
2921 return 1; /* no change */
2922 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2923 return 1; /* both look at the same file on the filesystem. */
2927 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2929 if (diff_unmodified_pair(p
))
2932 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2933 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2934 return; /* no tree diffs in patch format */
2939 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2940 struct diffstat_t
*diffstat
)
2942 if (diff_unmodified_pair(p
))
2945 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2946 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2947 return; /* no tree diffs in patch format */
2949 run_diffstat(p
, o
, diffstat
);
2952 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2953 struct diff_options
*o
)
2955 if (diff_unmodified_pair(p
))
2958 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2959 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2960 return; /* no tree diffs in patch format */
2962 run_checkdiff(p
, o
);
2965 int diff_queue_is_empty(void)
2967 struct diff_queue_struct
*q
= &diff_queued_diff
;
2969 for (i
= 0; i
< q
->nr
; i
++)
2970 if (!diff_unmodified_pair(q
->queue
[i
]))
2976 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2978 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2981 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2983 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2984 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2986 s
->size
, s
->xfrm_flags
);
2989 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2991 diff_debug_filespec(p
->one
, i
, "one");
2992 diff_debug_filespec(p
->two
, i
, "two");
2993 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2994 p
->score
, p
->status
? p
->status
: '?',
2995 p
->one
->rename_used
, p
->broken_pair
);
2998 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
3002 fprintf(stderr
, "%s\n", msg
);
3003 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
3004 for (i
= 0; i
< q
->nr
; i
++) {
3005 struct diff_filepair
*p
= q
->queue
[i
];
3006 diff_debug_filepair(p
, i
);
3011 static void diff_resolve_rename_copy(void)
3014 struct diff_filepair
*p
;
3015 struct diff_queue_struct
*q
= &diff_queued_diff
;
3017 diff_debug_queue("resolve-rename-copy", q
);
3019 for (i
= 0; i
< q
->nr
; i
++) {
3021 p
->status
= 0; /* undecided */
3022 if (DIFF_PAIR_UNMERGED(p
))
3023 p
->status
= DIFF_STATUS_UNMERGED
;
3024 else if (!DIFF_FILE_VALID(p
->one
))
3025 p
->status
= DIFF_STATUS_ADDED
;
3026 else if (!DIFF_FILE_VALID(p
->two
))
3027 p
->status
= DIFF_STATUS_DELETED
;
3028 else if (DIFF_PAIR_TYPE_CHANGED(p
))
3029 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
3031 /* from this point on, we are dealing with a pair
3032 * whose both sides are valid and of the same type, i.e.
3033 * either in-place edit or rename/copy edit.
3035 else if (DIFF_PAIR_RENAME(p
)) {
3037 * A rename might have re-connected a broken
3038 * pair up, causing the pathnames to be the
3039 * same again. If so, that's not a rename at
3040 * all, just a modification..
3042 * Otherwise, see if this source was used for
3043 * multiple renames, in which case we decrement
3044 * the count, and call it a copy.
3046 if (!strcmp(p
->one
->path
, p
->two
->path
))
3047 p
->status
= DIFF_STATUS_MODIFIED
;
3048 else if (--p
->one
->rename_used
> 0)
3049 p
->status
= DIFF_STATUS_COPIED
;
3051 p
->status
= DIFF_STATUS_RENAMED
;
3053 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
3054 p
->one
->mode
!= p
->two
->mode
||
3055 is_null_sha1(p
->one
->sha1
))
3056 p
->status
= DIFF_STATUS_MODIFIED
;
3058 /* This is a "no-change" entry and should not
3059 * happen anymore, but prepare for broken callers.
3061 error("feeding unmodified %s to diffcore",
3063 p
->status
= DIFF_STATUS_UNKNOWN
;
3066 diff_debug_queue("resolve-rename-copy done", q
);
3069 static int check_pair_status(struct diff_filepair
*p
)
3071 switch (p
->status
) {
3072 case DIFF_STATUS_UNKNOWN
:
3075 die("internal error in diff-resolve-rename-copy");
3081 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
3083 int fmt
= opt
->output_format
;
3085 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
3086 diff_flush_checkdiff(p
, opt
);
3087 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
3088 diff_flush_raw(p
, opt
);
3089 else if (fmt
& DIFF_FORMAT_NAME
) {
3090 const char *name_a
, *name_b
;
3091 name_a
= p
->two
->path
;
3093 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3094 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
3098 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
3101 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
3103 fprintf(file
, " %s ", newdelete
);
3104 write_name_quoted(fs
->path
, file
, '\n');
3108 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
)
3110 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
3111 fprintf(file
, " mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
3112 show_name
? ' ' : '\n');
3114 write_name_quoted(p
->two
->path
, file
, '\n');
3119 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
)
3121 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
3123 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
3125 show_mode_change(file
, p
, 0);
3128 static void diff_summary(FILE *file
, struct diff_filepair
*p
)
3131 case DIFF_STATUS_DELETED
:
3132 show_file_mode_name(file
, "delete", p
->one
);
3134 case DIFF_STATUS_ADDED
:
3135 show_file_mode_name(file
, "create", p
->two
);
3137 case DIFF_STATUS_COPIED
:
3138 show_rename_copy(file
, "copy", p
);
3140 case DIFF_STATUS_RENAMED
:
3141 show_rename_copy(file
, "rename", p
);
3145 fputs(" rewrite ", file
);
3146 write_name_quoted(p
->two
->path
, file
, ' ');
3147 fprintf(file
, "(%d%%)\n", similarity_index(p
));
3149 show_mode_change(file
, p
, !p
->score
);
3155 struct xdiff_emit_state xm
;
3160 static int remove_space(char *line
, int len
)
3166 for (i
= 0; i
< len
; i
++)
3167 if (!isspace((c
= line
[i
])))
3173 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3175 struct patch_id_t
*data
= priv
;
3178 /* Ignore line numbers when computing the SHA1 of the patch */
3179 if (!prefixcmp(line
, "@@ -"))
3182 new_len
= remove_space(line
, len
);
3184 SHA1_Update(data
->ctx
, line
, new_len
);
3185 data
->patchlen
+= new_len
;
3188 /* returns 0 upon success, and writes result into sha1 */
3189 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3191 struct diff_queue_struct
*q
= &diff_queued_diff
;
3194 struct patch_id_t data
;
3195 char buffer
[PATH_MAX
* 4 + 20];
3198 memset(&data
, 0, sizeof(struct patch_id_t
));
3200 data
.xm
.consume
= patch_id_consume
;
3202 for (i
= 0; i
< q
->nr
; i
++) {
3207 struct diff_filepair
*p
= q
->queue
[i
];
3210 memset(&xecfg
, 0, sizeof(xecfg
));
3212 return error("internal diff status error");
3213 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3215 if (diff_unmodified_pair(p
))
3217 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3218 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3220 if (DIFF_PAIR_UNMERGED(p
))
3223 diff_fill_sha1_info(p
->one
);
3224 diff_fill_sha1_info(p
->two
);
3225 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3226 fill_mmfile(&mf2
, p
->two
) < 0)
3227 return error("unable to read files to diff");
3229 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3230 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3231 if (p
->one
->mode
== 0)
3232 len1
= snprintf(buffer
, sizeof(buffer
),
3233 "diff--gita/%.*sb/%.*s"
3240 len2
, p
->two
->path
);
3241 else if (p
->two
->mode
== 0)
3242 len1
= snprintf(buffer
, sizeof(buffer
),
3243 "diff--gita/%.*sb/%.*s"
3244 "deletedfilemode%06o"
3250 len1
, p
->one
->path
);
3252 len1
= snprintf(buffer
, sizeof(buffer
),
3253 "diff--gita/%.*sb/%.*s"
3259 len2
, p
->two
->path
);
3260 SHA1_Update(&ctx
, buffer
, len1
);
3262 xpp
.flags
= XDF_NEED_MINIMAL
;
3264 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3265 ecb
.outf
= xdiff_outf
;
3267 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
3270 SHA1_Final(sha1
, &ctx
);
3274 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3276 struct diff_queue_struct
*q
= &diff_queued_diff
;
3278 int result
= diff_get_patch_id(options
, sha1
);
3280 for (i
= 0; i
< q
->nr
; i
++)
3281 diff_free_filepair(q
->queue
[i
]);
3285 q
->nr
= q
->alloc
= 0;
3290 static int is_summary_empty(const struct diff_queue_struct
*q
)
3294 for (i
= 0; i
< q
->nr
; i
++) {
3295 const struct diff_filepair
*p
= q
->queue
[i
];
3297 switch (p
->status
) {
3298 case DIFF_STATUS_DELETED
:
3299 case DIFF_STATUS_ADDED
:
3300 case DIFF_STATUS_COPIED
:
3301 case DIFF_STATUS_RENAMED
:
3306 if (p
->one
->mode
&& p
->two
->mode
&&
3307 p
->one
->mode
!= p
->two
->mode
)
3315 void diff_flush(struct diff_options
*options
)
3317 struct diff_queue_struct
*q
= &diff_queued_diff
;
3318 int i
, output_format
= options
->output_format
;
3322 * Order: raw, stat, summary, patch
3323 * or: name/name-status/checkdiff (other bits clear)
3328 if (output_format
& (DIFF_FORMAT_RAW
|
3330 DIFF_FORMAT_NAME_STATUS
|
3331 DIFF_FORMAT_CHECKDIFF
)) {
3332 for (i
= 0; i
< q
->nr
; i
++) {
3333 struct diff_filepair
*p
= q
->queue
[i
];
3334 if (check_pair_status(p
))
3335 flush_one_pair(p
, options
);
3340 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3341 struct diffstat_t diffstat
;
3343 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3344 diffstat
.xm
.consume
= diffstat_consume
;
3345 for (i
= 0; i
< q
->nr
; i
++) {
3346 struct diff_filepair
*p
= q
->queue
[i
];
3347 if (check_pair_status(p
))
3348 diff_flush_stat(p
, options
, &diffstat
);
3350 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3351 show_numstat(&diffstat
, options
);
3352 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3353 show_stats(&diffstat
, options
);
3354 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3355 show_shortstats(&diffstat
, options
);
3356 free_diffstat_info(&diffstat
);
3359 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3360 show_dirstat(options
);
3362 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3363 for (i
= 0; i
< q
->nr
; i
++)
3364 diff_summary(options
->file
, q
->queue
[i
]);
3368 if (output_format
& DIFF_FORMAT_PATCH
) {
3370 putc(options
->line_termination
, options
->file
);
3371 if (options
->stat_sep
) {
3372 /* attach patch instead of inline */
3373 fputs(options
->stat_sep
, options
->file
);
3377 for (i
= 0; i
< q
->nr
; i
++) {
3378 struct diff_filepair
*p
= q
->queue
[i
];
3379 if (check_pair_status(p
))
3380 diff_flush_patch(p
, options
);
3384 if (output_format
& DIFF_FORMAT_CALLBACK
)
3385 options
->format_callback(q
, options
, options
->format_callback_data
);
3387 for (i
= 0; i
< q
->nr
; i
++)
3388 diff_free_filepair(q
->queue
[i
]);
3392 q
->nr
= q
->alloc
= 0;
3393 if (options
->close_file
)
3394 fclose(options
->file
);
3397 static void diffcore_apply_filter(const char *filter
)
3400 struct diff_queue_struct
*q
= &diff_queued_diff
;
3401 struct diff_queue_struct outq
;
3403 outq
.nr
= outq
.alloc
= 0;
3408 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3410 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3411 struct diff_filepair
*p
= q
->queue
[i
];
3412 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3414 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3416 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3417 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3418 strchr(filter
, p
->status
)))
3424 /* otherwise we will clear the whole queue
3425 * by copying the empty outq at the end of this
3426 * function, but first clear the current entries
3429 for (i
= 0; i
< q
->nr
; i
++)
3430 diff_free_filepair(q
->queue
[i
]);
3433 /* Only the matching ones */
3434 for (i
= 0; i
< q
->nr
; i
++) {
3435 struct diff_filepair
*p
= q
->queue
[i
];
3437 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3439 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3441 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3442 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3443 strchr(filter
, p
->status
)))
3446 diff_free_filepair(p
);
3453 /* Check whether two filespecs with the same mode and size are identical */
3454 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3455 struct diff_filespec
*two
)
3457 if (S_ISGITLINK(one
->mode
))
3459 if (diff_populate_filespec(one
, 0))
3461 if (diff_populate_filespec(two
, 0))
3463 return !memcmp(one
->data
, two
->data
, one
->size
);
3466 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3469 struct diff_queue_struct
*q
= &diff_queued_diff
;
3470 struct diff_queue_struct outq
;
3472 outq
.nr
= outq
.alloc
= 0;
3474 for (i
= 0; i
< q
->nr
; i
++) {
3475 struct diff_filepair
*p
= q
->queue
[i
];
3478 * 1. Entries that come from stat info dirtyness
3479 * always have both sides (iow, not create/delete),
3480 * one side of the object name is unknown, with
3481 * the same mode and size. Keep the ones that
3482 * do not match these criteria. They have real
3485 * 2. At this point, the file is known to be modified,
3486 * with the same mode and size, and the object
3487 * name of one side is unknown. Need to inspect
3488 * the identical contents.
3490 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3491 !DIFF_FILE_VALID(p
->two
) ||
3492 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3493 (p
->one
->mode
!= p
->two
->mode
) ||
3494 diff_populate_filespec(p
->one
, 1) ||
3495 diff_populate_filespec(p
->two
, 1) ||
3496 (p
->one
->size
!= p
->two
->size
) ||
3497 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3501 * The caller can subtract 1 from skip_stat_unmatch
3502 * to determine how many paths were dirty only
3503 * due to stat info mismatch.
3505 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3506 diffopt
->skip_stat_unmatch
++;
3507 diff_free_filepair(p
);
3514 void diffcore_std(struct diff_options
*options
)
3516 if (options
->skip_stat_unmatch
)
3517 diffcore_skip_stat_unmatch(options
);
3518 if (options
->break_opt
!= -1)
3519 diffcore_break(options
->break_opt
);
3520 if (options
->detect_rename
)
3521 diffcore_rename(options
);
3522 if (options
->break_opt
!= -1)
3523 diffcore_merge_broken();
3524 if (options
->pickaxe
)
3525 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3526 if (options
->orderfile
)
3527 diffcore_order(options
->orderfile
);
3528 diff_resolve_rename_copy();
3529 diffcore_apply_filter(options
->filter
);
3531 if (diff_queued_diff
.nr
)
3532 DIFF_OPT_SET(options
, HAS_CHANGES
);
3534 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3537 int diff_result_code(struct diff_options
*opt
, int status
)
3540 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3541 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3543 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3544 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3546 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3547 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3552 void diff_addremove(struct diff_options
*options
,
3553 int addremove
, unsigned mode
,
3554 const unsigned char *sha1
,
3555 const char *concatpath
)
3557 struct diff_filespec
*one
, *two
;
3559 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(mode
))
3562 /* This may look odd, but it is a preparation for
3563 * feeding "there are unchanged files which should
3564 * not produce diffs, but when you are doing copy
3565 * detection you would need them, so here they are"
3566 * entries to the diff-core. They will be prefixed
3567 * with something like '=' or '*' (I haven't decided
3568 * which but should not make any difference).
3569 * Feeding the same new and old to diff_change()
3570 * also has the same effect.
3571 * Before the final output happens, they are pruned after
3572 * merged into rename/copy pairs as appropriate.
3574 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3575 addremove
= (addremove
== '+' ? '-' :
3576 addremove
== '-' ? '+' : addremove
);
3578 if (options
->prefix
&&
3579 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3582 one
= alloc_filespec(concatpath
);
3583 two
= alloc_filespec(concatpath
);
3585 if (addremove
!= '+')
3586 fill_filespec(one
, sha1
, mode
);
3587 if (addremove
!= '-')
3588 fill_filespec(two
, sha1
, mode
);
3590 diff_queue(&diff_queued_diff
, one
, two
);
3591 DIFF_OPT_SET(options
, HAS_CHANGES
);
3594 void diff_change(struct diff_options
*options
,
3595 unsigned old_mode
, unsigned new_mode
,
3596 const unsigned char *old_sha1
,
3597 const unsigned char *new_sha1
,
3598 const char *concatpath
)
3600 struct diff_filespec
*one
, *two
;
3602 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(old_mode
)
3603 && S_ISGITLINK(new_mode
))
3606 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3608 const unsigned char *tmp_c
;
3609 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3610 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3613 if (options
->prefix
&&
3614 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3617 one
= alloc_filespec(concatpath
);
3618 two
= alloc_filespec(concatpath
);
3619 fill_filespec(one
, old_sha1
, old_mode
);
3620 fill_filespec(two
, new_sha1
, new_mode
);
3622 diff_queue(&diff_queued_diff
, one
, two
);
3623 DIFF_OPT_SET(options
, HAS_CHANGES
);
3626 void diff_unmerge(struct diff_options
*options
,
3628 unsigned mode
, const unsigned char *sha1
)
3630 struct diff_filespec
*one
, *two
;
3632 if (options
->prefix
&&
3633 strncmp(path
, options
->prefix
, options
->prefix_length
))
3636 one
= alloc_filespec(path
);
3637 two
= alloc_filespec(path
);
3638 fill_filespec(one
, sha1
, mode
);
3639 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;