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;
26 static int diff_mnemonic_prefix
;
28 static char diff_colors
[][COLOR_MAXLEN
] = {
30 "", /* PLAIN (normal) */
31 "\033[1m", /* METAINFO (bold) */
32 "\033[36m", /* FRAGINFO (cyan) */
33 "\033[31m", /* OLD (red) */
34 "\033[32m", /* NEW (green) */
35 "\033[33m", /* COMMIT (yellow) */
36 "\033[41m", /* WHITESPACE (red background) */
39 static int parse_diff_color_slot(const char *var
, int ofs
)
41 if (!strcasecmp(var
+ofs
, "plain"))
43 if (!strcasecmp(var
+ofs
, "meta"))
45 if (!strcasecmp(var
+ofs
, "frag"))
47 if (!strcasecmp(var
+ofs
, "old"))
49 if (!strcasecmp(var
+ofs
, "new"))
51 if (!strcasecmp(var
+ofs
, "commit"))
53 if (!strcasecmp(var
+ofs
, "whitespace"))
54 return DIFF_WHITESPACE
;
55 die("bad config variable '%s'", var
);
58 static struct ll_diff_driver
{
60 struct ll_diff_driver
*next
;
62 } *user_diff
, **user_diff_tail
;
65 * Currently there is only "diff.<drivername>.command" variable;
66 * because there are "diff.color.<slot>" variables, we are parsing
67 * this in a bit convoluted way to allow low level diff driver
70 static int parse_lldiff_command(const char *var
, const char *ep
, const char *value
)
74 struct ll_diff_driver
*drv
;
78 for (drv
= user_diff
; drv
; drv
= drv
->next
)
79 if (!strncmp(drv
->name
, name
, namelen
) && !drv
->name
[namelen
])
82 drv
= xcalloc(1, sizeof(struct ll_diff_driver
));
83 drv
->name
= xmemdupz(name
, namelen
);
85 user_diff_tail
= &user_diff
;
86 *user_diff_tail
= drv
;
87 user_diff_tail
= &(drv
->next
);
90 return git_config_string(&(drv
->cmd
), var
, value
);
94 * 'diff.<what>.funcname' attribute can be specified in the configuration
95 * to define a customized regexp to find the beginning of a function to
96 * be used for hunk header lines of "diff -p" style output.
98 static struct funcname_pattern
{
101 struct funcname_pattern
*next
;
102 } *funcname_pattern_list
;
104 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
)
108 struct funcname_pattern
*pp
;
110 name
= var
+ 5; /* "diff." */
113 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
114 if (!strncmp(pp
->name
, name
, namelen
) && !pp
->name
[namelen
])
117 pp
= xcalloc(1, sizeof(*pp
));
118 pp
->name
= xmemdupz(name
, namelen
);
119 pp
->next
= funcname_pattern_list
;
120 funcname_pattern_list
= pp
;
123 pp
->pattern
= xstrdup(value
);
128 * These are to give UI layer defaults.
129 * The core-level commands such as git-diff-files should
130 * never be affected by the setting of diff.renames
131 * the user happens to have in the configuration file.
133 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
135 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
136 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
139 if (!strcmp(var
, "diff.renames")) {
141 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
142 else if (!strcasecmp(value
, "copies") ||
143 !strcasecmp(value
, "copy"))
144 diff_detect_rename_default
= DIFF_DETECT_COPY
;
145 else if (git_config_bool(var
,value
))
146 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
149 if (!strcmp(var
, "diff.autorefreshindex")) {
150 diff_auto_refresh_index
= git_config_bool(var
, value
);
153 if (!strcmp(var
, "diff.mnemonicprefix")) {
154 diff_mnemonic_prefix
= 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
);
195 return git_color_default_config(var
, value
, cb
);
198 static char *quote_two(const char *one
, const char *two
)
200 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
201 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
204 strbuf_init(&res
, 0);
205 if (need_one
+ need_two
) {
206 strbuf_addch(&res
, '"');
207 quote_c_style(one
, &res
, NULL
, 1);
208 quote_c_style(two
, &res
, NULL
, 1);
209 strbuf_addch(&res
, '"');
211 strbuf_addstr(&res
, one
);
212 strbuf_addstr(&res
, two
);
214 return strbuf_detach(&res
, NULL
);
217 static const char *external_diff(void)
219 static const char *external_diff_cmd
= NULL
;
220 static int done_preparing
= 0;
223 return external_diff_cmd
;
224 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
225 if (!external_diff_cmd
)
226 external_diff_cmd
= external_diff_cmd_cfg
;
228 return external_diff_cmd
;
231 static struct diff_tempfile
{
232 const char *name
; /* filename external diff should read from */
235 char tmp_path
[PATH_MAX
];
238 static int count_lines(const char *data
, int size
)
240 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
247 completely_empty
= 0;
251 completely_empty
= 0;
254 if (completely_empty
)
257 count
++; /* no trailing newline */
261 static void print_line_count(FILE *file
, int count
)
265 fprintf(file
, "0,0");
271 fprintf(file
, "1,%d", count
);
276 static void copy_file_with_prefix(FILE *file
,
277 int prefix
, const char *data
, int size
,
278 const char *set
, const char *reset
)
280 int ch
, nl_just_seen
= 1;
295 fprintf(file
, "%s\n\\ No newline at end of file\n", reset
);
298 static void emit_rewrite_diff(const char *name_a
,
300 struct diff_filespec
*one
,
301 struct diff_filespec
*two
,
302 struct diff_options
*o
)
305 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
306 const char *name_a_tab
, *name_b_tab
;
307 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
308 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
309 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
310 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
311 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
312 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
313 const char *a_prefix
, *b_prefix
;
315 if (diff_mnemonic_prefix
&& DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
316 a_prefix
= o
->b_prefix
;
317 b_prefix
= o
->a_prefix
;
319 a_prefix
= o
->a_prefix
;
320 b_prefix
= o
->b_prefix
;
323 name_a
+= (*name_a
== '/');
324 name_b
+= (*name_b
== '/');
325 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
326 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
328 strbuf_reset(&a_name
);
329 strbuf_reset(&b_name
);
330 quote_two_c_style(&a_name
, a_prefix
, name_a
, 0);
331 quote_two_c_style(&b_name
, b_prefix
, name_b
, 0);
333 diff_populate_filespec(one
, 0);
334 diff_populate_filespec(two
, 0);
335 lc_a
= count_lines(one
->data
, one
->size
);
336 lc_b
= count_lines(two
->data
, two
->size
);
338 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
339 metainfo
, a_name
.buf
, name_a_tab
, reset
,
340 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
341 print_line_count(o
->file
, lc_a
);
342 fprintf(o
->file
, " +");
343 print_line_count(o
->file
, lc_b
);
344 fprintf(o
->file
, " @@%s\n", reset
);
346 copy_file_with_prefix(o
->file
, '-', one
->data
, one
->size
, old
, reset
);
348 copy_file_with_prefix(o
->file
, '+', two
->data
, two
->size
, new, reset
);
351 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
353 if (!DIFF_FILE_VALID(one
)) {
354 mf
->ptr
= (char *)""; /* does not matter */
358 else if (diff_populate_filespec(one
, 0))
361 mf
->size
= one
->size
;
365 struct diff_words_buffer
{
368 long current
; /* output pointer */
369 int suppressed_newline
;
372 static void diff_words_append(char *line
, unsigned long len
,
373 struct diff_words_buffer
*buffer
)
375 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
376 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
377 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
381 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
382 buffer
->text
.size
+= len
;
385 struct diff_words_data
{
386 struct xdiff_emit_state xm
;
387 struct diff_words_buffer minus
, plus
;
391 static void print_word(FILE *file
, struct diff_words_buffer
*buffer
, int len
, int color
,
392 int suppress_newline
)
400 ptr
= buffer
->text
.ptr
+ buffer
->current
;
401 buffer
->current
+= len
;
403 if (ptr
[len
- 1] == '\n') {
408 fputs(diff_get_color(1, color
), file
);
409 fwrite(ptr
, len
, 1, file
);
410 fputs(diff_get_color(1, DIFF_RESET
), file
);
413 if (suppress_newline
)
414 buffer
->suppressed_newline
= 1;
420 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
422 struct diff_words_data
*diff_words
= priv
;
424 if (diff_words
->minus
.suppressed_newline
) {
426 putc('\n', diff_words
->file
);
427 diff_words
->minus
.suppressed_newline
= 0;
433 print_word(diff_words
->file
,
434 &diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
437 print_word(diff_words
->file
,
438 &diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
441 print_word(diff_words
->file
,
442 &diff_words
->plus
, len
, DIFF_PLAIN
, 0);
443 diff_words
->minus
.current
+= len
;
448 /* this executes the word diff on the accumulated buffers */
449 static void diff_words_show(struct diff_words_data
*diff_words
)
454 mmfile_t minus
, plus
;
457 memset(&xecfg
, 0, sizeof(xecfg
));
458 minus
.size
= diff_words
->minus
.text
.size
;
459 minus
.ptr
= xmalloc(minus
.size
);
460 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
461 for (i
= 0; i
< minus
.size
; i
++)
462 if (isspace(minus
.ptr
[i
]))
464 diff_words
->minus
.current
= 0;
466 plus
.size
= diff_words
->plus
.text
.size
;
467 plus
.ptr
= xmalloc(plus
.size
);
468 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
469 for (i
= 0; i
< plus
.size
; i
++)
470 if (isspace(plus
.ptr
[i
]))
472 diff_words
->plus
.current
= 0;
474 xpp
.flags
= XDF_NEED_MINIMAL
;
475 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
476 ecb
.outf
= xdiff_outf
;
477 ecb
.priv
= diff_words
;
478 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
479 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
483 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
485 if (diff_words
->minus
.suppressed_newline
) {
486 putc('\n', diff_words
->file
);
487 diff_words
->minus
.suppressed_newline
= 0;
491 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
493 struct emit_callback
{
494 struct xdiff_emit_state xm
;
495 int nparents
, color_diff
;
497 sane_truncate_fn truncate
;
498 const char **label_path
;
499 struct diff_words_data
*diff_words
;
504 static void free_diff_words_data(struct emit_callback
*ecbdata
)
506 if (ecbdata
->diff_words
) {
508 if (ecbdata
->diff_words
->minus
.text
.size
||
509 ecbdata
->diff_words
->plus
.text
.size
)
510 diff_words_show(ecbdata
->diff_words
);
512 free (ecbdata
->diff_words
->minus
.text
.ptr
);
513 free (ecbdata
->diff_words
->plus
.text
.ptr
);
514 free(ecbdata
->diff_words
);
515 ecbdata
->diff_words
= NULL
;
519 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
522 return diff_colors
[ix
];
526 static void emit_line(FILE *file
, const char *set
, const char *reset
, const char *line
, int len
)
528 int has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
529 if (has_trailing_newline
)
533 fwrite(line
, len
, 1, file
);
535 if (has_trailing_newline
)
539 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
541 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
542 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
545 emit_line(ecbdata
->file
, set
, reset
, line
, len
);
547 /* Emit just the prefix, then the rest. */
548 emit_line(ecbdata
->file
, set
, reset
, line
, ecbdata
->nparents
);
549 ws_check_emit(line
+ ecbdata
->nparents
,
550 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
551 ecbdata
->file
, set
, reset
, ws
);
555 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
562 return ecb
->truncate(line
, len
);
566 (void) utf8_width(&cp
, &l
);
568 break; /* truncated in the middle? */
573 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
577 struct emit_callback
*ecbdata
= priv
;
578 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
579 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
580 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
582 *(ecbdata
->found_changesp
) = 1;
584 if (ecbdata
->label_path
[0]) {
585 const char *name_a_tab
, *name_b_tab
;
587 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
588 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
590 fprintf(ecbdata
->file
, "%s--- %s%s%s\n",
591 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
592 fprintf(ecbdata
->file
, "%s+++ %s%s%s\n",
593 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
594 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
597 /* This is not really necessary for now because
598 * this codepath only deals with two-way diffs.
600 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
602 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
603 ecbdata
->nparents
= i
- 1;
604 len
= sane_truncate_line(ecbdata
, line
, len
);
605 emit_line(ecbdata
->file
,
606 diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
608 if (line
[len
-1] != '\n')
609 putc('\n', ecbdata
->file
);
613 if (len
< ecbdata
->nparents
) {
614 emit_line(ecbdata
->file
, reset
, reset
, line
, len
);
619 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
620 /* fall back to normal diff */
621 free_diff_words_data(ecbdata
);
622 if (ecbdata
->diff_words
) {
623 if (line
[0] == '-') {
624 diff_words_append(line
, len
,
625 &ecbdata
->diff_words
->minus
);
627 } else if (line
[0] == '+') {
628 diff_words_append(line
, len
,
629 &ecbdata
->diff_words
->plus
);
632 if (ecbdata
->diff_words
->minus
.text
.size
||
633 ecbdata
->diff_words
->plus
.text
.size
)
634 diff_words_show(ecbdata
->diff_words
);
637 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
640 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
642 color
= DIFF_FILE_OLD
;
643 else if (line
[i
] == '+')
644 color
= DIFF_FILE_NEW
;
647 if (color
!= DIFF_FILE_NEW
) {
648 emit_line(ecbdata
->file
,
649 diff_get_color(ecbdata
->color_diff
, color
),
653 emit_add_line(reset
, ecbdata
, line
, len
);
656 static char *pprint_rename(const char *a
, const char *b
)
661 int pfx_length
, sfx_length
;
662 int len_a
= strlen(a
);
663 int len_b
= strlen(b
);
664 int a_midlen
, b_midlen
;
665 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
666 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
668 strbuf_init(&name
, 0);
669 if (qlen_a
|| qlen_b
) {
670 quote_c_style(a
, &name
, NULL
, 0);
671 strbuf_addstr(&name
, " => ");
672 quote_c_style(b
, &name
, NULL
, 0);
673 return strbuf_detach(&name
, NULL
);
676 /* Find common prefix */
678 while (*old
&& *new && *old
== *new) {
680 pfx_length
= old
- a
+ 1;
685 /* Find common suffix */
689 while (a
<= old
&& b
<= new && *old
== *new) {
691 sfx_length
= len_a
- (old
- a
);
697 * pfx{mid-a => mid-b}sfx
698 * {pfx-a => pfx-b}sfx
699 * pfx{sfx-a => sfx-b}
702 a_midlen
= len_a
- pfx_length
- sfx_length
;
703 b_midlen
= len_b
- pfx_length
- sfx_length
;
709 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
710 if (pfx_length
+ sfx_length
) {
711 strbuf_add(&name
, a
, pfx_length
);
712 strbuf_addch(&name
, '{');
714 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
715 strbuf_addstr(&name
, " => ");
716 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
717 if (pfx_length
+ sfx_length
) {
718 strbuf_addch(&name
, '}');
719 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
721 return strbuf_detach(&name
, NULL
);
725 struct xdiff_emit_state xm
;
729 struct diffstat_file
{
733 unsigned is_unmerged
:1;
734 unsigned is_binary
:1;
735 unsigned is_renamed
:1;
736 unsigned int added
, deleted
;
740 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
744 struct diffstat_file
*x
;
745 x
= xcalloc(sizeof (*x
), 1);
746 if (diffstat
->nr
== diffstat
->alloc
) {
747 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
748 diffstat
->files
= xrealloc(diffstat
->files
,
749 diffstat
->alloc
* sizeof(x
));
751 diffstat
->files
[diffstat
->nr
++] = x
;
753 x
->from_name
= xstrdup(name_a
);
754 x
->name
= xstrdup(name_b
);
759 x
->name
= xstrdup(name_a
);
764 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
766 struct diffstat_t
*diffstat
= priv
;
767 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
771 else if (line
[0] == '-')
775 const char mime_boundary_leader
[] = "------------";
777 static int scale_linear(int it
, int width
, int max_change
)
780 * make sure that at least one '-' is printed if there were deletions,
781 * and likewise for '+'.
785 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
788 static void show_name(FILE *file
,
789 const char *prefix
, const char *name
, int len
,
790 const char *reset
, const char *set
)
792 fprintf(file
, " %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
795 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
799 fprintf(file
, "%s", set
);
802 fprintf(file
, "%s", reset
);
805 static void fill_print_name(struct diffstat_file
*file
)
809 if (file
->print_name
)
812 if (!file
->is_renamed
) {
814 strbuf_init(&buf
, 0);
815 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
816 pname
= strbuf_detach(&buf
, NULL
);
819 strbuf_release(&buf
);
822 pname
= pprint_rename(file
->from_name
, file
->name
);
824 file
->print_name
= pname
;
827 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
829 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
830 int max_change
= 0, max_len
= 0;
831 int total_files
= data
->nr
;
832 int width
, name_width
;
833 const char *reset
, *set
, *add_c
, *del_c
;
838 width
= options
->stat_width
? options
->stat_width
: 80;
839 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
841 /* Sanity: give at least 5 columns to the graph,
842 * but leave at least 10 columns for the name.
848 else if (width
< name_width
+ 15)
849 name_width
= width
- 15;
851 /* Find the longest filename and max number of changes */
852 reset
= diff_get_color_opt(options
, DIFF_RESET
);
853 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
854 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
855 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
857 for (i
= 0; i
< data
->nr
; i
++) {
858 struct diffstat_file
*file
= data
->files
[i
];
859 int change
= file
->added
+ file
->deleted
;
860 fill_print_name(file
);
861 len
= strlen(file
->print_name
);
865 if (file
->is_binary
|| file
->is_unmerged
)
867 if (max_change
< change
)
871 /* Compute the width of the graph part;
872 * 10 is for one blank at the beginning of the line plus
873 * " | count " between the name and the graph.
875 * From here on, name_width is the width of the name area,
876 * and width is the width of the graph area.
878 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
879 if (width
< (name_width
+ 10) + max_change
)
880 width
= width
- (name_width
+ 10);
884 for (i
= 0; i
< data
->nr
; i
++) {
885 const char *prefix
= "";
886 char *name
= data
->files
[i
]->print_name
;
887 int added
= data
->files
[i
]->added
;
888 int deleted
= data
->files
[i
]->deleted
;
892 * "scale" the filename
895 name_len
= strlen(name
);
896 if (name_width
< name_len
) {
900 name
+= name_len
- len
;
901 slash
= strchr(name
, '/');
906 if (data
->files
[i
]->is_binary
) {
907 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
908 fprintf(options
->file
, " Bin ");
909 fprintf(options
->file
, "%s%d%s", del_c
, deleted
, reset
);
910 fprintf(options
->file
, " -> ");
911 fprintf(options
->file
, "%s%d%s", add_c
, added
, reset
);
912 fprintf(options
->file
, " bytes");
913 fprintf(options
->file
, "\n");
916 else if (data
->files
[i
]->is_unmerged
) {
917 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
918 fprintf(options
->file
, " Unmerged\n");
921 else if (!data
->files
[i
]->is_renamed
&&
922 (added
+ deleted
== 0)) {
928 * scale the add/delete
936 if (width
<= max_change
) {
937 add
= scale_linear(add
, width
, max_change
);
938 del
= scale_linear(del
, width
, max_change
);
941 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
942 fprintf(options
->file
, "%5d%s", added
+ deleted
,
943 added
+ deleted
? " " : "");
944 show_graph(options
->file
, '+', add
, add_c
, reset
);
945 show_graph(options
->file
, '-', del
, del_c
, reset
);
946 fprintf(options
->file
, "\n");
948 fprintf(options
->file
,
949 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
950 set
, total_files
, adds
, dels
, reset
);
953 static void show_shortstats(struct diffstat_t
* data
, struct diff_options
*options
)
955 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
960 for (i
= 0; i
< data
->nr
; i
++) {
961 if (!data
->files
[i
]->is_binary
&&
962 !data
->files
[i
]->is_unmerged
) {
963 int added
= data
->files
[i
]->added
;
964 int deleted
= data
->files
[i
]->deleted
;
965 if (!data
->files
[i
]->is_renamed
&&
966 (added
+ deleted
== 0)) {
974 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
975 total_files
, adds
, dels
);
978 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
985 for (i
= 0; i
< data
->nr
; i
++) {
986 struct diffstat_file
*file
= data
->files
[i
];
989 fprintf(options
->file
, "-\t-\t");
991 fprintf(options
->file
,
992 "%d\t%d\t", file
->added
, file
->deleted
);
993 if (options
->line_termination
) {
994 fill_print_name(file
);
995 if (!file
->is_renamed
)
996 write_name_quoted(file
->name
, options
->file
,
997 options
->line_termination
);
999 fputs(file
->print_name
, options
->file
);
1000 putc(options
->line_termination
, options
->file
);
1003 if (file
->is_renamed
) {
1004 putc('\0', options
->file
);
1005 write_name_quoted(file
->from_name
, options
->file
, '\0');
1007 write_name_quoted(file
->name
, options
->file
, '\0');
1012 struct dirstat_file
{
1014 unsigned long changed
;
1017 struct dirstat_dir
{
1018 struct dirstat_file
*files
;
1019 int alloc
, nr
, percent
, cumulative
;
1022 static long gather_dirstat(FILE *file
, struct dirstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1024 unsigned long this_dir
= 0;
1025 unsigned int sources
= 0;
1028 struct dirstat_file
*f
= dir
->files
;
1029 int namelen
= strlen(f
->name
);
1033 if (namelen
< baselen
)
1035 if (memcmp(f
->name
, base
, baselen
))
1037 slash
= strchr(f
->name
+ baselen
, '/');
1039 int newbaselen
= slash
+ 1 - f
->name
;
1040 this = gather_dirstat(file
, dir
, changed
, f
->name
, newbaselen
);
1052 * We don't report dirstat's for
1054 * - or cases where everything came from a single directory
1055 * under this directory (sources == 1).
1057 if (baselen
&& sources
!= 1) {
1058 int permille
= this_dir
* 1000 / changed
;
1060 int percent
= permille
/ 10;
1061 if (percent
>= dir
->percent
) {
1062 fprintf(file
, "%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1063 if (!dir
->cumulative
)
1071 static int dirstat_compare(const void *_a
, const void *_b
)
1073 const struct dirstat_file
*a
= _a
;
1074 const struct dirstat_file
*b
= _b
;
1075 return strcmp(a
->name
, b
->name
);
1078 static void show_dirstat(struct diff_options
*options
)
1081 unsigned long changed
;
1082 struct dirstat_dir dir
;
1083 struct diff_queue_struct
*q
= &diff_queued_diff
;
1088 dir
.percent
= options
->dirstat_percent
;
1089 dir
.cumulative
= options
->output_format
& DIFF_FORMAT_CUMULATIVE
;
1092 for (i
= 0; i
< q
->nr
; i
++) {
1093 struct diff_filepair
*p
= q
->queue
[i
];
1095 unsigned long copied
, added
, damage
;
1097 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1099 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1100 diff_populate_filespec(p
->one
, 0);
1101 diff_populate_filespec(p
->two
, 0);
1102 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1104 diff_free_filespec_data(p
->one
);
1105 diff_free_filespec_data(p
->two
);
1106 } else if (DIFF_FILE_VALID(p
->one
)) {
1107 diff_populate_filespec(p
->one
, 1);
1109 diff_free_filespec_data(p
->one
);
1110 } else if (DIFF_FILE_VALID(p
->two
)) {
1111 diff_populate_filespec(p
->two
, 1);
1113 added
= p
->two
->size
;
1114 diff_free_filespec_data(p
->two
);
1119 * Original minus copied is the removed material,
1120 * added is the new material. They are both damages
1121 * made to the preimage.
1123 damage
= (p
->one
->size
- copied
) + added
;
1125 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1126 dir
.files
[dir
.nr
].name
= name
;
1127 dir
.files
[dir
.nr
].changed
= damage
;
1132 /* This can happen even with many files, if everything was renames */
1136 /* Show all directories with more than x% of the changes */
1137 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1138 gather_dirstat(options
->file
, &dir
, changed
, "", 0);
1141 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1144 for (i
= 0; i
< diffstat
->nr
; i
++) {
1145 struct diffstat_file
*f
= diffstat
->files
[i
];
1146 if (f
->name
!= f
->print_name
)
1147 free(f
->print_name
);
1152 free(diffstat
->files
);
1155 struct checkdiff_t
{
1156 struct xdiff_emit_state xm
;
1157 const char *filename
;
1159 struct diff_options
*o
;
1162 int trailing_blanks_start
;
1165 static int is_conflict_marker(const char *line
, unsigned long len
)
1172 firstchar
= line
[0];
1173 switch (firstchar
) {
1174 case '=': case '>': case '<':
1179 for (cnt
= 1; cnt
< 7; cnt
++)
1180 if (line
[cnt
] != firstchar
)
1182 /* line[0] thru line[6] are same as firstchar */
1183 if (firstchar
== '=') {
1184 /* divider between ours and theirs? */
1185 if (len
!= 8 || line
[7] != '\n')
1187 } else if (len
< 8 || !isspace(line
[7])) {
1188 /* not divider before ours nor after theirs */
1194 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1196 struct checkdiff_t
*data
= priv
;
1197 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1198 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1199 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1200 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1203 if (line
[0] == '+') {
1206 if (!ws_blank_line(line
+ 1, len
- 1, data
->ws_rule
))
1207 data
->trailing_blanks_start
= 0;
1208 else if (!data
->trailing_blanks_start
)
1209 data
->trailing_blanks_start
= data
->lineno
;
1210 if (is_conflict_marker(line
+ 1, len
- 1)) {
1212 fprintf(data
->o
->file
,
1213 "%s:%d: leftover conflict marker\n",
1214 data
->filename
, data
->lineno
);
1216 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1219 data
->status
|= bad
;
1220 err
= whitespace_error_string(bad
);
1221 fprintf(data
->o
->file
, "%s:%d: %s.\n",
1222 data
->filename
, data
->lineno
, err
);
1224 emit_line(data
->o
->file
, set
, reset
, line
, 1);
1225 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1226 data
->o
->file
, set
, reset
, ws
);
1227 } else if (line
[0] == ' ') {
1229 data
->trailing_blanks_start
= 0;
1230 } else if (line
[0] == '@') {
1231 char *plus
= strchr(line
, '+');
1233 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1235 die("invalid diff");
1236 data
->trailing_blanks_start
= 0;
1240 static unsigned char *deflate_it(char *data
,
1242 unsigned long *result_size
)
1245 unsigned char *deflated
;
1248 memset(&stream
, 0, sizeof(stream
));
1249 deflateInit(&stream
, zlib_compression_level
);
1250 bound
= deflateBound(&stream
, size
);
1251 deflated
= xmalloc(bound
);
1252 stream
.next_out
= deflated
;
1253 stream
.avail_out
= bound
;
1255 stream
.next_in
= (unsigned char *)data
;
1256 stream
.avail_in
= size
;
1257 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1259 deflateEnd(&stream
);
1260 *result_size
= stream
.total_out
;
1264 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1270 unsigned long orig_size
;
1271 unsigned long delta_size
;
1272 unsigned long deflate_size
;
1273 unsigned long data_size
;
1275 /* We could do deflated delta, or we could do just deflated two,
1276 * whichever is smaller.
1279 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1280 if (one
->size
&& two
->size
) {
1281 delta
= diff_delta(one
->ptr
, one
->size
,
1282 two
->ptr
, two
->size
,
1283 &delta_size
, deflate_size
);
1285 void *to_free
= delta
;
1286 orig_size
= delta_size
;
1287 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1292 if (delta
&& delta_size
< deflate_size
) {
1293 fprintf(file
, "delta %lu\n", orig_size
);
1296 data_size
= delta_size
;
1299 fprintf(file
, "literal %lu\n", two
->size
);
1302 data_size
= deflate_size
;
1305 /* emit data encoded in base85 */
1308 int bytes
= (52 < data_size
) ? 52 : data_size
;
1312 line
[0] = bytes
+ 'A' - 1;
1314 line
[0] = bytes
- 26 + 'a' - 1;
1315 encode_85(line
+ 1, cp
, bytes
);
1316 cp
= (char *) cp
+ bytes
;
1320 fprintf(file
, "\n");
1324 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1326 fprintf(file
, "GIT binary patch\n");
1327 emit_binary_diff_body(file
, one
, two
);
1328 emit_binary_diff_body(file
, two
, one
);
1331 static void setup_diff_attr_check(struct git_attr_check
*check
)
1333 static struct git_attr
*attr_diff
;
1336 attr_diff
= git_attr("diff", 4);
1338 check
[0].attr
= attr_diff
;
1341 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1343 struct git_attr_check attr_diff_check
;
1344 int check_from_data
= 0;
1346 if (one
->checked_attr
)
1349 setup_diff_attr_check(&attr_diff_check
);
1351 one
->funcname_pattern_ident
= NULL
;
1353 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1357 value
= attr_diff_check
.value
;
1358 if (ATTR_TRUE(value
))
1360 else if (ATTR_FALSE(value
))
1363 check_from_data
= 1;
1365 /* funcname pattern ident */
1366 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1369 one
->funcname_pattern_ident
= value
;
1372 if (check_from_data
) {
1373 if (!one
->data
&& DIFF_FILE_VALID(one
))
1374 diff_populate_filespec(one
, 0);
1377 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1381 int diff_filespec_is_binary(struct diff_filespec
*one
)
1383 diff_filespec_check_attr(one
);
1384 return one
->is_binary
;
1387 static const char *funcname_pattern(const char *ident
)
1389 struct funcname_pattern
*pp
;
1391 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1392 if (!strcmp(ident
, pp
->name
))
1397 static struct builtin_funcname_pattern
{
1399 const char *pattern
;
1400 } builtin_funcname_pattern
[] = {
1401 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1402 "new\\|return\\|switch\\|throw\\|while\\)\n"
1404 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1406 { "pascal", "^\\(\\(procedure\\|function\\|constructor\\|"
1407 "destructor\\|interface\\|implementation\\|"
1408 "initialization\\|finalization\\)[ \t]*.*\\)$"
1410 "^\\(.*=[ \t]*\\(class\\|record\\).*\\)$"
1412 { "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$" },
1413 { "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$" },
1414 { "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
1417 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1419 const char *ident
, *pattern
;
1422 diff_filespec_check_attr(one
);
1423 ident
= one
->funcname_pattern_ident
;
1427 * If the config file has "funcname.default" defined, that
1428 * regexp is used; otherwise NULL is returned and xemit uses
1429 * the built-in default.
1431 return funcname_pattern("default");
1433 /* Look up custom "funcname.$ident" regexp from config. */
1434 pattern
= funcname_pattern(ident
);
1439 * And define built-in fallback patterns here. Note that
1440 * these can be overridden by the user's config settings.
1442 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1443 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1444 return builtin_funcname_pattern
[i
].pattern
;
1449 void diff_set_mnemonic_prefix(struct diff_options
*options
, const char *a
, const char *b
)
1451 if (!options
->a_prefix
)
1452 options
->a_prefix
= a
;
1453 if (!options
->b_prefix
)
1454 options
->b_prefix
= b
;
1457 static void builtin_diff(const char *name_a
,
1459 struct diff_filespec
*one
,
1460 struct diff_filespec
*two
,
1461 const char *xfrm_msg
,
1462 struct diff_options
*o
,
1463 int complete_rewrite
)
1467 char *a_one
, *b_two
;
1468 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1469 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1470 const char *a_prefix
, *b_prefix
;
1472 diff_set_mnemonic_prefix(o
, "a/", "b/");
1473 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
1474 a_prefix
= o
->b_prefix
;
1475 b_prefix
= o
->a_prefix
;
1477 a_prefix
= o
->a_prefix
;
1478 b_prefix
= o
->b_prefix
;
1481 a_one
= quote_two(a_prefix
, name_a
+ (*name_a
== '/'));
1482 b_two
= quote_two(b_prefix
, name_b
+ (*name_b
== '/'));
1483 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1484 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1485 fprintf(o
->file
, "%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1486 if (lbl
[0][0] == '/') {
1488 fprintf(o
->file
, "%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1489 if (xfrm_msg
&& xfrm_msg
[0])
1490 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1492 else if (lbl
[1][0] == '/') {
1493 fprintf(o
->file
, "%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1494 if (xfrm_msg
&& xfrm_msg
[0])
1495 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1498 if (one
->mode
!= two
->mode
) {
1499 fprintf(o
->file
, "%sold mode %06o%s\n", set
, one
->mode
, reset
);
1500 fprintf(o
->file
, "%snew mode %06o%s\n", set
, two
->mode
, reset
);
1502 if (xfrm_msg
&& xfrm_msg
[0])
1503 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1505 * we do not run diff between different kind
1508 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1509 goto free_ab_and_return
;
1510 if (complete_rewrite
) {
1511 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1512 o
->found_changes
= 1;
1513 goto free_ab_and_return
;
1517 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1518 die("unable to read files to diff");
1520 if (!DIFF_OPT_TST(o
, TEXT
) &&
1521 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1522 /* Quite common confusing case */
1523 if (mf1
.size
== mf2
.size
&&
1524 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1525 goto free_ab_and_return
;
1526 if (DIFF_OPT_TST(o
, BINARY
))
1527 emit_binary_diff(o
->file
, &mf1
, &mf2
);
1529 fprintf(o
->file
, "Binary files %s and %s differ\n",
1531 o
->found_changes
= 1;
1534 /* Crazy xdl interfaces.. */
1535 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1539 struct emit_callback ecbdata
;
1540 const char *funcname_pattern
;
1542 funcname_pattern
= diff_funcname_pattern(one
);
1543 if (!funcname_pattern
)
1544 funcname_pattern
= diff_funcname_pattern(two
);
1546 memset(&xecfg
, 0, sizeof(xecfg
));
1547 memset(&ecbdata
, 0, sizeof(ecbdata
));
1548 ecbdata
.label_path
= lbl
;
1549 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1550 ecbdata
.found_changesp
= &o
->found_changes
;
1551 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1552 ecbdata
.file
= o
->file
;
1553 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1554 xecfg
.ctxlen
= o
->context
;
1555 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1556 if (funcname_pattern
)
1557 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1560 else if (!prefixcmp(diffopts
, "--unified="))
1561 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1562 else if (!prefixcmp(diffopts
, "-u"))
1563 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1564 ecb
.outf
= xdiff_outf
;
1565 ecb
.priv
= &ecbdata
;
1566 ecbdata
.xm
.consume
= fn_out_consume
;
1567 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
)) {
1568 ecbdata
.diff_words
=
1569 xcalloc(1, sizeof(struct diff_words_data
));
1570 ecbdata
.diff_words
->file
= o
->file
;
1572 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1573 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1574 free_diff_words_data(&ecbdata
);
1578 diff_free_filespec_data(one
);
1579 diff_free_filespec_data(two
);
1585 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1586 struct diff_filespec
*one
,
1587 struct diff_filespec
*two
,
1588 struct diffstat_t
*diffstat
,
1589 struct diff_options
*o
,
1590 int complete_rewrite
)
1593 struct diffstat_file
*data
;
1595 data
= diffstat_add(diffstat
, name_a
, name_b
);
1598 data
->is_unmerged
= 1;
1601 if (complete_rewrite
) {
1602 diff_populate_filespec(one
, 0);
1603 diff_populate_filespec(two
, 0);
1604 data
->deleted
= count_lines(one
->data
, one
->size
);
1605 data
->added
= count_lines(two
->data
, two
->size
);
1606 goto free_and_return
;
1608 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1609 die("unable to read files to diff");
1611 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1612 data
->is_binary
= 1;
1613 data
->added
= mf2
.size
;
1614 data
->deleted
= mf1
.size
;
1616 /* Crazy xdl interfaces.. */
1621 memset(&xecfg
, 0, sizeof(xecfg
));
1622 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1623 ecb
.outf
= xdiff_outf
;
1624 ecb
.priv
= diffstat
;
1625 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1629 diff_free_filespec_data(one
);
1630 diff_free_filespec_data(two
);
1633 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1634 const char *attr_path
,
1635 struct diff_filespec
*one
,
1636 struct diff_filespec
*two
,
1637 struct diff_options
*o
)
1640 struct checkdiff_t data
;
1645 memset(&data
, 0, sizeof(data
));
1646 data
.xm
.consume
= checkdiff_consume
;
1647 data
.filename
= name_b
? name_b
: name_a
;
1650 data
.ws_rule
= whitespace_rule(attr_path
);
1652 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1653 die("unable to read files to diff");
1656 * All the other codepaths check both sides, but not checking
1657 * the "old" side here is deliberate. We are checking the newly
1658 * introduced changes, and as long as the "new" side is text, we
1659 * can and should check what it introduces.
1661 if (diff_filespec_is_binary(two
))
1662 goto free_and_return
;
1664 /* Crazy xdl interfaces.. */
1669 memset(&xecfg
, 0, sizeof(xecfg
));
1670 xecfg
.ctxlen
= 1; /* at least one context line */
1671 xpp
.flags
= XDF_NEED_MINIMAL
;
1672 ecb
.outf
= xdiff_outf
;
1674 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1676 if ((data
.ws_rule
& WS_TRAILING_SPACE
) &&
1677 data
.trailing_blanks_start
) {
1678 fprintf(o
->file
, "%s:%d: ends with blank lines.\n",
1679 data
.filename
, data
.trailing_blanks_start
);
1680 data
.status
= 1; /* report errors */
1684 diff_free_filespec_data(one
);
1685 diff_free_filespec_data(two
);
1687 DIFF_OPT_SET(o
, CHECK_FAILED
);
1690 struct diff_filespec
*alloc_filespec(const char *path
)
1692 int namelen
= strlen(path
);
1693 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1695 memset(spec
, 0, sizeof(*spec
));
1696 spec
->path
= (char *)(spec
+ 1);
1697 memcpy(spec
->path
, path
, namelen
+1);
1702 void free_filespec(struct diff_filespec
*spec
)
1704 if (!--spec
->count
) {
1705 diff_free_filespec_data(spec
);
1710 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1711 unsigned short mode
)
1714 spec
->mode
= canon_mode(mode
);
1715 hashcpy(spec
->sha1
, sha1
);
1716 spec
->sha1_valid
= !is_null_sha1(sha1
);
1721 * Given a name and sha1 pair, if the index tells us the file in
1722 * the work tree has that object contents, return true, so that
1723 * prepare_temp_file() does not have to inflate and extract.
1725 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1727 struct cache_entry
*ce
;
1731 /* We do not read the cache ourselves here, because the
1732 * benchmark with my previous version that always reads cache
1733 * shows that it makes things worse for diff-tree comparing
1734 * two linux-2.6 kernel trees in an already checked out work
1735 * tree. This is because most diff-tree comparisons deal with
1736 * only a small number of files, while reading the cache is
1737 * expensive for a large project, and its cost outweighs the
1738 * savings we get by not inflating the object to a temporary
1739 * file. Practically, this code only helps when we are used
1740 * by diff-cache --cached, which does read the cache before
1746 /* We want to avoid the working directory if our caller
1747 * doesn't need the data in a normal file, this system
1748 * is rather slow with its stat/open/mmap/close syscalls,
1749 * and the object is contained in a pack file. The pack
1750 * is probably already open and will be faster to obtain
1751 * the data through than the working directory. Loose
1752 * objects however would tend to be slower as they need
1753 * to be individually opened and inflated.
1755 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1759 pos
= cache_name_pos(name
, len
);
1762 ce
= active_cache
[pos
];
1765 * This is not the sha1 we are looking for, or
1766 * unreusable because it is not a regular file.
1768 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1772 * If ce matches the file in the work tree, we can reuse it.
1774 if (ce_uptodate(ce
) ||
1775 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1781 static int populate_from_stdin(struct diff_filespec
*s
)
1786 strbuf_init(&buf
, 0);
1787 if (strbuf_read(&buf
, 0, 0) < 0)
1788 return error("error while reading from stdin %s",
1791 s
->should_munmap
= 0;
1792 s
->data
= strbuf_detach(&buf
, &size
);
1798 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1801 char *data
= xmalloc(100);
1802 len
= snprintf(data
, 100,
1803 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1815 * While doing rename detection and pickaxe operation, we may need to
1816 * grab the data for the blob (or file) for our own in-core comparison.
1817 * diff_filespec has data and size fields for this purpose.
1819 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1822 if (!DIFF_FILE_VALID(s
))
1823 die("internal error: asking to populate invalid file.");
1824 if (S_ISDIR(s
->mode
))
1830 if (size_only
&& 0 < s
->size
)
1833 if (S_ISGITLINK(s
->mode
))
1834 return diff_populate_gitlink(s
, size_only
);
1836 if (!s
->sha1_valid
||
1837 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1842 if (!strcmp(s
->path
, "-"))
1843 return populate_from_stdin(s
);
1845 if (lstat(s
->path
, &st
) < 0) {
1846 if (errno
== ENOENT
) {
1850 s
->data
= (char *)"";
1855 s
->size
= xsize_t(st
.st_size
);
1860 if (S_ISLNK(st
.st_mode
)) {
1862 s
->data
= xmalloc(s
->size
);
1864 ret
= readlink(s
->path
, s
->data
, s
->size
);
1871 fd
= open(s
->path
, O_RDONLY
);
1874 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1876 s
->should_munmap
= 1;
1879 * Convert from working tree format to canonical git format
1881 strbuf_init(&buf
, 0);
1882 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
1884 munmap(s
->data
, s
->size
);
1885 s
->should_munmap
= 0;
1886 s
->data
= strbuf_detach(&buf
, &size
);
1892 enum object_type type
;
1894 type
= sha1_object_info(s
->sha1
, &s
->size
);
1896 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1903 void diff_free_filespec_blob(struct diff_filespec
*s
)
1907 else if (s
->should_munmap
)
1908 munmap(s
->data
, s
->size
);
1910 if (s
->should_free
|| s
->should_munmap
) {
1911 s
->should_free
= s
->should_munmap
= 0;
1916 void diff_free_filespec_data(struct diff_filespec
*s
)
1918 diff_free_filespec_blob(s
);
1923 static void prep_temp_blob(struct diff_tempfile
*temp
,
1926 const unsigned char *sha1
,
1931 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1933 die("unable to create temp-file: %s", strerror(errno
));
1934 if (write_in_full(fd
, blob
, size
) != size
)
1935 die("unable to write temp-file");
1937 temp
->name
= temp
->tmp_path
;
1938 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1940 sprintf(temp
->mode
, "%06o", mode
);
1943 static void prepare_temp_file(const char *name
,
1944 struct diff_tempfile
*temp
,
1945 struct diff_filespec
*one
)
1947 if (!DIFF_FILE_VALID(one
)) {
1949 /* A '-' entry produces this for file-2, and
1950 * a '+' entry produces this for file-1.
1952 temp
->name
= "/dev/null";
1953 strcpy(temp
->hex
, ".");
1954 strcpy(temp
->mode
, ".");
1958 if (!one
->sha1_valid
||
1959 reuse_worktree_file(name
, one
->sha1
, 1)) {
1961 if (lstat(name
, &st
) < 0) {
1962 if (errno
== ENOENT
)
1963 goto not_a_valid_file
;
1964 die("stat(%s): %s", name
, strerror(errno
));
1966 if (S_ISLNK(st
.st_mode
)) {
1968 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1969 size_t sz
= xsize_t(st
.st_size
);
1970 if (sizeof(buf
) <= st
.st_size
)
1971 die("symlink too long: %s", name
);
1972 ret
= readlink(name
, buf
, sz
);
1974 die("readlink(%s)", name
);
1975 prep_temp_blob(temp
, buf
, sz
,
1977 one
->sha1
: null_sha1
),
1979 one
->mode
: S_IFLNK
));
1982 /* we can borrow from the file in the work tree */
1984 if (!one
->sha1_valid
)
1985 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1987 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1988 /* Even though we may sometimes borrow the
1989 * contents from the work tree, we always want
1990 * one->mode. mode is trustworthy even when
1991 * !(one->sha1_valid), as long as
1992 * DIFF_FILE_VALID(one).
1994 sprintf(temp
->mode
, "%06o", one
->mode
);
1999 if (diff_populate_filespec(one
, 0))
2000 die("cannot read data blob for %s", one
->path
);
2001 prep_temp_blob(temp
, one
->data
, one
->size
,
2002 one
->sha1
, one
->mode
);
2006 static void remove_tempfile(void)
2010 for (i
= 0; i
< 2; i
++)
2011 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
2012 unlink(diff_temp
[i
].name
);
2013 diff_temp
[i
].name
= NULL
;
2017 static void remove_tempfile_on_signal(int signo
)
2020 signal(SIGINT
, SIG_DFL
);
2024 /* An external diff command takes:
2026 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2027 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2030 static void run_external_diff(const char *pgm
,
2033 struct diff_filespec
*one
,
2034 struct diff_filespec
*two
,
2035 const char *xfrm_msg
,
2036 int complete_rewrite
)
2038 const char *spawn_arg
[10];
2039 struct diff_tempfile
*temp
= diff_temp
;
2041 static int atexit_asked
= 0;
2042 const char *othername
;
2043 const char **arg
= &spawn_arg
[0];
2045 othername
= (other
? other
: name
);
2047 prepare_temp_file(name
, &temp
[0], one
);
2048 prepare_temp_file(othername
, &temp
[1], two
);
2049 if (! atexit_asked
&&
2050 (temp
[0].name
== temp
[0].tmp_path
||
2051 temp
[1].name
== temp
[1].tmp_path
)) {
2053 atexit(remove_tempfile
);
2055 signal(SIGINT
, remove_tempfile_on_signal
);
2061 *arg
++ = temp
[0].name
;
2062 *arg
++ = temp
[0].hex
;
2063 *arg
++ = temp
[0].mode
;
2064 *arg
++ = temp
[1].name
;
2065 *arg
++ = temp
[1].hex
;
2066 *arg
++ = temp
[1].mode
;
2077 retval
= run_command_v_opt(spawn_arg
, 0);
2080 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2085 static const char *external_diff_attr(const char *name
)
2087 struct git_attr_check attr_diff_check
;
2092 setup_diff_attr_check(&attr_diff_check
);
2093 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
2094 const char *value
= attr_diff_check
.value
;
2095 if (!ATTR_TRUE(value
) &&
2096 !ATTR_FALSE(value
) &&
2097 !ATTR_UNSET(value
)) {
2098 struct ll_diff_driver
*drv
;
2100 for (drv
= user_diff
; drv
; drv
= drv
->next
)
2101 if (!strcmp(drv
->name
, value
))
2108 static void run_diff_cmd(const char *pgm
,
2111 const char *attr_path
,
2112 struct diff_filespec
*one
,
2113 struct diff_filespec
*two
,
2114 const char *xfrm_msg
,
2115 struct diff_options
*o
,
2116 int complete_rewrite
)
2118 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2121 const char *cmd
= external_diff_attr(attr_path
);
2127 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2132 builtin_diff(name
, other
? other
: name
,
2133 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2135 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2138 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2140 if (DIFF_FILE_VALID(one
)) {
2141 if (!one
->sha1_valid
) {
2143 if (!strcmp(one
->path
, "-")) {
2144 hashcpy(one
->sha1
, null_sha1
);
2147 if (lstat(one
->path
, &st
) < 0)
2148 die("stat %s", one
->path
);
2149 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2150 die("cannot hash %s\n", one
->path
);
2157 static int similarity_index(struct diff_filepair
*p
)
2159 return p
->score
* 100 / MAX_SCORE
;
2162 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2164 /* Strip the prefix but do not molest /dev/null and absolute paths */
2165 if (*namep
&& **namep
!= '/')
2166 *namep
+= prefix_length
;
2167 if (*otherp
&& **otherp
!= '/')
2168 *otherp
+= prefix_length
;
2171 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2173 const char *pgm
= external_diff();
2176 struct diff_filespec
*one
= p
->one
;
2177 struct diff_filespec
*two
= p
->two
;
2180 const char *attr_path
;
2181 int complete_rewrite
= 0;
2183 name
= p
->one
->path
;
2184 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2186 if (o
->prefix_length
)
2187 strip_prefix(o
->prefix_length
, &name
, &other
);
2189 if (DIFF_PAIR_UNMERGED(p
)) {
2190 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2191 NULL
, NULL
, NULL
, o
, 0);
2195 diff_fill_sha1_info(one
);
2196 diff_fill_sha1_info(two
);
2198 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
2199 switch (p
->status
) {
2200 case DIFF_STATUS_COPIED
:
2201 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2202 strbuf_addstr(&msg
, "\ncopy from ");
2203 quote_c_style(name
, &msg
, NULL
, 0);
2204 strbuf_addstr(&msg
, "\ncopy to ");
2205 quote_c_style(other
, &msg
, NULL
, 0);
2206 strbuf_addch(&msg
, '\n');
2208 case DIFF_STATUS_RENAMED
:
2209 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2210 strbuf_addstr(&msg
, "\nrename from ");
2211 quote_c_style(name
, &msg
, NULL
, 0);
2212 strbuf_addstr(&msg
, "\nrename to ");
2213 quote_c_style(other
, &msg
, NULL
, 0);
2214 strbuf_addch(&msg
, '\n');
2216 case DIFF_STATUS_MODIFIED
:
2218 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
2219 similarity_index(p
));
2220 complete_rewrite
= 1;
2229 if (hashcmp(one
->sha1
, two
->sha1
)) {
2230 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2232 if (DIFF_OPT_TST(o
, BINARY
)) {
2234 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2235 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2238 strbuf_addf(&msg
, "index %.*s..%.*s",
2239 abbrev
, sha1_to_hex(one
->sha1
),
2240 abbrev
, sha1_to_hex(two
->sha1
));
2241 if (one
->mode
== two
->mode
)
2242 strbuf_addf(&msg
, " %06o", one
->mode
);
2243 strbuf_addch(&msg
, '\n');
2247 strbuf_setlen(&msg
, msg
.len
- 1);
2248 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
2251 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2252 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2253 /* a filepair that changes between file and symlink
2254 * needs to be split into deletion and creation.
2256 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2257 run_diff_cmd(NULL
, name
, other
, attr_path
,
2258 one
, null
, xfrm_msg
, o
, 0);
2260 null
= alloc_filespec(one
->path
);
2261 run_diff_cmd(NULL
, name
, other
, attr_path
,
2262 null
, two
, xfrm_msg
, o
, 0);
2266 run_diff_cmd(pgm
, name
, other
, attr_path
,
2267 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2269 strbuf_release(&msg
);
2272 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2273 struct diffstat_t
*diffstat
)
2277 int complete_rewrite
= 0;
2279 if (DIFF_PAIR_UNMERGED(p
)) {
2281 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2285 name
= p
->one
->path
;
2286 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2288 if (o
->prefix_length
)
2289 strip_prefix(o
->prefix_length
, &name
, &other
);
2291 diff_fill_sha1_info(p
->one
);
2292 diff_fill_sha1_info(p
->two
);
2294 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2295 complete_rewrite
= 1;
2296 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2299 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2303 const char *attr_path
;
2305 if (DIFF_PAIR_UNMERGED(p
)) {
2310 name
= p
->one
->path
;
2311 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2312 attr_path
= other
? other
: name
;
2314 if (o
->prefix_length
)
2315 strip_prefix(o
->prefix_length
, &name
, &other
);
2317 diff_fill_sha1_info(p
->one
);
2318 diff_fill_sha1_info(p
->two
);
2320 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2323 void diff_setup(struct diff_options
*options
)
2325 memset(options
, 0, sizeof(*options
));
2327 options
->file
= stdout
;
2329 options
->line_termination
= '\n';
2330 options
->break_opt
= -1;
2331 options
->rename_limit
= -1;
2332 options
->dirstat_percent
= 3;
2333 options
->context
= 3;
2335 options
->change
= diff_change
;
2336 options
->add_remove
= diff_addremove
;
2337 if (diff_use_color_default
> 0)
2338 DIFF_OPT_SET(options
, COLOR_DIFF
);
2340 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2341 options
->detect_rename
= diff_detect_rename_default
;
2343 if (!diff_mnemonic_prefix
) {
2344 options
->a_prefix
= "a/";
2345 options
->b_prefix
= "b/";
2349 int diff_setup_done(struct diff_options
*options
)
2353 if (options
->output_format
& DIFF_FORMAT_NAME
)
2355 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2357 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2359 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2362 die("--name-only, --name-status, --check and -s are mutually exclusive");
2364 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2365 options
->detect_rename
= DIFF_DETECT_COPY
;
2367 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2368 options
->prefix
= NULL
;
2369 if (options
->prefix
)
2370 options
->prefix_length
= strlen(options
->prefix
);
2372 options
->prefix_length
= 0;
2374 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2375 DIFF_FORMAT_NAME_STATUS
|
2376 DIFF_FORMAT_CHECKDIFF
|
2377 DIFF_FORMAT_NO_OUTPUT
))
2378 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2379 DIFF_FORMAT_NUMSTAT
|
2380 DIFF_FORMAT_DIFFSTAT
|
2381 DIFF_FORMAT_SHORTSTAT
|
2382 DIFF_FORMAT_DIRSTAT
|
2383 DIFF_FORMAT_SUMMARY
|
2387 * These cases always need recursive; we do not drop caller-supplied
2388 * recursive bits for other formats here.
2390 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2391 DIFF_FORMAT_NUMSTAT
|
2392 DIFF_FORMAT_DIFFSTAT
|
2393 DIFF_FORMAT_SHORTSTAT
|
2394 DIFF_FORMAT_DIRSTAT
|
2395 DIFF_FORMAT_SUMMARY
|
2396 DIFF_FORMAT_CHECKDIFF
))
2397 DIFF_OPT_SET(options
, RECURSIVE
);
2399 * Also pickaxe would not work very well if you do not say recursive
2401 if (options
->pickaxe
)
2402 DIFF_OPT_SET(options
, RECURSIVE
);
2404 if (options
->detect_rename
&& options
->rename_limit
< 0)
2405 options
->rename_limit
= diff_rename_limit_default
;
2406 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2408 /* read-cache does not die even when it fails
2409 * so it is safe for us to do this here. Also
2410 * it does not smudge active_cache or active_nr
2411 * when it fails, so we do not have to worry about
2412 * cleaning it up ourselves either.
2416 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2417 options
->abbrev
= 40; /* full */
2420 * It does not make sense to show the first hit we happened
2421 * to have found. It does not make sense not to return with
2422 * exit code in such a case either.
2424 if (DIFF_OPT_TST(options
, QUIET
)) {
2425 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2426 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2430 * If we postprocess in diffcore, we cannot simply return
2431 * upon the first hit. We need to run diff as usual.
2433 if (options
->pickaxe
|| options
->filter
)
2434 DIFF_OPT_CLR(options
, QUIET
);
2439 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2449 if (c
== arg_short
) {
2453 if (val
&& isdigit(c
)) {
2455 int n
= strtoul(arg
, &end
, 10);
2466 eq
= strchr(arg
, '=');
2471 if (!len
|| strncmp(arg
, arg_long
, len
))
2476 if (!isdigit(*++eq
))
2478 n
= strtoul(eq
, &end
, 10);
2486 static int diff_scoreopt_parse(const char *opt
);
2488 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2490 const char *arg
= av
[0];
2492 /* Output format options */
2493 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2494 options
->output_format
|= DIFF_FORMAT_PATCH
;
2495 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2496 options
->output_format
|= DIFF_FORMAT_PATCH
;
2497 else if (!strcmp(arg
, "--raw"))
2498 options
->output_format
|= DIFF_FORMAT_RAW
;
2499 else if (!strcmp(arg
, "--patch-with-raw"))
2500 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2501 else if (!strcmp(arg
, "--numstat"))
2502 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2503 else if (!strcmp(arg
, "--shortstat"))
2504 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2505 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2506 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2507 else if (!strcmp(arg
, "--cumulative"))
2508 options
->output_format
|= DIFF_FORMAT_CUMULATIVE
;
2509 else if (!strcmp(arg
, "--check"))
2510 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2511 else if (!strcmp(arg
, "--summary"))
2512 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2513 else if (!strcmp(arg
, "--patch-with-stat"))
2514 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2515 else if (!strcmp(arg
, "--name-only"))
2516 options
->output_format
|= DIFF_FORMAT_NAME
;
2517 else if (!strcmp(arg
, "--name-status"))
2518 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2519 else if (!strcmp(arg
, "-s"))
2520 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2521 else if (!prefixcmp(arg
, "--stat")) {
2523 int width
= options
->stat_width
;
2524 int name_width
= options
->stat_name_width
;
2530 if (!prefixcmp(arg
, "-width="))
2531 width
= strtoul(arg
+ 7, &end
, 10);
2532 else if (!prefixcmp(arg
, "-name-width="))
2533 name_width
= strtoul(arg
+ 12, &end
, 10);
2536 width
= strtoul(arg
+1, &end
, 10);
2538 name_width
= strtoul(end
+1, &end
, 10);
2541 /* Important! This checks all the error cases! */
2544 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2545 options
->stat_name_width
= name_width
;
2546 options
->stat_width
= width
;
2549 /* renames options */
2550 else if (!prefixcmp(arg
, "-B")) {
2551 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2554 else if (!prefixcmp(arg
, "-M")) {
2555 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2557 options
->detect_rename
= DIFF_DETECT_RENAME
;
2559 else if (!prefixcmp(arg
, "-C")) {
2560 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2561 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2562 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2564 options
->detect_rename
= DIFF_DETECT_COPY
;
2566 else if (!strcmp(arg
, "--no-renames"))
2567 options
->detect_rename
= 0;
2568 else if (!strcmp(arg
, "--relative"))
2569 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2570 else if (!prefixcmp(arg
, "--relative=")) {
2571 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2572 options
->prefix
= arg
+ 11;
2576 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2577 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2578 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2579 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2580 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2581 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2584 else if (!strcmp(arg
, "--binary")) {
2585 options
->output_format
|= DIFF_FORMAT_PATCH
;
2586 DIFF_OPT_SET(options
, BINARY
);
2588 else if (!strcmp(arg
, "--full-index"))
2589 DIFF_OPT_SET(options
, FULL_INDEX
);
2590 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2591 DIFF_OPT_SET(options
, TEXT
);
2592 else if (!strcmp(arg
, "-R"))
2593 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2594 else if (!strcmp(arg
, "--find-copies-harder"))
2595 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2596 else if (!strcmp(arg
, "--follow"))
2597 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2598 else if (!strcmp(arg
, "--color"))
2599 DIFF_OPT_SET(options
, COLOR_DIFF
);
2600 else if (!strcmp(arg
, "--no-color"))
2601 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2602 else if (!strcmp(arg
, "--color-words"))
2603 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2604 else if (!strcmp(arg
, "--exit-code"))
2605 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2606 else if (!strcmp(arg
, "--quiet"))
2607 DIFF_OPT_SET(options
, QUIET
);
2608 else if (!strcmp(arg
, "--ext-diff"))
2609 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2610 else if (!strcmp(arg
, "--no-ext-diff"))
2611 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2612 else if (!strcmp(arg
, "--ignore-submodules"))
2613 DIFF_OPT_SET(options
, IGNORE_SUBMODULES
);
2616 else if (!strcmp(arg
, "-z"))
2617 options
->line_termination
= 0;
2618 else if (!prefixcmp(arg
, "-l"))
2619 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2620 else if (!prefixcmp(arg
, "-S"))
2621 options
->pickaxe
= arg
+ 2;
2622 else if (!strcmp(arg
, "--pickaxe-all"))
2623 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2624 else if (!strcmp(arg
, "--pickaxe-regex"))
2625 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2626 else if (!prefixcmp(arg
, "-O"))
2627 options
->orderfile
= arg
+ 2;
2628 else if (!prefixcmp(arg
, "--diff-filter="))
2629 options
->filter
= arg
+ 14;
2630 else if (!strcmp(arg
, "--abbrev"))
2631 options
->abbrev
= DEFAULT_ABBREV
;
2632 else if (!prefixcmp(arg
, "--abbrev=")) {
2633 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2634 if (options
->abbrev
< MINIMUM_ABBREV
)
2635 options
->abbrev
= MINIMUM_ABBREV
;
2636 else if (40 < options
->abbrev
)
2637 options
->abbrev
= 40;
2639 else if (!prefixcmp(arg
, "--src-prefix="))
2640 options
->a_prefix
= arg
+ 13;
2641 else if (!prefixcmp(arg
, "--dst-prefix="))
2642 options
->b_prefix
= arg
+ 13;
2643 else if (!strcmp(arg
, "--no-prefix"))
2644 options
->a_prefix
= options
->b_prefix
= "";
2645 else if (!prefixcmp(arg
, "--output=")) {
2646 options
->file
= fopen(arg
+ strlen("--output="), "w");
2647 options
->close_file
= 1;
2653 static int parse_num(const char **cp_p
)
2655 unsigned long num
, scale
;
2657 const char *cp
= *cp_p
;
2664 if ( !dot
&& ch
== '.' ) {
2667 } else if ( ch
== '%' ) {
2668 scale
= dot
? scale
*100 : 100;
2669 cp
++; /* % is always at the end */
2671 } else if ( ch
>= '0' && ch
<= '9' ) {
2672 if ( scale
< 100000 ) {
2674 num
= (num
*10) + (ch
-'0');
2683 /* user says num divided by scale and we say internally that
2684 * is MAX_SCORE * num / scale.
2686 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2689 static int diff_scoreopt_parse(const char *opt
)
2691 int opt1
, opt2
, cmd
;
2696 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2697 return -1; /* that is not a -M, -C nor -B option */
2699 opt1
= parse_num(&opt
);
2705 else if (*opt
!= '/')
2706 return -1; /* we expect -B80/99 or -B80 */
2709 opt2
= parse_num(&opt
);
2714 return opt1
| (opt2
<< 16);
2717 struct diff_queue_struct diff_queued_diff
;
2719 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2721 if (queue
->alloc
<= queue
->nr
) {
2722 queue
->alloc
= alloc_nr(queue
->alloc
);
2723 queue
->queue
= xrealloc(queue
->queue
,
2724 sizeof(dp
) * queue
->alloc
);
2726 queue
->queue
[queue
->nr
++] = dp
;
2729 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2730 struct diff_filespec
*one
,
2731 struct diff_filespec
*two
)
2733 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2741 void diff_free_filepair(struct diff_filepair
*p
)
2743 free_filespec(p
->one
);
2744 free_filespec(p
->two
);
2748 /* This is different from find_unique_abbrev() in that
2749 * it stuffs the result with dots for alignment.
2751 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2756 return sha1_to_hex(sha1
);
2758 abbrev
= find_unique_abbrev(sha1
, len
);
2759 abblen
= strlen(abbrev
);
2761 static char hex
[41];
2762 if (len
< abblen
&& abblen
<= len
+ 2)
2763 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2765 sprintf(hex
, "%s...", abbrev
);
2768 return sha1_to_hex(sha1
);
2771 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2773 int line_termination
= opt
->line_termination
;
2774 int inter_name_termination
= line_termination
? '\t' : '\0';
2776 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2777 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2778 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2779 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2782 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
2783 inter_name_termination
);
2785 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
2788 if (p
->status
== DIFF_STATUS_COPIED
||
2789 p
->status
== DIFF_STATUS_RENAMED
) {
2790 const char *name_a
, *name_b
;
2791 name_a
= p
->one
->path
;
2792 name_b
= p
->two
->path
;
2793 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2794 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
2795 write_name_quoted(name_b
, opt
->file
, line_termination
);
2797 const char *name_a
, *name_b
;
2798 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2800 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2801 write_name_quoted(name_a
, opt
->file
, line_termination
);
2805 int diff_unmodified_pair(struct diff_filepair
*p
)
2807 /* This function is written stricter than necessary to support
2808 * the currently implemented transformers, but the idea is to
2809 * let transformers to produce diff_filepairs any way they want,
2810 * and filter and clean them up here before producing the output.
2812 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2814 if (DIFF_PAIR_UNMERGED(p
))
2815 return 0; /* unmerged is interesting */
2817 /* deletion, addition, mode or type change
2818 * and rename are all interesting.
2820 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2821 DIFF_PAIR_MODE_CHANGED(p
) ||
2822 strcmp(one
->path
, two
->path
))
2825 /* both are valid and point at the same path. that is, we are
2826 * dealing with a change.
2828 if (one
->sha1_valid
&& two
->sha1_valid
&&
2829 !hashcmp(one
->sha1
, two
->sha1
))
2830 return 1; /* no change */
2831 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2832 return 1; /* both look at the same file on the filesystem. */
2836 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2838 if (diff_unmodified_pair(p
))
2841 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2842 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2843 return; /* no tree diffs in patch format */
2848 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2849 struct diffstat_t
*diffstat
)
2851 if (diff_unmodified_pair(p
))
2854 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2855 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2856 return; /* no tree diffs in patch format */
2858 run_diffstat(p
, o
, diffstat
);
2861 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2862 struct diff_options
*o
)
2864 if (diff_unmodified_pair(p
))
2867 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2868 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2869 return; /* no tree diffs in patch format */
2871 run_checkdiff(p
, o
);
2874 int diff_queue_is_empty(void)
2876 struct diff_queue_struct
*q
= &diff_queued_diff
;
2878 for (i
= 0; i
< q
->nr
; i
++)
2879 if (!diff_unmodified_pair(q
->queue
[i
]))
2885 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2887 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2890 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2892 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2893 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2895 s
->size
, s
->xfrm_flags
);
2898 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2900 diff_debug_filespec(p
->one
, i
, "one");
2901 diff_debug_filespec(p
->two
, i
, "two");
2902 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2903 p
->score
, p
->status
? p
->status
: '?',
2904 p
->one
->rename_used
, p
->broken_pair
);
2907 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2911 fprintf(stderr
, "%s\n", msg
);
2912 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2913 for (i
= 0; i
< q
->nr
; i
++) {
2914 struct diff_filepair
*p
= q
->queue
[i
];
2915 diff_debug_filepair(p
, i
);
2920 static void diff_resolve_rename_copy(void)
2923 struct diff_filepair
*p
;
2924 struct diff_queue_struct
*q
= &diff_queued_diff
;
2926 diff_debug_queue("resolve-rename-copy", q
);
2928 for (i
= 0; i
< q
->nr
; i
++) {
2930 p
->status
= 0; /* undecided */
2931 if (DIFF_PAIR_UNMERGED(p
))
2932 p
->status
= DIFF_STATUS_UNMERGED
;
2933 else if (!DIFF_FILE_VALID(p
->one
))
2934 p
->status
= DIFF_STATUS_ADDED
;
2935 else if (!DIFF_FILE_VALID(p
->two
))
2936 p
->status
= DIFF_STATUS_DELETED
;
2937 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2938 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2940 /* from this point on, we are dealing with a pair
2941 * whose both sides are valid and of the same type, i.e.
2942 * either in-place edit or rename/copy edit.
2944 else if (DIFF_PAIR_RENAME(p
)) {
2946 * A rename might have re-connected a broken
2947 * pair up, causing the pathnames to be the
2948 * same again. If so, that's not a rename at
2949 * all, just a modification..
2951 * Otherwise, see if this source was used for
2952 * multiple renames, in which case we decrement
2953 * the count, and call it a copy.
2955 if (!strcmp(p
->one
->path
, p
->two
->path
))
2956 p
->status
= DIFF_STATUS_MODIFIED
;
2957 else if (--p
->one
->rename_used
> 0)
2958 p
->status
= DIFF_STATUS_COPIED
;
2960 p
->status
= DIFF_STATUS_RENAMED
;
2962 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2963 p
->one
->mode
!= p
->two
->mode
||
2964 is_null_sha1(p
->one
->sha1
))
2965 p
->status
= DIFF_STATUS_MODIFIED
;
2967 /* This is a "no-change" entry and should not
2968 * happen anymore, but prepare for broken callers.
2970 error("feeding unmodified %s to diffcore",
2972 p
->status
= DIFF_STATUS_UNKNOWN
;
2975 diff_debug_queue("resolve-rename-copy done", q
);
2978 static int check_pair_status(struct diff_filepair
*p
)
2980 switch (p
->status
) {
2981 case DIFF_STATUS_UNKNOWN
:
2984 die("internal error in diff-resolve-rename-copy");
2990 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2992 int fmt
= opt
->output_format
;
2994 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2995 diff_flush_checkdiff(p
, opt
);
2996 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2997 diff_flush_raw(p
, opt
);
2998 else if (fmt
& DIFF_FORMAT_NAME
) {
2999 const char *name_a
, *name_b
;
3000 name_a
= p
->two
->path
;
3002 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3003 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
3007 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
3010 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
3012 fprintf(file
, " %s ", newdelete
);
3013 write_name_quoted(fs
->path
, file
, '\n');
3017 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
)
3019 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
3020 fprintf(file
, " mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
3021 show_name
? ' ' : '\n');
3023 write_name_quoted(p
->two
->path
, file
, '\n');
3028 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
)
3030 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
3032 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
3034 show_mode_change(file
, p
, 0);
3037 static void diff_summary(FILE *file
, struct diff_filepair
*p
)
3040 case DIFF_STATUS_DELETED
:
3041 show_file_mode_name(file
, "delete", p
->one
);
3043 case DIFF_STATUS_ADDED
:
3044 show_file_mode_name(file
, "create", p
->two
);
3046 case DIFF_STATUS_COPIED
:
3047 show_rename_copy(file
, "copy", p
);
3049 case DIFF_STATUS_RENAMED
:
3050 show_rename_copy(file
, "rename", p
);
3054 fputs(" rewrite ", file
);
3055 write_name_quoted(p
->two
->path
, file
, ' ');
3056 fprintf(file
, "(%d%%)\n", similarity_index(p
));
3058 show_mode_change(file
, p
, !p
->score
);
3064 struct xdiff_emit_state xm
;
3069 static int remove_space(char *line
, int len
)
3075 for (i
= 0; i
< len
; i
++)
3076 if (!isspace((c
= line
[i
])))
3082 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3084 struct patch_id_t
*data
= priv
;
3087 /* Ignore line numbers when computing the SHA1 of the patch */
3088 if (!prefixcmp(line
, "@@ -"))
3091 new_len
= remove_space(line
, len
);
3093 SHA1_Update(data
->ctx
, line
, new_len
);
3094 data
->patchlen
+= new_len
;
3097 /* returns 0 upon success, and writes result into sha1 */
3098 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3100 struct diff_queue_struct
*q
= &diff_queued_diff
;
3103 struct patch_id_t data
;
3104 char buffer
[PATH_MAX
* 4 + 20];
3107 memset(&data
, 0, sizeof(struct patch_id_t
));
3109 data
.xm
.consume
= patch_id_consume
;
3111 for (i
= 0; i
< q
->nr
; i
++) {
3116 struct diff_filepair
*p
= q
->queue
[i
];
3119 memset(&xecfg
, 0, sizeof(xecfg
));
3121 return error("internal diff status error");
3122 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3124 if (diff_unmodified_pair(p
))
3126 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3127 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3129 if (DIFF_PAIR_UNMERGED(p
))
3132 diff_fill_sha1_info(p
->one
);
3133 diff_fill_sha1_info(p
->two
);
3134 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3135 fill_mmfile(&mf2
, p
->two
) < 0)
3136 return error("unable to read files to diff");
3138 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3139 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3140 if (p
->one
->mode
== 0)
3141 len1
= snprintf(buffer
, sizeof(buffer
),
3142 "diff--gita/%.*sb/%.*s"
3149 len2
, p
->two
->path
);
3150 else if (p
->two
->mode
== 0)
3151 len1
= snprintf(buffer
, sizeof(buffer
),
3152 "diff--gita/%.*sb/%.*s"
3153 "deletedfilemode%06o"
3159 len1
, p
->one
->path
);
3161 len1
= snprintf(buffer
, sizeof(buffer
),
3162 "diff--gita/%.*sb/%.*s"
3168 len2
, p
->two
->path
);
3169 SHA1_Update(&ctx
, buffer
, len1
);
3171 xpp
.flags
= XDF_NEED_MINIMAL
;
3173 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3174 ecb
.outf
= xdiff_outf
;
3176 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
3179 SHA1_Final(sha1
, &ctx
);
3183 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3185 struct diff_queue_struct
*q
= &diff_queued_diff
;
3187 int result
= diff_get_patch_id(options
, sha1
);
3189 for (i
= 0; i
< q
->nr
; i
++)
3190 diff_free_filepair(q
->queue
[i
]);
3194 q
->nr
= q
->alloc
= 0;
3199 static int is_summary_empty(const struct diff_queue_struct
*q
)
3203 for (i
= 0; i
< q
->nr
; i
++) {
3204 const struct diff_filepair
*p
= q
->queue
[i
];
3206 switch (p
->status
) {
3207 case DIFF_STATUS_DELETED
:
3208 case DIFF_STATUS_ADDED
:
3209 case DIFF_STATUS_COPIED
:
3210 case DIFF_STATUS_RENAMED
:
3215 if (p
->one
->mode
&& p
->two
->mode
&&
3216 p
->one
->mode
!= p
->two
->mode
)
3224 void diff_flush(struct diff_options
*options
)
3226 struct diff_queue_struct
*q
= &diff_queued_diff
;
3227 int i
, output_format
= options
->output_format
;
3231 * Order: raw, stat, summary, patch
3232 * or: name/name-status/checkdiff (other bits clear)
3237 if (output_format
& (DIFF_FORMAT_RAW
|
3239 DIFF_FORMAT_NAME_STATUS
|
3240 DIFF_FORMAT_CHECKDIFF
)) {
3241 for (i
= 0; i
< q
->nr
; i
++) {
3242 struct diff_filepair
*p
= q
->queue
[i
];
3243 if (check_pair_status(p
))
3244 flush_one_pair(p
, options
);
3249 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3250 struct diffstat_t diffstat
;
3252 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3253 diffstat
.xm
.consume
= diffstat_consume
;
3254 for (i
= 0; i
< q
->nr
; i
++) {
3255 struct diff_filepair
*p
= q
->queue
[i
];
3256 if (check_pair_status(p
))
3257 diff_flush_stat(p
, options
, &diffstat
);
3259 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3260 show_numstat(&diffstat
, options
);
3261 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3262 show_stats(&diffstat
, options
);
3263 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3264 show_shortstats(&diffstat
, options
);
3265 free_diffstat_info(&diffstat
);
3268 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3269 show_dirstat(options
);
3271 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3272 for (i
= 0; i
< q
->nr
; i
++)
3273 diff_summary(options
->file
, q
->queue
[i
]);
3277 if (output_format
& DIFF_FORMAT_PATCH
) {
3279 putc(options
->line_termination
, options
->file
);
3280 if (options
->stat_sep
) {
3281 /* attach patch instead of inline */
3282 fputs(options
->stat_sep
, options
->file
);
3286 for (i
= 0; i
< q
->nr
; i
++) {
3287 struct diff_filepair
*p
= q
->queue
[i
];
3288 if (check_pair_status(p
))
3289 diff_flush_patch(p
, options
);
3293 if (output_format
& DIFF_FORMAT_CALLBACK
)
3294 options
->format_callback(q
, options
, options
->format_callback_data
);
3296 for (i
= 0; i
< q
->nr
; i
++)
3297 diff_free_filepair(q
->queue
[i
]);
3301 q
->nr
= q
->alloc
= 0;
3302 if (options
->close_file
)
3303 fclose(options
->file
);
3306 static void diffcore_apply_filter(const char *filter
)
3309 struct diff_queue_struct
*q
= &diff_queued_diff
;
3310 struct diff_queue_struct outq
;
3312 outq
.nr
= outq
.alloc
= 0;
3317 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3319 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3320 struct diff_filepair
*p
= q
->queue
[i
];
3321 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3323 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3325 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3326 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3327 strchr(filter
, p
->status
)))
3333 /* otherwise we will clear the whole queue
3334 * by copying the empty outq at the end of this
3335 * function, but first clear the current entries
3338 for (i
= 0; i
< q
->nr
; i
++)
3339 diff_free_filepair(q
->queue
[i
]);
3342 /* Only the matching ones */
3343 for (i
= 0; i
< q
->nr
; i
++) {
3344 struct diff_filepair
*p
= q
->queue
[i
];
3346 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3348 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3350 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3351 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3352 strchr(filter
, p
->status
)))
3355 diff_free_filepair(p
);
3362 /* Check whether two filespecs with the same mode and size are identical */
3363 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3364 struct diff_filespec
*two
)
3366 if (S_ISGITLINK(one
->mode
))
3368 if (diff_populate_filespec(one
, 0))
3370 if (diff_populate_filespec(two
, 0))
3372 return !memcmp(one
->data
, two
->data
, one
->size
);
3375 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3378 struct diff_queue_struct
*q
= &diff_queued_diff
;
3379 struct diff_queue_struct outq
;
3381 outq
.nr
= outq
.alloc
= 0;
3383 for (i
= 0; i
< q
->nr
; i
++) {
3384 struct diff_filepair
*p
= q
->queue
[i
];
3387 * 1. Entries that come from stat info dirtyness
3388 * always have both sides (iow, not create/delete),
3389 * one side of the object name is unknown, with
3390 * the same mode and size. Keep the ones that
3391 * do not match these criteria. They have real
3394 * 2. At this point, the file is known to be modified,
3395 * with the same mode and size, and the object
3396 * name of one side is unknown. Need to inspect
3397 * the identical contents.
3399 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3400 !DIFF_FILE_VALID(p
->two
) ||
3401 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3402 (p
->one
->mode
!= p
->two
->mode
) ||
3403 diff_populate_filespec(p
->one
, 1) ||
3404 diff_populate_filespec(p
->two
, 1) ||
3405 (p
->one
->size
!= p
->two
->size
) ||
3406 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3410 * The caller can subtract 1 from skip_stat_unmatch
3411 * to determine how many paths were dirty only
3412 * due to stat info mismatch.
3414 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3415 diffopt
->skip_stat_unmatch
++;
3416 diff_free_filepair(p
);
3423 void diffcore_std(struct diff_options
*options
)
3425 if (DIFF_OPT_TST(options
, QUIET
))
3428 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3429 diffcore_skip_stat_unmatch(options
);
3430 if (options
->break_opt
!= -1)
3431 diffcore_break(options
->break_opt
);
3432 if (options
->detect_rename
)
3433 diffcore_rename(options
);
3434 if (options
->break_opt
!= -1)
3435 diffcore_merge_broken();
3436 if (options
->pickaxe
)
3437 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3438 if (options
->orderfile
)
3439 diffcore_order(options
->orderfile
);
3440 diff_resolve_rename_copy();
3441 diffcore_apply_filter(options
->filter
);
3443 if (diff_queued_diff
.nr
)
3444 DIFF_OPT_SET(options
, HAS_CHANGES
);
3446 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3449 int diff_result_code(struct diff_options
*opt
, int status
)
3452 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3453 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3455 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3456 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3458 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3459 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3464 void diff_addremove(struct diff_options
*options
,
3465 int addremove
, unsigned mode
,
3466 const unsigned char *sha1
,
3467 const char *concatpath
)
3469 struct diff_filespec
*one
, *two
;
3471 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(mode
))
3474 /* This may look odd, but it is a preparation for
3475 * feeding "there are unchanged files which should
3476 * not produce diffs, but when you are doing copy
3477 * detection you would need them, so here they are"
3478 * entries to the diff-core. They will be prefixed
3479 * with something like '=' or '*' (I haven't decided
3480 * which but should not make any difference).
3481 * Feeding the same new and old to diff_change()
3482 * also has the same effect.
3483 * Before the final output happens, they are pruned after
3484 * merged into rename/copy pairs as appropriate.
3486 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3487 addremove
= (addremove
== '+' ? '-' :
3488 addremove
== '-' ? '+' : addremove
);
3490 if (options
->prefix
&&
3491 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3494 one
= alloc_filespec(concatpath
);
3495 two
= alloc_filespec(concatpath
);
3497 if (addremove
!= '+')
3498 fill_filespec(one
, sha1
, mode
);
3499 if (addremove
!= '-')
3500 fill_filespec(two
, sha1
, mode
);
3502 diff_queue(&diff_queued_diff
, one
, two
);
3503 DIFF_OPT_SET(options
, HAS_CHANGES
);
3506 void diff_change(struct diff_options
*options
,
3507 unsigned old_mode
, unsigned new_mode
,
3508 const unsigned char *old_sha1
,
3509 const unsigned char *new_sha1
,
3510 const char *concatpath
)
3512 struct diff_filespec
*one
, *two
;
3514 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(old_mode
)
3515 && S_ISGITLINK(new_mode
))
3518 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3520 const unsigned char *tmp_c
;
3521 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3522 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3525 if (options
->prefix
&&
3526 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3529 one
= alloc_filespec(concatpath
);
3530 two
= alloc_filespec(concatpath
);
3531 fill_filespec(one
, old_sha1
, old_mode
);
3532 fill_filespec(two
, new_sha1
, new_mode
);
3534 diff_queue(&diff_queued_diff
, one
, two
);
3535 DIFF_OPT_SET(options
, HAS_CHANGES
);
3538 void diff_unmerge(struct diff_options
*options
,
3540 unsigned mode
, const unsigned char *sha1
)
3542 struct diff_filespec
*one
, *two
;
3544 if (options
->prefix
&&
3545 strncmp(path
, options
->prefix
, options
->prefix_length
))
3548 one
= alloc_filespec(path
);
3549 two
= alloc_filespec(path
);
3550 fill_filespec(one
, sha1
, mode
);
3551 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;