2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "spawn-pipe.h"
14 #ifdef NO_FAST_WORKING_DIRECTORY
15 #define FAST_WORKING_DIRECTORY 0
17 #define FAST_WORKING_DIRECTORY 1
20 static int diff_detect_rename_default
;
21 static int diff_rename_limit_default
= 100;
22 static int diff_use_color_default
;
23 int diff_auto_refresh_index
= 1;
25 static char diff_colors
[][COLOR_MAXLEN
] = {
27 "", /* PLAIN (normal) */
28 "\033[1m", /* METAINFO (bold) */
29 "\033[36m", /* FRAGINFO (cyan) */
30 "\033[31m", /* OLD (red) */
31 "\033[32m", /* NEW (green) */
32 "\033[33m", /* COMMIT (yellow) */
33 "\033[41m", /* WHITESPACE (red background) */
36 static int parse_diff_color_slot(const char *var
, int ofs
)
38 if (!strcasecmp(var
+ofs
, "plain"))
40 if (!strcasecmp(var
+ofs
, "meta"))
42 if (!strcasecmp(var
+ofs
, "frag"))
44 if (!strcasecmp(var
+ofs
, "old"))
46 if (!strcasecmp(var
+ofs
, "new"))
48 if (!strcasecmp(var
+ofs
, "commit"))
50 if (!strcasecmp(var
+ofs
, "whitespace"))
51 return DIFF_WHITESPACE
;
52 die("bad config variable '%s'", var
);
55 static struct ll_diff_driver
{
57 struct ll_diff_driver
*next
;
59 } *user_diff
, **user_diff_tail
;
61 static void read_config_if_needed(void)
63 if (!user_diff_tail
) {
64 user_diff_tail
= &user_diff
;
65 git_config(git_diff_ui_config
);
70 * Currently there is only "diff.<drivername>.command" variable;
71 * because there are "diff.color.<slot>" variables, we are parsing
72 * this in a bit convoluted way to allow low level diff driver
75 static int parse_lldiff_command(const char *var
, const char *ep
, const char *value
)
79 struct ll_diff_driver
*drv
;
83 for (drv
= user_diff
; drv
; drv
= drv
->next
)
84 if (!strncmp(drv
->name
, name
, namelen
) && !drv
->name
[namelen
])
87 drv
= xcalloc(1, sizeof(struct ll_diff_driver
));
88 drv
->name
= xmemdupz(name
, namelen
);
90 user_diff_tail
= &user_diff
;
91 *user_diff_tail
= drv
;
92 user_diff_tail
= &(drv
->next
);
96 return error("%s: lacks value", var
);
97 drv
->cmd
= strdup(value
);
102 * 'diff.<what>.funcname' attribute can be specified in the configuration
103 * to define a customized regexp to find the beginning of a function to
104 * be used for hunk header lines of "diff -p" style output.
106 static struct funcname_pattern
{
109 struct funcname_pattern
*next
;
110 } *funcname_pattern_list
;
112 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
)
116 struct funcname_pattern
*pp
;
118 name
= var
+ 5; /* "diff." */
121 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
122 if (!strncmp(pp
->name
, name
, namelen
) && !pp
->name
[namelen
])
125 pp
= xcalloc(1, sizeof(*pp
));
126 pp
->name
= xmemdupz(name
, namelen
);
127 pp
->next
= funcname_pattern_list
;
128 funcname_pattern_list
= pp
;
132 pp
->pattern
= xstrdup(value
);
137 * These are to give UI layer defaults.
138 * The core-level commands such as git-diff-files should
139 * never be affected by the setting of diff.renames
140 * the user happens to have in the configuration file.
142 int git_diff_ui_config(const char *var
, const char *value
)
144 if (!strcmp(var
, "diff.renamelimit")) {
145 diff_rename_limit_default
= git_config_int(var
, value
);
148 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
149 diff_use_color_default
= git_config_colorbool(var
, value
);
152 if (!strcmp(var
, "diff.renames")) {
154 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
155 else if (!strcasecmp(value
, "copies") ||
156 !strcasecmp(value
, "copy"))
157 diff_detect_rename_default
= DIFF_DETECT_COPY
;
158 else if (git_config_bool(var
,value
))
159 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
162 if (!strcmp(var
, "diff.autorefreshindex")) {
163 diff_auto_refresh_index
= git_config_bool(var
, value
);
166 if (!prefixcmp(var
, "diff.")) {
167 const char *ep
= strrchr(var
, '.');
170 if (!strcmp(ep
, ".command"))
171 return parse_lldiff_command(var
, ep
, value
);
172 if (!strcmp(ep
, ".funcname"))
173 return parse_funcname_pattern(var
, ep
, value
);
176 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
177 int slot
= parse_diff_color_slot(var
, 11);
178 color_parse(value
, var
, diff_colors
[slot
]);
182 return git_default_config(var
, value
);
185 static char *quote_two(const char *one
, const char *two
)
187 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
188 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
191 strbuf_init(&res
, 0);
192 if (need_one
+ need_two
) {
193 strbuf_addch(&res
, '"');
194 quote_c_style(one
, &res
, NULL
, 1);
195 quote_c_style(two
, &res
, NULL
, 1);
196 strbuf_addch(&res
, '"');
198 strbuf_addstr(&res
, one
);
199 strbuf_addstr(&res
, two
);
201 return strbuf_detach(&res
, NULL
);
204 static const char *external_diff(void)
206 static const char *external_diff_cmd
= NULL
;
207 static int done_preparing
= 0;
210 return external_diff_cmd
;
211 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
213 return external_diff_cmd
;
216 static struct diff_tempfile
{
217 const char *name
; /* filename external diff should read from */
220 char tmp_path
[PATH_MAX
];
223 static int count_lines(const char *data
, int size
)
225 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
232 completely_empty
= 0;
236 completely_empty
= 0;
239 if (completely_empty
)
242 count
++; /* no trailing newline */
246 static void print_line_count(int count
)
256 printf("1,%d", count
);
261 static void copy_file(int prefix
, const char *data
, int size
,
262 const char *set
, const char *reset
)
264 int ch
, nl_just_seen
= 1;
273 fputs(reset
, stdout
);
279 printf("%s\n\\ No newline at end of file\n", reset
);
282 static void emit_rewrite_diff(const char *name_a
,
284 struct diff_filespec
*one
,
285 struct diff_filespec
*two
,
289 const char *name_a_tab
, *name_b_tab
;
290 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
291 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
292 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
293 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
294 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
296 name_a
+= (*name_a
== '/');
297 name_b
+= (*name_b
== '/');
298 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
299 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
301 diff_populate_filespec(one
, 0);
302 diff_populate_filespec(two
, 0);
303 lc_a
= count_lines(one
->data
, one
->size
);
304 lc_b
= count_lines(two
->data
, two
->size
);
305 printf("%s--- a/%s%s%s\n%s+++ b/%s%s%s\n%s@@ -",
306 metainfo
, name_a
, name_a_tab
, reset
,
307 metainfo
, name_b
, name_b_tab
, reset
, fraginfo
);
308 print_line_count(lc_a
);
310 print_line_count(lc_b
);
311 printf(" @@%s\n", reset
);
313 copy_file('-', one
->data
, one
->size
, old
, reset
);
315 copy_file('+', two
->data
, two
->size
, new, reset
);
318 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
320 if (!DIFF_FILE_VALID(one
)) {
321 mf
->ptr
= (char *)""; /* does not matter */
325 else if (diff_populate_filespec(one
, 0))
328 mf
->size
= one
->size
;
332 struct diff_words_buffer
{
335 long current
; /* output pointer */
336 int suppressed_newline
;
339 static void diff_words_append(char *line
, unsigned long len
,
340 struct diff_words_buffer
*buffer
)
342 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
343 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
344 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
348 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
349 buffer
->text
.size
+= len
;
352 struct diff_words_data
{
353 struct xdiff_emit_state xm
;
354 struct diff_words_buffer minus
, plus
;
357 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
358 int suppress_newline
)
366 ptr
= buffer
->text
.ptr
+ buffer
->current
;
367 buffer
->current
+= len
;
369 if (ptr
[len
- 1] == '\n') {
374 fputs(diff_get_color(1, color
), stdout
);
375 fwrite(ptr
, len
, 1, stdout
);
376 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
379 if (suppress_newline
)
380 buffer
->suppressed_newline
= 1;
386 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
388 struct diff_words_data
*diff_words
= priv
;
390 if (diff_words
->minus
.suppressed_newline
) {
393 diff_words
->minus
.suppressed_newline
= 0;
399 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
402 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
405 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
406 diff_words
->minus
.current
+= len
;
411 /* this executes the word diff on the accumulated buffers */
412 static void diff_words_show(struct diff_words_data
*diff_words
)
417 mmfile_t minus
, plus
;
420 memset(&xecfg
, 0, sizeof(xecfg
));
421 minus
.size
= diff_words
->minus
.text
.size
;
422 minus
.ptr
= xmalloc(minus
.size
);
423 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
424 for (i
= 0; i
< minus
.size
; i
++)
425 if (isspace(minus
.ptr
[i
]))
427 diff_words
->minus
.current
= 0;
429 plus
.size
= diff_words
->plus
.text
.size
;
430 plus
.ptr
= xmalloc(plus
.size
);
431 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
432 for (i
= 0; i
< plus
.size
; i
++)
433 if (isspace(plus
.ptr
[i
]))
435 diff_words
->plus
.current
= 0;
437 xpp
.flags
= XDF_NEED_MINIMAL
;
438 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
439 ecb
.outf
= xdiff_outf
;
440 ecb
.priv
= diff_words
;
441 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
442 xdl_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
446 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
448 if (diff_words
->minus
.suppressed_newline
) {
450 diff_words
->minus
.suppressed_newline
= 0;
454 struct emit_callback
{
455 struct xdiff_emit_state xm
;
456 int nparents
, color_diff
;
457 const char **label_path
;
458 struct diff_words_data
*diff_words
;
462 static void free_diff_words_data(struct emit_callback
*ecbdata
)
464 if (ecbdata
->diff_words
) {
466 if (ecbdata
->diff_words
->minus
.text
.size
||
467 ecbdata
->diff_words
->plus
.text
.size
)
468 diff_words_show(ecbdata
->diff_words
);
470 if (ecbdata
->diff_words
->minus
.text
.ptr
)
471 free (ecbdata
->diff_words
->minus
.text
.ptr
);
472 if (ecbdata
->diff_words
->plus
.text
.ptr
)
473 free (ecbdata
->diff_words
->plus
.text
.ptr
);
474 free(ecbdata
->diff_words
);
475 ecbdata
->diff_words
= NULL
;
479 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
482 return diff_colors
[ix
];
486 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
488 if (len
> 0 && line
[len
-1] == '\n')
491 fwrite(line
, len
, 1, stdout
);
495 static void emit_line_with_ws(int nparents
,
496 const char *set
, const char *reset
, const char *ws
,
497 const char *line
, int len
)
500 int last_tab_in_indent
= -1;
501 int last_space_in_indent
= -1;
504 int need_highlight_leading_space
= 0;
505 /* The line is a newly added line. Does it have funny leading
506 * whitespaces? In indent, SP should never precede a TAB.
508 for (i
= col0
; i
< len
; i
++) {
509 if (line
[i
] == '\t') {
510 last_tab_in_indent
= i
;
511 if (0 <= last_space_in_indent
)
512 need_highlight_leading_space
= 1;
514 else if (line
[i
] == ' ')
515 last_space_in_indent
= i
;
520 fwrite(line
, col0
, 1, stdout
);
521 fputs(reset
, stdout
);
522 if (((i
== len
) || line
[i
] == '\n') && i
!= col0
) {
523 /* The whole line was indent */
524 emit_line(ws
, reset
, line
+ col0
, len
- col0
);
528 if (need_highlight_leading_space
) {
529 while (i
< last_tab_in_indent
) {
530 if (line
[i
] == ' ') {
533 fputs(reset
, stdout
);
541 if (line
[tail
] == '\n' && i
< tail
)
544 if (!isspace(line
[tail
]))
548 if ((i
< tail
&& line
[tail
+ 1] != '\n')) {
549 /* This has whitespace between tail+1..len */
551 fwrite(line
+ i
, tail
- i
+ 1, 1, stdout
);
552 fputs(reset
, stdout
);
553 emit_line(ws
, reset
, line
+ tail
+ 1, len
- tail
- 1);
556 emit_line(set
, reset
, line
+ i
, len
- i
);
559 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
561 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
562 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
565 emit_line(set
, reset
, line
, len
);
567 emit_line_with_ws(ecbdata
->nparents
, set
, reset
, ws
,
571 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
575 struct emit_callback
*ecbdata
= priv
;
576 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
577 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
579 *(ecbdata
->found_changesp
) = 1;
581 if (ecbdata
->label_path
[0]) {
582 const char *name_a_tab
, *name_b_tab
;
584 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
585 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
587 printf("%s--- %s%s%s\n",
588 set
, ecbdata
->label_path
[0], reset
, name_a_tab
);
589 printf("%s+++ %s%s%s\n",
590 set
, ecbdata
->label_path
[1], reset
, name_b_tab
);
591 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
594 /* This is not really necessary for now because
595 * this codepath only deals with two-way diffs.
597 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
599 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
600 ecbdata
->nparents
= i
- 1;
601 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
606 if (len
< ecbdata
->nparents
) {
608 emit_line(reset
, reset
, line
, len
);
613 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
614 /* fall back to normal diff */
615 free_diff_words_data(ecbdata
);
616 if (ecbdata
->diff_words
) {
617 if (line
[0] == '-') {
618 diff_words_append(line
, len
,
619 &ecbdata
->diff_words
->minus
);
621 } else if (line
[0] == '+') {
622 diff_words_append(line
, len
,
623 &ecbdata
->diff_words
->plus
);
626 if (ecbdata
->diff_words
->minus
.text
.size
||
627 ecbdata
->diff_words
->plus
.text
.size
)
628 diff_words_show(ecbdata
->diff_words
);
631 emit_line(set
, reset
, line
, len
);
634 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
636 color
= DIFF_FILE_OLD
;
637 else if (line
[i
] == '+')
638 color
= DIFF_FILE_NEW
;
641 if (color
!= DIFF_FILE_NEW
) {
642 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
646 emit_add_line(reset
, ecbdata
, line
, len
);
649 static char *pprint_rename(const char *a
, const char *b
)
654 int pfx_length
, sfx_length
;
655 int len_a
= strlen(a
);
656 int len_b
= strlen(b
);
657 int a_midlen
, b_midlen
;
658 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
659 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
661 strbuf_init(&name
, 0);
662 if (qlen_a
|| qlen_b
) {
663 quote_c_style(a
, &name
, NULL
, 0);
664 strbuf_addstr(&name
, " => ");
665 quote_c_style(b
, &name
, NULL
, 0);
666 return strbuf_detach(&name
, NULL
);
669 /* Find common prefix */
671 while (*old
&& *new && *old
== *new) {
673 pfx_length
= old
- a
+ 1;
678 /* Find common suffix */
682 while (a
<= old
&& b
<= new && *old
== *new) {
684 sfx_length
= len_a
- (old
- a
);
690 * pfx{mid-a => mid-b}sfx
691 * {pfx-a => pfx-b}sfx
692 * pfx{sfx-a => sfx-b}
695 a_midlen
= len_a
- pfx_length
- sfx_length
;
696 b_midlen
= len_b
- pfx_length
- sfx_length
;
702 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
703 if (pfx_length
+ sfx_length
) {
704 strbuf_add(&name
, a
, pfx_length
);
705 strbuf_addch(&name
, '{');
707 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
708 strbuf_addstr(&name
, " => ");
709 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
710 if (pfx_length
+ sfx_length
) {
711 strbuf_addch(&name
, '}');
712 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
714 return strbuf_detach(&name
, NULL
);
718 struct xdiff_emit_state xm
;
722 struct diffstat_file
{
724 unsigned is_unmerged
:1;
725 unsigned is_binary
:1;
726 unsigned is_renamed
:1;
727 unsigned int added
, deleted
;
731 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
735 struct diffstat_file
*x
;
736 x
= xcalloc(sizeof (*x
), 1);
737 if (diffstat
->nr
== diffstat
->alloc
) {
738 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
739 diffstat
->files
= xrealloc(diffstat
->files
,
740 diffstat
->alloc
* sizeof(x
));
742 diffstat
->files
[diffstat
->nr
++] = x
;
744 x
->name
= pprint_rename(name_a
, name_b
);
748 x
->name
= xstrdup(name_a
);
752 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
754 struct diffstat_t
*diffstat
= priv
;
755 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
759 else if (line
[0] == '-')
763 const char mime_boundary_leader
[] = "------------";
765 static int scale_linear(int it
, int width
, int max_change
)
768 * make sure that at least one '-' is printed if there were deletions,
769 * and likewise for '+'.
773 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
776 static void show_name(const char *prefix
, const char *name
, int len
,
777 const char *reset
, const char *set
)
779 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
782 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
792 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
794 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
795 int max_change
= 0, max_len
= 0;
796 int total_files
= data
->nr
;
797 int width
, name_width
;
798 const char *reset
, *set
, *add_c
, *del_c
;
803 width
= options
->stat_width
? options
->stat_width
: 80;
804 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
806 /* Sanity: give at least 5 columns to the graph,
807 * but leave at least 10 columns for the name.
809 if (width
< name_width
+ 15) {
810 if (name_width
<= 25)
811 width
= name_width
+ 15;
813 name_width
= width
- 15;
816 /* Find the longest filename and max number of changes */
817 reset
= diff_get_color(options
->color_diff
, DIFF_RESET
);
818 set
= diff_get_color(options
->color_diff
, DIFF_PLAIN
);
819 add_c
= diff_get_color(options
->color_diff
, DIFF_FILE_NEW
);
820 del_c
= diff_get_color(options
->color_diff
, DIFF_FILE_OLD
);
822 for (i
= 0; i
< data
->nr
; i
++) {
823 struct diffstat_file
*file
= data
->files
[i
];
824 int change
= file
->added
+ file
->deleted
;
826 if (!file
->is_renamed
) { /* renames are already quoted by pprint_rename */
828 strbuf_init(&buf
, 0);
829 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
831 file
->name
= strbuf_detach(&buf
, NULL
);
833 strbuf_release(&buf
);
837 len
= strlen(file
->name
);
841 if (file
->is_binary
|| file
->is_unmerged
)
843 if (max_change
< change
)
847 /* Compute the width of the graph part;
848 * 10 is for one blank at the beginning of the line plus
849 * " | count " between the name and the graph.
851 * From here on, name_width is the width of the name area,
852 * and width is the width of the graph area.
854 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
855 if (width
< (name_width
+ 10) + max_change
)
856 width
= width
- (name_width
+ 10);
860 for (i
= 0; i
< data
->nr
; i
++) {
861 const char *prefix
= "";
862 char *name
= data
->files
[i
]->name
;
863 int added
= data
->files
[i
]->added
;
864 int deleted
= data
->files
[i
]->deleted
;
868 * "scale" the filename
871 name_len
= strlen(name
);
872 if (name_width
< name_len
) {
876 name
+= name_len
- len
;
877 slash
= strchr(name
, '/');
882 if (data
->files
[i
]->is_binary
) {
883 show_name(prefix
, name
, len
, reset
, set
);
885 printf("%s%d%s", del_c
, deleted
, reset
);
887 printf("%s%d%s", add_c
, added
, reset
);
890 goto free_diffstat_file
;
892 else if (data
->files
[i
]->is_unmerged
) {
893 show_name(prefix
, name
, len
, reset
, set
);
894 printf(" Unmerged\n");
895 goto free_diffstat_file
;
897 else if (!data
->files
[i
]->is_renamed
&&
898 (added
+ deleted
== 0)) {
900 goto free_diffstat_file
;
904 * scale the add/delete
912 if (width
<= max_change
) {
913 add
= scale_linear(add
, width
, max_change
);
914 del
= scale_linear(del
, width
, max_change
);
917 show_name(prefix
, name
, len
, reset
, set
);
918 printf("%5d ", added
+ deleted
);
919 show_graph('+', add
, add_c
, reset
);
920 show_graph('-', del
, del_c
, reset
);
923 free(data
->files
[i
]->name
);
924 free(data
->files
[i
]);
927 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
928 set
, total_files
, adds
, dels
, reset
);
931 static void show_shortstats(struct diffstat_t
* data
)
933 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
938 for (i
= 0; i
< data
->nr
; i
++) {
939 if (!data
->files
[i
]->is_binary
&&
940 !data
->files
[i
]->is_unmerged
) {
941 int added
= data
->files
[i
]->added
;
942 int deleted
= data
->files
[i
]->deleted
;
943 if (!data
->files
[i
]->is_renamed
&&
944 (added
+ deleted
== 0)) {
951 free(data
->files
[i
]->name
);
952 free(data
->files
[i
]);
956 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
957 total_files
, adds
, dels
);
960 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
964 for (i
= 0; i
< data
->nr
; i
++) {
965 struct diffstat_file
*file
= data
->files
[i
];
970 printf("%d\t%d\t", file
->added
, file
->deleted
);
971 if (!file
->is_renamed
) {
972 write_name_quoted(file
->name
, stdout
, options
->line_termination
);
974 fputs(file
->name
, stdout
);
975 putchar(options
->line_termination
);
981 struct xdiff_emit_state xm
;
982 const char *filename
;
983 int lineno
, color_diff
;
986 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
988 struct checkdiff_t
*data
= priv
;
989 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
990 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
991 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
993 if (line
[0] == '+') {
994 int i
, spaces
= 0, space_before_tab
= 0, white_space_at_end
= 0;
996 /* check space before tab */
997 for (i
= 1; i
< len
&& (line
[i
] == ' ' || line
[i
] == '\t'); i
++)
1000 if (line
[i
- 1] == '\t' && spaces
)
1001 space_before_tab
= 1;
1003 /* check white space at line end */
1004 if (line
[len
- 1] == '\n')
1006 if (isspace(line
[len
- 1]))
1007 white_space_at_end
= 1;
1009 if (space_before_tab
|| white_space_at_end
) {
1010 printf("%s:%d: %s", data
->filename
, data
->lineno
, ws
);
1011 if (space_before_tab
) {
1012 printf("space before tab");
1013 if (white_space_at_end
)
1016 if (white_space_at_end
)
1017 printf("white space at end");
1018 printf(":%s ", reset
);
1019 emit_line_with_ws(1, set
, reset
, ws
, line
, len
);
1023 } else if (line
[0] == ' ')
1025 else if (line
[0] == '@') {
1026 char *plus
= strchr(line
, '+');
1028 data
->lineno
= strtol(plus
, NULL
, 10);
1030 die("invalid diff");
1034 static unsigned char *deflate_it(char *data
,
1036 unsigned long *result_size
)
1039 unsigned char *deflated
;
1042 memset(&stream
, 0, sizeof(stream
));
1043 deflateInit(&stream
, zlib_compression_level
);
1044 bound
= deflateBound(&stream
, size
);
1045 deflated
= xmalloc(bound
);
1046 stream
.next_out
= deflated
;
1047 stream
.avail_out
= bound
;
1049 stream
.next_in
= (unsigned char *)data
;
1050 stream
.avail_in
= size
;
1051 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1053 deflateEnd(&stream
);
1054 *result_size
= stream
.total_out
;
1058 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
1064 unsigned long orig_size
;
1065 unsigned long delta_size
;
1066 unsigned long deflate_size
;
1067 unsigned long data_size
;
1069 /* We could do deflated delta, or we could do just deflated two,
1070 * whichever is smaller.
1073 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1074 if (one
->size
&& two
->size
) {
1075 delta
= diff_delta(one
->ptr
, one
->size
,
1076 two
->ptr
, two
->size
,
1077 &delta_size
, deflate_size
);
1079 void *to_free
= delta
;
1080 orig_size
= delta_size
;
1081 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1086 if (delta
&& delta_size
< deflate_size
) {
1087 printf("delta %lu\n", orig_size
);
1090 data_size
= delta_size
;
1093 printf("literal %lu\n", two
->size
);
1096 data_size
= deflate_size
;
1099 /* emit data encoded in base85 */
1102 int bytes
= (52 < data_size
) ? 52 : data_size
;
1106 line
[0] = bytes
+ 'A' - 1;
1108 line
[0] = bytes
- 26 + 'a' - 1;
1109 encode_85(line
+ 1, cp
, bytes
);
1110 cp
= (char *) cp
+ bytes
;
1117 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1119 printf("GIT binary patch\n");
1120 emit_binary_diff_body(one
, two
);
1121 emit_binary_diff_body(two
, one
);
1124 static void setup_diff_attr_check(struct git_attr_check
*check
)
1126 static struct git_attr
*attr_diff
;
1129 attr_diff
= git_attr("diff", 4);
1131 check
[0].attr
= attr_diff
;
1134 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1136 struct git_attr_check attr_diff_check
;
1137 int check_from_data
= 0;
1139 if (one
->checked_attr
)
1142 setup_diff_attr_check(&attr_diff_check
);
1144 one
->funcname_pattern_ident
= NULL
;
1146 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1150 value
= attr_diff_check
.value
;
1151 if (ATTR_TRUE(value
))
1153 else if (ATTR_FALSE(value
))
1156 check_from_data
= 1;
1158 /* funcname pattern ident */
1159 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1162 one
->funcname_pattern_ident
= value
;
1165 if (check_from_data
) {
1166 if (!one
->data
&& DIFF_FILE_VALID(one
))
1167 diff_populate_filespec(one
, 0);
1170 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1174 int diff_filespec_is_binary(struct diff_filespec
*one
)
1176 diff_filespec_check_attr(one
);
1177 return one
->is_binary
;
1180 static const char *funcname_pattern(const char *ident
)
1182 struct funcname_pattern
*pp
;
1184 read_config_if_needed();
1185 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1186 if (!strcmp(ident
, pp
->name
))
1191 static struct builtin_funcname_pattern
{
1193 const char *pattern
;
1194 } builtin_funcname_pattern
[] = {
1195 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1196 "new\\|return\\|switch\\|throw\\|while\\)\n"
1198 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1200 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1203 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1205 const char *ident
, *pattern
;
1208 diff_filespec_check_attr(one
);
1209 ident
= one
->funcname_pattern_ident
;
1213 * If the config file has "funcname.default" defined, that
1214 * regexp is used; otherwise NULL is returned and xemit uses
1215 * the built-in default.
1217 return funcname_pattern("default");
1219 /* Look up custom "funcname.$ident" regexp from config. */
1220 pattern
= funcname_pattern(ident
);
1225 * And define built-in fallback patterns here. Note that
1226 * these can be overriden by the user's config settings.
1228 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1229 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1230 return builtin_funcname_pattern
[i
].pattern
;
1235 static void builtin_diff(const char *name_a
,
1237 struct diff_filespec
*one
,
1238 struct diff_filespec
*two
,
1239 const char *xfrm_msg
,
1240 struct diff_options
*o
,
1241 int complete_rewrite
)
1245 char *a_one
, *b_two
;
1246 const char *set
= diff_get_color(o
->color_diff
, DIFF_METAINFO
);
1247 const char *reset
= diff_get_color(o
->color_diff
, DIFF_RESET
);
1249 a_one
= quote_two("a/", name_a
+ (*name_a
== '/'));
1250 b_two
= quote_two("b/", name_b
+ (*name_b
== '/'));
1251 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1252 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1253 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1254 if (lbl
[0][0] == '/') {
1256 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1257 if (xfrm_msg
&& xfrm_msg
[0])
1258 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1260 else if (lbl
[1][0] == '/') {
1261 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1262 if (xfrm_msg
&& xfrm_msg
[0])
1263 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1266 if (one
->mode
!= two
->mode
) {
1267 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1268 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1270 if (xfrm_msg
&& xfrm_msg
[0])
1271 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1273 * we do not run diff between different kind
1276 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1277 goto free_ab_and_return
;
1278 if (complete_rewrite
) {
1279 emit_rewrite_diff(name_a
, name_b
, one
, two
,
1281 o
->found_changes
= 1;
1282 goto free_ab_and_return
;
1286 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1287 die("unable to read files to diff");
1290 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1291 /* Quite common confusing case */
1292 if (mf1
.size
== mf2
.size
&&
1293 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1294 goto free_ab_and_return
;
1296 emit_binary_diff(&mf1
, &mf2
);
1298 printf("Binary files %s and %s differ\n",
1300 o
->found_changes
= 1;
1303 /* Crazy xdl interfaces.. */
1304 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1308 struct emit_callback ecbdata
;
1309 const char *funcname_pattern
;
1311 funcname_pattern
= diff_funcname_pattern(one
);
1312 if (!funcname_pattern
)
1313 funcname_pattern
= diff_funcname_pattern(two
);
1315 memset(&xecfg
, 0, sizeof(xecfg
));
1316 memset(&ecbdata
, 0, sizeof(ecbdata
));
1317 ecbdata
.label_path
= lbl
;
1318 ecbdata
.color_diff
= o
->color_diff
;
1319 ecbdata
.found_changesp
= &o
->found_changes
;
1320 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1321 xecfg
.ctxlen
= o
->context
;
1322 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1323 if (funcname_pattern
)
1324 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1327 else if (!prefixcmp(diffopts
, "--unified="))
1328 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1329 else if (!prefixcmp(diffopts
, "-u"))
1330 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1331 ecb
.outf
= xdiff_outf
;
1332 ecb
.priv
= &ecbdata
;
1333 ecbdata
.xm
.consume
= fn_out_consume
;
1334 if (o
->color_diff_words
)
1335 ecbdata
.diff_words
=
1336 xcalloc(1, sizeof(struct diff_words_data
));
1337 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1338 if (o
->color_diff_words
)
1339 free_diff_words_data(&ecbdata
);
1343 diff_free_filespec_data(one
);
1344 diff_free_filespec_data(two
);
1350 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1351 struct diff_filespec
*one
,
1352 struct diff_filespec
*two
,
1353 struct diffstat_t
*diffstat
,
1354 struct diff_options
*o
,
1355 int complete_rewrite
)
1358 struct diffstat_file
*data
;
1360 data
= diffstat_add(diffstat
, name_a
, name_b
);
1363 data
->is_unmerged
= 1;
1366 if (complete_rewrite
) {
1367 diff_populate_filespec(one
, 0);
1368 diff_populate_filespec(two
, 0);
1369 data
->deleted
= count_lines(one
->data
, one
->size
);
1370 data
->added
= count_lines(two
->data
, two
->size
);
1371 goto free_and_return
;
1373 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1374 die("unable to read files to diff");
1376 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1377 data
->is_binary
= 1;
1378 data
->added
= mf2
.size
;
1379 data
->deleted
= mf1
.size
;
1381 /* Crazy xdl interfaces.. */
1386 memset(&xecfg
, 0, sizeof(xecfg
));
1387 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1388 ecb
.outf
= xdiff_outf
;
1389 ecb
.priv
= diffstat
;
1390 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1394 diff_free_filespec_data(one
);
1395 diff_free_filespec_data(two
);
1398 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1399 struct diff_filespec
*one
,
1400 struct diff_filespec
*two
, struct diff_options
*o
)
1403 struct checkdiff_t data
;
1408 memset(&data
, 0, sizeof(data
));
1409 data
.xm
.consume
= checkdiff_consume
;
1410 data
.filename
= name_b
? name_b
: name_a
;
1412 data
.color_diff
= o
->color_diff
;
1414 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1415 die("unable to read files to diff");
1417 if (diff_filespec_is_binary(two
))
1418 goto free_and_return
;
1420 /* Crazy xdl interfaces.. */
1425 memset(&xecfg
, 0, sizeof(xecfg
));
1426 xpp
.flags
= XDF_NEED_MINIMAL
;
1427 ecb
.outf
= xdiff_outf
;
1429 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1432 diff_free_filespec_data(one
);
1433 diff_free_filespec_data(two
);
1436 struct diff_filespec
*alloc_filespec(const char *path
)
1438 int namelen
= strlen(path
);
1439 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1441 memset(spec
, 0, sizeof(*spec
));
1442 spec
->path
= (char *)(spec
+ 1);
1443 memcpy(spec
->path
, path
, namelen
+1);
1447 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1448 unsigned short mode
)
1451 spec
->mode
= canon_mode(mode
);
1452 hashcpy(spec
->sha1
, sha1
);
1453 spec
->sha1_valid
= !is_null_sha1(sha1
);
1458 * Given a name and sha1 pair, if the index tells us the file in
1459 * the work tree has that object contents, return true, so that
1460 * prepare_temp_file() does not have to inflate and extract.
1462 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1464 struct cache_entry
*ce
;
1468 /* We do not read the cache ourselves here, because the
1469 * benchmark with my previous version that always reads cache
1470 * shows that it makes things worse for diff-tree comparing
1471 * two linux-2.6 kernel trees in an already checked out work
1472 * tree. This is because most diff-tree comparisons deal with
1473 * only a small number of files, while reading the cache is
1474 * expensive for a large project, and its cost outweighs the
1475 * savings we get by not inflating the object to a temporary
1476 * file. Practically, this code only helps when we are used
1477 * by diff-cache --cached, which does read the cache before
1483 /* We want to avoid the working directory if our caller
1484 * doesn't need the data in a normal file, this system
1485 * is rather slow with its stat/open/mmap/close syscalls,
1486 * and the object is contained in a pack file. The pack
1487 * is probably already open and will be faster to obtain
1488 * the data through than the working directory. Loose
1489 * objects however would tend to be slower as they need
1490 * to be individually opened and inflated.
1492 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1496 pos
= cache_name_pos(name
, len
);
1499 ce
= active_cache
[pos
];
1500 if ((lstat(name
, &st
) < 0) ||
1501 !S_ISREG(st
.st_mode
) || /* careful! */
1502 ce_match_stat(ce
, &st
, 0) ||
1503 hashcmp(sha1
, ce
->sha1
))
1505 /* we return 1 only when we can stat, it is a regular file,
1506 * stat information matches, and sha1 recorded in the cache
1507 * matches. I.e. we know the file in the work tree really is
1508 * the same as the <name, sha1> pair.
1513 static int populate_from_stdin(struct diff_filespec
*s
)
1517 strbuf_init(&buf
, 0);
1518 if (strbuf_read(&buf
, 0, 0) < 0)
1519 return error("error while reading from stdin %s",
1522 s
->should_munmap
= 0;
1523 s
->data
= strbuf_detach(&buf
, &s
->size
);
1528 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1531 char *data
= xmalloc(100);
1532 len
= snprintf(data
, 100,
1533 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1545 * While doing rename detection and pickaxe operation, we may need to
1546 * grab the data for the blob (or file) for our own in-core comparison.
1547 * diff_filespec has data and size fields for this purpose.
1549 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1552 if (!DIFF_FILE_VALID(s
))
1553 die("internal error: asking to populate invalid file.");
1554 if (S_ISDIR(s
->mode
))
1560 if (size_only
&& 0 < s
->size
)
1563 if (S_ISGITLINK(s
->mode
))
1564 return diff_populate_gitlink(s
, size_only
);
1566 if (!s
->sha1_valid
||
1567 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1572 if (!strcmp(s
->path
, "-"))
1573 return populate_from_stdin(s
);
1575 if (lstat(s
->path
, &st
) < 0) {
1576 if (errno
== ENOENT
) {
1580 s
->data
= (char *)"";
1585 s
->size
= xsize_t(st
.st_size
);
1590 if (S_ISLNK(st
.st_mode
)) {
1592 s
->data
= xmalloc(s
->size
);
1594 ret
= readlink(s
->path
, s
->data
, s
->size
);
1601 fd
= open(s
->path
, O_RDONLY
);
1604 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1606 s
->should_munmap
= 1;
1609 * Convert from working tree format to canonical git format
1611 strbuf_init(&buf
, 0);
1612 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
)) {
1613 munmap(s
->data
, s
->size
);
1614 s
->should_munmap
= 0;
1615 s
->data
= strbuf_detach(&buf
, &s
->size
);
1620 enum object_type type
;
1622 type
= sha1_object_info(s
->sha1
, &s
->size
);
1624 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1631 void diff_free_filespec_blob(struct diff_filespec
*s
)
1635 else if (s
->should_munmap
)
1636 munmap(s
->data
, s
->size
);
1638 if (s
->should_free
|| s
->should_munmap
) {
1639 s
->should_free
= s
->should_munmap
= 0;
1644 void diff_free_filespec_data(struct diff_filespec
*s
)
1646 diff_free_filespec_blob(s
);
1651 static void prep_temp_blob(struct diff_tempfile
*temp
,
1654 const unsigned char *sha1
,
1659 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1661 die("unable to create temp-file: %s", strerror(errno
));
1662 if (write_in_full(fd
, blob
, size
) != size
)
1663 die("unable to write temp-file");
1665 temp
->name
= temp
->tmp_path
;
1666 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1668 sprintf(temp
->mode
, "%06o", mode
);
1671 static void prepare_temp_file(const char *name
,
1672 struct diff_tempfile
*temp
,
1673 struct diff_filespec
*one
)
1675 if (!DIFF_FILE_VALID(one
)) {
1677 /* A '-' entry produces this for file-2, and
1678 * a '+' entry produces this for file-1.
1680 temp
->name
= "/dev/null";
1681 strcpy(temp
->hex
, ".");
1682 strcpy(temp
->mode
, ".");
1686 if (!one
->sha1_valid
||
1687 reuse_worktree_file(name
, one
->sha1
, 1)) {
1689 if (lstat(name
, &st
) < 0) {
1690 if (errno
== ENOENT
)
1691 goto not_a_valid_file
;
1692 die("stat(%s): %s", name
, strerror(errno
));
1694 if (S_ISLNK(st
.st_mode
)) {
1696 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1697 size_t sz
= xsize_t(st
.st_size
);
1698 if (sizeof(buf
) <= st
.st_size
)
1699 die("symlink too long: %s", name
);
1700 ret
= readlink(name
, buf
, sz
);
1702 die("readlink(%s)", name
);
1703 prep_temp_blob(temp
, buf
, sz
,
1705 one
->sha1
: null_sha1
),
1707 one
->mode
: S_IFLNK
));
1710 /* we can borrow from the file in the work tree */
1712 if (!one
->sha1_valid
)
1713 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1715 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1716 /* Even though we may sometimes borrow the
1717 * contents from the work tree, we always want
1718 * one->mode. mode is trustworthy even when
1719 * !(one->sha1_valid), as long as
1720 * DIFF_FILE_VALID(one).
1722 sprintf(temp
->mode
, "%06o", one
->mode
);
1727 if (diff_populate_filespec(one
, 0))
1728 die("cannot read data blob for %s", one
->path
);
1729 prep_temp_blob(temp
, one
->data
, one
->size
,
1730 one
->sha1
, one
->mode
);
1734 static void remove_tempfile(void)
1738 for (i
= 0; i
< 2; i
++)
1739 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1740 unlink(diff_temp
[i
].name
);
1741 diff_temp
[i
].name
= NULL
;
1745 static void remove_tempfile_on_signal(int signo
)
1748 signal(SIGINT
, SIG_DFL
);
1752 static int spawn_prog(const char *pgm
, const char **arg
)
1758 pid
= spawnvpe_pipe(pgm
, arg
, environ
, NULL
, NULL
);
1760 die("unable to fork");
1762 while (waitpid(pid
, &status
, 0) < 0) {
1768 /* Earlier we did not check the exit status because
1769 * diff exits non-zero if files are different, and
1770 * we are not interested in knowing that. It was a
1771 * mistake which made it harder to quit a diff-*
1772 * session that uses the git-apply-patch-script as
1773 * the GIT_EXTERNAL_DIFF. A custom GIT_EXTERNAL_DIFF
1774 * should also exit non-zero only when it wants to
1775 * abort the entire diff-* session.
1777 if (WIFEXITED(status
) && !WEXITSTATUS(status
))
1782 /* An external diff command takes:
1784 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1785 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1788 static void run_external_diff(const char *pgm
,
1791 struct diff_filespec
*one
,
1792 struct diff_filespec
*two
,
1793 const char *xfrm_msg
,
1794 int complete_rewrite
)
1796 const char *spawn_arg
[10];
1797 struct diff_tempfile
*temp
= diff_temp
;
1799 static int atexit_asked
= 0;
1800 const char *othername
;
1801 const char **arg
= &spawn_arg
[1];
1803 othername
= (other
? other
: name
);
1805 prepare_temp_file(name
, &temp
[0], one
);
1806 prepare_temp_file(othername
, &temp
[1], two
);
1807 if (! atexit_asked
&&
1808 (temp
[0].name
== temp
[0].tmp_path
||
1809 temp
[1].name
== temp
[1].tmp_path
)) {
1811 atexit(remove_tempfile
);
1813 signal(SIGINT
, remove_tempfile_on_signal
);
1818 *arg
++ = temp
[0].name
;
1819 *arg
++ = temp
[0].hex
;
1820 *arg
++ = temp
[0].mode
;
1821 *arg
++ = temp
[1].name
;
1822 *arg
++ = temp
[1].hex
;
1823 *arg
++ = temp
[1].mode
;
1832 retval
= spawn_prog(pgm
, spawn_arg
);
1835 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1840 static const char *external_diff_attr(const char *name
)
1842 struct git_attr_check attr_diff_check
;
1844 setup_diff_attr_check(&attr_diff_check
);
1845 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
1846 const char *value
= attr_diff_check
.value
;
1847 if (!ATTR_TRUE(value
) &&
1848 !ATTR_FALSE(value
) &&
1849 !ATTR_UNSET(value
)) {
1850 struct ll_diff_driver
*drv
;
1852 read_config_if_needed();
1853 for (drv
= user_diff
; drv
; drv
= drv
->next
)
1854 if (!strcmp(drv
->name
, value
))
1861 static void run_diff_cmd(const char *pgm
,
1864 struct diff_filespec
*one
,
1865 struct diff_filespec
*two
,
1866 const char *xfrm_msg
,
1867 struct diff_options
*o
,
1868 int complete_rewrite
)
1870 if (!o
->allow_external
)
1873 const char *cmd
= external_diff_attr(name
);
1879 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
1884 builtin_diff(name
, other
? other
: name
,
1885 one
, two
, xfrm_msg
, o
, complete_rewrite
);
1887 printf("* Unmerged path %s\n", name
);
1890 static void diff_fill_sha1_info(struct diff_filespec
*one
)
1892 if (DIFF_FILE_VALID(one
)) {
1893 if (!one
->sha1_valid
) {
1895 if (!strcmp(one
->path
, "-")) {
1896 hashcpy(one
->sha1
, null_sha1
);
1899 if (lstat(one
->path
, &st
) < 0)
1900 die("stat %s", one
->path
);
1901 if (index_path(one
->sha1
, one
->path
, &st
, 0))
1902 die("cannot hash %s\n", one
->path
);
1909 static int similarity_index(struct diff_filepair
*p
)
1911 return p
->score
* 100 / MAX_SCORE
;
1914 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
1916 const char *pgm
= external_diff();
1919 struct diff_filespec
*one
= p
->one
;
1920 struct diff_filespec
*two
= p
->two
;
1923 int complete_rewrite
= 0;
1926 if (DIFF_PAIR_UNMERGED(p
)) {
1927 run_diff_cmd(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
, o
, 0);
1931 name
= p
->one
->path
;
1932 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1933 diff_fill_sha1_info(one
);
1934 diff_fill_sha1_info(two
);
1936 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
1937 switch (p
->status
) {
1938 case DIFF_STATUS_COPIED
:
1939 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1940 strbuf_addstr(&msg
, "\ncopy from ");
1941 quote_c_style(name
, &msg
, NULL
, 0);
1942 strbuf_addstr(&msg
, "\ncopy to ");
1943 quote_c_style(other
, &msg
, NULL
, 0);
1944 strbuf_addch(&msg
, '\n');
1946 case DIFF_STATUS_RENAMED
:
1947 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1948 strbuf_addstr(&msg
, "\nrename from ");
1949 quote_c_style(name
, &msg
, NULL
, 0);
1950 strbuf_addstr(&msg
, "\nrename to ");
1951 quote_c_style(other
, &msg
, NULL
, 0);
1952 strbuf_addch(&msg
, '\n');
1954 case DIFF_STATUS_MODIFIED
:
1956 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
1957 similarity_index(p
));
1958 complete_rewrite
= 1;
1967 if (hashcmp(one
->sha1
, two
->sha1
)) {
1968 int abbrev
= o
->full_index
? 40 : DEFAULT_ABBREV
;
1972 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
1973 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
1976 strbuf_addf(&msg
, "index %.*s..%.*s",
1977 abbrev
, sha1_to_hex(one
->sha1
),
1978 abbrev
, sha1_to_hex(two
->sha1
));
1979 if (one
->mode
== two
->mode
)
1980 strbuf_addf(&msg
, " %06o", one
->mode
);
1981 strbuf_addch(&msg
, '\n');
1985 strbuf_setlen(&msg
, msg
.len
- 1);
1986 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
1989 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
1990 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
1991 /* a filepair that changes between file and symlink
1992 * needs to be split into deletion and creation.
1994 struct diff_filespec
*null
= alloc_filespec(two
->path
);
1995 run_diff_cmd(NULL
, name
, other
, one
, null
, xfrm_msg
, o
, 0);
1997 null
= alloc_filespec(one
->path
);
1998 run_diff_cmd(NULL
, name
, other
, null
, two
, xfrm_msg
, o
, 0);
2002 run_diff_cmd(pgm
, name
, other
, one
, two
, xfrm_msg
, o
,
2005 strbuf_release(&msg
);
2008 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2009 struct diffstat_t
*diffstat
)
2013 int complete_rewrite
= 0;
2015 if (DIFF_PAIR_UNMERGED(p
)) {
2017 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2021 name
= p
->one
->path
;
2022 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2024 diff_fill_sha1_info(p
->one
);
2025 diff_fill_sha1_info(p
->two
);
2027 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2028 complete_rewrite
= 1;
2029 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2032 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2037 if (DIFF_PAIR_UNMERGED(p
)) {
2042 name
= p
->one
->path
;
2043 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2045 diff_fill_sha1_info(p
->one
);
2046 diff_fill_sha1_info(p
->two
);
2048 builtin_checkdiff(name
, other
, p
->one
, p
->two
, o
);
2051 void diff_setup(struct diff_options
*options
)
2053 memset(options
, 0, sizeof(*options
));
2054 options
->line_termination
= '\n';
2055 options
->break_opt
= -1;
2056 options
->rename_limit
= -1;
2057 options
->context
= 3;
2058 options
->msg_sep
= "";
2060 options
->change
= diff_change
;
2061 options
->add_remove
= diff_addremove
;
2062 options
->color_diff
= diff_use_color_default
;
2063 options
->detect_rename
= diff_detect_rename_default
;
2066 int diff_setup_done(struct diff_options
*options
)
2070 if (options
->output_format
& DIFF_FORMAT_NAME
)
2072 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2074 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2076 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2079 die("--name-only, --name-status, --check and -s are mutually exclusive");
2081 if (options
->find_copies_harder
)
2082 options
->detect_rename
= DIFF_DETECT_COPY
;
2084 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2085 DIFF_FORMAT_NAME_STATUS
|
2086 DIFF_FORMAT_CHECKDIFF
|
2087 DIFF_FORMAT_NO_OUTPUT
))
2088 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2089 DIFF_FORMAT_NUMSTAT
|
2090 DIFF_FORMAT_DIFFSTAT
|
2091 DIFF_FORMAT_SHORTSTAT
|
2092 DIFF_FORMAT_SUMMARY
|
2096 * These cases always need recursive; we do not drop caller-supplied
2097 * recursive bits for other formats here.
2099 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2100 DIFF_FORMAT_NUMSTAT
|
2101 DIFF_FORMAT_DIFFSTAT
|
2102 DIFF_FORMAT_SHORTSTAT
|
2103 DIFF_FORMAT_SUMMARY
|
2104 DIFF_FORMAT_CHECKDIFF
))
2105 options
->recursive
= 1;
2107 * Also pickaxe would not work very well if you do not say recursive
2109 if (options
->pickaxe
)
2110 options
->recursive
= 1;
2112 if (options
->detect_rename
&& options
->rename_limit
< 0)
2113 options
->rename_limit
= diff_rename_limit_default
;
2114 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2116 /* read-cache does not die even when it fails
2117 * so it is safe for us to do this here. Also
2118 * it does not smudge active_cache or active_nr
2119 * when it fails, so we do not have to worry about
2120 * cleaning it up ourselves either.
2124 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2125 options
->abbrev
= 40; /* full */
2128 * It does not make sense to show the first hit we happened
2129 * to have found. It does not make sense not to return with
2130 * exit code in such a case either.
2132 if (options
->quiet
) {
2133 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2134 options
->exit_with_status
= 1;
2138 * If we postprocess in diffcore, we cannot simply return
2139 * upon the first hit. We need to run diff as usual.
2141 if (options
->pickaxe
|| options
->filter
)
2147 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2157 if (c
== arg_short
) {
2161 if (val
&& isdigit(c
)) {
2163 int n
= strtoul(arg
, &end
, 10);
2174 eq
= strchr(arg
, '=');
2179 if (!len
|| strncmp(arg
, arg_long
, len
))
2184 if (!isdigit(*++eq
))
2186 n
= strtoul(eq
, &end
, 10);
2194 static int diff_scoreopt_parse(const char *opt
);
2196 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2198 const char *arg
= av
[0];
2199 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2200 options
->output_format
|= DIFF_FORMAT_PATCH
;
2201 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2202 options
->output_format
|= DIFF_FORMAT_PATCH
;
2203 else if (!strcmp(arg
, "--raw"))
2204 options
->output_format
|= DIFF_FORMAT_RAW
;
2205 else if (!strcmp(arg
, "--patch-with-raw")) {
2206 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2208 else if (!strcmp(arg
, "--numstat")) {
2209 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2211 else if (!strcmp(arg
, "--shortstat")) {
2212 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2214 else if (!prefixcmp(arg
, "--stat")) {
2216 int width
= options
->stat_width
;
2217 int name_width
= options
->stat_name_width
;
2223 if (!prefixcmp(arg
, "-width="))
2224 width
= strtoul(arg
+ 7, &end
, 10);
2225 else if (!prefixcmp(arg
, "-name-width="))
2226 name_width
= strtoul(arg
+ 12, &end
, 10);
2229 width
= strtoul(arg
+1, &end
, 10);
2231 name_width
= strtoul(end
+1, &end
, 10);
2234 /* Important! This checks all the error cases! */
2237 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2238 options
->stat_name_width
= name_width
;
2239 options
->stat_width
= width
;
2241 else if (!strcmp(arg
, "--check"))
2242 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2243 else if (!strcmp(arg
, "--summary"))
2244 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2245 else if (!strcmp(arg
, "--patch-with-stat")) {
2246 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2248 else if (!strcmp(arg
, "-z"))
2249 options
->line_termination
= 0;
2250 else if (!prefixcmp(arg
, "-l"))
2251 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2252 else if (!strcmp(arg
, "--full-index"))
2253 options
->full_index
= 1;
2254 else if (!strcmp(arg
, "--binary")) {
2255 options
->output_format
|= DIFF_FORMAT_PATCH
;
2256 options
->binary
= 1;
2258 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text")) {
2261 else if (!strcmp(arg
, "--name-only"))
2262 options
->output_format
|= DIFF_FORMAT_NAME
;
2263 else if (!strcmp(arg
, "--name-status"))
2264 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2265 else if (!strcmp(arg
, "-R"))
2266 options
->reverse_diff
= 1;
2267 else if (!prefixcmp(arg
, "-S"))
2268 options
->pickaxe
= arg
+ 2;
2269 else if (!strcmp(arg
, "-s")) {
2270 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2272 else if (!prefixcmp(arg
, "-O"))
2273 options
->orderfile
= arg
+ 2;
2274 else if (!prefixcmp(arg
, "--diff-filter="))
2275 options
->filter
= arg
+ 14;
2276 else if (!strcmp(arg
, "--pickaxe-all"))
2277 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2278 else if (!strcmp(arg
, "--pickaxe-regex"))
2279 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2280 else if (!prefixcmp(arg
, "-B")) {
2281 if ((options
->break_opt
=
2282 diff_scoreopt_parse(arg
)) == -1)
2285 else if (!prefixcmp(arg
, "-M")) {
2286 if ((options
->rename_score
=
2287 diff_scoreopt_parse(arg
)) == -1)
2289 options
->detect_rename
= DIFF_DETECT_RENAME
;
2291 else if (!prefixcmp(arg
, "-C")) {
2292 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2293 options
->find_copies_harder
= 1;
2294 if ((options
->rename_score
=
2295 diff_scoreopt_parse(arg
)) == -1)
2297 options
->detect_rename
= DIFF_DETECT_COPY
;
2299 else if (!strcmp(arg
, "--find-copies-harder"))
2300 options
->find_copies_harder
= 1;
2301 else if (!strcmp(arg
, "--follow"))
2302 options
->follow_renames
= 1;
2303 else if (!strcmp(arg
, "--abbrev"))
2304 options
->abbrev
= DEFAULT_ABBREV
;
2305 else if (!prefixcmp(arg
, "--abbrev=")) {
2306 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2307 if (options
->abbrev
< MINIMUM_ABBREV
)
2308 options
->abbrev
= MINIMUM_ABBREV
;
2309 else if (40 < options
->abbrev
)
2310 options
->abbrev
= 40;
2312 else if (!strcmp(arg
, "--color"))
2313 options
->color_diff
= 1;
2314 else if (!strcmp(arg
, "--no-color"))
2315 options
->color_diff
= 0;
2316 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2317 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2318 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2319 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2320 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2321 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2322 else if (!strcmp(arg
, "--color-words"))
2323 options
->color_diff
= options
->color_diff_words
= 1;
2324 else if (!strcmp(arg
, "--no-renames"))
2325 options
->detect_rename
= 0;
2326 else if (!strcmp(arg
, "--exit-code"))
2327 options
->exit_with_status
= 1;
2328 else if (!strcmp(arg
, "--quiet"))
2330 else if (!strcmp(arg
, "--ext-diff"))
2331 options
->allow_external
= 1;
2332 else if (!strcmp(arg
, "--no-ext-diff"))
2333 options
->allow_external
= 0;
2339 static int parse_num(const char **cp_p
)
2341 unsigned long num
, scale
;
2343 const char *cp
= *cp_p
;
2350 if ( !dot
&& ch
== '.' ) {
2353 } else if ( ch
== '%' ) {
2354 scale
= dot
? scale
*100 : 100;
2355 cp
++; /* % is always at the end */
2357 } else if ( ch
>= '0' && ch
<= '9' ) {
2358 if ( scale
< 100000 ) {
2360 num
= (num
*10) + (ch
-'0');
2369 /* user says num divided by scale and we say internally that
2370 * is MAX_SCORE * num / scale.
2372 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2375 static int diff_scoreopt_parse(const char *opt
)
2377 int opt1
, opt2
, cmd
;
2382 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2383 return -1; /* that is not a -M, -C nor -B option */
2385 opt1
= parse_num(&opt
);
2391 else if (*opt
!= '/')
2392 return -1; /* we expect -B80/99 or -B80 */
2395 opt2
= parse_num(&opt
);
2400 return opt1
| (opt2
<< 16);
2403 struct diff_queue_struct diff_queued_diff
;
2405 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2407 if (queue
->alloc
<= queue
->nr
) {
2408 queue
->alloc
= alloc_nr(queue
->alloc
);
2409 queue
->queue
= xrealloc(queue
->queue
,
2410 sizeof(dp
) * queue
->alloc
);
2412 queue
->queue
[queue
->nr
++] = dp
;
2415 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2416 struct diff_filespec
*one
,
2417 struct diff_filespec
*two
)
2419 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2427 void diff_free_filepair(struct diff_filepair
*p
)
2429 diff_free_filespec_data(p
->one
);
2430 diff_free_filespec_data(p
->two
);
2436 /* This is different from find_unique_abbrev() in that
2437 * it stuffs the result with dots for alignment.
2439 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2444 return sha1_to_hex(sha1
);
2446 abbrev
= find_unique_abbrev(sha1
, len
);
2448 return sha1_to_hex(sha1
);
2449 abblen
= strlen(abbrev
);
2451 static char hex
[41];
2452 if (len
< abblen
&& abblen
<= len
+ 2)
2453 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2455 sprintf(hex
, "%s...", abbrev
);
2458 return sha1_to_hex(sha1
);
2461 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2463 int line_termination
= opt
->line_termination
;
2464 int inter_name_termination
= line_termination
? '\t' : '\0';
2466 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2467 printf(":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2468 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2469 printf("%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2472 printf("%c%03d%c", p
->status
, similarity_index(p
),
2473 inter_name_termination
);
2475 printf("%c%c", p
->status
, inter_name_termination
);
2478 if (p
->status
== DIFF_STATUS_COPIED
|| p
->status
== DIFF_STATUS_RENAMED
) {
2479 write_name_quoted(p
->one
->path
, stdout
, inter_name_termination
);
2480 write_name_quoted(p
->two
->path
, stdout
, line_termination
);
2482 const char *path
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2483 write_name_quoted(path
, stdout
, line_termination
);
2487 int diff_unmodified_pair(struct diff_filepair
*p
)
2489 /* This function is written stricter than necessary to support
2490 * the currently implemented transformers, but the idea is to
2491 * let transformers to produce diff_filepairs any way they want,
2492 * and filter and clean them up here before producing the output.
2494 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2496 if (DIFF_PAIR_UNMERGED(p
))
2497 return 0; /* unmerged is interesting */
2499 /* deletion, addition, mode or type change
2500 * and rename are all interesting.
2502 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2503 DIFF_PAIR_MODE_CHANGED(p
) ||
2504 strcmp(one
->path
, two
->path
))
2507 /* both are valid and point at the same path. that is, we are
2508 * dealing with a change.
2510 if (one
->sha1_valid
&& two
->sha1_valid
&&
2511 !hashcmp(one
->sha1
, two
->sha1
))
2512 return 1; /* no change */
2513 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2514 return 1; /* both look at the same file on the filesystem. */
2518 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2520 if (diff_unmodified_pair(p
))
2523 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2524 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2525 return; /* no tree diffs in patch format */
2530 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2531 struct diffstat_t
*diffstat
)
2533 if (diff_unmodified_pair(p
))
2536 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2537 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2538 return; /* no tree diffs in patch format */
2540 run_diffstat(p
, o
, diffstat
);
2543 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2544 struct diff_options
*o
)
2546 if (diff_unmodified_pair(p
))
2549 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2550 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2551 return; /* no tree diffs in patch format */
2553 run_checkdiff(p
, o
);
2556 int diff_queue_is_empty(void)
2558 struct diff_queue_struct
*q
= &diff_queued_diff
;
2560 for (i
= 0; i
< q
->nr
; i
++)
2561 if (!diff_unmodified_pair(q
->queue
[i
]))
2567 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2569 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2572 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2574 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2575 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2577 s
->size
, s
->xfrm_flags
);
2580 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2582 diff_debug_filespec(p
->one
, i
, "one");
2583 diff_debug_filespec(p
->two
, i
, "two");
2584 fprintf(stderr
, "score %d, status %c stays %d broken %d\n",
2585 p
->score
, p
->status
? p
->status
: '?',
2586 p
->source_stays
, p
->broken_pair
);
2589 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2593 fprintf(stderr
, "%s\n", msg
);
2594 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2595 for (i
= 0; i
< q
->nr
; i
++) {
2596 struct diff_filepair
*p
= q
->queue
[i
];
2597 diff_debug_filepair(p
, i
);
2602 static void diff_resolve_rename_copy(void)
2605 struct diff_filepair
*p
, *pp
;
2606 struct diff_queue_struct
*q
= &diff_queued_diff
;
2608 diff_debug_queue("resolve-rename-copy", q
);
2610 for (i
= 0; i
< q
->nr
; i
++) {
2612 p
->status
= 0; /* undecided */
2613 if (DIFF_PAIR_UNMERGED(p
))
2614 p
->status
= DIFF_STATUS_UNMERGED
;
2615 else if (!DIFF_FILE_VALID(p
->one
))
2616 p
->status
= DIFF_STATUS_ADDED
;
2617 else if (!DIFF_FILE_VALID(p
->two
))
2618 p
->status
= DIFF_STATUS_DELETED
;
2619 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2620 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2622 /* from this point on, we are dealing with a pair
2623 * whose both sides are valid and of the same type, i.e.
2624 * either in-place edit or rename/copy edit.
2626 else if (DIFF_PAIR_RENAME(p
)) {
2627 if (p
->source_stays
) {
2628 p
->status
= DIFF_STATUS_COPIED
;
2631 /* See if there is some other filepair that
2632 * copies from the same source as us. If so
2633 * we are a copy. Otherwise we are either a
2634 * copy if the path stays, or a rename if it
2635 * does not, but we already handled "stays" case.
2637 for (j
= i
+ 1; j
< q
->nr
; j
++) {
2639 if (strcmp(pp
->one
->path
, p
->one
->path
))
2640 continue; /* not us */
2641 if (!DIFF_PAIR_RENAME(pp
))
2642 continue; /* not a rename/copy */
2643 /* pp is a rename/copy from the same source */
2644 p
->status
= DIFF_STATUS_COPIED
;
2648 p
->status
= DIFF_STATUS_RENAMED
;
2650 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2651 p
->one
->mode
!= p
->two
->mode
||
2652 is_null_sha1(p
->one
->sha1
))
2653 p
->status
= DIFF_STATUS_MODIFIED
;
2655 /* This is a "no-change" entry and should not
2656 * happen anymore, but prepare for broken callers.
2658 error("feeding unmodified %s to diffcore",
2660 p
->status
= DIFF_STATUS_UNKNOWN
;
2663 diff_debug_queue("resolve-rename-copy done", q
);
2666 static int check_pair_status(struct diff_filepair
*p
)
2668 switch (p
->status
) {
2669 case DIFF_STATUS_UNKNOWN
:
2672 die("internal error in diff-resolve-rename-copy");
2678 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2680 int fmt
= opt
->output_format
;
2682 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2683 diff_flush_checkdiff(p
, opt
);
2684 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2685 diff_flush_raw(p
, opt
);
2686 else if (fmt
& DIFF_FORMAT_NAME
)
2687 write_name_quoted(p
->two
->path
, stdout
, opt
->line_termination
);
2690 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2693 printf(" %s mode %06o ", newdelete
, fs
->mode
);
2695 printf(" %s ", newdelete
);
2696 write_name_quoted(fs
->path
, stdout
, '\n');
2700 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2702 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2703 printf(" mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2704 show_name
? ' ' : '\n');
2706 write_name_quoted(p
->two
->path
, stdout
, '\n');
2711 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2713 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2715 printf(" %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2717 show_mode_change(p
, 0);
2720 static void diff_summary(struct diff_filepair
*p
)
2723 case DIFF_STATUS_DELETED
:
2724 show_file_mode_name("delete", p
->one
);
2726 case DIFF_STATUS_ADDED
:
2727 show_file_mode_name("create", p
->two
);
2729 case DIFF_STATUS_COPIED
:
2730 show_rename_copy("copy", p
);
2732 case DIFF_STATUS_RENAMED
:
2733 show_rename_copy("rename", p
);
2738 write_name_quoted(p
->two
->path
, stdout
, ' ');
2739 printf("(%d%%)\n", similarity_index(p
));
2741 show_mode_change(p
, !p
->score
);
2747 struct xdiff_emit_state xm
;
2752 static int remove_space(char *line
, int len
)
2758 for (i
= 0; i
< len
; i
++)
2759 if (!isspace((c
= line
[i
])))
2765 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2767 struct patch_id_t
*data
= priv
;
2770 /* Ignore line numbers when computing the SHA1 of the patch */
2771 if (!prefixcmp(line
, "@@ -"))
2774 new_len
= remove_space(line
, len
);
2776 SHA1_Update(data
->ctx
, line
, new_len
);
2777 data
->patchlen
+= new_len
;
2780 /* returns 0 upon success, and writes result into sha1 */
2781 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2783 struct diff_queue_struct
*q
= &diff_queued_diff
;
2786 struct patch_id_t data
;
2787 char buffer
[PATH_MAX
* 4 + 20];
2790 memset(&data
, 0, sizeof(struct patch_id_t
));
2792 data
.xm
.consume
= patch_id_consume
;
2794 for (i
= 0; i
< q
->nr
; i
++) {
2799 struct diff_filepair
*p
= q
->queue
[i
];
2802 memset(&xecfg
, 0, sizeof(xecfg
));
2804 return error("internal diff status error");
2805 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2807 if (diff_unmodified_pair(p
))
2809 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2810 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2812 if (DIFF_PAIR_UNMERGED(p
))
2815 diff_fill_sha1_info(p
->one
);
2816 diff_fill_sha1_info(p
->two
);
2817 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2818 fill_mmfile(&mf2
, p
->two
) < 0)
2819 return error("unable to read files to diff");
2821 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2822 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2823 if (p
->one
->mode
== 0)
2824 len1
= snprintf(buffer
, sizeof(buffer
),
2825 "diff--gita/%.*sb/%.*s"
2832 len2
, p
->two
->path
);
2833 else if (p
->two
->mode
== 0)
2834 len1
= snprintf(buffer
, sizeof(buffer
),
2835 "diff--gita/%.*sb/%.*s"
2836 "deletedfilemode%06o"
2842 len1
, p
->one
->path
);
2844 len1
= snprintf(buffer
, sizeof(buffer
),
2845 "diff--gita/%.*sb/%.*s"
2851 len2
, p
->two
->path
);
2852 SHA1_Update(&ctx
, buffer
, len1
);
2854 xpp
.flags
= XDF_NEED_MINIMAL
;
2856 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2857 ecb
.outf
= xdiff_outf
;
2859 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2862 SHA1_Final(sha1
, &ctx
);
2866 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2868 struct diff_queue_struct
*q
= &diff_queued_diff
;
2870 int result
= diff_get_patch_id(options
, sha1
);
2872 for (i
= 0; i
< q
->nr
; i
++)
2873 diff_free_filepair(q
->queue
[i
]);
2877 q
->nr
= q
->alloc
= 0;
2882 static int is_summary_empty(const struct diff_queue_struct
*q
)
2886 for (i
= 0; i
< q
->nr
; i
++) {
2887 const struct diff_filepair
*p
= q
->queue
[i
];
2889 switch (p
->status
) {
2890 case DIFF_STATUS_DELETED
:
2891 case DIFF_STATUS_ADDED
:
2892 case DIFF_STATUS_COPIED
:
2893 case DIFF_STATUS_RENAMED
:
2898 if (p
->one
->mode
&& p
->two
->mode
&&
2899 p
->one
->mode
!= p
->two
->mode
)
2907 void diff_flush(struct diff_options
*options
)
2909 struct diff_queue_struct
*q
= &diff_queued_diff
;
2910 int i
, output_format
= options
->output_format
;
2914 * Order: raw, stat, summary, patch
2915 * or: name/name-status/checkdiff (other bits clear)
2920 if (output_format
& (DIFF_FORMAT_RAW
|
2922 DIFF_FORMAT_NAME_STATUS
|
2923 DIFF_FORMAT_CHECKDIFF
)) {
2924 for (i
= 0; i
< q
->nr
; i
++) {
2925 struct diff_filepair
*p
= q
->queue
[i
];
2926 if (check_pair_status(p
))
2927 flush_one_pair(p
, options
);
2932 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
2933 struct diffstat_t diffstat
;
2935 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
2936 diffstat
.xm
.consume
= diffstat_consume
;
2937 for (i
= 0; i
< q
->nr
; i
++) {
2938 struct diff_filepair
*p
= q
->queue
[i
];
2939 if (check_pair_status(p
))
2940 diff_flush_stat(p
, options
, &diffstat
);
2942 if (output_format
& DIFF_FORMAT_NUMSTAT
)
2943 show_numstat(&diffstat
, options
);
2944 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
2945 show_stats(&diffstat
, options
);
2946 else if (output_format
& DIFF_FORMAT_SHORTSTAT
)
2947 show_shortstats(&diffstat
);
2951 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
2952 for (i
= 0; i
< q
->nr
; i
++)
2953 diff_summary(q
->queue
[i
]);
2957 if (output_format
& DIFF_FORMAT_PATCH
) {
2959 if (options
->stat_sep
) {
2960 /* attach patch instead of inline */
2961 fputs(options
->stat_sep
, stdout
);
2963 putchar(options
->line_termination
);
2967 for (i
= 0; i
< q
->nr
; i
++) {
2968 struct diff_filepair
*p
= q
->queue
[i
];
2969 if (check_pair_status(p
))
2970 diff_flush_patch(p
, options
);
2974 if (output_format
& DIFF_FORMAT_CALLBACK
)
2975 options
->format_callback(q
, options
, options
->format_callback_data
);
2977 for (i
= 0; i
< q
->nr
; i
++)
2978 diff_free_filepair(q
->queue
[i
]);
2982 q
->nr
= q
->alloc
= 0;
2985 static void diffcore_apply_filter(const char *filter
)
2988 struct diff_queue_struct
*q
= &diff_queued_diff
;
2989 struct diff_queue_struct outq
;
2991 outq
.nr
= outq
.alloc
= 0;
2996 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
2998 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
2999 struct diff_filepair
*p
= q
->queue
[i
];
3000 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3002 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3004 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3005 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3006 strchr(filter
, p
->status
)))
3012 /* otherwise we will clear the whole queue
3013 * by copying the empty outq at the end of this
3014 * function, but first clear the current entries
3017 for (i
= 0; i
< q
->nr
; i
++)
3018 diff_free_filepair(q
->queue
[i
]);
3021 /* Only the matching ones */
3022 for (i
= 0; i
< q
->nr
; i
++) {
3023 struct diff_filepair
*p
= q
->queue
[i
];
3025 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3027 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3029 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3030 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3031 strchr(filter
, p
->status
)))
3034 diff_free_filepair(p
);
3041 /* Check whether two filespecs with the same mode and size are identical */
3042 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3043 struct diff_filespec
*two
)
3045 if (S_ISGITLINK(one
->mode
)) {
3046 diff_fill_sha1_info(one
);
3047 diff_fill_sha1_info(two
);
3048 return !hashcmp(one
->sha1
, two
->sha1
);
3050 if (diff_populate_filespec(one
, 0))
3052 if (diff_populate_filespec(two
, 0))
3054 return !memcmp(one
->data
, two
->data
, one
->size
);
3057 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3060 struct diff_queue_struct
*q
= &diff_queued_diff
;
3061 struct diff_queue_struct outq
;
3063 outq
.nr
= outq
.alloc
= 0;
3065 for (i
= 0; i
< q
->nr
; i
++) {
3066 struct diff_filepair
*p
= q
->queue
[i
];
3069 * 1. Entries that come from stat info dirtyness
3070 * always have both sides (iow, not create/delete),
3071 * one side of the object name is unknown, with
3072 * the same mode and size. Keep the ones that
3073 * do not match these criteria. They have real
3076 * 2. At this point, the file is known to be modified,
3077 * with the same mode and size, and the object
3078 * name of one side is unknown. Need to inspect
3079 * the identical contents.
3081 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3082 !DIFF_FILE_VALID(p
->two
) ||
3083 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3084 (p
->one
->mode
!= p
->two
->mode
) ||
3085 diff_populate_filespec(p
->one
, 1) ||
3086 diff_populate_filespec(p
->two
, 1) ||
3087 (p
->one
->size
!= p
->two
->size
) ||
3088 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3092 * The caller can subtract 1 from skip_stat_unmatch
3093 * to determine how many paths were dirty only
3094 * due to stat info mismatch.
3096 if (!diffopt
->no_index
)
3097 diffopt
->skip_stat_unmatch
++;
3098 diff_free_filepair(p
);
3105 void diffcore_std(struct diff_options
*options
)
3110 if (options
->skip_stat_unmatch
&& !options
->find_copies_harder
)
3111 diffcore_skip_stat_unmatch(options
);
3112 if (options
->break_opt
!= -1)
3113 diffcore_break(options
->break_opt
);
3114 if (options
->detect_rename
)
3115 diffcore_rename(options
);
3116 if (options
->break_opt
!= -1)
3117 diffcore_merge_broken();
3118 if (options
->pickaxe
)
3119 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3120 if (options
->orderfile
)
3121 diffcore_order(options
->orderfile
);
3122 diff_resolve_rename_copy();
3123 diffcore_apply_filter(options
->filter
);
3125 options
->has_changes
= !!diff_queued_diff
.nr
;
3129 void diff_addremove(struct diff_options
*options
,
3130 int addremove
, unsigned mode
,
3131 const unsigned char *sha1
,
3132 const char *base
, const char *path
)
3134 char concatpath
[PATH_MAX
];
3135 struct diff_filespec
*one
, *two
;
3137 /* This may look odd, but it is a preparation for
3138 * feeding "there are unchanged files which should
3139 * not produce diffs, but when you are doing copy
3140 * detection you would need them, so here they are"
3141 * entries to the diff-core. They will be prefixed
3142 * with something like '=' or '*' (I haven't decided
3143 * which but should not make any difference).
3144 * Feeding the same new and old to diff_change()
3145 * also has the same effect.
3146 * Before the final output happens, they are pruned after
3147 * merged into rename/copy pairs as appropriate.
3149 if (options
->reverse_diff
)
3150 addremove
= (addremove
== '+' ? '-' :
3151 addremove
== '-' ? '+' : addremove
);
3153 if (!path
) path
= "";
3154 sprintf(concatpath
, "%s%s", base
, path
);
3155 one
= alloc_filespec(concatpath
);
3156 two
= alloc_filespec(concatpath
);
3158 if (addremove
!= '+')
3159 fill_filespec(one
, sha1
, mode
);
3160 if (addremove
!= '-')
3161 fill_filespec(two
, sha1
, mode
);
3163 diff_queue(&diff_queued_diff
, one
, two
);
3164 options
->has_changes
= 1;
3167 void diff_change(struct diff_options
*options
,
3168 unsigned old_mode
, unsigned new_mode
,
3169 const unsigned char *old_sha1
,
3170 const unsigned char *new_sha1
,
3171 const char *base
, const char *path
)
3173 char concatpath
[PATH_MAX
];
3174 struct diff_filespec
*one
, *two
;
3176 if (options
->reverse_diff
) {
3178 const unsigned char *tmp_c
;
3179 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3180 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3182 if (!path
) path
= "";
3183 sprintf(concatpath
, "%s%s", base
, path
);
3184 one
= alloc_filespec(concatpath
);
3185 two
= alloc_filespec(concatpath
);
3186 fill_filespec(one
, old_sha1
, old_mode
);
3187 fill_filespec(two
, new_sha1
, new_mode
);
3189 diff_queue(&diff_queued_diff
, one
, two
);
3190 options
->has_changes
= 1;
3193 void diff_unmerge(struct diff_options
*options
,
3195 unsigned mode
, const unsigned char *sha1
)
3197 struct diff_filespec
*one
, *two
;
3198 one
= alloc_filespec(path
);
3199 two
= alloc_filespec(path
);
3200 fill_filespec(one
, sha1
, mode
);
3201 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;