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 use_size_cache
;
21 static int diff_detect_rename_default
;
22 static int diff_rename_limit_default
= -1;
23 static int diff_use_color_default
;
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
;
62 * Currently there is only "diff.<drivername>.command" variable;
63 * because there are "diff.color.<slot>" variables, we are parsing
64 * this in a bit convoluted way to allow low level diff driver
67 static int parse_lldiff_command(const char *var
, const char *ep
, const char *value
)
71 struct ll_diff_driver
*drv
;
75 for (drv
= user_diff
; drv
; drv
= drv
->next
)
76 if (!strncmp(drv
->name
, name
, namelen
) && !drv
->name
[namelen
])
80 drv
= xcalloc(1, sizeof(struct ll_diff_driver
));
81 namebuf
= xmalloc(namelen
+ 1);
82 memcpy(namebuf
, name
, namelen
);
87 user_diff_tail
= &user_diff
;
88 *user_diff_tail
= drv
;
89 user_diff_tail
= &(drv
->next
);
93 return error("%s: lacks value", var
);
94 drv
->cmd
= strdup(value
);
99 * These are to give UI layer defaults.
100 * The core-level commands such as git-diff-files should
101 * never be affected by the setting of diff.renames
102 * the user happens to have in the configuration file.
104 int git_diff_ui_config(const char *var
, const char *value
)
106 if (!strcmp(var
, "diff.renamelimit")) {
107 diff_rename_limit_default
= git_config_int(var
, value
);
110 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
111 diff_use_color_default
= git_config_colorbool(var
, value
);
114 if (!strcmp(var
, "diff.renames")) {
116 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
117 else if (!strcasecmp(value
, "copies") ||
118 !strcasecmp(value
, "copy"))
119 diff_detect_rename_default
= DIFF_DETECT_COPY
;
120 else if (git_config_bool(var
,value
))
121 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
124 if (!prefixcmp(var
, "diff.")) {
125 const char *ep
= strrchr(var
, '.');
127 if (ep
!= var
+ 4 && !strcmp(ep
, ".command"))
128 return parse_lldiff_command(var
, ep
, value
);
130 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
131 int slot
= parse_diff_color_slot(var
, 11);
132 color_parse(value
, var
, diff_colors
[slot
]);
136 return git_default_config(var
, value
);
139 static char *quote_one(const char *str
)
146 needlen
= quote_c_style(str
, NULL
, NULL
, 0);
149 xp
= xmalloc(needlen
+ 1);
150 quote_c_style(str
, xp
, NULL
, 0);
154 static char *quote_two(const char *one
, const char *two
)
156 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
157 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
160 if (need_one
+ need_two
) {
161 if (!need_one
) need_one
= strlen(one
);
162 if (!need_two
) need_one
= strlen(two
);
164 xp
= xmalloc(need_one
+ need_two
+ 3);
166 quote_c_style(one
, xp
+ 1, NULL
, 1);
167 quote_c_style(two
, xp
+ need_one
+ 1, NULL
, 1);
168 strcpy(xp
+ need_one
+ need_two
+ 1, "\"");
171 need_one
= strlen(one
);
172 need_two
= strlen(two
);
173 xp
= xmalloc(need_one
+ need_two
+ 1);
175 strcpy(xp
+ need_one
, two
);
179 static const char *external_diff(void)
181 static const char *external_diff_cmd
= NULL
;
182 static int done_preparing
= 0;
185 return external_diff_cmd
;
186 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
188 return external_diff_cmd
;
191 #define TEMPFILE_PATH_LEN 50
193 static struct diff_tempfile
{
194 const char *name
; /* filename external diff should read from */
197 char tmp_path
[TEMPFILE_PATH_LEN
];
200 static int count_lines(const char *data
, int size
)
202 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
209 completely_empty
= 0;
213 completely_empty
= 0;
216 if (completely_empty
)
219 count
++; /* no trailing newline */
223 static void print_line_count(int count
)
233 printf("1,%d", count
);
238 static void copy_file(int prefix
, const char *data
, int size
,
239 const char *set
, const char *reset
)
241 int ch
, nl_just_seen
= 1;
250 fputs(reset
, stdout
);
256 printf("%s\n\\ No newline at end of file\n", reset
);
259 static void emit_rewrite_diff(const char *name_a
,
261 struct diff_filespec
*one
,
262 struct diff_filespec
*two
,
266 const char *name_a_tab
, *name_b_tab
;
267 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
268 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
269 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
270 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
271 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
273 name_a
+= (*name_a
== '/');
274 name_b
+= (*name_b
== '/');
275 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
276 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
278 diff_populate_filespec(one
, 0);
279 diff_populate_filespec(two
, 0);
280 lc_a
= count_lines(one
->data
, one
->size
);
281 lc_b
= count_lines(two
->data
, two
->size
);
282 printf("%s--- a/%s%s%s\n%s+++ b/%s%s%s\n%s@@ -",
283 metainfo
, name_a
, name_a_tab
, reset
,
284 metainfo
, name_b
, name_b_tab
, reset
, fraginfo
);
285 print_line_count(lc_a
);
287 print_line_count(lc_b
);
288 printf(" @@%s\n", reset
);
290 copy_file('-', one
->data
, one
->size
, old
, reset
);
292 copy_file('+', two
->data
, two
->size
, new, reset
);
295 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
297 if (!DIFF_FILE_VALID(one
)) {
298 mf
->ptr
= (char *)""; /* does not matter */
302 else if (diff_populate_filespec(one
, 0))
305 mf
->size
= one
->size
;
309 struct diff_words_buffer
{
312 long current
; /* output pointer */
313 int suppressed_newline
;
316 static void diff_words_append(char *line
, unsigned long len
,
317 struct diff_words_buffer
*buffer
)
319 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
320 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
321 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
325 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
326 buffer
->text
.size
+= len
;
329 struct diff_words_data
{
330 struct xdiff_emit_state xm
;
331 struct diff_words_buffer minus
, plus
;
334 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
335 int suppress_newline
)
343 ptr
= buffer
->text
.ptr
+ buffer
->current
;
344 buffer
->current
+= len
;
346 if (ptr
[len
- 1] == '\n') {
351 fputs(diff_get_color(1, color
), stdout
);
352 fwrite(ptr
, len
, 1, stdout
);
353 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
356 if (suppress_newline
)
357 buffer
->suppressed_newline
= 1;
363 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
365 struct diff_words_data
*diff_words
= priv
;
367 if (diff_words
->minus
.suppressed_newline
) {
370 diff_words
->minus
.suppressed_newline
= 0;
376 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
379 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
382 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
383 diff_words
->minus
.current
+= len
;
388 /* this executes the word diff on the accumulated buffers */
389 static void diff_words_show(struct diff_words_data
*diff_words
)
394 mmfile_t minus
, plus
;
397 minus
.size
= diff_words
->minus
.text
.size
;
398 minus
.ptr
= xmalloc(minus
.size
);
399 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
400 for (i
= 0; i
< minus
.size
; i
++)
401 if (isspace(minus
.ptr
[i
]))
403 diff_words
->minus
.current
= 0;
405 plus
.size
= diff_words
->plus
.text
.size
;
406 plus
.ptr
= xmalloc(plus
.size
);
407 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
408 for (i
= 0; i
< plus
.size
; i
++)
409 if (isspace(plus
.ptr
[i
]))
411 diff_words
->plus
.current
= 0;
413 xpp
.flags
= XDF_NEED_MINIMAL
;
414 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
416 ecb
.outf
= xdiff_outf
;
417 ecb
.priv
= diff_words
;
418 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
419 xdl_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
423 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
425 if (diff_words
->minus
.suppressed_newline
) {
427 diff_words
->minus
.suppressed_newline
= 0;
431 struct emit_callback
{
432 struct xdiff_emit_state xm
;
433 int nparents
, color_diff
;
434 const char **label_path
;
435 struct diff_words_data
*diff_words
;
439 static void free_diff_words_data(struct emit_callback
*ecbdata
)
441 if (ecbdata
->diff_words
) {
443 if (ecbdata
->diff_words
->minus
.text
.size
||
444 ecbdata
->diff_words
->plus
.text
.size
)
445 diff_words_show(ecbdata
->diff_words
);
447 if (ecbdata
->diff_words
->minus
.text
.ptr
)
448 free (ecbdata
->diff_words
->minus
.text
.ptr
);
449 if (ecbdata
->diff_words
->plus
.text
.ptr
)
450 free (ecbdata
->diff_words
->plus
.text
.ptr
);
451 free(ecbdata
->diff_words
);
452 ecbdata
->diff_words
= NULL
;
456 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
459 return diff_colors
[ix
];
463 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
465 if (len
> 0 && line
[len
-1] == '\n')
468 fwrite(line
, len
, 1, stdout
);
472 static void emit_line_with_ws(int nparents
,
473 const char *set
, const char *reset
, const char *ws
,
474 const char *line
, int len
)
477 int last_tab_in_indent
= -1;
478 int last_space_in_indent
= -1;
481 int need_highlight_leading_space
= 0;
482 /* The line is a newly added line. Does it have funny leading
483 * whitespaces? In indent, SP should never precede a TAB.
485 for (i
= col0
; i
< len
; i
++) {
486 if (line
[i
] == '\t') {
487 last_tab_in_indent
= i
;
488 if (0 <= last_space_in_indent
)
489 need_highlight_leading_space
= 1;
491 else if (line
[i
] == ' ')
492 last_space_in_indent
= i
;
497 fwrite(line
, col0
, 1, stdout
);
498 fputs(reset
, stdout
);
499 if (((i
== len
) || line
[i
] == '\n') && i
!= col0
) {
500 /* The whole line was indent */
501 emit_line(ws
, reset
, line
+ col0
, len
- col0
);
505 if (need_highlight_leading_space
) {
506 while (i
< last_tab_in_indent
) {
507 if (line
[i
] == ' ') {
510 fputs(reset
, stdout
);
518 if (line
[tail
] == '\n' && i
< tail
)
521 if (!isspace(line
[tail
]))
525 if ((i
< tail
&& line
[tail
+ 1] != '\n')) {
526 /* This has whitespace between tail+1..len */
528 fwrite(line
+ i
, tail
- i
+ 1, 1, stdout
);
529 fputs(reset
, stdout
);
530 emit_line(ws
, reset
, line
+ tail
+ 1, len
- tail
- 1);
533 emit_line(set
, reset
, line
+ i
, len
- i
);
536 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
538 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
539 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
542 emit_line(set
, reset
, line
, len
);
544 emit_line_with_ws(ecbdata
->nparents
, set
, reset
, ws
,
548 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
552 struct emit_callback
*ecbdata
= priv
;
553 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
554 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
556 *(ecbdata
->found_changesp
) = 1;
558 if (ecbdata
->label_path
[0]) {
559 const char *name_a_tab
, *name_b_tab
;
561 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
562 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
564 printf("%s--- %s%s%s\n",
565 set
, ecbdata
->label_path
[0], reset
, name_a_tab
);
566 printf("%s+++ %s%s%s\n",
567 set
, ecbdata
->label_path
[1], reset
, name_b_tab
);
568 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
571 /* This is not really necessary for now because
572 * this codepath only deals with two-way diffs.
574 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
576 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
577 ecbdata
->nparents
= i
- 1;
578 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
583 if (len
< ecbdata
->nparents
) {
585 emit_line(reset
, reset
, line
, len
);
590 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
591 /* fall back to normal diff */
592 free_diff_words_data(ecbdata
);
593 if (ecbdata
->diff_words
) {
594 if (line
[0] == '-') {
595 diff_words_append(line
, len
,
596 &ecbdata
->diff_words
->minus
);
598 } else if (line
[0] == '+') {
599 diff_words_append(line
, len
,
600 &ecbdata
->diff_words
->plus
);
603 if (ecbdata
->diff_words
->minus
.text
.size
||
604 ecbdata
->diff_words
->plus
.text
.size
)
605 diff_words_show(ecbdata
->diff_words
);
608 emit_line(set
, reset
, line
, len
);
611 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
613 color
= DIFF_FILE_OLD
;
614 else if (line
[i
] == '+')
615 color
= DIFF_FILE_NEW
;
618 if (color
!= DIFF_FILE_NEW
) {
619 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
623 emit_add_line(reset
, ecbdata
, line
, len
);
626 static char *pprint_rename(const char *a
, const char *b
)
631 int pfx_length
, sfx_length
;
632 int len_a
= strlen(a
);
633 int len_b
= strlen(b
);
634 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
635 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
637 if (qlen_a
|| qlen_b
) {
638 if (qlen_a
) len_a
= qlen_a
;
639 if (qlen_b
) len_b
= qlen_b
;
640 name
= xmalloc( len_a
+ len_b
+ 5 );
642 quote_c_style(a
, name
, NULL
, 0);
644 memcpy(name
, a
, len_a
);
645 memcpy(name
+ len_a
, " => ", 4);
647 quote_c_style(b
, name
+ len_a
+ 4, NULL
, 0);
649 memcpy(name
+ len_a
+ 4, b
, len_b
+ 1);
653 /* Find common prefix */
655 while (*old
&& *new && *old
== *new) {
657 pfx_length
= old
- a
+ 1;
662 /* Find common suffix */
666 while (a
<= old
&& b
<= new && *old
== *new) {
668 sfx_length
= len_a
- (old
- a
);
674 * pfx{mid-a => mid-b}sfx
675 * {pfx-a => pfx-b}sfx
676 * pfx{sfx-a => sfx-b}
679 if (pfx_length
+ sfx_length
) {
680 int a_midlen
= len_a
- pfx_length
- sfx_length
;
681 int b_midlen
= len_b
- pfx_length
- sfx_length
;
682 if (a_midlen
< 0) a_midlen
= 0;
683 if (b_midlen
< 0) b_midlen
= 0;
685 name
= xmalloc(pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
686 sprintf(name
, "%.*s{%.*s => %.*s}%s",
688 a_midlen
, a
+ pfx_length
,
689 b_midlen
, b
+ pfx_length
,
690 a
+ len_a
- sfx_length
);
693 name
= xmalloc(len_a
+ len_b
+ 5);
694 sprintf(name
, "%s => %s", a
, b
);
700 struct xdiff_emit_state xm
;
704 struct diffstat_file
{
707 unsigned is_unmerged
:1;
708 unsigned is_binary
:1;
709 unsigned is_renamed
:1;
710 unsigned int added
, deleted
;
714 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
718 struct diffstat_file
*x
;
719 x
= xcalloc(sizeof (*x
), 1);
720 if (diffstat
->nr
== diffstat
->alloc
) {
721 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
722 diffstat
->files
= xrealloc(diffstat
->files
,
723 diffstat
->alloc
* sizeof(x
));
725 diffstat
->files
[diffstat
->nr
++] = x
;
726 x
->name
= xstrdup(name_a
);
728 x
->from_name
= xstrdup(name_b
);
736 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
738 struct diffstat_t
*diffstat
= priv
;
739 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
743 else if (line
[0] == '-')
747 const char mime_boundary_leader
[] = "------------";
749 static int scale_linear(int it
, int width
, int max_change
)
752 * make sure that at least one '-' is printed if there were deletions,
753 * and likewise for '+'.
757 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
760 static void show_name(const char *prefix
, const char *name
, int len
,
761 const char *reset
, const char *set
)
763 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
766 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
776 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
778 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
779 int max_change
= 0, max_len
= 0;
780 int total_files
= data
->nr
;
781 int width
, name_width
;
782 const char *reset
, *set
, *add_c
, *del_c
;
787 width
= options
->stat_width
? options
->stat_width
: 80;
788 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
790 /* Sanity: give at least 5 columns to the graph,
791 * but leave at least 10 columns for the name.
793 if (width
< name_width
+ 15) {
794 if (name_width
<= 25)
795 width
= name_width
+ 15;
797 name_width
= width
- 15;
800 /* Find the longest filename and max number of changes */
801 reset
= diff_get_color(options
->color_diff
, DIFF_RESET
);
802 set
= diff_get_color(options
->color_diff
, DIFF_PLAIN
);
803 add_c
= diff_get_color(options
->color_diff
, DIFF_FILE_NEW
);
804 del_c
= diff_get_color(options
->color_diff
, DIFF_FILE_OLD
);
806 for (i
= 0; i
< data
->nr
; i
++) {
807 struct diffstat_file
*file
= data
->files
[i
];
808 int change
= file
->added
+ file
->deleted
;
810 if (!file
->is_renamed
) { /* renames are quoted by pprint_rename */
811 len
= quote_c_style(file
->name
, NULL
, NULL
, 0);
813 char *qname
= xmalloc(len
+ 1);
814 quote_c_style(file
->name
, qname
, NULL
, 0);
819 char *qname
= pprint_rename(file
->name
, file
->from_name
);
824 len
= strlen(file
->name
);
828 if (file
->is_binary
|| file
->is_unmerged
)
830 if (max_change
< change
)
834 /* Compute the width of the graph part;
835 * 10 is for one blank at the beginning of the line plus
836 * " | count " between the name and the graph.
838 * From here on, name_width is the width of the name area,
839 * and width is the width of the graph area.
841 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
842 if (width
< (name_width
+ 10) + max_change
)
843 width
= width
- (name_width
+ 10);
847 for (i
= 0; i
< data
->nr
; i
++) {
848 const char *prefix
= "";
849 char *name
= data
->files
[i
]->name
;
850 int added
= data
->files
[i
]->added
;
851 int deleted
= data
->files
[i
]->deleted
;
855 * "scale" the filename
858 name_len
= strlen(name
);
859 if (name_width
< name_len
) {
863 name
+= name_len
- len
;
864 slash
= strchr(name
, '/');
869 if (data
->files
[i
]->is_binary
) {
870 show_name(prefix
, name
, len
, reset
, set
);
872 printf("%s%d%s", del_c
, deleted
, reset
);
874 printf("%s%d%s", add_c
, added
, reset
);
877 goto free_diffstat_file
;
879 else if (data
->files
[i
]->is_unmerged
) {
880 show_name(prefix
, name
, len
, reset
, set
);
881 printf(" Unmerged\n");
882 goto free_diffstat_file
;
884 else if (!data
->files
[i
]->is_renamed
&&
885 (added
+ deleted
== 0)) {
887 goto free_diffstat_file
;
891 * scale the add/delete
899 if (width
<= max_change
) {
900 add
= scale_linear(add
, width
, max_change
);
901 del
= scale_linear(del
, width
, max_change
);
904 show_name(prefix
, name
, len
, reset
, set
);
905 printf("%5d ", added
+ deleted
);
906 show_graph('+', add
, add_c
, reset
);
907 show_graph('-', del
, del_c
, reset
);
910 free(data
->files
[i
]->name
);
911 free(data
->files
[i
]);
914 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
915 set
, total_files
, adds
, dels
, reset
);
918 static void show_shortstats(struct diffstat_t
* data
)
920 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
925 for (i
= 0; i
< data
->nr
; i
++) {
926 if (!data
->files
[i
]->is_binary
&&
927 !data
->files
[i
]->is_unmerged
) {
928 int added
= data
->files
[i
]->added
;
929 int deleted
= data
->files
[i
]->deleted
;
930 if (!data
->files
[i
]->is_renamed
&&
931 (added
+ deleted
== 0)) {
938 free(data
->files
[i
]->name
);
939 free(data
->files
[i
]);
943 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
944 total_files
, adds
, dels
);
947 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
951 for (i
= 0; i
< data
->nr
; i
++) {
952 struct diffstat_file
*file
= data
->files
[i
];
957 printf("%d\t%d\t", file
->added
, file
->deleted
);
958 if (options
->line_termination
&&
959 quote_c_style(file
->name
, NULL
, NULL
, 0))
960 quote_c_style(file
->name
, NULL
, stdout
, 0);
962 fputs(file
->name
, stdout
);
963 if (file
->is_renamed
) {
964 printf("%s", options
->line_termination
? "\t" : "\0\0");
965 if (options
->line_termination
&&
966 quote_c_style(file
->from_name
, NULL
, NULL
, 0))
967 quote_c_style(file
->from_name
, NULL
, stdout
, 0);
969 fputs(file
->from_name
, stdout
);
971 putchar(options
->line_termination
);
976 struct xdiff_emit_state xm
;
977 const char *filename
;
978 int lineno
, color_diff
;
981 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
983 struct checkdiff_t
*data
= priv
;
984 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
985 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
986 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
988 if (line
[0] == '+') {
989 int i
, spaces
= 0, space_before_tab
= 0, white_space_at_end
= 0;
991 /* check space before tab */
992 for (i
= 1; i
< len
&& (line
[i
] == ' ' || line
[i
] == '\t'); i
++)
995 if (line
[i
- 1] == '\t' && spaces
)
996 space_before_tab
= 1;
998 /* check white space at line end */
999 if (line
[len
- 1] == '\n')
1001 if (isspace(line
[len
- 1]))
1002 white_space_at_end
= 1;
1004 if (space_before_tab
|| white_space_at_end
) {
1005 printf("%s:%d: %s", data
->filename
, data
->lineno
, ws
);
1006 if (space_before_tab
) {
1007 printf("space before tab");
1008 if (white_space_at_end
)
1011 if (white_space_at_end
)
1012 printf("white space at end");
1013 printf(":%s ", reset
);
1014 emit_line_with_ws(1, set
, reset
, ws
, line
, len
);
1018 } else if (line
[0] == ' ')
1020 else if (line
[0] == '@') {
1021 char *plus
= strchr(line
, '+');
1023 data
->lineno
= strtol(plus
, NULL
, 10);
1025 die("invalid diff");
1029 static unsigned char *deflate_it(char *data
,
1031 unsigned long *result_size
)
1034 unsigned char *deflated
;
1037 memset(&stream
, 0, sizeof(stream
));
1038 deflateInit(&stream
, zlib_compression_level
);
1039 bound
= deflateBound(&stream
, size
);
1040 deflated
= xmalloc(bound
);
1041 stream
.next_out
= deflated
;
1042 stream
.avail_out
= bound
;
1044 stream
.next_in
= (unsigned char *)data
;
1045 stream
.avail_in
= size
;
1046 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1048 deflateEnd(&stream
);
1049 *result_size
= stream
.total_out
;
1053 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
1059 unsigned long orig_size
;
1060 unsigned long delta_size
;
1061 unsigned long deflate_size
;
1062 unsigned long data_size
;
1064 /* We could do deflated delta, or we could do just deflated two,
1065 * whichever is smaller.
1068 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1069 if (one
->size
&& two
->size
) {
1070 delta
= diff_delta(one
->ptr
, one
->size
,
1071 two
->ptr
, two
->size
,
1072 &delta_size
, deflate_size
);
1074 void *to_free
= delta
;
1075 orig_size
= delta_size
;
1076 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1081 if (delta
&& delta_size
< deflate_size
) {
1082 printf("delta %lu\n", orig_size
);
1085 data_size
= delta_size
;
1088 printf("literal %lu\n", two
->size
);
1091 data_size
= deflate_size
;
1094 /* emit data encoded in base85 */
1097 int bytes
= (52 < data_size
) ? 52 : data_size
;
1101 line
[0] = bytes
+ 'A' - 1;
1103 line
[0] = bytes
- 26 + 'a' - 1;
1104 encode_85(line
+ 1, cp
, bytes
);
1105 cp
= (char *) cp
+ bytes
;
1112 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1114 printf("GIT binary patch\n");
1115 emit_binary_diff_body(one
, two
);
1116 emit_binary_diff_body(two
, one
);
1119 static void setup_diff_attr_check(struct git_attr_check
*check
)
1121 static struct git_attr
*attr_diff
;
1124 attr_diff
= git_attr("diff", 4);
1125 check
->attr
= attr_diff
;
1128 #define FIRST_FEW_BYTES 8000
1129 static int file_is_binary(struct diff_filespec
*one
)
1132 struct git_attr_check attr_diff_check
;
1134 setup_diff_attr_check(&attr_diff_check
);
1135 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1136 const char *value
= attr_diff_check
.value
;
1137 if (ATTR_TRUE(value
))
1139 else if (ATTR_FALSE(value
))
1144 if (!DIFF_FILE_VALID(one
))
1146 diff_populate_filespec(one
, 0);
1149 if (FIRST_FEW_BYTES
< sz
)
1150 sz
= FIRST_FEW_BYTES
;
1151 return !!memchr(one
->data
, 0, sz
);
1154 static void builtin_diff(const char *name_a
,
1156 struct diff_filespec
*one
,
1157 struct diff_filespec
*two
,
1158 const char *xfrm_msg
,
1159 struct diff_options
*o
,
1160 int complete_rewrite
)
1164 char *a_one
, *b_two
;
1165 const char *set
= diff_get_color(o
->color_diff
, DIFF_METAINFO
);
1166 const char *reset
= diff_get_color(o
->color_diff
, DIFF_RESET
);
1168 a_one
= quote_two("a/", name_a
+ (*name_a
== '/'));
1169 b_two
= quote_two("b/", name_b
+ (*name_b
== '/'));
1170 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1171 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1172 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1173 if (lbl
[0][0] == '/') {
1175 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1176 if (xfrm_msg
&& xfrm_msg
[0])
1177 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1179 else if (lbl
[1][0] == '/') {
1180 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1181 if (xfrm_msg
&& xfrm_msg
[0])
1182 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1185 if (one
->mode
!= two
->mode
) {
1186 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1187 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1189 if (xfrm_msg
&& xfrm_msg
[0])
1190 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1192 * we do not run diff between different kind
1195 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1196 goto free_ab_and_return
;
1197 if (complete_rewrite
) {
1198 emit_rewrite_diff(name_a
, name_b
, one
, two
,
1200 o
->found_changes
= 1;
1201 goto free_ab_and_return
;
1205 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1206 die("unable to read files to diff");
1208 if (!o
->text
&& (file_is_binary(one
) || file_is_binary(two
))) {
1209 /* Quite common confusing case */
1210 if (mf1
.size
== mf2
.size
&&
1211 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1212 goto free_ab_and_return
;
1214 emit_binary_diff(&mf1
, &mf2
);
1216 printf("Binary files %s and %s differ\n",
1218 o
->found_changes
= 1;
1221 /* Crazy xdl interfaces.. */
1222 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1226 struct emit_callback ecbdata
;
1228 memset(&ecbdata
, 0, sizeof(ecbdata
));
1229 ecbdata
.label_path
= lbl
;
1230 ecbdata
.color_diff
= o
->color_diff
;
1231 ecbdata
.found_changesp
= &o
->found_changes
;
1232 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1233 xecfg
.ctxlen
= o
->context
;
1234 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1237 else if (!prefixcmp(diffopts
, "--unified="))
1238 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1239 else if (!prefixcmp(diffopts
, "-u"))
1240 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1241 ecb
.outf
= xdiff_outf
;
1242 ecb
.priv
= &ecbdata
;
1243 ecbdata
.xm
.consume
= fn_out_consume
;
1244 if (o
->color_diff_words
)
1245 ecbdata
.diff_words
=
1246 xcalloc(1, sizeof(struct diff_words_data
));
1247 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1248 if (o
->color_diff_words
)
1249 free_diff_words_data(&ecbdata
);
1258 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1259 struct diff_filespec
*one
,
1260 struct diff_filespec
*two
,
1261 struct diffstat_t
*diffstat
,
1262 struct diff_options
*o
,
1263 int complete_rewrite
)
1266 struct diffstat_file
*data
;
1268 data
= diffstat_add(diffstat
, name_a
, name_b
);
1271 data
->is_unmerged
= 1;
1274 if (complete_rewrite
) {
1275 diff_populate_filespec(one
, 0);
1276 diff_populate_filespec(two
, 0);
1277 data
->deleted
= count_lines(one
->data
, one
->size
);
1278 data
->added
= count_lines(two
->data
, two
->size
);
1281 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1282 die("unable to read files to diff");
1284 if (file_is_binary(one
) || file_is_binary(two
)) {
1285 data
->is_binary
= 1;
1286 data
->added
= mf2
.size
;
1287 data
->deleted
= mf1
.size
;
1289 /* Crazy xdl interfaces.. */
1294 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1297 ecb
.outf
= xdiff_outf
;
1298 ecb
.priv
= diffstat
;
1299 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1303 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1304 struct diff_filespec
*one
,
1305 struct diff_filespec
*two
, struct diff_options
*o
)
1308 struct checkdiff_t data
;
1313 memset(&data
, 0, sizeof(data
));
1314 data
.xm
.consume
= checkdiff_consume
;
1315 data
.filename
= name_b
? name_b
: name_a
;
1317 data
.color_diff
= o
->color_diff
;
1319 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1320 die("unable to read files to diff");
1322 if (file_is_binary(two
))
1325 /* Crazy xdl interfaces.. */
1330 xpp
.flags
= XDF_NEED_MINIMAL
;
1333 ecb
.outf
= xdiff_outf
;
1335 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1339 struct diff_filespec
*alloc_filespec(const char *path
)
1341 int namelen
= strlen(path
);
1342 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1344 memset(spec
, 0, sizeof(*spec
));
1345 spec
->path
= (char *)(spec
+ 1);
1346 memcpy(spec
->path
, path
, namelen
+1);
1350 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1351 unsigned short mode
)
1354 spec
->mode
= canon_mode(mode
);
1355 hashcpy(spec
->sha1
, sha1
);
1356 spec
->sha1_valid
= !is_null_sha1(sha1
);
1361 * Given a name and sha1 pair, if the dircache tells us the file in
1362 * the work tree has that object contents, return true, so that
1363 * prepare_temp_file() does not have to inflate and extract.
1365 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1367 struct cache_entry
*ce
;
1371 /* We do not read the cache ourselves here, because the
1372 * benchmark with my previous version that always reads cache
1373 * shows that it makes things worse for diff-tree comparing
1374 * two linux-2.6 kernel trees in an already checked out work
1375 * tree. This is because most diff-tree comparisons deal with
1376 * only a small number of files, while reading the cache is
1377 * expensive for a large project, and its cost outweighs the
1378 * savings we get by not inflating the object to a temporary
1379 * file. Practically, this code only helps when we are used
1380 * by diff-cache --cached, which does read the cache before
1386 /* We want to avoid the working directory if our caller
1387 * doesn't need the data in a normal file, this system
1388 * is rather slow with its stat/open/mmap/close syscalls,
1389 * and the object is contained in a pack file. The pack
1390 * is probably already open and will be faster to obtain
1391 * the data through than the working directory. Loose
1392 * objects however would tend to be slower as they need
1393 * to be individually opened and inflated.
1395 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1399 pos
= cache_name_pos(name
, len
);
1402 ce
= active_cache
[pos
];
1403 if ((lstat(name
, &st
) < 0) ||
1404 !S_ISREG(st
.st_mode
) || /* careful! */
1405 ce_match_stat(ce
, &st
, 0) ||
1406 hashcmp(sha1
, ce
->sha1
))
1408 /* we return 1 only when we can stat, it is a regular file,
1409 * stat information matches, and sha1 recorded in the cache
1410 * matches. I.e. we know the file in the work tree really is
1411 * the same as the <name, sha1> pair.
1416 static struct sha1_size_cache
{
1417 unsigned char sha1
[20];
1419 } **sha1_size_cache
;
1420 static int sha1_size_cache_nr
, sha1_size_cache_alloc
;
1422 static struct sha1_size_cache
*locate_size_cache(unsigned char *sha1
,
1427 struct sha1_size_cache
*e
;
1430 last
= sha1_size_cache_nr
;
1431 while (last
> first
) {
1432 int cmp
, next
= (last
+ first
) >> 1;
1433 e
= sha1_size_cache
[next
];
1434 cmp
= hashcmp(e
->sha1
, sha1
);
1446 /* insert to make it at "first" */
1447 if (sha1_size_cache_alloc
<= sha1_size_cache_nr
) {
1448 sha1_size_cache_alloc
= alloc_nr(sha1_size_cache_alloc
);
1449 sha1_size_cache
= xrealloc(sha1_size_cache
,
1450 sha1_size_cache_alloc
*
1451 sizeof(*sha1_size_cache
));
1453 sha1_size_cache_nr
++;
1454 if (first
< sha1_size_cache_nr
)
1455 memmove(sha1_size_cache
+ first
+ 1, sha1_size_cache
+ first
,
1456 (sha1_size_cache_nr
- first
- 1) *
1457 sizeof(*sha1_size_cache
));
1458 e
= xmalloc(sizeof(struct sha1_size_cache
));
1459 sha1_size_cache
[first
] = e
;
1460 hashcpy(e
->sha1
, sha1
);
1465 static int populate_from_stdin(struct diff_filespec
*s
)
1467 #define INCREMENT 1024
1475 buf
= xrealloc(buf
, size
+ INCREMENT
);
1476 got
= xread(0, buf
+ size
, INCREMENT
);
1480 return error("error while reading from stdin %s",
1484 s
->should_munmap
= 0;
1491 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1494 char *data
= xmalloc(100);
1495 len
= snprintf(data
, 100,
1496 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1508 * While doing rename detection and pickaxe operation, we may need to
1509 * grab the data for the blob (or file) for our own in-core comparison.
1510 * diff_filespec has data and size fields for this purpose.
1512 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1515 if (!DIFF_FILE_VALID(s
))
1516 die("internal error: asking to populate invalid file.");
1517 if (S_ISDIR(s
->mode
))
1520 if (!use_size_cache
)
1526 if (S_ISDIRLNK(s
->mode
))
1527 return diff_populate_gitlink(s
, size_only
);
1529 if (!s
->sha1_valid
||
1530 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1536 if (!strcmp(s
->path
, "-"))
1537 return populate_from_stdin(s
);
1539 if (lstat(s
->path
, &st
) < 0) {
1540 if (errno
== ENOENT
) {
1544 s
->data
= (char *)"";
1549 s
->size
= xsize_t(st
.st_size
);
1554 if (S_ISLNK(st
.st_mode
)) {
1556 s
->data
= xmalloc(s
->size
);
1558 ret
= readlink(s
->path
, s
->data
, s
->size
);
1565 fd
= open(s
->path
, O_RDONLY
);
1568 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1570 s
->should_munmap
= 1;
1573 * Convert from working tree format to canonical git format
1576 buf
= convert_to_git(s
->path
, s
->data
, &size
);
1578 munmap(s
->data
, s
->size
);
1579 s
->should_munmap
= 0;
1586 enum object_type type
;
1587 struct sha1_size_cache
*e
;
1589 if (size_only
&& use_size_cache
&&
1590 (e
= locate_size_cache(s
->sha1
, 1, 0)) != NULL
) {
1596 type
= sha1_object_info(s
->sha1
, &s
->size
);
1597 if (use_size_cache
&& 0 < type
)
1598 locate_size_cache(s
->sha1
, 0, s
->size
);
1601 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1608 void diff_free_filespec_data(struct diff_filespec
*s
)
1612 else if (s
->should_munmap
)
1613 munmap(s
->data
, s
->size
);
1614 s
->should_free
= s
->should_munmap
= 0;
1620 static void prep_temp_blob(struct diff_tempfile
*temp
,
1623 const unsigned char *sha1
,
1628 fd
= git_mkstemp(temp
->tmp_path
, TEMPFILE_PATH_LEN
, ".diff_XXXXXX");
1630 die("unable to create temp-file");
1631 if (write_in_full(fd
, blob
, size
) != size
)
1632 die("unable to write temp-file");
1634 temp
->name
= temp
->tmp_path
;
1635 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1637 sprintf(temp
->mode
, "%06o", mode
);
1640 static void prepare_temp_file(const char *name
,
1641 struct diff_tempfile
*temp
,
1642 struct diff_filespec
*one
)
1644 if (!DIFF_FILE_VALID(one
)) {
1646 /* A '-' entry produces this for file-2, and
1647 * a '+' entry produces this for file-1.
1649 temp
->name
= "/dev/null";
1650 strcpy(temp
->hex
, ".");
1651 strcpy(temp
->mode
, ".");
1655 if (!one
->sha1_valid
||
1656 reuse_worktree_file(name
, one
->sha1
, 1)) {
1658 if (lstat(name
, &st
) < 0) {
1659 if (errno
== ENOENT
)
1660 goto not_a_valid_file
;
1661 die("stat(%s): %s", name
, strerror(errno
));
1663 if (S_ISLNK(st
.st_mode
)) {
1665 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1666 size_t sz
= xsize_t(st
.st_size
);
1667 if (sizeof(buf
) <= st
.st_size
)
1668 die("symlink too long: %s", name
);
1669 ret
= readlink(name
, buf
, sz
);
1671 die("readlink(%s)", name
);
1672 prep_temp_blob(temp
, buf
, sz
,
1674 one
->sha1
: null_sha1
),
1676 one
->mode
: S_IFLNK
));
1679 /* we can borrow from the file in the work tree */
1681 if (!one
->sha1_valid
)
1682 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1684 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1685 /* Even though we may sometimes borrow the
1686 * contents from the work tree, we always want
1687 * one->mode. mode is trustworthy even when
1688 * !(one->sha1_valid), as long as
1689 * DIFF_FILE_VALID(one).
1691 sprintf(temp
->mode
, "%06o", one
->mode
);
1696 if (diff_populate_filespec(one
, 0))
1697 die("cannot read data blob for %s", one
->path
);
1698 prep_temp_blob(temp
, one
->data
, one
->size
,
1699 one
->sha1
, one
->mode
);
1703 static void remove_tempfile(void)
1707 for (i
= 0; i
< 2; i
++)
1708 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1709 unlink(diff_temp
[i
].name
);
1710 diff_temp
[i
].name
= NULL
;
1714 static void remove_tempfile_on_signal(int signo
)
1717 signal(SIGINT
, SIG_DFL
);
1721 static int spawn_prog(const char *pgm
, const char **arg
)
1729 die("unable to fork");
1731 execvp(pgm
, (char *const*) arg
);
1735 while (waitpid(pid
, &status
, 0) < 0) {
1741 /* Earlier we did not check the exit status because
1742 * diff exits non-zero if files are different, and
1743 * we are not interested in knowing that. It was a
1744 * mistake which made it harder to quit a diff-*
1745 * session that uses the git-apply-patch-script as
1746 * the GIT_EXTERNAL_DIFF. A custom GIT_EXTERNAL_DIFF
1747 * should also exit non-zero only when it wants to
1748 * abort the entire diff-* session.
1750 if (WIFEXITED(status
) && !WEXITSTATUS(status
))
1755 /* An external diff command takes:
1757 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1758 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1761 static void run_external_diff(const char *pgm
,
1764 struct diff_filespec
*one
,
1765 struct diff_filespec
*two
,
1766 const char *xfrm_msg
,
1767 int complete_rewrite
)
1769 const char *spawn_arg
[10];
1770 struct diff_tempfile
*temp
= diff_temp
;
1772 static int atexit_asked
= 0;
1773 const char *othername
;
1774 const char **arg
= &spawn_arg
[0];
1776 othername
= (other
? other
: name
);
1778 prepare_temp_file(name
, &temp
[0], one
);
1779 prepare_temp_file(othername
, &temp
[1], two
);
1780 if (! atexit_asked
&&
1781 (temp
[0].name
== temp
[0].tmp_path
||
1782 temp
[1].name
== temp
[1].tmp_path
)) {
1784 atexit(remove_tempfile
);
1786 signal(SIGINT
, remove_tempfile_on_signal
);
1792 *arg
++ = temp
[0].name
;
1793 *arg
++ = temp
[0].hex
;
1794 *arg
++ = temp
[0].mode
;
1795 *arg
++ = temp
[1].name
;
1796 *arg
++ = temp
[1].hex
;
1797 *arg
++ = temp
[1].mode
;
1807 retval
= spawn_prog(pgm
, spawn_arg
);
1810 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1815 static const char *external_diff_attr(const char *name
)
1817 struct git_attr_check attr_diff_check
;
1819 setup_diff_attr_check(&attr_diff_check
);
1820 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
1821 const char *value
= attr_diff_check
.value
;
1822 if (!ATTR_TRUE(value
) &&
1823 !ATTR_FALSE(value
) &&
1824 !ATTR_UNSET(value
)) {
1825 struct ll_diff_driver
*drv
;
1827 if (!user_diff_tail
) {
1828 user_diff_tail
= &user_diff
;
1829 git_config(git_diff_ui_config
);
1831 for (drv
= user_diff
; drv
; drv
= drv
->next
)
1832 if (!strcmp(drv
->name
, value
))
1839 static void run_diff_cmd(const char *pgm
,
1842 struct diff_filespec
*one
,
1843 struct diff_filespec
*two
,
1844 const char *xfrm_msg
,
1845 struct diff_options
*o
,
1846 int complete_rewrite
)
1848 if (!o
->allow_external
)
1851 const char *cmd
= external_diff_attr(name
);
1857 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
1862 builtin_diff(name
, other
? other
: name
,
1863 one
, two
, xfrm_msg
, o
, complete_rewrite
);
1865 printf("* Unmerged path %s\n", name
);
1868 static void diff_fill_sha1_info(struct diff_filespec
*one
)
1870 if (DIFF_FILE_VALID(one
)) {
1871 if (!one
->sha1_valid
) {
1873 if (!strcmp(one
->path
, "-")) {
1874 hashcpy(one
->sha1
, null_sha1
);
1877 if (lstat(one
->path
, &st
) < 0)
1878 die("stat %s", one
->path
);
1879 if (index_path(one
->sha1
, one
->path
, &st
, 0))
1880 die("cannot hash %s\n", one
->path
);
1887 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
1889 const char *pgm
= external_diff();
1890 char msg
[PATH_MAX
*2+300], *xfrm_msg
;
1891 struct diff_filespec
*one
;
1892 struct diff_filespec
*two
;
1895 char *name_munged
, *other_munged
;
1896 int complete_rewrite
= 0;
1899 if (DIFF_PAIR_UNMERGED(p
)) {
1901 run_diff_cmd(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
, o
, 0);
1905 name
= p
->one
->path
;
1906 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1907 name_munged
= quote_one(name
);
1908 other_munged
= quote_one(other
);
1909 one
= p
->one
; two
= p
->two
;
1911 diff_fill_sha1_info(one
);
1912 diff_fill_sha1_info(two
);
1915 switch (p
->status
) {
1916 case DIFF_STATUS_COPIED
:
1917 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1918 "similarity index %d%%\n"
1921 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
),
1922 name_munged
, other_munged
);
1924 case DIFF_STATUS_RENAMED
:
1925 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1926 "similarity index %d%%\n"
1929 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
),
1930 name_munged
, other_munged
);
1932 case DIFF_STATUS_MODIFIED
:
1934 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1935 "dissimilarity index %d%%\n",
1936 (int)(0.5 + p
->score
*
1938 complete_rewrite
= 1;
1947 if (hashcmp(one
->sha1
, two
->sha1
)) {
1948 int abbrev
= o
->full_index
? 40 : DEFAULT_ABBREV
;
1952 if ((!fill_mmfile(&mf
, one
) && file_is_binary(one
)) ||
1953 (!fill_mmfile(&mf
, two
) && file_is_binary(two
)))
1956 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1958 abbrev
, sha1_to_hex(one
->sha1
),
1959 abbrev
, sha1_to_hex(two
->sha1
));
1960 if (one
->mode
== two
->mode
)
1961 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1962 " %06o", one
->mode
);
1963 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
, "\n");
1968 xfrm_msg
= len
? msg
: NULL
;
1971 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
1972 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
1973 /* a filepair that changes between file and symlink
1974 * needs to be split into deletion and creation.
1976 struct diff_filespec
*null
= alloc_filespec(two
->path
);
1977 run_diff_cmd(NULL
, name
, other
, one
, null
, xfrm_msg
, o
, 0);
1979 null
= alloc_filespec(one
->path
);
1980 run_diff_cmd(NULL
, name
, other
, null
, two
, xfrm_msg
, o
, 0);
1984 run_diff_cmd(pgm
, name
, other
, one
, two
, xfrm_msg
, o
,
1991 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
1992 struct diffstat_t
*diffstat
)
1996 int complete_rewrite
= 0;
1998 if (DIFF_PAIR_UNMERGED(p
)) {
2000 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2004 name
= p
->one
->path
;
2005 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2007 diff_fill_sha1_info(p
->one
);
2008 diff_fill_sha1_info(p
->two
);
2010 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2011 complete_rewrite
= 1;
2012 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2015 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2020 if (DIFF_PAIR_UNMERGED(p
)) {
2025 name
= p
->one
->path
;
2026 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2028 diff_fill_sha1_info(p
->one
);
2029 diff_fill_sha1_info(p
->two
);
2031 builtin_checkdiff(name
, other
, p
->one
, p
->two
, o
);
2034 void diff_setup(struct diff_options
*options
)
2036 memset(options
, 0, sizeof(*options
));
2037 options
->line_termination
= '\n';
2038 options
->break_opt
= -1;
2039 options
->rename_limit
= -1;
2040 options
->context
= 3;
2041 options
->msg_sep
= "";
2043 options
->change
= diff_change
;
2044 options
->add_remove
= diff_addremove
;
2045 options
->color_diff
= diff_use_color_default
;
2046 options
->detect_rename
= diff_detect_rename_default
;
2049 int diff_setup_done(struct diff_options
*options
)
2053 if (options
->output_format
& DIFF_FORMAT_NAME
)
2055 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2057 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2059 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2062 die("--name-only, --name-status, --check and -s are mutually exclusive");
2064 if (options
->find_copies_harder
)
2065 options
->detect_rename
= DIFF_DETECT_COPY
;
2067 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2068 DIFF_FORMAT_NAME_STATUS
|
2069 DIFF_FORMAT_CHECKDIFF
|
2070 DIFF_FORMAT_NO_OUTPUT
))
2071 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2072 DIFF_FORMAT_NUMSTAT
|
2073 DIFF_FORMAT_DIFFSTAT
|
2074 DIFF_FORMAT_SHORTSTAT
|
2075 DIFF_FORMAT_SUMMARY
|
2079 * These cases always need recursive; we do not drop caller-supplied
2080 * recursive bits for other formats here.
2082 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2083 DIFF_FORMAT_NUMSTAT
|
2084 DIFF_FORMAT_DIFFSTAT
|
2085 DIFF_FORMAT_SHORTSTAT
|
2086 DIFF_FORMAT_SUMMARY
|
2087 DIFF_FORMAT_CHECKDIFF
))
2088 options
->recursive
= 1;
2090 * Also pickaxe would not work very well if you do not say recursive
2092 if (options
->pickaxe
)
2093 options
->recursive
= 1;
2095 if (options
->detect_rename
&& options
->rename_limit
< 0)
2096 options
->rename_limit
= diff_rename_limit_default
;
2097 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2099 /* read-cache does not die even when it fails
2100 * so it is safe for us to do this here. Also
2101 * it does not smudge active_cache or active_nr
2102 * when it fails, so we do not have to worry about
2103 * cleaning it up ourselves either.
2107 if (options
->setup
& DIFF_SETUP_USE_SIZE_CACHE
)
2109 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2110 options
->abbrev
= 40; /* full */
2113 * It does not make sense to show the first hit we happened
2114 * to have found. It does not make sense not to return with
2115 * exit code in such a case either.
2117 if (options
->quiet
) {
2118 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2119 options
->exit_with_status
= 1;
2123 * If we postprocess in diffcore, we cannot simply return
2124 * upon the first hit. We need to run diff as usual.
2126 if (options
->pickaxe
|| options
->filter
)
2132 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2142 if (c
== arg_short
) {
2146 if (val
&& isdigit(c
)) {
2148 int n
= strtoul(arg
, &end
, 10);
2159 eq
= strchr(arg
, '=');
2164 if (!len
|| strncmp(arg
, arg_long
, len
))
2169 if (!isdigit(*++eq
))
2171 n
= strtoul(eq
, &end
, 10);
2179 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2181 const char *arg
= av
[0];
2182 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2183 options
->output_format
|= DIFF_FORMAT_PATCH
;
2184 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2185 options
->output_format
|= DIFF_FORMAT_PATCH
;
2186 else if (!strcmp(arg
, "--raw"))
2187 options
->output_format
|= DIFF_FORMAT_RAW
;
2188 else if (!strcmp(arg
, "--patch-with-raw")) {
2189 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2191 else if (!strcmp(arg
, "--numstat")) {
2192 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2194 else if (!strcmp(arg
, "--shortstat")) {
2195 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2197 else if (!prefixcmp(arg
, "--stat")) {
2199 int width
= options
->stat_width
;
2200 int name_width
= options
->stat_name_width
;
2206 if (!prefixcmp(arg
, "-width="))
2207 width
= strtoul(arg
+ 7, &end
, 10);
2208 else if (!prefixcmp(arg
, "-name-width="))
2209 name_width
= strtoul(arg
+ 12, &end
, 10);
2212 width
= strtoul(arg
+1, &end
, 10);
2214 name_width
= strtoul(end
+1, &end
, 10);
2217 /* Important! This checks all the error cases! */
2220 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2221 options
->stat_name_width
= name_width
;
2222 options
->stat_width
= width
;
2224 else if (!strcmp(arg
, "--check"))
2225 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2226 else if (!strcmp(arg
, "--summary"))
2227 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2228 else if (!strcmp(arg
, "--patch-with-stat")) {
2229 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2231 else if (!strcmp(arg
, "-z"))
2232 options
->line_termination
= 0;
2233 else if (!prefixcmp(arg
, "-l"))
2234 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2235 else if (!strcmp(arg
, "--full-index"))
2236 options
->full_index
= 1;
2237 else if (!strcmp(arg
, "--binary")) {
2238 options
->output_format
|= DIFF_FORMAT_PATCH
;
2239 options
->binary
= 1;
2241 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text")) {
2244 else if (!strcmp(arg
, "--name-only"))
2245 options
->output_format
|= DIFF_FORMAT_NAME
;
2246 else if (!strcmp(arg
, "--name-status"))
2247 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2248 else if (!strcmp(arg
, "-R"))
2249 options
->reverse_diff
= 1;
2250 else if (!prefixcmp(arg
, "-S"))
2251 options
->pickaxe
= arg
+ 2;
2252 else if (!strcmp(arg
, "-s")) {
2253 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2255 else if (!prefixcmp(arg
, "-O"))
2256 options
->orderfile
= arg
+ 2;
2257 else if (!prefixcmp(arg
, "--diff-filter="))
2258 options
->filter
= arg
+ 14;
2259 else if (!strcmp(arg
, "--pickaxe-all"))
2260 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2261 else if (!strcmp(arg
, "--pickaxe-regex"))
2262 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2263 else if (!prefixcmp(arg
, "-B")) {
2264 if ((options
->break_opt
=
2265 diff_scoreopt_parse(arg
)) == -1)
2268 else if (!prefixcmp(arg
, "-M")) {
2269 if ((options
->rename_score
=
2270 diff_scoreopt_parse(arg
)) == -1)
2272 options
->detect_rename
= DIFF_DETECT_RENAME
;
2274 else if (!prefixcmp(arg
, "-C")) {
2275 if ((options
->rename_score
=
2276 diff_scoreopt_parse(arg
)) == -1)
2278 options
->detect_rename
= DIFF_DETECT_COPY
;
2280 else if (!strcmp(arg
, "--find-copies-harder"))
2281 options
->find_copies_harder
= 1;
2282 else if (!strcmp(arg
, "--abbrev"))
2283 options
->abbrev
= DEFAULT_ABBREV
;
2284 else if (!prefixcmp(arg
, "--abbrev=")) {
2285 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2286 if (options
->abbrev
< MINIMUM_ABBREV
)
2287 options
->abbrev
= MINIMUM_ABBREV
;
2288 else if (40 < options
->abbrev
)
2289 options
->abbrev
= 40;
2291 else if (!strcmp(arg
, "--color"))
2292 options
->color_diff
= 1;
2293 else if (!strcmp(arg
, "--no-color"))
2294 options
->color_diff
= 0;
2295 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2296 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2297 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2298 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2299 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2300 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2301 else if (!strcmp(arg
, "--color-words"))
2302 options
->color_diff
= options
->color_diff_words
= 1;
2303 else if (!strcmp(arg
, "--no-renames"))
2304 options
->detect_rename
= 0;
2305 else if (!strcmp(arg
, "--exit-code"))
2306 options
->exit_with_status
= 1;
2307 else if (!strcmp(arg
, "--quiet"))
2314 static int parse_num(const char **cp_p
)
2316 unsigned long num
, scale
;
2318 const char *cp
= *cp_p
;
2325 if ( !dot
&& ch
== '.' ) {
2328 } else if ( ch
== '%' ) {
2329 scale
= dot
? scale
*100 : 100;
2330 cp
++; /* % is always at the end */
2332 } else if ( ch
>= '0' && ch
<= '9' ) {
2333 if ( scale
< 100000 ) {
2335 num
= (num
*10) + (ch
-'0');
2344 /* user says num divided by scale and we say internally that
2345 * is MAX_SCORE * num / scale.
2347 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2350 int diff_scoreopt_parse(const char *opt
)
2352 int opt1
, opt2
, cmd
;
2357 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2358 return -1; /* that is not a -M, -C nor -B option */
2360 opt1
= parse_num(&opt
);
2366 else if (*opt
!= '/')
2367 return -1; /* we expect -B80/99 or -B80 */
2370 opt2
= parse_num(&opt
);
2375 return opt1
| (opt2
<< 16);
2378 struct diff_queue_struct diff_queued_diff
;
2380 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2382 if (queue
->alloc
<= queue
->nr
) {
2383 queue
->alloc
= alloc_nr(queue
->alloc
);
2384 queue
->queue
= xrealloc(queue
->queue
,
2385 sizeof(dp
) * queue
->alloc
);
2387 queue
->queue
[queue
->nr
++] = dp
;
2390 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2391 struct diff_filespec
*one
,
2392 struct diff_filespec
*two
)
2394 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2402 void diff_free_filepair(struct diff_filepair
*p
)
2404 diff_free_filespec_data(p
->one
);
2405 diff_free_filespec_data(p
->two
);
2411 /* This is different from find_unique_abbrev() in that
2412 * it stuffs the result with dots for alignment.
2414 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2419 return sha1_to_hex(sha1
);
2421 abbrev
= find_unique_abbrev(sha1
, len
);
2423 return sha1_to_hex(sha1
);
2424 abblen
= strlen(abbrev
);
2426 static char hex
[41];
2427 if (len
< abblen
&& abblen
<= len
+ 2)
2428 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2430 sprintf(hex
, "%s...", abbrev
);
2433 return sha1_to_hex(sha1
);
2436 static void diff_flush_raw(struct diff_filepair
*p
,
2437 struct diff_options
*options
)
2441 int abbrev
= options
->abbrev
;
2442 const char *path_one
, *path_two
;
2443 int inter_name_termination
= '\t';
2444 int line_termination
= options
->line_termination
;
2446 if (!line_termination
)
2447 inter_name_termination
= 0;
2449 path_one
= p
->one
->path
;
2450 path_two
= p
->two
->path
;
2451 if (line_termination
) {
2452 path_one
= quote_one(path_one
);
2453 path_two
= quote_one(path_two
);
2457 sprintf(status
, "%c%03d", p
->status
,
2458 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
));
2460 status
[0] = p
->status
;
2463 switch (p
->status
) {
2464 case DIFF_STATUS_COPIED
:
2465 case DIFF_STATUS_RENAMED
:
2468 case DIFF_STATUS_ADDED
:
2469 case DIFF_STATUS_DELETED
:
2476 if (!(options
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2477 printf(":%06o %06o %s ",
2478 p
->one
->mode
, p
->two
->mode
,
2479 diff_unique_abbrev(p
->one
->sha1
, abbrev
));
2481 diff_unique_abbrev(p
->two
->sha1
, abbrev
));
2483 printf("%s%c%s", status
, inter_name_termination
, path_one
);
2485 printf("%c%s", inter_name_termination
, path_two
);
2486 putchar(line_termination
);
2487 if (path_one
!= p
->one
->path
)
2488 free((void*)path_one
);
2489 if (path_two
!= p
->two
->path
)
2490 free((void*)path_two
);
2493 static void diff_flush_name(struct diff_filepair
*p
, struct diff_options
*opt
)
2495 char *path
= p
->two
->path
;
2497 if (opt
->line_termination
)
2498 path
= quote_one(p
->two
->path
);
2499 printf("%s%c", path
, opt
->line_termination
);
2500 if (p
->two
->path
!= path
)
2504 int diff_unmodified_pair(struct diff_filepair
*p
)
2506 /* This function is written stricter than necessary to support
2507 * the currently implemented transformers, but the idea is to
2508 * let transformers to produce diff_filepairs any way they want,
2509 * and filter and clean them up here before producing the output.
2511 struct diff_filespec
*one
, *two
;
2513 if (DIFF_PAIR_UNMERGED(p
))
2514 return 0; /* unmerged is interesting */
2519 /* deletion, addition, mode or type change
2520 * and rename are all interesting.
2522 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2523 DIFF_PAIR_MODE_CHANGED(p
) ||
2524 strcmp(one
->path
, two
->path
))
2527 /* both are valid and point at the same path. that is, we are
2528 * dealing with a change.
2530 if (one
->sha1_valid
&& two
->sha1_valid
&&
2531 !hashcmp(one
->sha1
, two
->sha1
))
2532 return 1; /* no change */
2533 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2534 return 1; /* both look at the same file on the filesystem. */
2538 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2540 if (diff_unmodified_pair(p
))
2543 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2544 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2545 return; /* no tree diffs in patch format */
2550 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2551 struct diffstat_t
*diffstat
)
2553 if (diff_unmodified_pair(p
))
2556 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2557 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2558 return; /* no tree diffs in patch format */
2560 run_diffstat(p
, o
, diffstat
);
2563 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2564 struct diff_options
*o
)
2566 if (diff_unmodified_pair(p
))
2569 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2570 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2571 return; /* no tree diffs in patch format */
2573 run_checkdiff(p
, o
);
2576 int diff_queue_is_empty(void)
2578 struct diff_queue_struct
*q
= &diff_queued_diff
;
2580 for (i
= 0; i
< q
->nr
; i
++)
2581 if (!diff_unmodified_pair(q
->queue
[i
]))
2587 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2589 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2592 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2594 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2595 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2597 s
->size
, s
->xfrm_flags
);
2600 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2602 diff_debug_filespec(p
->one
, i
, "one");
2603 diff_debug_filespec(p
->two
, i
, "two");
2604 fprintf(stderr
, "score %d, status %c stays %d broken %d\n",
2605 p
->score
, p
->status
? p
->status
: '?',
2606 p
->source_stays
, p
->broken_pair
);
2609 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2613 fprintf(stderr
, "%s\n", msg
);
2614 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2615 for (i
= 0; i
< q
->nr
; i
++) {
2616 struct diff_filepair
*p
= q
->queue
[i
];
2617 diff_debug_filepair(p
, i
);
2622 static void diff_resolve_rename_copy(void)
2625 struct diff_filepair
*p
, *pp
;
2626 struct diff_queue_struct
*q
= &diff_queued_diff
;
2628 diff_debug_queue("resolve-rename-copy", q
);
2630 for (i
= 0; i
< q
->nr
; i
++) {
2632 p
->status
= 0; /* undecided */
2633 if (DIFF_PAIR_UNMERGED(p
))
2634 p
->status
= DIFF_STATUS_UNMERGED
;
2635 else if (!DIFF_FILE_VALID(p
->one
))
2636 p
->status
= DIFF_STATUS_ADDED
;
2637 else if (!DIFF_FILE_VALID(p
->two
))
2638 p
->status
= DIFF_STATUS_DELETED
;
2639 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2640 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2642 /* from this point on, we are dealing with a pair
2643 * whose both sides are valid and of the same type, i.e.
2644 * either in-place edit or rename/copy edit.
2646 else if (DIFF_PAIR_RENAME(p
)) {
2647 if (p
->source_stays
) {
2648 p
->status
= DIFF_STATUS_COPIED
;
2651 /* See if there is some other filepair that
2652 * copies from the same source as us. If so
2653 * we are a copy. Otherwise we are either a
2654 * copy if the path stays, or a rename if it
2655 * does not, but we already handled "stays" case.
2657 for (j
= i
+ 1; j
< q
->nr
; j
++) {
2659 if (strcmp(pp
->one
->path
, p
->one
->path
))
2660 continue; /* not us */
2661 if (!DIFF_PAIR_RENAME(pp
))
2662 continue; /* not a rename/copy */
2663 /* pp is a rename/copy from the same source */
2664 p
->status
= DIFF_STATUS_COPIED
;
2668 p
->status
= DIFF_STATUS_RENAMED
;
2670 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2671 p
->one
->mode
!= p
->two
->mode
||
2672 is_null_sha1(p
->one
->sha1
))
2673 p
->status
= DIFF_STATUS_MODIFIED
;
2675 /* This is a "no-change" entry and should not
2676 * happen anymore, but prepare for broken callers.
2678 error("feeding unmodified %s to diffcore",
2680 p
->status
= DIFF_STATUS_UNKNOWN
;
2683 diff_debug_queue("resolve-rename-copy done", q
);
2686 static int check_pair_status(struct diff_filepair
*p
)
2688 switch (p
->status
) {
2689 case DIFF_STATUS_UNKNOWN
:
2692 die("internal error in diff-resolve-rename-copy");
2698 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2700 int fmt
= opt
->output_format
;
2702 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2703 diff_flush_checkdiff(p
, opt
);
2704 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2705 diff_flush_raw(p
, opt
);
2706 else if (fmt
& DIFF_FORMAT_NAME
)
2707 diff_flush_name(p
, opt
);
2710 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2712 char *name
= quote_one(fs
->path
);
2714 printf(" %s mode %06o %s\n", newdelete
, fs
->mode
, name
);
2716 printf(" %s %s\n", newdelete
, name
);
2721 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2723 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2725 char *name
= quote_one(p
->two
->path
);
2726 printf(" mode change %06o => %06o %s\n",
2727 p
->one
->mode
, p
->two
->mode
, name
);
2731 printf(" mode change %06o => %06o\n",
2732 p
->one
->mode
, p
->two
->mode
);
2736 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2738 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2740 printf(" %s %s (%d%%)\n", renamecopy
, names
,
2741 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
));
2743 show_mode_change(p
, 0);
2746 static void diff_summary(struct diff_filepair
*p
)
2749 case DIFF_STATUS_DELETED
:
2750 show_file_mode_name("delete", p
->one
);
2752 case DIFF_STATUS_ADDED
:
2753 show_file_mode_name("create", p
->two
);
2755 case DIFF_STATUS_COPIED
:
2756 show_rename_copy("copy", p
);
2758 case DIFF_STATUS_RENAMED
:
2759 show_rename_copy("rename", p
);
2763 char *name
= quote_one(p
->two
->path
);
2764 printf(" rewrite %s (%d%%)\n", name
,
2765 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
));
2767 show_mode_change(p
, 0);
2768 } else show_mode_change(p
, 1);
2774 struct xdiff_emit_state xm
;
2779 static int remove_space(char *line
, int len
)
2785 for (i
= 0; i
< len
; i
++)
2786 if (!isspace((c
= line
[i
])))
2792 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2794 struct patch_id_t
*data
= priv
;
2797 /* Ignore line numbers when computing the SHA1 of the patch */
2798 if (!prefixcmp(line
, "@@ -"))
2801 new_len
= remove_space(line
, len
);
2803 SHA1_Update(data
->ctx
, line
, new_len
);
2804 data
->patchlen
+= new_len
;
2807 /* returns 0 upon success, and writes result into sha1 */
2808 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2810 struct diff_queue_struct
*q
= &diff_queued_diff
;
2813 struct patch_id_t data
;
2814 char buffer
[PATH_MAX
* 4 + 20];
2817 memset(&data
, 0, sizeof(struct patch_id_t
));
2819 data
.xm
.consume
= patch_id_consume
;
2821 for (i
= 0; i
< q
->nr
; i
++) {
2826 struct diff_filepair
*p
= q
->queue
[i
];
2830 return error("internal diff status error");
2831 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2833 if (diff_unmodified_pair(p
))
2835 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2836 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2838 if (DIFF_PAIR_UNMERGED(p
))
2841 diff_fill_sha1_info(p
->one
);
2842 diff_fill_sha1_info(p
->two
);
2843 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2844 fill_mmfile(&mf2
, p
->two
) < 0)
2845 return error("unable to read files to diff");
2847 /* Maybe hash p->two? into the patch id? */
2848 if (file_is_binary(p
->two
))
2851 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2852 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2853 if (p
->one
->mode
== 0)
2854 len1
= snprintf(buffer
, sizeof(buffer
),
2855 "diff--gita/%.*sb/%.*s"
2862 len2
, p
->two
->path
);
2863 else if (p
->two
->mode
== 0)
2864 len1
= snprintf(buffer
, sizeof(buffer
),
2865 "diff--gita/%.*sb/%.*s"
2866 "deletedfilemode%06o"
2872 len1
, p
->one
->path
);
2874 len1
= snprintf(buffer
, sizeof(buffer
),
2875 "diff--gita/%.*sb/%.*s"
2881 len2
, p
->two
->path
);
2882 SHA1_Update(&ctx
, buffer
, len1
);
2884 xpp
.flags
= XDF_NEED_MINIMAL
;
2886 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2887 ecb
.outf
= xdiff_outf
;
2889 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2892 SHA1_Final(sha1
, &ctx
);
2896 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2898 struct diff_queue_struct
*q
= &diff_queued_diff
;
2900 int result
= diff_get_patch_id(options
, sha1
);
2902 for (i
= 0; i
< q
->nr
; i
++)
2903 diff_free_filepair(q
->queue
[i
]);
2907 q
->nr
= q
->alloc
= 0;
2912 static int is_summary_empty(const struct diff_queue_struct
*q
)
2916 for (i
= 0; i
< q
->nr
; i
++) {
2917 const struct diff_filepair
*p
= q
->queue
[i
];
2919 switch (p
->status
) {
2920 case DIFF_STATUS_DELETED
:
2921 case DIFF_STATUS_ADDED
:
2922 case DIFF_STATUS_COPIED
:
2923 case DIFF_STATUS_RENAMED
:
2928 if (p
->one
->mode
&& p
->two
->mode
&&
2929 p
->one
->mode
!= p
->two
->mode
)
2937 void diff_flush(struct diff_options
*options
)
2939 struct diff_queue_struct
*q
= &diff_queued_diff
;
2940 int i
, output_format
= options
->output_format
;
2944 * Order: raw, stat, summary, patch
2945 * or: name/name-status/checkdiff (other bits clear)
2950 if (output_format
& (DIFF_FORMAT_RAW
|
2952 DIFF_FORMAT_NAME_STATUS
|
2953 DIFF_FORMAT_CHECKDIFF
)) {
2954 for (i
= 0; i
< q
->nr
; i
++) {
2955 struct diff_filepair
*p
= q
->queue
[i
];
2956 if (check_pair_status(p
))
2957 flush_one_pair(p
, options
);
2962 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
2963 struct diffstat_t diffstat
;
2965 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
2966 diffstat
.xm
.consume
= diffstat_consume
;
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_stat(p
, options
, &diffstat
);
2972 if (output_format
& DIFF_FORMAT_NUMSTAT
)
2973 show_numstat(&diffstat
, options
);
2974 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
2975 show_stats(&diffstat
, options
);
2976 else if (output_format
& DIFF_FORMAT_SHORTSTAT
)
2977 show_shortstats(&diffstat
);
2981 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
2982 for (i
= 0; i
< q
->nr
; i
++)
2983 diff_summary(q
->queue
[i
]);
2987 if (output_format
& DIFF_FORMAT_PATCH
) {
2989 if (options
->stat_sep
) {
2990 /* attach patch instead of inline */
2991 fputs(options
->stat_sep
, stdout
);
2993 putchar(options
->line_termination
);
2997 for (i
= 0; i
< q
->nr
; i
++) {
2998 struct diff_filepair
*p
= q
->queue
[i
];
2999 if (check_pair_status(p
))
3000 diff_flush_patch(p
, options
);
3004 if (output_format
& DIFF_FORMAT_CALLBACK
)
3005 options
->format_callback(q
, options
, options
->format_callback_data
);
3007 for (i
= 0; i
< q
->nr
; i
++)
3008 diff_free_filepair(q
->queue
[i
]);
3012 q
->nr
= q
->alloc
= 0;
3015 static void diffcore_apply_filter(const char *filter
)
3018 struct diff_queue_struct
*q
= &diff_queued_diff
;
3019 struct diff_queue_struct outq
;
3021 outq
.nr
= outq
.alloc
= 0;
3026 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3028 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3029 struct diff_filepair
*p
= q
->queue
[i
];
3030 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3032 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3034 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3035 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3036 strchr(filter
, p
->status
)))
3042 /* otherwise we will clear the whole queue
3043 * by copying the empty outq at the end of this
3044 * function, but first clear the current entries
3047 for (i
= 0; i
< q
->nr
; i
++)
3048 diff_free_filepair(q
->queue
[i
]);
3051 /* Only the matching ones */
3052 for (i
= 0; i
< q
->nr
; i
++) {
3053 struct diff_filepair
*p
= q
->queue
[i
];
3055 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3057 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3059 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3060 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3061 strchr(filter
, p
->status
)))
3064 diff_free_filepair(p
);
3071 void diffcore_std(struct diff_options
*options
)
3075 if (options
->break_opt
!= -1)
3076 diffcore_break(options
->break_opt
);
3077 if (options
->detect_rename
)
3078 diffcore_rename(options
);
3079 if (options
->break_opt
!= -1)
3080 diffcore_merge_broken();
3081 if (options
->pickaxe
)
3082 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3083 if (options
->orderfile
)
3084 diffcore_order(options
->orderfile
);
3085 diff_resolve_rename_copy();
3086 diffcore_apply_filter(options
->filter
);
3088 options
->has_changes
= !!diff_queued_diff
.nr
;
3092 void diff_addremove(struct diff_options
*options
,
3093 int addremove
, unsigned mode
,
3094 const unsigned char *sha1
,
3095 const char *base
, const char *path
)
3097 char concatpath
[PATH_MAX
];
3098 struct diff_filespec
*one
, *two
;
3100 /* This may look odd, but it is a preparation for
3101 * feeding "there are unchanged files which should
3102 * not produce diffs, but when you are doing copy
3103 * detection you would need them, so here they are"
3104 * entries to the diff-core. They will be prefixed
3105 * with something like '=' or '*' (I haven't decided
3106 * which but should not make any difference).
3107 * Feeding the same new and old to diff_change()
3108 * also has the same effect.
3109 * Before the final output happens, they are pruned after
3110 * merged into rename/copy pairs as appropriate.
3112 if (options
->reverse_diff
)
3113 addremove
= (addremove
== '+' ? '-' :
3114 addremove
== '-' ? '+' : addremove
);
3116 if (!path
) path
= "";
3117 sprintf(concatpath
, "%s%s", base
, path
);
3118 one
= alloc_filespec(concatpath
);
3119 two
= alloc_filespec(concatpath
);
3121 if (addremove
!= '+')
3122 fill_filespec(one
, sha1
, mode
);
3123 if (addremove
!= '-')
3124 fill_filespec(two
, sha1
, mode
);
3126 diff_queue(&diff_queued_diff
, one
, two
);
3127 options
->has_changes
= 1;
3130 void diff_change(struct diff_options
*options
,
3131 unsigned old_mode
, unsigned new_mode
,
3132 const unsigned char *old_sha1
,
3133 const unsigned char *new_sha1
,
3134 const char *base
, const char *path
)
3136 char concatpath
[PATH_MAX
];
3137 struct diff_filespec
*one
, *two
;
3139 if (options
->reverse_diff
) {
3141 const unsigned char *tmp_c
;
3142 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3143 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3145 if (!path
) path
= "";
3146 sprintf(concatpath
, "%s%s", base
, path
);
3147 one
= alloc_filespec(concatpath
);
3148 two
= alloc_filespec(concatpath
);
3149 fill_filespec(one
, old_sha1
, old_mode
);
3150 fill_filespec(two
, new_sha1
, new_mode
);
3152 diff_queue(&diff_queued_diff
, one
, two
);
3153 options
->has_changes
= 1;
3156 void diff_unmerge(struct diff_options
*options
,
3158 unsigned mode
, const unsigned char *sha1
)
3160 struct diff_filespec
*one
, *two
;
3161 one
= alloc_filespec(path
);
3162 two
= alloc_filespec(path
);
3163 fill_filespec(one
, sha1
, mode
);
3164 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;