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 config_error_nonbool(var
);
91 drv
->cmd
= xstrdup(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")) {
162 return config_error_nonbool(var
);
163 external_diff_cmd_cfg
= xstrdup(value
);
166 if (!prefixcmp(var
, "diff.")) {
167 const char *ep
= strrchr(var
, '.');
169 if (ep
!= var
+ 4 && !strcmp(ep
, ".command"))
170 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);
181 return config_error_nonbool(var
);
182 color_parse(value
, var
, diff_colors
[slot
]);
186 if (!prefixcmp(var
, "diff.")) {
187 const char *ep
= strrchr(var
, '.');
189 if (!strcmp(ep
, ".funcname")) {
191 return config_error_nonbool(var
);
192 return parse_funcname_pattern(var
, ep
, value
);
197 return git_default_config(var
, value
);
200 static char *quote_two(const char *one
, const char *two
)
202 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
203 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
206 strbuf_init(&res
, 0);
207 if (need_one
+ need_two
) {
208 strbuf_addch(&res
, '"');
209 quote_c_style(one
, &res
, NULL
, 1);
210 quote_c_style(two
, &res
, NULL
, 1);
211 strbuf_addch(&res
, '"');
213 strbuf_addstr(&res
, one
);
214 strbuf_addstr(&res
, two
);
216 return strbuf_detach(&res
, NULL
);
219 static const char *external_diff(void)
221 static const char *external_diff_cmd
= NULL
;
222 static int done_preparing
= 0;
225 return external_diff_cmd
;
226 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
227 if (!external_diff_cmd
)
228 external_diff_cmd
= external_diff_cmd_cfg
;
230 return external_diff_cmd
;
233 static struct diff_tempfile
{
234 const char *name
; /* filename external diff should read from */
237 char tmp_path
[PATH_MAX
];
240 static int count_lines(const char *data
, int size
)
242 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
249 completely_empty
= 0;
253 completely_empty
= 0;
256 if (completely_empty
)
259 count
++; /* no trailing newline */
263 static void print_line_count(int count
)
273 printf("1,%d", count
);
278 static void copy_file(int prefix
, const char *data
, int size
,
279 const char *set
, const char *reset
)
281 int ch
, nl_just_seen
= 1;
290 fputs(reset
, stdout
);
296 printf("%s\n\\ No newline at end of file\n", reset
);
299 static void emit_rewrite_diff(const char *name_a
,
301 struct diff_filespec
*one
,
302 struct diff_filespec
*two
,
303 struct diff_options
*o
)
306 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
307 const char *name_a_tab
, *name_b_tab
;
308 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
309 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
310 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
311 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
312 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
313 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
315 name_a
+= (*name_a
== '/');
316 name_b
+= (*name_b
== '/');
317 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
318 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
320 strbuf_reset(&a_name
);
321 strbuf_reset(&b_name
);
322 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
323 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
325 diff_populate_filespec(one
, 0);
326 diff_populate_filespec(two
, 0);
327 lc_a
= count_lines(one
->data
, one
->size
);
328 lc_b
= count_lines(two
->data
, two
->size
);
329 printf("%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
330 metainfo
, a_name
.buf
, name_a_tab
, reset
,
331 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
332 print_line_count(lc_a
);
334 print_line_count(lc_b
);
335 printf(" @@%s\n", reset
);
337 copy_file('-', one
->data
, one
->size
, old
, reset
);
339 copy_file('+', two
->data
, two
->size
, new, reset
);
342 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
344 if (!DIFF_FILE_VALID(one
)) {
345 mf
->ptr
= (char *)""; /* does not matter */
349 else if (diff_populate_filespec(one
, 0))
352 mf
->size
= one
->size
;
356 struct diff_words_buffer
{
359 long current
; /* output pointer */
360 int suppressed_newline
;
363 static void diff_words_append(char *line
, unsigned long len
,
364 struct diff_words_buffer
*buffer
)
366 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
367 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
368 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
372 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
373 buffer
->text
.size
+= len
;
376 struct diff_words_data
{
377 struct xdiff_emit_state xm
;
378 struct diff_words_buffer minus
, plus
;
381 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
382 int suppress_newline
)
390 ptr
= buffer
->text
.ptr
+ buffer
->current
;
391 buffer
->current
+= len
;
393 if (ptr
[len
- 1] == '\n') {
398 fputs(diff_get_color(1, color
), stdout
);
399 fwrite(ptr
, len
, 1, stdout
);
400 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
403 if (suppress_newline
)
404 buffer
->suppressed_newline
= 1;
410 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
412 struct diff_words_data
*diff_words
= priv
;
414 if (diff_words
->minus
.suppressed_newline
) {
417 diff_words
->minus
.suppressed_newline
= 0;
423 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
426 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
429 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
430 diff_words
->minus
.current
+= len
;
435 /* this executes the word diff on the accumulated buffers */
436 static void diff_words_show(struct diff_words_data
*diff_words
)
441 mmfile_t minus
, plus
;
444 memset(&xecfg
, 0, sizeof(xecfg
));
445 minus
.size
= diff_words
->minus
.text
.size
;
446 minus
.ptr
= xmalloc(minus
.size
);
447 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
448 for (i
= 0; i
< minus
.size
; i
++)
449 if (isspace(minus
.ptr
[i
]))
451 diff_words
->minus
.current
= 0;
453 plus
.size
= diff_words
->plus
.text
.size
;
454 plus
.ptr
= xmalloc(plus
.size
);
455 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
456 for (i
= 0; i
< plus
.size
; i
++)
457 if (isspace(plus
.ptr
[i
]))
459 diff_words
->plus
.current
= 0;
461 xpp
.flags
= XDF_NEED_MINIMAL
;
462 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
463 ecb
.outf
= xdiff_outf
;
464 ecb
.priv
= diff_words
;
465 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
466 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
470 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
472 if (diff_words
->minus
.suppressed_newline
) {
474 diff_words
->minus
.suppressed_newline
= 0;
478 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
480 struct emit_callback
{
481 struct xdiff_emit_state xm
;
482 int nparents
, color_diff
;
484 sane_truncate_fn truncate
;
485 const char **label_path
;
486 struct diff_words_data
*diff_words
;
490 static void free_diff_words_data(struct emit_callback
*ecbdata
)
492 if (ecbdata
->diff_words
) {
494 if (ecbdata
->diff_words
->minus
.text
.size
||
495 ecbdata
->diff_words
->plus
.text
.size
)
496 diff_words_show(ecbdata
->diff_words
);
498 if (ecbdata
->diff_words
->minus
.text
.ptr
)
499 free (ecbdata
->diff_words
->minus
.text
.ptr
);
500 if (ecbdata
->diff_words
->plus
.text
.ptr
)
501 free (ecbdata
->diff_words
->plus
.text
.ptr
);
502 free(ecbdata
->diff_words
);
503 ecbdata
->diff_words
= NULL
;
507 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
510 return diff_colors
[ix
];
514 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
517 fwrite(line
, len
, 1, stdout
);
518 fputs(reset
, stdout
);
521 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
523 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
524 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
527 emit_line(set
, reset
, line
, len
);
529 /* Emit just the prefix, then the rest. */
530 emit_line(set
, reset
, line
, ecbdata
->nparents
);
531 (void)check_and_emit_line(line
+ ecbdata
->nparents
,
532 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
533 stdout
, set
, reset
, ws
);
537 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
544 return ecb
->truncate(line
, len
);
548 (void) utf8_width(&cp
, &l
);
550 break; /* truncated in the middle? */
555 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
559 struct emit_callback
*ecbdata
= priv
;
560 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
561 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
562 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
564 *(ecbdata
->found_changesp
) = 1;
566 if (ecbdata
->label_path
[0]) {
567 const char *name_a_tab
, *name_b_tab
;
569 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
570 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
572 printf("%s--- %s%s%s\n",
573 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
574 printf("%s+++ %s%s%s\n",
575 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
576 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
579 /* This is not really necessary for now because
580 * this codepath only deals with two-way diffs.
582 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
584 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
585 ecbdata
->nparents
= i
- 1;
586 len
= sane_truncate_line(ecbdata
, line
, len
);
587 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
589 if (line
[len
-1] != '\n')
594 if (len
< ecbdata
->nparents
) {
595 emit_line(reset
, reset
, line
, len
);
600 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
601 /* fall back to normal diff */
602 free_diff_words_data(ecbdata
);
603 if (ecbdata
->diff_words
) {
604 if (line
[0] == '-') {
605 diff_words_append(line
, len
,
606 &ecbdata
->diff_words
->minus
);
608 } else if (line
[0] == '+') {
609 diff_words_append(line
, len
,
610 &ecbdata
->diff_words
->plus
);
613 if (ecbdata
->diff_words
->minus
.text
.size
||
614 ecbdata
->diff_words
->plus
.text
.size
)
615 diff_words_show(ecbdata
->diff_words
);
618 emit_line(plain
, reset
, line
, len
);
621 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
623 color
= DIFF_FILE_OLD
;
624 else if (line
[i
] == '+')
625 color
= DIFF_FILE_NEW
;
628 if (color
!= DIFF_FILE_NEW
) {
629 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
633 emit_add_line(reset
, ecbdata
, line
, len
);
636 static char *pprint_rename(const char *a
, const char *b
)
641 int pfx_length
, sfx_length
;
642 int len_a
= strlen(a
);
643 int len_b
= strlen(b
);
644 int a_midlen
, b_midlen
;
645 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
646 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
648 strbuf_init(&name
, 0);
649 if (qlen_a
|| qlen_b
) {
650 quote_c_style(a
, &name
, NULL
, 0);
651 strbuf_addstr(&name
, " => ");
652 quote_c_style(b
, &name
, NULL
, 0);
653 return strbuf_detach(&name
, NULL
);
656 /* Find common prefix */
658 while (*old
&& *new && *old
== *new) {
660 pfx_length
= old
- a
+ 1;
665 /* Find common suffix */
669 while (a
<= old
&& b
<= new && *old
== *new) {
671 sfx_length
= len_a
- (old
- a
);
677 * pfx{mid-a => mid-b}sfx
678 * {pfx-a => pfx-b}sfx
679 * pfx{sfx-a => sfx-b}
682 a_midlen
= len_a
- pfx_length
- sfx_length
;
683 b_midlen
= len_b
- pfx_length
- sfx_length
;
689 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
690 if (pfx_length
+ sfx_length
) {
691 strbuf_add(&name
, a
, pfx_length
);
692 strbuf_addch(&name
, '{');
694 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
695 strbuf_addstr(&name
, " => ");
696 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
697 if (pfx_length
+ sfx_length
) {
698 strbuf_addch(&name
, '}');
699 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
701 return strbuf_detach(&name
, NULL
);
705 struct xdiff_emit_state xm
;
709 struct diffstat_file
{
713 unsigned is_unmerged
:1;
714 unsigned is_binary
:1;
715 unsigned is_renamed
:1;
716 unsigned int added
, deleted
;
720 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
724 struct diffstat_file
*x
;
725 x
= xcalloc(sizeof (*x
), 1);
726 if (diffstat
->nr
== diffstat
->alloc
) {
727 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
728 diffstat
->files
= xrealloc(diffstat
->files
,
729 diffstat
->alloc
* sizeof(x
));
731 diffstat
->files
[diffstat
->nr
++] = x
;
733 x
->from_name
= xstrdup(name_a
);
734 x
->name
= xstrdup(name_b
);
739 x
->name
= xstrdup(name_a
);
744 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
746 struct diffstat_t
*diffstat
= priv
;
747 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
751 else if (line
[0] == '-')
755 const char mime_boundary_leader
[] = "------------";
757 static int scale_linear(int it
, int width
, int max_change
)
760 * make sure that at least one '-' is printed if there were deletions,
761 * and likewise for '+'.
765 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
768 static void show_name(const char *prefix
, const char *name
, int len
,
769 const char *reset
, const char *set
)
771 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
774 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
784 static void fill_print_name(struct diffstat_file
*file
)
788 if (file
->print_name
)
791 if (!file
->is_renamed
) {
793 strbuf_init(&buf
, 0);
794 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
795 pname
= strbuf_detach(&buf
, NULL
);
798 strbuf_release(&buf
);
801 pname
= pprint_rename(file
->from_name
, file
->name
);
803 file
->print_name
= pname
;
806 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
808 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
809 int max_change
= 0, max_len
= 0;
810 int total_files
= data
->nr
;
811 int width
, name_width
;
812 const char *reset
, *set
, *add_c
, *del_c
;
817 width
= options
->stat_width
? options
->stat_width
: 80;
818 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
820 /* Sanity: give at least 5 columns to the graph,
821 * but leave at least 10 columns for the name.
823 if (width
< name_width
+ 15) {
824 if (name_width
<= 25)
825 width
= name_width
+ 15;
827 name_width
= width
- 15;
830 /* Find the longest filename and max number of changes */
831 reset
= diff_get_color_opt(options
, DIFF_RESET
);
832 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
833 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
834 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
836 for (i
= 0; i
< data
->nr
; i
++) {
837 struct diffstat_file
*file
= data
->files
[i
];
838 int change
= file
->added
+ file
->deleted
;
839 fill_print_name(file
);
840 len
= strlen(file
->print_name
);
844 if (file
->is_binary
|| file
->is_unmerged
)
846 if (max_change
< change
)
850 /* Compute the width of the graph part;
851 * 10 is for one blank at the beginning of the line plus
852 * " | count " between the name and the graph.
854 * From here on, name_width is the width of the name area,
855 * and width is the width of the graph area.
857 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
858 if (width
< (name_width
+ 10) + max_change
)
859 width
= width
- (name_width
+ 10);
863 for (i
= 0; i
< data
->nr
; i
++) {
864 const char *prefix
= "";
865 char *name
= data
->files
[i
]->print_name
;
866 int added
= data
->files
[i
]->added
;
867 int deleted
= data
->files
[i
]->deleted
;
871 * "scale" the filename
874 name_len
= strlen(name
);
875 if (name_width
< name_len
) {
879 name
+= name_len
- len
;
880 slash
= strchr(name
, '/');
885 if (data
->files
[i
]->is_binary
) {
886 show_name(prefix
, name
, len
, reset
, set
);
888 printf("%s%d%s", del_c
, deleted
, reset
);
890 printf("%s%d%s", add_c
, added
, reset
);
895 else if (data
->files
[i
]->is_unmerged
) {
896 show_name(prefix
, name
, len
, reset
, set
);
897 printf(" Unmerged\n");
900 else if (!data
->files
[i
]->is_renamed
&&
901 (added
+ deleted
== 0)) {
907 * scale the add/delete
915 if (width
<= max_change
) {
916 add
= scale_linear(add
, width
, max_change
);
917 del
= scale_linear(del
, width
, max_change
);
920 show_name(prefix
, name
, len
, reset
, set
);
921 printf("%5d ", added
+ deleted
);
922 show_graph('+', add
, add_c
, reset
);
923 show_graph('-', del
, del_c
, reset
);
926 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
927 set
, total_files
, adds
, dels
, reset
);
930 static void show_shortstats(struct diffstat_t
* data
)
932 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
937 for (i
= 0; i
< data
->nr
; i
++) {
938 if (!data
->files
[i
]->is_binary
&&
939 !data
->files
[i
]->is_unmerged
) {
940 int added
= data
->files
[i
]->added
;
941 int deleted
= data
->files
[i
]->deleted
;
942 if (!data
->files
[i
]->is_renamed
&&
943 (added
+ deleted
== 0)) {
951 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
952 total_files
, adds
, dels
);
955 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
962 for (i
= 0; i
< data
->nr
; i
++) {
963 struct diffstat_file
*file
= data
->files
[i
];
968 printf("%d\t%d\t", file
->added
, file
->deleted
);
969 if (options
->line_termination
) {
970 fill_print_name(file
);
971 if (!file
->is_renamed
)
972 write_name_quoted(file
->name
, stdout
,
973 options
->line_termination
);
975 fputs(file
->print_name
, stdout
);
976 putchar(options
->line_termination
);
979 if (file
->is_renamed
) {
981 write_name_quoted(file
->from_name
, stdout
, '\0');
983 write_name_quoted(file
->name
, stdout
, '\0');
988 static void free_diffstat_info(struct diffstat_t
*diffstat
)
991 for (i
= 0; i
< diffstat
->nr
; i
++) {
992 struct diffstat_file
*f
= diffstat
->files
[i
];
993 if (f
->name
!= f
->print_name
)
999 free(diffstat
->files
);
1002 struct checkdiff_t
{
1003 struct xdiff_emit_state xm
;
1004 const char *filename
;
1005 int lineno
, color_diff
;
1010 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1012 struct checkdiff_t
*data
= priv
;
1013 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
1014 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
1015 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
1018 if (line
[0] == '+') {
1019 data
->status
= check_and_emit_line(line
+ 1, len
- 1,
1020 data
->ws_rule
, NULL
, NULL
, NULL
, NULL
);
1023 err
= whitespace_error_string(data
->status
);
1024 printf("%s:%d: %s.\n", data
->filename
, data
->lineno
, err
);
1026 emit_line(set
, reset
, line
, 1);
1027 (void)check_and_emit_line(line
+ 1, len
- 1, data
->ws_rule
,
1028 stdout
, set
, reset
, ws
);
1030 } else if (line
[0] == ' ')
1032 else if (line
[0] == '@') {
1033 char *plus
= strchr(line
, '+');
1035 data
->lineno
= strtol(plus
, NULL
, 10);
1037 die("invalid diff");
1041 static unsigned char *deflate_it(char *data
,
1043 unsigned long *result_size
)
1046 unsigned char *deflated
;
1049 memset(&stream
, 0, sizeof(stream
));
1050 deflateInit(&stream
, zlib_compression_level
);
1051 bound
= deflateBound(&stream
, size
);
1052 deflated
= xmalloc(bound
);
1053 stream
.next_out
= deflated
;
1054 stream
.avail_out
= bound
;
1056 stream
.next_in
= (unsigned char *)data
;
1057 stream
.avail_in
= size
;
1058 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1060 deflateEnd(&stream
);
1061 *result_size
= stream
.total_out
;
1065 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
1071 unsigned long orig_size
;
1072 unsigned long delta_size
;
1073 unsigned long deflate_size
;
1074 unsigned long data_size
;
1076 /* We could do deflated delta, or we could do just deflated two,
1077 * whichever is smaller.
1080 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1081 if (one
->size
&& two
->size
) {
1082 delta
= diff_delta(one
->ptr
, one
->size
,
1083 two
->ptr
, two
->size
,
1084 &delta_size
, deflate_size
);
1086 void *to_free
= delta
;
1087 orig_size
= delta_size
;
1088 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1093 if (delta
&& delta_size
< deflate_size
) {
1094 printf("delta %lu\n", orig_size
);
1097 data_size
= delta_size
;
1100 printf("literal %lu\n", two
->size
);
1103 data_size
= deflate_size
;
1106 /* emit data encoded in base85 */
1109 int bytes
= (52 < data_size
) ? 52 : data_size
;
1113 line
[0] = bytes
+ 'A' - 1;
1115 line
[0] = bytes
- 26 + 'a' - 1;
1116 encode_85(line
+ 1, cp
, bytes
);
1117 cp
= (char *) cp
+ bytes
;
1124 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1126 printf("GIT binary patch\n");
1127 emit_binary_diff_body(one
, two
);
1128 emit_binary_diff_body(two
, one
);
1131 static void setup_diff_attr_check(struct git_attr_check
*check
)
1133 static struct git_attr
*attr_diff
;
1136 attr_diff
= git_attr("diff", 4);
1138 check
[0].attr
= attr_diff
;
1141 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1143 struct git_attr_check attr_diff_check
;
1144 int check_from_data
= 0;
1146 if (one
->checked_attr
)
1149 setup_diff_attr_check(&attr_diff_check
);
1151 one
->funcname_pattern_ident
= NULL
;
1153 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1157 value
= attr_diff_check
.value
;
1158 if (ATTR_TRUE(value
))
1160 else if (ATTR_FALSE(value
))
1163 check_from_data
= 1;
1165 /* funcname pattern ident */
1166 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1169 one
->funcname_pattern_ident
= value
;
1172 if (check_from_data
) {
1173 if (!one
->data
&& DIFF_FILE_VALID(one
))
1174 diff_populate_filespec(one
, 0);
1177 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1181 int diff_filespec_is_binary(struct diff_filespec
*one
)
1183 diff_filespec_check_attr(one
);
1184 return one
->is_binary
;
1187 static const char *funcname_pattern(const char *ident
)
1189 struct funcname_pattern
*pp
;
1191 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1192 if (!strcmp(ident
, pp
->name
))
1197 static struct builtin_funcname_pattern
{
1199 const char *pattern
;
1200 } builtin_funcname_pattern
[] = {
1201 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1202 "new\\|return\\|switch\\|throw\\|while\\)\n"
1204 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1206 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1209 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1211 const char *ident
, *pattern
;
1214 diff_filespec_check_attr(one
);
1215 ident
= one
->funcname_pattern_ident
;
1219 * If the config file has "funcname.default" defined, that
1220 * regexp is used; otherwise NULL is returned and xemit uses
1221 * the built-in default.
1223 return funcname_pattern("default");
1225 /* Look up custom "funcname.$ident" regexp from config. */
1226 pattern
= funcname_pattern(ident
);
1231 * And define built-in fallback patterns here. Note that
1232 * these can be overridden by the user's config settings.
1234 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1235 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1236 return builtin_funcname_pattern
[i
].pattern
;
1241 static void builtin_diff(const char *name_a
,
1243 struct diff_filespec
*one
,
1244 struct diff_filespec
*two
,
1245 const char *xfrm_msg
,
1246 struct diff_options
*o
,
1247 int complete_rewrite
)
1251 char *a_one
, *b_two
;
1252 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1253 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1255 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1256 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1257 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1258 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1259 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1260 if (lbl
[0][0] == '/') {
1262 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1263 if (xfrm_msg
&& xfrm_msg
[0])
1264 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1266 else if (lbl
[1][0] == '/') {
1267 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1268 if (xfrm_msg
&& xfrm_msg
[0])
1269 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1272 if (one
->mode
!= two
->mode
) {
1273 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1274 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1276 if (xfrm_msg
&& xfrm_msg
[0])
1277 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1279 * we do not run diff between different kind
1282 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1283 goto free_ab_and_return
;
1284 if (complete_rewrite
) {
1285 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1286 o
->found_changes
= 1;
1287 goto free_ab_and_return
;
1291 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1292 die("unable to read files to diff");
1294 if (!DIFF_OPT_TST(o
, TEXT
) &&
1295 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1296 /* Quite common confusing case */
1297 if (mf1
.size
== mf2
.size
&&
1298 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1299 goto free_ab_and_return
;
1300 if (DIFF_OPT_TST(o
, BINARY
))
1301 emit_binary_diff(&mf1
, &mf2
);
1303 printf("Binary files %s and %s differ\n",
1305 o
->found_changes
= 1;
1308 /* Crazy xdl interfaces.. */
1309 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1313 struct emit_callback ecbdata
;
1314 const char *funcname_pattern
;
1316 funcname_pattern
= diff_funcname_pattern(one
);
1317 if (!funcname_pattern
)
1318 funcname_pattern
= diff_funcname_pattern(two
);
1320 memset(&xecfg
, 0, sizeof(xecfg
));
1321 memset(&ecbdata
, 0, sizeof(ecbdata
));
1322 ecbdata
.label_path
= lbl
;
1323 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1324 ecbdata
.found_changesp
= &o
->found_changes
;
1325 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1326 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1327 xecfg
.ctxlen
= o
->context
;
1328 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1329 if (funcname_pattern
)
1330 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1333 else if (!prefixcmp(diffopts
, "--unified="))
1334 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1335 else if (!prefixcmp(diffopts
, "-u"))
1336 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1337 ecb
.outf
= xdiff_outf
;
1338 ecb
.priv
= &ecbdata
;
1339 ecbdata
.xm
.consume
= fn_out_consume
;
1340 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1341 ecbdata
.diff_words
=
1342 xcalloc(1, sizeof(struct diff_words_data
));
1343 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1344 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1345 free_diff_words_data(&ecbdata
);
1349 diff_free_filespec_data(one
);
1350 diff_free_filespec_data(two
);
1356 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1357 struct diff_filespec
*one
,
1358 struct diff_filespec
*two
,
1359 struct diffstat_t
*diffstat
,
1360 struct diff_options
*o
,
1361 int complete_rewrite
)
1364 struct diffstat_file
*data
;
1366 data
= diffstat_add(diffstat
, name_a
, name_b
);
1369 data
->is_unmerged
= 1;
1372 if (complete_rewrite
) {
1373 diff_populate_filespec(one
, 0);
1374 diff_populate_filespec(two
, 0);
1375 data
->deleted
= count_lines(one
->data
, one
->size
);
1376 data
->added
= count_lines(two
->data
, two
->size
);
1377 goto free_and_return
;
1379 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1380 die("unable to read files to diff");
1382 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1383 data
->is_binary
= 1;
1384 data
->added
= mf2
.size
;
1385 data
->deleted
= mf1
.size
;
1387 /* Crazy xdl interfaces.. */
1392 memset(&xecfg
, 0, sizeof(xecfg
));
1393 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1394 ecb
.outf
= xdiff_outf
;
1395 ecb
.priv
= diffstat
;
1396 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1400 diff_free_filespec_data(one
);
1401 diff_free_filespec_data(two
);
1404 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1405 struct diff_filespec
*one
,
1406 struct diff_filespec
*two
, struct diff_options
*o
)
1409 struct checkdiff_t data
;
1414 memset(&data
, 0, sizeof(data
));
1415 data
.xm
.consume
= checkdiff_consume
;
1416 data
.filename
= name_b
? name_b
: name_a
;
1418 data
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1419 data
.ws_rule
= whitespace_rule(data
.filename
);
1421 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1422 die("unable to read files to diff");
1424 if (diff_filespec_is_binary(two
))
1425 goto free_and_return
;
1427 /* Crazy xdl interfaces.. */
1432 memset(&xecfg
, 0, sizeof(xecfg
));
1433 xpp
.flags
= XDF_NEED_MINIMAL
;
1434 ecb
.outf
= xdiff_outf
;
1436 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1439 diff_free_filespec_data(one
);
1440 diff_free_filespec_data(two
);
1442 DIFF_OPT_SET(o
, CHECK_FAILED
);
1445 struct diff_filespec
*alloc_filespec(const char *path
)
1447 int namelen
= strlen(path
);
1448 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1450 memset(spec
, 0, sizeof(*spec
));
1451 spec
->path
= (char *)(spec
+ 1);
1452 memcpy(spec
->path
, path
, namelen
+1);
1457 void free_filespec(struct diff_filespec
*spec
)
1459 if (!--spec
->count
) {
1460 diff_free_filespec_data(spec
);
1465 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1466 unsigned short mode
)
1469 spec
->mode
= canon_mode(mode
);
1470 hashcpy(spec
->sha1
, sha1
);
1471 spec
->sha1_valid
= !is_null_sha1(sha1
);
1476 * Given a name and sha1 pair, if the index tells us the file in
1477 * the work tree has that object contents, return true, so that
1478 * prepare_temp_file() does not have to inflate and extract.
1480 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1482 struct cache_entry
*ce
;
1486 /* We do not read the cache ourselves here, because the
1487 * benchmark with my previous version that always reads cache
1488 * shows that it makes things worse for diff-tree comparing
1489 * two linux-2.6 kernel trees in an already checked out work
1490 * tree. This is because most diff-tree comparisons deal with
1491 * only a small number of files, while reading the cache is
1492 * expensive for a large project, and its cost outweighs the
1493 * savings we get by not inflating the object to a temporary
1494 * file. Practically, this code only helps when we are used
1495 * by diff-cache --cached, which does read the cache before
1501 /* We want to avoid the working directory if our caller
1502 * doesn't need the data in a normal file, this system
1503 * is rather slow with its stat/open/mmap/close syscalls,
1504 * and the object is contained in a pack file. The pack
1505 * is probably already open and will be faster to obtain
1506 * the data through than the working directory. Loose
1507 * objects however would tend to be slower as they need
1508 * to be individually opened and inflated.
1510 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1514 pos
= cache_name_pos(name
, len
);
1517 ce
= active_cache
[pos
];
1518 if ((lstat(name
, &st
) < 0) ||
1519 !S_ISREG(st
.st_mode
) || /* careful! */
1520 ce_match_stat(ce
, &st
, 0) ||
1521 hashcmp(sha1
, ce
->sha1
))
1523 /* we return 1 only when we can stat, it is a regular file,
1524 * stat information matches, and sha1 recorded in the cache
1525 * matches. I.e. we know the file in the work tree really is
1526 * the same as the <name, sha1> pair.
1531 static int populate_from_stdin(struct diff_filespec
*s
)
1536 strbuf_init(&buf
, 0);
1537 if (strbuf_read(&buf
, 0, 0) < 0)
1538 return error("error while reading from stdin %s",
1541 s
->should_munmap
= 0;
1542 s
->data
= strbuf_detach(&buf
, &size
);
1548 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1551 char *data
= xmalloc(100);
1552 len
= snprintf(data
, 100,
1553 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1565 * While doing rename detection and pickaxe operation, we may need to
1566 * grab the data for the blob (or file) for our own in-core comparison.
1567 * diff_filespec has data and size fields for this purpose.
1569 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1572 if (!DIFF_FILE_VALID(s
))
1573 die("internal error: asking to populate invalid file.");
1574 if (S_ISDIR(s
->mode
))
1580 if (size_only
&& 0 < s
->size
)
1583 if (S_ISGITLINK(s
->mode
))
1584 return diff_populate_gitlink(s
, size_only
);
1586 if (!s
->sha1_valid
||
1587 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1592 if (!strcmp(s
->path
, "-"))
1593 return populate_from_stdin(s
);
1595 if (lstat(s
->path
, &st
) < 0) {
1596 if (errno
== ENOENT
) {
1600 s
->data
= (char *)"";
1605 s
->size
= xsize_t(st
.st_size
);
1610 if (S_ISLNK(st
.st_mode
)) {
1612 s
->data
= xmalloc(s
->size
);
1614 ret
= readlink(s
->path
, s
->data
, s
->size
);
1621 fd
= open(s
->path
, O_RDONLY
);
1624 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1626 s
->should_munmap
= 1;
1629 * Convert from working tree format to canonical git format
1631 strbuf_init(&buf
, 0);
1632 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
)) {
1634 munmap(s
->data
, s
->size
);
1635 s
->should_munmap
= 0;
1636 s
->data
= strbuf_detach(&buf
, &size
);
1642 enum object_type type
;
1644 type
= sha1_object_info(s
->sha1
, &s
->size
);
1646 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1653 void diff_free_filespec_blob(struct diff_filespec
*s
)
1657 else if (s
->should_munmap
)
1658 munmap(s
->data
, s
->size
);
1660 if (s
->should_free
|| s
->should_munmap
) {
1661 s
->should_free
= s
->should_munmap
= 0;
1666 void diff_free_filespec_data(struct diff_filespec
*s
)
1668 diff_free_filespec_blob(s
);
1673 static void prep_temp_blob(struct diff_tempfile
*temp
,
1676 const unsigned char *sha1
,
1681 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1683 die("unable to create temp-file: %s", strerror(errno
));
1684 if (write_in_full(fd
, blob
, size
) != size
)
1685 die("unable to write temp-file");
1687 temp
->name
= temp
->tmp_path
;
1688 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1690 sprintf(temp
->mode
, "%06o", mode
);
1693 static void prepare_temp_file(const char *name
,
1694 struct diff_tempfile
*temp
,
1695 struct diff_filespec
*one
)
1697 if (!DIFF_FILE_VALID(one
)) {
1699 /* A '-' entry produces this for file-2, and
1700 * a '+' entry produces this for file-1.
1702 temp
->name
= "/dev/null";
1703 strcpy(temp
->hex
, ".");
1704 strcpy(temp
->mode
, ".");
1708 if (!one
->sha1_valid
||
1709 reuse_worktree_file(name
, one
->sha1
, 1)) {
1711 if (lstat(name
, &st
) < 0) {
1712 if (errno
== ENOENT
)
1713 goto not_a_valid_file
;
1714 die("stat(%s): %s", name
, strerror(errno
));
1716 if (S_ISLNK(st
.st_mode
)) {
1718 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1719 size_t sz
= xsize_t(st
.st_size
);
1720 if (sizeof(buf
) <= st
.st_size
)
1721 die("symlink too long: %s", name
);
1722 ret
= readlink(name
, buf
, sz
);
1724 die("readlink(%s)", name
);
1725 prep_temp_blob(temp
, buf
, sz
,
1727 one
->sha1
: null_sha1
),
1729 one
->mode
: S_IFLNK
));
1732 /* we can borrow from the file in the work tree */
1734 if (!one
->sha1_valid
)
1735 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1737 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1738 /* Even though we may sometimes borrow the
1739 * contents from the work tree, we always want
1740 * one->mode. mode is trustworthy even when
1741 * !(one->sha1_valid), as long as
1742 * DIFF_FILE_VALID(one).
1744 sprintf(temp
->mode
, "%06o", one
->mode
);
1749 if (diff_populate_filespec(one
, 0))
1750 die("cannot read data blob for %s", one
->path
);
1751 prep_temp_blob(temp
, one
->data
, one
->size
,
1752 one
->sha1
, one
->mode
);
1756 static void remove_tempfile(void)
1760 for (i
= 0; i
< 2; i
++)
1761 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1762 unlink(diff_temp
[i
].name
);
1763 diff_temp
[i
].name
= NULL
;
1767 static void remove_tempfile_on_signal(int signo
)
1770 signal(SIGINT
, SIG_DFL
);
1774 /* An external diff command takes:
1776 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1777 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1780 static void run_external_diff(const char *pgm
,
1783 struct diff_filespec
*one
,
1784 struct diff_filespec
*two
,
1785 const char *xfrm_msg
,
1786 int complete_rewrite
)
1788 const char *spawn_arg
[10];
1789 struct diff_tempfile
*temp
= diff_temp
;
1791 static int atexit_asked
= 0;
1792 const char *othername
;
1793 const char **arg
= &spawn_arg
[0];
1795 othername
= (other
? other
: name
);
1797 prepare_temp_file(name
, &temp
[0], one
);
1798 prepare_temp_file(othername
, &temp
[1], two
);
1799 if (! atexit_asked
&&
1800 (temp
[0].name
== temp
[0].tmp_path
||
1801 temp
[1].name
== temp
[1].tmp_path
)) {
1803 atexit(remove_tempfile
);
1805 signal(SIGINT
, remove_tempfile_on_signal
);
1811 *arg
++ = temp
[0].name
;
1812 *arg
++ = temp
[0].hex
;
1813 *arg
++ = temp
[0].mode
;
1814 *arg
++ = temp
[1].name
;
1815 *arg
++ = temp
[1].hex
;
1816 *arg
++ = temp
[1].mode
;
1827 retval
= run_command_v_opt(spawn_arg
, 0);
1830 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1835 static const char *external_diff_attr(const char *name
)
1837 struct git_attr_check attr_diff_check
;
1839 setup_diff_attr_check(&attr_diff_check
);
1840 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
1841 const char *value
= attr_diff_check
.value
;
1842 if (!ATTR_TRUE(value
) &&
1843 !ATTR_FALSE(value
) &&
1844 !ATTR_UNSET(value
)) {
1845 struct ll_diff_driver
*drv
;
1847 for (drv
= user_diff
; drv
; drv
= drv
->next
)
1848 if (!strcmp(drv
->name
, value
))
1855 static void run_diff_cmd(const char *pgm
,
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(name
);
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 run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
1910 const char *pgm
= external_diff();
1913 struct diff_filespec
*one
= p
->one
;
1914 struct diff_filespec
*two
= p
->two
;
1917 int complete_rewrite
= 0;
1920 if (DIFF_PAIR_UNMERGED(p
)) {
1921 run_diff_cmd(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
, o
, 0);
1925 name
= p
->one
->path
;
1926 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1927 diff_fill_sha1_info(one
);
1928 diff_fill_sha1_info(two
);
1930 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
1931 switch (p
->status
) {
1932 case DIFF_STATUS_COPIED
:
1933 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1934 strbuf_addstr(&msg
, "\ncopy from ");
1935 quote_c_style(name
, &msg
, NULL
, 0);
1936 strbuf_addstr(&msg
, "\ncopy to ");
1937 quote_c_style(other
, &msg
, NULL
, 0);
1938 strbuf_addch(&msg
, '\n');
1940 case DIFF_STATUS_RENAMED
:
1941 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1942 strbuf_addstr(&msg
, "\nrename from ");
1943 quote_c_style(name
, &msg
, NULL
, 0);
1944 strbuf_addstr(&msg
, "\nrename to ");
1945 quote_c_style(other
, &msg
, NULL
, 0);
1946 strbuf_addch(&msg
, '\n');
1948 case DIFF_STATUS_MODIFIED
:
1950 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
1951 similarity_index(p
));
1952 complete_rewrite
= 1;
1961 if (hashcmp(one
->sha1
, two
->sha1
)) {
1962 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
1964 if (DIFF_OPT_TST(o
, BINARY
)) {
1966 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
1967 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
1970 strbuf_addf(&msg
, "index %.*s..%.*s",
1971 abbrev
, sha1_to_hex(one
->sha1
),
1972 abbrev
, sha1_to_hex(two
->sha1
));
1973 if (one
->mode
== two
->mode
)
1974 strbuf_addf(&msg
, " %06o", one
->mode
);
1975 strbuf_addch(&msg
, '\n');
1979 strbuf_setlen(&msg
, msg
.len
- 1);
1980 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
1983 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
1984 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
1985 /* a filepair that changes between file and symlink
1986 * needs to be split into deletion and creation.
1988 struct diff_filespec
*null
= alloc_filespec(two
->path
);
1989 run_diff_cmd(NULL
, name
, other
, one
, null
, xfrm_msg
, o
, 0);
1991 null
= alloc_filespec(one
->path
);
1992 run_diff_cmd(NULL
, name
, other
, null
, two
, xfrm_msg
, o
, 0);
1996 run_diff_cmd(pgm
, name
, other
, one
, two
, xfrm_msg
, o
,
1999 strbuf_release(&msg
);
2002 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2003 struct diffstat_t
*diffstat
)
2007 int complete_rewrite
= 0;
2009 if (DIFF_PAIR_UNMERGED(p
)) {
2011 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2015 name
= p
->one
->path
;
2016 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2018 diff_fill_sha1_info(p
->one
);
2019 diff_fill_sha1_info(p
->two
);
2021 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2022 complete_rewrite
= 1;
2023 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2026 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2031 if (DIFF_PAIR_UNMERGED(p
)) {
2036 name
= p
->one
->path
;
2037 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2039 diff_fill_sha1_info(p
->one
);
2040 diff_fill_sha1_info(p
->two
);
2042 builtin_checkdiff(name
, other
, p
->one
, p
->two
, o
);
2045 void diff_setup(struct diff_options
*options
)
2047 memset(options
, 0, sizeof(*options
));
2048 options
->line_termination
= '\n';
2049 options
->break_opt
= -1;
2050 options
->rename_limit
= -1;
2051 options
->context
= 3;
2052 options
->msg_sep
= "";
2054 options
->change
= diff_change
;
2055 options
->add_remove
= diff_addremove
;
2056 if (diff_use_color_default
)
2057 DIFF_OPT_SET(options
, COLOR_DIFF
);
2059 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2060 options
->detect_rename
= diff_detect_rename_default
;
2062 options
->a_prefix
= "a/";
2063 options
->b_prefix
= "b/";
2066 int diff_setup_done(struct diff_options
*options
)
2070 if (options
->output_format
& DIFF_FORMAT_NAME
)
2072 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2074 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2076 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2079 die("--name-only, --name-status, --check and -s are mutually exclusive");
2081 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2082 options
->detect_rename
= DIFF_DETECT_COPY
;
2084 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2085 DIFF_FORMAT_NAME_STATUS
|
2086 DIFF_FORMAT_CHECKDIFF
|
2087 DIFF_FORMAT_NO_OUTPUT
))
2088 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2089 DIFF_FORMAT_NUMSTAT
|
2090 DIFF_FORMAT_DIFFSTAT
|
2091 DIFF_FORMAT_SHORTSTAT
|
2092 DIFF_FORMAT_SUMMARY
|
2096 * These cases always need recursive; we do not drop caller-supplied
2097 * recursive bits for other formats here.
2099 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2100 DIFF_FORMAT_NUMSTAT
|
2101 DIFF_FORMAT_DIFFSTAT
|
2102 DIFF_FORMAT_SHORTSTAT
|
2103 DIFF_FORMAT_SUMMARY
|
2104 DIFF_FORMAT_CHECKDIFF
))
2105 DIFF_OPT_SET(options
, RECURSIVE
);
2107 * Also pickaxe would not work very well if you do not say recursive
2109 if (options
->pickaxe
)
2110 DIFF_OPT_SET(options
, RECURSIVE
);
2112 if (options
->detect_rename
&& options
->rename_limit
< 0)
2113 options
->rename_limit
= diff_rename_limit_default
;
2114 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2116 /* read-cache does not die even when it fails
2117 * so it is safe for us to do this here. Also
2118 * it does not smudge active_cache or active_nr
2119 * when it fails, so we do not have to worry about
2120 * cleaning it up ourselves either.
2124 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2125 options
->abbrev
= 40; /* full */
2128 * It does not make sense to show the first hit we happened
2129 * to have found. It does not make sense not to return with
2130 * exit code in such a case either.
2132 if (DIFF_OPT_TST(options
, QUIET
)) {
2133 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2134 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2138 * If we postprocess in diffcore, we cannot simply return
2139 * upon the first hit. We need to run diff as usual.
2141 if (options
->pickaxe
|| options
->filter
)
2142 DIFF_OPT_CLR(options
, QUIET
);
2147 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2157 if (c
== arg_short
) {
2161 if (val
&& isdigit(c
)) {
2163 int n
= strtoul(arg
, &end
, 10);
2174 eq
= strchr(arg
, '=');
2179 if (!len
|| strncmp(arg
, arg_long
, len
))
2184 if (!isdigit(*++eq
))
2186 n
= strtoul(eq
, &end
, 10);
2194 static int diff_scoreopt_parse(const char *opt
);
2196 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2198 const char *arg
= av
[0];
2200 /* Output format options */
2201 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2202 options
->output_format
|= DIFF_FORMAT_PATCH
;
2203 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2204 options
->output_format
|= DIFF_FORMAT_PATCH
;
2205 else if (!strcmp(arg
, "--raw"))
2206 options
->output_format
|= DIFF_FORMAT_RAW
;
2207 else if (!strcmp(arg
, "--patch-with-raw"))
2208 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2209 else if (!strcmp(arg
, "--numstat"))
2210 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2211 else if (!strcmp(arg
, "--shortstat"))
2212 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2213 else if (!strcmp(arg
, "--check"))
2214 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2215 else if (!strcmp(arg
, "--summary"))
2216 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2217 else if (!strcmp(arg
, "--patch-with-stat"))
2218 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2219 else if (!strcmp(arg
, "--name-only"))
2220 options
->output_format
|= DIFF_FORMAT_NAME
;
2221 else if (!strcmp(arg
, "--name-status"))
2222 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2223 else if (!strcmp(arg
, "-s"))
2224 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2225 else if (!prefixcmp(arg
, "--stat")) {
2227 int width
= options
->stat_width
;
2228 int name_width
= options
->stat_name_width
;
2234 if (!prefixcmp(arg
, "-width="))
2235 width
= strtoul(arg
+ 7, &end
, 10);
2236 else if (!prefixcmp(arg
, "-name-width="))
2237 name_width
= strtoul(arg
+ 12, &end
, 10);
2240 width
= strtoul(arg
+1, &end
, 10);
2242 name_width
= strtoul(end
+1, &end
, 10);
2245 /* Important! This checks all the error cases! */
2248 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2249 options
->stat_name_width
= name_width
;
2250 options
->stat_width
= width
;
2253 /* renames options */
2254 else if (!prefixcmp(arg
, "-B")) {
2255 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2258 else if (!prefixcmp(arg
, "-M")) {
2259 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2261 options
->detect_rename
= DIFF_DETECT_RENAME
;
2263 else if (!prefixcmp(arg
, "-C")) {
2264 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2265 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2266 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2268 options
->detect_rename
= DIFF_DETECT_COPY
;
2270 else if (!strcmp(arg
, "--no-renames"))
2271 options
->detect_rename
= 0;
2274 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2275 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2276 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2277 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2278 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2279 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2282 else if (!strcmp(arg
, "--binary")) {
2283 options
->output_format
|= DIFF_FORMAT_PATCH
;
2284 DIFF_OPT_SET(options
, BINARY
);
2286 else if (!strcmp(arg
, "--full-index"))
2287 DIFF_OPT_SET(options
, FULL_INDEX
);
2288 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2289 DIFF_OPT_SET(options
, TEXT
);
2290 else if (!strcmp(arg
, "-R"))
2291 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2292 else if (!strcmp(arg
, "--find-copies-harder"))
2293 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2294 else if (!strcmp(arg
, "--follow"))
2295 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2296 else if (!strcmp(arg
, "--color"))
2297 DIFF_OPT_SET(options
, COLOR_DIFF
);
2298 else if (!strcmp(arg
, "--no-color"))
2299 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2300 else if (!strcmp(arg
, "--color-words"))
2301 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2302 else if (!strcmp(arg
, "--exit-code"))
2303 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2304 else if (!strcmp(arg
, "--quiet"))
2305 DIFF_OPT_SET(options
, QUIET
);
2306 else if (!strcmp(arg
, "--ext-diff"))
2307 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2308 else if (!strcmp(arg
, "--no-ext-diff"))
2309 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2312 else if (!strcmp(arg
, "-z"))
2313 options
->line_termination
= 0;
2314 else if (!prefixcmp(arg
, "-l"))
2315 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2316 else if (!prefixcmp(arg
, "-S"))
2317 options
->pickaxe
= arg
+ 2;
2318 else if (!strcmp(arg
, "--pickaxe-all"))
2319 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2320 else if (!strcmp(arg
, "--pickaxe-regex"))
2321 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2322 else if (!prefixcmp(arg
, "-O"))
2323 options
->orderfile
= arg
+ 2;
2324 else if (!prefixcmp(arg
, "--diff-filter="))
2325 options
->filter
= arg
+ 14;
2326 else if (!strcmp(arg
, "--abbrev"))
2327 options
->abbrev
= DEFAULT_ABBREV
;
2328 else if (!prefixcmp(arg
, "--abbrev=")) {
2329 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2330 if (options
->abbrev
< MINIMUM_ABBREV
)
2331 options
->abbrev
= MINIMUM_ABBREV
;
2332 else if (40 < options
->abbrev
)
2333 options
->abbrev
= 40;
2335 else if (!prefixcmp(arg
, "--src-prefix="))
2336 options
->a_prefix
= arg
+ 13;
2337 else if (!prefixcmp(arg
, "--dst-prefix="))
2338 options
->b_prefix
= arg
+ 13;
2339 else if (!strcmp(arg
, "--no-prefix"))
2340 options
->a_prefix
= options
->b_prefix
= "";
2346 static int parse_num(const char **cp_p
)
2348 unsigned long num
, scale
;
2350 const char *cp
= *cp_p
;
2357 if ( !dot
&& ch
== '.' ) {
2360 } else if ( ch
== '%' ) {
2361 scale
= dot
? scale
*100 : 100;
2362 cp
++; /* % is always at the end */
2364 } else if ( ch
>= '0' && ch
<= '9' ) {
2365 if ( scale
< 100000 ) {
2367 num
= (num
*10) + (ch
-'0');
2376 /* user says num divided by scale and we say internally that
2377 * is MAX_SCORE * num / scale.
2379 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2382 static int diff_scoreopt_parse(const char *opt
)
2384 int opt1
, opt2
, cmd
;
2389 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2390 return -1; /* that is not a -M, -C nor -B option */
2392 opt1
= parse_num(&opt
);
2398 else if (*opt
!= '/')
2399 return -1; /* we expect -B80/99 or -B80 */
2402 opt2
= parse_num(&opt
);
2407 return opt1
| (opt2
<< 16);
2410 struct diff_queue_struct diff_queued_diff
;
2412 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2414 if (queue
->alloc
<= queue
->nr
) {
2415 queue
->alloc
= alloc_nr(queue
->alloc
);
2416 queue
->queue
= xrealloc(queue
->queue
,
2417 sizeof(dp
) * queue
->alloc
);
2419 queue
->queue
[queue
->nr
++] = dp
;
2422 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2423 struct diff_filespec
*one
,
2424 struct diff_filespec
*two
)
2426 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2434 void diff_free_filepair(struct diff_filepair
*p
)
2436 free_filespec(p
->one
);
2437 free_filespec(p
->two
);
2441 /* This is different from find_unique_abbrev() in that
2442 * it stuffs the result with dots for alignment.
2444 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2449 return sha1_to_hex(sha1
);
2451 abbrev
= find_unique_abbrev(sha1
, len
);
2453 return sha1_to_hex(sha1
);
2454 abblen
= strlen(abbrev
);
2456 static char hex
[41];
2457 if (len
< abblen
&& abblen
<= len
+ 2)
2458 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2460 sprintf(hex
, "%s...", abbrev
);
2463 return sha1_to_hex(sha1
);
2466 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2468 int line_termination
= opt
->line_termination
;
2469 int inter_name_termination
= line_termination
? '\t' : '\0';
2471 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2472 printf(":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2473 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2474 printf("%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2477 printf("%c%03d%c", p
->status
, similarity_index(p
),
2478 inter_name_termination
);
2480 printf("%c%c", p
->status
, inter_name_termination
);
2483 if (p
->status
== DIFF_STATUS_COPIED
|| p
->status
== DIFF_STATUS_RENAMED
) {
2484 write_name_quoted(p
->one
->path
, stdout
, inter_name_termination
);
2485 write_name_quoted(p
->two
->path
, stdout
, line_termination
);
2487 const char *path
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2488 write_name_quoted(path
, stdout
, line_termination
);
2492 int diff_unmodified_pair(struct diff_filepair
*p
)
2494 /* This function is written stricter than necessary to support
2495 * the currently implemented transformers, but the idea is to
2496 * let transformers to produce diff_filepairs any way they want,
2497 * and filter and clean them up here before producing the output.
2499 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2501 if (DIFF_PAIR_UNMERGED(p
))
2502 return 0; /* unmerged is interesting */
2504 /* deletion, addition, mode or type change
2505 * and rename are all interesting.
2507 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2508 DIFF_PAIR_MODE_CHANGED(p
) ||
2509 strcmp(one
->path
, two
->path
))
2512 /* both are valid and point at the same path. that is, we are
2513 * dealing with a change.
2515 if (one
->sha1_valid
&& two
->sha1_valid
&&
2516 !hashcmp(one
->sha1
, two
->sha1
))
2517 return 1; /* no change */
2518 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2519 return 1; /* both look at the same file on the filesystem. */
2523 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2525 if (diff_unmodified_pair(p
))
2528 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2529 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2530 return; /* no tree diffs in patch format */
2535 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2536 struct diffstat_t
*diffstat
)
2538 if (diff_unmodified_pair(p
))
2541 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2542 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2543 return; /* no tree diffs in patch format */
2545 run_diffstat(p
, o
, diffstat
);
2548 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2549 struct diff_options
*o
)
2551 if (diff_unmodified_pair(p
))
2554 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2555 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2556 return; /* no tree diffs in patch format */
2558 run_checkdiff(p
, o
);
2561 int diff_queue_is_empty(void)
2563 struct diff_queue_struct
*q
= &diff_queued_diff
;
2565 for (i
= 0; i
< q
->nr
; i
++)
2566 if (!diff_unmodified_pair(q
->queue
[i
]))
2572 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2574 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2577 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2579 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2580 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2582 s
->size
, s
->xfrm_flags
);
2585 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2587 diff_debug_filespec(p
->one
, i
, "one");
2588 diff_debug_filespec(p
->two
, i
, "two");
2589 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2590 p
->score
, p
->status
? p
->status
: '?',
2591 p
->one
->rename_used
, p
->broken_pair
);
2594 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2598 fprintf(stderr
, "%s\n", msg
);
2599 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2600 for (i
= 0; i
< q
->nr
; i
++) {
2601 struct diff_filepair
*p
= q
->queue
[i
];
2602 diff_debug_filepair(p
, i
);
2607 static void diff_resolve_rename_copy(void)
2610 struct diff_filepair
*p
;
2611 struct diff_queue_struct
*q
= &diff_queued_diff
;
2613 diff_debug_queue("resolve-rename-copy", q
);
2615 for (i
= 0; i
< q
->nr
; i
++) {
2617 p
->status
= 0; /* undecided */
2618 if (DIFF_PAIR_UNMERGED(p
))
2619 p
->status
= DIFF_STATUS_UNMERGED
;
2620 else if (!DIFF_FILE_VALID(p
->one
))
2621 p
->status
= DIFF_STATUS_ADDED
;
2622 else if (!DIFF_FILE_VALID(p
->two
))
2623 p
->status
= DIFF_STATUS_DELETED
;
2624 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2625 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2627 /* from this point on, we are dealing with a pair
2628 * whose both sides are valid and of the same type, i.e.
2629 * either in-place edit or rename/copy edit.
2631 else if (DIFF_PAIR_RENAME(p
)) {
2633 * A rename might have re-connected a broken
2634 * pair up, causing the pathnames to be the
2635 * same again. If so, that's not a rename at
2636 * all, just a modification..
2638 * Otherwise, see if this source was used for
2639 * multiple renames, in which case we decrement
2640 * the count, and call it a copy.
2642 if (!strcmp(p
->one
->path
, p
->two
->path
))
2643 p
->status
= DIFF_STATUS_MODIFIED
;
2644 else if (--p
->one
->rename_used
> 0)
2645 p
->status
= DIFF_STATUS_COPIED
;
2647 p
->status
= DIFF_STATUS_RENAMED
;
2649 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2650 p
->one
->mode
!= p
->two
->mode
||
2651 is_null_sha1(p
->one
->sha1
))
2652 p
->status
= DIFF_STATUS_MODIFIED
;
2654 /* This is a "no-change" entry and should not
2655 * happen anymore, but prepare for broken callers.
2657 error("feeding unmodified %s to diffcore",
2659 p
->status
= DIFF_STATUS_UNKNOWN
;
2662 diff_debug_queue("resolve-rename-copy done", q
);
2665 static int check_pair_status(struct diff_filepair
*p
)
2667 switch (p
->status
) {
2668 case DIFF_STATUS_UNKNOWN
:
2671 die("internal error in diff-resolve-rename-copy");
2677 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2679 int fmt
= opt
->output_format
;
2681 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2682 diff_flush_checkdiff(p
, opt
);
2683 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2684 diff_flush_raw(p
, opt
);
2685 else if (fmt
& DIFF_FORMAT_NAME
)
2686 write_name_quoted(p
->two
->path
, stdout
, opt
->line_termination
);
2689 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2692 printf(" %s mode %06o ", newdelete
, fs
->mode
);
2694 printf(" %s ", newdelete
);
2695 write_name_quoted(fs
->path
, stdout
, '\n');
2699 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2701 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2702 printf(" mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2703 show_name
? ' ' : '\n');
2705 write_name_quoted(p
->two
->path
, stdout
, '\n');
2710 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2712 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2714 printf(" %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2716 show_mode_change(p
, 0);
2719 static void diff_summary(struct diff_filepair
*p
)
2722 case DIFF_STATUS_DELETED
:
2723 show_file_mode_name("delete", p
->one
);
2725 case DIFF_STATUS_ADDED
:
2726 show_file_mode_name("create", p
->two
);
2728 case DIFF_STATUS_COPIED
:
2729 show_rename_copy("copy", p
);
2731 case DIFF_STATUS_RENAMED
:
2732 show_rename_copy("rename", p
);
2736 fputs(" rewrite ", stdout
);
2737 write_name_quoted(p
->two
->path
, stdout
, ' ');
2738 printf("(%d%%)\n", similarity_index(p
));
2740 show_mode_change(p
, !p
->score
);
2746 struct xdiff_emit_state xm
;
2751 static int remove_space(char *line
, int len
)
2757 for (i
= 0; i
< len
; i
++)
2758 if (!isspace((c
= line
[i
])))
2764 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2766 struct patch_id_t
*data
= priv
;
2769 /* Ignore line numbers when computing the SHA1 of the patch */
2770 if (!prefixcmp(line
, "@@ -"))
2773 new_len
= remove_space(line
, len
);
2775 SHA1_Update(data
->ctx
, line
, new_len
);
2776 data
->patchlen
+= new_len
;
2779 /* returns 0 upon success, and writes result into sha1 */
2780 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2782 struct diff_queue_struct
*q
= &diff_queued_diff
;
2785 struct patch_id_t data
;
2786 char buffer
[PATH_MAX
* 4 + 20];
2789 memset(&data
, 0, sizeof(struct patch_id_t
));
2791 data
.xm
.consume
= patch_id_consume
;
2793 for (i
= 0; i
< q
->nr
; i
++) {
2798 struct diff_filepair
*p
= q
->queue
[i
];
2801 memset(&xecfg
, 0, sizeof(xecfg
));
2803 return error("internal diff status error");
2804 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2806 if (diff_unmodified_pair(p
))
2808 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2809 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2811 if (DIFF_PAIR_UNMERGED(p
))
2814 diff_fill_sha1_info(p
->one
);
2815 diff_fill_sha1_info(p
->two
);
2816 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2817 fill_mmfile(&mf2
, p
->two
) < 0)
2818 return error("unable to read files to diff");
2820 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2821 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2822 if (p
->one
->mode
== 0)
2823 len1
= snprintf(buffer
, sizeof(buffer
),
2824 "diff--gita/%.*sb/%.*s"
2831 len2
, p
->two
->path
);
2832 else if (p
->two
->mode
== 0)
2833 len1
= snprintf(buffer
, sizeof(buffer
),
2834 "diff--gita/%.*sb/%.*s"
2835 "deletedfilemode%06o"
2841 len1
, p
->one
->path
);
2843 len1
= snprintf(buffer
, sizeof(buffer
),
2844 "diff--gita/%.*sb/%.*s"
2850 len2
, p
->two
->path
);
2851 SHA1_Update(&ctx
, buffer
, len1
);
2853 xpp
.flags
= XDF_NEED_MINIMAL
;
2855 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2856 ecb
.outf
= xdiff_outf
;
2858 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2861 SHA1_Final(sha1
, &ctx
);
2865 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2867 struct diff_queue_struct
*q
= &diff_queued_diff
;
2869 int result
= diff_get_patch_id(options
, sha1
);
2871 for (i
= 0; i
< q
->nr
; i
++)
2872 diff_free_filepair(q
->queue
[i
]);
2876 q
->nr
= q
->alloc
= 0;
2881 static int is_summary_empty(const struct diff_queue_struct
*q
)
2885 for (i
= 0; i
< q
->nr
; i
++) {
2886 const struct diff_filepair
*p
= q
->queue
[i
];
2888 switch (p
->status
) {
2889 case DIFF_STATUS_DELETED
:
2890 case DIFF_STATUS_ADDED
:
2891 case DIFF_STATUS_COPIED
:
2892 case DIFF_STATUS_RENAMED
:
2897 if (p
->one
->mode
&& p
->two
->mode
&&
2898 p
->one
->mode
!= p
->two
->mode
)
2906 void diff_flush(struct diff_options
*options
)
2908 struct diff_queue_struct
*q
= &diff_queued_diff
;
2909 int i
, output_format
= options
->output_format
;
2913 * Order: raw, stat, summary, patch
2914 * or: name/name-status/checkdiff (other bits clear)
2919 if (output_format
& (DIFF_FORMAT_RAW
|
2921 DIFF_FORMAT_NAME_STATUS
|
2922 DIFF_FORMAT_CHECKDIFF
)) {
2923 for (i
= 0; i
< q
->nr
; i
++) {
2924 struct diff_filepair
*p
= q
->queue
[i
];
2925 if (check_pair_status(p
))
2926 flush_one_pair(p
, options
);
2931 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
2932 struct diffstat_t diffstat
;
2934 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
2935 diffstat
.xm
.consume
= diffstat_consume
;
2936 for (i
= 0; i
< q
->nr
; i
++) {
2937 struct diff_filepair
*p
= q
->queue
[i
];
2938 if (check_pair_status(p
))
2939 diff_flush_stat(p
, options
, &diffstat
);
2941 if (output_format
& DIFF_FORMAT_NUMSTAT
)
2942 show_numstat(&diffstat
, options
);
2943 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
2944 show_stats(&diffstat
, options
);
2945 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
2946 show_shortstats(&diffstat
);
2947 free_diffstat_info(&diffstat
);
2951 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
2952 for (i
= 0; i
< q
->nr
; i
++)
2953 diff_summary(q
->queue
[i
]);
2957 if (output_format
& DIFF_FORMAT_PATCH
) {
2959 if (options
->stat_sep
) {
2960 /* attach patch instead of inline */
2961 fputs(options
->stat_sep
, stdout
);
2963 putchar(options
->line_termination
);
2967 for (i
= 0; i
< q
->nr
; i
++) {
2968 struct diff_filepair
*p
= q
->queue
[i
];
2969 if (check_pair_status(p
))
2970 diff_flush_patch(p
, options
);
2974 if (output_format
& DIFF_FORMAT_CALLBACK
)
2975 options
->format_callback(q
, options
, options
->format_callback_data
);
2977 for (i
= 0; i
< q
->nr
; i
++)
2978 diff_free_filepair(q
->queue
[i
]);
2982 q
->nr
= q
->alloc
= 0;
2985 static void diffcore_apply_filter(const char *filter
)
2988 struct diff_queue_struct
*q
= &diff_queued_diff
;
2989 struct diff_queue_struct outq
;
2991 outq
.nr
= outq
.alloc
= 0;
2996 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
2998 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
2999 struct diff_filepair
*p
= q
->queue
[i
];
3000 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3002 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3004 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3005 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3006 strchr(filter
, p
->status
)))
3012 /* otherwise we will clear the whole queue
3013 * by copying the empty outq at the end of this
3014 * function, but first clear the current entries
3017 for (i
= 0; i
< q
->nr
; i
++)
3018 diff_free_filepair(q
->queue
[i
]);
3021 /* Only the matching ones */
3022 for (i
= 0; i
< q
->nr
; i
++) {
3023 struct diff_filepair
*p
= q
->queue
[i
];
3025 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3027 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3029 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3030 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3031 strchr(filter
, p
->status
)))
3034 diff_free_filepair(p
);
3041 /* Check whether two filespecs with the same mode and size are identical */
3042 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3043 struct diff_filespec
*two
)
3045 if (S_ISGITLINK(one
->mode
)) {
3046 diff_fill_sha1_info(one
);
3047 diff_fill_sha1_info(two
);
3048 return !hashcmp(one
->sha1
, two
->sha1
);
3050 if (diff_populate_filespec(one
, 0))
3052 if (diff_populate_filespec(two
, 0))
3054 return !memcmp(one
->data
, two
->data
, one
->size
);
3057 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3060 struct diff_queue_struct
*q
= &diff_queued_diff
;
3061 struct diff_queue_struct outq
;
3063 outq
.nr
= outq
.alloc
= 0;
3065 for (i
= 0; i
< q
->nr
; i
++) {
3066 struct diff_filepair
*p
= q
->queue
[i
];
3069 * 1. Entries that come from stat info dirtyness
3070 * always have both sides (iow, not create/delete),
3071 * one side of the object name is unknown, with
3072 * the same mode and size. Keep the ones that
3073 * do not match these criteria. They have real
3076 * 2. At this point, the file is known to be modified,
3077 * with the same mode and size, and the object
3078 * name of one side is unknown. Need to inspect
3079 * the identical contents.
3081 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3082 !DIFF_FILE_VALID(p
->two
) ||
3083 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3084 (p
->one
->mode
!= p
->two
->mode
) ||
3085 diff_populate_filespec(p
->one
, 1) ||
3086 diff_populate_filespec(p
->two
, 1) ||
3087 (p
->one
->size
!= p
->two
->size
) ||
3088 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3092 * The caller can subtract 1 from skip_stat_unmatch
3093 * to determine how many paths were dirty only
3094 * due to stat info mismatch.
3096 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3097 diffopt
->skip_stat_unmatch
++;
3098 diff_free_filepair(p
);
3105 void diffcore_std(struct diff_options
*options
)
3107 if (DIFF_OPT_TST(options
, QUIET
))
3110 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3111 diffcore_skip_stat_unmatch(options
);
3112 if (options
->break_opt
!= -1)
3113 diffcore_break(options
->break_opt
);
3114 if (options
->detect_rename
)
3115 diffcore_rename(options
);
3116 if (options
->break_opt
!= -1)
3117 diffcore_merge_broken();
3118 if (options
->pickaxe
)
3119 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3120 if (options
->orderfile
)
3121 diffcore_order(options
->orderfile
);
3122 diff_resolve_rename_copy();
3123 diffcore_apply_filter(options
->filter
);
3125 if (diff_queued_diff
.nr
)
3126 DIFF_OPT_SET(options
, HAS_CHANGES
);
3128 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3131 int diff_result_code(struct diff_options
*opt
, int status
)
3134 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3135 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3137 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3138 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3140 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3141 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3146 void diff_addremove(struct diff_options
*options
,
3147 int addremove
, unsigned mode
,
3148 const unsigned char *sha1
,
3149 const char *base
, const char *path
)
3151 char concatpath
[PATH_MAX
];
3152 struct diff_filespec
*one
, *two
;
3154 /* This may look odd, but it is a preparation for
3155 * feeding "there are unchanged files which should
3156 * not produce diffs, but when you are doing copy
3157 * detection you would need them, so here they are"
3158 * entries to the diff-core. They will be prefixed
3159 * with something like '=' or '*' (I haven't decided
3160 * which but should not make any difference).
3161 * Feeding the same new and old to diff_change()
3162 * also has the same effect.
3163 * Before the final output happens, they are pruned after
3164 * merged into rename/copy pairs as appropriate.
3166 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3167 addremove
= (addremove
== '+' ? '-' :
3168 addremove
== '-' ? '+' : addremove
);
3170 if (!path
) path
= "";
3171 sprintf(concatpath
, "%s%s", base
, path
);
3172 one
= alloc_filespec(concatpath
);
3173 two
= alloc_filespec(concatpath
);
3175 if (addremove
!= '+')
3176 fill_filespec(one
, sha1
, mode
);
3177 if (addremove
!= '-')
3178 fill_filespec(two
, sha1
, mode
);
3180 diff_queue(&diff_queued_diff
, one
, two
);
3181 DIFF_OPT_SET(options
, HAS_CHANGES
);
3184 void diff_change(struct diff_options
*options
,
3185 unsigned old_mode
, unsigned new_mode
,
3186 const unsigned char *old_sha1
,
3187 const unsigned char *new_sha1
,
3188 const char *base
, const char *path
)
3190 char concatpath
[PATH_MAX
];
3191 struct diff_filespec
*one
, *two
;
3193 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3195 const unsigned char *tmp_c
;
3196 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3197 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3199 if (!path
) path
= "";
3200 sprintf(concatpath
, "%s%s", base
, path
);
3201 one
= alloc_filespec(concatpath
);
3202 two
= alloc_filespec(concatpath
);
3203 fill_filespec(one
, old_sha1
, old_mode
);
3204 fill_filespec(two
, new_sha1
, new_mode
);
3206 diff_queue(&diff_queued_diff
, one
, two
);
3207 DIFF_OPT_SET(options
, HAS_CHANGES
);
3210 void diff_unmerge(struct diff_options
*options
,
3212 unsigned mode
, const unsigned char *sha1
)
3214 struct diff_filespec
*one
, *two
;
3215 one
= alloc_filespec(path
);
3216 two
= alloc_filespec(path
);
3217 fill_filespec(one
, sha1
, mode
);
3218 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;