2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
15 #ifdef NO_FAST_WORKING_DIRECTORY
16 #define FAST_WORKING_DIRECTORY 0
18 #define FAST_WORKING_DIRECTORY 1
21 static int diff_detect_rename_default
;
22 static int diff_rename_limit_default
= 100;
23 static int diff_use_color_default
;
24 static const char *external_diff_cmd_cfg
;
25 int diff_auto_refresh_index
= 1;
27 static char diff_colors
[][COLOR_MAXLEN
] = {
29 "", /* PLAIN (normal) */
30 "\033[1m", /* METAINFO (bold) */
31 "\033[36m", /* FRAGINFO (cyan) */
32 "\033[31m", /* OLD (red) */
33 "\033[32m", /* NEW (green) */
34 "\033[33m", /* COMMIT (yellow) */
35 "\033[41m", /* WHITESPACE (red background) */
38 static int parse_diff_color_slot(const char *var
, int ofs
)
40 if (!strcasecmp(var
+ofs
, "plain"))
42 if (!strcasecmp(var
+ofs
, "meta"))
44 if (!strcasecmp(var
+ofs
, "frag"))
46 if (!strcasecmp(var
+ofs
, "old"))
48 if (!strcasecmp(var
+ofs
, "new"))
50 if (!strcasecmp(var
+ofs
, "commit"))
52 if (!strcasecmp(var
+ofs
, "whitespace"))
53 return DIFF_WHITESPACE
;
54 die("bad config variable '%s'", var
);
57 static struct ll_diff_driver
{
59 struct ll_diff_driver
*next
;
61 } *user_diff
, **user_diff_tail
;
64 * Currently there is only "diff.<drivername>.command" variable;
65 * because there are "diff.color.<slot>" variables, we are parsing
66 * this in a bit convoluted way to allow low level diff driver
69 static int parse_lldiff_command(const char *var
, const char *ep
, const char *value
)
73 struct ll_diff_driver
*drv
;
77 for (drv
= user_diff
; drv
; drv
= drv
->next
)
78 if (!strncmp(drv
->name
, name
, namelen
) && !drv
->name
[namelen
])
81 drv
= xcalloc(1, sizeof(struct ll_diff_driver
));
82 drv
->name
= xmemdupz(name
, namelen
);
84 user_diff_tail
= &user_diff
;
85 *user_diff_tail
= drv
;
86 user_diff_tail
= &(drv
->next
);
90 return error("%s: lacks value", var
);
91 drv
->cmd
= strdup(value
);
96 * 'diff.<what>.funcname' attribute can be specified in the configuration
97 * to define a customized regexp to find the beginning of a function to
98 * be used for hunk header lines of "diff -p" style output.
100 static struct funcname_pattern
{
103 struct funcname_pattern
*next
;
104 } *funcname_pattern_list
;
106 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
)
110 struct funcname_pattern
*pp
;
112 name
= var
+ 5; /* "diff." */
115 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
116 if (!strncmp(pp
->name
, name
, namelen
) && !pp
->name
[namelen
])
119 pp
= xcalloc(1, sizeof(*pp
));
120 pp
->name
= xmemdupz(name
, namelen
);
121 pp
->next
= funcname_pattern_list
;
122 funcname_pattern_list
= pp
;
126 pp
->pattern
= xstrdup(value
);
131 * These are to give UI layer defaults.
132 * The core-level commands such as git-diff-files should
133 * never be affected by the setting of diff.renames
134 * the user happens to have in the configuration file.
136 int git_diff_ui_config(const char *var
, const char *value
)
138 if (!strcmp(var
, "diff.renamelimit")) {
139 diff_rename_limit_default
= git_config_int(var
, value
);
142 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
143 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
146 if (!strcmp(var
, "diff.renames")) {
148 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
149 else if (!strcasecmp(value
, "copies") ||
150 !strcasecmp(value
, "copy"))
151 diff_detect_rename_default
= DIFF_DETECT_COPY
;
152 else if (git_config_bool(var
,value
))
153 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
156 if (!strcmp(var
, "diff.autorefreshindex")) {
157 diff_auto_refresh_index
= git_config_bool(var
, value
);
160 if (!strcmp(var
, "diff.external")) {
161 external_diff_cmd_cfg
= xstrdup(value
);
164 if (!prefixcmp(var
, "diff.")) {
165 const char *ep
= strrchr(var
, '.');
168 if (!strcmp(ep
, ".command"))
169 return parse_lldiff_command(var
, ep
, value
);
173 return git_diff_basic_config(var
, value
);
176 int git_diff_basic_config(const char *var
, const char *value
)
178 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
179 int slot
= parse_diff_color_slot(var
, 11);
180 color_parse(value
, var
, diff_colors
[slot
]);
184 if (!prefixcmp(var
, "diff.")) {
185 const char *ep
= strrchr(var
, '.');
187 if (!strcmp(ep
, ".funcname"))
188 return parse_funcname_pattern(var
, ep
, value
);
192 return git_default_config(var
, value
);
195 static char *quote_two(const char *one
, const char *two
)
197 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
198 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
201 strbuf_init(&res
, 0);
202 if (need_one
+ need_two
) {
203 strbuf_addch(&res
, '"');
204 quote_c_style(one
, &res
, NULL
, 1);
205 quote_c_style(two
, &res
, NULL
, 1);
206 strbuf_addch(&res
, '"');
208 strbuf_addstr(&res
, one
);
209 strbuf_addstr(&res
, two
);
211 return strbuf_detach(&res
, NULL
);
214 static const char *external_diff(void)
216 static const char *external_diff_cmd
= NULL
;
217 static int done_preparing
= 0;
220 return external_diff_cmd
;
221 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
222 if (!external_diff_cmd
)
223 external_diff_cmd
= external_diff_cmd_cfg
;
225 return external_diff_cmd
;
228 static struct diff_tempfile
{
229 const char *name
; /* filename external diff should read from */
232 char tmp_path
[PATH_MAX
];
235 static int count_lines(const char *data
, int size
)
237 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
244 completely_empty
= 0;
248 completely_empty
= 0;
251 if (completely_empty
)
254 count
++; /* no trailing newline */
258 static void print_line_count(int count
)
268 printf("1,%d", count
);
273 static void copy_file(int prefix
, const char *data
, int size
,
274 const char *set
, const char *reset
)
276 int ch
, nl_just_seen
= 1;
285 fputs(reset
, stdout
);
291 printf("%s\n\\ No newline at end of file\n", reset
);
294 static void emit_rewrite_diff(const char *name_a
,
296 struct diff_filespec
*one
,
297 struct diff_filespec
*two
,
298 struct diff_options
*o
)
301 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
302 const char *name_a_tab
, *name_b_tab
;
303 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
304 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
305 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
306 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
307 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
308 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
310 name_a
+= (*name_a
== '/');
311 name_b
+= (*name_b
== '/');
312 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
313 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
315 strbuf_reset(&a_name
);
316 strbuf_reset(&b_name
);
317 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
318 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
320 diff_populate_filespec(one
, 0);
321 diff_populate_filespec(two
, 0);
322 lc_a
= count_lines(one
->data
, one
->size
);
323 lc_b
= count_lines(two
->data
, two
->size
);
324 printf("%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
325 metainfo
, a_name
.buf
, name_a_tab
, reset
,
326 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
327 print_line_count(lc_a
);
329 print_line_count(lc_b
);
330 printf(" @@%s\n", reset
);
332 copy_file('-', one
->data
, one
->size
, old
, reset
);
334 copy_file('+', two
->data
, two
->size
, new, reset
);
337 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
339 if (!DIFF_FILE_VALID(one
)) {
340 mf
->ptr
= (char *)""; /* does not matter */
344 else if (diff_populate_filespec(one
, 0))
347 mf
->size
= one
->size
;
351 struct diff_words_buffer
{
354 long current
; /* output pointer */
355 int suppressed_newline
;
358 static void diff_words_append(char *line
, unsigned long len
,
359 struct diff_words_buffer
*buffer
)
361 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
362 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
363 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
367 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
368 buffer
->text
.size
+= len
;
371 struct diff_words_data
{
372 struct xdiff_emit_state xm
;
373 struct diff_words_buffer minus
, plus
;
376 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
377 int suppress_newline
)
385 ptr
= buffer
->text
.ptr
+ buffer
->current
;
386 buffer
->current
+= len
;
388 if (ptr
[len
- 1] == '\n') {
393 fputs(diff_get_color(1, color
), stdout
);
394 fwrite(ptr
, len
, 1, stdout
);
395 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
398 if (suppress_newline
)
399 buffer
->suppressed_newline
= 1;
405 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
407 struct diff_words_data
*diff_words
= priv
;
409 if (diff_words
->minus
.suppressed_newline
) {
412 diff_words
->minus
.suppressed_newline
= 0;
418 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
421 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
424 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
425 diff_words
->minus
.current
+= len
;
430 /* this executes the word diff on the accumulated buffers */
431 static void diff_words_show(struct diff_words_data
*diff_words
)
436 mmfile_t minus
, plus
;
439 memset(&xecfg
, 0, sizeof(xecfg
));
440 minus
.size
= diff_words
->minus
.text
.size
;
441 minus
.ptr
= xmalloc(minus
.size
);
442 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
443 for (i
= 0; i
< minus
.size
; i
++)
444 if (isspace(minus
.ptr
[i
]))
446 diff_words
->minus
.current
= 0;
448 plus
.size
= diff_words
->plus
.text
.size
;
449 plus
.ptr
= xmalloc(plus
.size
);
450 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
451 for (i
= 0; i
< plus
.size
; i
++)
452 if (isspace(plus
.ptr
[i
]))
454 diff_words
->plus
.current
= 0;
456 xpp
.flags
= XDF_NEED_MINIMAL
;
457 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
458 ecb
.outf
= xdiff_outf
;
459 ecb
.priv
= diff_words
;
460 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
461 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
465 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
467 if (diff_words
->minus
.suppressed_newline
) {
469 diff_words
->minus
.suppressed_newline
= 0;
473 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
475 struct emit_callback
{
476 struct xdiff_emit_state xm
;
477 int nparents
, color_diff
;
479 sane_truncate_fn truncate
;
480 const char **label_path
;
481 struct diff_words_data
*diff_words
;
485 static void free_diff_words_data(struct emit_callback
*ecbdata
)
487 if (ecbdata
->diff_words
) {
489 if (ecbdata
->diff_words
->minus
.text
.size
||
490 ecbdata
->diff_words
->plus
.text
.size
)
491 diff_words_show(ecbdata
->diff_words
);
493 if (ecbdata
->diff_words
->minus
.text
.ptr
)
494 free (ecbdata
->diff_words
->minus
.text
.ptr
);
495 if (ecbdata
->diff_words
->plus
.text
.ptr
)
496 free (ecbdata
->diff_words
->plus
.text
.ptr
);
497 free(ecbdata
->diff_words
);
498 ecbdata
->diff_words
= NULL
;
502 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
505 return diff_colors
[ix
];
509 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
512 fwrite(line
, len
, 1, stdout
);
513 fputs(reset
, stdout
);
516 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
518 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
519 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
522 emit_line(set
, reset
, line
, len
);
524 /* Emit just the prefix, then the rest. */
525 emit_line(set
, reset
, line
, ecbdata
->nparents
);
526 (void)check_and_emit_line(line
+ ecbdata
->nparents
,
527 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
528 stdout
, set
, reset
, ws
);
532 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
539 return ecb
->truncate(line
, len
);
543 (void) utf8_width(&cp
, &l
);
545 break; /* truncated in the middle? */
550 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
554 struct emit_callback
*ecbdata
= priv
;
555 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
556 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
557 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
559 *(ecbdata
->found_changesp
) = 1;
561 if (ecbdata
->label_path
[0]) {
562 const char *name_a_tab
, *name_b_tab
;
564 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
565 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
567 printf("%s--- %s%s%s\n",
568 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
569 printf("%s+++ %s%s%s\n",
570 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
571 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
574 /* This is not really necessary for now because
575 * this codepath only deals with two-way diffs.
577 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
579 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
580 ecbdata
->nparents
= i
- 1;
581 len
= sane_truncate_line(ecbdata
, line
, len
);
582 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
584 if (line
[len
-1] != '\n')
589 if (len
< ecbdata
->nparents
) {
590 emit_line(reset
, reset
, line
, len
);
595 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
596 /* fall back to normal diff */
597 free_diff_words_data(ecbdata
);
598 if (ecbdata
->diff_words
) {
599 if (line
[0] == '-') {
600 diff_words_append(line
, len
,
601 &ecbdata
->diff_words
->minus
);
603 } else if (line
[0] == '+') {
604 diff_words_append(line
, len
,
605 &ecbdata
->diff_words
->plus
);
608 if (ecbdata
->diff_words
->minus
.text
.size
||
609 ecbdata
->diff_words
->plus
.text
.size
)
610 diff_words_show(ecbdata
->diff_words
);
613 emit_line(plain
, reset
, line
, len
);
616 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
618 color
= DIFF_FILE_OLD
;
619 else if (line
[i
] == '+')
620 color
= DIFF_FILE_NEW
;
623 if (color
!= DIFF_FILE_NEW
) {
624 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
628 emit_add_line(reset
, ecbdata
, line
, len
);
631 static char *pprint_rename(const char *a
, const char *b
)
636 int pfx_length
, sfx_length
;
637 int len_a
= strlen(a
);
638 int len_b
= strlen(b
);
639 int a_midlen
, b_midlen
;
640 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
641 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
643 strbuf_init(&name
, 0);
644 if (qlen_a
|| qlen_b
) {
645 quote_c_style(a
, &name
, NULL
, 0);
646 strbuf_addstr(&name
, " => ");
647 quote_c_style(b
, &name
, NULL
, 0);
648 return strbuf_detach(&name
, NULL
);
651 /* Find common prefix */
653 while (*old
&& *new && *old
== *new) {
655 pfx_length
= old
- a
+ 1;
660 /* Find common suffix */
664 while (a
<= old
&& b
<= new && *old
== *new) {
666 sfx_length
= len_a
- (old
- a
);
672 * pfx{mid-a => mid-b}sfx
673 * {pfx-a => pfx-b}sfx
674 * pfx{sfx-a => sfx-b}
677 a_midlen
= len_a
- pfx_length
- sfx_length
;
678 b_midlen
= len_b
- pfx_length
- sfx_length
;
684 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
685 if (pfx_length
+ sfx_length
) {
686 strbuf_add(&name
, a
, pfx_length
);
687 strbuf_addch(&name
, '{');
689 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
690 strbuf_addstr(&name
, " => ");
691 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
692 if (pfx_length
+ sfx_length
) {
693 strbuf_addch(&name
, '}');
694 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
696 return strbuf_detach(&name
, NULL
);
700 struct xdiff_emit_state xm
;
704 struct diffstat_file
{
708 unsigned is_unmerged
:1;
709 unsigned is_binary
:1;
710 unsigned is_renamed
:1;
711 unsigned int added
, deleted
;
715 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
719 struct diffstat_file
*x
;
720 x
= xcalloc(sizeof (*x
), 1);
721 if (diffstat
->nr
== diffstat
->alloc
) {
722 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
723 diffstat
->files
= xrealloc(diffstat
->files
,
724 diffstat
->alloc
* sizeof(x
));
726 diffstat
->files
[diffstat
->nr
++] = x
;
728 x
->from_name
= xstrdup(name_a
);
729 x
->name
= xstrdup(name_b
);
734 x
->name
= xstrdup(name_a
);
739 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
741 struct diffstat_t
*diffstat
= priv
;
742 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
746 else if (line
[0] == '-')
750 const char mime_boundary_leader
[] = "------------";
752 static int scale_linear(int it
, int width
, int max_change
)
755 * make sure that at least one '-' is printed if there were deletions,
756 * and likewise for '+'.
760 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
763 static void show_name(const char *prefix
, const char *name
, int len
,
764 const char *reset
, const char *set
)
766 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
769 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
779 static void fill_print_name(struct diffstat_file
*file
)
783 if (file
->print_name
)
786 if (!file
->is_renamed
) {
788 strbuf_init(&buf
, 0);
789 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
790 pname
= strbuf_detach(&buf
, NULL
);
793 strbuf_release(&buf
);
796 pname
= pprint_rename(file
->from_name
, file
->name
);
798 file
->print_name
= pname
;
801 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
803 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
804 int max_change
= 0, max_len
= 0;
805 int total_files
= data
->nr
;
806 int width
, name_width
;
807 const char *reset
, *set
, *add_c
, *del_c
;
812 width
= options
->stat_width
? options
->stat_width
: 80;
813 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
815 /* Sanity: give at least 5 columns to the graph,
816 * but leave at least 10 columns for the name.
818 if (width
< name_width
+ 15) {
819 if (name_width
<= 25)
820 width
= name_width
+ 15;
822 name_width
= width
- 15;
825 /* Find the longest filename and max number of changes */
826 reset
= diff_get_color_opt(options
, DIFF_RESET
);
827 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
828 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
829 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
831 for (i
= 0; i
< data
->nr
; i
++) {
832 struct diffstat_file
*file
= data
->files
[i
];
833 int change
= file
->added
+ file
->deleted
;
834 fill_print_name(file
);
835 len
= strlen(file
->print_name
);
839 if (file
->is_binary
|| file
->is_unmerged
)
841 if (max_change
< change
)
845 /* Compute the width of the graph part;
846 * 10 is for one blank at the beginning of the line plus
847 * " | count " between the name and the graph.
849 * From here on, name_width is the width of the name area,
850 * and width is the width of the graph area.
852 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
853 if (width
< (name_width
+ 10) + max_change
)
854 width
= width
- (name_width
+ 10);
858 for (i
= 0; i
< data
->nr
; i
++) {
859 const char *prefix
= "";
860 char *name
= data
->files
[i
]->print_name
;
861 int added
= data
->files
[i
]->added
;
862 int deleted
= data
->files
[i
]->deleted
;
866 * "scale" the filename
869 name_len
= strlen(name
);
870 if (name_width
< name_len
) {
874 name
+= name_len
- len
;
875 slash
= strchr(name
, '/');
880 if (data
->files
[i
]->is_binary
) {
881 show_name(prefix
, name
, len
, reset
, set
);
883 printf("%s%d%s", del_c
, deleted
, reset
);
885 printf("%s%d%s", add_c
, added
, reset
);
890 else if (data
->files
[i
]->is_unmerged
) {
891 show_name(prefix
, name
, len
, reset
, set
);
892 printf(" Unmerged\n");
895 else if (!data
->files
[i
]->is_renamed
&&
896 (added
+ deleted
== 0)) {
902 * scale the add/delete
910 if (width
<= max_change
) {
911 add
= scale_linear(add
, width
, max_change
);
912 del
= scale_linear(del
, width
, max_change
);
915 show_name(prefix
, name
, len
, reset
, set
);
916 printf("%5d ", added
+ deleted
);
917 show_graph('+', add
, add_c
, reset
);
918 show_graph('-', del
, del_c
, reset
);
921 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
922 set
, total_files
, adds
, dels
, reset
);
925 static void show_shortstats(struct diffstat_t
* data
)
927 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
932 for (i
= 0; i
< data
->nr
; i
++) {
933 if (!data
->files
[i
]->is_binary
&&
934 !data
->files
[i
]->is_unmerged
) {
935 int added
= data
->files
[i
]->added
;
936 int deleted
= data
->files
[i
]->deleted
;
937 if (!data
->files
[i
]->is_renamed
&&
938 (added
+ deleted
== 0)) {
946 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
947 total_files
, adds
, dels
);
950 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
957 for (i
= 0; i
< data
->nr
; i
++) {
958 struct diffstat_file
*file
= data
->files
[i
];
963 printf("%d\t%d\t", file
->added
, file
->deleted
);
964 if (options
->line_termination
) {
965 fill_print_name(file
);
966 if (!file
->is_renamed
)
967 write_name_quoted(file
->name
, stdout
,
968 options
->line_termination
);
970 fputs(file
->print_name
, stdout
);
971 putchar(options
->line_termination
);
974 if (file
->is_renamed
) {
976 write_name_quoted(file
->from_name
, stdout
, '\0');
978 write_name_quoted(file
->name
, stdout
, '\0');
983 static void free_diffstat_info(struct diffstat_t
*diffstat
)
986 for (i
= 0; i
< diffstat
->nr
; i
++) {
987 struct diffstat_file
*f
= diffstat
->files
[i
];
988 if (f
->name
!= f
->print_name
)
994 free(diffstat
->files
);
998 struct xdiff_emit_state xm
;
999 const char *filename
;
1000 int lineno
, color_diff
;
1005 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1007 struct checkdiff_t
*data
= priv
;
1008 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
1009 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
1010 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
1013 if (line
[0] == '+') {
1014 data
->status
= check_and_emit_line(line
+ 1, len
- 1,
1015 data
->ws_rule
, NULL
, NULL
, NULL
, NULL
);
1018 err
= whitespace_error_string(data
->status
);
1019 printf("%s:%d: %s.\n", data
->filename
, data
->lineno
, err
);
1021 emit_line(set
, reset
, line
, 1);
1022 (void)check_and_emit_line(line
+ 1, len
- 1, data
->ws_rule
,
1023 stdout
, set
, reset
, ws
);
1025 } else if (line
[0] == ' ')
1027 else if (line
[0] == '@') {
1028 char *plus
= strchr(line
, '+');
1030 data
->lineno
= strtol(plus
, NULL
, 10);
1032 die("invalid diff");
1036 static unsigned char *deflate_it(char *data
,
1038 unsigned long *result_size
)
1041 unsigned char *deflated
;
1044 memset(&stream
, 0, sizeof(stream
));
1045 deflateInit(&stream
, zlib_compression_level
);
1046 bound
= deflateBound(&stream
, size
);
1047 deflated
= xmalloc(bound
);
1048 stream
.next_out
= deflated
;
1049 stream
.avail_out
= bound
;
1051 stream
.next_in
= (unsigned char *)data
;
1052 stream
.avail_in
= size
;
1053 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1055 deflateEnd(&stream
);
1056 *result_size
= stream
.total_out
;
1060 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
1066 unsigned long orig_size
;
1067 unsigned long delta_size
;
1068 unsigned long deflate_size
;
1069 unsigned long data_size
;
1071 /* We could do deflated delta, or we could do just deflated two,
1072 * whichever is smaller.
1075 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1076 if (one
->size
&& two
->size
) {
1077 delta
= diff_delta(one
->ptr
, one
->size
,
1078 two
->ptr
, two
->size
,
1079 &delta_size
, deflate_size
);
1081 void *to_free
= delta
;
1082 orig_size
= delta_size
;
1083 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1088 if (delta
&& delta_size
< deflate_size
) {
1089 printf("delta %lu\n", orig_size
);
1092 data_size
= delta_size
;
1095 printf("literal %lu\n", two
->size
);
1098 data_size
= deflate_size
;
1101 /* emit data encoded in base85 */
1104 int bytes
= (52 < data_size
) ? 52 : data_size
;
1108 line
[0] = bytes
+ 'A' - 1;
1110 line
[0] = bytes
- 26 + 'a' - 1;
1111 encode_85(line
+ 1, cp
, bytes
);
1112 cp
= (char *) cp
+ bytes
;
1119 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1121 printf("GIT binary patch\n");
1122 emit_binary_diff_body(one
, two
);
1123 emit_binary_diff_body(two
, one
);
1126 static void setup_diff_attr_check(struct git_attr_check
*check
)
1128 static struct git_attr
*attr_diff
;
1131 attr_diff
= git_attr("diff", 4);
1133 check
[0].attr
= attr_diff
;
1136 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1138 struct git_attr_check attr_diff_check
;
1139 int check_from_data
= 0;
1141 if (one
->checked_attr
)
1144 setup_diff_attr_check(&attr_diff_check
);
1146 one
->funcname_pattern_ident
= NULL
;
1148 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1152 value
= attr_diff_check
.value
;
1153 if (ATTR_TRUE(value
))
1155 else if (ATTR_FALSE(value
))
1158 check_from_data
= 1;
1160 /* funcname pattern ident */
1161 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1164 one
->funcname_pattern_ident
= value
;
1167 if (check_from_data
) {
1168 if (!one
->data
&& DIFF_FILE_VALID(one
))
1169 diff_populate_filespec(one
, 0);
1172 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1176 int diff_filespec_is_binary(struct diff_filespec
*one
)
1178 diff_filespec_check_attr(one
);
1179 return one
->is_binary
;
1182 static const char *funcname_pattern(const char *ident
)
1184 struct funcname_pattern
*pp
;
1186 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1187 if (!strcmp(ident
, pp
->name
))
1192 static struct builtin_funcname_pattern
{
1194 const char *pattern
;
1195 } builtin_funcname_pattern
[] = {
1196 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1197 "new\\|return\\|switch\\|throw\\|while\\)\n"
1199 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1201 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1204 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1206 const char *ident
, *pattern
;
1209 diff_filespec_check_attr(one
);
1210 ident
= one
->funcname_pattern_ident
;
1214 * If the config file has "funcname.default" defined, that
1215 * regexp is used; otherwise NULL is returned and xemit uses
1216 * the built-in default.
1218 return funcname_pattern("default");
1220 /* Look up custom "funcname.$ident" regexp from config. */
1221 pattern
= funcname_pattern(ident
);
1226 * And define built-in fallback patterns here. Note that
1227 * these can be overridden by the user's config settings.
1229 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1230 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1231 return builtin_funcname_pattern
[i
].pattern
;
1236 static void builtin_diff(const char *name_a
,
1238 struct diff_filespec
*one
,
1239 struct diff_filespec
*two
,
1240 const char *xfrm_msg
,
1241 struct diff_options
*o
,
1242 int complete_rewrite
)
1246 char *a_one
, *b_two
;
1247 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1248 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1250 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1251 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1252 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1253 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1254 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1255 if (lbl
[0][0] == '/') {
1257 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1258 if (xfrm_msg
&& xfrm_msg
[0])
1259 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1261 else if (lbl
[1][0] == '/') {
1262 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1263 if (xfrm_msg
&& xfrm_msg
[0])
1264 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1267 if (one
->mode
!= two
->mode
) {
1268 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1269 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1271 if (xfrm_msg
&& xfrm_msg
[0])
1272 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1274 * we do not run diff between different kind
1277 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1278 goto free_ab_and_return
;
1279 if (complete_rewrite
) {
1280 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
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");
1289 if (!DIFF_OPT_TST(o
, TEXT
) &&
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
;
1295 if (DIFF_OPT_TST(o
, BINARY
))
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
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1319 ecbdata
.found_changesp
= &o
->found_changes
;
1320 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1321 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1322 xecfg
.ctxlen
= o
->context
;
1323 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1324 if (funcname_pattern
)
1325 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1328 else if (!prefixcmp(diffopts
, "--unified="))
1329 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1330 else if (!prefixcmp(diffopts
, "-u"))
1331 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1332 ecb
.outf
= xdiff_outf
;
1333 ecb
.priv
= &ecbdata
;
1334 ecbdata
.xm
.consume
= fn_out_consume
;
1335 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1336 ecbdata
.diff_words
=
1337 xcalloc(1, sizeof(struct diff_words_data
));
1338 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1339 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1340 free_diff_words_data(&ecbdata
);
1344 diff_free_filespec_data(one
);
1345 diff_free_filespec_data(two
);
1351 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1352 struct diff_filespec
*one
,
1353 struct diff_filespec
*two
,
1354 struct diffstat_t
*diffstat
,
1355 struct diff_options
*o
,
1356 int complete_rewrite
)
1359 struct diffstat_file
*data
;
1361 data
= diffstat_add(diffstat
, name_a
, name_b
);
1364 data
->is_unmerged
= 1;
1367 if (complete_rewrite
) {
1368 diff_populate_filespec(one
, 0);
1369 diff_populate_filespec(two
, 0);
1370 data
->deleted
= count_lines(one
->data
, one
->size
);
1371 data
->added
= count_lines(two
->data
, two
->size
);
1372 goto free_and_return
;
1374 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1375 die("unable to read files to diff");
1377 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1378 data
->is_binary
= 1;
1379 data
->added
= mf2
.size
;
1380 data
->deleted
= mf1
.size
;
1382 /* Crazy xdl interfaces.. */
1387 memset(&xecfg
, 0, sizeof(xecfg
));
1388 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1389 ecb
.outf
= xdiff_outf
;
1390 ecb
.priv
= diffstat
;
1391 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1395 diff_free_filespec_data(one
);
1396 diff_free_filespec_data(two
);
1399 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1400 const char *attr_path
,
1401 struct diff_filespec
*one
,
1402 struct diff_filespec
*two
, struct diff_options
*o
)
1405 struct checkdiff_t data
;
1410 memset(&data
, 0, sizeof(data
));
1411 data
.xm
.consume
= checkdiff_consume
;
1412 data
.filename
= name_b
? name_b
: name_a
;
1414 data
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1415 data
.ws_rule
= whitespace_rule(attr_path
);
1417 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1418 die("unable to read files to diff");
1420 if (diff_filespec_is_binary(two
))
1421 goto free_and_return
;
1423 /* Crazy xdl interfaces.. */
1428 memset(&xecfg
, 0, sizeof(xecfg
));
1429 xpp
.flags
= XDF_NEED_MINIMAL
;
1430 ecb
.outf
= xdiff_outf
;
1432 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1435 diff_free_filespec_data(one
);
1436 diff_free_filespec_data(two
);
1438 DIFF_OPT_SET(o
, CHECK_FAILED
);
1441 struct diff_filespec
*alloc_filespec(const char *path
)
1443 int namelen
= strlen(path
);
1444 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1446 memset(spec
, 0, sizeof(*spec
));
1447 spec
->path
= (char *)(spec
+ 1);
1448 memcpy(spec
->path
, path
, namelen
+1);
1453 void free_filespec(struct diff_filespec
*spec
)
1455 if (!--spec
->count
) {
1456 diff_free_filespec_data(spec
);
1461 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1462 unsigned short mode
)
1465 spec
->mode
= canon_mode(mode
);
1466 hashcpy(spec
->sha1
, sha1
);
1467 spec
->sha1_valid
= !is_null_sha1(sha1
);
1472 * Given a name and sha1 pair, if the index tells us the file in
1473 * the work tree has that object contents, return true, so that
1474 * prepare_temp_file() does not have to inflate and extract.
1476 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1478 struct cache_entry
*ce
;
1482 /* We do not read the cache ourselves here, because the
1483 * benchmark with my previous version that always reads cache
1484 * shows that it makes things worse for diff-tree comparing
1485 * two linux-2.6 kernel trees in an already checked out work
1486 * tree. This is because most diff-tree comparisons deal with
1487 * only a small number of files, while reading the cache is
1488 * expensive for a large project, and its cost outweighs the
1489 * savings we get by not inflating the object to a temporary
1490 * file. Practically, this code only helps when we are used
1491 * by diff-cache --cached, which does read the cache before
1497 /* We want to avoid the working directory if our caller
1498 * doesn't need the data in a normal file, this system
1499 * is rather slow with its stat/open/mmap/close syscalls,
1500 * and the object is contained in a pack file. The pack
1501 * is probably already open and will be faster to obtain
1502 * the data through than the working directory. Loose
1503 * objects however would tend to be slower as they need
1504 * to be individually opened and inflated.
1506 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1510 pos
= cache_name_pos(name
, len
);
1513 ce
= active_cache
[pos
];
1514 if ((lstat(name
, &st
) < 0) ||
1515 !S_ISREG(st
.st_mode
) || /* careful! */
1516 ce_match_stat(ce
, &st
, 0) ||
1517 hashcmp(sha1
, ce
->sha1
))
1519 /* we return 1 only when we can stat, it is a regular file,
1520 * stat information matches, and sha1 recorded in the cache
1521 * matches. I.e. we know the file in the work tree really is
1522 * the same as the <name, sha1> pair.
1527 static int populate_from_stdin(struct diff_filespec
*s
)
1532 strbuf_init(&buf
, 0);
1533 if (strbuf_read(&buf
, 0, 0) < 0)
1534 return error("error while reading from stdin %s",
1537 s
->should_munmap
= 0;
1538 s
->data
= strbuf_detach(&buf
, &size
);
1544 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1547 char *data
= xmalloc(100);
1548 len
= snprintf(data
, 100,
1549 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1561 * While doing rename detection and pickaxe operation, we may need to
1562 * grab the data for the blob (or file) for our own in-core comparison.
1563 * diff_filespec has data and size fields for this purpose.
1565 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1568 if (!DIFF_FILE_VALID(s
))
1569 die("internal error: asking to populate invalid file.");
1570 if (S_ISDIR(s
->mode
))
1576 if (size_only
&& 0 < s
->size
)
1579 if (S_ISGITLINK(s
->mode
))
1580 return diff_populate_gitlink(s
, size_only
);
1582 if (!s
->sha1_valid
||
1583 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1588 if (!strcmp(s
->path
, "-"))
1589 return populate_from_stdin(s
);
1591 if (lstat(s
->path
, &st
) < 0) {
1592 if (errno
== ENOENT
) {
1596 s
->data
= (char *)"";
1601 s
->size
= xsize_t(st
.st_size
);
1606 if (S_ISLNK(st
.st_mode
)) {
1608 s
->data
= xmalloc(s
->size
);
1610 ret
= readlink(s
->path
, s
->data
, s
->size
);
1617 fd
= open(s
->path
, O_RDONLY
);
1620 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1622 s
->should_munmap
= 1;
1625 * Convert from working tree format to canonical git format
1627 strbuf_init(&buf
, 0);
1628 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
)) {
1630 munmap(s
->data
, s
->size
);
1631 s
->should_munmap
= 0;
1632 s
->data
= strbuf_detach(&buf
, &size
);
1638 enum object_type type
;
1640 type
= sha1_object_info(s
->sha1
, &s
->size
);
1642 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1649 void diff_free_filespec_blob(struct diff_filespec
*s
)
1653 else if (s
->should_munmap
)
1654 munmap(s
->data
, s
->size
);
1656 if (s
->should_free
|| s
->should_munmap
) {
1657 s
->should_free
= s
->should_munmap
= 0;
1662 void diff_free_filespec_data(struct diff_filespec
*s
)
1664 diff_free_filespec_blob(s
);
1669 static void prep_temp_blob(struct diff_tempfile
*temp
,
1672 const unsigned char *sha1
,
1677 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1679 die("unable to create temp-file: %s", strerror(errno
));
1680 if (write_in_full(fd
, blob
, size
) != size
)
1681 die("unable to write temp-file");
1683 temp
->name
= temp
->tmp_path
;
1684 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1686 sprintf(temp
->mode
, "%06o", mode
);
1689 static void prepare_temp_file(const char *name
,
1690 struct diff_tempfile
*temp
,
1691 struct diff_filespec
*one
)
1693 if (!DIFF_FILE_VALID(one
)) {
1695 /* A '-' entry produces this for file-2, and
1696 * a '+' entry produces this for file-1.
1698 temp
->name
= "/dev/null";
1699 strcpy(temp
->hex
, ".");
1700 strcpy(temp
->mode
, ".");
1704 if (!one
->sha1_valid
||
1705 reuse_worktree_file(name
, one
->sha1
, 1)) {
1707 if (lstat(name
, &st
) < 0) {
1708 if (errno
== ENOENT
)
1709 goto not_a_valid_file
;
1710 die("stat(%s): %s", name
, strerror(errno
));
1712 if (S_ISLNK(st
.st_mode
)) {
1714 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1715 size_t sz
= xsize_t(st
.st_size
);
1716 if (sizeof(buf
) <= st
.st_size
)
1717 die("symlink too long: %s", name
);
1718 ret
= readlink(name
, buf
, sz
);
1720 die("readlink(%s)", name
);
1721 prep_temp_blob(temp
, buf
, sz
,
1723 one
->sha1
: null_sha1
),
1725 one
->mode
: S_IFLNK
));
1728 /* we can borrow from the file in the work tree */
1730 if (!one
->sha1_valid
)
1731 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1733 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1734 /* Even though we may sometimes borrow the
1735 * contents from the work tree, we always want
1736 * one->mode. mode is trustworthy even when
1737 * !(one->sha1_valid), as long as
1738 * DIFF_FILE_VALID(one).
1740 sprintf(temp
->mode
, "%06o", one
->mode
);
1745 if (diff_populate_filespec(one
, 0))
1746 die("cannot read data blob for %s", one
->path
);
1747 prep_temp_blob(temp
, one
->data
, one
->size
,
1748 one
->sha1
, one
->mode
);
1752 static void remove_tempfile(void)
1756 for (i
= 0; i
< 2; i
++)
1757 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1758 unlink(diff_temp
[i
].name
);
1759 diff_temp
[i
].name
= NULL
;
1763 static void remove_tempfile_on_signal(int signo
)
1766 signal(SIGINT
, SIG_DFL
);
1770 /* An external diff command takes:
1772 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1773 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1776 static void run_external_diff(const char *pgm
,
1779 struct diff_filespec
*one
,
1780 struct diff_filespec
*two
,
1781 const char *xfrm_msg
,
1782 int complete_rewrite
)
1784 const char *spawn_arg
[10];
1785 struct diff_tempfile
*temp
= diff_temp
;
1787 static int atexit_asked
= 0;
1788 const char *othername
;
1789 const char **arg
= &spawn_arg
[0];
1791 othername
= (other
? other
: name
);
1793 prepare_temp_file(name
, &temp
[0], one
);
1794 prepare_temp_file(othername
, &temp
[1], two
);
1795 if (! atexit_asked
&&
1796 (temp
[0].name
== temp
[0].tmp_path
||
1797 temp
[1].name
== temp
[1].tmp_path
)) {
1799 atexit(remove_tempfile
);
1801 signal(SIGINT
, remove_tempfile_on_signal
);
1807 *arg
++ = temp
[0].name
;
1808 *arg
++ = temp
[0].hex
;
1809 *arg
++ = temp
[0].mode
;
1810 *arg
++ = temp
[1].name
;
1811 *arg
++ = temp
[1].hex
;
1812 *arg
++ = temp
[1].mode
;
1823 retval
= run_command_v_opt(spawn_arg
, 0);
1826 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1831 static const char *external_diff_attr(const char *name
)
1833 struct git_attr_check attr_diff_check
;
1838 setup_diff_attr_check(&attr_diff_check
);
1839 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
1840 const char *value
= attr_diff_check
.value
;
1841 if (!ATTR_TRUE(value
) &&
1842 !ATTR_FALSE(value
) &&
1843 !ATTR_UNSET(value
)) {
1844 struct ll_diff_driver
*drv
;
1846 for (drv
= user_diff
; drv
; drv
= drv
->next
)
1847 if (!strcmp(drv
->name
, value
))
1854 static void run_diff_cmd(const char *pgm
,
1857 const char *attr_path
,
1858 struct diff_filespec
*one
,
1859 struct diff_filespec
*two
,
1860 const char *xfrm_msg
,
1861 struct diff_options
*o
,
1862 int complete_rewrite
)
1864 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
1867 const char *cmd
= external_diff_attr(attr_path
);
1873 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
1878 builtin_diff(name
, other
? other
: name
,
1879 one
, two
, xfrm_msg
, o
, complete_rewrite
);
1881 printf("* Unmerged path %s\n", name
);
1884 static void diff_fill_sha1_info(struct diff_filespec
*one
)
1886 if (DIFF_FILE_VALID(one
)) {
1887 if (!one
->sha1_valid
) {
1889 if (!strcmp(one
->path
, "-")) {
1890 hashcpy(one
->sha1
, null_sha1
);
1893 if (lstat(one
->path
, &st
) < 0)
1894 die("stat %s", one
->path
);
1895 if (index_path(one
->sha1
, one
->path
, &st
, 0))
1896 die("cannot hash %s\n", one
->path
);
1903 static int similarity_index(struct diff_filepair
*p
)
1905 return p
->score
* 100 / MAX_SCORE
;
1908 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
1910 /* Strip the prefix but do not molest /dev/null and absolute paths */
1911 if (*namep
&& **namep
!= '/')
1912 *namep
+= prefix_length
;
1913 if (*otherp
&& **otherp
!= '/')
1914 *otherp
+= prefix_length
;
1917 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
1919 const char *pgm
= external_diff();
1922 struct diff_filespec
*one
= p
->one
;
1923 struct diff_filespec
*two
= p
->two
;
1926 const char *attr_path
;
1927 int complete_rewrite
= 0;
1929 name
= p
->one
->path
;
1930 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1932 if (o
->prefix_length
)
1933 strip_prefix(o
->prefix_length
, &name
, &other
);
1935 if (DIFF_PAIR_UNMERGED(p
)) {
1936 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
1937 NULL
, NULL
, NULL
, o
, 0);
1941 diff_fill_sha1_info(one
);
1942 diff_fill_sha1_info(two
);
1944 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
1945 switch (p
->status
) {
1946 case DIFF_STATUS_COPIED
:
1947 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1948 strbuf_addstr(&msg
, "\ncopy from ");
1949 quote_c_style(name
, &msg
, NULL
, 0);
1950 strbuf_addstr(&msg
, "\ncopy to ");
1951 quote_c_style(other
, &msg
, NULL
, 0);
1952 strbuf_addch(&msg
, '\n');
1954 case DIFF_STATUS_RENAMED
:
1955 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1956 strbuf_addstr(&msg
, "\nrename from ");
1957 quote_c_style(name
, &msg
, NULL
, 0);
1958 strbuf_addstr(&msg
, "\nrename to ");
1959 quote_c_style(other
, &msg
, NULL
, 0);
1960 strbuf_addch(&msg
, '\n');
1962 case DIFF_STATUS_MODIFIED
:
1964 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
1965 similarity_index(p
));
1966 complete_rewrite
= 1;
1975 if (hashcmp(one
->sha1
, two
->sha1
)) {
1976 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
1978 if (DIFF_OPT_TST(o
, BINARY
)) {
1980 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
1981 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
1984 strbuf_addf(&msg
, "index %.*s..%.*s",
1985 abbrev
, sha1_to_hex(one
->sha1
),
1986 abbrev
, sha1_to_hex(two
->sha1
));
1987 if (one
->mode
== two
->mode
)
1988 strbuf_addf(&msg
, " %06o", one
->mode
);
1989 strbuf_addch(&msg
, '\n');
1993 strbuf_setlen(&msg
, msg
.len
- 1);
1994 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
1997 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
1998 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
1999 /* a filepair that changes between file and symlink
2000 * needs to be split into deletion and creation.
2002 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2003 run_diff_cmd(NULL
, name
, other
, attr_path
,
2004 one
, null
, xfrm_msg
, o
, 0);
2006 null
= alloc_filespec(one
->path
);
2007 run_diff_cmd(NULL
, name
, other
, attr_path
,
2008 null
, two
, xfrm_msg
, o
, 0);
2012 run_diff_cmd(pgm
, name
, other
, attr_path
,
2013 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2015 strbuf_release(&msg
);
2018 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2019 struct diffstat_t
*diffstat
)
2023 int complete_rewrite
= 0;
2025 if (DIFF_PAIR_UNMERGED(p
)) {
2027 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2031 name
= p
->one
->path
;
2032 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2034 if (o
->prefix_length
)
2035 strip_prefix(o
->prefix_length
, &name
, &other
);
2037 diff_fill_sha1_info(p
->one
);
2038 diff_fill_sha1_info(p
->two
);
2040 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2041 complete_rewrite
= 1;
2042 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2045 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2049 const char *attr_path
;
2051 if (DIFF_PAIR_UNMERGED(p
)) {
2056 name
= p
->one
->path
;
2057 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2058 attr_path
= other
? other
: name
;
2060 if (o
->prefix_length
)
2061 strip_prefix(o
->prefix_length
, &name
, &other
);
2063 diff_fill_sha1_info(p
->one
);
2064 diff_fill_sha1_info(p
->two
);
2066 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2069 void diff_setup(struct diff_options
*options
)
2071 memset(options
, 0, sizeof(*options
));
2072 options
->line_termination
= '\n';
2073 options
->break_opt
= -1;
2074 options
->rename_limit
= -1;
2075 options
->context
= 3;
2076 options
->msg_sep
= "";
2078 options
->change
= diff_change
;
2079 options
->add_remove
= diff_addremove
;
2080 if (diff_use_color_default
)
2081 DIFF_OPT_SET(options
, COLOR_DIFF
);
2083 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2084 options
->detect_rename
= diff_detect_rename_default
;
2086 options
->a_prefix
= "a/";
2087 options
->b_prefix
= "b/";
2090 int diff_setup_done(struct diff_options
*options
)
2094 if (options
->output_format
& DIFF_FORMAT_NAME
)
2096 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2098 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2100 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2103 die("--name-only, --name-status, --check and -s are mutually exclusive");
2105 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2106 options
->detect_rename
= DIFF_DETECT_COPY
;
2108 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2109 options
->prefix
= NULL
;
2110 if (options
->prefix
)
2111 options
->prefix_length
= strlen(options
->prefix
);
2113 options
->prefix_length
= 0;
2115 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2116 DIFF_FORMAT_NAME_STATUS
|
2117 DIFF_FORMAT_CHECKDIFF
|
2118 DIFF_FORMAT_NO_OUTPUT
))
2119 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2120 DIFF_FORMAT_NUMSTAT
|
2121 DIFF_FORMAT_DIFFSTAT
|
2122 DIFF_FORMAT_SHORTSTAT
|
2123 DIFF_FORMAT_SUMMARY
|
2127 * These cases always need recursive; we do not drop caller-supplied
2128 * recursive bits for other formats here.
2130 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2131 DIFF_FORMAT_NUMSTAT
|
2132 DIFF_FORMAT_DIFFSTAT
|
2133 DIFF_FORMAT_SHORTSTAT
|
2134 DIFF_FORMAT_SUMMARY
|
2135 DIFF_FORMAT_CHECKDIFF
))
2136 DIFF_OPT_SET(options
, RECURSIVE
);
2138 * Also pickaxe would not work very well if you do not say recursive
2140 if (options
->pickaxe
)
2141 DIFF_OPT_SET(options
, RECURSIVE
);
2143 if (options
->detect_rename
&& options
->rename_limit
< 0)
2144 options
->rename_limit
= diff_rename_limit_default
;
2145 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2147 /* read-cache does not die even when it fails
2148 * so it is safe for us to do this here. Also
2149 * it does not smudge active_cache or active_nr
2150 * when it fails, so we do not have to worry about
2151 * cleaning it up ourselves either.
2155 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2156 options
->abbrev
= 40; /* full */
2159 * It does not make sense to show the first hit we happened
2160 * to have found. It does not make sense not to return with
2161 * exit code in such a case either.
2163 if (DIFF_OPT_TST(options
, QUIET
)) {
2164 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2165 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2169 * If we postprocess in diffcore, we cannot simply return
2170 * upon the first hit. We need to run diff as usual.
2172 if (options
->pickaxe
|| options
->filter
)
2173 DIFF_OPT_CLR(options
, QUIET
);
2178 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2188 if (c
== arg_short
) {
2192 if (val
&& isdigit(c
)) {
2194 int n
= strtoul(arg
, &end
, 10);
2205 eq
= strchr(arg
, '=');
2210 if (!len
|| strncmp(arg
, arg_long
, len
))
2215 if (!isdigit(*++eq
))
2217 n
= strtoul(eq
, &end
, 10);
2225 static int diff_scoreopt_parse(const char *opt
);
2227 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2229 const char *arg
= av
[0];
2231 /* Output format options */
2232 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2233 options
->output_format
|= DIFF_FORMAT_PATCH
;
2234 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2235 options
->output_format
|= DIFF_FORMAT_PATCH
;
2236 else if (!strcmp(arg
, "--raw"))
2237 options
->output_format
|= DIFF_FORMAT_RAW
;
2238 else if (!strcmp(arg
, "--patch-with-raw"))
2239 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2240 else if (!strcmp(arg
, "--numstat"))
2241 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2242 else if (!strcmp(arg
, "--shortstat"))
2243 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2244 else if (!strcmp(arg
, "--check"))
2245 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2246 else if (!strcmp(arg
, "--summary"))
2247 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2248 else if (!strcmp(arg
, "--patch-with-stat"))
2249 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2250 else if (!strcmp(arg
, "--name-only"))
2251 options
->output_format
|= DIFF_FORMAT_NAME
;
2252 else if (!strcmp(arg
, "--name-status"))
2253 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2254 else if (!strcmp(arg
, "-s"))
2255 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2256 else if (!prefixcmp(arg
, "--stat")) {
2258 int width
= options
->stat_width
;
2259 int name_width
= options
->stat_name_width
;
2265 if (!prefixcmp(arg
, "-width="))
2266 width
= strtoul(arg
+ 7, &end
, 10);
2267 else if (!prefixcmp(arg
, "-name-width="))
2268 name_width
= strtoul(arg
+ 12, &end
, 10);
2271 width
= strtoul(arg
+1, &end
, 10);
2273 name_width
= strtoul(end
+1, &end
, 10);
2276 /* Important! This checks all the error cases! */
2279 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2280 options
->stat_name_width
= name_width
;
2281 options
->stat_width
= width
;
2284 /* renames options */
2285 else if (!prefixcmp(arg
, "-B")) {
2286 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2289 else if (!prefixcmp(arg
, "-M")) {
2290 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2292 options
->detect_rename
= DIFF_DETECT_RENAME
;
2294 else if (!prefixcmp(arg
, "-C")) {
2295 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2296 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2297 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2299 options
->detect_rename
= DIFF_DETECT_COPY
;
2301 else if (!strcmp(arg
, "--no-renames"))
2302 options
->detect_rename
= 0;
2303 else if (!strcmp(arg
, "--relative"))
2304 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2305 else if (!prefixcmp(arg
, "--relative=")) {
2306 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2307 options
->prefix
= arg
+ 11;
2311 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2312 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2313 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2314 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2315 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2316 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2319 else if (!strcmp(arg
, "--binary")) {
2320 options
->output_format
|= DIFF_FORMAT_PATCH
;
2321 DIFF_OPT_SET(options
, BINARY
);
2323 else if (!strcmp(arg
, "--full-index"))
2324 DIFF_OPT_SET(options
, FULL_INDEX
);
2325 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2326 DIFF_OPT_SET(options
, TEXT
);
2327 else if (!strcmp(arg
, "-R"))
2328 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2329 else if (!strcmp(arg
, "--find-copies-harder"))
2330 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2331 else if (!strcmp(arg
, "--follow"))
2332 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2333 else if (!strcmp(arg
, "--color"))
2334 DIFF_OPT_SET(options
, COLOR_DIFF
);
2335 else if (!strcmp(arg
, "--no-color"))
2336 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2337 else if (!strcmp(arg
, "--color-words"))
2338 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2339 else if (!strcmp(arg
, "--exit-code"))
2340 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2341 else if (!strcmp(arg
, "--quiet"))
2342 DIFF_OPT_SET(options
, QUIET
);
2343 else if (!strcmp(arg
, "--ext-diff"))
2344 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2345 else if (!strcmp(arg
, "--no-ext-diff"))
2346 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2349 else if (!strcmp(arg
, "-z"))
2350 options
->line_termination
= 0;
2351 else if (!prefixcmp(arg
, "-l"))
2352 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2353 else if (!prefixcmp(arg
, "-S"))
2354 options
->pickaxe
= arg
+ 2;
2355 else if (!strcmp(arg
, "--pickaxe-all"))
2356 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2357 else if (!strcmp(arg
, "--pickaxe-regex"))
2358 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2359 else if (!prefixcmp(arg
, "-O"))
2360 options
->orderfile
= arg
+ 2;
2361 else if (!prefixcmp(arg
, "--diff-filter="))
2362 options
->filter
= arg
+ 14;
2363 else if (!strcmp(arg
, "--abbrev"))
2364 options
->abbrev
= DEFAULT_ABBREV
;
2365 else if (!prefixcmp(arg
, "--abbrev=")) {
2366 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2367 if (options
->abbrev
< MINIMUM_ABBREV
)
2368 options
->abbrev
= MINIMUM_ABBREV
;
2369 else if (40 < options
->abbrev
)
2370 options
->abbrev
= 40;
2372 else if (!prefixcmp(arg
, "--src-prefix="))
2373 options
->a_prefix
= arg
+ 13;
2374 else if (!prefixcmp(arg
, "--dst-prefix="))
2375 options
->b_prefix
= arg
+ 13;
2376 else if (!strcmp(arg
, "--no-prefix"))
2377 options
->a_prefix
= options
->b_prefix
= "";
2383 static int parse_num(const char **cp_p
)
2385 unsigned long num
, scale
;
2387 const char *cp
= *cp_p
;
2394 if ( !dot
&& ch
== '.' ) {
2397 } else if ( ch
== '%' ) {
2398 scale
= dot
? scale
*100 : 100;
2399 cp
++; /* % is always at the end */
2401 } else if ( ch
>= '0' && ch
<= '9' ) {
2402 if ( scale
< 100000 ) {
2404 num
= (num
*10) + (ch
-'0');
2413 /* user says num divided by scale and we say internally that
2414 * is MAX_SCORE * num / scale.
2416 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2419 static int diff_scoreopt_parse(const char *opt
)
2421 int opt1
, opt2
, cmd
;
2426 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2427 return -1; /* that is not a -M, -C nor -B option */
2429 opt1
= parse_num(&opt
);
2435 else if (*opt
!= '/')
2436 return -1; /* we expect -B80/99 or -B80 */
2439 opt2
= parse_num(&opt
);
2444 return opt1
| (opt2
<< 16);
2447 struct diff_queue_struct diff_queued_diff
;
2449 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2451 if (queue
->alloc
<= queue
->nr
) {
2452 queue
->alloc
= alloc_nr(queue
->alloc
);
2453 queue
->queue
= xrealloc(queue
->queue
,
2454 sizeof(dp
) * queue
->alloc
);
2456 queue
->queue
[queue
->nr
++] = dp
;
2459 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2460 struct diff_filespec
*one
,
2461 struct diff_filespec
*two
)
2463 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2471 void diff_free_filepair(struct diff_filepair
*p
)
2473 free_filespec(p
->one
);
2474 free_filespec(p
->two
);
2478 /* This is different from find_unique_abbrev() in that
2479 * it stuffs the result with dots for alignment.
2481 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2486 return sha1_to_hex(sha1
);
2488 abbrev
= find_unique_abbrev(sha1
, len
);
2490 return sha1_to_hex(sha1
);
2491 abblen
= strlen(abbrev
);
2493 static char hex
[41];
2494 if (len
< abblen
&& abblen
<= len
+ 2)
2495 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2497 sprintf(hex
, "%s...", abbrev
);
2500 return sha1_to_hex(sha1
);
2503 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2505 int line_termination
= opt
->line_termination
;
2506 int inter_name_termination
= line_termination
? '\t' : '\0';
2508 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2509 printf(":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2510 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2511 printf("%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2514 printf("%c%03d%c", p
->status
, similarity_index(p
),
2515 inter_name_termination
);
2517 printf("%c%c", p
->status
, inter_name_termination
);
2520 if (p
->status
== DIFF_STATUS_COPIED
||
2521 p
->status
== DIFF_STATUS_RENAMED
) {
2522 const char *name_a
, *name_b
;
2523 name_a
= p
->one
->path
;
2524 name_b
= p
->two
->path
;
2525 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2526 write_name_quoted(name_a
, stdout
, inter_name_termination
);
2527 write_name_quoted(name_b
, stdout
, line_termination
);
2529 const char *name_a
, *name_b
;
2530 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2532 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2533 write_name_quoted(name_a
, stdout
, line_termination
);
2537 int diff_unmodified_pair(struct diff_filepair
*p
)
2539 /* This function is written stricter than necessary to support
2540 * the currently implemented transformers, but the idea is to
2541 * let transformers to produce diff_filepairs any way they want,
2542 * and filter and clean them up here before producing the output.
2544 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2546 if (DIFF_PAIR_UNMERGED(p
))
2547 return 0; /* unmerged is interesting */
2549 /* deletion, addition, mode or type change
2550 * and rename are all interesting.
2552 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2553 DIFF_PAIR_MODE_CHANGED(p
) ||
2554 strcmp(one
->path
, two
->path
))
2557 /* both are valid and point at the same path. that is, we are
2558 * dealing with a change.
2560 if (one
->sha1_valid
&& two
->sha1_valid
&&
2561 !hashcmp(one
->sha1
, two
->sha1
))
2562 return 1; /* no change */
2563 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2564 return 1; /* both look at the same file on the filesystem. */
2568 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2570 if (diff_unmodified_pair(p
))
2573 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2574 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2575 return; /* no tree diffs in patch format */
2580 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2581 struct diffstat_t
*diffstat
)
2583 if (diff_unmodified_pair(p
))
2586 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2587 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2588 return; /* no tree diffs in patch format */
2590 run_diffstat(p
, o
, diffstat
);
2593 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2594 struct diff_options
*o
)
2596 if (diff_unmodified_pair(p
))
2599 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2600 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2601 return; /* no tree diffs in patch format */
2603 run_checkdiff(p
, o
);
2606 int diff_queue_is_empty(void)
2608 struct diff_queue_struct
*q
= &diff_queued_diff
;
2610 for (i
= 0; i
< q
->nr
; i
++)
2611 if (!diff_unmodified_pair(q
->queue
[i
]))
2617 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2619 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2622 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2624 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2625 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2627 s
->size
, s
->xfrm_flags
);
2630 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2632 diff_debug_filespec(p
->one
, i
, "one");
2633 diff_debug_filespec(p
->two
, i
, "two");
2634 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2635 p
->score
, p
->status
? p
->status
: '?',
2636 p
->one
->rename_used
, p
->broken_pair
);
2639 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2643 fprintf(stderr
, "%s\n", msg
);
2644 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2645 for (i
= 0; i
< q
->nr
; i
++) {
2646 struct diff_filepair
*p
= q
->queue
[i
];
2647 diff_debug_filepair(p
, i
);
2652 static void diff_resolve_rename_copy(void)
2655 struct diff_filepair
*p
;
2656 struct diff_queue_struct
*q
= &diff_queued_diff
;
2658 diff_debug_queue("resolve-rename-copy", q
);
2660 for (i
= 0; i
< q
->nr
; i
++) {
2662 p
->status
= 0; /* undecided */
2663 if (DIFF_PAIR_UNMERGED(p
))
2664 p
->status
= DIFF_STATUS_UNMERGED
;
2665 else if (!DIFF_FILE_VALID(p
->one
))
2666 p
->status
= DIFF_STATUS_ADDED
;
2667 else if (!DIFF_FILE_VALID(p
->two
))
2668 p
->status
= DIFF_STATUS_DELETED
;
2669 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2670 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2672 /* from this point on, we are dealing with a pair
2673 * whose both sides are valid and of the same type, i.e.
2674 * either in-place edit or rename/copy edit.
2676 else if (DIFF_PAIR_RENAME(p
)) {
2678 * A rename might have re-connected a broken
2679 * pair up, causing the pathnames to be the
2680 * same again. If so, that's not a rename at
2681 * all, just a modification..
2683 * Otherwise, see if this source was used for
2684 * multiple renames, in which case we decrement
2685 * the count, and call it a copy.
2687 if (!strcmp(p
->one
->path
, p
->two
->path
))
2688 p
->status
= DIFF_STATUS_MODIFIED
;
2689 else if (--p
->one
->rename_used
> 0)
2690 p
->status
= DIFF_STATUS_COPIED
;
2692 p
->status
= DIFF_STATUS_RENAMED
;
2694 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2695 p
->one
->mode
!= p
->two
->mode
||
2696 is_null_sha1(p
->one
->sha1
))
2697 p
->status
= DIFF_STATUS_MODIFIED
;
2699 /* This is a "no-change" entry and should not
2700 * happen anymore, but prepare for broken callers.
2702 error("feeding unmodified %s to diffcore",
2704 p
->status
= DIFF_STATUS_UNKNOWN
;
2707 diff_debug_queue("resolve-rename-copy done", q
);
2710 static int check_pair_status(struct diff_filepair
*p
)
2712 switch (p
->status
) {
2713 case DIFF_STATUS_UNKNOWN
:
2716 die("internal error in diff-resolve-rename-copy");
2722 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2724 int fmt
= opt
->output_format
;
2726 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2727 diff_flush_checkdiff(p
, opt
);
2728 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2729 diff_flush_raw(p
, opt
);
2730 else if (fmt
& DIFF_FORMAT_NAME
) {
2731 const char *name_a
, *name_b
;
2732 name_a
= p
->two
->path
;
2734 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2735 write_name_quoted(name_a
, stdout
, opt
->line_termination
);
2739 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2742 printf(" %s mode %06o ", newdelete
, fs
->mode
);
2744 printf(" %s ", newdelete
);
2745 write_name_quoted(fs
->path
, stdout
, '\n');
2749 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2751 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2752 printf(" mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2753 show_name
? ' ' : '\n');
2755 write_name_quoted(p
->two
->path
, stdout
, '\n');
2760 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2762 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2764 printf(" %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2766 show_mode_change(p
, 0);
2769 static void diff_summary(struct diff_filepair
*p
)
2772 case DIFF_STATUS_DELETED
:
2773 show_file_mode_name("delete", p
->one
);
2775 case DIFF_STATUS_ADDED
:
2776 show_file_mode_name("create", p
->two
);
2778 case DIFF_STATUS_COPIED
:
2779 show_rename_copy("copy", p
);
2781 case DIFF_STATUS_RENAMED
:
2782 show_rename_copy("rename", p
);
2786 fputs(" rewrite ", stdout
);
2787 write_name_quoted(p
->two
->path
, stdout
, ' ');
2788 printf("(%d%%)\n", similarity_index(p
));
2790 show_mode_change(p
, !p
->score
);
2796 struct xdiff_emit_state xm
;
2801 static int remove_space(char *line
, int len
)
2807 for (i
= 0; i
< len
; i
++)
2808 if (!isspace((c
= line
[i
])))
2814 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2816 struct patch_id_t
*data
= priv
;
2819 /* Ignore line numbers when computing the SHA1 of the patch */
2820 if (!prefixcmp(line
, "@@ -"))
2823 new_len
= remove_space(line
, len
);
2825 SHA1_Update(data
->ctx
, line
, new_len
);
2826 data
->patchlen
+= new_len
;
2829 /* returns 0 upon success, and writes result into sha1 */
2830 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2832 struct diff_queue_struct
*q
= &diff_queued_diff
;
2835 struct patch_id_t data
;
2836 char buffer
[PATH_MAX
* 4 + 20];
2839 memset(&data
, 0, sizeof(struct patch_id_t
));
2841 data
.xm
.consume
= patch_id_consume
;
2843 for (i
= 0; i
< q
->nr
; i
++) {
2848 struct diff_filepair
*p
= q
->queue
[i
];
2851 memset(&xecfg
, 0, sizeof(xecfg
));
2853 return error("internal diff status error");
2854 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2856 if (diff_unmodified_pair(p
))
2858 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2859 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2861 if (DIFF_PAIR_UNMERGED(p
))
2864 diff_fill_sha1_info(p
->one
);
2865 diff_fill_sha1_info(p
->two
);
2866 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2867 fill_mmfile(&mf2
, p
->two
) < 0)
2868 return error("unable to read files to diff");
2870 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2871 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2872 if (p
->one
->mode
== 0)
2873 len1
= snprintf(buffer
, sizeof(buffer
),
2874 "diff--gita/%.*sb/%.*s"
2881 len2
, p
->two
->path
);
2882 else if (p
->two
->mode
== 0)
2883 len1
= snprintf(buffer
, sizeof(buffer
),
2884 "diff--gita/%.*sb/%.*s"
2885 "deletedfilemode%06o"
2891 len1
, p
->one
->path
);
2893 len1
= snprintf(buffer
, sizeof(buffer
),
2894 "diff--gita/%.*sb/%.*s"
2900 len2
, p
->two
->path
);
2901 SHA1_Update(&ctx
, buffer
, len1
);
2903 xpp
.flags
= XDF_NEED_MINIMAL
;
2905 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2906 ecb
.outf
= xdiff_outf
;
2908 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2911 SHA1_Final(sha1
, &ctx
);
2915 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2917 struct diff_queue_struct
*q
= &diff_queued_diff
;
2919 int result
= diff_get_patch_id(options
, sha1
);
2921 for (i
= 0; i
< q
->nr
; i
++)
2922 diff_free_filepair(q
->queue
[i
]);
2926 q
->nr
= q
->alloc
= 0;
2931 static int is_summary_empty(const struct diff_queue_struct
*q
)
2935 for (i
= 0; i
< q
->nr
; i
++) {
2936 const struct diff_filepair
*p
= q
->queue
[i
];
2938 switch (p
->status
) {
2939 case DIFF_STATUS_DELETED
:
2940 case DIFF_STATUS_ADDED
:
2941 case DIFF_STATUS_COPIED
:
2942 case DIFF_STATUS_RENAMED
:
2947 if (p
->one
->mode
&& p
->two
->mode
&&
2948 p
->one
->mode
!= p
->two
->mode
)
2956 void diff_flush(struct diff_options
*options
)
2958 struct diff_queue_struct
*q
= &diff_queued_diff
;
2959 int i
, output_format
= options
->output_format
;
2963 * Order: raw, stat, summary, patch
2964 * or: name/name-status/checkdiff (other bits clear)
2969 if (output_format
& (DIFF_FORMAT_RAW
|
2971 DIFF_FORMAT_NAME_STATUS
|
2972 DIFF_FORMAT_CHECKDIFF
)) {
2973 for (i
= 0; i
< q
->nr
; i
++) {
2974 struct diff_filepair
*p
= q
->queue
[i
];
2975 if (check_pair_status(p
))
2976 flush_one_pair(p
, options
);
2981 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
2982 struct diffstat_t diffstat
;
2984 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
2985 diffstat
.xm
.consume
= diffstat_consume
;
2986 for (i
= 0; i
< q
->nr
; i
++) {
2987 struct diff_filepair
*p
= q
->queue
[i
];
2988 if (check_pair_status(p
))
2989 diff_flush_stat(p
, options
, &diffstat
);
2991 if (output_format
& DIFF_FORMAT_NUMSTAT
)
2992 show_numstat(&diffstat
, options
);
2993 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
2994 show_stats(&diffstat
, options
);
2995 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
2996 show_shortstats(&diffstat
);
2997 free_diffstat_info(&diffstat
);
3001 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3002 for (i
= 0; i
< q
->nr
; i
++)
3003 diff_summary(q
->queue
[i
]);
3007 if (output_format
& DIFF_FORMAT_PATCH
) {
3009 if (options
->stat_sep
) {
3010 /* attach patch instead of inline */
3011 fputs(options
->stat_sep
, stdout
);
3013 putchar(options
->line_termination
);
3017 for (i
= 0; i
< q
->nr
; i
++) {
3018 struct diff_filepair
*p
= q
->queue
[i
];
3019 if (check_pair_status(p
))
3020 diff_flush_patch(p
, options
);
3024 if (output_format
& DIFF_FORMAT_CALLBACK
)
3025 options
->format_callback(q
, options
, options
->format_callback_data
);
3027 for (i
= 0; i
< q
->nr
; i
++)
3028 diff_free_filepair(q
->queue
[i
]);
3032 q
->nr
= q
->alloc
= 0;
3035 static void diffcore_apply_filter(const char *filter
)
3038 struct diff_queue_struct
*q
= &diff_queued_diff
;
3039 struct diff_queue_struct outq
;
3041 outq
.nr
= outq
.alloc
= 0;
3046 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3048 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3049 struct diff_filepair
*p
= q
->queue
[i
];
3050 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3052 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3054 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3055 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3056 strchr(filter
, p
->status
)))
3062 /* otherwise we will clear the whole queue
3063 * by copying the empty outq at the end of this
3064 * function, but first clear the current entries
3067 for (i
= 0; i
< q
->nr
; i
++)
3068 diff_free_filepair(q
->queue
[i
]);
3071 /* Only the matching ones */
3072 for (i
= 0; i
< q
->nr
; i
++) {
3073 struct diff_filepair
*p
= q
->queue
[i
];
3075 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3077 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3079 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3080 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3081 strchr(filter
, p
->status
)))
3084 diff_free_filepair(p
);
3091 /* Check whether two filespecs with the same mode and size are identical */
3092 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3093 struct diff_filespec
*two
)
3095 if (S_ISGITLINK(one
->mode
)) {
3096 diff_fill_sha1_info(one
);
3097 diff_fill_sha1_info(two
);
3098 return !hashcmp(one
->sha1
, two
->sha1
);
3100 if (diff_populate_filespec(one
, 0))
3102 if (diff_populate_filespec(two
, 0))
3104 return !memcmp(one
->data
, two
->data
, one
->size
);
3107 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3110 struct diff_queue_struct
*q
= &diff_queued_diff
;
3111 struct diff_queue_struct outq
;
3113 outq
.nr
= outq
.alloc
= 0;
3115 for (i
= 0; i
< q
->nr
; i
++) {
3116 struct diff_filepair
*p
= q
->queue
[i
];
3119 * 1. Entries that come from stat info dirtyness
3120 * always have both sides (iow, not create/delete),
3121 * one side of the object name is unknown, with
3122 * the same mode and size. Keep the ones that
3123 * do not match these criteria. They have real
3126 * 2. At this point, the file is known to be modified,
3127 * with the same mode and size, and the object
3128 * name of one side is unknown. Need to inspect
3129 * the identical contents.
3131 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3132 !DIFF_FILE_VALID(p
->two
) ||
3133 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3134 (p
->one
->mode
!= p
->two
->mode
) ||
3135 diff_populate_filespec(p
->one
, 1) ||
3136 diff_populate_filespec(p
->two
, 1) ||
3137 (p
->one
->size
!= p
->two
->size
) ||
3138 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3142 * The caller can subtract 1 from skip_stat_unmatch
3143 * to determine how many paths were dirty only
3144 * due to stat info mismatch.
3146 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3147 diffopt
->skip_stat_unmatch
++;
3148 diff_free_filepair(p
);
3155 void diffcore_std(struct diff_options
*options
)
3157 if (DIFF_OPT_TST(options
, QUIET
))
3160 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3161 diffcore_skip_stat_unmatch(options
);
3162 if (options
->break_opt
!= -1)
3163 diffcore_break(options
->break_opt
);
3164 if (options
->detect_rename
)
3165 diffcore_rename(options
);
3166 if (options
->break_opt
!= -1)
3167 diffcore_merge_broken();
3168 if (options
->pickaxe
)
3169 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3170 if (options
->orderfile
)
3171 diffcore_order(options
->orderfile
);
3172 diff_resolve_rename_copy();
3173 diffcore_apply_filter(options
->filter
);
3175 if (diff_queued_diff
.nr
)
3176 DIFF_OPT_SET(options
, HAS_CHANGES
);
3178 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3181 int diff_result_code(struct diff_options
*opt
, int status
)
3184 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3185 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3187 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3188 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3190 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3191 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3196 void diff_addremove(struct diff_options
*options
,
3197 int addremove
, unsigned mode
,
3198 const unsigned char *sha1
,
3199 const char *base
, const char *path
)
3201 char concatpath
[PATH_MAX
];
3202 struct diff_filespec
*one
, *two
;
3204 /* This may look odd, but it is a preparation for
3205 * feeding "there are unchanged files which should
3206 * not produce diffs, but when you are doing copy
3207 * detection you would need them, so here they are"
3208 * entries to the diff-core. They will be prefixed
3209 * with something like '=' or '*' (I haven't decided
3210 * which but should not make any difference).
3211 * Feeding the same new and old to diff_change()
3212 * also has the same effect.
3213 * Before the final output happens, they are pruned after
3214 * merged into rename/copy pairs as appropriate.
3216 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3217 addremove
= (addremove
== '+' ? '-' :
3218 addremove
== '-' ? '+' : addremove
);
3220 if (!path
) path
= "";
3221 sprintf(concatpath
, "%s%s", base
, path
);
3223 if (options
->prefix
&&
3224 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3227 one
= alloc_filespec(concatpath
);
3228 two
= alloc_filespec(concatpath
);
3230 if (addremove
!= '+')
3231 fill_filespec(one
, sha1
, mode
);
3232 if (addremove
!= '-')
3233 fill_filespec(two
, sha1
, mode
);
3235 diff_queue(&diff_queued_diff
, one
, two
);
3236 DIFF_OPT_SET(options
, HAS_CHANGES
);
3239 void diff_change(struct diff_options
*options
,
3240 unsigned old_mode
, unsigned new_mode
,
3241 const unsigned char *old_sha1
,
3242 const unsigned char *new_sha1
,
3243 const char *base
, const char *path
)
3245 char concatpath
[PATH_MAX
];
3246 struct diff_filespec
*one
, *two
;
3248 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3250 const unsigned char *tmp_c
;
3251 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3252 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3254 if (!path
) path
= "";
3255 sprintf(concatpath
, "%s%s", base
, path
);
3257 if (options
->prefix
&&
3258 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3261 one
= alloc_filespec(concatpath
);
3262 two
= alloc_filespec(concatpath
);
3263 fill_filespec(one
, old_sha1
, old_mode
);
3264 fill_filespec(two
, new_sha1
, new_mode
);
3266 diff_queue(&diff_queued_diff
, one
, two
);
3267 DIFF_OPT_SET(options
, HAS_CHANGES
);
3270 void diff_unmerge(struct diff_options
*options
,
3272 unsigned mode
, const unsigned char *sha1
)
3274 struct diff_filespec
*one
, *two
;
3276 if (options
->prefix
&&
3277 strncmp(path
, options
->prefix
, options
->prefix_length
))
3280 one
= alloc_filespec(path
);
3281 two
= alloc_filespec(path
);
3282 fill_filespec(one
, sha1
, mode
);
3283 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;