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 int diff_use_color_default
= -1;
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
);
89 return git_config_string(&(drv
->cmd
), var
, value
);
93 * 'diff.<what>.funcname' attribute can be specified in the configuration
94 * to define a customized regexp to find the beginning of a function to
95 * be used for hunk header lines of "diff -p" style output.
97 static struct funcname_pattern
{
100 struct funcname_pattern
*next
;
101 } *funcname_pattern_list
;
103 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
)
107 struct funcname_pattern
*pp
;
109 name
= var
+ 5; /* "diff." */
112 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
113 if (!strncmp(pp
->name
, name
, namelen
) && !pp
->name
[namelen
])
116 pp
= xcalloc(1, sizeof(*pp
));
117 pp
->name
= xmemdupz(name
, namelen
);
118 pp
->next
= funcname_pattern_list
;
119 funcname_pattern_list
= pp
;
122 pp
->pattern
= xstrdup(value
);
127 * These are to give UI layer defaults.
128 * The core-level commands such as git-diff-files should
129 * never be affected by the setting of diff.renames
130 * the user happens to have in the configuration file.
132 int git_diff_ui_config(const char *var
, const char *value
)
134 if (!strcmp(var
, "diff.renamelimit")) {
135 diff_rename_limit_default
= git_config_int(var
, value
);
138 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
139 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
142 if (!strcmp(var
, "diff.renames")) {
144 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
145 else if (!strcasecmp(value
, "copies") ||
146 !strcasecmp(value
, "copy"))
147 diff_detect_rename_default
= DIFF_DETECT_COPY
;
148 else if (git_config_bool(var
,value
))
149 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
152 if (!strcmp(var
, "diff.autorefreshindex")) {
153 diff_auto_refresh_index
= git_config_bool(var
, value
);
156 if (!strcmp(var
, "diff.external")) {
158 return config_error_nonbool(var
);
159 external_diff_cmd_cfg
= xstrdup(value
);
162 if (!prefixcmp(var
, "diff.")) {
163 const char *ep
= strrchr(var
, '.');
165 if (ep
!= var
+ 4 && !strcmp(ep
, ".command"))
166 return parse_lldiff_command(var
, ep
, value
);
169 return git_diff_basic_config(var
, value
);
172 int git_diff_basic_config(const char *var
, const char *value
)
174 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
175 int slot
= parse_diff_color_slot(var
, 11);
177 return config_error_nonbool(var
);
178 color_parse(value
, var
, diff_colors
[slot
]);
182 if (!prefixcmp(var
, "diff.")) {
183 const char *ep
= strrchr(var
, '.');
185 if (!strcmp(ep
, ".funcname")) {
187 return config_error_nonbool(var
);
188 return parse_funcname_pattern(var
, ep
, value
);
193 return git_color_default_config(var
, value
);
196 static char *quote_two(const char *one
, const char *two
)
198 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
199 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
202 strbuf_init(&res
, 0);
203 if (need_one
+ need_two
) {
204 strbuf_addch(&res
, '"');
205 quote_c_style(one
, &res
, NULL
, 1);
206 quote_c_style(two
, &res
, NULL
, 1);
207 strbuf_addch(&res
, '"');
209 strbuf_addstr(&res
, one
);
210 strbuf_addstr(&res
, two
);
212 return strbuf_detach(&res
, NULL
);
215 static const char *external_diff(void)
217 static const char *external_diff_cmd
= NULL
;
218 static int done_preparing
= 0;
221 return external_diff_cmd
;
222 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
223 if (!external_diff_cmd
)
224 external_diff_cmd
= external_diff_cmd_cfg
;
226 return external_diff_cmd
;
229 static struct diff_tempfile
{
230 const char *name
; /* filename external diff should read from */
233 char tmp_path
[PATH_MAX
];
236 static int count_lines(const char *data
, int size
)
238 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
245 completely_empty
= 0;
249 completely_empty
= 0;
252 if (completely_empty
)
255 count
++; /* no trailing newline */
259 static void print_line_count(int count
)
269 printf("1,%d", count
);
274 static void copy_file(int prefix
, const char *data
, int size
,
275 const char *set
, const char *reset
)
277 int ch
, nl_just_seen
= 1;
286 fputs(reset
, stdout
);
292 printf("%s\n\\ No newline at end of file\n", reset
);
295 static void emit_rewrite_diff(const char *name_a
,
297 struct diff_filespec
*one
,
298 struct diff_filespec
*two
,
299 struct diff_options
*o
)
302 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
303 const char *name_a_tab
, *name_b_tab
;
304 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
305 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
306 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
307 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
308 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
309 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
311 name_a
+= (*name_a
== '/');
312 name_b
+= (*name_b
== '/');
313 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
314 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
316 strbuf_reset(&a_name
);
317 strbuf_reset(&b_name
);
318 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
319 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
321 diff_populate_filespec(one
, 0);
322 diff_populate_filespec(two
, 0);
323 lc_a
= count_lines(one
->data
, one
->size
);
324 lc_b
= count_lines(two
->data
, two
->size
);
325 printf("%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
326 metainfo
, a_name
.buf
, name_a_tab
, reset
,
327 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
328 print_line_count(lc_a
);
330 print_line_count(lc_b
);
331 printf(" @@%s\n", reset
);
333 copy_file('-', one
->data
, one
->size
, old
, reset
);
335 copy_file('+', two
->data
, two
->size
, new, reset
);
338 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
340 if (!DIFF_FILE_VALID(one
)) {
341 mf
->ptr
= (char *)""; /* does not matter */
345 else if (diff_populate_filespec(one
, 0))
348 mf
->size
= one
->size
;
352 struct diff_words_buffer
{
355 long current
; /* output pointer */
356 int suppressed_newline
;
359 static void diff_words_append(char *line
, unsigned long len
,
360 struct diff_words_buffer
*buffer
)
362 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
363 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
364 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
368 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
369 buffer
->text
.size
+= len
;
372 struct diff_words_data
{
373 struct xdiff_emit_state xm
;
374 struct diff_words_buffer minus
, plus
;
377 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
378 int suppress_newline
)
386 ptr
= buffer
->text
.ptr
+ buffer
->current
;
387 buffer
->current
+= len
;
389 if (ptr
[len
- 1] == '\n') {
394 fputs(diff_get_color(1, color
), stdout
);
395 fwrite(ptr
, len
, 1, stdout
);
396 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
399 if (suppress_newline
)
400 buffer
->suppressed_newline
= 1;
406 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
408 struct diff_words_data
*diff_words
= priv
;
410 if (diff_words
->minus
.suppressed_newline
) {
413 diff_words
->minus
.suppressed_newline
= 0;
419 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
422 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
425 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
426 diff_words
->minus
.current
+= len
;
431 /* this executes the word diff on the accumulated buffers */
432 static void diff_words_show(struct diff_words_data
*diff_words
)
437 mmfile_t minus
, plus
;
440 memset(&xecfg
, 0, sizeof(xecfg
));
441 minus
.size
= diff_words
->minus
.text
.size
;
442 minus
.ptr
= xmalloc(minus
.size
);
443 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
444 for (i
= 0; i
< minus
.size
; i
++)
445 if (isspace(minus
.ptr
[i
]))
447 diff_words
->minus
.current
= 0;
449 plus
.size
= diff_words
->plus
.text
.size
;
450 plus
.ptr
= xmalloc(plus
.size
);
451 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
452 for (i
= 0; i
< plus
.size
; i
++)
453 if (isspace(plus
.ptr
[i
]))
455 diff_words
->plus
.current
= 0;
457 xpp
.flags
= XDF_NEED_MINIMAL
;
458 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
459 ecb
.outf
= xdiff_outf
;
460 ecb
.priv
= diff_words
;
461 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
462 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
466 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
468 if (diff_words
->minus
.suppressed_newline
) {
470 diff_words
->minus
.suppressed_newline
= 0;
474 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
476 struct emit_callback
{
477 struct xdiff_emit_state xm
;
478 int nparents
, color_diff
;
480 sane_truncate_fn truncate
;
481 const char **label_path
;
482 struct diff_words_data
*diff_words
;
486 static void free_diff_words_data(struct emit_callback
*ecbdata
)
488 if (ecbdata
->diff_words
) {
490 if (ecbdata
->diff_words
->minus
.text
.size
||
491 ecbdata
->diff_words
->plus
.text
.size
)
492 diff_words_show(ecbdata
->diff_words
);
494 free (ecbdata
->diff_words
->minus
.text
.ptr
);
495 free (ecbdata
->diff_words
->plus
.text
.ptr
);
496 free(ecbdata
->diff_words
);
497 ecbdata
->diff_words
= NULL
;
501 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
504 return diff_colors
[ix
];
508 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
511 fwrite(line
, len
, 1, stdout
);
512 fputs(reset
, stdout
);
515 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
517 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
518 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
521 emit_line(set
, reset
, line
, len
);
523 /* Emit just the prefix, then the rest. */
524 emit_line(set
, reset
, line
, ecbdata
->nparents
);
525 (void)check_and_emit_line(line
+ ecbdata
->nparents
,
526 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
527 stdout
, set
, reset
, ws
);
531 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
538 return ecb
->truncate(line
, len
);
542 (void) utf8_width(&cp
, &l
);
544 break; /* truncated in the middle? */
549 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
553 struct emit_callback
*ecbdata
= priv
;
554 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
555 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
556 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
558 *(ecbdata
->found_changesp
) = 1;
560 if (ecbdata
->label_path
[0]) {
561 const char *name_a_tab
, *name_b_tab
;
563 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
564 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
566 printf("%s--- %s%s%s\n",
567 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
568 printf("%s+++ %s%s%s\n",
569 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
570 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
573 /* This is not really necessary for now because
574 * this codepath only deals with two-way diffs.
576 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
578 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
579 ecbdata
->nparents
= i
- 1;
580 len
= sane_truncate_line(ecbdata
, line
, len
);
581 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
583 if (line
[len
-1] != '\n')
588 if (len
< ecbdata
->nparents
) {
589 emit_line(reset
, reset
, line
, len
);
594 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
595 /* fall back to normal diff */
596 free_diff_words_data(ecbdata
);
597 if (ecbdata
->diff_words
) {
598 if (line
[0] == '-') {
599 diff_words_append(line
, len
,
600 &ecbdata
->diff_words
->minus
);
602 } else if (line
[0] == '+') {
603 diff_words_append(line
, len
,
604 &ecbdata
->diff_words
->plus
);
607 if (ecbdata
->diff_words
->minus
.text
.size
||
608 ecbdata
->diff_words
->plus
.text
.size
)
609 diff_words_show(ecbdata
->diff_words
);
612 emit_line(plain
, reset
, line
, len
);
615 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
617 color
= DIFF_FILE_OLD
;
618 else if (line
[i
] == '+')
619 color
= DIFF_FILE_NEW
;
622 if (color
!= DIFF_FILE_NEW
) {
623 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
627 emit_add_line(reset
, ecbdata
, line
, len
);
630 static char *pprint_rename(const char *a
, const char *b
)
635 int pfx_length
, sfx_length
;
636 int len_a
= strlen(a
);
637 int len_b
= strlen(b
);
638 int a_midlen
, b_midlen
;
639 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
640 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
642 strbuf_init(&name
, 0);
643 if (qlen_a
|| qlen_b
) {
644 quote_c_style(a
, &name
, NULL
, 0);
645 strbuf_addstr(&name
, " => ");
646 quote_c_style(b
, &name
, NULL
, 0);
647 return strbuf_detach(&name
, NULL
);
650 /* Find common prefix */
652 while (*old
&& *new && *old
== *new) {
654 pfx_length
= old
- a
+ 1;
659 /* Find common suffix */
663 while (a
<= old
&& b
<= new && *old
== *new) {
665 sfx_length
= len_a
- (old
- a
);
671 * pfx{mid-a => mid-b}sfx
672 * {pfx-a => pfx-b}sfx
673 * pfx{sfx-a => sfx-b}
676 a_midlen
= len_a
- pfx_length
- sfx_length
;
677 b_midlen
= len_b
- pfx_length
- sfx_length
;
683 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
684 if (pfx_length
+ sfx_length
) {
685 strbuf_add(&name
, a
, pfx_length
);
686 strbuf_addch(&name
, '{');
688 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
689 strbuf_addstr(&name
, " => ");
690 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
691 if (pfx_length
+ sfx_length
) {
692 strbuf_addch(&name
, '}');
693 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
695 return strbuf_detach(&name
, NULL
);
699 struct xdiff_emit_state xm
;
703 struct diffstat_file
{
707 unsigned is_unmerged
:1;
708 unsigned is_binary
:1;
709 unsigned is_renamed
:1;
710 unsigned int added
, deleted
;
714 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
718 struct diffstat_file
*x
;
719 x
= xcalloc(sizeof (*x
), 1);
720 if (diffstat
->nr
== diffstat
->alloc
) {
721 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
722 diffstat
->files
= xrealloc(diffstat
->files
,
723 diffstat
->alloc
* sizeof(x
));
725 diffstat
->files
[diffstat
->nr
++] = x
;
727 x
->from_name
= xstrdup(name_a
);
728 x
->name
= xstrdup(name_b
);
733 x
->name
= xstrdup(name_a
);
738 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
740 struct diffstat_t
*diffstat
= priv
;
741 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
745 else if (line
[0] == '-')
749 const char mime_boundary_leader
[] = "------------";
751 static int scale_linear(int it
, int width
, int max_change
)
754 * make sure that at least one '-' is printed if there were deletions,
755 * and likewise for '+'.
759 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
762 static void show_name(const char *prefix
, const char *name
, int len
,
763 const char *reset
, const char *set
)
765 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
768 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
778 static void fill_print_name(struct diffstat_file
*file
)
782 if (file
->print_name
)
785 if (!file
->is_renamed
) {
787 strbuf_init(&buf
, 0);
788 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
789 pname
= strbuf_detach(&buf
, NULL
);
792 strbuf_release(&buf
);
795 pname
= pprint_rename(file
->from_name
, file
->name
);
797 file
->print_name
= pname
;
800 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
802 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
803 int max_change
= 0, max_len
= 0;
804 int total_files
= data
->nr
;
805 int width
, name_width
;
806 const char *reset
, *set
, *add_c
, *del_c
;
811 width
= options
->stat_width
? options
->stat_width
: 80;
812 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
814 /* Sanity: give at least 5 columns to the graph,
815 * but leave at least 10 columns for the name.
817 if (width
< name_width
+ 15) {
818 if (name_width
<= 25)
819 width
= name_width
+ 15;
821 name_width
= width
- 15;
824 /* Find the longest filename and max number of changes */
825 reset
= diff_get_color_opt(options
, DIFF_RESET
);
826 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
827 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
828 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
830 for (i
= 0; i
< data
->nr
; i
++) {
831 struct diffstat_file
*file
= data
->files
[i
];
832 int change
= file
->added
+ file
->deleted
;
833 fill_print_name(file
);
834 len
= strlen(file
->print_name
);
838 if (file
->is_binary
|| file
->is_unmerged
)
840 if (max_change
< change
)
844 /* Compute the width of the graph part;
845 * 10 is for one blank at the beginning of the line plus
846 * " | count " between the name and the graph.
848 * From here on, name_width is the width of the name area,
849 * and width is the width of the graph area.
851 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
852 if (width
< (name_width
+ 10) + max_change
)
853 width
= width
- (name_width
+ 10);
857 for (i
= 0; i
< data
->nr
; i
++) {
858 const char *prefix
= "";
859 char *name
= data
->files
[i
]->print_name
;
860 int added
= data
->files
[i
]->added
;
861 int deleted
= data
->files
[i
]->deleted
;
865 * "scale" the filename
868 name_len
= strlen(name
);
869 if (name_width
< name_len
) {
873 name
+= name_len
- len
;
874 slash
= strchr(name
, '/');
879 if (data
->files
[i
]->is_binary
) {
880 show_name(prefix
, name
, len
, reset
, set
);
882 printf("%s%d%s", del_c
, deleted
, reset
);
884 printf("%s%d%s", add_c
, added
, reset
);
889 else if (data
->files
[i
]->is_unmerged
) {
890 show_name(prefix
, name
, len
, reset
, set
);
891 printf(" Unmerged\n");
894 else if (!data
->files
[i
]->is_renamed
&&
895 (added
+ deleted
== 0)) {
901 * scale the add/delete
909 if (width
<= max_change
) {
910 add
= scale_linear(add
, width
, max_change
);
911 del
= scale_linear(del
, width
, max_change
);
914 show_name(prefix
, name
, len
, reset
, set
);
915 printf("%5d ", added
+ deleted
);
916 show_graph('+', add
, add_c
, reset
);
917 show_graph('-', del
, del_c
, reset
);
920 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
921 set
, total_files
, adds
, dels
, reset
);
924 static void show_shortstats(struct diffstat_t
* data
)
926 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
931 for (i
= 0; i
< data
->nr
; i
++) {
932 if (!data
->files
[i
]->is_binary
&&
933 !data
->files
[i
]->is_unmerged
) {
934 int added
= data
->files
[i
]->added
;
935 int deleted
= data
->files
[i
]->deleted
;
936 if (!data
->files
[i
]->is_renamed
&&
937 (added
+ deleted
== 0)) {
945 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
946 total_files
, adds
, dels
);
949 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
956 for (i
= 0; i
< data
->nr
; i
++) {
957 struct diffstat_file
*file
= data
->files
[i
];
962 printf("%d\t%d\t", file
->added
, file
->deleted
);
963 if (options
->line_termination
) {
964 fill_print_name(file
);
965 if (!file
->is_renamed
)
966 write_name_quoted(file
->name
, stdout
,
967 options
->line_termination
);
969 fputs(file
->print_name
, stdout
);
970 putchar(options
->line_termination
);
973 if (file
->is_renamed
) {
975 write_name_quoted(file
->from_name
, stdout
, '\0');
977 write_name_quoted(file
->name
, stdout
, '\0');
982 static void free_diffstat_info(struct diffstat_t
*diffstat
)
985 for (i
= 0; i
< diffstat
->nr
; i
++) {
986 struct diffstat_file
*f
= diffstat
->files
[i
];
987 if (f
->name
!= f
->print_name
)
993 free(diffstat
->files
);
997 struct xdiff_emit_state xm
;
998 const char *filename
;
999 int lineno
, color_diff
;
1004 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1006 struct checkdiff_t
*data
= priv
;
1007 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
1008 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
1009 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
1012 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
);
1024 } else if (line
[0] == ' ')
1026 else if (line
[0] == '@') {
1027 char *plus
= strchr(line
, '+');
1029 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1031 die("invalid diff");
1035 static unsigned char *deflate_it(char *data
,
1037 unsigned long *result_size
)
1040 unsigned char *deflated
;
1043 memset(&stream
, 0, sizeof(stream
));
1044 deflateInit(&stream
, zlib_compression_level
);
1045 bound
= deflateBound(&stream
, size
);
1046 deflated
= xmalloc(bound
);
1047 stream
.next_out
= deflated
;
1048 stream
.avail_out
= bound
;
1050 stream
.next_in
= (unsigned char *)data
;
1051 stream
.avail_in
= size
;
1052 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1054 deflateEnd(&stream
);
1055 *result_size
= stream
.total_out
;
1059 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
1065 unsigned long orig_size
;
1066 unsigned long delta_size
;
1067 unsigned long deflate_size
;
1068 unsigned long data_size
;
1070 /* We could do deflated delta, or we could do just deflated two,
1071 * whichever is smaller.
1074 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1075 if (one
->size
&& two
->size
) {
1076 delta
= diff_delta(one
->ptr
, one
->size
,
1077 two
->ptr
, two
->size
,
1078 &delta_size
, deflate_size
);
1080 void *to_free
= delta
;
1081 orig_size
= delta_size
;
1082 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1087 if (delta
&& delta_size
< deflate_size
) {
1088 printf("delta %lu\n", orig_size
);
1091 data_size
= delta_size
;
1094 printf("literal %lu\n", two
->size
);
1097 data_size
= deflate_size
;
1100 /* emit data encoded in base85 */
1103 int bytes
= (52 < data_size
) ? 52 : data_size
;
1107 line
[0] = bytes
+ 'A' - 1;
1109 line
[0] = bytes
- 26 + 'a' - 1;
1110 encode_85(line
+ 1, cp
, bytes
);
1111 cp
= (char *) cp
+ bytes
;
1118 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1120 printf("GIT binary patch\n");
1121 emit_binary_diff_body(one
, two
);
1122 emit_binary_diff_body(two
, one
);
1125 static void setup_diff_attr_check(struct git_attr_check
*check
)
1127 static struct git_attr
*attr_diff
;
1130 attr_diff
= git_attr("diff", 4);
1132 check
[0].attr
= attr_diff
;
1135 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1137 struct git_attr_check attr_diff_check
;
1138 int check_from_data
= 0;
1140 if (one
->checked_attr
)
1143 setup_diff_attr_check(&attr_diff_check
);
1145 one
->funcname_pattern_ident
= NULL
;
1147 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1151 value
= attr_diff_check
.value
;
1152 if (ATTR_TRUE(value
))
1154 else if (ATTR_FALSE(value
))
1157 check_from_data
= 1;
1159 /* funcname pattern ident */
1160 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1163 one
->funcname_pattern_ident
= value
;
1166 if (check_from_data
) {
1167 if (!one
->data
&& DIFF_FILE_VALID(one
))
1168 diff_populate_filespec(one
, 0);
1171 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1175 int diff_filespec_is_binary(struct diff_filespec
*one
)
1177 diff_filespec_check_attr(one
);
1178 return one
->is_binary
;
1181 static const char *funcname_pattern(const char *ident
)
1183 struct funcname_pattern
*pp
;
1185 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1186 if (!strcmp(ident
, pp
->name
))
1191 static struct builtin_funcname_pattern
{
1193 const char *pattern
;
1194 } builtin_funcname_pattern
[] = {
1195 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1196 "new\\|return\\|switch\\|throw\\|while\\)\n"
1198 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1200 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1203 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1205 const char *ident
, *pattern
;
1208 diff_filespec_check_attr(one
);
1209 ident
= one
->funcname_pattern_ident
;
1213 * If the config file has "funcname.default" defined, that
1214 * regexp is used; otherwise NULL is returned and xemit uses
1215 * the built-in default.
1217 return funcname_pattern("default");
1219 /* Look up custom "funcname.$ident" regexp from config. */
1220 pattern
= funcname_pattern(ident
);
1225 * And define built-in fallback patterns here. Note that
1226 * these can be overridden by the user's config settings.
1228 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1229 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1230 return builtin_funcname_pattern
[i
].pattern
;
1235 static void builtin_diff(const char *name_a
,
1237 struct diff_filespec
*one
,
1238 struct diff_filespec
*two
,
1239 const char *xfrm_msg
,
1240 struct diff_options
*o
,
1241 int complete_rewrite
)
1245 char *a_one
, *b_two
;
1246 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1247 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1249 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1250 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1251 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1252 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1253 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1254 if (lbl
[0][0] == '/') {
1256 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1257 if (xfrm_msg
&& xfrm_msg
[0])
1258 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1260 else if (lbl
[1][0] == '/') {
1261 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1262 if (xfrm_msg
&& xfrm_msg
[0])
1263 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1266 if (one
->mode
!= two
->mode
) {
1267 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1268 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1270 if (xfrm_msg
&& xfrm_msg
[0])
1271 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1273 * we do not run diff between different kind
1276 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1277 goto free_ab_and_return
;
1278 if (complete_rewrite
) {
1279 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1280 o
->found_changes
= 1;
1281 goto free_ab_and_return
;
1285 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1286 die("unable to read files to diff");
1288 if (!DIFF_OPT_TST(o
, TEXT
) &&
1289 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1290 /* Quite common confusing case */
1291 if (mf1
.size
== mf2
.size
&&
1292 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1293 goto free_ab_and_return
;
1294 if (DIFF_OPT_TST(o
, BINARY
))
1295 emit_binary_diff(&mf1
, &mf2
);
1297 printf("Binary files %s and %s differ\n",
1299 o
->found_changes
= 1;
1302 /* Crazy xdl interfaces.. */
1303 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1307 struct emit_callback ecbdata
;
1308 const char *funcname_pattern
;
1310 funcname_pattern
= diff_funcname_pattern(one
);
1311 if (!funcname_pattern
)
1312 funcname_pattern
= diff_funcname_pattern(two
);
1314 memset(&xecfg
, 0, sizeof(xecfg
));
1315 memset(&ecbdata
, 0, sizeof(ecbdata
));
1316 ecbdata
.label_path
= lbl
;
1317 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1318 ecbdata
.found_changesp
= &o
->found_changes
;
1319 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1320 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1321 xecfg
.ctxlen
= o
->context
;
1322 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1323 if (funcname_pattern
)
1324 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1327 else if (!prefixcmp(diffopts
, "--unified="))
1328 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1329 else if (!prefixcmp(diffopts
, "-u"))
1330 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1331 ecb
.outf
= xdiff_outf
;
1332 ecb
.priv
= &ecbdata
;
1333 ecbdata
.xm
.consume
= fn_out_consume
;
1334 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1335 ecbdata
.diff_words
=
1336 xcalloc(1, sizeof(struct diff_words_data
));
1337 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1338 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1339 free_diff_words_data(&ecbdata
);
1343 diff_free_filespec_data(one
);
1344 diff_free_filespec_data(two
);
1350 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1351 struct diff_filespec
*one
,
1352 struct diff_filespec
*two
,
1353 struct diffstat_t
*diffstat
,
1354 struct diff_options
*o
,
1355 int complete_rewrite
)
1358 struct diffstat_file
*data
;
1360 data
= diffstat_add(diffstat
, name_a
, name_b
);
1363 data
->is_unmerged
= 1;
1366 if (complete_rewrite
) {
1367 diff_populate_filespec(one
, 0);
1368 diff_populate_filespec(two
, 0);
1369 data
->deleted
= count_lines(one
->data
, one
->size
);
1370 data
->added
= count_lines(two
->data
, two
->size
);
1371 goto free_and_return
;
1373 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1374 die("unable to read files to diff");
1376 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1377 data
->is_binary
= 1;
1378 data
->added
= mf2
.size
;
1379 data
->deleted
= mf1
.size
;
1381 /* Crazy xdl interfaces.. */
1386 memset(&xecfg
, 0, sizeof(xecfg
));
1387 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1388 ecb
.outf
= xdiff_outf
;
1389 ecb
.priv
= diffstat
;
1390 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1394 diff_free_filespec_data(one
);
1395 diff_free_filespec_data(two
);
1398 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1399 struct diff_filespec
*one
,
1400 struct diff_filespec
*two
, struct diff_options
*o
)
1403 struct checkdiff_t data
;
1408 memset(&data
, 0, sizeof(data
));
1409 data
.xm
.consume
= checkdiff_consume
;
1410 data
.filename
= name_b
? name_b
: name_a
;
1412 data
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1413 data
.ws_rule
= whitespace_rule(data
.filename
);
1415 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1416 die("unable to read files to diff");
1418 if (diff_filespec_is_binary(two
))
1419 goto free_and_return
;
1421 /* Crazy xdl interfaces.. */
1426 memset(&xecfg
, 0, sizeof(xecfg
));
1427 xpp
.flags
= XDF_NEED_MINIMAL
;
1428 ecb
.outf
= xdiff_outf
;
1430 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1433 diff_free_filespec_data(one
);
1434 diff_free_filespec_data(two
);
1436 DIFF_OPT_SET(o
, CHECK_FAILED
);
1439 struct diff_filespec
*alloc_filespec(const char *path
)
1441 int namelen
= strlen(path
);
1442 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1444 memset(spec
, 0, sizeof(*spec
));
1445 spec
->path
= (char *)(spec
+ 1);
1446 memcpy(spec
->path
, path
, namelen
+1);
1451 void free_filespec(struct diff_filespec
*spec
)
1453 if (!--spec
->count
) {
1454 diff_free_filespec_data(spec
);
1459 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1460 unsigned short mode
)
1463 spec
->mode
= canon_mode(mode
);
1464 hashcpy(spec
->sha1
, sha1
);
1465 spec
->sha1_valid
= !is_null_sha1(sha1
);
1470 * Given a name and sha1 pair, if the index tells us the file in
1471 * the work tree has that object contents, return true, so that
1472 * prepare_temp_file() does not have to inflate and extract.
1474 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1476 struct cache_entry
*ce
;
1480 /* We do not read the cache ourselves here, because the
1481 * benchmark with my previous version that always reads cache
1482 * shows that it makes things worse for diff-tree comparing
1483 * two linux-2.6 kernel trees in an already checked out work
1484 * tree. This is because most diff-tree comparisons deal with
1485 * only a small number of files, while reading the cache is
1486 * expensive for a large project, and its cost outweighs the
1487 * savings we get by not inflating the object to a temporary
1488 * file. Practically, this code only helps when we are used
1489 * by diff-cache --cached, which does read the cache before
1495 /* We want to avoid the working directory if our caller
1496 * doesn't need the data in a normal file, this system
1497 * is rather slow with its stat/open/mmap/close syscalls,
1498 * and the object is contained in a pack file. The pack
1499 * is probably already open and will be faster to obtain
1500 * the data through than the working directory. Loose
1501 * objects however would tend to be slower as they need
1502 * to be individually opened and inflated.
1504 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1508 pos
= cache_name_pos(name
, len
);
1511 ce
= active_cache
[pos
];
1514 * This is not the sha1 we are looking for, or
1515 * unreusable because it is not a regular file.
1517 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1521 * If ce matches the file in the work tree, we can reuse it.
1523 if (ce_uptodate(ce
) ||
1524 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1530 static int populate_from_stdin(struct diff_filespec
*s
)
1535 strbuf_init(&buf
, 0);
1536 if (strbuf_read(&buf
, 0, 0) < 0)
1537 return error("error while reading from stdin %s",
1540 s
->should_munmap
= 0;
1541 s
->data
= strbuf_detach(&buf
, &size
);
1547 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1550 char *data
= xmalloc(100);
1551 len
= snprintf(data
, 100,
1552 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1564 * While doing rename detection and pickaxe operation, we may need to
1565 * grab the data for the blob (or file) for our own in-core comparison.
1566 * diff_filespec has data and size fields for this purpose.
1568 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1571 if (!DIFF_FILE_VALID(s
))
1572 die("internal error: asking to populate invalid file.");
1573 if (S_ISDIR(s
->mode
))
1579 if (size_only
&& 0 < s
->size
)
1582 if (S_ISGITLINK(s
->mode
))
1583 return diff_populate_gitlink(s
, size_only
);
1585 if (!s
->sha1_valid
||
1586 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1591 if (!strcmp(s
->path
, "-"))
1592 return populate_from_stdin(s
);
1594 if (lstat(s
->path
, &st
) < 0) {
1595 if (errno
== ENOENT
) {
1599 s
->data
= (char *)"";
1604 s
->size
= xsize_t(st
.st_size
);
1609 if (S_ISLNK(st
.st_mode
)) {
1611 s
->data
= xmalloc(s
->size
);
1613 ret
= readlink(s
->path
, s
->data
, s
->size
);
1620 fd
= open(s
->path
, O_RDONLY
);
1623 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1625 s
->should_munmap
= 1;
1628 * Convert from working tree format to canonical git format
1630 strbuf_init(&buf
, 0);
1631 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
1633 munmap(s
->data
, s
->size
);
1634 s
->should_munmap
= 0;
1635 s
->data
= strbuf_detach(&buf
, &size
);
1641 enum object_type type
;
1643 type
= sha1_object_info(s
->sha1
, &s
->size
);
1645 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1652 void diff_free_filespec_blob(struct diff_filespec
*s
)
1656 else if (s
->should_munmap
)
1657 munmap(s
->data
, s
->size
);
1659 if (s
->should_free
|| s
->should_munmap
) {
1660 s
->should_free
= s
->should_munmap
= 0;
1665 void diff_free_filespec_data(struct diff_filespec
*s
)
1667 diff_free_filespec_blob(s
);
1672 static void prep_temp_blob(struct diff_tempfile
*temp
,
1675 const unsigned char *sha1
,
1680 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1682 die("unable to create temp-file: %s", strerror(errno
));
1683 if (write_in_full(fd
, blob
, size
) != size
)
1684 die("unable to write temp-file");
1686 temp
->name
= temp
->tmp_path
;
1687 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1689 sprintf(temp
->mode
, "%06o", mode
);
1692 static void prepare_temp_file(const char *name
,
1693 struct diff_tempfile
*temp
,
1694 struct diff_filespec
*one
)
1696 if (!DIFF_FILE_VALID(one
)) {
1698 /* A '-' entry produces this for file-2, and
1699 * a '+' entry produces this for file-1.
1701 temp
->name
= "/dev/null";
1702 strcpy(temp
->hex
, ".");
1703 strcpy(temp
->mode
, ".");
1707 if (!one
->sha1_valid
||
1708 reuse_worktree_file(name
, one
->sha1
, 1)) {
1710 if (lstat(name
, &st
) < 0) {
1711 if (errno
== ENOENT
)
1712 goto not_a_valid_file
;
1713 die("stat(%s): %s", name
, strerror(errno
));
1715 if (S_ISLNK(st
.st_mode
)) {
1717 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1718 size_t sz
= xsize_t(st
.st_size
);
1719 if (sizeof(buf
) <= st
.st_size
)
1720 die("symlink too long: %s", name
);
1721 ret
= readlink(name
, buf
, sz
);
1723 die("readlink(%s)", name
);
1724 prep_temp_blob(temp
, buf
, sz
,
1726 one
->sha1
: null_sha1
),
1728 one
->mode
: S_IFLNK
));
1731 /* we can borrow from the file in the work tree */
1733 if (!one
->sha1_valid
)
1734 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1736 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1737 /* Even though we may sometimes borrow the
1738 * contents from the work tree, we always want
1739 * one->mode. mode is trustworthy even when
1740 * !(one->sha1_valid), as long as
1741 * DIFF_FILE_VALID(one).
1743 sprintf(temp
->mode
, "%06o", one
->mode
);
1748 if (diff_populate_filespec(one
, 0))
1749 die("cannot read data blob for %s", one
->path
);
1750 prep_temp_blob(temp
, one
->data
, one
->size
,
1751 one
->sha1
, one
->mode
);
1755 static void remove_tempfile(void)
1759 for (i
= 0; i
< 2; i
++)
1760 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1761 unlink(diff_temp
[i
].name
);
1762 diff_temp
[i
].name
= NULL
;
1766 static void remove_tempfile_on_signal(int signo
)
1769 signal(SIGINT
, SIG_DFL
);
1773 /* An external diff command takes:
1775 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1776 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1779 static void run_external_diff(const char *pgm
,
1782 struct diff_filespec
*one
,
1783 struct diff_filespec
*two
,
1784 const char *xfrm_msg
,
1785 int complete_rewrite
)
1787 const char *spawn_arg
[10];
1788 struct diff_tempfile
*temp
= diff_temp
;
1790 static int atexit_asked
= 0;
1791 const char *othername
;
1792 const char **arg
= &spawn_arg
[0];
1794 othername
= (other
? other
: name
);
1796 prepare_temp_file(name
, &temp
[0], one
);
1797 prepare_temp_file(othername
, &temp
[1], two
);
1798 if (! atexit_asked
&&
1799 (temp
[0].name
== temp
[0].tmp_path
||
1800 temp
[1].name
== temp
[1].tmp_path
)) {
1802 atexit(remove_tempfile
);
1804 signal(SIGINT
, remove_tempfile_on_signal
);
1810 *arg
++ = temp
[0].name
;
1811 *arg
++ = temp
[0].hex
;
1812 *arg
++ = temp
[0].mode
;
1813 *arg
++ = temp
[1].name
;
1814 *arg
++ = temp
[1].hex
;
1815 *arg
++ = temp
[1].mode
;
1826 retval
= run_command_v_opt(spawn_arg
, 0);
1829 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1834 static const char *external_diff_attr(const char *name
)
1836 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 struct diff_filespec
*one
,
1858 struct diff_filespec
*two
,
1859 const char *xfrm_msg
,
1860 struct diff_options
*o
,
1861 int complete_rewrite
)
1863 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
1866 const char *cmd
= external_diff_attr(name
);
1872 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
1877 builtin_diff(name
, other
? other
: name
,
1878 one
, two
, xfrm_msg
, o
, complete_rewrite
);
1880 printf("* Unmerged path %s\n", name
);
1883 static void diff_fill_sha1_info(struct diff_filespec
*one
)
1885 if (DIFF_FILE_VALID(one
)) {
1886 if (!one
->sha1_valid
) {
1888 if (!strcmp(one
->path
, "-")) {
1889 hashcpy(one
->sha1
, null_sha1
);
1892 if (lstat(one
->path
, &st
) < 0)
1893 die("stat %s", one
->path
);
1894 if (index_path(one
->sha1
, one
->path
, &st
, 0))
1895 die("cannot hash %s\n", one
->path
);
1902 static int similarity_index(struct diff_filepair
*p
)
1904 return p
->score
* 100 / MAX_SCORE
;
1907 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
1909 const char *pgm
= external_diff();
1912 struct diff_filespec
*one
= p
->one
;
1913 struct diff_filespec
*two
= p
->two
;
1916 int complete_rewrite
= 0;
1919 if (DIFF_PAIR_UNMERGED(p
)) {
1920 run_diff_cmd(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
, o
, 0);
1924 name
= p
->one
->path
;
1925 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1926 diff_fill_sha1_info(one
);
1927 diff_fill_sha1_info(two
);
1929 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
1930 switch (p
->status
) {
1931 case DIFF_STATUS_COPIED
:
1932 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1933 strbuf_addstr(&msg
, "\ncopy from ");
1934 quote_c_style(name
, &msg
, NULL
, 0);
1935 strbuf_addstr(&msg
, "\ncopy to ");
1936 quote_c_style(other
, &msg
, NULL
, 0);
1937 strbuf_addch(&msg
, '\n');
1939 case DIFF_STATUS_RENAMED
:
1940 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1941 strbuf_addstr(&msg
, "\nrename from ");
1942 quote_c_style(name
, &msg
, NULL
, 0);
1943 strbuf_addstr(&msg
, "\nrename to ");
1944 quote_c_style(other
, &msg
, NULL
, 0);
1945 strbuf_addch(&msg
, '\n');
1947 case DIFF_STATUS_MODIFIED
:
1949 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
1950 similarity_index(p
));
1951 complete_rewrite
= 1;
1960 if (hashcmp(one
->sha1
, two
->sha1
)) {
1961 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
1963 if (DIFF_OPT_TST(o
, BINARY
)) {
1965 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
1966 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
1969 strbuf_addf(&msg
, "index %.*s..%.*s",
1970 abbrev
, sha1_to_hex(one
->sha1
),
1971 abbrev
, sha1_to_hex(two
->sha1
));
1972 if (one
->mode
== two
->mode
)
1973 strbuf_addf(&msg
, " %06o", one
->mode
);
1974 strbuf_addch(&msg
, '\n');
1978 strbuf_setlen(&msg
, msg
.len
- 1);
1979 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
1982 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
1983 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
1984 /* a filepair that changes between file and symlink
1985 * needs to be split into deletion and creation.
1987 struct diff_filespec
*null
= alloc_filespec(two
->path
);
1988 run_diff_cmd(NULL
, name
, other
, one
, null
, xfrm_msg
, o
, 0);
1990 null
= alloc_filespec(one
->path
);
1991 run_diff_cmd(NULL
, name
, other
, null
, two
, xfrm_msg
, o
, 0);
1995 run_diff_cmd(pgm
, name
, other
, one
, two
, xfrm_msg
, o
,
1998 strbuf_release(&msg
);
2001 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2002 struct diffstat_t
*diffstat
)
2006 int complete_rewrite
= 0;
2008 if (DIFF_PAIR_UNMERGED(p
)) {
2010 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2014 name
= p
->one
->path
;
2015 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2017 diff_fill_sha1_info(p
->one
);
2018 diff_fill_sha1_info(p
->two
);
2020 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2021 complete_rewrite
= 1;
2022 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2025 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2030 if (DIFF_PAIR_UNMERGED(p
)) {
2035 name
= p
->one
->path
;
2036 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2038 diff_fill_sha1_info(p
->one
);
2039 diff_fill_sha1_info(p
->two
);
2041 builtin_checkdiff(name
, other
, p
->one
, p
->two
, o
);
2044 void diff_setup(struct diff_options
*options
)
2046 memset(options
, 0, sizeof(*options
));
2047 options
->line_termination
= '\n';
2048 options
->break_opt
= -1;
2049 options
->rename_limit
= -1;
2050 options
->context
= 3;
2051 options
->msg_sep
= "";
2053 options
->change
= diff_change
;
2054 options
->add_remove
= diff_addremove
;
2055 if (diff_use_color_default
> 0)
2056 DIFF_OPT_SET(options
, COLOR_DIFF
);
2058 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2059 options
->detect_rename
= diff_detect_rename_default
;
2061 options
->a_prefix
= "a/";
2062 options
->b_prefix
= "b/";
2065 int diff_setup_done(struct diff_options
*options
)
2069 if (options
->output_format
& DIFF_FORMAT_NAME
)
2071 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2073 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2075 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2078 die("--name-only, --name-status, --check and -s are mutually exclusive");
2080 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2081 options
->detect_rename
= DIFF_DETECT_COPY
;
2083 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2084 DIFF_FORMAT_NAME_STATUS
|
2085 DIFF_FORMAT_CHECKDIFF
|
2086 DIFF_FORMAT_NO_OUTPUT
))
2087 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2088 DIFF_FORMAT_NUMSTAT
|
2089 DIFF_FORMAT_DIFFSTAT
|
2090 DIFF_FORMAT_SHORTSTAT
|
2091 DIFF_FORMAT_SUMMARY
|
2095 * These cases always need recursive; we do not drop caller-supplied
2096 * recursive bits for other formats here.
2098 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2099 DIFF_FORMAT_NUMSTAT
|
2100 DIFF_FORMAT_DIFFSTAT
|
2101 DIFF_FORMAT_SHORTSTAT
|
2102 DIFF_FORMAT_SUMMARY
|
2103 DIFF_FORMAT_CHECKDIFF
))
2104 DIFF_OPT_SET(options
, RECURSIVE
);
2106 * Also pickaxe would not work very well if you do not say recursive
2108 if (options
->pickaxe
)
2109 DIFF_OPT_SET(options
, RECURSIVE
);
2111 if (options
->detect_rename
&& options
->rename_limit
< 0)
2112 options
->rename_limit
= diff_rename_limit_default
;
2113 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2115 /* read-cache does not die even when it fails
2116 * so it is safe for us to do this here. Also
2117 * it does not smudge active_cache or active_nr
2118 * when it fails, so we do not have to worry about
2119 * cleaning it up ourselves either.
2123 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2124 options
->abbrev
= 40; /* full */
2127 * It does not make sense to show the first hit we happened
2128 * to have found. It does not make sense not to return with
2129 * exit code in such a case either.
2131 if (DIFF_OPT_TST(options
, QUIET
)) {
2132 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2133 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2137 * If we postprocess in diffcore, we cannot simply return
2138 * upon the first hit. We need to run diff as usual.
2140 if (options
->pickaxe
|| options
->filter
)
2141 DIFF_OPT_CLR(options
, QUIET
);
2146 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2156 if (c
== arg_short
) {
2160 if (val
&& isdigit(c
)) {
2162 int n
= strtoul(arg
, &end
, 10);
2173 eq
= strchr(arg
, '=');
2178 if (!len
|| strncmp(arg
, arg_long
, len
))
2183 if (!isdigit(*++eq
))
2185 n
= strtoul(eq
, &end
, 10);
2193 static int diff_scoreopt_parse(const char *opt
);
2195 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2197 const char *arg
= av
[0];
2199 /* Output format options */
2200 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2201 options
->output_format
|= DIFF_FORMAT_PATCH
;
2202 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2203 options
->output_format
|= DIFF_FORMAT_PATCH
;
2204 else if (!strcmp(arg
, "--raw"))
2205 options
->output_format
|= DIFF_FORMAT_RAW
;
2206 else if (!strcmp(arg
, "--patch-with-raw"))
2207 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2208 else if (!strcmp(arg
, "--numstat"))
2209 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2210 else if (!strcmp(arg
, "--shortstat"))
2211 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2212 else if (!strcmp(arg
, "--check"))
2213 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2214 else if (!strcmp(arg
, "--summary"))
2215 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2216 else if (!strcmp(arg
, "--patch-with-stat"))
2217 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2218 else if (!strcmp(arg
, "--name-only"))
2219 options
->output_format
|= DIFF_FORMAT_NAME
;
2220 else if (!strcmp(arg
, "--name-status"))
2221 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2222 else if (!strcmp(arg
, "-s"))
2223 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2224 else if (!prefixcmp(arg
, "--stat")) {
2226 int width
= options
->stat_width
;
2227 int name_width
= options
->stat_name_width
;
2233 if (!prefixcmp(arg
, "-width="))
2234 width
= strtoul(arg
+ 7, &end
, 10);
2235 else if (!prefixcmp(arg
, "-name-width="))
2236 name_width
= strtoul(arg
+ 12, &end
, 10);
2239 width
= strtoul(arg
+1, &end
, 10);
2241 name_width
= strtoul(end
+1, &end
, 10);
2244 /* Important! This checks all the error cases! */
2247 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2248 options
->stat_name_width
= name_width
;
2249 options
->stat_width
= width
;
2252 /* renames options */
2253 else if (!prefixcmp(arg
, "-B")) {
2254 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2257 else if (!prefixcmp(arg
, "-M")) {
2258 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2260 options
->detect_rename
= DIFF_DETECT_RENAME
;
2262 else if (!prefixcmp(arg
, "-C")) {
2263 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2264 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2265 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2267 options
->detect_rename
= DIFF_DETECT_COPY
;
2269 else if (!strcmp(arg
, "--no-renames"))
2270 options
->detect_rename
= 0;
2273 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2274 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2275 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2276 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2277 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2278 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2281 else if (!strcmp(arg
, "--binary")) {
2282 options
->output_format
|= DIFF_FORMAT_PATCH
;
2283 DIFF_OPT_SET(options
, BINARY
);
2285 else if (!strcmp(arg
, "--full-index"))
2286 DIFF_OPT_SET(options
, FULL_INDEX
);
2287 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2288 DIFF_OPT_SET(options
, TEXT
);
2289 else if (!strcmp(arg
, "-R"))
2290 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2291 else if (!strcmp(arg
, "--find-copies-harder"))
2292 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2293 else if (!strcmp(arg
, "--follow"))
2294 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2295 else if (!strcmp(arg
, "--color"))
2296 DIFF_OPT_SET(options
, COLOR_DIFF
);
2297 else if (!strcmp(arg
, "--no-color"))
2298 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2299 else if (!strcmp(arg
, "--color-words"))
2300 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2301 else if (!strcmp(arg
, "--exit-code"))
2302 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2303 else if (!strcmp(arg
, "--quiet"))
2304 DIFF_OPT_SET(options
, QUIET
);
2305 else if (!strcmp(arg
, "--ext-diff"))
2306 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2307 else if (!strcmp(arg
, "--no-ext-diff"))
2308 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2311 else if (!strcmp(arg
, "-z"))
2312 options
->line_termination
= 0;
2313 else if (!prefixcmp(arg
, "-l"))
2314 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2315 else if (!prefixcmp(arg
, "-S"))
2316 options
->pickaxe
= arg
+ 2;
2317 else if (!strcmp(arg
, "--pickaxe-all"))
2318 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2319 else if (!strcmp(arg
, "--pickaxe-regex"))
2320 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2321 else if (!prefixcmp(arg
, "-O"))
2322 options
->orderfile
= arg
+ 2;
2323 else if (!prefixcmp(arg
, "--diff-filter="))
2324 options
->filter
= arg
+ 14;
2325 else if (!strcmp(arg
, "--abbrev"))
2326 options
->abbrev
= DEFAULT_ABBREV
;
2327 else if (!prefixcmp(arg
, "--abbrev=")) {
2328 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2329 if (options
->abbrev
< MINIMUM_ABBREV
)
2330 options
->abbrev
= MINIMUM_ABBREV
;
2331 else if (40 < options
->abbrev
)
2332 options
->abbrev
= 40;
2334 else if (!prefixcmp(arg
, "--src-prefix="))
2335 options
->a_prefix
= arg
+ 13;
2336 else if (!prefixcmp(arg
, "--dst-prefix="))
2337 options
->b_prefix
= arg
+ 13;
2338 else if (!strcmp(arg
, "--no-prefix"))
2339 options
->a_prefix
= options
->b_prefix
= "";
2345 static int parse_num(const char **cp_p
)
2347 unsigned long num
, scale
;
2349 const char *cp
= *cp_p
;
2356 if ( !dot
&& ch
== '.' ) {
2359 } else if ( ch
== '%' ) {
2360 scale
= dot
? scale
*100 : 100;
2361 cp
++; /* % is always at the end */
2363 } else if ( ch
>= '0' && ch
<= '9' ) {
2364 if ( scale
< 100000 ) {
2366 num
= (num
*10) + (ch
-'0');
2375 /* user says num divided by scale and we say internally that
2376 * is MAX_SCORE * num / scale.
2378 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2381 static int diff_scoreopt_parse(const char *opt
)
2383 int opt1
, opt2
, cmd
;
2388 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2389 return -1; /* that is not a -M, -C nor -B option */
2391 opt1
= parse_num(&opt
);
2397 else if (*opt
!= '/')
2398 return -1; /* we expect -B80/99 or -B80 */
2401 opt2
= parse_num(&opt
);
2406 return opt1
| (opt2
<< 16);
2409 struct diff_queue_struct diff_queued_diff
;
2411 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2413 if (queue
->alloc
<= queue
->nr
) {
2414 queue
->alloc
= alloc_nr(queue
->alloc
);
2415 queue
->queue
= xrealloc(queue
->queue
,
2416 sizeof(dp
) * queue
->alloc
);
2418 queue
->queue
[queue
->nr
++] = dp
;
2421 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2422 struct diff_filespec
*one
,
2423 struct diff_filespec
*two
)
2425 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2433 void diff_free_filepair(struct diff_filepair
*p
)
2435 free_filespec(p
->one
);
2436 free_filespec(p
->two
);
2440 /* This is different from find_unique_abbrev() in that
2441 * it stuffs the result with dots for alignment.
2443 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2448 return sha1_to_hex(sha1
);
2450 abbrev
= find_unique_abbrev(sha1
, len
);
2452 return sha1_to_hex(sha1
);
2453 abblen
= strlen(abbrev
);
2455 static char hex
[41];
2456 if (len
< abblen
&& abblen
<= len
+ 2)
2457 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2459 sprintf(hex
, "%s...", abbrev
);
2462 return sha1_to_hex(sha1
);
2465 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2467 int line_termination
= opt
->line_termination
;
2468 int inter_name_termination
= line_termination
? '\t' : '\0';
2470 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2471 printf(":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2472 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2473 printf("%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2476 printf("%c%03d%c", p
->status
, similarity_index(p
),
2477 inter_name_termination
);
2479 printf("%c%c", p
->status
, inter_name_termination
);
2482 if (p
->status
== DIFF_STATUS_COPIED
|| p
->status
== DIFF_STATUS_RENAMED
) {
2483 write_name_quoted(p
->one
->path
, stdout
, inter_name_termination
);
2484 write_name_quoted(p
->two
->path
, stdout
, line_termination
);
2486 const char *path
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2487 write_name_quoted(path
, stdout
, line_termination
);
2491 int diff_unmodified_pair(struct diff_filepair
*p
)
2493 /* This function is written stricter than necessary to support
2494 * the currently implemented transformers, but the idea is to
2495 * let transformers to produce diff_filepairs any way they want,
2496 * and filter and clean them up here before producing the output.
2498 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2500 if (DIFF_PAIR_UNMERGED(p
))
2501 return 0; /* unmerged is interesting */
2503 /* deletion, addition, mode or type change
2504 * and rename are all interesting.
2506 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2507 DIFF_PAIR_MODE_CHANGED(p
) ||
2508 strcmp(one
->path
, two
->path
))
2511 /* both are valid and point at the same path. that is, we are
2512 * dealing with a change.
2514 if (one
->sha1_valid
&& two
->sha1_valid
&&
2515 !hashcmp(one
->sha1
, two
->sha1
))
2516 return 1; /* no change */
2517 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2518 return 1; /* both look at the same file on the filesystem. */
2522 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2524 if (diff_unmodified_pair(p
))
2527 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2528 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2529 return; /* no tree diffs in patch format */
2534 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2535 struct diffstat_t
*diffstat
)
2537 if (diff_unmodified_pair(p
))
2540 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2541 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2542 return; /* no tree diffs in patch format */
2544 run_diffstat(p
, o
, diffstat
);
2547 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2548 struct diff_options
*o
)
2550 if (diff_unmodified_pair(p
))
2553 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2554 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2555 return; /* no tree diffs in patch format */
2557 run_checkdiff(p
, o
);
2560 int diff_queue_is_empty(void)
2562 struct diff_queue_struct
*q
= &diff_queued_diff
;
2564 for (i
= 0; i
< q
->nr
; i
++)
2565 if (!diff_unmodified_pair(q
->queue
[i
]))
2571 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2573 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2576 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2578 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2579 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2581 s
->size
, s
->xfrm_flags
);
2584 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2586 diff_debug_filespec(p
->one
, i
, "one");
2587 diff_debug_filespec(p
->two
, i
, "two");
2588 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2589 p
->score
, p
->status
? p
->status
: '?',
2590 p
->one
->rename_used
, p
->broken_pair
);
2593 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2597 fprintf(stderr
, "%s\n", msg
);
2598 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2599 for (i
= 0; i
< q
->nr
; i
++) {
2600 struct diff_filepair
*p
= q
->queue
[i
];
2601 diff_debug_filepair(p
, i
);
2606 static void diff_resolve_rename_copy(void)
2609 struct diff_filepair
*p
;
2610 struct diff_queue_struct
*q
= &diff_queued_diff
;
2612 diff_debug_queue("resolve-rename-copy", q
);
2614 for (i
= 0; i
< q
->nr
; i
++) {
2616 p
->status
= 0; /* undecided */
2617 if (DIFF_PAIR_UNMERGED(p
))
2618 p
->status
= DIFF_STATUS_UNMERGED
;
2619 else if (!DIFF_FILE_VALID(p
->one
))
2620 p
->status
= DIFF_STATUS_ADDED
;
2621 else if (!DIFF_FILE_VALID(p
->two
))
2622 p
->status
= DIFF_STATUS_DELETED
;
2623 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2624 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2626 /* from this point on, we are dealing with a pair
2627 * whose both sides are valid and of the same type, i.e.
2628 * either in-place edit or rename/copy edit.
2630 else if (DIFF_PAIR_RENAME(p
)) {
2632 * A rename might have re-connected a broken
2633 * pair up, causing the pathnames to be the
2634 * same again. If so, that's not a rename at
2635 * all, just a modification..
2637 * Otherwise, see if this source was used for
2638 * multiple renames, in which case we decrement
2639 * the count, and call it a copy.
2641 if (!strcmp(p
->one
->path
, p
->two
->path
))
2642 p
->status
= DIFF_STATUS_MODIFIED
;
2643 else if (--p
->one
->rename_used
> 0)
2644 p
->status
= DIFF_STATUS_COPIED
;
2646 p
->status
= DIFF_STATUS_RENAMED
;
2648 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2649 p
->one
->mode
!= p
->two
->mode
||
2650 is_null_sha1(p
->one
->sha1
))
2651 p
->status
= DIFF_STATUS_MODIFIED
;
2653 /* This is a "no-change" entry and should not
2654 * happen anymore, but prepare for broken callers.
2656 error("feeding unmodified %s to diffcore",
2658 p
->status
= DIFF_STATUS_UNKNOWN
;
2661 diff_debug_queue("resolve-rename-copy done", q
);
2664 static int check_pair_status(struct diff_filepair
*p
)
2666 switch (p
->status
) {
2667 case DIFF_STATUS_UNKNOWN
:
2670 die("internal error in diff-resolve-rename-copy");
2676 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2678 int fmt
= opt
->output_format
;
2680 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2681 diff_flush_checkdiff(p
, opt
);
2682 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2683 diff_flush_raw(p
, opt
);
2684 else if (fmt
& DIFF_FORMAT_NAME
)
2685 write_name_quoted(p
->two
->path
, stdout
, opt
->line_termination
);
2688 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2691 printf(" %s mode %06o ", newdelete
, fs
->mode
);
2693 printf(" %s ", newdelete
);
2694 write_name_quoted(fs
->path
, stdout
, '\n');
2698 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2700 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2701 printf(" mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2702 show_name
? ' ' : '\n');
2704 write_name_quoted(p
->two
->path
, stdout
, '\n');
2709 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2711 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2713 printf(" %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2715 show_mode_change(p
, 0);
2718 static void diff_summary(struct diff_filepair
*p
)
2721 case DIFF_STATUS_DELETED
:
2722 show_file_mode_name("delete", p
->one
);
2724 case DIFF_STATUS_ADDED
:
2725 show_file_mode_name("create", p
->two
);
2727 case DIFF_STATUS_COPIED
:
2728 show_rename_copy("copy", p
);
2730 case DIFF_STATUS_RENAMED
:
2731 show_rename_copy("rename", p
);
2735 fputs(" rewrite ", stdout
);
2736 write_name_quoted(p
->two
->path
, stdout
, ' ');
2737 printf("(%d%%)\n", similarity_index(p
));
2739 show_mode_change(p
, !p
->score
);
2745 struct xdiff_emit_state xm
;
2750 static int remove_space(char *line
, int len
)
2756 for (i
= 0; i
< len
; i
++)
2757 if (!isspace((c
= line
[i
])))
2763 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2765 struct patch_id_t
*data
= priv
;
2768 /* Ignore line numbers when computing the SHA1 of the patch */
2769 if (!prefixcmp(line
, "@@ -"))
2772 new_len
= remove_space(line
, len
);
2774 SHA1_Update(data
->ctx
, line
, new_len
);
2775 data
->patchlen
+= new_len
;
2778 /* returns 0 upon success, and writes result into sha1 */
2779 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2781 struct diff_queue_struct
*q
= &diff_queued_diff
;
2784 struct patch_id_t data
;
2785 char buffer
[PATH_MAX
* 4 + 20];
2788 memset(&data
, 0, sizeof(struct patch_id_t
));
2790 data
.xm
.consume
= patch_id_consume
;
2792 for (i
= 0; i
< q
->nr
; i
++) {
2797 struct diff_filepair
*p
= q
->queue
[i
];
2800 memset(&xecfg
, 0, sizeof(xecfg
));
2802 return error("internal diff status error");
2803 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2805 if (diff_unmodified_pair(p
))
2807 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2808 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2810 if (DIFF_PAIR_UNMERGED(p
))
2813 diff_fill_sha1_info(p
->one
);
2814 diff_fill_sha1_info(p
->two
);
2815 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2816 fill_mmfile(&mf2
, p
->two
) < 0)
2817 return error("unable to read files to diff");
2819 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2820 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2821 if (p
->one
->mode
== 0)
2822 len1
= snprintf(buffer
, sizeof(buffer
),
2823 "diff--gita/%.*sb/%.*s"
2830 len2
, p
->two
->path
);
2831 else if (p
->two
->mode
== 0)
2832 len1
= snprintf(buffer
, sizeof(buffer
),
2833 "diff--gita/%.*sb/%.*s"
2834 "deletedfilemode%06o"
2840 len1
, p
->one
->path
);
2842 len1
= snprintf(buffer
, sizeof(buffer
),
2843 "diff--gita/%.*sb/%.*s"
2849 len2
, p
->two
->path
);
2850 SHA1_Update(&ctx
, buffer
, len1
);
2852 xpp
.flags
= XDF_NEED_MINIMAL
;
2854 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2855 ecb
.outf
= xdiff_outf
;
2857 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2860 SHA1_Final(sha1
, &ctx
);
2864 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2866 struct diff_queue_struct
*q
= &diff_queued_diff
;
2868 int result
= diff_get_patch_id(options
, sha1
);
2870 for (i
= 0; i
< q
->nr
; i
++)
2871 diff_free_filepair(q
->queue
[i
]);
2875 q
->nr
= q
->alloc
= 0;
2880 static int is_summary_empty(const struct diff_queue_struct
*q
)
2884 for (i
= 0; i
< q
->nr
; i
++) {
2885 const struct diff_filepair
*p
= q
->queue
[i
];
2887 switch (p
->status
) {
2888 case DIFF_STATUS_DELETED
:
2889 case DIFF_STATUS_ADDED
:
2890 case DIFF_STATUS_COPIED
:
2891 case DIFF_STATUS_RENAMED
:
2896 if (p
->one
->mode
&& p
->two
->mode
&&
2897 p
->one
->mode
!= p
->two
->mode
)
2905 void diff_flush(struct diff_options
*options
)
2907 struct diff_queue_struct
*q
= &diff_queued_diff
;
2908 int i
, output_format
= options
->output_format
;
2912 * Order: raw, stat, summary, patch
2913 * or: name/name-status/checkdiff (other bits clear)
2918 if (output_format
& (DIFF_FORMAT_RAW
|
2920 DIFF_FORMAT_NAME_STATUS
|
2921 DIFF_FORMAT_CHECKDIFF
)) {
2922 for (i
= 0; i
< q
->nr
; i
++) {
2923 struct diff_filepair
*p
= q
->queue
[i
];
2924 if (check_pair_status(p
))
2925 flush_one_pair(p
, options
);
2930 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
2931 struct diffstat_t diffstat
;
2933 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
2934 diffstat
.xm
.consume
= diffstat_consume
;
2935 for (i
= 0; i
< q
->nr
; i
++) {
2936 struct diff_filepair
*p
= q
->queue
[i
];
2937 if (check_pair_status(p
))
2938 diff_flush_stat(p
, options
, &diffstat
);
2940 if (output_format
& DIFF_FORMAT_NUMSTAT
)
2941 show_numstat(&diffstat
, options
);
2942 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
2943 show_stats(&diffstat
, options
);
2944 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
2945 show_shortstats(&diffstat
);
2946 free_diffstat_info(&diffstat
);
2950 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
2951 for (i
= 0; i
< q
->nr
; i
++)
2952 diff_summary(q
->queue
[i
]);
2956 if (output_format
& DIFF_FORMAT_PATCH
) {
2958 if (options
->stat_sep
) {
2959 /* attach patch instead of inline */
2960 fputs(options
->stat_sep
, stdout
);
2962 putchar(options
->line_termination
);
2966 for (i
= 0; i
< q
->nr
; i
++) {
2967 struct diff_filepair
*p
= q
->queue
[i
];
2968 if (check_pair_status(p
))
2969 diff_flush_patch(p
, options
);
2973 if (output_format
& DIFF_FORMAT_CALLBACK
)
2974 options
->format_callback(q
, options
, options
->format_callback_data
);
2976 for (i
= 0; i
< q
->nr
; i
++)
2977 diff_free_filepair(q
->queue
[i
]);
2981 q
->nr
= q
->alloc
= 0;
2984 static void diffcore_apply_filter(const char *filter
)
2987 struct diff_queue_struct
*q
= &diff_queued_diff
;
2988 struct diff_queue_struct outq
;
2990 outq
.nr
= outq
.alloc
= 0;
2995 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
2997 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
2998 struct diff_filepair
*p
= q
->queue
[i
];
2999 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3001 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3003 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3004 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3005 strchr(filter
, p
->status
)))
3011 /* otherwise we will clear the whole queue
3012 * by copying the empty outq at the end of this
3013 * function, but first clear the current entries
3016 for (i
= 0; i
< q
->nr
; i
++)
3017 diff_free_filepair(q
->queue
[i
]);
3020 /* Only the matching ones */
3021 for (i
= 0; i
< q
->nr
; i
++) {
3022 struct diff_filepair
*p
= q
->queue
[i
];
3024 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3026 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3028 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3029 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3030 strchr(filter
, p
->status
)))
3033 diff_free_filepair(p
);
3040 /* Check whether two filespecs with the same mode and size are identical */
3041 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3042 struct diff_filespec
*two
)
3044 if (S_ISGITLINK(one
->mode
)) {
3045 diff_fill_sha1_info(one
);
3046 diff_fill_sha1_info(two
);
3047 return !hashcmp(one
->sha1
, two
->sha1
);
3049 if (diff_populate_filespec(one
, 0))
3051 if (diff_populate_filespec(two
, 0))
3053 return !memcmp(one
->data
, two
->data
, one
->size
);
3056 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3059 struct diff_queue_struct
*q
= &diff_queued_diff
;
3060 struct diff_queue_struct outq
;
3062 outq
.nr
= outq
.alloc
= 0;
3064 for (i
= 0; i
< q
->nr
; i
++) {
3065 struct diff_filepair
*p
= q
->queue
[i
];
3068 * 1. Entries that come from stat info dirtyness
3069 * always have both sides (iow, not create/delete),
3070 * one side of the object name is unknown, with
3071 * the same mode and size. Keep the ones that
3072 * do not match these criteria. They have real
3075 * 2. At this point, the file is known to be modified,
3076 * with the same mode and size, and the object
3077 * name of one side is unknown. Need to inspect
3078 * the identical contents.
3080 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3081 !DIFF_FILE_VALID(p
->two
) ||
3082 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3083 (p
->one
->mode
!= p
->two
->mode
) ||
3084 diff_populate_filespec(p
->one
, 1) ||
3085 diff_populate_filespec(p
->two
, 1) ||
3086 (p
->one
->size
!= p
->two
->size
) ||
3087 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3091 * The caller can subtract 1 from skip_stat_unmatch
3092 * to determine how many paths were dirty only
3093 * due to stat info mismatch.
3095 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3096 diffopt
->skip_stat_unmatch
++;
3097 diff_free_filepair(p
);
3104 void diffcore_std(struct diff_options
*options
)
3106 if (DIFF_OPT_TST(options
, QUIET
))
3109 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3110 diffcore_skip_stat_unmatch(options
);
3111 if (options
->break_opt
!= -1)
3112 diffcore_break(options
->break_opt
);
3113 if (options
->detect_rename
)
3114 diffcore_rename(options
);
3115 if (options
->break_opt
!= -1)
3116 diffcore_merge_broken();
3117 if (options
->pickaxe
)
3118 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3119 if (options
->orderfile
)
3120 diffcore_order(options
->orderfile
);
3121 diff_resolve_rename_copy();
3122 diffcore_apply_filter(options
->filter
);
3124 if (diff_queued_diff
.nr
)
3125 DIFF_OPT_SET(options
, HAS_CHANGES
);
3127 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3130 int diff_result_code(struct diff_options
*opt
, int status
)
3133 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3134 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3136 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3137 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3139 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3140 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3145 void diff_addremove(struct diff_options
*options
,
3146 int addremove
, unsigned mode
,
3147 const unsigned char *sha1
,
3148 const char *base
, const char *path
)
3150 char concatpath
[PATH_MAX
];
3151 struct diff_filespec
*one
, *two
;
3153 /* This may look odd, but it is a preparation for
3154 * feeding "there are unchanged files which should
3155 * not produce diffs, but when you are doing copy
3156 * detection you would need them, so here they are"
3157 * entries to the diff-core. They will be prefixed
3158 * with something like '=' or '*' (I haven't decided
3159 * which but should not make any difference).
3160 * Feeding the same new and old to diff_change()
3161 * also has the same effect.
3162 * Before the final output happens, they are pruned after
3163 * merged into rename/copy pairs as appropriate.
3165 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3166 addremove
= (addremove
== '+' ? '-' :
3167 addremove
== '-' ? '+' : addremove
);
3169 if (!path
) path
= "";
3170 sprintf(concatpath
, "%s%s", base
, path
);
3171 one
= alloc_filespec(concatpath
);
3172 two
= alloc_filespec(concatpath
);
3174 if (addremove
!= '+')
3175 fill_filespec(one
, sha1
, mode
);
3176 if (addremove
!= '-')
3177 fill_filespec(two
, sha1
, mode
);
3179 diff_queue(&diff_queued_diff
, one
, two
);
3180 DIFF_OPT_SET(options
, HAS_CHANGES
);
3183 void diff_change(struct diff_options
*options
,
3184 unsigned old_mode
, unsigned new_mode
,
3185 const unsigned char *old_sha1
,
3186 const unsigned char *new_sha1
,
3187 const char *base
, const char *path
)
3189 char concatpath
[PATH_MAX
];
3190 struct diff_filespec
*one
, *two
;
3192 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3194 const unsigned char *tmp_c
;
3195 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3196 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3198 if (!path
) path
= "";
3199 sprintf(concatpath
, "%s%s", base
, path
);
3200 one
= alloc_filespec(concatpath
);
3201 two
= alloc_filespec(concatpath
);
3202 fill_filespec(one
, old_sha1
, old_mode
);
3203 fill_filespec(two
, new_sha1
, new_mode
);
3205 diff_queue(&diff_queued_diff
, one
, two
);
3206 DIFF_OPT_SET(options
, HAS_CHANGES
);
3209 void diff_unmerge(struct diff_options
*options
,
3211 unsigned mode
, const unsigned char *sha1
)
3213 struct diff_filespec
*one
, *two
;
3214 one
= alloc_filespec(path
);
3215 two
= alloc_filespec(path
);
3216 fill_filespec(one
, sha1
, mode
);
3217 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;