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
+ 1, len
- 1, ecbdata
->ws_rule
);
430 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
432 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
433 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
436 emit_line(ecbdata
->file
, set
, reset
, line
, len
);
437 else if (new_blank_line_at_eof(ecbdata
, line
, len
))
438 /* Blank line at EOF - paint '+' as well */
439 emit_line(ecbdata
->file
, ws
, reset
, line
, len
);
441 /* Emit just the prefix, then the rest. */
442 emit_line(ecbdata
->file
, set
, reset
, line
, 1);
443 ws_check_emit(line
+ 1, len
- 1, ecbdata
->ws_rule
,
444 ecbdata
->file
, set
, reset
, ws
);
448 static void emit_rewrite_diff(const char *name_a
,
450 struct diff_filespec
*one
,
451 struct diff_filespec
*two
,
452 struct diff_options
*o
)
455 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
456 const char *name_a_tab
, *name_b_tab
;
457 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
458 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
459 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
460 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
461 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
462 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
464 name_a
+= (*name_a
== '/');
465 name_b
+= (*name_b
== '/');
466 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
467 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
469 strbuf_reset(&a_name
);
470 strbuf_reset(&b_name
);
471 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
472 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
474 diff_populate_filespec(one
, 0);
475 diff_populate_filespec(two
, 0);
476 lc_a
= count_lines(one
->data
, one
->size
);
477 lc_b
= count_lines(two
->data
, two
->size
);
479 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
480 metainfo
, a_name
.buf
, name_a_tab
, reset
,
481 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
482 print_line_count(o
->file
, lc_a
);
483 fprintf(o
->file
, " +");
484 print_line_count(o
->file
, lc_b
);
485 fprintf(o
->file
, " @@%s\n", reset
);
487 copy_file_with_prefix(o
->file
, '-', one
->data
, one
->size
, old
, reset
);
489 copy_file_with_prefix(o
->file
, '+', two
->data
, two
->size
, new, reset
);
492 struct diff_words_buffer
{
495 long current
; /* output pointer */
496 int suppressed_newline
;
499 static void diff_words_append(char *line
, unsigned long len
,
500 struct diff_words_buffer
*buffer
)
502 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
503 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
504 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
508 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
509 buffer
->text
.size
+= len
;
512 struct diff_words_data
{
513 struct xdiff_emit_state xm
;
514 struct diff_words_buffer minus
, plus
;
518 static void print_word(FILE *file
, struct diff_words_buffer
*buffer
, int len
, int color
,
519 int suppress_newline
)
527 ptr
= buffer
->text
.ptr
+ buffer
->current
;
528 buffer
->current
+= len
;
530 if (ptr
[len
- 1] == '\n') {
535 fputs(diff_get_color(1, color
), file
);
536 fwrite(ptr
, len
, 1, file
);
537 fputs(diff_get_color(1, DIFF_RESET
), file
);
540 if (suppress_newline
)
541 buffer
->suppressed_newline
= 1;
547 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
549 struct diff_words_data
*diff_words
= priv
;
551 if (diff_words
->minus
.suppressed_newline
) {
553 putc('\n', diff_words
->file
);
554 diff_words
->minus
.suppressed_newline
= 0;
560 print_word(diff_words
->file
,
561 &diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
564 print_word(diff_words
->file
,
565 &diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
568 print_word(diff_words
->file
,
569 &diff_words
->plus
, len
, DIFF_PLAIN
, 0);
570 diff_words
->minus
.current
+= len
;
575 /* this executes the word diff on the accumulated buffers */
576 static void diff_words_show(struct diff_words_data
*diff_words
)
581 mmfile_t minus
, plus
;
584 memset(&xecfg
, 0, sizeof(xecfg
));
585 minus
.size
= diff_words
->minus
.text
.size
;
586 minus
.ptr
= xmalloc(minus
.size
);
587 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
588 for (i
= 0; i
< minus
.size
; i
++)
589 if (isspace(minus
.ptr
[i
]))
591 diff_words
->minus
.current
= 0;
593 plus
.size
= diff_words
->plus
.text
.size
;
594 plus
.ptr
= xmalloc(plus
.size
);
595 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
596 for (i
= 0; i
< plus
.size
; i
++)
597 if (isspace(plus
.ptr
[i
]))
599 diff_words
->plus
.current
= 0;
601 xpp
.flags
= XDF_NEED_MINIMAL
;
602 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
603 ecb
.outf
= xdiff_outf
;
604 ecb
.priv
= diff_words
;
605 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
606 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
610 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
612 if (diff_words
->minus
.suppressed_newline
) {
613 putc('\n', diff_words
->file
);
614 diff_words
->minus
.suppressed_newline
= 0;
618 static void free_diff_words_data(struct emit_callback
*ecbdata
)
620 if (ecbdata
->diff_words
) {
622 if (ecbdata
->diff_words
->minus
.text
.size
||
623 ecbdata
->diff_words
->plus
.text
.size
)
624 diff_words_show(ecbdata
->diff_words
);
626 free (ecbdata
->diff_words
->minus
.text
.ptr
);
627 free (ecbdata
->diff_words
->plus
.text
.ptr
);
628 free(ecbdata
->diff_words
);
629 ecbdata
->diff_words
= NULL
;
633 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
636 return diff_colors
[ix
];
640 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
647 return ecb
->truncate(line
, len
);
651 (void) utf8_width(&cp
, &l
);
653 break; /* truncated in the middle? */
658 static void find_lno(const char *line
, struct emit_callback
*ecbdata
)
661 ecbdata
->lno_in_preimage
= 0;
662 ecbdata
->lno_in_postimage
= 0;
663 p
= strchr(line
, '-');
665 return; /* cannot happen */
666 ecbdata
->lno_in_preimage
= strtol(p
+ 1, NULL
, 10);
669 return; /* cannot happen */
670 ecbdata
->lno_in_postimage
= strtol(p
+ 1, NULL
, 10);
673 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
675 struct emit_callback
*ecbdata
= priv
;
676 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
677 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
678 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
680 *(ecbdata
->found_changesp
) = 1;
682 if (ecbdata
->label_path
[0]) {
683 const char *name_a_tab
, *name_b_tab
;
685 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
686 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
688 fprintf(ecbdata
->file
, "%s--- %s%s%s\n",
689 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
690 fprintf(ecbdata
->file
, "%s+++ %s%s%s\n",
691 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
692 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
695 if (line
[0] == '@') {
696 len
= sane_truncate_line(ecbdata
, line
, len
);
697 find_lno(line
, ecbdata
);
698 emit_line(ecbdata
->file
,
699 diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
701 if (line
[len
-1] != '\n')
702 putc('\n', ecbdata
->file
);
707 emit_line(ecbdata
->file
, reset
, reset
, line
, len
);
711 if (ecbdata
->diff_words
) {
712 if (line
[0] == '-') {
713 diff_words_append(line
, len
,
714 &ecbdata
->diff_words
->minus
);
716 } else if (line
[0] == '+') {
717 diff_words_append(line
, len
,
718 &ecbdata
->diff_words
->plus
);
721 if (ecbdata
->diff_words
->minus
.text
.size
||
722 ecbdata
->diff_words
->plus
.text
.size
)
723 diff_words_show(ecbdata
->diff_words
);
726 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
730 if (line
[0] != '+') {
732 diff_get_color(ecbdata
->color_diff
,
733 line
[0] == '-' ? DIFF_FILE_OLD
: DIFF_PLAIN
);
734 ecbdata
->lno_in_preimage
++;
736 ecbdata
->lno_in_postimage
++;
737 emit_line(ecbdata
->file
, color
, reset
, line
, len
);
739 ecbdata
->lno_in_postimage
++;
740 emit_add_line(reset
, ecbdata
, line
, len
);
744 static char *pprint_rename(const char *a
, const char *b
)
749 int pfx_length
, sfx_length
;
750 int len_a
= strlen(a
);
751 int len_b
= strlen(b
);
752 int a_midlen
, b_midlen
;
753 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
754 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
756 strbuf_init(&name
, 0);
757 if (qlen_a
|| qlen_b
) {
758 quote_c_style(a
, &name
, NULL
, 0);
759 strbuf_addstr(&name
, " => ");
760 quote_c_style(b
, &name
, NULL
, 0);
761 return strbuf_detach(&name
, NULL
);
764 /* Find common prefix */
766 while (*old
&& *new && *old
== *new) {
768 pfx_length
= old
- a
+ 1;
773 /* Find common suffix */
777 while (a
<= old
&& b
<= new && *old
== *new) {
779 sfx_length
= len_a
- (old
- a
);
785 * pfx{mid-a => mid-b}sfx
786 * {pfx-a => pfx-b}sfx
787 * pfx{sfx-a => sfx-b}
790 a_midlen
= len_a
- pfx_length
- sfx_length
;
791 b_midlen
= len_b
- pfx_length
- sfx_length
;
797 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
798 if (pfx_length
+ sfx_length
) {
799 strbuf_add(&name
, a
, pfx_length
);
800 strbuf_addch(&name
, '{');
802 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
803 strbuf_addstr(&name
, " => ");
804 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
805 if (pfx_length
+ sfx_length
) {
806 strbuf_addch(&name
, '}');
807 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
809 return strbuf_detach(&name
, NULL
);
813 struct xdiff_emit_state xm
;
817 struct diffstat_file
{
821 unsigned is_unmerged
:1;
822 unsigned is_binary
:1;
823 unsigned is_renamed
:1;
824 unsigned int added
, deleted
;
828 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
832 struct diffstat_file
*x
;
833 x
= xcalloc(sizeof (*x
), 1);
834 if (diffstat
->nr
== diffstat
->alloc
) {
835 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
836 diffstat
->files
= xrealloc(diffstat
->files
,
837 diffstat
->alloc
* sizeof(x
));
839 diffstat
->files
[diffstat
->nr
++] = x
;
841 x
->from_name
= xstrdup(name_a
);
842 x
->name
= xstrdup(name_b
);
847 x
->name
= xstrdup(name_a
);
852 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
854 struct diffstat_t
*diffstat
= priv
;
855 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
859 else if (line
[0] == '-')
863 const char mime_boundary_leader
[] = "------------";
865 static int scale_linear(int it
, int width
, int max_change
)
868 * make sure that at least one '-' is printed if there were deletions,
869 * and likewise for '+'.
873 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
876 static void show_name(FILE *file
,
877 const char *prefix
, const char *name
, int len
,
878 const char *reset
, const char *set
)
880 fprintf(file
, " %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
883 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
887 fprintf(file
, "%s", set
);
890 fprintf(file
, "%s", reset
);
893 static void fill_print_name(struct diffstat_file
*file
)
897 if (file
->print_name
)
900 if (!file
->is_renamed
) {
902 strbuf_init(&buf
, 0);
903 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
904 pname
= strbuf_detach(&buf
, NULL
);
907 strbuf_release(&buf
);
910 pname
= pprint_rename(file
->from_name
, file
->name
);
912 file
->print_name
= pname
;
915 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
917 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
918 int max_change
= 0, max_len
= 0;
919 int total_files
= data
->nr
;
920 int width
, name_width
;
921 const char *reset
, *set
, *add_c
, *del_c
;
926 width
= options
->stat_width
? options
->stat_width
: 80;
927 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
929 /* Sanity: give at least 5 columns to the graph,
930 * but leave at least 10 columns for the name.
936 else if (width
< name_width
+ 15)
937 name_width
= width
- 15;
939 /* Find the longest filename and max number of changes */
940 reset
= diff_get_color_opt(options
, DIFF_RESET
);
941 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
942 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
943 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
945 for (i
= 0; i
< data
->nr
; i
++) {
946 struct diffstat_file
*file
= data
->files
[i
];
947 int change
= file
->added
+ file
->deleted
;
948 fill_print_name(file
);
949 len
= strlen(file
->print_name
);
953 if (file
->is_binary
|| file
->is_unmerged
)
955 if (max_change
< change
)
959 /* Compute the width of the graph part;
960 * 10 is for one blank at the beginning of the line plus
961 * " | count " between the name and the graph.
963 * From here on, name_width is the width of the name area,
964 * and width is the width of the graph area.
966 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
967 if (width
< (name_width
+ 10) + max_change
)
968 width
= width
- (name_width
+ 10);
972 for (i
= 0; i
< data
->nr
; i
++) {
973 const char *prefix
= "";
974 char *name
= data
->files
[i
]->print_name
;
975 int added
= data
->files
[i
]->added
;
976 int deleted
= data
->files
[i
]->deleted
;
980 * "scale" the filename
983 name_len
= strlen(name
);
984 if (name_width
< name_len
) {
988 name
+= name_len
- len
;
989 slash
= strchr(name
, '/');
994 if (data
->files
[i
]->is_binary
) {
995 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
996 fprintf(options
->file
, " Bin ");
997 fprintf(options
->file
, "%s%d%s", del_c
, deleted
, reset
);
998 fprintf(options
->file
, " -> ");
999 fprintf(options
->file
, "%s%d%s", add_c
, added
, reset
);
1000 fprintf(options
->file
, " bytes");
1001 fprintf(options
->file
, "\n");
1004 else if (data
->files
[i
]->is_unmerged
) {
1005 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
1006 fprintf(options
->file
, " Unmerged\n");
1009 else if (!data
->files
[i
]->is_renamed
&&
1010 (added
+ deleted
== 0)) {
1016 * scale the add/delete
1024 if (width
<= max_change
) {
1025 add
= scale_linear(add
, width
, max_change
);
1026 del
= scale_linear(del
, width
, max_change
);
1029 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
1030 fprintf(options
->file
, "%5d%s", added
+ deleted
,
1031 added
+ deleted
? " " : "");
1032 show_graph(options
->file
, '+', add
, add_c
, reset
);
1033 show_graph(options
->file
, '-', del
, del_c
, reset
);
1034 fprintf(options
->file
, "\n");
1036 fprintf(options
->file
,
1037 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
1038 set
, total_files
, adds
, dels
, reset
);
1041 static void show_shortstats(struct diffstat_t
* data
, struct diff_options
*options
)
1043 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
1048 for (i
= 0; i
< data
->nr
; i
++) {
1049 if (!data
->files
[i
]->is_binary
&&
1050 !data
->files
[i
]->is_unmerged
) {
1051 int added
= data
->files
[i
]->added
;
1052 int deleted
= data
->files
[i
]->deleted
;
1053 if (!data
->files
[i
]->is_renamed
&&
1054 (added
+ deleted
== 0)) {
1062 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
1063 total_files
, adds
, dels
);
1066 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
1073 for (i
= 0; i
< data
->nr
; i
++) {
1074 struct diffstat_file
*file
= data
->files
[i
];
1076 if (file
->is_binary
)
1077 fprintf(options
->file
, "-\t-\t");
1079 fprintf(options
->file
,
1080 "%d\t%d\t", file
->added
, file
->deleted
);
1081 if (options
->line_termination
) {
1082 fill_print_name(file
);
1083 if (!file
->is_renamed
)
1084 write_name_quoted(file
->name
, options
->file
,
1085 options
->line_termination
);
1087 fputs(file
->print_name
, options
->file
);
1088 putc(options
->line_termination
, options
->file
);
1091 if (file
->is_renamed
) {
1092 putc('\0', options
->file
);
1093 write_name_quoted(file
->from_name
, options
->file
, '\0');
1095 write_name_quoted(file
->name
, options
->file
, '\0');
1100 struct dirstat_file
{
1102 unsigned long changed
;
1105 struct dirstat_dir
{
1106 struct dirstat_file
*files
;
1107 int alloc
, nr
, percent
, cumulative
;
1110 static long gather_dirstat(FILE *file
, struct dirstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1112 unsigned long this_dir
= 0;
1113 unsigned int sources
= 0;
1116 struct dirstat_file
*f
= dir
->files
;
1117 int namelen
= strlen(f
->name
);
1121 if (namelen
< baselen
)
1123 if (memcmp(f
->name
, base
, baselen
))
1125 slash
= strchr(f
->name
+ baselen
, '/');
1127 int newbaselen
= slash
+ 1 - f
->name
;
1128 this = gather_dirstat(file
, dir
, changed
, f
->name
, newbaselen
);
1140 * We don't report dirstat's for
1142 * - or cases where everything came from a single directory
1143 * under this directory (sources == 1).
1145 if (baselen
&& sources
!= 1) {
1146 int permille
= this_dir
* 1000 / changed
;
1148 int percent
= permille
/ 10;
1149 if (percent
>= dir
->percent
) {
1150 fprintf(file
, "%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1151 if (!dir
->cumulative
)
1159 static int dirstat_compare(const void *_a
, const void *_b
)
1161 const struct dirstat_file
*a
= _a
;
1162 const struct dirstat_file
*b
= _b
;
1163 return strcmp(a
->name
, b
->name
);
1166 static void show_dirstat(struct diff_options
*options
)
1169 unsigned long changed
;
1170 struct dirstat_dir dir
;
1171 struct diff_queue_struct
*q
= &diff_queued_diff
;
1176 dir
.percent
= options
->dirstat_percent
;
1177 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1180 for (i
= 0; i
< q
->nr
; i
++) {
1181 struct diff_filepair
*p
= q
->queue
[i
];
1183 unsigned long copied
, added
, damage
;
1185 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1187 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1188 diff_populate_filespec(p
->one
, 0);
1189 diff_populate_filespec(p
->two
, 0);
1190 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1192 diff_free_filespec_data(p
->one
);
1193 diff_free_filespec_data(p
->two
);
1194 } else if (DIFF_FILE_VALID(p
->one
)) {
1195 diff_populate_filespec(p
->one
, 1);
1197 diff_free_filespec_data(p
->one
);
1198 } else if (DIFF_FILE_VALID(p
->two
)) {
1199 diff_populate_filespec(p
->two
, 1);
1201 added
= p
->two
->size
;
1202 diff_free_filespec_data(p
->two
);
1207 * Original minus copied is the removed material,
1208 * added is the new material. They are both damages
1209 * made to the preimage.
1211 damage
= (p
->one
->size
- copied
) + added
;
1213 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1214 dir
.files
[dir
.nr
].name
= name
;
1215 dir
.files
[dir
.nr
].changed
= damage
;
1220 /* This can happen even with many files, if everything was renames */
1224 /* Show all directories with more than x% of the changes */
1225 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1226 gather_dirstat(options
->file
, &dir
, changed
, "", 0);
1229 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1232 for (i
= 0; i
< diffstat
->nr
; i
++) {
1233 struct diffstat_file
*f
= diffstat
->files
[i
];
1234 if (f
->name
!= f
->print_name
)
1235 free(f
->print_name
);
1240 free(diffstat
->files
);
1243 struct checkdiff_t
{
1244 struct xdiff_emit_state xm
;
1245 const char *filename
;
1247 struct diff_options
*o
;
1252 static int is_conflict_marker(const char *line
, unsigned long len
)
1259 firstchar
= line
[0];
1260 switch (firstchar
) {
1261 case '=': case '>': case '<':
1266 for (cnt
= 1; cnt
< 7; cnt
++)
1267 if (line
[cnt
] != firstchar
)
1269 /* line[0] thru line[6] are same as firstchar */
1270 if (firstchar
== '=') {
1271 /* divider between ours and theirs? */
1272 if (len
!= 8 || line
[7] != '\n')
1274 } else if (len
< 8 || !isspace(line
[7])) {
1275 /* not divider before ours nor after theirs */
1281 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1283 struct checkdiff_t
*data
= priv
;
1284 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1285 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1286 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1287 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1290 if (line
[0] == '+') {
1293 if (is_conflict_marker(line
+ 1, len
- 1)) {
1295 fprintf(data
->o
->file
,
1296 "%s:%d: leftover conflict marker\n",
1297 data
->filename
, data
->lineno
);
1299 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1302 data
->status
|= bad
;
1303 err
= whitespace_error_string(bad
);
1304 fprintf(data
->o
->file
, "%s:%d: %s.\n",
1305 data
->filename
, data
->lineno
, err
);
1307 emit_line(data
->o
->file
, set
, reset
, line
, 1);
1308 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1309 data
->o
->file
, set
, reset
, ws
);
1310 } else if (line
[0] == ' ') {
1312 } else if (line
[0] == '@') {
1313 char *plus
= strchr(line
, '+');
1315 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1317 die("invalid diff");
1321 static unsigned char *deflate_it(char *data
,
1323 unsigned long *result_size
)
1326 unsigned char *deflated
;
1329 memset(&stream
, 0, sizeof(stream
));
1330 deflateInit(&stream
, zlib_compression_level
);
1331 bound
= deflateBound(&stream
, size
);
1332 deflated
= xmalloc(bound
);
1333 stream
.next_out
= deflated
;
1334 stream
.avail_out
= bound
;
1336 stream
.next_in
= (unsigned char *)data
;
1337 stream
.avail_in
= size
;
1338 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1340 deflateEnd(&stream
);
1341 *result_size
= stream
.total_out
;
1345 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1351 unsigned long orig_size
;
1352 unsigned long delta_size
;
1353 unsigned long deflate_size
;
1354 unsigned long data_size
;
1356 /* We could do deflated delta, or we could do just deflated two,
1357 * whichever is smaller.
1360 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1361 if (one
->size
&& two
->size
) {
1362 delta
= diff_delta(one
->ptr
, one
->size
,
1363 two
->ptr
, two
->size
,
1364 &delta_size
, deflate_size
);
1366 void *to_free
= delta
;
1367 orig_size
= delta_size
;
1368 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1373 if (delta
&& delta_size
< deflate_size
) {
1374 fprintf(file
, "delta %lu\n", orig_size
);
1377 data_size
= delta_size
;
1380 fprintf(file
, "literal %lu\n", two
->size
);
1383 data_size
= deflate_size
;
1386 /* emit data encoded in base85 */
1389 int bytes
= (52 < data_size
) ? 52 : data_size
;
1393 line
[0] = bytes
+ 'A' - 1;
1395 line
[0] = bytes
- 26 + 'a' - 1;
1396 encode_85(line
+ 1, cp
, bytes
);
1397 cp
= (char *) cp
+ bytes
;
1401 fprintf(file
, "\n");
1405 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1407 fprintf(file
, "GIT binary patch\n");
1408 emit_binary_diff_body(file
, one
, two
);
1409 emit_binary_diff_body(file
, two
, one
);
1412 static void setup_diff_attr_check(struct git_attr_check
*check
)
1414 static struct git_attr
*attr_diff
;
1417 attr_diff
= git_attr("diff", 4);
1419 check
[0].attr
= attr_diff
;
1422 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1424 struct git_attr_check attr_diff_check
;
1425 int check_from_data
= 0;
1427 if (one
->checked_attr
)
1430 setup_diff_attr_check(&attr_diff_check
);
1432 one
->funcname_pattern_ident
= NULL
;
1434 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1438 value
= attr_diff_check
.value
;
1439 if (ATTR_TRUE(value
))
1441 else if (ATTR_FALSE(value
))
1444 check_from_data
= 1;
1446 /* funcname pattern ident */
1447 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1450 one
->funcname_pattern_ident
= value
;
1453 if (check_from_data
) {
1454 if (!one
->data
&& DIFF_FILE_VALID(one
))
1455 diff_populate_filespec(one
, 0);
1458 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1462 int diff_filespec_is_binary(struct diff_filespec
*one
)
1464 diff_filespec_check_attr(one
);
1465 return one
->is_binary
;
1468 static const struct funcname_pattern_entry
*funcname_pattern(const char *ident
)
1470 struct funcname_pattern_list
*pp
;
1472 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1473 if (!strcmp(ident
, pp
->e
.name
))
1478 static const struct funcname_pattern_entry builtin_funcname_pattern
[] = {
1480 "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
1481 "^[ \t]*(([ \t]*[A-Za-z_][A-Za-z_0-9]*){2,}[ \t]*\\([^;]*)$",
1484 "^((procedure|function|constructor|destructor|interface|"
1485 "implementation|initialization|finalization)[ \t]*.*)$"
1487 "^(.*=[ \t]*(class|record).*)$",
1489 { "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
1492 "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
1494 { "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
1498 static const struct funcname_pattern_entry
*diff_funcname_pattern(struct diff_filespec
*one
)
1501 const struct funcname_pattern_entry
*pe
;
1504 diff_filespec_check_attr(one
);
1505 ident
= one
->funcname_pattern_ident
;
1509 * If the config file has "funcname.default" defined, that
1510 * regexp is used; otherwise NULL is returned and xemit uses
1511 * the built-in default.
1513 return funcname_pattern("default");
1515 /* Look up custom "funcname.$ident" regexp from config. */
1516 pe
= funcname_pattern(ident
);
1521 * And define built-in fallback patterns here. Note that
1522 * these can be overridden by the user's config settings.
1524 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1525 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1526 return &builtin_funcname_pattern
[i
];
1531 static void builtin_diff(const char *name_a
,
1533 struct diff_filespec
*one
,
1534 struct diff_filespec
*two
,
1535 const char *xfrm_msg
,
1536 struct diff_options
*o
,
1537 int complete_rewrite
)
1541 char *a_one
, *b_two
;
1542 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1543 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1545 /* Never use a non-valid filename anywhere if at all possible */
1546 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
1547 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
1549 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1550 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1551 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1552 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1553 fprintf(o
->file
, "%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1554 if (lbl
[0][0] == '/') {
1556 fprintf(o
->file
, "%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1557 if (xfrm_msg
&& xfrm_msg
[0])
1558 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1560 else if (lbl
[1][0] == '/') {
1561 fprintf(o
->file
, "%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1562 if (xfrm_msg
&& xfrm_msg
[0])
1563 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1566 if (one
->mode
!= two
->mode
) {
1567 fprintf(o
->file
, "%sold mode %06o%s\n", set
, one
->mode
, reset
);
1568 fprintf(o
->file
, "%snew mode %06o%s\n", set
, two
->mode
, reset
);
1570 if (xfrm_msg
&& xfrm_msg
[0])
1571 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1573 * we do not run diff between different kind
1576 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1577 goto free_ab_and_return
;
1578 if (complete_rewrite
) {
1579 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1580 o
->found_changes
= 1;
1581 goto free_ab_and_return
;
1585 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1586 die("unable to read files to diff");
1588 if (!DIFF_OPT_TST(o
, TEXT
) &&
1589 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1590 /* Quite common confusing case */
1591 if (mf1
.size
== mf2
.size
&&
1592 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1593 goto free_ab_and_return
;
1594 if (DIFF_OPT_TST(o
, BINARY
))
1595 emit_binary_diff(o
->file
, &mf1
, &mf2
);
1597 fprintf(o
->file
, "Binary files %s and %s differ\n",
1599 o
->found_changes
= 1;
1602 /* Crazy xdl interfaces.. */
1603 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1607 struct emit_callback ecbdata
;
1608 const struct funcname_pattern_entry
*pe
;
1610 pe
= diff_funcname_pattern(one
);
1612 pe
= diff_funcname_pattern(two
);
1614 memset(&xecfg
, 0, sizeof(xecfg
));
1615 memset(&ecbdata
, 0, sizeof(ecbdata
));
1616 ecbdata
.label_path
= lbl
;
1617 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1618 ecbdata
.found_changesp
= &o
->found_changes
;
1619 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1620 if (ecbdata
.ws_rule
& WS_BLANK_AT_EOF
)
1621 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1622 ecbdata
.file
= o
->file
;
1623 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1624 xecfg
.ctxlen
= o
->context
;
1625 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1627 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
1630 else if (!prefixcmp(diffopts
, "--unified="))
1631 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1632 else if (!prefixcmp(diffopts
, "-u"))
1633 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1634 ecb
.outf
= xdiff_outf
;
1635 ecb
.priv
= &ecbdata
;
1636 ecbdata
.xm
.consume
= fn_out_consume
;
1637 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
)) {
1638 ecbdata
.diff_words
=
1639 xcalloc(1, sizeof(struct diff_words_data
));
1640 ecbdata
.diff_words
->file
= o
->file
;
1642 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1643 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1644 free_diff_words_data(&ecbdata
);
1648 diff_free_filespec_data(one
);
1649 diff_free_filespec_data(two
);
1655 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1656 struct diff_filespec
*one
,
1657 struct diff_filespec
*two
,
1658 struct diffstat_t
*diffstat
,
1659 struct diff_options
*o
,
1660 int complete_rewrite
)
1663 struct diffstat_file
*data
;
1665 data
= diffstat_add(diffstat
, name_a
, name_b
);
1668 data
->is_unmerged
= 1;
1671 if (complete_rewrite
) {
1672 diff_populate_filespec(one
, 0);
1673 diff_populate_filespec(two
, 0);
1674 data
->deleted
= count_lines(one
->data
, one
->size
);
1675 data
->added
= count_lines(two
->data
, two
->size
);
1676 goto free_and_return
;
1678 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1679 die("unable to read files to diff");
1681 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1682 data
->is_binary
= 1;
1683 data
->added
= mf2
.size
;
1684 data
->deleted
= mf1
.size
;
1686 /* Crazy xdl interfaces.. */
1691 memset(&xecfg
, 0, sizeof(xecfg
));
1692 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1693 ecb
.outf
= xdiff_outf
;
1694 ecb
.priv
= diffstat
;
1695 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1699 diff_free_filespec_data(one
);
1700 diff_free_filespec_data(two
);
1703 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1704 const char *attr_path
,
1705 struct diff_filespec
*one
,
1706 struct diff_filespec
*two
,
1707 struct diff_options
*o
)
1710 struct checkdiff_t data
;
1715 memset(&data
, 0, sizeof(data
));
1716 data
.xm
.consume
= checkdiff_consume
;
1717 data
.filename
= name_b
? name_b
: name_a
;
1720 data
.ws_rule
= whitespace_rule(attr_path
);
1722 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1723 die("unable to read files to diff");
1726 * All the other codepaths check both sides, but not checking
1727 * the "old" side here is deliberate. We are checking the newly
1728 * introduced changes, and as long as the "new" side is text, we
1729 * can and should check what it introduces.
1731 if (diff_filespec_is_binary(two
))
1732 goto free_and_return
;
1734 /* Crazy xdl interfaces.. */
1739 memset(&xecfg
, 0, sizeof(xecfg
));
1740 xecfg
.ctxlen
= 1; /* at least one context line */
1741 xpp
.flags
= XDF_NEED_MINIMAL
;
1742 ecb
.outf
= xdiff_outf
;
1744 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1746 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
1747 struct emit_callback ecbdata
;
1750 ecbdata
.ws_rule
= data
.ws_rule
;
1751 check_blank_at_eof(&mf1
, &mf2
, &ecbdata
);
1752 blank_at_eof
= ecbdata
.blank_at_eof_in_preimage
;
1757 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
1758 fprintf(o
->file
, "%s:%d: %s.\n",
1759 data
.filename
, blank_at_eof
, err
);
1760 data
.status
= 1; /* report errors */
1765 diff_free_filespec_data(one
);
1766 diff_free_filespec_data(two
);
1768 DIFF_OPT_SET(o
, CHECK_FAILED
);
1771 struct diff_filespec
*alloc_filespec(const char *path
)
1773 int namelen
= strlen(path
);
1774 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1776 memset(spec
, 0, sizeof(*spec
));
1777 spec
->path
= (char *)(spec
+ 1);
1778 memcpy(spec
->path
, path
, namelen
+1);
1783 void free_filespec(struct diff_filespec
*spec
)
1785 if (!--spec
->count
) {
1786 diff_free_filespec_data(spec
);
1791 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1792 unsigned short mode
)
1795 spec
->mode
= canon_mode(mode
);
1796 hashcpy(spec
->sha1
, sha1
);
1797 spec
->sha1_valid
= !is_null_sha1(sha1
);
1802 * Given a name and sha1 pair, if the index tells us the file in
1803 * the work tree has that object contents, return true, so that
1804 * prepare_temp_file() does not have to inflate and extract.
1806 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1808 struct cache_entry
*ce
;
1812 /* We do not read the cache ourselves here, because the
1813 * benchmark with my previous version that always reads cache
1814 * shows that it makes things worse for diff-tree comparing
1815 * two linux-2.6 kernel trees in an already checked out work
1816 * tree. This is because most diff-tree comparisons deal with
1817 * only a small number of files, while reading the cache is
1818 * expensive for a large project, and its cost outweighs the
1819 * savings we get by not inflating the object to a temporary
1820 * file. Practically, this code only helps when we are used
1821 * by diff-cache --cached, which does read the cache before
1827 /* We want to avoid the working directory if our caller
1828 * doesn't need the data in a normal file, this system
1829 * is rather slow with its stat/open/mmap/close syscalls,
1830 * and the object is contained in a pack file. The pack
1831 * is probably already open and will be faster to obtain
1832 * the data through than the working directory. Loose
1833 * objects however would tend to be slower as they need
1834 * to be individually opened and inflated.
1836 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1840 pos
= cache_name_pos(name
, len
);
1843 ce
= active_cache
[pos
];
1846 * This is not the sha1 we are looking for, or
1847 * unreusable because it is not a regular file.
1849 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1853 * If ce matches the file in the work tree, we can reuse it.
1855 if (ce_uptodate(ce
) ||
1856 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1862 static int populate_from_stdin(struct diff_filespec
*s
)
1867 strbuf_init(&buf
, 0);
1868 if (strbuf_read(&buf
, 0, 0) < 0)
1869 return error("error while reading from stdin %s",
1872 s
->should_munmap
= 0;
1873 s
->data
= strbuf_detach(&buf
, &size
);
1879 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1882 char *data
= xmalloc(100);
1883 len
= snprintf(data
, 100,
1884 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1896 * While doing rename detection and pickaxe operation, we may need to
1897 * grab the data for the blob (or file) for our own in-core comparison.
1898 * diff_filespec has data and size fields for this purpose.
1900 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1903 if (!DIFF_FILE_VALID(s
))
1904 die("internal error: asking to populate invalid file.");
1905 if (S_ISDIR(s
->mode
))
1911 if (size_only
&& 0 < s
->size
)
1914 if (S_ISGITLINK(s
->mode
))
1915 return diff_populate_gitlink(s
, size_only
);
1917 if (!s
->sha1_valid
||
1918 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1923 if (!strcmp(s
->path
, "-"))
1924 return populate_from_stdin(s
);
1926 if (lstat(s
->path
, &st
) < 0) {
1927 if (errno
== ENOENT
) {
1931 s
->data
= (char *)"";
1936 s
->size
= xsize_t(st
.st_size
);
1941 if (S_ISLNK(st
.st_mode
)) {
1943 s
->data
= xmalloc(s
->size
);
1945 ret
= readlink(s
->path
, s
->data
, s
->size
);
1952 fd
= open(s
->path
, O_RDONLY
);
1955 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1957 s
->should_munmap
= 1;
1960 * Convert from working tree format to canonical git format
1962 strbuf_init(&buf
, 0);
1963 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
1965 munmap(s
->data
, s
->size
);
1966 s
->should_munmap
= 0;
1967 s
->data
= strbuf_detach(&buf
, &size
);
1973 enum object_type type
;
1975 type
= sha1_object_info(s
->sha1
, &s
->size
);
1977 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1984 void diff_free_filespec_blob(struct diff_filespec
*s
)
1988 else if (s
->should_munmap
)
1989 munmap(s
->data
, s
->size
);
1991 if (s
->should_free
|| s
->should_munmap
) {
1992 s
->should_free
= s
->should_munmap
= 0;
1997 void diff_free_filespec_data(struct diff_filespec
*s
)
1999 diff_free_filespec_blob(s
);
2004 static void prep_temp_blob(struct diff_tempfile
*temp
,
2007 const unsigned char *sha1
,
2012 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
2014 die("unable to create temp-file: %s", strerror(errno
));
2015 if (write_in_full(fd
, blob
, size
) != size
)
2016 die("unable to write temp-file");
2018 temp
->name
= temp
->tmp_path
;
2019 strcpy(temp
->hex
, sha1_to_hex(sha1
));
2021 sprintf(temp
->mode
, "%06o", mode
);
2024 static void prepare_temp_file(const char *name
,
2025 struct diff_tempfile
*temp
,
2026 struct diff_filespec
*one
)
2028 if (!DIFF_FILE_VALID(one
)) {
2030 /* A '-' entry produces this for file-2, and
2031 * a '+' entry produces this for file-1.
2033 temp
->name
= "/dev/null";
2034 strcpy(temp
->hex
, ".");
2035 strcpy(temp
->mode
, ".");
2039 if (!one
->sha1_valid
||
2040 reuse_worktree_file(name
, one
->sha1
, 1)) {
2042 if (lstat(name
, &st
) < 0) {
2043 if (errno
== ENOENT
)
2044 goto not_a_valid_file
;
2045 die("stat(%s): %s", name
, strerror(errno
));
2047 if (S_ISLNK(st
.st_mode
)) {
2049 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
2050 size_t sz
= xsize_t(st
.st_size
);
2051 if (sizeof(buf
) <= st
.st_size
)
2052 die("symlink too long: %s", name
);
2053 ret
= readlink(name
, buf
, sz
);
2055 die("readlink(%s)", name
);
2056 prep_temp_blob(temp
, buf
, sz
,
2058 one
->sha1
: null_sha1
),
2060 one
->mode
: S_IFLNK
));
2063 /* we can borrow from the file in the work tree */
2065 if (!one
->sha1_valid
)
2066 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
2068 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
2069 /* Even though we may sometimes borrow the
2070 * contents from the work tree, we always want
2071 * one->mode. mode is trustworthy even when
2072 * !(one->sha1_valid), as long as
2073 * DIFF_FILE_VALID(one).
2075 sprintf(temp
->mode
, "%06o", one
->mode
);
2080 if (diff_populate_filespec(one
, 0))
2081 die("cannot read data blob for %s", one
->path
);
2082 prep_temp_blob(temp
, one
->data
, one
->size
,
2083 one
->sha1
, one
->mode
);
2087 static void remove_tempfile(void)
2091 for (i
= 0; i
< 2; i
++)
2092 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
2093 unlink(diff_temp
[i
].name
);
2094 diff_temp
[i
].name
= NULL
;
2098 static void remove_tempfile_on_signal(int signo
)
2101 signal(SIGINT
, SIG_DFL
);
2105 /* An external diff command takes:
2107 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2108 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2111 static void run_external_diff(const char *pgm
,
2114 struct diff_filespec
*one
,
2115 struct diff_filespec
*two
,
2116 const char *xfrm_msg
,
2117 int complete_rewrite
)
2119 const char *spawn_arg
[10];
2120 struct diff_tempfile
*temp
= diff_temp
;
2122 static int atexit_asked
= 0;
2123 const char *othername
;
2124 const char **arg
= &spawn_arg
[0];
2126 othername
= (other
? other
: name
);
2128 prepare_temp_file(name
, &temp
[0], one
);
2129 prepare_temp_file(othername
, &temp
[1], two
);
2130 if (! atexit_asked
&&
2131 (temp
[0].name
== temp
[0].tmp_path
||
2132 temp
[1].name
== temp
[1].tmp_path
)) {
2134 atexit(remove_tempfile
);
2136 signal(SIGINT
, remove_tempfile_on_signal
);
2142 *arg
++ = temp
[0].name
;
2143 *arg
++ = temp
[0].hex
;
2144 *arg
++ = temp
[0].mode
;
2145 *arg
++ = temp
[1].name
;
2146 *arg
++ = temp
[1].hex
;
2147 *arg
++ = temp
[1].mode
;
2158 retval
= run_command_v_opt(spawn_arg
, 0);
2161 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2166 static const char *external_diff_attr(const char *name
)
2168 struct git_attr_check attr_diff_check
;
2173 setup_diff_attr_check(&attr_diff_check
);
2174 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
2175 const char *value
= attr_diff_check
.value
;
2176 if (!ATTR_TRUE(value
) &&
2177 !ATTR_FALSE(value
) &&
2178 !ATTR_UNSET(value
)) {
2179 struct ll_diff_driver
*drv
;
2181 for (drv
= user_diff
; drv
; drv
= drv
->next
)
2182 if (!strcmp(drv
->name
, value
))
2189 static int similarity_index(struct diff_filepair
*p
)
2191 return p
->score
* 100 / MAX_SCORE
;
2194 static void fill_metainfo(struct strbuf
*msg
,
2197 struct diff_filespec
*one
,
2198 struct diff_filespec
*two
,
2199 struct diff_options
*o
,
2200 struct diff_filepair
*p
)
2202 strbuf_init(msg
, PATH_MAX
* 2 + 300);
2203 switch (p
->status
) {
2204 case DIFF_STATUS_COPIED
:
2205 strbuf_addf(msg
, "similarity index %d%%", similarity_index(p
));
2206 strbuf_addstr(msg
, "\ncopy from ");
2207 quote_c_style(name
, msg
, NULL
, 0);
2208 strbuf_addstr(msg
, "\ncopy to ");
2209 quote_c_style(other
, msg
, NULL
, 0);
2210 strbuf_addch(msg
, '\n');
2212 case DIFF_STATUS_RENAMED
:
2213 strbuf_addf(msg
, "similarity index %d%%", similarity_index(p
));
2214 strbuf_addstr(msg
, "\nrename from ");
2215 quote_c_style(name
, msg
, NULL
, 0);
2216 strbuf_addstr(msg
, "\nrename to ");
2217 quote_c_style(other
, msg
, NULL
, 0);
2218 strbuf_addch(msg
, '\n');
2220 case DIFF_STATUS_MODIFIED
:
2222 strbuf_addf(msg
, "dissimilarity index %d%%\n",
2223 similarity_index(p
));
2231 if (one
&& two
&& hashcmp(one
->sha1
, two
->sha1
)) {
2232 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2234 if (DIFF_OPT_TST(o
, BINARY
)) {
2236 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2237 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2240 strbuf_addf(msg
, "index %.*s..%.*s",
2241 abbrev
, sha1_to_hex(one
->sha1
),
2242 abbrev
, sha1_to_hex(two
->sha1
));
2243 if (one
->mode
== two
->mode
)
2244 strbuf_addf(msg
, " %06o", one
->mode
);
2245 strbuf_addch(msg
, '\n');
2248 strbuf_setlen(msg
, msg
->len
- 1);
2251 static void run_diff_cmd(const char *pgm
,
2254 const char *attr_path
,
2255 struct diff_filespec
*one
,
2256 struct diff_filespec
*two
,
2258 struct diff_options
*o
,
2259 struct diff_filepair
*p
)
2261 const char *xfrm_msg
= NULL
;
2262 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
2265 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
);
2266 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
2269 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2272 const char *cmd
= external_diff_attr(attr_path
);
2278 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2283 builtin_diff(name
, other
? other
: name
,
2284 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2286 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2289 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2291 if (DIFF_FILE_VALID(one
)) {
2292 if (!one
->sha1_valid
) {
2294 if (!strcmp(one
->path
, "-")) {
2295 hashcpy(one
->sha1
, null_sha1
);
2298 if (lstat(one
->path
, &st
) < 0)
2299 die("stat %s", one
->path
);
2300 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2301 die("cannot hash %s\n", one
->path
);
2308 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2310 /* Strip the prefix but do not molest /dev/null and absolute paths */
2311 if (*namep
&& **namep
!= '/')
2312 *namep
+= prefix_length
;
2313 if (*otherp
&& **otherp
!= '/')
2314 *otherp
+= prefix_length
;
2317 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2319 const char *pgm
= external_diff();
2321 struct diff_filespec
*one
= p
->one
;
2322 struct diff_filespec
*two
= p
->two
;
2325 const char *attr_path
;
2327 name
= p
->one
->path
;
2328 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2330 if (o
->prefix_length
)
2331 strip_prefix(o
->prefix_length
, &name
, &other
);
2333 if (DIFF_PAIR_UNMERGED(p
)) {
2334 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2335 NULL
, NULL
, NULL
, o
, p
);
2339 diff_fill_sha1_info(one
);
2340 diff_fill_sha1_info(two
);
2343 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2344 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2346 * a filepair that changes between file and symlink
2347 * needs to be split into deletion and creation.
2349 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2350 run_diff_cmd(NULL
, name
, other
, attr_path
,
2351 one
, null
, &msg
, o
, p
);
2353 strbuf_release(&msg
);
2355 null
= alloc_filespec(one
->path
);
2356 run_diff_cmd(NULL
, name
, other
, attr_path
,
2357 null
, two
, &msg
, o
, p
);
2361 run_diff_cmd(pgm
, name
, other
, attr_path
,
2362 one
, two
, &msg
, o
, p
);
2364 strbuf_release(&msg
);
2367 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2368 struct diffstat_t
*diffstat
)
2372 int complete_rewrite
= 0;
2374 if (DIFF_PAIR_UNMERGED(p
)) {
2376 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2380 name
= p
->one
->path
;
2381 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2383 if (o
->prefix_length
)
2384 strip_prefix(o
->prefix_length
, &name
, &other
);
2386 diff_fill_sha1_info(p
->one
);
2387 diff_fill_sha1_info(p
->two
);
2389 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2390 complete_rewrite
= 1;
2391 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2394 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2398 const char *attr_path
;
2400 if (DIFF_PAIR_UNMERGED(p
)) {
2405 name
= p
->one
->path
;
2406 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2407 attr_path
= other
? other
: name
;
2409 if (o
->prefix_length
)
2410 strip_prefix(o
->prefix_length
, &name
, &other
);
2412 diff_fill_sha1_info(p
->one
);
2413 diff_fill_sha1_info(p
->two
);
2415 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2418 void diff_setup(struct diff_options
*options
)
2420 memset(options
, 0, sizeof(*options
));
2422 options
->file
= stdout
;
2424 options
->line_termination
= '\n';
2425 options
->break_opt
= -1;
2426 options
->rename_limit
= -1;
2427 options
->dirstat_percent
= 3;
2428 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
2429 options
->context
= 3;
2431 options
->change
= diff_change
;
2432 options
->add_remove
= diff_addremove
;
2433 if (diff_use_color_default
> 0)
2434 DIFF_OPT_SET(options
, COLOR_DIFF
);
2436 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2437 options
->detect_rename
= diff_detect_rename_default
;
2439 options
->a_prefix
= "a/";
2440 options
->b_prefix
= "b/";
2443 int diff_setup_done(struct diff_options
*options
)
2447 if (options
->output_format
& DIFF_FORMAT_NAME
)
2449 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2451 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2453 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2456 die("--name-only, --name-status, --check and -s are mutually exclusive");
2458 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2459 options
->detect_rename
= DIFF_DETECT_COPY
;
2461 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2462 options
->prefix
= NULL
;
2463 if (options
->prefix
)
2464 options
->prefix_length
= strlen(options
->prefix
);
2466 options
->prefix_length
= 0;
2468 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2469 DIFF_FORMAT_NAME_STATUS
|
2470 DIFF_FORMAT_CHECKDIFF
|
2471 DIFF_FORMAT_NO_OUTPUT
))
2472 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2473 DIFF_FORMAT_NUMSTAT
|
2474 DIFF_FORMAT_DIFFSTAT
|
2475 DIFF_FORMAT_SHORTSTAT
|
2476 DIFF_FORMAT_DIRSTAT
|
2477 DIFF_FORMAT_SUMMARY
|
2481 * These cases always need recursive; we do not drop caller-supplied
2482 * recursive bits for other formats here.
2484 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2485 DIFF_FORMAT_NUMSTAT
|
2486 DIFF_FORMAT_DIFFSTAT
|
2487 DIFF_FORMAT_SHORTSTAT
|
2488 DIFF_FORMAT_DIRSTAT
|
2489 DIFF_FORMAT_SUMMARY
|
2490 DIFF_FORMAT_CHECKDIFF
))
2491 DIFF_OPT_SET(options
, RECURSIVE
);
2493 * Also pickaxe would not work very well if you do not say recursive
2495 if (options
->pickaxe
)
2496 DIFF_OPT_SET(options
, RECURSIVE
);
2498 if (options
->detect_rename
&& options
->rename_limit
< 0)
2499 options
->rename_limit
= diff_rename_limit_default
;
2500 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2502 /* read-cache does not die even when it fails
2503 * so it is safe for us to do this here. Also
2504 * it does not smudge active_cache or active_nr
2505 * when it fails, so we do not have to worry about
2506 * cleaning it up ourselves either.
2510 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2511 options
->abbrev
= 40; /* full */
2514 * It does not make sense to show the first hit we happened
2515 * to have found. It does not make sense not to return with
2516 * exit code in such a case either.
2518 if (DIFF_OPT_TST(options
, QUIET
)) {
2519 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2520 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2526 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2536 if (c
== arg_short
) {
2540 if (val
&& isdigit(c
)) {
2542 int n
= strtoul(arg
, &end
, 10);
2553 eq
= strchr(arg
, '=');
2558 if (!len
|| strncmp(arg
, arg_long
, len
))
2563 if (!isdigit(*++eq
))
2565 n
= strtoul(eq
, &end
, 10);
2573 static int diff_scoreopt_parse(const char *opt
);
2575 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2577 const char *arg
= av
[0];
2579 /* Output format options */
2580 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2581 options
->output_format
|= DIFF_FORMAT_PATCH
;
2582 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2583 options
->output_format
|= DIFF_FORMAT_PATCH
;
2584 else if (!strcmp(arg
, "--raw"))
2585 options
->output_format
|= DIFF_FORMAT_RAW
;
2586 else if (!strcmp(arg
, "--patch-with-raw"))
2587 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2588 else if (!strcmp(arg
, "--numstat"))
2589 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2590 else if (!strcmp(arg
, "--shortstat"))
2591 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2592 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2593 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2594 else if (!strcmp(arg
, "--cumulative")) {
2595 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2596 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
2598 else if (!strcmp(arg
, "--check"))
2599 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2600 else if (!strcmp(arg
, "--summary"))
2601 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2602 else if (!strcmp(arg
, "--patch-with-stat"))
2603 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2604 else if (!strcmp(arg
, "--name-only"))
2605 options
->output_format
|= DIFF_FORMAT_NAME
;
2606 else if (!strcmp(arg
, "--name-status"))
2607 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2608 else if (!strcmp(arg
, "-s"))
2609 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2610 else if (!prefixcmp(arg
, "--stat")) {
2612 int width
= options
->stat_width
;
2613 int name_width
= options
->stat_name_width
;
2619 if (!prefixcmp(arg
, "-width="))
2620 width
= strtoul(arg
+ 7, &end
, 10);
2621 else if (!prefixcmp(arg
, "-name-width="))
2622 name_width
= strtoul(arg
+ 12, &end
, 10);
2625 width
= strtoul(arg
+1, &end
, 10);
2627 name_width
= strtoul(end
+1, &end
, 10);
2630 /* Important! This checks all the error cases! */
2633 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2634 options
->stat_name_width
= name_width
;
2635 options
->stat_width
= width
;
2638 /* renames options */
2639 else if (!prefixcmp(arg
, "-B")) {
2640 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2643 else if (!prefixcmp(arg
, "-M")) {
2644 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2646 options
->detect_rename
= DIFF_DETECT_RENAME
;
2648 else if (!prefixcmp(arg
, "-C")) {
2649 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2650 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2651 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2653 options
->detect_rename
= DIFF_DETECT_COPY
;
2655 else if (!strcmp(arg
, "--no-renames"))
2656 options
->detect_rename
= 0;
2657 else if (!strcmp(arg
, "--relative"))
2658 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2659 else if (!prefixcmp(arg
, "--relative=")) {
2660 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2661 options
->prefix
= arg
+ 11;
2665 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2666 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2667 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2668 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2669 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2670 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2673 else if (!strcmp(arg
, "--binary")) {
2674 options
->output_format
|= DIFF_FORMAT_PATCH
;
2675 DIFF_OPT_SET(options
, BINARY
);
2677 else if (!strcmp(arg
, "--full-index"))
2678 DIFF_OPT_SET(options
, FULL_INDEX
);
2679 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2680 DIFF_OPT_SET(options
, TEXT
);
2681 else if (!strcmp(arg
, "-R"))
2682 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2683 else if (!strcmp(arg
, "--find-copies-harder"))
2684 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2685 else if (!strcmp(arg
, "--follow"))
2686 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2687 else if (!strcmp(arg
, "--color"))
2688 DIFF_OPT_SET(options
, COLOR_DIFF
);
2689 else if (!strcmp(arg
, "--no-color"))
2690 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2691 else if (!strcmp(arg
, "--color-words"))
2692 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2693 else if (!strcmp(arg
, "--exit-code"))
2694 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2695 else if (!strcmp(arg
, "--quiet"))
2696 DIFF_OPT_SET(options
, QUIET
);
2697 else if (!strcmp(arg
, "--ext-diff"))
2698 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2699 else if (!strcmp(arg
, "--no-ext-diff"))
2700 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2701 else if (!strcmp(arg
, "--ignore-submodules"))
2702 DIFF_OPT_SET(options
, IGNORE_SUBMODULES
);
2705 else if (!strcmp(arg
, "-z"))
2706 options
->line_termination
= 0;
2707 else if (!prefixcmp(arg
, "-l"))
2708 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2709 else if (!prefixcmp(arg
, "-S"))
2710 options
->pickaxe
= arg
+ 2;
2711 else if (!strcmp(arg
, "--pickaxe-all"))
2712 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2713 else if (!strcmp(arg
, "--pickaxe-regex"))
2714 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2715 else if (!prefixcmp(arg
, "-O"))
2716 options
->orderfile
= arg
+ 2;
2717 else if (!prefixcmp(arg
, "--diff-filter="))
2718 options
->filter
= arg
+ 14;
2719 else if (!strcmp(arg
, "--abbrev"))
2720 options
->abbrev
= DEFAULT_ABBREV
;
2721 else if (!prefixcmp(arg
, "--abbrev=")) {
2722 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2723 if (options
->abbrev
< MINIMUM_ABBREV
)
2724 options
->abbrev
= MINIMUM_ABBREV
;
2725 else if (40 < options
->abbrev
)
2726 options
->abbrev
= 40;
2728 else if (!prefixcmp(arg
, "--src-prefix="))
2729 options
->a_prefix
= arg
+ 13;
2730 else if (!prefixcmp(arg
, "--dst-prefix="))
2731 options
->b_prefix
= arg
+ 13;
2732 else if (!strcmp(arg
, "--no-prefix"))
2733 options
->a_prefix
= options
->b_prefix
= "";
2734 else if (!prefixcmp(arg
, "--output=")) {
2735 options
->file
= fopen(arg
+ strlen("--output="), "w");
2736 options
->close_file
= 1;
2742 static int parse_num(const char **cp_p
)
2744 unsigned long num
, scale
;
2746 const char *cp
= *cp_p
;
2753 if ( !dot
&& ch
== '.' ) {
2756 } else if ( ch
== '%' ) {
2757 scale
= dot
? scale
*100 : 100;
2758 cp
++; /* % is always at the end */
2760 } else if ( ch
>= '0' && ch
<= '9' ) {
2761 if ( scale
< 100000 ) {
2763 num
= (num
*10) + (ch
-'0');
2772 /* user says num divided by scale and we say internally that
2773 * is MAX_SCORE * num / scale.
2775 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2778 static int diff_scoreopt_parse(const char *opt
)
2780 int opt1
, opt2
, cmd
;
2785 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2786 return -1; /* that is not a -M, -C nor -B option */
2788 opt1
= parse_num(&opt
);
2794 else if (*opt
!= '/')
2795 return -1; /* we expect -B80/99 or -B80 */
2798 opt2
= parse_num(&opt
);
2803 return opt1
| (opt2
<< 16);
2806 struct diff_queue_struct diff_queued_diff
;
2808 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2810 if (queue
->alloc
<= queue
->nr
) {
2811 queue
->alloc
= alloc_nr(queue
->alloc
);
2812 queue
->queue
= xrealloc(queue
->queue
,
2813 sizeof(dp
) * queue
->alloc
);
2815 queue
->queue
[queue
->nr
++] = dp
;
2818 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2819 struct diff_filespec
*one
,
2820 struct diff_filespec
*two
)
2822 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2830 void diff_free_filepair(struct diff_filepair
*p
)
2832 free_filespec(p
->one
);
2833 free_filespec(p
->two
);
2837 /* This is different from find_unique_abbrev() in that
2838 * it stuffs the result with dots for alignment.
2840 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2845 return sha1_to_hex(sha1
);
2847 abbrev
= find_unique_abbrev(sha1
, len
);
2848 abblen
= strlen(abbrev
);
2850 static char hex
[41];
2851 if (len
< abblen
&& abblen
<= len
+ 2)
2852 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2854 sprintf(hex
, "%s...", abbrev
);
2857 return sha1_to_hex(sha1
);
2860 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2862 int line_termination
= opt
->line_termination
;
2863 int inter_name_termination
= line_termination
? '\t' : '\0';
2865 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2866 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2867 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2868 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2871 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
2872 inter_name_termination
);
2874 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
2877 if (p
->status
== DIFF_STATUS_COPIED
||
2878 p
->status
== DIFF_STATUS_RENAMED
) {
2879 const char *name_a
, *name_b
;
2880 name_a
= p
->one
->path
;
2881 name_b
= p
->two
->path
;
2882 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2883 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
2884 write_name_quoted(name_b
, opt
->file
, line_termination
);
2886 const char *name_a
, *name_b
;
2887 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2889 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2890 write_name_quoted(name_a
, opt
->file
, line_termination
);
2894 int diff_unmodified_pair(struct diff_filepair
*p
)
2896 /* This function is written stricter than necessary to support
2897 * the currently implemented transformers, but the idea is to
2898 * let transformers to produce diff_filepairs any way they want,
2899 * and filter and clean them up here before producing the output.
2901 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2903 if (DIFF_PAIR_UNMERGED(p
))
2904 return 0; /* unmerged is interesting */
2906 /* deletion, addition, mode or type change
2907 * and rename are all interesting.
2909 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2910 DIFF_PAIR_MODE_CHANGED(p
) ||
2911 strcmp(one
->path
, two
->path
))
2914 /* both are valid and point at the same path. that is, we are
2915 * dealing with a change.
2917 if (one
->sha1_valid
&& two
->sha1_valid
&&
2918 !hashcmp(one
->sha1
, two
->sha1
))
2919 return 1; /* no change */
2920 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2921 return 1; /* both look at the same file on the filesystem. */
2925 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2927 if (diff_unmodified_pair(p
))
2930 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2931 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2932 return; /* no tree diffs in patch format */
2937 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2938 struct diffstat_t
*diffstat
)
2940 if (diff_unmodified_pair(p
))
2943 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2944 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2945 return; /* no tree diffs in patch format */
2947 run_diffstat(p
, o
, diffstat
);
2950 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2951 struct diff_options
*o
)
2953 if (diff_unmodified_pair(p
))
2956 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2957 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2958 return; /* no tree diffs in patch format */
2960 run_checkdiff(p
, o
);
2963 int diff_queue_is_empty(void)
2965 struct diff_queue_struct
*q
= &diff_queued_diff
;
2967 for (i
= 0; i
< q
->nr
; i
++)
2968 if (!diff_unmodified_pair(q
->queue
[i
]))
2974 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2976 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2979 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2981 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2982 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2984 s
->size
, s
->xfrm_flags
);
2987 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2989 diff_debug_filespec(p
->one
, i
, "one");
2990 diff_debug_filespec(p
->two
, i
, "two");
2991 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2992 p
->score
, p
->status
? p
->status
: '?',
2993 p
->one
->rename_used
, p
->broken_pair
);
2996 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
3000 fprintf(stderr
, "%s\n", msg
);
3001 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
3002 for (i
= 0; i
< q
->nr
; i
++) {
3003 struct diff_filepair
*p
= q
->queue
[i
];
3004 diff_debug_filepair(p
, i
);
3009 static void diff_resolve_rename_copy(void)
3012 struct diff_filepair
*p
;
3013 struct diff_queue_struct
*q
= &diff_queued_diff
;
3015 diff_debug_queue("resolve-rename-copy", q
);
3017 for (i
= 0; i
< q
->nr
; i
++) {
3019 p
->status
= 0; /* undecided */
3020 if (DIFF_PAIR_UNMERGED(p
))
3021 p
->status
= DIFF_STATUS_UNMERGED
;
3022 else if (!DIFF_FILE_VALID(p
->one
))
3023 p
->status
= DIFF_STATUS_ADDED
;
3024 else if (!DIFF_FILE_VALID(p
->two
))
3025 p
->status
= DIFF_STATUS_DELETED
;
3026 else if (DIFF_PAIR_TYPE_CHANGED(p
))
3027 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
3029 /* from this point on, we are dealing with a pair
3030 * whose both sides are valid and of the same type, i.e.
3031 * either in-place edit or rename/copy edit.
3033 else if (DIFF_PAIR_RENAME(p
)) {
3035 * A rename might have re-connected a broken
3036 * pair up, causing the pathnames to be the
3037 * same again. If so, that's not a rename at
3038 * all, just a modification..
3040 * Otherwise, see if this source was used for
3041 * multiple renames, in which case we decrement
3042 * the count, and call it a copy.
3044 if (!strcmp(p
->one
->path
, p
->two
->path
))
3045 p
->status
= DIFF_STATUS_MODIFIED
;
3046 else if (--p
->one
->rename_used
> 0)
3047 p
->status
= DIFF_STATUS_COPIED
;
3049 p
->status
= DIFF_STATUS_RENAMED
;
3051 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
3052 p
->one
->mode
!= p
->two
->mode
||
3053 is_null_sha1(p
->one
->sha1
))
3054 p
->status
= DIFF_STATUS_MODIFIED
;
3056 /* This is a "no-change" entry and should not
3057 * happen anymore, but prepare for broken callers.
3059 error("feeding unmodified %s to diffcore",
3061 p
->status
= DIFF_STATUS_UNKNOWN
;
3064 diff_debug_queue("resolve-rename-copy done", q
);
3067 static int check_pair_status(struct diff_filepair
*p
)
3069 switch (p
->status
) {
3070 case DIFF_STATUS_UNKNOWN
:
3073 die("internal error in diff-resolve-rename-copy");
3079 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
3081 int fmt
= opt
->output_format
;
3083 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
3084 diff_flush_checkdiff(p
, opt
);
3085 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
3086 diff_flush_raw(p
, opt
);
3087 else if (fmt
& DIFF_FORMAT_NAME
) {
3088 const char *name_a
, *name_b
;
3089 name_a
= p
->two
->path
;
3091 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3092 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
3096 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
3099 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
3101 fprintf(file
, " %s ", newdelete
);
3102 write_name_quoted(fs
->path
, file
, '\n');
3106 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
)
3108 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
3109 fprintf(file
, " mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
3110 show_name
? ' ' : '\n');
3112 write_name_quoted(p
->two
->path
, file
, '\n');
3117 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
)
3119 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
3121 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
3123 show_mode_change(file
, p
, 0);
3126 static void diff_summary(FILE *file
, struct diff_filepair
*p
)
3129 case DIFF_STATUS_DELETED
:
3130 show_file_mode_name(file
, "delete", p
->one
);
3132 case DIFF_STATUS_ADDED
:
3133 show_file_mode_name(file
, "create", p
->two
);
3135 case DIFF_STATUS_COPIED
:
3136 show_rename_copy(file
, "copy", p
);
3138 case DIFF_STATUS_RENAMED
:
3139 show_rename_copy(file
, "rename", p
);
3143 fputs(" rewrite ", file
);
3144 write_name_quoted(p
->two
->path
, file
, ' ');
3145 fprintf(file
, "(%d%%)\n", similarity_index(p
));
3147 show_mode_change(file
, p
, !p
->score
);
3153 struct xdiff_emit_state xm
;
3158 static int remove_space(char *line
, int len
)
3164 for (i
= 0; i
< len
; i
++)
3165 if (!isspace((c
= line
[i
])))
3171 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3173 struct patch_id_t
*data
= priv
;
3176 /* Ignore line numbers when computing the SHA1 of the patch */
3177 if (!prefixcmp(line
, "@@ -"))
3180 new_len
= remove_space(line
, len
);
3182 SHA1_Update(data
->ctx
, line
, new_len
);
3183 data
->patchlen
+= new_len
;
3186 /* returns 0 upon success, and writes result into sha1 */
3187 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3189 struct diff_queue_struct
*q
= &diff_queued_diff
;
3192 struct patch_id_t data
;
3193 char buffer
[PATH_MAX
* 4 + 20];
3196 memset(&data
, 0, sizeof(struct patch_id_t
));
3198 data
.xm
.consume
= patch_id_consume
;
3200 for (i
= 0; i
< q
->nr
; i
++) {
3205 struct diff_filepair
*p
= q
->queue
[i
];
3208 memset(&xecfg
, 0, sizeof(xecfg
));
3210 return error("internal diff status error");
3211 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3213 if (diff_unmodified_pair(p
))
3215 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3216 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3218 if (DIFF_PAIR_UNMERGED(p
))
3221 diff_fill_sha1_info(p
->one
);
3222 diff_fill_sha1_info(p
->two
);
3223 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3224 fill_mmfile(&mf2
, p
->two
) < 0)
3225 return error("unable to read files to diff");
3227 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3228 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3229 if (p
->one
->mode
== 0)
3230 len1
= snprintf(buffer
, sizeof(buffer
),
3231 "diff--gita/%.*sb/%.*s"
3238 len2
, p
->two
->path
);
3239 else if (p
->two
->mode
== 0)
3240 len1
= snprintf(buffer
, sizeof(buffer
),
3241 "diff--gita/%.*sb/%.*s"
3242 "deletedfilemode%06o"
3248 len1
, p
->one
->path
);
3250 len1
= snprintf(buffer
, sizeof(buffer
),
3251 "diff--gita/%.*sb/%.*s"
3257 len2
, p
->two
->path
);
3258 SHA1_Update(&ctx
, buffer
, len1
);
3260 xpp
.flags
= XDF_NEED_MINIMAL
;
3262 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3263 ecb
.outf
= xdiff_outf
;
3265 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
3268 SHA1_Final(sha1
, &ctx
);
3272 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3274 struct diff_queue_struct
*q
= &diff_queued_diff
;
3276 int result
= diff_get_patch_id(options
, sha1
);
3278 for (i
= 0; i
< q
->nr
; i
++)
3279 diff_free_filepair(q
->queue
[i
]);
3283 q
->nr
= q
->alloc
= 0;
3288 static int is_summary_empty(const struct diff_queue_struct
*q
)
3292 for (i
= 0; i
< q
->nr
; i
++) {
3293 const struct diff_filepair
*p
= q
->queue
[i
];
3295 switch (p
->status
) {
3296 case DIFF_STATUS_DELETED
:
3297 case DIFF_STATUS_ADDED
:
3298 case DIFF_STATUS_COPIED
:
3299 case DIFF_STATUS_RENAMED
:
3304 if (p
->one
->mode
&& p
->two
->mode
&&
3305 p
->one
->mode
!= p
->two
->mode
)
3313 void diff_flush(struct diff_options
*options
)
3315 struct diff_queue_struct
*q
= &diff_queued_diff
;
3316 int i
, output_format
= options
->output_format
;
3320 * Order: raw, stat, summary, patch
3321 * or: name/name-status/checkdiff (other bits clear)
3326 if (output_format
& (DIFF_FORMAT_RAW
|
3328 DIFF_FORMAT_NAME_STATUS
|
3329 DIFF_FORMAT_CHECKDIFF
)) {
3330 for (i
= 0; i
< q
->nr
; i
++) {
3331 struct diff_filepair
*p
= q
->queue
[i
];
3332 if (check_pair_status(p
))
3333 flush_one_pair(p
, options
);
3338 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3339 struct diffstat_t diffstat
;
3341 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3342 diffstat
.xm
.consume
= diffstat_consume
;
3343 for (i
= 0; i
< q
->nr
; i
++) {
3344 struct diff_filepair
*p
= q
->queue
[i
];
3345 if (check_pair_status(p
))
3346 diff_flush_stat(p
, options
, &diffstat
);
3348 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3349 show_numstat(&diffstat
, options
);
3350 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3351 show_stats(&diffstat
, options
);
3352 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3353 show_shortstats(&diffstat
, options
);
3354 free_diffstat_info(&diffstat
);
3357 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3358 show_dirstat(options
);
3360 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3361 for (i
= 0; i
< q
->nr
; i
++)
3362 diff_summary(options
->file
, q
->queue
[i
]);
3366 if (output_format
& DIFF_FORMAT_PATCH
) {
3368 putc(options
->line_termination
, options
->file
);
3369 if (options
->stat_sep
) {
3370 /* attach patch instead of inline */
3371 fputs(options
->stat_sep
, options
->file
);
3375 for (i
= 0; i
< q
->nr
; i
++) {
3376 struct diff_filepair
*p
= q
->queue
[i
];
3377 if (check_pair_status(p
))
3378 diff_flush_patch(p
, options
);
3382 if (output_format
& DIFF_FORMAT_CALLBACK
)
3383 options
->format_callback(q
, options
, options
->format_callback_data
);
3385 for (i
= 0; i
< q
->nr
; i
++)
3386 diff_free_filepair(q
->queue
[i
]);
3390 q
->nr
= q
->alloc
= 0;
3391 if (options
->close_file
)
3392 fclose(options
->file
);
3395 static void diffcore_apply_filter(const char *filter
)
3398 struct diff_queue_struct
*q
= &diff_queued_diff
;
3399 struct diff_queue_struct outq
;
3401 outq
.nr
= outq
.alloc
= 0;
3406 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3408 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3409 struct diff_filepair
*p
= q
->queue
[i
];
3410 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3412 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3414 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3415 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3416 strchr(filter
, p
->status
)))
3422 /* otherwise we will clear the whole queue
3423 * by copying the empty outq at the end of this
3424 * function, but first clear the current entries
3427 for (i
= 0; i
< q
->nr
; i
++)
3428 diff_free_filepair(q
->queue
[i
]);
3431 /* Only the matching ones */
3432 for (i
= 0; i
< q
->nr
; i
++) {
3433 struct diff_filepair
*p
= q
->queue
[i
];
3435 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3437 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3439 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3440 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3441 strchr(filter
, p
->status
)))
3444 diff_free_filepair(p
);
3451 /* Check whether two filespecs with the same mode and size are identical */
3452 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3453 struct diff_filespec
*two
)
3455 if (S_ISGITLINK(one
->mode
))
3457 if (diff_populate_filespec(one
, 0))
3459 if (diff_populate_filespec(two
, 0))
3461 return !memcmp(one
->data
, two
->data
, one
->size
);
3464 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3467 struct diff_queue_struct
*q
= &diff_queued_diff
;
3468 struct diff_queue_struct outq
;
3470 outq
.nr
= outq
.alloc
= 0;
3472 for (i
= 0; i
< q
->nr
; i
++) {
3473 struct diff_filepair
*p
= q
->queue
[i
];
3476 * 1. Entries that come from stat info dirtyness
3477 * always have both sides (iow, not create/delete),
3478 * one side of the object name is unknown, with
3479 * the same mode and size. Keep the ones that
3480 * do not match these criteria. They have real
3483 * 2. At this point, the file is known to be modified,
3484 * with the same mode and size, and the object
3485 * name of one side is unknown. Need to inspect
3486 * the identical contents.
3488 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3489 !DIFF_FILE_VALID(p
->two
) ||
3490 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3491 (p
->one
->mode
!= p
->two
->mode
) ||
3492 diff_populate_filespec(p
->one
, 1) ||
3493 diff_populate_filespec(p
->two
, 1) ||
3494 (p
->one
->size
!= p
->two
->size
) ||
3495 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3499 * The caller can subtract 1 from skip_stat_unmatch
3500 * to determine how many paths were dirty only
3501 * due to stat info mismatch.
3503 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3504 diffopt
->skip_stat_unmatch
++;
3505 diff_free_filepair(p
);
3512 void diffcore_std(struct diff_options
*options
)
3514 if (options
->skip_stat_unmatch
)
3515 diffcore_skip_stat_unmatch(options
);
3516 if (options
->break_opt
!= -1)
3517 diffcore_break(options
->break_opt
);
3518 if (options
->detect_rename
)
3519 diffcore_rename(options
);
3520 if (options
->break_opt
!= -1)
3521 diffcore_merge_broken();
3522 if (options
->pickaxe
)
3523 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3524 if (options
->orderfile
)
3525 diffcore_order(options
->orderfile
);
3526 diff_resolve_rename_copy();
3527 diffcore_apply_filter(options
->filter
);
3529 if (diff_queued_diff
.nr
)
3530 DIFF_OPT_SET(options
, HAS_CHANGES
);
3532 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3535 int diff_result_code(struct diff_options
*opt
, int status
)
3538 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3539 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3541 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3542 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3544 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3545 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3550 void diff_addremove(struct diff_options
*options
,
3551 int addremove
, unsigned mode
,
3552 const unsigned char *sha1
,
3553 const char *concatpath
)
3555 struct diff_filespec
*one
, *two
;
3557 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(mode
))
3560 /* This may look odd, but it is a preparation for
3561 * feeding "there are unchanged files which should
3562 * not produce diffs, but when you are doing copy
3563 * detection you would need them, so here they are"
3564 * entries to the diff-core. They will be prefixed
3565 * with something like '=' or '*' (I haven't decided
3566 * which but should not make any difference).
3567 * Feeding the same new and old to diff_change()
3568 * also has the same effect.
3569 * Before the final output happens, they are pruned after
3570 * merged into rename/copy pairs as appropriate.
3572 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3573 addremove
= (addremove
== '+' ? '-' :
3574 addremove
== '-' ? '+' : addremove
);
3576 if (options
->prefix
&&
3577 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3580 one
= alloc_filespec(concatpath
);
3581 two
= alloc_filespec(concatpath
);
3583 if (addremove
!= '+')
3584 fill_filespec(one
, sha1
, mode
);
3585 if (addremove
!= '-')
3586 fill_filespec(two
, sha1
, mode
);
3588 diff_queue(&diff_queued_diff
, one
, two
);
3589 DIFF_OPT_SET(options
, HAS_CHANGES
);
3592 void diff_change(struct diff_options
*options
,
3593 unsigned old_mode
, unsigned new_mode
,
3594 const unsigned char *old_sha1
,
3595 const unsigned char *new_sha1
,
3596 const char *concatpath
)
3598 struct diff_filespec
*one
, *two
;
3600 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(old_mode
)
3601 && S_ISGITLINK(new_mode
))
3604 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3606 const unsigned char *tmp_c
;
3607 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3608 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3611 if (options
->prefix
&&
3612 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3615 one
= alloc_filespec(concatpath
);
3616 two
= alloc_filespec(concatpath
);
3617 fill_filespec(one
, old_sha1
, old_mode
);
3618 fill_filespec(two
, new_sha1
, new_mode
);
3620 diff_queue(&diff_queued_diff
, one
, two
);
3621 DIFF_OPT_SET(options
, HAS_CHANGES
);
3624 void diff_unmerge(struct diff_options
*options
,
3626 unsigned mode
, const unsigned char *sha1
)
3628 struct diff_filespec
*one
, *two
;
3630 if (options
->prefix
&&
3631 strncmp(path
, options
->prefix
, options
->prefix_length
))
3634 one
= alloc_filespec(path
);
3635 two
= alloc_filespec(path
);
3636 fill_filespec(one
, sha1
, mode
);
3637 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;