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
);
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
;
123 pp
->pattern
= xstrdup(value
);
128 * These are to give UI layer defaults.
129 * The core-level commands such as git-diff-files should
130 * never be affected by the setting of diff.renames
131 * the user happens to have in the configuration file.
133 int git_diff_ui_config(const char *var
, const char *value
)
135 if (!strcmp(var
, "diff.renamelimit")) {
136 diff_rename_limit_default
= git_config_int(var
, value
);
139 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
140 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
143 if (!strcmp(var
, "diff.renames")) {
145 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
146 else if (!strcasecmp(value
, "copies") ||
147 !strcasecmp(value
, "copy"))
148 diff_detect_rename_default
= DIFF_DETECT_COPY
;
149 else if (git_config_bool(var
,value
))
150 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
153 if (!strcmp(var
, "diff.autorefreshindex")) {
154 diff_auto_refresh_index
= git_config_bool(var
, value
);
157 if (!strcmp(var
, "diff.external")) {
159 return config_error_nonbool(var
);
160 external_diff_cmd_cfg
= xstrdup(value
);
163 if (!prefixcmp(var
, "diff.")) {
164 const char *ep
= strrchr(var
, '.');
166 if (ep
!= var
+ 4 && !strcmp(ep
, ".command"))
167 return parse_lldiff_command(var
, ep
, value
);
170 return git_diff_basic_config(var
, value
);
173 int git_diff_basic_config(const char *var
, const char *value
)
175 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
176 int slot
= parse_diff_color_slot(var
, 11);
178 return config_error_nonbool(var
);
179 color_parse(value
, var
, diff_colors
[slot
]);
183 if (!prefixcmp(var
, "diff.")) {
184 const char *ep
= strrchr(var
, '.');
186 if (!strcmp(ep
, ".funcname")) {
188 return config_error_nonbool(var
);
189 return parse_funcname_pattern(var
, ep
, value
);
194 return git_default_config(var
, value
);
197 static char *quote_two(const char *one
, const char *two
)
199 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
200 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
203 strbuf_init(&res
, 0);
204 if (need_one
+ need_two
) {
205 strbuf_addch(&res
, '"');
206 quote_c_style(one
, &res
, NULL
, 1);
207 quote_c_style(two
, &res
, NULL
, 1);
208 strbuf_addch(&res
, '"');
210 strbuf_addstr(&res
, one
);
211 strbuf_addstr(&res
, two
);
213 return strbuf_detach(&res
, NULL
);
216 static const char *external_diff(void)
218 static const char *external_diff_cmd
= NULL
;
219 static int done_preparing
= 0;
222 return external_diff_cmd
;
223 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
224 if (!external_diff_cmd
)
225 external_diff_cmd
= external_diff_cmd_cfg
;
227 return external_diff_cmd
;
230 static struct diff_tempfile
{
231 const char *name
; /* filename external diff should read from */
234 char tmp_path
[PATH_MAX
];
237 static int count_lines(const char *data
, int size
)
239 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
246 completely_empty
= 0;
250 completely_empty
= 0;
253 if (completely_empty
)
256 count
++; /* no trailing newline */
260 static void print_line_count(int count
)
270 printf("1,%d", count
);
275 static void copy_file_with_prefix(int prefix
, const char *data
, int size
,
276 const char *set
, const char *reset
)
278 int ch
, nl_just_seen
= 1;
287 fputs(reset
, stdout
);
293 printf("%s\n\\ No newline at end of file\n", reset
);
296 static void emit_rewrite_diff(const char *name_a
,
298 struct diff_filespec
*one
,
299 struct diff_filespec
*two
,
300 struct diff_options
*o
)
303 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
304 const char *name_a_tab
, *name_b_tab
;
305 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
306 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
307 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
308 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
309 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
310 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
312 name_a
+= (*name_a
== '/');
313 name_b
+= (*name_b
== '/');
314 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
315 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
317 strbuf_reset(&a_name
);
318 strbuf_reset(&b_name
);
319 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
320 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
322 diff_populate_filespec(one
, 0);
323 diff_populate_filespec(two
, 0);
324 lc_a
= count_lines(one
->data
, one
->size
);
325 lc_b
= count_lines(two
->data
, two
->size
);
326 printf("%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
327 metainfo
, a_name
.buf
, name_a_tab
, reset
,
328 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
329 print_line_count(lc_a
);
331 print_line_count(lc_b
);
332 printf(" @@%s\n", reset
);
334 copy_file_with_prefix('-', one
->data
, one
->size
, old
, reset
);
336 copy_file_with_prefix('+', two
->data
, two
->size
, new, reset
);
339 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
341 if (!DIFF_FILE_VALID(one
)) {
342 mf
->ptr
= (char *)""; /* does not matter */
346 else if (diff_populate_filespec(one
, 0))
349 mf
->size
= one
->size
;
353 struct diff_words_buffer
{
356 long current
; /* output pointer */
357 int suppressed_newline
;
360 static void diff_words_append(char *line
, unsigned long len
,
361 struct diff_words_buffer
*buffer
)
363 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
364 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
365 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
369 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
370 buffer
->text
.size
+= len
;
373 struct diff_words_data
{
374 struct xdiff_emit_state xm
;
375 struct diff_words_buffer minus
, plus
;
378 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
379 int suppress_newline
)
387 ptr
= buffer
->text
.ptr
+ buffer
->current
;
388 buffer
->current
+= len
;
390 if (ptr
[len
- 1] == '\n') {
395 fputs(diff_get_color(1, color
), stdout
);
396 fwrite(ptr
, len
, 1, stdout
);
397 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
400 if (suppress_newline
)
401 buffer
->suppressed_newline
= 1;
407 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
409 struct diff_words_data
*diff_words
= priv
;
411 if (diff_words
->minus
.suppressed_newline
) {
414 diff_words
->minus
.suppressed_newline
= 0;
420 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
423 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
426 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
427 diff_words
->minus
.current
+= len
;
432 /* this executes the word diff on the accumulated buffers */
433 static void diff_words_show(struct diff_words_data
*diff_words
)
438 mmfile_t minus
, plus
;
441 memset(&xecfg
, 0, sizeof(xecfg
));
442 minus
.size
= diff_words
->minus
.text
.size
;
443 minus
.ptr
= xmalloc(minus
.size
);
444 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
445 for (i
= 0; i
< minus
.size
; i
++)
446 if (isspace(minus
.ptr
[i
]))
448 diff_words
->minus
.current
= 0;
450 plus
.size
= diff_words
->plus
.text
.size
;
451 plus
.ptr
= xmalloc(plus
.size
);
452 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
453 for (i
= 0; i
< plus
.size
; i
++)
454 if (isspace(plus
.ptr
[i
]))
456 diff_words
->plus
.current
= 0;
458 xpp
.flags
= XDF_NEED_MINIMAL
;
459 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
460 ecb
.outf
= xdiff_outf
;
461 ecb
.priv
= diff_words
;
462 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
463 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
467 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
469 if (diff_words
->minus
.suppressed_newline
) {
471 diff_words
->minus
.suppressed_newline
= 0;
475 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
477 struct emit_callback
{
478 struct xdiff_emit_state xm
;
479 int nparents
, color_diff
;
481 sane_truncate_fn truncate
;
482 const char **label_path
;
483 struct diff_words_data
*diff_words
;
487 static void free_diff_words_data(struct emit_callback
*ecbdata
)
489 if (ecbdata
->diff_words
) {
491 if (ecbdata
->diff_words
->minus
.text
.size
||
492 ecbdata
->diff_words
->plus
.text
.size
)
493 diff_words_show(ecbdata
->diff_words
);
495 if (ecbdata
->diff_words
->minus
.text
.ptr
)
496 free (ecbdata
->diff_words
->minus
.text
.ptr
);
497 if (ecbdata
->diff_words
->plus
.text
.ptr
)
498 free (ecbdata
->diff_words
->plus
.text
.ptr
);
499 free(ecbdata
->diff_words
);
500 ecbdata
->diff_words
= NULL
;
504 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
507 return diff_colors
[ix
];
511 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
514 fwrite(line
, len
, 1, stdout
);
515 fputs(reset
, stdout
);
518 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
520 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
521 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
524 emit_line(set
, reset
, line
, len
);
526 /* Emit just the prefix, then the rest. */
527 emit_line(set
, reset
, line
, ecbdata
->nparents
);
528 (void)check_and_emit_line(line
+ ecbdata
->nparents
,
529 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
530 stdout
, set
, reset
, ws
);
534 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
541 return ecb
->truncate(line
, len
);
545 (void) utf8_width(&cp
, &l
);
547 break; /* truncated in the middle? */
552 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
556 struct emit_callback
*ecbdata
= priv
;
557 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
558 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
559 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
561 *(ecbdata
->found_changesp
) = 1;
563 if (ecbdata
->label_path
[0]) {
564 const char *name_a_tab
, *name_b_tab
;
566 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
567 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
569 printf("%s--- %s%s%s\n",
570 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
571 printf("%s+++ %s%s%s\n",
572 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
573 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
576 /* This is not really necessary for now because
577 * this codepath only deals with two-way diffs.
579 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
581 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
582 ecbdata
->nparents
= i
- 1;
583 len
= sane_truncate_line(ecbdata
, line
, len
);
584 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
586 if (line
[len
-1] != '\n')
591 if (len
< ecbdata
->nparents
) {
592 emit_line(reset
, reset
, line
, len
);
597 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
598 /* fall back to normal diff */
599 free_diff_words_data(ecbdata
);
600 if (ecbdata
->diff_words
) {
601 if (line
[0] == '-') {
602 diff_words_append(line
, len
,
603 &ecbdata
->diff_words
->minus
);
605 } else if (line
[0] == '+') {
606 diff_words_append(line
, len
,
607 &ecbdata
->diff_words
->plus
);
610 if (ecbdata
->diff_words
->minus
.text
.size
||
611 ecbdata
->diff_words
->plus
.text
.size
)
612 diff_words_show(ecbdata
->diff_words
);
615 emit_line(plain
, reset
, line
, len
);
618 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
620 color
= DIFF_FILE_OLD
;
621 else if (line
[i
] == '+')
622 color
= DIFF_FILE_NEW
;
625 if (color
!= DIFF_FILE_NEW
) {
626 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
630 emit_add_line(reset
, ecbdata
, line
, len
);
633 static char *pprint_rename(const char *a
, const char *b
)
638 int pfx_length
, sfx_length
;
639 int len_a
= strlen(a
);
640 int len_b
= strlen(b
);
641 int a_midlen
, b_midlen
;
642 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
643 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
645 strbuf_init(&name
, 0);
646 if (qlen_a
|| qlen_b
) {
647 quote_c_style(a
, &name
, NULL
, 0);
648 strbuf_addstr(&name
, " => ");
649 quote_c_style(b
, &name
, NULL
, 0);
650 return strbuf_detach(&name
, NULL
);
653 /* Find common prefix */
655 while (*old
&& *new && *old
== *new) {
657 pfx_length
= old
- a
+ 1;
662 /* Find common suffix */
666 while (a
<= old
&& b
<= new && *old
== *new) {
668 sfx_length
= len_a
- (old
- a
);
674 * pfx{mid-a => mid-b}sfx
675 * {pfx-a => pfx-b}sfx
676 * pfx{sfx-a => sfx-b}
679 a_midlen
= len_a
- pfx_length
- sfx_length
;
680 b_midlen
= len_b
- pfx_length
- sfx_length
;
686 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
687 if (pfx_length
+ sfx_length
) {
688 strbuf_add(&name
, a
, pfx_length
);
689 strbuf_addch(&name
, '{');
691 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
692 strbuf_addstr(&name
, " => ");
693 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
694 if (pfx_length
+ sfx_length
) {
695 strbuf_addch(&name
, '}');
696 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
698 return strbuf_detach(&name
, NULL
);
702 struct xdiff_emit_state xm
;
706 struct diffstat_file
{
710 unsigned is_unmerged
:1;
711 unsigned is_binary
:1;
712 unsigned is_renamed
:1;
713 unsigned int added
, deleted
;
717 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
721 struct diffstat_file
*x
;
722 x
= xcalloc(sizeof (*x
), 1);
723 if (diffstat
->nr
== diffstat
->alloc
) {
724 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
725 diffstat
->files
= xrealloc(diffstat
->files
,
726 diffstat
->alloc
* sizeof(x
));
728 diffstat
->files
[diffstat
->nr
++] = x
;
730 x
->from_name
= xstrdup(name_a
);
731 x
->name
= xstrdup(name_b
);
736 x
->name
= xstrdup(name_a
);
741 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
743 struct diffstat_t
*diffstat
= priv
;
744 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
748 else if (line
[0] == '-')
752 const char mime_boundary_leader
[] = "------------";
754 static int scale_linear(int it
, int width
, int max_change
)
757 * make sure that at least one '-' is printed if there were deletions,
758 * and likewise for '+'.
762 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
765 static void show_name(const char *prefix
, const char *name
, int len
,
766 const char *reset
, const char *set
)
768 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
771 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
781 static void fill_print_name(struct diffstat_file
*file
)
785 if (file
->print_name
)
788 if (!file
->is_renamed
) {
790 strbuf_init(&buf
, 0);
791 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
792 pname
= strbuf_detach(&buf
, NULL
);
795 strbuf_release(&buf
);
798 pname
= pprint_rename(file
->from_name
, file
->name
);
800 file
->print_name
= pname
;
803 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
805 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
806 int max_change
= 0, max_len
= 0;
807 int total_files
= data
->nr
;
808 int width
, name_width
;
809 const char *reset
, *set
, *add_c
, *del_c
;
814 width
= options
->stat_width
? options
->stat_width
: 80;
815 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
817 /* Sanity: give at least 5 columns to the graph,
818 * but leave at least 10 columns for the name.
820 if (width
< name_width
+ 15) {
821 if (name_width
<= 25)
822 width
= name_width
+ 15;
824 name_width
= width
- 15;
827 /* Find the longest filename and max number of changes */
828 reset
= diff_get_color_opt(options
, DIFF_RESET
);
829 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
830 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
831 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
833 for (i
= 0; i
< data
->nr
; i
++) {
834 struct diffstat_file
*file
= data
->files
[i
];
835 int change
= file
->added
+ file
->deleted
;
836 fill_print_name(file
);
837 len
= strlen(file
->print_name
);
841 if (file
->is_binary
|| file
->is_unmerged
)
843 if (max_change
< change
)
847 /* Compute the width of the graph part;
848 * 10 is for one blank at the beginning of the line plus
849 * " | count " between the name and the graph.
851 * From here on, name_width is the width of the name area,
852 * and width is the width of the graph area.
854 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
855 if (width
< (name_width
+ 10) + max_change
)
856 width
= width
- (name_width
+ 10);
860 for (i
= 0; i
< data
->nr
; i
++) {
861 const char *prefix
= "";
862 char *name
= data
->files
[i
]->print_name
;
863 int added
= data
->files
[i
]->added
;
864 int deleted
= data
->files
[i
]->deleted
;
868 * "scale" the filename
871 name_len
= strlen(name
);
872 if (name_width
< name_len
) {
876 name
+= name_len
- len
;
877 slash
= strchr(name
, '/');
882 if (data
->files
[i
]->is_binary
) {
883 show_name(prefix
, name
, len
, reset
, set
);
885 printf("%s%d%s", del_c
, deleted
, reset
);
887 printf("%s%d%s", add_c
, added
, reset
);
892 else if (data
->files
[i
]->is_unmerged
) {
893 show_name(prefix
, name
, len
, reset
, set
);
894 printf(" Unmerged\n");
897 else if (!data
->files
[i
]->is_renamed
&&
898 (added
+ deleted
== 0)) {
904 * scale the add/delete
912 if (width
<= max_change
) {
913 add
= scale_linear(add
, width
, max_change
);
914 del
= scale_linear(del
, width
, max_change
);
917 show_name(prefix
, name
, len
, reset
, set
);
918 printf("%5d ", added
+ deleted
);
919 show_graph('+', add
, add_c
, reset
);
920 show_graph('-', del
, del_c
, reset
);
923 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
924 set
, total_files
, adds
, dels
, reset
);
927 static void show_shortstats(struct diffstat_t
* data
)
929 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
934 for (i
= 0; i
< data
->nr
; i
++) {
935 if (!data
->files
[i
]->is_binary
&&
936 !data
->files
[i
]->is_unmerged
) {
937 int added
= data
->files
[i
]->added
;
938 int deleted
= data
->files
[i
]->deleted
;
939 if (!data
->files
[i
]->is_renamed
&&
940 (added
+ deleted
== 0)) {
948 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
949 total_files
, adds
, dels
);
952 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
959 for (i
= 0; i
< data
->nr
; i
++) {
960 struct diffstat_file
*file
= data
->files
[i
];
965 printf("%d\t%d\t", file
->added
, file
->deleted
);
966 if (options
->line_termination
) {
967 fill_print_name(file
);
968 if (!file
->is_renamed
)
969 write_name_quoted(file
->name
, stdout
,
970 options
->line_termination
);
972 fputs(file
->print_name
, stdout
);
973 putchar(options
->line_termination
);
976 if (file
->is_renamed
) {
978 write_name_quoted(file
->from_name
, stdout
, '\0');
980 write_name_quoted(file
->name
, stdout
, '\0');
985 static void free_diffstat_info(struct diffstat_t
*diffstat
)
988 for (i
= 0; i
< diffstat
->nr
; i
++) {
989 struct diffstat_file
*f
= diffstat
->files
[i
];
990 if (f
->name
!= f
->print_name
)
996 free(diffstat
->files
);
1000 struct xdiff_emit_state xm
;
1001 const char *filename
;
1002 int lineno
, color_diff
;
1007 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1009 struct checkdiff_t
*data
= priv
;
1010 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
1011 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
1012 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
1015 if (line
[0] == '+') {
1017 data
->status
= check_and_emit_line(line
+ 1, len
- 1,
1018 data
->ws_rule
, NULL
, NULL
, NULL
, NULL
);
1021 err
= whitespace_error_string(data
->status
);
1022 printf("%s:%d: %s.\n", data
->filename
, data
->lineno
, err
);
1024 emit_line(set
, reset
, line
, 1);
1025 (void)check_and_emit_line(line
+ 1, len
- 1, data
->ws_rule
,
1026 stdout
, set
, reset
, ws
);
1027 } else if (line
[0] == ' ')
1029 else if (line
[0] == '@') {
1030 char *plus
= strchr(line
, '+');
1032 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1034 die("invalid diff");
1038 static unsigned char *deflate_it(char *data
,
1040 unsigned long *result_size
)
1043 unsigned char *deflated
;
1046 memset(&stream
, 0, sizeof(stream
));
1047 deflateInit(&stream
, zlib_compression_level
);
1048 bound
= deflateBound(&stream
, size
);
1049 deflated
= xmalloc(bound
);
1050 stream
.next_out
= deflated
;
1051 stream
.avail_out
= bound
;
1053 stream
.next_in
= (unsigned char *)data
;
1054 stream
.avail_in
= size
;
1055 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1057 deflateEnd(&stream
);
1058 *result_size
= stream
.total_out
;
1062 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
1068 unsigned long orig_size
;
1069 unsigned long delta_size
;
1070 unsigned long deflate_size
;
1071 unsigned long data_size
;
1073 /* We could do deflated delta, or we could do just deflated two,
1074 * whichever is smaller.
1077 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1078 if (one
->size
&& two
->size
) {
1079 delta
= diff_delta(one
->ptr
, one
->size
,
1080 two
->ptr
, two
->size
,
1081 &delta_size
, deflate_size
);
1083 void *to_free
= delta
;
1084 orig_size
= delta_size
;
1085 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1090 if (delta
&& delta_size
< deflate_size
) {
1091 printf("delta %lu\n", orig_size
);
1094 data_size
= delta_size
;
1097 printf("literal %lu\n", two
->size
);
1100 data_size
= deflate_size
;
1103 /* emit data encoded in base85 */
1106 int bytes
= (52 < data_size
) ? 52 : data_size
;
1110 line
[0] = bytes
+ 'A' - 1;
1112 line
[0] = bytes
- 26 + 'a' - 1;
1113 encode_85(line
+ 1, cp
, bytes
);
1114 cp
= (char *) cp
+ bytes
;
1121 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1123 printf("GIT binary patch\n");
1124 emit_binary_diff_body(one
, two
);
1125 emit_binary_diff_body(two
, one
);
1128 static void setup_diff_attr_check(struct git_attr_check
*check
)
1130 static struct git_attr
*attr_diff
;
1133 attr_diff
= git_attr("diff", 4);
1135 check
[0].attr
= attr_diff
;
1138 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1140 struct git_attr_check attr_diff_check
;
1141 int check_from_data
= 0;
1143 if (one
->checked_attr
)
1146 setup_diff_attr_check(&attr_diff_check
);
1148 one
->funcname_pattern_ident
= NULL
;
1150 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1154 value
= attr_diff_check
.value
;
1155 if (ATTR_TRUE(value
))
1157 else if (ATTR_FALSE(value
))
1160 check_from_data
= 1;
1162 /* funcname pattern ident */
1163 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1166 one
->funcname_pattern_ident
= value
;
1169 if (check_from_data
) {
1170 if (!one
->data
&& DIFF_FILE_VALID(one
))
1171 diff_populate_filespec(one
, 0);
1174 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1178 int diff_filespec_is_binary(struct diff_filespec
*one
)
1180 diff_filespec_check_attr(one
);
1181 return one
->is_binary
;
1184 static const char *funcname_pattern(const char *ident
)
1186 struct funcname_pattern
*pp
;
1188 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1189 if (!strcmp(ident
, pp
->name
))
1194 static struct builtin_funcname_pattern
{
1196 const char *pattern
;
1197 } builtin_funcname_pattern
[] = {
1198 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1199 "new\\|return\\|switch\\|throw\\|while\\)\n"
1201 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1203 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1206 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1208 const char *ident
, *pattern
;
1211 diff_filespec_check_attr(one
);
1212 ident
= one
->funcname_pattern_ident
;
1216 * If the config file has "funcname.default" defined, that
1217 * regexp is used; otherwise NULL is returned and xemit uses
1218 * the built-in default.
1220 return funcname_pattern("default");
1222 /* Look up custom "funcname.$ident" regexp from config. */
1223 pattern
= funcname_pattern(ident
);
1228 * And define built-in fallback patterns here. Note that
1229 * these can be overridden by the user's config settings.
1231 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1232 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1233 return builtin_funcname_pattern
[i
].pattern
;
1238 static void builtin_diff(const char *name_a
,
1240 struct diff_filespec
*one
,
1241 struct diff_filespec
*two
,
1242 const char *xfrm_msg
,
1243 struct diff_options
*o
,
1244 int complete_rewrite
)
1248 char *a_one
, *b_two
;
1249 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1250 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1252 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1253 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1254 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1255 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1256 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1257 if (lbl
[0][0] == '/') {
1259 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1260 if (xfrm_msg
&& xfrm_msg
[0])
1261 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1263 else if (lbl
[1][0] == '/') {
1264 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1265 if (xfrm_msg
&& xfrm_msg
[0])
1266 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1269 if (one
->mode
!= two
->mode
) {
1270 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1271 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1273 if (xfrm_msg
&& xfrm_msg
[0])
1274 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1276 * we do not run diff between different kind
1279 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1280 goto free_ab_and_return
;
1281 if (complete_rewrite
) {
1282 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1283 o
->found_changes
= 1;
1284 goto free_ab_and_return
;
1288 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1289 die("unable to read files to diff");
1291 if (!DIFF_OPT_TST(o
, TEXT
) &&
1292 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1293 /* Quite common confusing case */
1294 if (mf1
.size
== mf2
.size
&&
1295 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1296 goto free_ab_and_return
;
1297 if (DIFF_OPT_TST(o
, BINARY
))
1298 emit_binary_diff(&mf1
, &mf2
);
1300 printf("Binary files %s and %s differ\n",
1302 o
->found_changes
= 1;
1305 /* Crazy xdl interfaces.. */
1306 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1310 struct emit_callback ecbdata
;
1311 const char *funcname_pattern
;
1313 funcname_pattern
= diff_funcname_pattern(one
);
1314 if (!funcname_pattern
)
1315 funcname_pattern
= diff_funcname_pattern(two
);
1317 memset(&xecfg
, 0, sizeof(xecfg
));
1318 memset(&ecbdata
, 0, sizeof(ecbdata
));
1319 ecbdata
.label_path
= lbl
;
1320 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1321 ecbdata
.found_changesp
= &o
->found_changes
;
1322 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1323 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1324 xecfg
.ctxlen
= o
->context
;
1325 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1326 if (funcname_pattern
)
1327 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1330 else if (!prefixcmp(diffopts
, "--unified="))
1331 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1332 else if (!prefixcmp(diffopts
, "-u"))
1333 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1334 ecb
.outf
= xdiff_outf
;
1335 ecb
.priv
= &ecbdata
;
1336 ecbdata
.xm
.consume
= fn_out_consume
;
1337 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1338 ecbdata
.diff_words
=
1339 xcalloc(1, sizeof(struct diff_words_data
));
1340 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1341 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1342 free_diff_words_data(&ecbdata
);
1346 diff_free_filespec_data(one
);
1347 diff_free_filespec_data(two
);
1353 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1354 struct diff_filespec
*one
,
1355 struct diff_filespec
*two
,
1356 struct diffstat_t
*diffstat
,
1357 struct diff_options
*o
,
1358 int complete_rewrite
)
1361 struct diffstat_file
*data
;
1363 data
= diffstat_add(diffstat
, name_a
, name_b
);
1366 data
->is_unmerged
= 1;
1369 if (complete_rewrite
) {
1370 diff_populate_filespec(one
, 0);
1371 diff_populate_filespec(two
, 0);
1372 data
->deleted
= count_lines(one
->data
, one
->size
);
1373 data
->added
= count_lines(two
->data
, two
->size
);
1374 goto free_and_return
;
1376 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1377 die("unable to read files to diff");
1379 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1380 data
->is_binary
= 1;
1381 data
->added
= mf2
.size
;
1382 data
->deleted
= mf1
.size
;
1384 /* Crazy xdl interfaces.. */
1389 memset(&xecfg
, 0, sizeof(xecfg
));
1390 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1391 ecb
.outf
= xdiff_outf
;
1392 ecb
.priv
= diffstat
;
1393 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1397 diff_free_filespec_data(one
);
1398 diff_free_filespec_data(two
);
1401 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1402 struct diff_filespec
*one
,
1403 struct diff_filespec
*two
, struct diff_options
*o
)
1406 struct checkdiff_t data
;
1411 memset(&data
, 0, sizeof(data
));
1412 data
.xm
.consume
= checkdiff_consume
;
1413 data
.filename
= name_b
? name_b
: name_a
;
1415 data
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1416 data
.ws_rule
= whitespace_rule(data
.filename
);
1418 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1419 die("unable to read files to diff");
1421 if (diff_filespec_is_binary(two
))
1422 goto free_and_return
;
1424 /* Crazy xdl interfaces.. */
1429 memset(&xecfg
, 0, sizeof(xecfg
));
1430 xpp
.flags
= XDF_NEED_MINIMAL
;
1431 ecb
.outf
= xdiff_outf
;
1433 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1436 diff_free_filespec_data(one
);
1437 diff_free_filespec_data(two
);
1439 DIFF_OPT_SET(o
, CHECK_FAILED
);
1442 struct diff_filespec
*alloc_filespec(const char *path
)
1444 int namelen
= strlen(path
);
1445 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1447 memset(spec
, 0, sizeof(*spec
));
1448 spec
->path
= (char *)(spec
+ 1);
1449 memcpy(spec
->path
, path
, namelen
+1);
1454 void free_filespec(struct diff_filespec
*spec
)
1456 if (!--spec
->count
) {
1457 diff_free_filespec_data(spec
);
1462 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1463 unsigned short mode
)
1466 spec
->mode
= canon_mode(mode
);
1467 hashcpy(spec
->sha1
, sha1
);
1468 spec
->sha1_valid
= !is_null_sha1(sha1
);
1473 * Given a name and sha1 pair, if the index tells us the file in
1474 * the work tree has that object contents, return true, so that
1475 * prepare_temp_file() does not have to inflate and extract.
1477 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1479 struct cache_entry
*ce
;
1483 /* We do not read the cache ourselves here, because the
1484 * benchmark with my previous version that always reads cache
1485 * shows that it makes things worse for diff-tree comparing
1486 * two linux-2.6 kernel trees in an already checked out work
1487 * tree. This is because most diff-tree comparisons deal with
1488 * only a small number of files, while reading the cache is
1489 * expensive for a large project, and its cost outweighs the
1490 * savings we get by not inflating the object to a temporary
1491 * file. Practically, this code only helps when we are used
1492 * by diff-cache --cached, which does read the cache before
1498 /* We want to avoid the working directory if our caller
1499 * doesn't need the data in a normal file, this system
1500 * is rather slow with its stat/open/mmap/close syscalls,
1501 * and the object is contained in a pack file. The pack
1502 * is probably already open and will be faster to obtain
1503 * the data through than the working directory. Loose
1504 * objects however would tend to be slower as they need
1505 * to be individually opened and inflated.
1507 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1511 pos
= cache_name_pos(name
, len
);
1514 ce
= active_cache
[pos
];
1515 if ((lstat(name
, &st
) < 0) ||
1516 !S_ISREG(st
.st_mode
) || /* careful! */
1517 ce_match_stat(ce
, &st
, 0) ||
1518 hashcmp(sha1
, ce
->sha1
))
1520 /* we return 1 only when we can stat, it is a regular file,
1521 * stat information matches, and sha1 recorded in the cache
1522 * matches. I.e. we know the file in the work tree really is
1523 * the same as the <name, sha1> pair.
1528 static int populate_from_stdin(struct diff_filespec
*s
)
1533 strbuf_init(&buf
, 0);
1534 if (strbuf_read(&buf
, 0, 0) < 0)
1535 return error("error while reading from stdin %s",
1538 s
->should_munmap
= 0;
1539 s
->data
= strbuf_detach(&buf
, &size
);
1545 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1548 char *data
= xmalloc(100);
1549 len
= snprintf(data
, 100,
1550 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1562 * While doing rename detection and pickaxe operation, we may need to
1563 * grab the data for the blob (or file) for our own in-core comparison.
1564 * diff_filespec has data and size fields for this purpose.
1566 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1569 if (!DIFF_FILE_VALID(s
))
1570 die("internal error: asking to populate invalid file.");
1571 if (S_ISDIR(s
->mode
))
1577 if (size_only
&& 0 < s
->size
)
1580 if (S_ISGITLINK(s
->mode
))
1581 return diff_populate_gitlink(s
, size_only
);
1583 if (!s
->sha1_valid
||
1584 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1589 if (!strcmp(s
->path
, "-"))
1590 return populate_from_stdin(s
);
1592 if (lstat(s
->path
, &st
) < 0) {
1593 if (errno
== ENOENT
) {
1597 s
->data
= (char *)"";
1602 s
->size
= xsize_t(st
.st_size
);
1607 if (S_ISLNK(st
.st_mode
)) {
1609 s
->data
= xmalloc(s
->size
);
1611 ret
= readlink(s
->path
, s
->data
, s
->size
);
1618 fd
= open(s
->path
, O_RDONLY
);
1621 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1623 s
->should_munmap
= 1;
1626 * Convert from working tree format to canonical git format
1628 strbuf_init(&buf
, 0);
1629 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
)) {
1631 munmap(s
->data
, s
->size
);
1632 s
->should_munmap
= 0;
1633 s
->data
= strbuf_detach(&buf
, &size
);
1639 enum object_type type
;
1641 type
= sha1_object_info(s
->sha1
, &s
->size
);
1643 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1650 void diff_free_filespec_blob(struct diff_filespec
*s
)
1654 else if (s
->should_munmap
)
1655 munmap(s
->data
, s
->size
);
1657 if (s
->should_free
|| s
->should_munmap
) {
1658 s
->should_free
= s
->should_munmap
= 0;
1663 void diff_free_filespec_data(struct diff_filespec
*s
)
1665 diff_free_filespec_blob(s
);
1670 static void prep_temp_blob(struct diff_tempfile
*temp
,
1673 const unsigned char *sha1
,
1678 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1680 die("unable to create temp-file: %s", strerror(errno
));
1681 if (write_in_full(fd
, blob
, size
) != size
)
1682 die("unable to write temp-file");
1684 temp
->name
= temp
->tmp_path
;
1685 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1687 sprintf(temp
->mode
, "%06o", mode
);
1690 static void prepare_temp_file(const char *name
,
1691 struct diff_tempfile
*temp
,
1692 struct diff_filespec
*one
)
1694 if (!DIFF_FILE_VALID(one
)) {
1696 /* A '-' entry produces this for file-2, and
1697 * a '+' entry produces this for file-1.
1699 temp
->name
= "/dev/null";
1700 strcpy(temp
->hex
, ".");
1701 strcpy(temp
->mode
, ".");
1705 if (!one
->sha1_valid
||
1706 reuse_worktree_file(name
, one
->sha1
, 1)) {
1708 if (lstat(name
, &st
) < 0) {
1709 if (errno
== ENOENT
)
1710 goto not_a_valid_file
;
1711 die("stat(%s): %s", name
, strerror(errno
));
1713 if (S_ISLNK(st
.st_mode
)) {
1715 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1716 size_t sz
= xsize_t(st
.st_size
);
1717 if (sizeof(buf
) <= st
.st_size
)
1718 die("symlink too long: %s", name
);
1719 ret
= readlink(name
, buf
, sz
);
1721 die("readlink(%s)", name
);
1722 prep_temp_blob(temp
, buf
, sz
,
1724 one
->sha1
: null_sha1
),
1726 one
->mode
: S_IFLNK
));
1729 /* we can borrow from the file in the work tree */
1731 if (!one
->sha1_valid
)
1732 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1734 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1735 /* Even though we may sometimes borrow the
1736 * contents from the work tree, we always want
1737 * one->mode. mode is trustworthy even when
1738 * !(one->sha1_valid), as long as
1739 * DIFF_FILE_VALID(one).
1741 sprintf(temp
->mode
, "%06o", one
->mode
);
1746 if (diff_populate_filespec(one
, 0))
1747 die("cannot read data blob for %s", one
->path
);
1748 prep_temp_blob(temp
, one
->data
, one
->size
,
1749 one
->sha1
, one
->mode
);
1753 static void remove_tempfile(void)
1757 for (i
= 0; i
< 2; i
++)
1758 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1759 unlink(diff_temp
[i
].name
);
1760 diff_temp
[i
].name
= NULL
;
1764 static void remove_tempfile_on_signal(int signo
)
1767 signal(SIGINT
, SIG_DFL
);
1771 /* An external diff command takes:
1773 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1774 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1777 static void run_external_diff(const char *pgm
,
1780 struct diff_filespec
*one
,
1781 struct diff_filespec
*two
,
1782 const char *xfrm_msg
,
1783 int complete_rewrite
)
1785 const char *spawn_arg
[10];
1786 struct diff_tempfile
*temp
= diff_temp
;
1788 static int atexit_asked
= 0;
1789 const char *othername
;
1790 const char **arg
= &spawn_arg
[0];
1792 othername
= (other
? other
: name
);
1794 prepare_temp_file(name
, &temp
[0], one
);
1795 prepare_temp_file(othername
, &temp
[1], two
);
1796 if (! atexit_asked
&&
1797 (temp
[0].name
== temp
[0].tmp_path
||
1798 temp
[1].name
== temp
[1].tmp_path
)) {
1800 atexit(remove_tempfile
);
1802 signal(SIGINT
, remove_tempfile_on_signal
);
1808 *arg
++ = temp
[0].name
;
1809 *arg
++ = temp
[0].hex
;
1810 *arg
++ = temp
[0].mode
;
1811 *arg
++ = temp
[1].name
;
1812 *arg
++ = temp
[1].hex
;
1813 *arg
++ = temp
[1].mode
;
1824 retval
= run_command_v_opt(spawn_arg
, 0);
1827 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1832 static const char *external_diff_attr(const char *name
)
1834 struct git_attr_check attr_diff_check
;
1836 setup_diff_attr_check(&attr_diff_check
);
1837 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
1838 const char *value
= attr_diff_check
.value
;
1839 if (!ATTR_TRUE(value
) &&
1840 !ATTR_FALSE(value
) &&
1841 !ATTR_UNSET(value
)) {
1842 struct ll_diff_driver
*drv
;
1844 for (drv
= user_diff
; drv
; drv
= drv
->next
)
1845 if (!strcmp(drv
->name
, value
))
1852 static void run_diff_cmd(const char *pgm
,
1855 struct diff_filespec
*one
,
1856 struct diff_filespec
*two
,
1857 const char *xfrm_msg
,
1858 struct diff_options
*o
,
1859 int complete_rewrite
)
1861 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
1864 const char *cmd
= external_diff_attr(name
);
1870 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
1875 builtin_diff(name
, other
? other
: name
,
1876 one
, two
, xfrm_msg
, o
, complete_rewrite
);
1878 printf("* Unmerged path %s\n", name
);
1881 static void diff_fill_sha1_info(struct diff_filespec
*one
)
1883 if (DIFF_FILE_VALID(one
)) {
1884 if (!one
->sha1_valid
) {
1886 if (!strcmp(one
->path
, "-")) {
1887 hashcpy(one
->sha1
, null_sha1
);
1890 if (lstat(one
->path
, &st
) < 0)
1891 die("stat %s", one
->path
);
1892 if (index_path(one
->sha1
, one
->path
, &st
, 0))
1893 die("cannot hash %s\n", one
->path
);
1900 static int similarity_index(struct diff_filepair
*p
)
1902 return p
->score
* 100 / MAX_SCORE
;
1905 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
1907 const char *pgm
= external_diff();
1910 struct diff_filespec
*one
= p
->one
;
1911 struct diff_filespec
*two
= p
->two
;
1914 int complete_rewrite
= 0;
1917 if (DIFF_PAIR_UNMERGED(p
)) {
1918 run_diff_cmd(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
, o
, 0);
1922 name
= p
->one
->path
;
1923 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1924 diff_fill_sha1_info(one
);
1925 diff_fill_sha1_info(two
);
1927 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
1928 switch (p
->status
) {
1929 case DIFF_STATUS_COPIED
:
1930 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1931 strbuf_addstr(&msg
, "\ncopy from ");
1932 quote_c_style(name
, &msg
, NULL
, 0);
1933 strbuf_addstr(&msg
, "\ncopy to ");
1934 quote_c_style(other
, &msg
, NULL
, 0);
1935 strbuf_addch(&msg
, '\n');
1937 case DIFF_STATUS_RENAMED
:
1938 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1939 strbuf_addstr(&msg
, "\nrename from ");
1940 quote_c_style(name
, &msg
, NULL
, 0);
1941 strbuf_addstr(&msg
, "\nrename to ");
1942 quote_c_style(other
, &msg
, NULL
, 0);
1943 strbuf_addch(&msg
, '\n');
1945 case DIFF_STATUS_MODIFIED
:
1947 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
1948 similarity_index(p
));
1949 complete_rewrite
= 1;
1958 if (hashcmp(one
->sha1
, two
->sha1
)) {
1959 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
1961 if (DIFF_OPT_TST(o
, BINARY
)) {
1963 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
1964 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
1967 strbuf_addf(&msg
, "index %.*s..%.*s",
1968 abbrev
, sha1_to_hex(one
->sha1
),
1969 abbrev
, sha1_to_hex(two
->sha1
));
1970 if (one
->mode
== two
->mode
)
1971 strbuf_addf(&msg
, " %06o", one
->mode
);
1972 strbuf_addch(&msg
, '\n');
1976 strbuf_setlen(&msg
, msg
.len
- 1);
1977 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
1980 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
1981 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
1982 /* a filepair that changes between file and symlink
1983 * needs to be split into deletion and creation.
1985 struct diff_filespec
*null
= alloc_filespec(two
->path
);
1986 run_diff_cmd(NULL
, name
, other
, one
, null
, xfrm_msg
, o
, 0);
1988 null
= alloc_filespec(one
->path
);
1989 run_diff_cmd(NULL
, name
, other
, null
, two
, xfrm_msg
, o
, 0);
1993 run_diff_cmd(pgm
, name
, other
, one
, two
, xfrm_msg
, o
,
1996 strbuf_release(&msg
);
1999 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2000 struct diffstat_t
*diffstat
)
2004 int complete_rewrite
= 0;
2006 if (DIFF_PAIR_UNMERGED(p
)) {
2008 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2012 name
= p
->one
->path
;
2013 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2015 diff_fill_sha1_info(p
->one
);
2016 diff_fill_sha1_info(p
->two
);
2018 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2019 complete_rewrite
= 1;
2020 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2023 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2028 if (DIFF_PAIR_UNMERGED(p
)) {
2033 name
= p
->one
->path
;
2034 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2036 diff_fill_sha1_info(p
->one
);
2037 diff_fill_sha1_info(p
->two
);
2039 builtin_checkdiff(name
, other
, p
->one
, p
->two
, o
);
2042 void diff_setup(struct diff_options
*options
)
2044 memset(options
, 0, sizeof(*options
));
2045 options
->line_termination
= '\n';
2046 options
->break_opt
= -1;
2047 options
->rename_limit
= -1;
2048 options
->context
= 3;
2049 options
->msg_sep
= "";
2051 options
->change
= diff_change
;
2052 options
->add_remove
= diff_addremove
;
2053 if (diff_use_color_default
)
2054 DIFF_OPT_SET(options
, COLOR_DIFF
);
2056 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2057 options
->detect_rename
= diff_detect_rename_default
;
2059 options
->a_prefix
= "a/";
2060 options
->b_prefix
= "b/";
2063 int diff_setup_done(struct diff_options
*options
)
2067 if (options
->output_format
& DIFF_FORMAT_NAME
)
2069 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2071 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2073 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2076 die("--name-only, --name-status, --check and -s are mutually exclusive");
2078 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2079 options
->detect_rename
= DIFF_DETECT_COPY
;
2081 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2082 DIFF_FORMAT_NAME_STATUS
|
2083 DIFF_FORMAT_CHECKDIFF
|
2084 DIFF_FORMAT_NO_OUTPUT
))
2085 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2086 DIFF_FORMAT_NUMSTAT
|
2087 DIFF_FORMAT_DIFFSTAT
|
2088 DIFF_FORMAT_SHORTSTAT
|
2089 DIFF_FORMAT_SUMMARY
|
2093 * These cases always need recursive; we do not drop caller-supplied
2094 * recursive bits for other formats here.
2096 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2097 DIFF_FORMAT_NUMSTAT
|
2098 DIFF_FORMAT_DIFFSTAT
|
2099 DIFF_FORMAT_SHORTSTAT
|
2100 DIFF_FORMAT_SUMMARY
|
2101 DIFF_FORMAT_CHECKDIFF
))
2102 DIFF_OPT_SET(options
, RECURSIVE
);
2104 * Also pickaxe would not work very well if you do not say recursive
2106 if (options
->pickaxe
)
2107 DIFF_OPT_SET(options
, RECURSIVE
);
2109 if (options
->detect_rename
&& options
->rename_limit
< 0)
2110 options
->rename_limit
= diff_rename_limit_default
;
2111 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2113 /* read-cache does not die even when it fails
2114 * so it is safe for us to do this here. Also
2115 * it does not smudge active_cache or active_nr
2116 * when it fails, so we do not have to worry about
2117 * cleaning it up ourselves either.
2121 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2122 options
->abbrev
= 40; /* full */
2125 * It does not make sense to show the first hit we happened
2126 * to have found. It does not make sense not to return with
2127 * exit code in such a case either.
2129 if (DIFF_OPT_TST(options
, QUIET
)) {
2130 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2131 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2135 * If we postprocess in diffcore, we cannot simply return
2136 * upon the first hit. We need to run diff as usual.
2138 if (options
->pickaxe
|| options
->filter
)
2139 DIFF_OPT_CLR(options
, QUIET
);
2144 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2154 if (c
== arg_short
) {
2158 if (val
&& isdigit(c
)) {
2160 int n
= strtoul(arg
, &end
, 10);
2171 eq
= strchr(arg
, '=');
2176 if (!len
|| strncmp(arg
, arg_long
, len
))
2181 if (!isdigit(*++eq
))
2183 n
= strtoul(eq
, &end
, 10);
2191 static int diff_scoreopt_parse(const char *opt
);
2193 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2195 const char *arg
= av
[0];
2197 /* Output format options */
2198 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2199 options
->output_format
|= DIFF_FORMAT_PATCH
;
2200 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2201 options
->output_format
|= DIFF_FORMAT_PATCH
;
2202 else if (!strcmp(arg
, "--raw"))
2203 options
->output_format
|= DIFF_FORMAT_RAW
;
2204 else if (!strcmp(arg
, "--patch-with-raw"))
2205 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2206 else if (!strcmp(arg
, "--numstat"))
2207 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2208 else if (!strcmp(arg
, "--shortstat"))
2209 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2210 else if (!strcmp(arg
, "--check"))
2211 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2212 else if (!strcmp(arg
, "--summary"))
2213 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2214 else if (!strcmp(arg
, "--patch-with-stat"))
2215 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2216 else if (!strcmp(arg
, "--name-only"))
2217 options
->output_format
|= DIFF_FORMAT_NAME
;
2218 else if (!strcmp(arg
, "--name-status"))
2219 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2220 else if (!strcmp(arg
, "-s"))
2221 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2222 else if (!prefixcmp(arg
, "--stat")) {
2224 int width
= options
->stat_width
;
2225 int name_width
= options
->stat_name_width
;
2231 if (!prefixcmp(arg
, "-width="))
2232 width
= strtoul(arg
+ 7, &end
, 10);
2233 else if (!prefixcmp(arg
, "-name-width="))
2234 name_width
= strtoul(arg
+ 12, &end
, 10);
2237 width
= strtoul(arg
+1, &end
, 10);
2239 name_width
= strtoul(end
+1, &end
, 10);
2242 /* Important! This checks all the error cases! */
2245 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2246 options
->stat_name_width
= name_width
;
2247 options
->stat_width
= width
;
2250 /* renames options */
2251 else if (!prefixcmp(arg
, "-B")) {
2252 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2255 else if (!prefixcmp(arg
, "-M")) {
2256 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2258 options
->detect_rename
= DIFF_DETECT_RENAME
;
2260 else if (!prefixcmp(arg
, "-C")) {
2261 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2262 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2263 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2265 options
->detect_rename
= DIFF_DETECT_COPY
;
2267 else if (!strcmp(arg
, "--no-renames"))
2268 options
->detect_rename
= 0;
2271 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2272 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2273 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2274 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2275 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2276 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2279 else if (!strcmp(arg
, "--binary")) {
2280 options
->output_format
|= DIFF_FORMAT_PATCH
;
2281 DIFF_OPT_SET(options
, BINARY
);
2283 else if (!strcmp(arg
, "--full-index"))
2284 DIFF_OPT_SET(options
, FULL_INDEX
);
2285 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2286 DIFF_OPT_SET(options
, TEXT
);
2287 else if (!strcmp(arg
, "-R"))
2288 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2289 else if (!strcmp(arg
, "--find-copies-harder"))
2290 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2291 else if (!strcmp(arg
, "--follow"))
2292 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2293 else if (!strcmp(arg
, "--color"))
2294 DIFF_OPT_SET(options
, COLOR_DIFF
);
2295 else if (!strcmp(arg
, "--no-color"))
2296 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2297 else if (!strcmp(arg
, "--color-words"))
2298 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2299 else if (!strcmp(arg
, "--exit-code"))
2300 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2301 else if (!strcmp(arg
, "--quiet"))
2302 DIFF_OPT_SET(options
, QUIET
);
2303 else if (!strcmp(arg
, "--ext-diff"))
2304 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2305 else if (!strcmp(arg
, "--no-ext-diff"))
2306 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2309 else if (!strcmp(arg
, "-z"))
2310 options
->line_termination
= 0;
2311 else if (!prefixcmp(arg
, "-l"))
2312 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2313 else if (!prefixcmp(arg
, "-S"))
2314 options
->pickaxe
= arg
+ 2;
2315 else if (!strcmp(arg
, "--pickaxe-all"))
2316 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2317 else if (!strcmp(arg
, "--pickaxe-regex"))
2318 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2319 else if (!prefixcmp(arg
, "-O"))
2320 options
->orderfile
= arg
+ 2;
2321 else if (!prefixcmp(arg
, "--diff-filter="))
2322 options
->filter
= arg
+ 14;
2323 else if (!strcmp(arg
, "--abbrev"))
2324 options
->abbrev
= DEFAULT_ABBREV
;
2325 else if (!prefixcmp(arg
, "--abbrev=")) {
2326 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2327 if (options
->abbrev
< MINIMUM_ABBREV
)
2328 options
->abbrev
= MINIMUM_ABBREV
;
2329 else if (40 < options
->abbrev
)
2330 options
->abbrev
= 40;
2332 else if (!prefixcmp(arg
, "--src-prefix="))
2333 options
->a_prefix
= arg
+ 13;
2334 else if (!prefixcmp(arg
, "--dst-prefix="))
2335 options
->b_prefix
= arg
+ 13;
2336 else if (!strcmp(arg
, "--no-prefix"))
2337 options
->a_prefix
= options
->b_prefix
= "";
2343 static int parse_num(const char **cp_p
)
2345 unsigned long num
, scale
;
2347 const char *cp
= *cp_p
;
2354 if ( !dot
&& ch
== '.' ) {
2357 } else if ( ch
== '%' ) {
2358 scale
= dot
? scale
*100 : 100;
2359 cp
++; /* % is always at the end */
2361 } else if ( ch
>= '0' && ch
<= '9' ) {
2362 if ( scale
< 100000 ) {
2364 num
= (num
*10) + (ch
-'0');
2373 /* user says num divided by scale and we say internally that
2374 * is MAX_SCORE * num / scale.
2376 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2379 static int diff_scoreopt_parse(const char *opt
)
2381 int opt1
, opt2
, cmd
;
2386 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2387 return -1; /* that is not a -M, -C nor -B option */
2389 opt1
= parse_num(&opt
);
2395 else if (*opt
!= '/')
2396 return -1; /* we expect -B80/99 or -B80 */
2399 opt2
= parse_num(&opt
);
2404 return opt1
| (opt2
<< 16);
2407 struct diff_queue_struct diff_queued_diff
;
2409 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2411 if (queue
->alloc
<= queue
->nr
) {
2412 queue
->alloc
= alloc_nr(queue
->alloc
);
2413 queue
->queue
= xrealloc(queue
->queue
,
2414 sizeof(dp
) * queue
->alloc
);
2416 queue
->queue
[queue
->nr
++] = dp
;
2419 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2420 struct diff_filespec
*one
,
2421 struct diff_filespec
*two
)
2423 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2431 void diff_free_filepair(struct diff_filepair
*p
)
2433 free_filespec(p
->one
);
2434 free_filespec(p
->two
);
2438 /* This is different from find_unique_abbrev() in that
2439 * it stuffs the result with dots for alignment.
2441 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2446 return sha1_to_hex(sha1
);
2448 abbrev
= find_unique_abbrev(sha1
, len
);
2450 return sha1_to_hex(sha1
);
2451 abblen
= strlen(abbrev
);
2453 static char hex
[41];
2454 if (len
< abblen
&& abblen
<= len
+ 2)
2455 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2457 sprintf(hex
, "%s...", abbrev
);
2460 return sha1_to_hex(sha1
);
2463 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2465 int line_termination
= opt
->line_termination
;
2466 int inter_name_termination
= line_termination
? '\t' : '\0';
2468 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2469 printf(":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2470 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2471 printf("%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2474 printf("%c%03d%c", p
->status
, similarity_index(p
),
2475 inter_name_termination
);
2477 printf("%c%c", p
->status
, inter_name_termination
);
2480 if (p
->status
== DIFF_STATUS_COPIED
|| p
->status
== DIFF_STATUS_RENAMED
) {
2481 write_name_quoted(p
->one
->path
, stdout
, inter_name_termination
);
2482 write_name_quoted(p
->two
->path
, stdout
, line_termination
);
2484 const char *path
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2485 write_name_quoted(path
, stdout
, line_termination
);
2489 int diff_unmodified_pair(struct diff_filepair
*p
)
2491 /* This function is written stricter than necessary to support
2492 * the currently implemented transformers, but the idea is to
2493 * let transformers to produce diff_filepairs any way they want,
2494 * and filter and clean them up here before producing the output.
2496 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2498 if (DIFF_PAIR_UNMERGED(p
))
2499 return 0; /* unmerged is interesting */
2501 /* deletion, addition, mode or type change
2502 * and rename are all interesting.
2504 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2505 DIFF_PAIR_MODE_CHANGED(p
) ||
2506 strcmp(one
->path
, two
->path
))
2509 /* both are valid and point at the same path. that is, we are
2510 * dealing with a change.
2512 if (one
->sha1_valid
&& two
->sha1_valid
&&
2513 !hashcmp(one
->sha1
, two
->sha1
))
2514 return 1; /* no change */
2515 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2516 return 1; /* both look at the same file on the filesystem. */
2520 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2522 if (diff_unmodified_pair(p
))
2525 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2526 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2527 return; /* no tree diffs in patch format */
2532 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2533 struct diffstat_t
*diffstat
)
2535 if (diff_unmodified_pair(p
))
2538 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2539 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2540 return; /* no tree diffs in patch format */
2542 run_diffstat(p
, o
, diffstat
);
2545 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2546 struct diff_options
*o
)
2548 if (diff_unmodified_pair(p
))
2551 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2552 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2553 return; /* no tree diffs in patch format */
2555 run_checkdiff(p
, o
);
2558 int diff_queue_is_empty(void)
2560 struct diff_queue_struct
*q
= &diff_queued_diff
;
2562 for (i
= 0; i
< q
->nr
; i
++)
2563 if (!diff_unmodified_pair(q
->queue
[i
]))
2569 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2571 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2574 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2576 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2577 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2579 s
->size
, s
->xfrm_flags
);
2582 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2584 diff_debug_filespec(p
->one
, i
, "one");
2585 diff_debug_filespec(p
->two
, i
, "two");
2586 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2587 p
->score
, p
->status
? p
->status
: '?',
2588 p
->one
->rename_used
, p
->broken_pair
);
2591 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2595 fprintf(stderr
, "%s\n", msg
);
2596 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2597 for (i
= 0; i
< q
->nr
; i
++) {
2598 struct diff_filepair
*p
= q
->queue
[i
];
2599 diff_debug_filepair(p
, i
);
2604 static void diff_resolve_rename_copy(void)
2607 struct diff_filepair
*p
;
2608 struct diff_queue_struct
*q
= &diff_queued_diff
;
2610 diff_debug_queue("resolve-rename-copy", q
);
2612 for (i
= 0; i
< q
->nr
; i
++) {
2614 p
->status
= 0; /* undecided */
2615 if (DIFF_PAIR_UNMERGED(p
))
2616 p
->status
= DIFF_STATUS_UNMERGED
;
2617 else if (!DIFF_FILE_VALID(p
->one
))
2618 p
->status
= DIFF_STATUS_ADDED
;
2619 else if (!DIFF_FILE_VALID(p
->two
))
2620 p
->status
= DIFF_STATUS_DELETED
;
2621 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2622 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2624 /* from this point on, we are dealing with a pair
2625 * whose both sides are valid and of the same type, i.e.
2626 * either in-place edit or rename/copy edit.
2628 else if (DIFF_PAIR_RENAME(p
)) {
2630 * A rename might have re-connected a broken
2631 * pair up, causing the pathnames to be the
2632 * same again. If so, that's not a rename at
2633 * all, just a modification..
2635 * Otherwise, see if this source was used for
2636 * multiple renames, in which case we decrement
2637 * the count, and call it a copy.
2639 if (!strcmp(p
->one
->path
, p
->two
->path
))
2640 p
->status
= DIFF_STATUS_MODIFIED
;
2641 else if (--p
->one
->rename_used
> 0)
2642 p
->status
= DIFF_STATUS_COPIED
;
2644 p
->status
= DIFF_STATUS_RENAMED
;
2646 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2647 p
->one
->mode
!= p
->two
->mode
||
2648 is_null_sha1(p
->one
->sha1
))
2649 p
->status
= DIFF_STATUS_MODIFIED
;
2651 /* This is a "no-change" entry and should not
2652 * happen anymore, but prepare for broken callers.
2654 error("feeding unmodified %s to diffcore",
2656 p
->status
= DIFF_STATUS_UNKNOWN
;
2659 diff_debug_queue("resolve-rename-copy done", q
);
2662 static int check_pair_status(struct diff_filepair
*p
)
2664 switch (p
->status
) {
2665 case DIFF_STATUS_UNKNOWN
:
2668 die("internal error in diff-resolve-rename-copy");
2674 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2676 int fmt
= opt
->output_format
;
2678 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2679 diff_flush_checkdiff(p
, opt
);
2680 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2681 diff_flush_raw(p
, opt
);
2682 else if (fmt
& DIFF_FORMAT_NAME
)
2683 write_name_quoted(p
->two
->path
, stdout
, opt
->line_termination
);
2686 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2689 printf(" %s mode %06o ", newdelete
, fs
->mode
);
2691 printf(" %s ", newdelete
);
2692 write_name_quoted(fs
->path
, stdout
, '\n');
2696 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2698 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2699 printf(" mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2700 show_name
? ' ' : '\n');
2702 write_name_quoted(p
->two
->path
, stdout
, '\n');
2707 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2709 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2711 printf(" %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2713 show_mode_change(p
, 0);
2716 static void diff_summary(struct diff_filepair
*p
)
2719 case DIFF_STATUS_DELETED
:
2720 show_file_mode_name("delete", p
->one
);
2722 case DIFF_STATUS_ADDED
:
2723 show_file_mode_name("create", p
->two
);
2725 case DIFF_STATUS_COPIED
:
2726 show_rename_copy("copy", p
);
2728 case DIFF_STATUS_RENAMED
:
2729 show_rename_copy("rename", p
);
2733 fputs(" rewrite ", stdout
);
2734 write_name_quoted(p
->two
->path
, stdout
, ' ');
2735 printf("(%d%%)\n", similarity_index(p
));
2737 show_mode_change(p
, !p
->score
);
2743 struct xdiff_emit_state xm
;
2748 static int remove_space(char *line
, int len
)
2754 for (i
= 0; i
< len
; i
++)
2755 if (!isspace((c
= line
[i
])))
2761 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2763 struct patch_id_t
*data
= priv
;
2766 /* Ignore line numbers when computing the SHA1 of the patch */
2767 if (!prefixcmp(line
, "@@ -"))
2770 new_len
= remove_space(line
, len
);
2772 SHA1_Update(data
->ctx
, line
, new_len
);
2773 data
->patchlen
+= new_len
;
2776 /* returns 0 upon success, and writes result into sha1 */
2777 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2779 struct diff_queue_struct
*q
= &diff_queued_diff
;
2782 struct patch_id_t data
;
2783 char buffer
[PATH_MAX
* 4 + 20];
2786 memset(&data
, 0, sizeof(struct patch_id_t
));
2788 data
.xm
.consume
= patch_id_consume
;
2790 for (i
= 0; i
< q
->nr
; i
++) {
2795 struct diff_filepair
*p
= q
->queue
[i
];
2798 memset(&xecfg
, 0, sizeof(xecfg
));
2800 return error("internal diff status error");
2801 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2803 if (diff_unmodified_pair(p
))
2805 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2806 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2808 if (DIFF_PAIR_UNMERGED(p
))
2811 diff_fill_sha1_info(p
->one
);
2812 diff_fill_sha1_info(p
->two
);
2813 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2814 fill_mmfile(&mf2
, p
->two
) < 0)
2815 return error("unable to read files to diff");
2817 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2818 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2819 if (p
->one
->mode
== 0)
2820 len1
= snprintf(buffer
, sizeof(buffer
),
2821 "diff--gita/%.*sb/%.*s"
2828 len2
, p
->two
->path
);
2829 else if (p
->two
->mode
== 0)
2830 len1
= snprintf(buffer
, sizeof(buffer
),
2831 "diff--gita/%.*sb/%.*s"
2832 "deletedfilemode%06o"
2838 len1
, p
->one
->path
);
2840 len1
= snprintf(buffer
, sizeof(buffer
),
2841 "diff--gita/%.*sb/%.*s"
2847 len2
, p
->two
->path
);
2848 SHA1_Update(&ctx
, buffer
, len1
);
2850 xpp
.flags
= XDF_NEED_MINIMAL
;
2852 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2853 ecb
.outf
= xdiff_outf
;
2855 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2858 SHA1_Final(sha1
, &ctx
);
2862 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2864 struct diff_queue_struct
*q
= &diff_queued_diff
;
2866 int result
= diff_get_patch_id(options
, sha1
);
2868 for (i
= 0; i
< q
->nr
; i
++)
2869 diff_free_filepair(q
->queue
[i
]);
2873 q
->nr
= q
->alloc
= 0;
2878 static int is_summary_empty(const struct diff_queue_struct
*q
)
2882 for (i
= 0; i
< q
->nr
; i
++) {
2883 const struct diff_filepair
*p
= q
->queue
[i
];
2885 switch (p
->status
) {
2886 case DIFF_STATUS_DELETED
:
2887 case DIFF_STATUS_ADDED
:
2888 case DIFF_STATUS_COPIED
:
2889 case DIFF_STATUS_RENAMED
:
2894 if (p
->one
->mode
&& p
->two
->mode
&&
2895 p
->one
->mode
!= p
->two
->mode
)
2903 void diff_flush(struct diff_options
*options
)
2905 struct diff_queue_struct
*q
= &diff_queued_diff
;
2906 int i
, output_format
= options
->output_format
;
2910 * Order: raw, stat, summary, patch
2911 * or: name/name-status/checkdiff (other bits clear)
2916 if (output_format
& (DIFF_FORMAT_RAW
|
2918 DIFF_FORMAT_NAME_STATUS
|
2919 DIFF_FORMAT_CHECKDIFF
)) {
2920 for (i
= 0; i
< q
->nr
; i
++) {
2921 struct diff_filepair
*p
= q
->queue
[i
];
2922 if (check_pair_status(p
))
2923 flush_one_pair(p
, options
);
2928 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
2929 struct diffstat_t diffstat
;
2931 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
2932 diffstat
.xm
.consume
= diffstat_consume
;
2933 for (i
= 0; i
< q
->nr
; i
++) {
2934 struct diff_filepair
*p
= q
->queue
[i
];
2935 if (check_pair_status(p
))
2936 diff_flush_stat(p
, options
, &diffstat
);
2938 if (output_format
& DIFF_FORMAT_NUMSTAT
)
2939 show_numstat(&diffstat
, options
);
2940 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
2941 show_stats(&diffstat
, options
);
2942 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
2943 show_shortstats(&diffstat
);
2944 free_diffstat_info(&diffstat
);
2948 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
2949 for (i
= 0; i
< q
->nr
; i
++)
2950 diff_summary(q
->queue
[i
]);
2954 if (output_format
& DIFF_FORMAT_PATCH
) {
2956 if (options
->stat_sep
) {
2957 /* attach patch instead of inline */
2958 fputs(options
->stat_sep
, stdout
);
2960 putchar(options
->line_termination
);
2964 for (i
= 0; i
< q
->nr
; i
++) {
2965 struct diff_filepair
*p
= q
->queue
[i
];
2966 if (check_pair_status(p
))
2967 diff_flush_patch(p
, options
);
2971 if (output_format
& DIFF_FORMAT_CALLBACK
)
2972 options
->format_callback(q
, options
, options
->format_callback_data
);
2974 for (i
= 0; i
< q
->nr
; i
++)
2975 diff_free_filepair(q
->queue
[i
]);
2979 q
->nr
= q
->alloc
= 0;
2982 static void diffcore_apply_filter(const char *filter
)
2985 struct diff_queue_struct
*q
= &diff_queued_diff
;
2986 struct diff_queue_struct outq
;
2988 outq
.nr
= outq
.alloc
= 0;
2993 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
2995 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
2996 struct diff_filepair
*p
= q
->queue
[i
];
2997 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
2999 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3001 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3002 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3003 strchr(filter
, p
->status
)))
3009 /* otherwise we will clear the whole queue
3010 * by copying the empty outq at the end of this
3011 * function, but first clear the current entries
3014 for (i
= 0; i
< q
->nr
; i
++)
3015 diff_free_filepair(q
->queue
[i
]);
3018 /* Only the matching ones */
3019 for (i
= 0; i
< q
->nr
; i
++) {
3020 struct diff_filepair
*p
= q
->queue
[i
];
3022 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3024 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3026 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3027 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3028 strchr(filter
, p
->status
)))
3031 diff_free_filepair(p
);
3038 /* Check whether two filespecs with the same mode and size are identical */
3039 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3040 struct diff_filespec
*two
)
3042 if (S_ISGITLINK(one
->mode
)) {
3043 diff_fill_sha1_info(one
);
3044 diff_fill_sha1_info(two
);
3045 return !hashcmp(one
->sha1
, two
->sha1
);
3047 if (diff_populate_filespec(one
, 0))
3049 if (diff_populate_filespec(two
, 0))
3051 return !memcmp(one
->data
, two
->data
, one
->size
);
3054 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3057 struct diff_queue_struct
*q
= &diff_queued_diff
;
3058 struct diff_queue_struct outq
;
3060 outq
.nr
= outq
.alloc
= 0;
3062 for (i
= 0; i
< q
->nr
; i
++) {
3063 struct diff_filepair
*p
= q
->queue
[i
];
3066 * 1. Entries that come from stat info dirtyness
3067 * always have both sides (iow, not create/delete),
3068 * one side of the object name is unknown, with
3069 * the same mode and size. Keep the ones that
3070 * do not match these criteria. They have real
3073 * 2. At this point, the file is known to be modified,
3074 * with the same mode and size, and the object
3075 * name of one side is unknown. Need to inspect
3076 * the identical contents.
3078 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3079 !DIFF_FILE_VALID(p
->two
) ||
3080 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3081 (p
->one
->mode
!= p
->two
->mode
) ||
3082 diff_populate_filespec(p
->one
, 1) ||
3083 diff_populate_filespec(p
->two
, 1) ||
3084 (p
->one
->size
!= p
->two
->size
) ||
3085 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3089 * The caller can subtract 1 from skip_stat_unmatch
3090 * to determine how many paths were dirty only
3091 * due to stat info mismatch.
3093 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3094 diffopt
->skip_stat_unmatch
++;
3095 diff_free_filepair(p
);
3102 void diffcore_std(struct diff_options
*options
)
3104 if (DIFF_OPT_TST(options
, QUIET
))
3107 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3108 diffcore_skip_stat_unmatch(options
);
3109 if (options
->break_opt
!= -1)
3110 diffcore_break(options
->break_opt
);
3111 if (options
->detect_rename
)
3112 diffcore_rename(options
);
3113 if (options
->break_opt
!= -1)
3114 diffcore_merge_broken();
3115 if (options
->pickaxe
)
3116 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3117 if (options
->orderfile
)
3118 diffcore_order(options
->orderfile
);
3119 diff_resolve_rename_copy();
3120 diffcore_apply_filter(options
->filter
);
3122 if (diff_queued_diff
.nr
)
3123 DIFF_OPT_SET(options
, HAS_CHANGES
);
3125 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3128 int diff_result_code(struct diff_options
*opt
, int status
)
3131 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3132 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3134 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3135 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3137 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3138 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3143 void diff_addremove(struct diff_options
*options
,
3144 int addremove
, unsigned mode
,
3145 const unsigned char *sha1
,
3146 const char *base
, const char *path
)
3148 char concatpath
[PATH_MAX
];
3149 struct diff_filespec
*one
, *two
;
3151 /* This may look odd, but it is a preparation for
3152 * feeding "there are unchanged files which should
3153 * not produce diffs, but when you are doing copy
3154 * detection you would need them, so here they are"
3155 * entries to the diff-core. They will be prefixed
3156 * with something like '=' or '*' (I haven't decided
3157 * which but should not make any difference).
3158 * Feeding the same new and old to diff_change()
3159 * also has the same effect.
3160 * Before the final output happens, they are pruned after
3161 * merged into rename/copy pairs as appropriate.
3163 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3164 addremove
= (addremove
== '+' ? '-' :
3165 addremove
== '-' ? '+' : addremove
);
3167 if (!path
) path
= "";
3168 sprintf(concatpath
, "%s%s", base
, path
);
3169 one
= alloc_filespec(concatpath
);
3170 two
= alloc_filespec(concatpath
);
3172 if (addremove
!= '+')
3173 fill_filespec(one
, sha1
, mode
);
3174 if (addremove
!= '-')
3175 fill_filespec(two
, sha1
, mode
);
3177 diff_queue(&diff_queued_diff
, one
, two
);
3178 DIFF_OPT_SET(options
, HAS_CHANGES
);
3181 void diff_change(struct diff_options
*options
,
3182 unsigned old_mode
, unsigned new_mode
,
3183 const unsigned char *old_sha1
,
3184 const unsigned char *new_sha1
,
3185 const char *base
, const char *path
)
3187 char concatpath
[PATH_MAX
];
3188 struct diff_filespec
*one
, *two
;
3190 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3192 const unsigned char *tmp_c
;
3193 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3194 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3196 if (!path
) path
= "";
3197 sprintf(concatpath
, "%s%s", base
, path
);
3198 one
= alloc_filespec(concatpath
);
3199 two
= alloc_filespec(concatpath
);
3200 fill_filespec(one
, old_sha1
, old_mode
);
3201 fill_filespec(two
, new_sha1
, new_mode
);
3203 diff_queue(&diff_queued_diff
, one
, two
);
3204 DIFF_OPT_SET(options
, HAS_CHANGES
);
3207 void diff_unmerge(struct diff_options
*options
,
3209 unsigned mode
, const unsigned char *sha1
)
3211 struct diff_filespec
*one
, *two
;
3212 one
= alloc_filespec(path
);
3213 two
= alloc_filespec(path
);
3214 fill_filespec(one
, sha1
, mode
);
3215 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;