2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
13 #ifdef NO_FAST_WORKING_DIRECTORY
14 #define FAST_WORKING_DIRECTORY 0
16 #define FAST_WORKING_DIRECTORY 1
19 static int diff_detect_rename_default
;
20 static int diff_rename_limit_default
= 100;
21 static int diff_use_color_default
;
22 int diff_auto_refresh_index
= 1;
24 static char diff_colors
[][COLOR_MAXLEN
] = {
26 "", /* PLAIN (normal) */
27 "\033[1m", /* METAINFO (bold) */
28 "\033[36m", /* FRAGINFO (cyan) */
29 "\033[31m", /* OLD (red) */
30 "\033[32m", /* NEW (green) */
31 "\033[33m", /* COMMIT (yellow) */
32 "\033[41m", /* WHITESPACE (red background) */
35 static int parse_diff_color_slot(const char *var
, int ofs
)
37 if (!strcasecmp(var
+ofs
, "plain"))
39 if (!strcasecmp(var
+ofs
, "meta"))
41 if (!strcasecmp(var
+ofs
, "frag"))
43 if (!strcasecmp(var
+ofs
, "old"))
45 if (!strcasecmp(var
+ofs
, "new"))
47 if (!strcasecmp(var
+ofs
, "commit"))
49 if (!strcasecmp(var
+ofs
, "whitespace"))
50 return DIFF_WHITESPACE
;
51 die("bad config variable '%s'", var
);
54 static struct ll_diff_driver
{
56 struct ll_diff_driver
*next
;
58 } *user_diff
, **user_diff_tail
;
60 static void read_config_if_needed(void)
62 if (!user_diff_tail
) {
63 user_diff_tail
= &user_diff
;
64 git_config(git_diff_ui_config
);
69 * Currently there is only "diff.<drivername>.command" variable;
70 * because there are "diff.color.<slot>" variables, we are parsing
71 * this in a bit convoluted way to allow low level diff driver
74 static int parse_lldiff_command(const char *var
, const char *ep
, const char *value
)
78 struct ll_diff_driver
*drv
;
82 for (drv
= user_diff
; drv
; drv
= drv
->next
)
83 if (!strncmp(drv
->name
, name
, namelen
) && !drv
->name
[namelen
])
86 drv
= xcalloc(1, sizeof(struct ll_diff_driver
));
87 drv
->name
= xmemdupz(name
, namelen
);
89 user_diff_tail
= &user_diff
;
90 *user_diff_tail
= drv
;
91 user_diff_tail
= &(drv
->next
);
95 return error("%s: lacks value", var
);
96 drv
->cmd
= strdup(value
);
101 * 'diff.<what>.funcname' attribute can be specified in the configuration
102 * to define a customized regexp to find the beginning of a function to
103 * be used for hunk header lines of "diff -p" style output.
105 static struct funcname_pattern
{
108 struct funcname_pattern
*next
;
109 } *funcname_pattern_list
;
111 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
)
115 struct funcname_pattern
*pp
;
117 name
= var
+ 5; /* "diff." */
120 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
121 if (!strncmp(pp
->name
, name
, namelen
) && !pp
->name
[namelen
])
124 pp
= xcalloc(1, sizeof(*pp
));
125 pp
->name
= xmemdupz(name
, namelen
);
126 pp
->next
= funcname_pattern_list
;
127 funcname_pattern_list
= pp
;
131 pp
->pattern
= xstrdup(value
);
136 * These are to give UI layer defaults.
137 * The core-level commands such as git-diff-files should
138 * never be affected by the setting of diff.renames
139 * the user happens to have in the configuration file.
141 int git_diff_ui_config(const char *var
, const char *value
)
143 if (!strcmp(var
, "diff.renamelimit")) {
144 diff_rename_limit_default
= git_config_int(var
, value
);
147 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
148 diff_use_color_default
= git_config_colorbool(var
, value
);
151 if (!strcmp(var
, "diff.renames")) {
153 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
154 else if (!strcasecmp(value
, "copies") ||
155 !strcasecmp(value
, "copy"))
156 diff_detect_rename_default
= DIFF_DETECT_COPY
;
157 else if (git_config_bool(var
,value
))
158 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
161 if (!strcmp(var
, "diff.autorefreshindex")) {
162 diff_auto_refresh_index
= git_config_bool(var
, value
);
165 if (!prefixcmp(var
, "diff.")) {
166 const char *ep
= strrchr(var
, '.');
169 if (!strcmp(ep
, ".command"))
170 return parse_lldiff_command(var
, ep
, value
);
171 if (!strcmp(ep
, ".funcname"))
172 return parse_funcname_pattern(var
, ep
, value
);
175 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
176 int slot
= parse_diff_color_slot(var
, 11);
177 color_parse(value
, var
, diff_colors
[slot
]);
181 return git_default_config(var
, value
);
184 static char *quote_two(const char *one
, const char *two
)
186 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
187 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
190 strbuf_init(&res
, 0);
191 if (need_one
+ need_two
) {
192 strbuf_addch(&res
, '"');
193 quote_c_style(one
, &res
, NULL
, 1);
194 quote_c_style(two
, &res
, NULL
, 1);
195 strbuf_addch(&res
, '"');
197 strbuf_addstr(&res
, one
);
198 strbuf_addstr(&res
, two
);
200 return strbuf_detach(&res
, NULL
);
203 static const char *external_diff(void)
205 static const char *external_diff_cmd
= NULL
;
206 static int done_preparing
= 0;
209 return external_diff_cmd
;
210 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
212 return external_diff_cmd
;
215 static struct diff_tempfile
{
216 const char *name
; /* filename external diff should read from */
219 char tmp_path
[PATH_MAX
];
222 static int count_lines(const char *data
, int size
)
224 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
231 completely_empty
= 0;
235 completely_empty
= 0;
238 if (completely_empty
)
241 count
++; /* no trailing newline */
245 static void print_line_count(int count
)
255 printf("1,%d", count
);
260 static void copy_file(int prefix
, const char *data
, int size
,
261 const char *set
, const char *reset
)
263 int ch
, nl_just_seen
= 1;
272 fputs(reset
, stdout
);
278 printf("%s\n\\ No newline at end of file\n", reset
);
281 static void emit_rewrite_diff(const char *name_a
,
283 struct diff_filespec
*one
,
284 struct diff_filespec
*two
,
288 const char *name_a_tab
, *name_b_tab
;
289 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
290 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
291 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
292 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
293 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
295 name_a
+= (*name_a
== '/');
296 name_b
+= (*name_b
== '/');
297 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
298 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
300 diff_populate_filespec(one
, 0);
301 diff_populate_filespec(two
, 0);
302 lc_a
= count_lines(one
->data
, one
->size
);
303 lc_b
= count_lines(two
->data
, two
->size
);
304 printf("%s--- a/%s%s%s\n%s+++ b/%s%s%s\n%s@@ -",
305 metainfo
, name_a
, name_a_tab
, reset
,
306 metainfo
, name_b
, name_b_tab
, reset
, fraginfo
);
307 print_line_count(lc_a
);
309 print_line_count(lc_b
);
310 printf(" @@%s\n", reset
);
312 copy_file('-', one
->data
, one
->size
, old
, reset
);
314 copy_file('+', two
->data
, two
->size
, new, reset
);
317 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
319 if (!DIFF_FILE_VALID(one
)) {
320 mf
->ptr
= (char *)""; /* does not matter */
324 else if (diff_populate_filespec(one
, 0))
327 mf
->size
= one
->size
;
331 struct diff_words_buffer
{
334 long current
; /* output pointer */
335 int suppressed_newline
;
338 static void diff_words_append(char *line
, unsigned long len
,
339 struct diff_words_buffer
*buffer
)
341 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
342 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
343 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
347 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
348 buffer
->text
.size
+= len
;
351 struct diff_words_data
{
352 struct xdiff_emit_state xm
;
353 struct diff_words_buffer minus
, plus
;
356 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
357 int suppress_newline
)
365 ptr
= buffer
->text
.ptr
+ buffer
->current
;
366 buffer
->current
+= len
;
368 if (ptr
[len
- 1] == '\n') {
373 fputs(diff_get_color(1, color
), stdout
);
374 fwrite(ptr
, len
, 1, stdout
);
375 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
378 if (suppress_newline
)
379 buffer
->suppressed_newline
= 1;
385 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
387 struct diff_words_data
*diff_words
= priv
;
389 if (diff_words
->minus
.suppressed_newline
) {
392 diff_words
->minus
.suppressed_newline
= 0;
398 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
401 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
404 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
405 diff_words
->minus
.current
+= len
;
410 /* this executes the word diff on the accumulated buffers */
411 static void diff_words_show(struct diff_words_data
*diff_words
)
416 mmfile_t minus
, plus
;
419 memset(&xecfg
, 0, sizeof(xecfg
));
420 minus
.size
= diff_words
->minus
.text
.size
;
421 minus
.ptr
= xmalloc(minus
.size
);
422 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
423 for (i
= 0; i
< minus
.size
; i
++)
424 if (isspace(minus
.ptr
[i
]))
426 diff_words
->minus
.current
= 0;
428 plus
.size
= diff_words
->plus
.text
.size
;
429 plus
.ptr
= xmalloc(plus
.size
);
430 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
431 for (i
= 0; i
< plus
.size
; i
++)
432 if (isspace(plus
.ptr
[i
]))
434 diff_words
->plus
.current
= 0;
436 xpp
.flags
= XDF_NEED_MINIMAL
;
437 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
438 ecb
.outf
= xdiff_outf
;
439 ecb
.priv
= diff_words
;
440 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
441 xdl_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
445 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
447 if (diff_words
->minus
.suppressed_newline
) {
449 diff_words
->minus
.suppressed_newline
= 0;
453 struct emit_callback
{
454 struct xdiff_emit_state xm
;
455 int nparents
, color_diff
;
456 const char **label_path
;
457 struct diff_words_data
*diff_words
;
461 static void free_diff_words_data(struct emit_callback
*ecbdata
)
463 if (ecbdata
->diff_words
) {
465 if (ecbdata
->diff_words
->minus
.text
.size
||
466 ecbdata
->diff_words
->plus
.text
.size
)
467 diff_words_show(ecbdata
->diff_words
);
469 if (ecbdata
->diff_words
->minus
.text
.ptr
)
470 free (ecbdata
->diff_words
->minus
.text
.ptr
);
471 if (ecbdata
->diff_words
->plus
.text
.ptr
)
472 free (ecbdata
->diff_words
->plus
.text
.ptr
);
473 free(ecbdata
->diff_words
);
474 ecbdata
->diff_words
= NULL
;
478 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
481 return diff_colors
[ix
];
485 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
487 if (len
> 0 && line
[len
-1] == '\n')
490 fwrite(line
, len
, 1, stdout
);
494 static void emit_line_with_ws(int nparents
,
495 const char *set
, const char *reset
, const char *ws
,
496 const char *line
, int len
)
499 int last_tab_in_indent
= -1;
500 int last_space_in_indent
= -1;
503 int need_highlight_leading_space
= 0;
504 /* The line is a newly added line. Does it have funny leading
505 * whitespaces? In indent, SP should never precede a TAB.
507 for (i
= col0
; i
< len
; i
++) {
508 if (line
[i
] == '\t') {
509 last_tab_in_indent
= i
;
510 if (0 <= last_space_in_indent
)
511 need_highlight_leading_space
= 1;
513 else if (line
[i
] == ' ')
514 last_space_in_indent
= i
;
519 fwrite(line
, col0
, 1, stdout
);
520 fputs(reset
, stdout
);
521 if (((i
== len
) || line
[i
] == '\n') && i
!= col0
) {
522 /* The whole line was indent */
523 emit_line(ws
, reset
, line
+ col0
, len
- col0
);
527 if (need_highlight_leading_space
) {
528 while (i
< last_tab_in_indent
) {
529 if (line
[i
] == ' ') {
532 fputs(reset
, stdout
);
540 if (line
[tail
] == '\n' && i
< tail
)
543 if (!isspace(line
[tail
]))
547 if ((i
< tail
&& line
[tail
+ 1] != '\n')) {
548 /* This has whitespace between tail+1..len */
550 fwrite(line
+ i
, tail
- i
+ 1, 1, stdout
);
551 fputs(reset
, stdout
);
552 emit_line(ws
, reset
, line
+ tail
+ 1, len
- tail
- 1);
555 emit_line(set
, reset
, line
+ i
, len
- i
);
558 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
560 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
561 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
564 emit_line(set
, reset
, line
, len
);
566 emit_line_with_ws(ecbdata
->nparents
, set
, reset
, ws
,
570 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
574 struct emit_callback
*ecbdata
= priv
;
575 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
576 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
578 *(ecbdata
->found_changesp
) = 1;
580 if (ecbdata
->label_path
[0]) {
581 const char *name_a_tab
, *name_b_tab
;
583 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
584 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
586 printf("%s--- %s%s%s\n",
587 set
, ecbdata
->label_path
[0], reset
, name_a_tab
);
588 printf("%s+++ %s%s%s\n",
589 set
, ecbdata
->label_path
[1], reset
, name_b_tab
);
590 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
593 /* This is not really necessary for now because
594 * this codepath only deals with two-way diffs.
596 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
598 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
599 ecbdata
->nparents
= i
- 1;
600 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
605 if (len
< ecbdata
->nparents
) {
607 emit_line(reset
, reset
, line
, len
);
612 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
613 /* fall back to normal diff */
614 free_diff_words_data(ecbdata
);
615 if (ecbdata
->diff_words
) {
616 if (line
[0] == '-') {
617 diff_words_append(line
, len
,
618 &ecbdata
->diff_words
->minus
);
620 } else if (line
[0] == '+') {
621 diff_words_append(line
, len
,
622 &ecbdata
->diff_words
->plus
);
625 if (ecbdata
->diff_words
->minus
.text
.size
||
626 ecbdata
->diff_words
->plus
.text
.size
)
627 diff_words_show(ecbdata
->diff_words
);
630 emit_line(set
, reset
, line
, len
);
633 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
635 color
= DIFF_FILE_OLD
;
636 else if (line
[i
] == '+')
637 color
= DIFF_FILE_NEW
;
640 if (color
!= DIFF_FILE_NEW
) {
641 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
645 emit_add_line(reset
, ecbdata
, line
, len
);
648 static char *pprint_rename(const char *a
, const char *b
)
653 int pfx_length
, sfx_length
;
654 int len_a
= strlen(a
);
655 int len_b
= strlen(b
);
656 int a_midlen
, b_midlen
;
657 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
658 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
660 strbuf_init(&name
, 0);
661 if (qlen_a
|| qlen_b
) {
662 quote_c_style(a
, &name
, NULL
, 0);
663 strbuf_addstr(&name
, " => ");
664 quote_c_style(b
, &name
, NULL
, 0);
665 return strbuf_detach(&name
, NULL
);
668 /* Find common prefix */
670 while (*old
&& *new && *old
== *new) {
672 pfx_length
= old
- a
+ 1;
677 /* Find common suffix */
681 while (a
<= old
&& b
<= new && *old
== *new) {
683 sfx_length
= len_a
- (old
- a
);
689 * pfx{mid-a => mid-b}sfx
690 * {pfx-a => pfx-b}sfx
691 * pfx{sfx-a => sfx-b}
694 a_midlen
= len_a
- pfx_length
- sfx_length
;
695 b_midlen
= len_b
- pfx_length
- sfx_length
;
701 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
702 if (pfx_length
+ sfx_length
) {
703 strbuf_add(&name
, a
, pfx_length
);
704 strbuf_addch(&name
, '{');
706 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
707 strbuf_addstr(&name
, " => ");
708 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
709 if (pfx_length
+ sfx_length
) {
710 strbuf_addch(&name
, '}');
711 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
713 return strbuf_detach(&name
, NULL
);
717 struct xdiff_emit_state xm
;
721 struct diffstat_file
{
723 unsigned is_unmerged
:1;
724 unsigned is_binary
:1;
725 unsigned is_renamed
:1;
726 unsigned int added
, deleted
;
730 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
734 struct diffstat_file
*x
;
735 x
= xcalloc(sizeof (*x
), 1);
736 if (diffstat
->nr
== diffstat
->alloc
) {
737 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
738 diffstat
->files
= xrealloc(diffstat
->files
,
739 diffstat
->alloc
* sizeof(x
));
741 diffstat
->files
[diffstat
->nr
++] = x
;
743 x
->name
= pprint_rename(name_a
, name_b
);
747 x
->name
= xstrdup(name_a
);
751 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
753 struct diffstat_t
*diffstat
= priv
;
754 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
758 else if (line
[0] == '-')
762 const char mime_boundary_leader
[] = "------------";
764 static int scale_linear(int it
, int width
, int max_change
)
767 * make sure that at least one '-' is printed if there were deletions,
768 * and likewise for '+'.
772 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
775 static void show_name(const char *prefix
, const char *name
, int len
,
776 const char *reset
, const char *set
)
778 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
781 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
791 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
793 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
794 int max_change
= 0, max_len
= 0;
795 int total_files
= data
->nr
;
796 int width
, name_width
;
797 const char *reset
, *set
, *add_c
, *del_c
;
802 width
= options
->stat_width
? options
->stat_width
: 80;
803 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
805 /* Sanity: give at least 5 columns to the graph,
806 * but leave at least 10 columns for the name.
808 if (width
< name_width
+ 15) {
809 if (name_width
<= 25)
810 width
= name_width
+ 15;
812 name_width
= width
- 15;
815 /* Find the longest filename and max number of changes */
816 reset
= diff_get_color(options
->color_diff
, DIFF_RESET
);
817 set
= diff_get_color(options
->color_diff
, DIFF_PLAIN
);
818 add_c
= diff_get_color(options
->color_diff
, DIFF_FILE_NEW
);
819 del_c
= diff_get_color(options
->color_diff
, DIFF_FILE_OLD
);
821 for (i
= 0; i
< data
->nr
; i
++) {
822 struct diffstat_file
*file
= data
->files
[i
];
823 int change
= file
->added
+ file
->deleted
;
825 if (!file
->is_renamed
) { /* renames are already quoted by pprint_rename */
827 strbuf_init(&buf
, 0);
828 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
830 file
->name
= strbuf_detach(&buf
, NULL
);
832 strbuf_release(&buf
);
836 len
= strlen(file
->name
);
840 if (file
->is_binary
|| file
->is_unmerged
)
842 if (max_change
< change
)
846 /* Compute the width of the graph part;
847 * 10 is for one blank at the beginning of the line plus
848 * " | count " between the name and the graph.
850 * From here on, name_width is the width of the name area,
851 * and width is the width of the graph area.
853 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
854 if (width
< (name_width
+ 10) + max_change
)
855 width
= width
- (name_width
+ 10);
859 for (i
= 0; i
< data
->nr
; i
++) {
860 const char *prefix
= "";
861 char *name
= data
->files
[i
]->name
;
862 int added
= data
->files
[i
]->added
;
863 int deleted
= data
->files
[i
]->deleted
;
867 * "scale" the filename
870 name_len
= strlen(name
);
871 if (name_width
< name_len
) {
875 name
+= name_len
- len
;
876 slash
= strchr(name
, '/');
881 if (data
->files
[i
]->is_binary
) {
882 show_name(prefix
, name
, len
, reset
, set
);
884 printf("%s%d%s", del_c
, deleted
, reset
);
886 printf("%s%d%s", add_c
, added
, reset
);
889 goto free_diffstat_file
;
891 else if (data
->files
[i
]->is_unmerged
) {
892 show_name(prefix
, name
, len
, reset
, set
);
893 printf(" Unmerged\n");
894 goto free_diffstat_file
;
896 else if (!data
->files
[i
]->is_renamed
&&
897 (added
+ deleted
== 0)) {
899 goto free_diffstat_file
;
903 * scale the add/delete
911 if (width
<= max_change
) {
912 add
= scale_linear(add
, width
, max_change
);
913 del
= scale_linear(del
, width
, max_change
);
916 show_name(prefix
, name
, len
, reset
, set
);
917 printf("%5d ", added
+ deleted
);
918 show_graph('+', add
, add_c
, reset
);
919 show_graph('-', del
, del_c
, reset
);
922 free(data
->files
[i
]->name
);
923 free(data
->files
[i
]);
926 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
927 set
, total_files
, adds
, dels
, reset
);
930 static void show_shortstats(struct diffstat_t
* data
)
932 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
937 for (i
= 0; i
< data
->nr
; i
++) {
938 if (!data
->files
[i
]->is_binary
&&
939 !data
->files
[i
]->is_unmerged
) {
940 int added
= data
->files
[i
]->added
;
941 int deleted
= data
->files
[i
]->deleted
;
942 if (!data
->files
[i
]->is_renamed
&&
943 (added
+ deleted
== 0)) {
950 free(data
->files
[i
]->name
);
951 free(data
->files
[i
]);
955 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
956 total_files
, adds
, dels
);
959 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
963 for (i
= 0; i
< data
->nr
; i
++) {
964 struct diffstat_file
*file
= data
->files
[i
];
969 printf("%d\t%d\t", file
->added
, file
->deleted
);
970 if (!file
->is_renamed
) {
971 write_name_quoted(file
->name
, stdout
, options
->line_termination
);
973 fputs(file
->name
, stdout
);
974 putchar(options
->line_termination
);
980 struct xdiff_emit_state xm
;
981 const char *filename
;
982 int lineno
, color_diff
;
985 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
987 struct checkdiff_t
*data
= priv
;
988 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
989 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
990 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
992 if (line
[0] == '+') {
993 int i
, spaces
= 0, space_before_tab
= 0, white_space_at_end
= 0;
995 /* check space before tab */
996 for (i
= 1; i
< len
&& (line
[i
] == ' ' || line
[i
] == '\t'); i
++)
999 if (line
[i
- 1] == '\t' && spaces
)
1000 space_before_tab
= 1;
1002 /* check white space at line end */
1003 if (line
[len
- 1] == '\n')
1005 if (isspace(line
[len
- 1]))
1006 white_space_at_end
= 1;
1008 if (space_before_tab
|| white_space_at_end
) {
1009 printf("%s:%d: %s", data
->filename
, data
->lineno
, ws
);
1010 if (space_before_tab
) {
1011 printf("space before tab");
1012 if (white_space_at_end
)
1015 if (white_space_at_end
)
1016 printf("white space at end");
1017 printf(":%s ", reset
);
1018 emit_line_with_ws(1, set
, reset
, ws
, line
, len
);
1022 } else if (line
[0] == ' ')
1024 else if (line
[0] == '@') {
1025 char *plus
= strchr(line
, '+');
1027 data
->lineno
= strtol(plus
, NULL
, 10);
1029 die("invalid diff");
1033 static unsigned char *deflate_it(char *data
,
1035 unsigned long *result_size
)
1038 unsigned char *deflated
;
1041 memset(&stream
, 0, sizeof(stream
));
1042 deflateInit(&stream
, zlib_compression_level
);
1043 bound
= deflateBound(&stream
, size
);
1044 deflated
= xmalloc(bound
);
1045 stream
.next_out
= deflated
;
1046 stream
.avail_out
= bound
;
1048 stream
.next_in
= (unsigned char *)data
;
1049 stream
.avail_in
= size
;
1050 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1052 deflateEnd(&stream
);
1053 *result_size
= stream
.total_out
;
1057 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
1063 unsigned long orig_size
;
1064 unsigned long delta_size
;
1065 unsigned long deflate_size
;
1066 unsigned long data_size
;
1068 /* We could do deflated delta, or we could do just deflated two,
1069 * whichever is smaller.
1072 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1073 if (one
->size
&& two
->size
) {
1074 delta
= diff_delta(one
->ptr
, one
->size
,
1075 two
->ptr
, two
->size
,
1076 &delta_size
, deflate_size
);
1078 void *to_free
= delta
;
1079 orig_size
= delta_size
;
1080 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1085 if (delta
&& delta_size
< deflate_size
) {
1086 printf("delta %lu\n", orig_size
);
1089 data_size
= delta_size
;
1092 printf("literal %lu\n", two
->size
);
1095 data_size
= deflate_size
;
1098 /* emit data encoded in base85 */
1101 int bytes
= (52 < data_size
) ? 52 : data_size
;
1105 line
[0] = bytes
+ 'A' - 1;
1107 line
[0] = bytes
- 26 + 'a' - 1;
1108 encode_85(line
+ 1, cp
, bytes
);
1109 cp
= (char *) cp
+ bytes
;
1116 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1118 printf("GIT binary patch\n");
1119 emit_binary_diff_body(one
, two
);
1120 emit_binary_diff_body(two
, one
);
1123 static void setup_diff_attr_check(struct git_attr_check
*check
)
1125 static struct git_attr
*attr_diff
;
1128 attr_diff
= git_attr("diff", 4);
1130 check
[0].attr
= attr_diff
;
1133 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1135 struct git_attr_check attr_diff_check
;
1136 int check_from_data
= 0;
1138 if (one
->checked_attr
)
1141 setup_diff_attr_check(&attr_diff_check
);
1143 one
->funcname_pattern_ident
= NULL
;
1145 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1149 value
= attr_diff_check
.value
;
1150 if (ATTR_TRUE(value
))
1152 else if (ATTR_FALSE(value
))
1155 check_from_data
= 1;
1157 /* funcname pattern ident */
1158 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1161 one
->funcname_pattern_ident
= value
;
1164 if (check_from_data
) {
1165 if (!one
->data
&& DIFF_FILE_VALID(one
))
1166 diff_populate_filespec(one
, 0);
1169 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1173 int diff_filespec_is_binary(struct diff_filespec
*one
)
1175 diff_filespec_check_attr(one
);
1176 return one
->is_binary
;
1179 static const char *funcname_pattern(const char *ident
)
1181 struct funcname_pattern
*pp
;
1183 read_config_if_needed();
1184 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1185 if (!strcmp(ident
, pp
->name
))
1190 static struct builtin_funcname_pattern
{
1192 const char *pattern
;
1193 } builtin_funcname_pattern
[] = {
1194 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1195 "new\\|return\\|switch\\|throw\\|while\\)\n"
1197 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1199 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1202 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1204 const char *ident
, *pattern
;
1207 diff_filespec_check_attr(one
);
1208 ident
= one
->funcname_pattern_ident
;
1212 * If the config file has "funcname.default" defined, that
1213 * regexp is used; otherwise NULL is returned and xemit uses
1214 * the built-in default.
1216 return funcname_pattern("default");
1218 /* Look up custom "funcname.$ident" regexp from config. */
1219 pattern
= funcname_pattern(ident
);
1224 * And define built-in fallback patterns here. Note that
1225 * these can be overriden by the user's config settings.
1227 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1228 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1229 return builtin_funcname_pattern
[i
].pattern
;
1234 static void builtin_diff(const char *name_a
,
1236 struct diff_filespec
*one
,
1237 struct diff_filespec
*two
,
1238 const char *xfrm_msg
,
1239 struct diff_options
*o
,
1240 int complete_rewrite
)
1244 char *a_one
, *b_two
;
1245 const char *set
= diff_get_color(o
->color_diff
, DIFF_METAINFO
);
1246 const char *reset
= diff_get_color(o
->color_diff
, DIFF_RESET
);
1248 a_one
= quote_two("a/", name_a
+ (*name_a
== '/'));
1249 b_two
= quote_two("b/", name_b
+ (*name_b
== '/'));
1250 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1251 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1252 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1253 if (lbl
[0][0] == '/') {
1255 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1256 if (xfrm_msg
&& xfrm_msg
[0])
1257 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1259 else if (lbl
[1][0] == '/') {
1260 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1261 if (xfrm_msg
&& xfrm_msg
[0])
1262 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1265 if (one
->mode
!= two
->mode
) {
1266 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1267 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1269 if (xfrm_msg
&& xfrm_msg
[0])
1270 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1272 * we do not run diff between different kind
1275 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1276 goto free_ab_and_return
;
1277 if (complete_rewrite
) {
1278 emit_rewrite_diff(name_a
, name_b
, one
, two
,
1280 o
->found_changes
= 1;
1281 goto free_ab_and_return
;
1285 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1286 die("unable to read files to diff");
1289 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1290 /* Quite common confusing case */
1291 if (mf1
.size
== mf2
.size
&&
1292 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1293 goto free_ab_and_return
;
1295 emit_binary_diff(&mf1
, &mf2
);
1297 printf("Binary files %s and %s differ\n",
1299 o
->found_changes
= 1;
1302 /* Crazy xdl interfaces.. */
1303 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1307 struct emit_callback ecbdata
;
1308 const char *funcname_pattern
;
1310 funcname_pattern
= diff_funcname_pattern(one
);
1311 if (!funcname_pattern
)
1312 funcname_pattern
= diff_funcname_pattern(two
);
1314 memset(&xecfg
, 0, sizeof(xecfg
));
1315 memset(&ecbdata
, 0, sizeof(ecbdata
));
1316 ecbdata
.label_path
= lbl
;
1317 ecbdata
.color_diff
= o
->color_diff
;
1318 ecbdata
.found_changesp
= &o
->found_changes
;
1319 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1320 xecfg
.ctxlen
= o
->context
;
1321 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1322 if (funcname_pattern
)
1323 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1326 else if (!prefixcmp(diffopts
, "--unified="))
1327 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1328 else if (!prefixcmp(diffopts
, "-u"))
1329 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1330 ecb
.outf
= xdiff_outf
;
1331 ecb
.priv
= &ecbdata
;
1332 ecbdata
.xm
.consume
= fn_out_consume
;
1333 if (o
->color_diff_words
)
1334 ecbdata
.diff_words
=
1335 xcalloc(1, sizeof(struct diff_words_data
));
1336 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1337 if (o
->color_diff_words
)
1338 free_diff_words_data(&ecbdata
);
1342 diff_free_filespec_data(one
);
1343 diff_free_filespec_data(two
);
1349 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1350 struct diff_filespec
*one
,
1351 struct diff_filespec
*two
,
1352 struct diffstat_t
*diffstat
,
1353 struct diff_options
*o
,
1354 int complete_rewrite
)
1357 struct diffstat_file
*data
;
1359 data
= diffstat_add(diffstat
, name_a
, name_b
);
1362 data
->is_unmerged
= 1;
1365 if (complete_rewrite
) {
1366 diff_populate_filespec(one
, 0);
1367 diff_populate_filespec(two
, 0);
1368 data
->deleted
= count_lines(one
->data
, one
->size
);
1369 data
->added
= count_lines(two
->data
, two
->size
);
1370 goto free_and_return
;
1372 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1373 die("unable to read files to diff");
1375 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1376 data
->is_binary
= 1;
1377 data
->added
= mf2
.size
;
1378 data
->deleted
= mf1
.size
;
1380 /* Crazy xdl interfaces.. */
1385 memset(&xecfg
, 0, sizeof(xecfg
));
1386 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1387 ecb
.outf
= xdiff_outf
;
1388 ecb
.priv
= diffstat
;
1389 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1393 diff_free_filespec_data(one
);
1394 diff_free_filespec_data(two
);
1397 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1398 struct diff_filespec
*one
,
1399 struct diff_filespec
*two
, struct diff_options
*o
)
1402 struct checkdiff_t data
;
1407 memset(&data
, 0, sizeof(data
));
1408 data
.xm
.consume
= checkdiff_consume
;
1409 data
.filename
= name_b
? name_b
: name_a
;
1411 data
.color_diff
= o
->color_diff
;
1413 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1414 die("unable to read files to diff");
1416 if (diff_filespec_is_binary(two
))
1417 goto free_and_return
;
1419 /* Crazy xdl interfaces.. */
1424 memset(&xecfg
, 0, sizeof(xecfg
));
1425 xpp
.flags
= XDF_NEED_MINIMAL
;
1426 ecb
.outf
= xdiff_outf
;
1428 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1431 diff_free_filespec_data(one
);
1432 diff_free_filespec_data(two
);
1435 struct diff_filespec
*alloc_filespec(const char *path
)
1437 int namelen
= strlen(path
);
1438 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1440 memset(spec
, 0, sizeof(*spec
));
1441 spec
->path
= (char *)(spec
+ 1);
1442 memcpy(spec
->path
, path
, namelen
+1);
1447 void free_filespec(struct diff_filespec
*spec
)
1449 if (!--spec
->count
) {
1450 diff_free_filespec_data(spec
);
1455 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1456 unsigned short mode
)
1459 spec
->mode
= canon_mode(mode
);
1460 hashcpy(spec
->sha1
, sha1
);
1461 spec
->sha1_valid
= !is_null_sha1(sha1
);
1466 * Given a name and sha1 pair, if the index tells us the file in
1467 * the work tree has that object contents, return true, so that
1468 * prepare_temp_file() does not have to inflate and extract.
1470 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1472 struct cache_entry
*ce
;
1476 /* We do not read the cache ourselves here, because the
1477 * benchmark with my previous version that always reads cache
1478 * shows that it makes things worse for diff-tree comparing
1479 * two linux-2.6 kernel trees in an already checked out work
1480 * tree. This is because most diff-tree comparisons deal with
1481 * only a small number of files, while reading the cache is
1482 * expensive for a large project, and its cost outweighs the
1483 * savings we get by not inflating the object to a temporary
1484 * file. Practically, this code only helps when we are used
1485 * by diff-cache --cached, which does read the cache before
1491 /* We want to avoid the working directory if our caller
1492 * doesn't need the data in a normal file, this system
1493 * is rather slow with its stat/open/mmap/close syscalls,
1494 * and the object is contained in a pack file. The pack
1495 * is probably already open and will be faster to obtain
1496 * the data through than the working directory. Loose
1497 * objects however would tend to be slower as they need
1498 * to be individually opened and inflated.
1500 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1504 pos
= cache_name_pos(name
, len
);
1507 ce
= active_cache
[pos
];
1508 if ((lstat(name
, &st
) < 0) ||
1509 !S_ISREG(st
.st_mode
) || /* careful! */
1510 ce_match_stat(ce
, &st
, 0) ||
1511 hashcmp(sha1
, ce
->sha1
))
1513 /* we return 1 only when we can stat, it is a regular file,
1514 * stat information matches, and sha1 recorded in the cache
1515 * matches. I.e. we know the file in the work tree really is
1516 * the same as the <name, sha1> pair.
1521 static int populate_from_stdin(struct diff_filespec
*s
)
1526 strbuf_init(&buf
, 0);
1527 if (strbuf_read(&buf
, 0, 0) < 0)
1528 return error("error while reading from stdin %s",
1531 s
->should_munmap
= 0;
1532 s
->data
= strbuf_detach(&buf
, &size
);
1538 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1541 char *data
= xmalloc(100);
1542 len
= snprintf(data
, 100,
1543 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1555 * While doing rename detection and pickaxe operation, we may need to
1556 * grab the data for the blob (or file) for our own in-core comparison.
1557 * diff_filespec has data and size fields for this purpose.
1559 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1562 if (!DIFF_FILE_VALID(s
))
1563 die("internal error: asking to populate invalid file.");
1564 if (S_ISDIR(s
->mode
))
1570 if (size_only
&& 0 < s
->size
)
1573 if (S_ISGITLINK(s
->mode
))
1574 return diff_populate_gitlink(s
, size_only
);
1576 if (!s
->sha1_valid
||
1577 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1582 if (!strcmp(s
->path
, "-"))
1583 return populate_from_stdin(s
);
1585 if (lstat(s
->path
, &st
) < 0) {
1586 if (errno
== ENOENT
) {
1590 s
->data
= (char *)"";
1595 s
->size
= xsize_t(st
.st_size
);
1600 if (S_ISLNK(st
.st_mode
)) {
1602 s
->data
= xmalloc(s
->size
);
1604 ret
= readlink(s
->path
, s
->data
, s
->size
);
1611 fd
= open(s
->path
, O_RDONLY
);
1614 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1616 s
->should_munmap
= 1;
1619 * Convert from working tree format to canonical git format
1621 strbuf_init(&buf
, 0);
1622 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
)) {
1624 munmap(s
->data
, s
->size
);
1625 s
->should_munmap
= 0;
1626 s
->data
= strbuf_detach(&buf
, &size
);
1632 enum object_type type
;
1634 type
= sha1_object_info(s
->sha1
, &s
->size
);
1636 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1643 void diff_free_filespec_blob(struct diff_filespec
*s
)
1647 else if (s
->should_munmap
)
1648 munmap(s
->data
, s
->size
);
1650 if (s
->should_free
|| s
->should_munmap
) {
1651 s
->should_free
= s
->should_munmap
= 0;
1656 void diff_free_filespec_data(struct diff_filespec
*s
)
1658 diff_free_filespec_blob(s
);
1663 static void prep_temp_blob(struct diff_tempfile
*temp
,
1666 const unsigned char *sha1
,
1671 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1673 die("unable to create temp-file: %s", strerror(errno
));
1674 if (write_in_full(fd
, blob
, size
) != size
)
1675 die("unable to write temp-file");
1677 temp
->name
= temp
->tmp_path
;
1678 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1680 sprintf(temp
->mode
, "%06o", mode
);
1683 static void prepare_temp_file(const char *name
,
1684 struct diff_tempfile
*temp
,
1685 struct diff_filespec
*one
)
1687 if (!DIFF_FILE_VALID(one
)) {
1689 /* A '-' entry produces this for file-2, and
1690 * a '+' entry produces this for file-1.
1692 temp
->name
= "/dev/null";
1693 strcpy(temp
->hex
, ".");
1694 strcpy(temp
->mode
, ".");
1698 if (!one
->sha1_valid
||
1699 reuse_worktree_file(name
, one
->sha1
, 1)) {
1701 if (lstat(name
, &st
) < 0) {
1702 if (errno
== ENOENT
)
1703 goto not_a_valid_file
;
1704 die("stat(%s): %s", name
, strerror(errno
));
1706 if (S_ISLNK(st
.st_mode
)) {
1708 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1709 size_t sz
= xsize_t(st
.st_size
);
1710 if (sizeof(buf
) <= st
.st_size
)
1711 die("symlink too long: %s", name
);
1712 ret
= readlink(name
, buf
, sz
);
1714 die("readlink(%s)", name
);
1715 prep_temp_blob(temp
, buf
, sz
,
1717 one
->sha1
: null_sha1
),
1719 one
->mode
: S_IFLNK
));
1722 /* we can borrow from the file in the work tree */
1724 if (!one
->sha1_valid
)
1725 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1727 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1728 /* Even though we may sometimes borrow the
1729 * contents from the work tree, we always want
1730 * one->mode. mode is trustworthy even when
1731 * !(one->sha1_valid), as long as
1732 * DIFF_FILE_VALID(one).
1734 sprintf(temp
->mode
, "%06o", one
->mode
);
1739 if (diff_populate_filespec(one
, 0))
1740 die("cannot read data blob for %s", one
->path
);
1741 prep_temp_blob(temp
, one
->data
, one
->size
,
1742 one
->sha1
, one
->mode
);
1746 static void remove_tempfile(void)
1750 for (i
= 0; i
< 2; i
++)
1751 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1752 unlink(diff_temp
[i
].name
);
1753 diff_temp
[i
].name
= NULL
;
1757 static void remove_tempfile_on_signal(int signo
)
1760 signal(SIGINT
, SIG_DFL
);
1764 static int spawn_prog(const char *pgm
, const char **arg
)
1772 die("unable to fork");
1774 execvp(pgm
, (char *const*) arg
);
1778 while (waitpid(pid
, &status
, 0) < 0) {
1784 /* Earlier we did not check the exit status because
1785 * diff exits non-zero if files are different, and
1786 * we are not interested in knowing that. It was a
1787 * mistake which made it harder to quit a diff-*
1788 * session that uses the git-apply-patch-script as
1789 * the GIT_EXTERNAL_DIFF. A custom GIT_EXTERNAL_DIFF
1790 * should also exit non-zero only when it wants to
1791 * abort the entire diff-* session.
1793 if (WIFEXITED(status
) && !WEXITSTATUS(status
))
1798 /* An external diff command takes:
1800 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1801 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1804 static void run_external_diff(const char *pgm
,
1807 struct diff_filespec
*one
,
1808 struct diff_filespec
*two
,
1809 const char *xfrm_msg
,
1810 int complete_rewrite
)
1812 const char *spawn_arg
[10];
1813 struct diff_tempfile
*temp
= diff_temp
;
1815 static int atexit_asked
= 0;
1816 const char *othername
;
1817 const char **arg
= &spawn_arg
[0];
1819 othername
= (other
? other
: name
);
1821 prepare_temp_file(name
, &temp
[0], one
);
1822 prepare_temp_file(othername
, &temp
[1], two
);
1823 if (! atexit_asked
&&
1824 (temp
[0].name
== temp
[0].tmp_path
||
1825 temp
[1].name
== temp
[1].tmp_path
)) {
1827 atexit(remove_tempfile
);
1829 signal(SIGINT
, remove_tempfile_on_signal
);
1835 *arg
++ = temp
[0].name
;
1836 *arg
++ = temp
[0].hex
;
1837 *arg
++ = temp
[0].mode
;
1838 *arg
++ = temp
[1].name
;
1839 *arg
++ = temp
[1].hex
;
1840 *arg
++ = temp
[1].mode
;
1850 retval
= spawn_prog(pgm
, spawn_arg
);
1853 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1858 static const char *external_diff_attr(const char *name
)
1860 struct git_attr_check attr_diff_check
;
1862 setup_diff_attr_check(&attr_diff_check
);
1863 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
1864 const char *value
= attr_diff_check
.value
;
1865 if (!ATTR_TRUE(value
) &&
1866 !ATTR_FALSE(value
) &&
1867 !ATTR_UNSET(value
)) {
1868 struct ll_diff_driver
*drv
;
1870 read_config_if_needed();
1871 for (drv
= user_diff
; drv
; drv
= drv
->next
)
1872 if (!strcmp(drv
->name
, value
))
1879 static void run_diff_cmd(const char *pgm
,
1882 struct diff_filespec
*one
,
1883 struct diff_filespec
*two
,
1884 const char *xfrm_msg
,
1885 struct diff_options
*o
,
1886 int complete_rewrite
)
1888 if (!o
->allow_external
)
1891 const char *cmd
= external_diff_attr(name
);
1897 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
1902 builtin_diff(name
, other
? other
: name
,
1903 one
, two
, xfrm_msg
, o
, complete_rewrite
);
1905 printf("* Unmerged path %s\n", name
);
1908 static void diff_fill_sha1_info(struct diff_filespec
*one
)
1910 if (DIFF_FILE_VALID(one
)) {
1911 if (!one
->sha1_valid
) {
1913 if (!strcmp(one
->path
, "-")) {
1914 hashcpy(one
->sha1
, null_sha1
);
1917 if (lstat(one
->path
, &st
) < 0)
1918 die("stat %s", one
->path
);
1919 if (index_path(one
->sha1
, one
->path
, &st
, 0))
1920 die("cannot hash %s\n", one
->path
);
1927 static int similarity_index(struct diff_filepair
*p
)
1929 return p
->score
* 100 / MAX_SCORE
;
1932 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
1934 const char *pgm
= external_diff();
1937 struct diff_filespec
*one
= p
->one
;
1938 struct diff_filespec
*two
= p
->two
;
1941 int complete_rewrite
= 0;
1944 if (DIFF_PAIR_UNMERGED(p
)) {
1945 run_diff_cmd(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
, o
, 0);
1949 name
= p
->one
->path
;
1950 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1951 diff_fill_sha1_info(one
);
1952 diff_fill_sha1_info(two
);
1954 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
1955 switch (p
->status
) {
1956 case DIFF_STATUS_COPIED
:
1957 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1958 strbuf_addstr(&msg
, "\ncopy from ");
1959 quote_c_style(name
, &msg
, NULL
, 0);
1960 strbuf_addstr(&msg
, "\ncopy to ");
1961 quote_c_style(other
, &msg
, NULL
, 0);
1962 strbuf_addch(&msg
, '\n');
1964 case DIFF_STATUS_RENAMED
:
1965 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1966 strbuf_addstr(&msg
, "\nrename from ");
1967 quote_c_style(name
, &msg
, NULL
, 0);
1968 strbuf_addstr(&msg
, "\nrename to ");
1969 quote_c_style(other
, &msg
, NULL
, 0);
1970 strbuf_addch(&msg
, '\n');
1972 case DIFF_STATUS_MODIFIED
:
1974 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
1975 similarity_index(p
));
1976 complete_rewrite
= 1;
1985 if (hashcmp(one
->sha1
, two
->sha1
)) {
1986 int abbrev
= o
->full_index
? 40 : DEFAULT_ABBREV
;
1990 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
1991 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
1994 strbuf_addf(&msg
, "index %.*s..%.*s",
1995 abbrev
, sha1_to_hex(one
->sha1
),
1996 abbrev
, sha1_to_hex(two
->sha1
));
1997 if (one
->mode
== two
->mode
)
1998 strbuf_addf(&msg
, " %06o", one
->mode
);
1999 strbuf_addch(&msg
, '\n');
2003 strbuf_setlen(&msg
, msg
.len
- 1);
2004 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
2007 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2008 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2009 /* a filepair that changes between file and symlink
2010 * needs to be split into deletion and creation.
2012 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2013 run_diff_cmd(NULL
, name
, other
, one
, null
, xfrm_msg
, o
, 0);
2015 null
= alloc_filespec(one
->path
);
2016 run_diff_cmd(NULL
, name
, other
, null
, two
, xfrm_msg
, o
, 0);
2020 run_diff_cmd(pgm
, name
, other
, one
, two
, xfrm_msg
, o
,
2023 strbuf_release(&msg
);
2026 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2027 struct diffstat_t
*diffstat
)
2031 int complete_rewrite
= 0;
2033 if (DIFF_PAIR_UNMERGED(p
)) {
2035 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2039 name
= p
->one
->path
;
2040 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2042 diff_fill_sha1_info(p
->one
);
2043 diff_fill_sha1_info(p
->two
);
2045 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2046 complete_rewrite
= 1;
2047 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2050 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2055 if (DIFF_PAIR_UNMERGED(p
)) {
2060 name
= p
->one
->path
;
2061 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2063 diff_fill_sha1_info(p
->one
);
2064 diff_fill_sha1_info(p
->two
);
2066 builtin_checkdiff(name
, other
, p
->one
, p
->two
, o
);
2069 void diff_setup(struct diff_options
*options
)
2071 memset(options
, 0, sizeof(*options
));
2072 options
->line_termination
= '\n';
2073 options
->break_opt
= -1;
2074 options
->rename_limit
= -1;
2075 options
->context
= 3;
2076 options
->msg_sep
= "";
2078 options
->change
= diff_change
;
2079 options
->add_remove
= diff_addremove
;
2080 options
->color_diff
= diff_use_color_default
;
2081 options
->detect_rename
= diff_detect_rename_default
;
2084 int diff_setup_done(struct diff_options
*options
)
2088 if (options
->output_format
& DIFF_FORMAT_NAME
)
2090 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2092 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2094 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2097 die("--name-only, --name-status, --check and -s are mutually exclusive");
2099 if (options
->find_copies_harder
)
2100 options
->detect_rename
= DIFF_DETECT_COPY
;
2102 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2103 DIFF_FORMAT_NAME_STATUS
|
2104 DIFF_FORMAT_CHECKDIFF
|
2105 DIFF_FORMAT_NO_OUTPUT
))
2106 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2107 DIFF_FORMAT_NUMSTAT
|
2108 DIFF_FORMAT_DIFFSTAT
|
2109 DIFF_FORMAT_SHORTSTAT
|
2110 DIFF_FORMAT_SUMMARY
|
2114 * These cases always need recursive; we do not drop caller-supplied
2115 * recursive bits for other formats here.
2117 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2118 DIFF_FORMAT_NUMSTAT
|
2119 DIFF_FORMAT_DIFFSTAT
|
2120 DIFF_FORMAT_SHORTSTAT
|
2121 DIFF_FORMAT_SUMMARY
|
2122 DIFF_FORMAT_CHECKDIFF
))
2123 options
->recursive
= 1;
2125 * Also pickaxe would not work very well if you do not say recursive
2127 if (options
->pickaxe
)
2128 options
->recursive
= 1;
2130 if (options
->detect_rename
&& options
->rename_limit
< 0)
2131 options
->rename_limit
= diff_rename_limit_default
;
2132 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2134 /* read-cache does not die even when it fails
2135 * so it is safe for us to do this here. Also
2136 * it does not smudge active_cache or active_nr
2137 * when it fails, so we do not have to worry about
2138 * cleaning it up ourselves either.
2142 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2143 options
->abbrev
= 40; /* full */
2146 * It does not make sense to show the first hit we happened
2147 * to have found. It does not make sense not to return with
2148 * exit code in such a case either.
2150 if (options
->quiet
) {
2151 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2152 options
->exit_with_status
= 1;
2156 * If we postprocess in diffcore, we cannot simply return
2157 * upon the first hit. We need to run diff as usual.
2159 if (options
->pickaxe
|| options
->filter
)
2165 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2175 if (c
== arg_short
) {
2179 if (val
&& isdigit(c
)) {
2181 int n
= strtoul(arg
, &end
, 10);
2192 eq
= strchr(arg
, '=');
2197 if (!len
|| strncmp(arg
, arg_long
, len
))
2202 if (!isdigit(*++eq
))
2204 n
= strtoul(eq
, &end
, 10);
2212 static int diff_scoreopt_parse(const char *opt
);
2214 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2216 const char *arg
= av
[0];
2217 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2218 options
->output_format
|= DIFF_FORMAT_PATCH
;
2219 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2220 options
->output_format
|= DIFF_FORMAT_PATCH
;
2221 else if (!strcmp(arg
, "--raw"))
2222 options
->output_format
|= DIFF_FORMAT_RAW
;
2223 else if (!strcmp(arg
, "--patch-with-raw")) {
2224 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2226 else if (!strcmp(arg
, "--numstat")) {
2227 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2229 else if (!strcmp(arg
, "--shortstat")) {
2230 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2232 else if (!prefixcmp(arg
, "--stat")) {
2234 int width
= options
->stat_width
;
2235 int name_width
= options
->stat_name_width
;
2241 if (!prefixcmp(arg
, "-width="))
2242 width
= strtoul(arg
+ 7, &end
, 10);
2243 else if (!prefixcmp(arg
, "-name-width="))
2244 name_width
= strtoul(arg
+ 12, &end
, 10);
2247 width
= strtoul(arg
+1, &end
, 10);
2249 name_width
= strtoul(end
+1, &end
, 10);
2252 /* Important! This checks all the error cases! */
2255 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2256 options
->stat_name_width
= name_width
;
2257 options
->stat_width
= width
;
2259 else if (!strcmp(arg
, "--check"))
2260 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2261 else if (!strcmp(arg
, "--summary"))
2262 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2263 else if (!strcmp(arg
, "--patch-with-stat")) {
2264 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2266 else if (!strcmp(arg
, "-z"))
2267 options
->line_termination
= 0;
2268 else if (!prefixcmp(arg
, "-l"))
2269 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2270 else if (!strcmp(arg
, "--full-index"))
2271 options
->full_index
= 1;
2272 else if (!strcmp(arg
, "--binary")) {
2273 options
->output_format
|= DIFF_FORMAT_PATCH
;
2274 options
->binary
= 1;
2276 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text")) {
2279 else if (!strcmp(arg
, "--name-only"))
2280 options
->output_format
|= DIFF_FORMAT_NAME
;
2281 else if (!strcmp(arg
, "--name-status"))
2282 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2283 else if (!strcmp(arg
, "-R"))
2284 options
->reverse_diff
= 1;
2285 else if (!prefixcmp(arg
, "-S"))
2286 options
->pickaxe
= arg
+ 2;
2287 else if (!strcmp(arg
, "-s")) {
2288 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2290 else if (!prefixcmp(arg
, "-O"))
2291 options
->orderfile
= arg
+ 2;
2292 else if (!prefixcmp(arg
, "--diff-filter="))
2293 options
->filter
= arg
+ 14;
2294 else if (!strcmp(arg
, "--pickaxe-all"))
2295 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2296 else if (!strcmp(arg
, "--pickaxe-regex"))
2297 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2298 else if (!prefixcmp(arg
, "-B")) {
2299 if ((options
->break_opt
=
2300 diff_scoreopt_parse(arg
)) == -1)
2303 else if (!prefixcmp(arg
, "-M")) {
2304 if ((options
->rename_score
=
2305 diff_scoreopt_parse(arg
)) == -1)
2307 options
->detect_rename
= DIFF_DETECT_RENAME
;
2309 else if (!prefixcmp(arg
, "-C")) {
2310 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2311 options
->find_copies_harder
= 1;
2312 if ((options
->rename_score
=
2313 diff_scoreopt_parse(arg
)) == -1)
2315 options
->detect_rename
= DIFF_DETECT_COPY
;
2317 else if (!strcmp(arg
, "--find-copies-harder"))
2318 options
->find_copies_harder
= 1;
2319 else if (!strcmp(arg
, "--follow"))
2320 options
->follow_renames
= 1;
2321 else if (!strcmp(arg
, "--abbrev"))
2322 options
->abbrev
= DEFAULT_ABBREV
;
2323 else if (!prefixcmp(arg
, "--abbrev=")) {
2324 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2325 if (options
->abbrev
< MINIMUM_ABBREV
)
2326 options
->abbrev
= MINIMUM_ABBREV
;
2327 else if (40 < options
->abbrev
)
2328 options
->abbrev
= 40;
2330 else if (!strcmp(arg
, "--color"))
2331 options
->color_diff
= 1;
2332 else if (!strcmp(arg
, "--no-color"))
2333 options
->color_diff
= 0;
2334 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2335 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2336 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2337 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2338 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2339 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2340 else if (!strcmp(arg
, "--color-words"))
2341 options
->color_diff
= options
->color_diff_words
= 1;
2342 else if (!strcmp(arg
, "--no-renames"))
2343 options
->detect_rename
= 0;
2344 else if (!strcmp(arg
, "--exit-code"))
2345 options
->exit_with_status
= 1;
2346 else if (!strcmp(arg
, "--quiet"))
2348 else if (!strcmp(arg
, "--ext-diff"))
2349 options
->allow_external
= 1;
2350 else if (!strcmp(arg
, "--no-ext-diff"))
2351 options
->allow_external
= 0;
2357 static int parse_num(const char **cp_p
)
2359 unsigned long num
, scale
;
2361 const char *cp
= *cp_p
;
2368 if ( !dot
&& ch
== '.' ) {
2371 } else if ( ch
== '%' ) {
2372 scale
= dot
? scale
*100 : 100;
2373 cp
++; /* % is always at the end */
2375 } else if ( ch
>= '0' && ch
<= '9' ) {
2376 if ( scale
< 100000 ) {
2378 num
= (num
*10) + (ch
-'0');
2387 /* user says num divided by scale and we say internally that
2388 * is MAX_SCORE * num / scale.
2390 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2393 static int diff_scoreopt_parse(const char *opt
)
2395 int opt1
, opt2
, cmd
;
2400 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2401 return -1; /* that is not a -M, -C nor -B option */
2403 opt1
= parse_num(&opt
);
2409 else if (*opt
!= '/')
2410 return -1; /* we expect -B80/99 or -B80 */
2413 opt2
= parse_num(&opt
);
2418 return opt1
| (opt2
<< 16);
2421 struct diff_queue_struct diff_queued_diff
;
2423 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2425 if (queue
->alloc
<= queue
->nr
) {
2426 queue
->alloc
= alloc_nr(queue
->alloc
);
2427 queue
->queue
= xrealloc(queue
->queue
,
2428 sizeof(dp
) * queue
->alloc
);
2430 queue
->queue
[queue
->nr
++] = dp
;
2433 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2434 struct diff_filespec
*one
,
2435 struct diff_filespec
*two
)
2437 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2445 void diff_free_filepair(struct diff_filepair
*p
)
2447 free_filespec(p
->one
);
2448 free_filespec(p
->two
);
2452 /* This is different from find_unique_abbrev() in that
2453 * it stuffs the result with dots for alignment.
2455 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2460 return sha1_to_hex(sha1
);
2462 abbrev
= find_unique_abbrev(sha1
, len
);
2464 return sha1_to_hex(sha1
);
2465 abblen
= strlen(abbrev
);
2467 static char hex
[41];
2468 if (len
< abblen
&& abblen
<= len
+ 2)
2469 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2471 sprintf(hex
, "%s...", abbrev
);
2474 return sha1_to_hex(sha1
);
2477 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2479 int line_termination
= opt
->line_termination
;
2480 int inter_name_termination
= line_termination
? '\t' : '\0';
2482 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2483 printf(":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2484 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2485 printf("%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2488 printf("%c%03d%c", p
->status
, similarity_index(p
),
2489 inter_name_termination
);
2491 printf("%c%c", p
->status
, inter_name_termination
);
2494 if (p
->status
== DIFF_STATUS_COPIED
|| p
->status
== DIFF_STATUS_RENAMED
) {
2495 write_name_quoted(p
->one
->path
, stdout
, inter_name_termination
);
2496 write_name_quoted(p
->two
->path
, stdout
, line_termination
);
2498 const char *path
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2499 write_name_quoted(path
, stdout
, line_termination
);
2503 int diff_unmodified_pair(struct diff_filepair
*p
)
2505 /* This function is written stricter than necessary to support
2506 * the currently implemented transformers, but the idea is to
2507 * let transformers to produce diff_filepairs any way they want,
2508 * and filter and clean them up here before producing the output.
2510 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2512 if (DIFF_PAIR_UNMERGED(p
))
2513 return 0; /* unmerged is interesting */
2515 /* deletion, addition, mode or type change
2516 * and rename are all interesting.
2518 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2519 DIFF_PAIR_MODE_CHANGED(p
) ||
2520 strcmp(one
->path
, two
->path
))
2523 /* both are valid and point at the same path. that is, we are
2524 * dealing with a change.
2526 if (one
->sha1_valid
&& two
->sha1_valid
&&
2527 !hashcmp(one
->sha1
, two
->sha1
))
2528 return 1; /* no change */
2529 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2530 return 1; /* both look at the same file on the filesystem. */
2534 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2536 if (diff_unmodified_pair(p
))
2539 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2540 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2541 return; /* no tree diffs in patch format */
2546 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2547 struct diffstat_t
*diffstat
)
2549 if (diff_unmodified_pair(p
))
2552 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2553 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2554 return; /* no tree diffs in patch format */
2556 run_diffstat(p
, o
, diffstat
);
2559 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2560 struct diff_options
*o
)
2562 if (diff_unmodified_pair(p
))
2565 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2566 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2567 return; /* no tree diffs in patch format */
2569 run_checkdiff(p
, o
);
2572 int diff_queue_is_empty(void)
2574 struct diff_queue_struct
*q
= &diff_queued_diff
;
2576 for (i
= 0; i
< q
->nr
; i
++)
2577 if (!diff_unmodified_pair(q
->queue
[i
]))
2583 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2585 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2588 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2590 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2591 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2593 s
->size
, s
->xfrm_flags
);
2596 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2598 diff_debug_filespec(p
->one
, i
, "one");
2599 diff_debug_filespec(p
->two
, i
, "two");
2600 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2601 p
->score
, p
->status
? p
->status
: '?',
2602 p
->one
->rename_used
, p
->broken_pair
);
2605 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2609 fprintf(stderr
, "%s\n", msg
);
2610 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2611 for (i
= 0; i
< q
->nr
; i
++) {
2612 struct diff_filepair
*p
= q
->queue
[i
];
2613 diff_debug_filepair(p
, i
);
2618 static void diff_resolve_rename_copy(void)
2621 struct diff_filepair
*p
;
2622 struct diff_queue_struct
*q
= &diff_queued_diff
;
2624 diff_debug_queue("resolve-rename-copy", q
);
2626 for (i
= 0; i
< q
->nr
; i
++) {
2628 p
->status
= 0; /* undecided */
2629 if (DIFF_PAIR_UNMERGED(p
))
2630 p
->status
= DIFF_STATUS_UNMERGED
;
2631 else if (!DIFF_FILE_VALID(p
->one
))
2632 p
->status
= DIFF_STATUS_ADDED
;
2633 else if (!DIFF_FILE_VALID(p
->two
))
2634 p
->status
= DIFF_STATUS_DELETED
;
2635 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2636 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2638 /* from this point on, we are dealing with a pair
2639 * whose both sides are valid and of the same type, i.e.
2640 * either in-place edit or rename/copy edit.
2642 else if (DIFF_PAIR_RENAME(p
)) {
2644 * A rename might have re-connected a broken
2645 * pair up, causing the pathnames to be the
2646 * same again. If so, that's not a rename at
2647 * all, just a modification..
2649 * Otherwise, see if this source was used for
2650 * multiple renames, in which case we decrement
2651 * the count, and call it a copy.
2653 if (!strcmp(p
->one
->path
, p
->two
->path
))
2654 p
->status
= DIFF_STATUS_MODIFIED
;
2655 else if (--p
->one
->rename_used
> 0)
2656 p
->status
= DIFF_STATUS_COPIED
;
2658 p
->status
= DIFF_STATUS_RENAMED
;
2660 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2661 p
->one
->mode
!= p
->two
->mode
||
2662 is_null_sha1(p
->one
->sha1
))
2663 p
->status
= DIFF_STATUS_MODIFIED
;
2665 /* This is a "no-change" entry and should not
2666 * happen anymore, but prepare for broken callers.
2668 error("feeding unmodified %s to diffcore",
2670 p
->status
= DIFF_STATUS_UNKNOWN
;
2673 diff_debug_queue("resolve-rename-copy done", q
);
2676 static int check_pair_status(struct diff_filepair
*p
)
2678 switch (p
->status
) {
2679 case DIFF_STATUS_UNKNOWN
:
2682 die("internal error in diff-resolve-rename-copy");
2688 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2690 int fmt
= opt
->output_format
;
2692 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2693 diff_flush_checkdiff(p
, opt
);
2694 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2695 diff_flush_raw(p
, opt
);
2696 else if (fmt
& DIFF_FORMAT_NAME
)
2697 write_name_quoted(p
->two
->path
, stdout
, opt
->line_termination
);
2700 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2703 printf(" %s mode %06o ", newdelete
, fs
->mode
);
2705 printf(" %s ", newdelete
);
2706 write_name_quoted(fs
->path
, stdout
, '\n');
2710 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2712 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2713 printf(" mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2714 show_name
? ' ' : '\n');
2716 write_name_quoted(p
->two
->path
, stdout
, '\n');
2721 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2723 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2725 printf(" %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2727 show_mode_change(p
, 0);
2730 static void diff_summary(struct diff_filepair
*p
)
2733 case DIFF_STATUS_DELETED
:
2734 show_file_mode_name("delete", p
->one
);
2736 case DIFF_STATUS_ADDED
:
2737 show_file_mode_name("create", p
->two
);
2739 case DIFF_STATUS_COPIED
:
2740 show_rename_copy("copy", p
);
2742 case DIFF_STATUS_RENAMED
:
2743 show_rename_copy("rename", p
);
2748 write_name_quoted(p
->two
->path
, stdout
, ' ');
2749 printf("(%d%%)\n", similarity_index(p
));
2751 show_mode_change(p
, !p
->score
);
2757 struct xdiff_emit_state xm
;
2762 static int remove_space(char *line
, int len
)
2768 for (i
= 0; i
< len
; i
++)
2769 if (!isspace((c
= line
[i
])))
2775 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2777 struct patch_id_t
*data
= priv
;
2780 /* Ignore line numbers when computing the SHA1 of the patch */
2781 if (!prefixcmp(line
, "@@ -"))
2784 new_len
= remove_space(line
, len
);
2786 SHA1_Update(data
->ctx
, line
, new_len
);
2787 data
->patchlen
+= new_len
;
2790 /* returns 0 upon success, and writes result into sha1 */
2791 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2793 struct diff_queue_struct
*q
= &diff_queued_diff
;
2796 struct patch_id_t data
;
2797 char buffer
[PATH_MAX
* 4 + 20];
2800 memset(&data
, 0, sizeof(struct patch_id_t
));
2802 data
.xm
.consume
= patch_id_consume
;
2804 for (i
= 0; i
< q
->nr
; i
++) {
2809 struct diff_filepair
*p
= q
->queue
[i
];
2812 memset(&xecfg
, 0, sizeof(xecfg
));
2814 return error("internal diff status error");
2815 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2817 if (diff_unmodified_pair(p
))
2819 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2820 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2822 if (DIFF_PAIR_UNMERGED(p
))
2825 diff_fill_sha1_info(p
->one
);
2826 diff_fill_sha1_info(p
->two
);
2827 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2828 fill_mmfile(&mf2
, p
->two
) < 0)
2829 return error("unable to read files to diff");
2831 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2832 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2833 if (p
->one
->mode
== 0)
2834 len1
= snprintf(buffer
, sizeof(buffer
),
2835 "diff--gita/%.*sb/%.*s"
2842 len2
, p
->two
->path
);
2843 else if (p
->two
->mode
== 0)
2844 len1
= snprintf(buffer
, sizeof(buffer
),
2845 "diff--gita/%.*sb/%.*s"
2846 "deletedfilemode%06o"
2852 len1
, p
->one
->path
);
2854 len1
= snprintf(buffer
, sizeof(buffer
),
2855 "diff--gita/%.*sb/%.*s"
2861 len2
, p
->two
->path
);
2862 SHA1_Update(&ctx
, buffer
, len1
);
2864 xpp
.flags
= XDF_NEED_MINIMAL
;
2866 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2867 ecb
.outf
= xdiff_outf
;
2869 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2872 SHA1_Final(sha1
, &ctx
);
2876 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2878 struct diff_queue_struct
*q
= &diff_queued_diff
;
2880 int result
= diff_get_patch_id(options
, sha1
);
2882 for (i
= 0; i
< q
->nr
; i
++)
2883 diff_free_filepair(q
->queue
[i
]);
2887 q
->nr
= q
->alloc
= 0;
2892 static int is_summary_empty(const struct diff_queue_struct
*q
)
2896 for (i
= 0; i
< q
->nr
; i
++) {
2897 const struct diff_filepair
*p
= q
->queue
[i
];
2899 switch (p
->status
) {
2900 case DIFF_STATUS_DELETED
:
2901 case DIFF_STATUS_ADDED
:
2902 case DIFF_STATUS_COPIED
:
2903 case DIFF_STATUS_RENAMED
:
2908 if (p
->one
->mode
&& p
->two
->mode
&&
2909 p
->one
->mode
!= p
->two
->mode
)
2917 void diff_flush(struct diff_options
*options
)
2919 struct diff_queue_struct
*q
= &diff_queued_diff
;
2920 int i
, output_format
= options
->output_format
;
2924 * Order: raw, stat, summary, patch
2925 * or: name/name-status/checkdiff (other bits clear)
2930 if (output_format
& (DIFF_FORMAT_RAW
|
2932 DIFF_FORMAT_NAME_STATUS
|
2933 DIFF_FORMAT_CHECKDIFF
)) {
2934 for (i
= 0; i
< q
->nr
; i
++) {
2935 struct diff_filepair
*p
= q
->queue
[i
];
2936 if (check_pair_status(p
))
2937 flush_one_pair(p
, options
);
2942 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
2943 struct diffstat_t diffstat
;
2945 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
2946 diffstat
.xm
.consume
= diffstat_consume
;
2947 for (i
= 0; i
< q
->nr
; i
++) {
2948 struct diff_filepair
*p
= q
->queue
[i
];
2949 if (check_pair_status(p
))
2950 diff_flush_stat(p
, options
, &diffstat
);
2952 if (output_format
& DIFF_FORMAT_NUMSTAT
)
2953 show_numstat(&diffstat
, options
);
2954 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
2955 show_stats(&diffstat
, options
);
2956 else if (output_format
& DIFF_FORMAT_SHORTSTAT
)
2957 show_shortstats(&diffstat
);
2961 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
2962 for (i
= 0; i
< q
->nr
; i
++)
2963 diff_summary(q
->queue
[i
]);
2967 if (output_format
& DIFF_FORMAT_PATCH
) {
2969 if (options
->stat_sep
) {
2970 /* attach patch instead of inline */
2971 fputs(options
->stat_sep
, stdout
);
2973 putchar(options
->line_termination
);
2977 for (i
= 0; i
< q
->nr
; i
++) {
2978 struct diff_filepair
*p
= q
->queue
[i
];
2979 if (check_pair_status(p
))
2980 diff_flush_patch(p
, options
);
2984 if (output_format
& DIFF_FORMAT_CALLBACK
)
2985 options
->format_callback(q
, options
, options
->format_callback_data
);
2987 for (i
= 0; i
< q
->nr
; i
++)
2988 diff_free_filepair(q
->queue
[i
]);
2992 q
->nr
= q
->alloc
= 0;
2995 static void diffcore_apply_filter(const char *filter
)
2998 struct diff_queue_struct
*q
= &diff_queued_diff
;
2999 struct diff_queue_struct outq
;
3001 outq
.nr
= outq
.alloc
= 0;
3006 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3008 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3009 struct diff_filepair
*p
= q
->queue
[i
];
3010 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3012 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3014 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3015 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3016 strchr(filter
, p
->status
)))
3022 /* otherwise we will clear the whole queue
3023 * by copying the empty outq at the end of this
3024 * function, but first clear the current entries
3027 for (i
= 0; i
< q
->nr
; i
++)
3028 diff_free_filepair(q
->queue
[i
]);
3031 /* Only the matching ones */
3032 for (i
= 0; i
< q
->nr
; i
++) {
3033 struct diff_filepair
*p
= q
->queue
[i
];
3035 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3037 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3039 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3040 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3041 strchr(filter
, p
->status
)))
3044 diff_free_filepair(p
);
3051 /* Check whether two filespecs with the same mode and size are identical */
3052 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3053 struct diff_filespec
*two
)
3055 if (S_ISGITLINK(one
->mode
)) {
3056 diff_fill_sha1_info(one
);
3057 diff_fill_sha1_info(two
);
3058 return !hashcmp(one
->sha1
, two
->sha1
);
3060 if (diff_populate_filespec(one
, 0))
3062 if (diff_populate_filespec(two
, 0))
3064 return !memcmp(one
->data
, two
->data
, one
->size
);
3067 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3070 struct diff_queue_struct
*q
= &diff_queued_diff
;
3071 struct diff_queue_struct outq
;
3073 outq
.nr
= outq
.alloc
= 0;
3075 for (i
= 0; i
< q
->nr
; i
++) {
3076 struct diff_filepair
*p
= q
->queue
[i
];
3079 * 1. Entries that come from stat info dirtyness
3080 * always have both sides (iow, not create/delete),
3081 * one side of the object name is unknown, with
3082 * the same mode and size. Keep the ones that
3083 * do not match these criteria. They have real
3086 * 2. At this point, the file is known to be modified,
3087 * with the same mode and size, and the object
3088 * name of one side is unknown. Need to inspect
3089 * the identical contents.
3091 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3092 !DIFF_FILE_VALID(p
->two
) ||
3093 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3094 (p
->one
->mode
!= p
->two
->mode
) ||
3095 diff_populate_filespec(p
->one
, 1) ||
3096 diff_populate_filespec(p
->two
, 1) ||
3097 (p
->one
->size
!= p
->two
->size
) ||
3098 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3102 * The caller can subtract 1 from skip_stat_unmatch
3103 * to determine how many paths were dirty only
3104 * due to stat info mismatch.
3106 if (!diffopt
->no_index
)
3107 diffopt
->skip_stat_unmatch
++;
3108 diff_free_filepair(p
);
3115 void diffcore_std(struct diff_options
*options
)
3120 if (options
->skip_stat_unmatch
&& !options
->find_copies_harder
)
3121 diffcore_skip_stat_unmatch(options
);
3122 if (options
->break_opt
!= -1)
3123 diffcore_break(options
->break_opt
);
3124 if (options
->detect_rename
)
3125 diffcore_rename(options
);
3126 if (options
->break_opt
!= -1)
3127 diffcore_merge_broken();
3128 if (options
->pickaxe
)
3129 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3130 if (options
->orderfile
)
3131 diffcore_order(options
->orderfile
);
3132 diff_resolve_rename_copy();
3133 diffcore_apply_filter(options
->filter
);
3135 options
->has_changes
= !!diff_queued_diff
.nr
;
3139 void diff_addremove(struct diff_options
*options
,
3140 int addremove
, unsigned mode
,
3141 const unsigned char *sha1
,
3142 const char *base
, const char *path
)
3144 char concatpath
[PATH_MAX
];
3145 struct diff_filespec
*one
, *two
;
3147 /* This may look odd, but it is a preparation for
3148 * feeding "there are unchanged files which should
3149 * not produce diffs, but when you are doing copy
3150 * detection you would need them, so here they are"
3151 * entries to the diff-core. They will be prefixed
3152 * with something like '=' or '*' (I haven't decided
3153 * which but should not make any difference).
3154 * Feeding the same new and old to diff_change()
3155 * also has the same effect.
3156 * Before the final output happens, they are pruned after
3157 * merged into rename/copy pairs as appropriate.
3159 if (options
->reverse_diff
)
3160 addremove
= (addremove
== '+' ? '-' :
3161 addremove
== '-' ? '+' : addremove
);
3163 if (!path
) path
= "";
3164 sprintf(concatpath
, "%s%s", base
, path
);
3165 one
= alloc_filespec(concatpath
);
3166 two
= alloc_filespec(concatpath
);
3168 if (addremove
!= '+')
3169 fill_filespec(one
, sha1
, mode
);
3170 if (addremove
!= '-')
3171 fill_filespec(two
, sha1
, mode
);
3173 diff_queue(&diff_queued_diff
, one
, two
);
3174 options
->has_changes
= 1;
3177 void diff_change(struct diff_options
*options
,
3178 unsigned old_mode
, unsigned new_mode
,
3179 const unsigned char *old_sha1
,
3180 const unsigned char *new_sha1
,
3181 const char *base
, const char *path
)
3183 char concatpath
[PATH_MAX
];
3184 struct diff_filespec
*one
, *two
;
3186 if (options
->reverse_diff
) {
3188 const unsigned char *tmp_c
;
3189 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3190 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3192 if (!path
) path
= "";
3193 sprintf(concatpath
, "%s%s", base
, path
);
3194 one
= alloc_filespec(concatpath
);
3195 two
= alloc_filespec(concatpath
);
3196 fill_filespec(one
, old_sha1
, old_mode
);
3197 fill_filespec(two
, new_sha1
, new_mode
);
3199 diff_queue(&diff_queued_diff
, one
, two
);
3200 options
->has_changes
= 1;
3203 void diff_unmerge(struct diff_options
*options
,
3205 unsigned mode
, const unsigned char *sha1
)
3207 struct diff_filespec
*one
, *two
;
3208 one
= alloc_filespec(path
);
3209 two
= alloc_filespec(path
);
3210 fill_filespec(one
, sha1
, mode
);
3211 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;