2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
14 #ifdef NO_FAST_WORKING_DIRECTORY
15 #define FAST_WORKING_DIRECTORY 0
17 #define FAST_WORKING_DIRECTORY 1
20 static int diff_detect_rename_default
;
21 static int diff_rename_limit_default
= 100;
22 static int diff_use_color_default
;
23 int diff_auto_refresh_index
= 1;
25 static char diff_colors
[][COLOR_MAXLEN
] = {
27 "", /* PLAIN (normal) */
28 "\033[1m", /* METAINFO (bold) */
29 "\033[36m", /* FRAGINFO (cyan) */
30 "\033[31m", /* OLD (red) */
31 "\033[32m", /* NEW (green) */
32 "\033[33m", /* COMMIT (yellow) */
33 "\033[41m", /* WHITESPACE (red background) */
36 static int parse_diff_color_slot(const char *var
, int ofs
)
38 if (!strcasecmp(var
+ofs
, "plain"))
40 if (!strcasecmp(var
+ofs
, "meta"))
42 if (!strcasecmp(var
+ofs
, "frag"))
44 if (!strcasecmp(var
+ofs
, "old"))
46 if (!strcasecmp(var
+ofs
, "new"))
48 if (!strcasecmp(var
+ofs
, "commit"))
50 if (!strcasecmp(var
+ofs
, "whitespace"))
51 return DIFF_WHITESPACE
;
52 die("bad config variable '%s'", var
);
55 static struct ll_diff_driver
{
57 struct ll_diff_driver
*next
;
59 } *user_diff
, **user_diff_tail
;
61 static void read_config_if_needed(void)
63 if (!user_diff_tail
) {
64 user_diff_tail
= &user_diff
;
65 git_config(git_diff_ui_config
);
70 * Currently there is only "diff.<drivername>.command" variable;
71 * because there are "diff.color.<slot>" variables, we are parsing
72 * this in a bit convoluted way to allow low level diff driver
75 static int parse_lldiff_command(const char *var
, const char *ep
, const char *value
)
79 struct ll_diff_driver
*drv
;
83 for (drv
= user_diff
; drv
; drv
= drv
->next
)
84 if (!strncmp(drv
->name
, name
, namelen
) && !drv
->name
[namelen
])
87 drv
= xcalloc(1, sizeof(struct ll_diff_driver
));
88 drv
->name
= xmemdupz(name
, namelen
);
90 user_diff_tail
= &user_diff
;
91 *user_diff_tail
= drv
;
92 user_diff_tail
= &(drv
->next
);
96 return error("%s: lacks value", var
);
97 drv
->cmd
= strdup(value
);
102 * 'diff.<what>.funcname' attribute can be specified in the configuration
103 * to define a customized regexp to find the beginning of a function to
104 * be used for hunk header lines of "diff -p" style output.
106 static struct funcname_pattern
{
109 struct funcname_pattern
*next
;
110 } *funcname_pattern_list
;
112 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
)
116 struct funcname_pattern
*pp
;
118 name
= var
+ 5; /* "diff." */
121 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
122 if (!strncmp(pp
->name
, name
, namelen
) && !pp
->name
[namelen
])
125 pp
= xcalloc(1, sizeof(*pp
));
126 pp
->name
= xmemdupz(name
, namelen
);
127 pp
->next
= funcname_pattern_list
;
128 funcname_pattern_list
= pp
;
132 pp
->pattern
= xstrdup(value
);
137 * These are to give UI layer defaults.
138 * The core-level commands such as git-diff-files should
139 * never be affected by the setting of diff.renames
140 * the user happens to have in the configuration file.
142 int git_diff_ui_config(const char *var
, const char *value
)
144 if (!strcmp(var
, "diff.renamelimit")) {
145 diff_rename_limit_default
= git_config_int(var
, value
);
148 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
149 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
152 if (!strcmp(var
, "diff.renames")) {
154 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
155 else if (!strcasecmp(value
, "copies") ||
156 !strcasecmp(value
, "copy"))
157 diff_detect_rename_default
= DIFF_DETECT_COPY
;
158 else if (git_config_bool(var
,value
))
159 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
162 if (!strcmp(var
, "diff.autorefreshindex")) {
163 diff_auto_refresh_index
= git_config_bool(var
, value
);
166 if (!prefixcmp(var
, "diff.")) {
167 const char *ep
= strrchr(var
, '.');
170 if (!strcmp(ep
, ".command"))
171 return parse_lldiff_command(var
, ep
, value
);
172 if (!strcmp(ep
, ".funcname"))
173 return parse_funcname_pattern(var
, ep
, value
);
176 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
177 int slot
= parse_diff_color_slot(var
, 11);
178 color_parse(value
, var
, diff_colors
[slot
]);
182 return git_default_config(var
, value
);
185 static char *quote_two(const char *one
, const char *two
)
187 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
188 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
191 strbuf_init(&res
, 0);
192 if (need_one
+ need_two
) {
193 strbuf_addch(&res
, '"');
194 quote_c_style(one
, &res
, NULL
, 1);
195 quote_c_style(two
, &res
, NULL
, 1);
196 strbuf_addch(&res
, '"');
198 strbuf_addstr(&res
, one
);
199 strbuf_addstr(&res
, two
);
201 return strbuf_detach(&res
, NULL
);
204 static const char *external_diff(void)
206 static const char *external_diff_cmd
= NULL
;
207 static int done_preparing
= 0;
210 return external_diff_cmd
;
211 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
213 return external_diff_cmd
;
216 static struct diff_tempfile
{
217 const char *name
; /* filename external diff should read from */
220 char tmp_path
[PATH_MAX
];
223 static int count_lines(const char *data
, int size
)
225 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
232 completely_empty
= 0;
236 completely_empty
= 0;
239 if (completely_empty
)
242 count
++; /* no trailing newline */
246 static void print_line_count(int count
)
256 printf("1,%d", count
);
261 static void copy_file(int prefix
, const char *data
, int size
,
262 const char *set
, const char *reset
)
264 int ch
, nl_just_seen
= 1;
273 fputs(reset
, stdout
);
279 printf("%s\n\\ No newline at end of file\n", reset
);
282 static void emit_rewrite_diff(const char *name_a
,
284 struct diff_filespec
*one
,
285 struct diff_filespec
*two
,
289 const char *name_a_tab
, *name_b_tab
;
290 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
291 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
292 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
293 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
294 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
296 name_a
+= (*name_a
== '/');
297 name_b
+= (*name_b
== '/');
298 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
299 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
301 diff_populate_filespec(one
, 0);
302 diff_populate_filespec(two
, 0);
303 lc_a
= count_lines(one
->data
, one
->size
);
304 lc_b
= count_lines(two
->data
, two
->size
);
305 printf("%s--- a/%s%s%s\n%s+++ b/%s%s%s\n%s@@ -",
306 metainfo
, name_a
, name_a_tab
, reset
,
307 metainfo
, name_b
, name_b_tab
, reset
, fraginfo
);
308 print_line_count(lc_a
);
310 print_line_count(lc_b
);
311 printf(" @@%s\n", reset
);
313 copy_file('-', one
->data
, one
->size
, old
, reset
);
315 copy_file('+', two
->data
, two
->size
, new, reset
);
318 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
320 if (!DIFF_FILE_VALID(one
)) {
321 mf
->ptr
= (char *)""; /* does not matter */
325 else if (diff_populate_filespec(one
, 0))
328 mf
->size
= one
->size
;
332 struct diff_words_buffer
{
335 long current
; /* output pointer */
336 int suppressed_newline
;
339 static void diff_words_append(char *line
, unsigned long len
,
340 struct diff_words_buffer
*buffer
)
342 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
343 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
344 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
348 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
349 buffer
->text
.size
+= len
;
352 struct diff_words_data
{
353 struct xdiff_emit_state xm
;
354 struct diff_words_buffer minus
, plus
;
357 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
358 int suppress_newline
)
366 ptr
= buffer
->text
.ptr
+ buffer
->current
;
367 buffer
->current
+= len
;
369 if (ptr
[len
- 1] == '\n') {
374 fputs(diff_get_color(1, color
), stdout
);
375 fwrite(ptr
, len
, 1, stdout
);
376 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
379 if (suppress_newline
)
380 buffer
->suppressed_newline
= 1;
386 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
388 struct diff_words_data
*diff_words
= priv
;
390 if (diff_words
->minus
.suppressed_newline
) {
393 diff_words
->minus
.suppressed_newline
= 0;
399 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
402 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
405 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
406 diff_words
->minus
.current
+= len
;
411 /* this executes the word diff on the accumulated buffers */
412 static void diff_words_show(struct diff_words_data
*diff_words
)
417 mmfile_t minus
, plus
;
420 memset(&xecfg
, 0, sizeof(xecfg
));
421 minus
.size
= diff_words
->minus
.text
.size
;
422 minus
.ptr
= xmalloc(minus
.size
);
423 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
424 for (i
= 0; i
< minus
.size
; i
++)
425 if (isspace(minus
.ptr
[i
]))
427 diff_words
->minus
.current
= 0;
429 plus
.size
= diff_words
->plus
.text
.size
;
430 plus
.ptr
= xmalloc(plus
.size
);
431 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
432 for (i
= 0; i
< plus
.size
; i
++)
433 if (isspace(plus
.ptr
[i
]))
435 diff_words
->plus
.current
= 0;
437 xpp
.flags
= XDF_NEED_MINIMAL
;
438 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
439 ecb
.outf
= xdiff_outf
;
440 ecb
.priv
= diff_words
;
441 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
442 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
446 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
448 if (diff_words
->minus
.suppressed_newline
) {
450 diff_words
->minus
.suppressed_newline
= 0;
454 struct emit_callback
{
455 struct xdiff_emit_state xm
;
456 int nparents
, color_diff
;
458 const char **label_path
;
459 struct diff_words_data
*diff_words
;
463 static void free_diff_words_data(struct emit_callback
*ecbdata
)
465 if (ecbdata
->diff_words
) {
467 if (ecbdata
->diff_words
->minus
.text
.size
||
468 ecbdata
->diff_words
->plus
.text
.size
)
469 diff_words_show(ecbdata
->diff_words
);
471 if (ecbdata
->diff_words
->minus
.text
.ptr
)
472 free (ecbdata
->diff_words
->minus
.text
.ptr
);
473 if (ecbdata
->diff_words
->plus
.text
.ptr
)
474 free (ecbdata
->diff_words
->plus
.text
.ptr
);
475 free(ecbdata
->diff_words
);
476 ecbdata
->diff_words
= NULL
;
480 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
483 return diff_colors
[ix
];
487 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
489 if (len
> 0 && line
[len
-1] == '\n')
492 fwrite(line
, len
, 1, stdout
);
496 static void emit_line_with_ws(int nparents
,
497 const char *set
, const char *reset
, const char *ws
,
498 const char *line
, int len
, unsigned ws_rule
)
501 int last_tab_in_indent
= -1;
502 int last_space_in_indent
= -1;
505 int need_highlight_leading_space
= 0;
507 * The line is a newly added line. Does it have funny leading
508 * whitespaces? In indent, SP should never precede a TAB. In
509 * addition, under "indent with non tab" rule, there should not
510 * be more than 8 consecutive spaces.
512 for (i
= col0
; i
< len
; i
++) {
513 if (line
[i
] == '\t') {
514 last_tab_in_indent
= i
;
515 if ((ws_rule
& WS_SPACE_BEFORE_TAB
) &&
516 0 <= last_space_in_indent
)
517 need_highlight_leading_space
= 1;
519 else if (line
[i
] == ' ')
520 last_space_in_indent
= i
;
524 if ((ws_rule
& WS_INDENT_WITH_NON_TAB
) &&
525 0 <= last_space_in_indent
&&
526 last_tab_in_indent
< 0 &&
528 last_tab_in_indent
= i
;
529 need_highlight_leading_space
= 1;
532 fwrite(line
, col0
, 1, stdout
);
533 fputs(reset
, stdout
);
534 if (((i
== len
) || line
[i
] == '\n') && i
!= col0
) {
535 /* The whole line was indent */
536 emit_line(ws
, reset
, line
+ col0
, len
- col0
);
540 if (need_highlight_leading_space
) {
541 while (i
< last_tab_in_indent
) {
542 if (line
[i
] == ' ') {
545 fputs(reset
, stdout
);
553 if (line
[tail
] == '\n' && i
< tail
)
555 if (ws_rule
& WS_TRAILING_SPACE
) {
557 if (!isspace(line
[tail
]))
562 if ((i
< tail
&& line
[tail
+ 1] != '\n')) {
563 /* This has whitespace between tail+1..len */
565 fwrite(line
+ i
, tail
- i
+ 1, 1, stdout
);
566 fputs(reset
, stdout
);
567 emit_line(ws
, reset
, line
+ tail
+ 1, len
- tail
- 1);
570 emit_line(set
, reset
, line
+ i
, len
- i
);
573 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
575 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
576 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
579 emit_line(set
, reset
, line
, len
);
581 emit_line_with_ws(ecbdata
->nparents
, set
, reset
, ws
,
582 line
, len
, ecbdata
->ws_rule
);
585 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
589 struct emit_callback
*ecbdata
= priv
;
590 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
591 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
593 *(ecbdata
->found_changesp
) = 1;
595 if (ecbdata
->label_path
[0]) {
596 const char *name_a_tab
, *name_b_tab
;
598 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
599 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
601 printf("%s--- %s%s%s\n",
602 set
, ecbdata
->label_path
[0], reset
, name_a_tab
);
603 printf("%s+++ %s%s%s\n",
604 set
, ecbdata
->label_path
[1], reset
, name_b_tab
);
605 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
608 /* This is not really necessary for now because
609 * this codepath only deals with two-way diffs.
611 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
613 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
614 ecbdata
->nparents
= i
- 1;
615 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
620 if (len
< ecbdata
->nparents
) {
622 emit_line(reset
, reset
, line
, len
);
627 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
628 /* fall back to normal diff */
629 free_diff_words_data(ecbdata
);
630 if (ecbdata
->diff_words
) {
631 if (line
[0] == '-') {
632 diff_words_append(line
, len
,
633 &ecbdata
->diff_words
->minus
);
635 } else if (line
[0] == '+') {
636 diff_words_append(line
, len
,
637 &ecbdata
->diff_words
->plus
);
640 if (ecbdata
->diff_words
->minus
.text
.size
||
641 ecbdata
->diff_words
->plus
.text
.size
)
642 diff_words_show(ecbdata
->diff_words
);
645 emit_line(set
, reset
, line
, len
);
648 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
650 color
= DIFF_FILE_OLD
;
651 else if (line
[i
] == '+')
652 color
= DIFF_FILE_NEW
;
655 if (color
!= DIFF_FILE_NEW
) {
656 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
660 emit_add_line(reset
, ecbdata
, line
, len
);
663 static char *pprint_rename(const char *a
, const char *b
)
668 int pfx_length
, sfx_length
;
669 int len_a
= strlen(a
);
670 int len_b
= strlen(b
);
671 int a_midlen
, b_midlen
;
672 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
673 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
675 strbuf_init(&name
, 0);
676 if (qlen_a
|| qlen_b
) {
677 quote_c_style(a
, &name
, NULL
, 0);
678 strbuf_addstr(&name
, " => ");
679 quote_c_style(b
, &name
, NULL
, 0);
680 return strbuf_detach(&name
, NULL
);
683 /* Find common prefix */
685 while (*old
&& *new && *old
== *new) {
687 pfx_length
= old
- a
+ 1;
692 /* Find common suffix */
696 while (a
<= old
&& b
<= new && *old
== *new) {
698 sfx_length
= len_a
- (old
- a
);
704 * pfx{mid-a => mid-b}sfx
705 * {pfx-a => pfx-b}sfx
706 * pfx{sfx-a => sfx-b}
709 a_midlen
= len_a
- pfx_length
- sfx_length
;
710 b_midlen
= len_b
- pfx_length
- sfx_length
;
716 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
717 if (pfx_length
+ sfx_length
) {
718 strbuf_add(&name
, a
, pfx_length
);
719 strbuf_addch(&name
, '{');
721 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
722 strbuf_addstr(&name
, " => ");
723 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
724 if (pfx_length
+ sfx_length
) {
725 strbuf_addch(&name
, '}');
726 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
728 return strbuf_detach(&name
, NULL
);
732 struct xdiff_emit_state xm
;
736 struct diffstat_file
{
740 unsigned is_unmerged
:1;
741 unsigned is_binary
:1;
742 unsigned is_renamed
:1;
743 unsigned int added
, deleted
;
747 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
751 struct diffstat_file
*x
;
752 x
= xcalloc(sizeof (*x
), 1);
753 if (diffstat
->nr
== diffstat
->alloc
) {
754 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
755 diffstat
->files
= xrealloc(diffstat
->files
,
756 diffstat
->alloc
* sizeof(x
));
758 diffstat
->files
[diffstat
->nr
++] = x
;
760 x
->from_name
= xstrdup(name_a
);
761 x
->name
= xstrdup(name_b
);
766 x
->name
= xstrdup(name_a
);
771 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
773 struct diffstat_t
*diffstat
= priv
;
774 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
778 else if (line
[0] == '-')
782 const char mime_boundary_leader
[] = "------------";
784 static int scale_linear(int it
, int width
, int max_change
)
787 * make sure that at least one '-' is printed if there were deletions,
788 * and likewise for '+'.
792 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
795 static void show_name(const char *prefix
, const char *name
, int len
,
796 const char *reset
, const char *set
)
798 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
801 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
811 static void fill_print_name(struct diffstat_file
*file
)
815 if (file
->print_name
)
818 if (!file
->is_renamed
) {
820 strbuf_init(&buf
, 0);
821 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
822 pname
= strbuf_detach(&buf
, NULL
);
825 strbuf_release(&buf
);
828 pname
= pprint_rename(file
->from_name
, file
->name
);
830 file
->print_name
= pname
;
833 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
835 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
836 int max_change
= 0, max_len
= 0;
837 int total_files
= data
->nr
;
838 int width
, name_width
;
839 const char *reset
, *set
, *add_c
, *del_c
;
844 width
= options
->stat_width
? options
->stat_width
: 80;
845 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
847 /* Sanity: give at least 5 columns to the graph,
848 * but leave at least 10 columns for the name.
850 if (width
< name_width
+ 15) {
851 if (name_width
<= 25)
852 width
= name_width
+ 15;
854 name_width
= width
- 15;
857 /* Find the longest filename and max number of changes */
858 reset
= diff_get_color_opt(options
, DIFF_RESET
);
859 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
860 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
861 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
863 for (i
= 0; i
< data
->nr
; i
++) {
864 struct diffstat_file
*file
= data
->files
[i
];
865 int change
= file
->added
+ file
->deleted
;
866 fill_print_name(file
);
867 len
= strlen(file
->print_name
);
871 if (file
->is_binary
|| file
->is_unmerged
)
873 if (max_change
< change
)
877 /* Compute the width of the graph part;
878 * 10 is for one blank at the beginning of the line plus
879 * " | count " between the name and the graph.
881 * From here on, name_width is the width of the name area,
882 * and width is the width of the graph area.
884 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
885 if (width
< (name_width
+ 10) + max_change
)
886 width
= width
- (name_width
+ 10);
890 for (i
= 0; i
< data
->nr
; i
++) {
891 const char *prefix
= "";
892 char *name
= data
->files
[i
]->print_name
;
893 int added
= data
->files
[i
]->added
;
894 int deleted
= data
->files
[i
]->deleted
;
898 * "scale" the filename
901 name_len
= strlen(name
);
902 if (name_width
< name_len
) {
906 name
+= name_len
- len
;
907 slash
= strchr(name
, '/');
912 if (data
->files
[i
]->is_binary
) {
913 show_name(prefix
, name
, len
, reset
, set
);
915 printf("%s%d%s", del_c
, deleted
, reset
);
917 printf("%s%d%s", add_c
, added
, reset
);
922 else if (data
->files
[i
]->is_unmerged
) {
923 show_name(prefix
, name
, len
, reset
, set
);
924 printf(" Unmerged\n");
927 else if (!data
->files
[i
]->is_renamed
&&
928 (added
+ deleted
== 0)) {
934 * scale the add/delete
942 if (width
<= max_change
) {
943 add
= scale_linear(add
, width
, max_change
);
944 del
= scale_linear(del
, width
, max_change
);
947 show_name(prefix
, name
, len
, reset
, set
);
948 printf("%5d ", added
+ deleted
);
949 show_graph('+', add
, add_c
, reset
);
950 show_graph('-', del
, del_c
, reset
);
953 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
954 set
, total_files
, adds
, dels
, reset
);
957 static void show_shortstats(struct diffstat_t
* data
)
959 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
964 for (i
= 0; i
< data
->nr
; i
++) {
965 if (!data
->files
[i
]->is_binary
&&
966 !data
->files
[i
]->is_unmerged
) {
967 int added
= data
->files
[i
]->added
;
968 int deleted
= data
->files
[i
]->deleted
;
969 if (!data
->files
[i
]->is_renamed
&&
970 (added
+ deleted
== 0)) {
978 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
979 total_files
, adds
, dels
);
982 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
989 for (i
= 0; i
< data
->nr
; i
++) {
990 struct diffstat_file
*file
= data
->files
[i
];
995 printf("%d\t%d\t", file
->added
, file
->deleted
);
996 if (options
->line_termination
) {
997 fill_print_name(file
);
998 if (!file
->is_renamed
)
999 write_name_quoted(file
->name
, stdout
,
1000 options
->line_termination
);
1002 fputs(file
->print_name
, stdout
);
1003 putchar(options
->line_termination
);
1006 if (file
->is_renamed
) {
1008 write_name_quoted(file
->from_name
, stdout
, '\0');
1010 write_name_quoted(file
->name
, stdout
, '\0');
1015 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1018 for (i
= 0; i
< diffstat
->nr
; i
++) {
1019 struct diffstat_file
*f
= diffstat
->files
[i
];
1020 if (f
->name
!= f
->print_name
)
1021 free(f
->print_name
);
1026 free(diffstat
->files
);
1029 struct checkdiff_t
{
1030 struct xdiff_emit_state xm
;
1031 const char *filename
;
1032 int lineno
, color_diff
;
1037 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1039 struct checkdiff_t
*data
= priv
;
1040 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
1041 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
1042 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
1044 if (line
[0] == '+') {
1045 int i
, spaces
= 0, space_before_tab
= 0, white_space_at_end
= 0;
1047 /* check space before tab */
1048 for (i
= 1; i
< len
; i
++) {
1051 else if (line
[i
] == '\t') {
1053 space_before_tab
= 1;
1061 /* check whitespace at line end */
1062 if (line
[len
- 1] == '\n')
1064 if (isspace(line
[len
- 1]))
1065 white_space_at_end
= 1;
1067 if (space_before_tab
|| white_space_at_end
) {
1069 printf("%s:%d: %s", data
->filename
, data
->lineno
, ws
);
1070 if (space_before_tab
) {
1071 printf("space before tab");
1072 if (white_space_at_end
)
1075 if (white_space_at_end
)
1076 printf("whitespace at end");
1077 printf(":%s ", reset
);
1078 emit_line_with_ws(1, set
, reset
, ws
, line
, len
,
1083 } else if (line
[0] == ' ')
1085 else if (line
[0] == '@') {
1086 char *plus
= strchr(line
, '+');
1088 data
->lineno
= strtol(plus
, NULL
, 10);
1090 die("invalid diff");
1094 static unsigned char *deflate_it(char *data
,
1096 unsigned long *result_size
)
1099 unsigned char *deflated
;
1102 memset(&stream
, 0, sizeof(stream
));
1103 deflateInit(&stream
, zlib_compression_level
);
1104 bound
= deflateBound(&stream
, size
);
1105 deflated
= xmalloc(bound
);
1106 stream
.next_out
= deflated
;
1107 stream
.avail_out
= bound
;
1109 stream
.next_in
= (unsigned char *)data
;
1110 stream
.avail_in
= size
;
1111 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1113 deflateEnd(&stream
);
1114 *result_size
= stream
.total_out
;
1118 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
1124 unsigned long orig_size
;
1125 unsigned long delta_size
;
1126 unsigned long deflate_size
;
1127 unsigned long data_size
;
1129 /* We could do deflated delta, or we could do just deflated two,
1130 * whichever is smaller.
1133 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1134 if (one
->size
&& two
->size
) {
1135 delta
= diff_delta(one
->ptr
, one
->size
,
1136 two
->ptr
, two
->size
,
1137 &delta_size
, deflate_size
);
1139 void *to_free
= delta
;
1140 orig_size
= delta_size
;
1141 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1146 if (delta
&& delta_size
< deflate_size
) {
1147 printf("delta %lu\n", orig_size
);
1150 data_size
= delta_size
;
1153 printf("literal %lu\n", two
->size
);
1156 data_size
= deflate_size
;
1159 /* emit data encoded in base85 */
1162 int bytes
= (52 < data_size
) ? 52 : data_size
;
1166 line
[0] = bytes
+ 'A' - 1;
1168 line
[0] = bytes
- 26 + 'a' - 1;
1169 encode_85(line
+ 1, cp
, bytes
);
1170 cp
= (char *) cp
+ bytes
;
1177 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1179 printf("GIT binary patch\n");
1180 emit_binary_diff_body(one
, two
);
1181 emit_binary_diff_body(two
, one
);
1184 static void setup_diff_attr_check(struct git_attr_check
*check
)
1186 static struct git_attr
*attr_diff
;
1189 attr_diff
= git_attr("diff", 4);
1191 check
[0].attr
= attr_diff
;
1194 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1196 struct git_attr_check attr_diff_check
;
1197 int check_from_data
= 0;
1199 if (one
->checked_attr
)
1202 setup_diff_attr_check(&attr_diff_check
);
1204 one
->funcname_pattern_ident
= NULL
;
1206 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1210 value
= attr_diff_check
.value
;
1211 if (ATTR_TRUE(value
))
1213 else if (ATTR_FALSE(value
))
1216 check_from_data
= 1;
1218 /* funcname pattern ident */
1219 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1222 one
->funcname_pattern_ident
= value
;
1225 if (check_from_data
) {
1226 if (!one
->data
&& DIFF_FILE_VALID(one
))
1227 diff_populate_filespec(one
, 0);
1230 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1234 int diff_filespec_is_binary(struct diff_filespec
*one
)
1236 diff_filespec_check_attr(one
);
1237 return one
->is_binary
;
1240 static const char *funcname_pattern(const char *ident
)
1242 struct funcname_pattern
*pp
;
1244 read_config_if_needed();
1245 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1246 if (!strcmp(ident
, pp
->name
))
1251 static struct builtin_funcname_pattern
{
1253 const char *pattern
;
1254 } builtin_funcname_pattern
[] = {
1255 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1256 "new\\|return\\|switch\\|throw\\|while\\)\n"
1258 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1260 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1263 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1265 const char *ident
, *pattern
;
1268 diff_filespec_check_attr(one
);
1269 ident
= one
->funcname_pattern_ident
;
1273 * If the config file has "funcname.default" defined, that
1274 * regexp is used; otherwise NULL is returned and xemit uses
1275 * the built-in default.
1277 return funcname_pattern("default");
1279 /* Look up custom "funcname.$ident" regexp from config. */
1280 pattern
= funcname_pattern(ident
);
1285 * And define built-in fallback patterns here. Note that
1286 * these can be overriden by the user's config settings.
1288 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1289 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1290 return builtin_funcname_pattern
[i
].pattern
;
1295 static void builtin_diff(const char *name_a
,
1297 struct diff_filespec
*one
,
1298 struct diff_filespec
*two
,
1299 const char *xfrm_msg
,
1300 struct diff_options
*o
,
1301 int complete_rewrite
)
1305 char *a_one
, *b_two
;
1306 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1307 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1309 a_one
= quote_two("a/", name_a
+ (*name_a
== '/'));
1310 b_two
= quote_two("b/", name_b
+ (*name_b
== '/'));
1311 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1312 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1313 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1314 if (lbl
[0][0] == '/') {
1316 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1317 if (xfrm_msg
&& xfrm_msg
[0])
1318 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1320 else if (lbl
[1][0] == '/') {
1321 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1322 if (xfrm_msg
&& xfrm_msg
[0])
1323 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1326 if (one
->mode
!= two
->mode
) {
1327 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1328 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1330 if (xfrm_msg
&& xfrm_msg
[0])
1331 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1333 * we do not run diff between different kind
1336 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1337 goto free_ab_and_return
;
1338 if (complete_rewrite
) {
1339 emit_rewrite_diff(name_a
, name_b
, one
, two
,
1340 DIFF_OPT_TST(o
, COLOR_DIFF
));
1341 o
->found_changes
= 1;
1342 goto free_ab_and_return
;
1346 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1347 die("unable to read files to diff");
1349 if (!DIFF_OPT_TST(o
, TEXT
) &&
1350 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1351 /* Quite common confusing case */
1352 if (mf1
.size
== mf2
.size
&&
1353 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1354 goto free_ab_and_return
;
1355 if (DIFF_OPT_TST(o
, BINARY
))
1356 emit_binary_diff(&mf1
, &mf2
);
1358 printf("Binary files %s and %s differ\n",
1360 o
->found_changes
= 1;
1363 /* Crazy xdl interfaces.. */
1364 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1368 struct emit_callback ecbdata
;
1369 const char *funcname_pattern
;
1371 funcname_pattern
= diff_funcname_pattern(one
);
1372 if (!funcname_pattern
)
1373 funcname_pattern
= diff_funcname_pattern(two
);
1375 memset(&xecfg
, 0, sizeof(xecfg
));
1376 memset(&ecbdata
, 0, sizeof(ecbdata
));
1377 ecbdata
.label_path
= lbl
;
1378 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1379 ecbdata
.found_changesp
= &o
->found_changes
;
1380 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1381 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1382 xecfg
.ctxlen
= o
->context
;
1383 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1384 if (funcname_pattern
)
1385 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1388 else if (!prefixcmp(diffopts
, "--unified="))
1389 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1390 else if (!prefixcmp(diffopts
, "-u"))
1391 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1392 ecb
.outf
= xdiff_outf
;
1393 ecb
.priv
= &ecbdata
;
1394 ecbdata
.xm
.consume
= fn_out_consume
;
1395 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1396 ecbdata
.diff_words
=
1397 xcalloc(1, sizeof(struct diff_words_data
));
1398 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1399 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1400 free_diff_words_data(&ecbdata
);
1404 diff_free_filespec_data(one
);
1405 diff_free_filespec_data(two
);
1411 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1412 struct diff_filespec
*one
,
1413 struct diff_filespec
*two
,
1414 struct diffstat_t
*diffstat
,
1415 struct diff_options
*o
,
1416 int complete_rewrite
)
1419 struct diffstat_file
*data
;
1421 data
= diffstat_add(diffstat
, name_a
, name_b
);
1424 data
->is_unmerged
= 1;
1427 if (complete_rewrite
) {
1428 diff_populate_filespec(one
, 0);
1429 diff_populate_filespec(two
, 0);
1430 data
->deleted
= count_lines(one
->data
, one
->size
);
1431 data
->added
= count_lines(two
->data
, two
->size
);
1432 goto free_and_return
;
1434 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1435 die("unable to read files to diff");
1437 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1438 data
->is_binary
= 1;
1439 data
->added
= mf2
.size
;
1440 data
->deleted
= mf1
.size
;
1442 /* Crazy xdl interfaces.. */
1447 memset(&xecfg
, 0, sizeof(xecfg
));
1448 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1449 ecb
.outf
= xdiff_outf
;
1450 ecb
.priv
= diffstat
;
1451 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1455 diff_free_filespec_data(one
);
1456 diff_free_filespec_data(two
);
1459 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1460 struct diff_filespec
*one
,
1461 struct diff_filespec
*two
, struct diff_options
*o
)
1464 struct checkdiff_t data
;
1469 memset(&data
, 0, sizeof(data
));
1470 data
.xm
.consume
= checkdiff_consume
;
1471 data
.filename
= name_b
? name_b
: name_a
;
1473 data
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1474 data
.ws_rule
= whitespace_rule(data
.filename
);
1476 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1477 die("unable to read files to diff");
1479 if (diff_filespec_is_binary(two
))
1480 goto free_and_return
;
1482 /* Crazy xdl interfaces.. */
1487 memset(&xecfg
, 0, sizeof(xecfg
));
1488 xpp
.flags
= XDF_NEED_MINIMAL
;
1489 ecb
.outf
= xdiff_outf
;
1491 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1494 diff_free_filespec_data(one
);
1495 diff_free_filespec_data(two
);
1497 DIFF_OPT_SET(o
, CHECK_FAILED
);
1500 struct diff_filespec
*alloc_filespec(const char *path
)
1502 int namelen
= strlen(path
);
1503 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1505 memset(spec
, 0, sizeof(*spec
));
1506 spec
->path
= (char *)(spec
+ 1);
1507 memcpy(spec
->path
, path
, namelen
+1);
1512 void free_filespec(struct diff_filespec
*spec
)
1514 if (!--spec
->count
) {
1515 diff_free_filespec_data(spec
);
1520 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1521 unsigned short mode
)
1524 spec
->mode
= canon_mode(mode
);
1525 hashcpy(spec
->sha1
, sha1
);
1526 spec
->sha1_valid
= !is_null_sha1(sha1
);
1531 * Given a name and sha1 pair, if the index tells us the file in
1532 * the work tree has that object contents, return true, so that
1533 * prepare_temp_file() does not have to inflate and extract.
1535 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1537 struct cache_entry
*ce
;
1541 /* We do not read the cache ourselves here, because the
1542 * benchmark with my previous version that always reads cache
1543 * shows that it makes things worse for diff-tree comparing
1544 * two linux-2.6 kernel trees in an already checked out work
1545 * tree. This is because most diff-tree comparisons deal with
1546 * only a small number of files, while reading the cache is
1547 * expensive for a large project, and its cost outweighs the
1548 * savings we get by not inflating the object to a temporary
1549 * file. Practically, this code only helps when we are used
1550 * by diff-cache --cached, which does read the cache before
1556 /* We want to avoid the working directory if our caller
1557 * doesn't need the data in a normal file, this system
1558 * is rather slow with its stat/open/mmap/close syscalls,
1559 * and the object is contained in a pack file. The pack
1560 * is probably already open and will be faster to obtain
1561 * the data through than the working directory. Loose
1562 * objects however would tend to be slower as they need
1563 * to be individually opened and inflated.
1565 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1569 pos
= cache_name_pos(name
, len
);
1572 ce
= active_cache
[pos
];
1573 if ((lstat(name
, &st
) < 0) ||
1574 !S_ISREG(st
.st_mode
) || /* careful! */
1575 ce_match_stat(ce
, &st
, 0) ||
1576 hashcmp(sha1
, ce
->sha1
))
1578 /* we return 1 only when we can stat, it is a regular file,
1579 * stat information matches, and sha1 recorded in the cache
1580 * matches. I.e. we know the file in the work tree really is
1581 * the same as the <name, sha1> pair.
1586 static int populate_from_stdin(struct diff_filespec
*s
)
1591 strbuf_init(&buf
, 0);
1592 if (strbuf_read(&buf
, 0, 0) < 0)
1593 return error("error while reading from stdin %s",
1596 s
->should_munmap
= 0;
1597 s
->data
= strbuf_detach(&buf
, &size
);
1603 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1606 char *data
= xmalloc(100);
1607 len
= snprintf(data
, 100,
1608 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1620 * While doing rename detection and pickaxe operation, we may need to
1621 * grab the data for the blob (or file) for our own in-core comparison.
1622 * diff_filespec has data and size fields for this purpose.
1624 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1627 if (!DIFF_FILE_VALID(s
))
1628 die("internal error: asking to populate invalid file.");
1629 if (S_ISDIR(s
->mode
))
1635 if (size_only
&& 0 < s
->size
)
1638 if (S_ISGITLINK(s
->mode
))
1639 return diff_populate_gitlink(s
, size_only
);
1641 if (!s
->sha1_valid
||
1642 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1647 if (!strcmp(s
->path
, "-"))
1648 return populate_from_stdin(s
);
1650 if (lstat(s
->path
, &st
) < 0) {
1651 if (errno
== ENOENT
) {
1655 s
->data
= (char *)"";
1660 s
->size
= xsize_t(st
.st_size
);
1665 if (S_ISLNK(st
.st_mode
)) {
1667 s
->data
= xmalloc(s
->size
);
1669 ret
= readlink(s
->path
, s
->data
, s
->size
);
1676 fd
= open(s
->path
, O_RDONLY
);
1679 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1681 s
->should_munmap
= 1;
1684 * Convert from working tree format to canonical git format
1686 strbuf_init(&buf
, 0);
1687 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
)) {
1689 munmap(s
->data
, s
->size
);
1690 s
->should_munmap
= 0;
1691 s
->data
= strbuf_detach(&buf
, &size
);
1697 enum object_type type
;
1699 type
= sha1_object_info(s
->sha1
, &s
->size
);
1701 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1708 void diff_free_filespec_blob(struct diff_filespec
*s
)
1712 else if (s
->should_munmap
)
1713 munmap(s
->data
, s
->size
);
1715 if (s
->should_free
|| s
->should_munmap
) {
1716 s
->should_free
= s
->should_munmap
= 0;
1721 void diff_free_filespec_data(struct diff_filespec
*s
)
1723 diff_free_filespec_blob(s
);
1728 static void prep_temp_blob(struct diff_tempfile
*temp
,
1731 const unsigned char *sha1
,
1736 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1738 die("unable to create temp-file: %s", strerror(errno
));
1739 if (write_in_full(fd
, blob
, size
) != size
)
1740 die("unable to write temp-file");
1742 temp
->name
= temp
->tmp_path
;
1743 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1745 sprintf(temp
->mode
, "%06o", mode
);
1748 static void prepare_temp_file(const char *name
,
1749 struct diff_tempfile
*temp
,
1750 struct diff_filespec
*one
)
1752 if (!DIFF_FILE_VALID(one
)) {
1754 /* A '-' entry produces this for file-2, and
1755 * a '+' entry produces this for file-1.
1757 temp
->name
= "/dev/null";
1758 strcpy(temp
->hex
, ".");
1759 strcpy(temp
->mode
, ".");
1763 if (!one
->sha1_valid
||
1764 reuse_worktree_file(name
, one
->sha1
, 1)) {
1766 if (lstat(name
, &st
) < 0) {
1767 if (errno
== ENOENT
)
1768 goto not_a_valid_file
;
1769 die("stat(%s): %s", name
, strerror(errno
));
1771 if (S_ISLNK(st
.st_mode
)) {
1773 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1774 size_t sz
= xsize_t(st
.st_size
);
1775 if (sizeof(buf
) <= st
.st_size
)
1776 die("symlink too long: %s", name
);
1777 ret
= readlink(name
, buf
, sz
);
1779 die("readlink(%s)", name
);
1780 prep_temp_blob(temp
, buf
, sz
,
1782 one
->sha1
: null_sha1
),
1784 one
->mode
: S_IFLNK
));
1787 /* we can borrow from the file in the work tree */
1789 if (!one
->sha1_valid
)
1790 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1792 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1793 /* Even though we may sometimes borrow the
1794 * contents from the work tree, we always want
1795 * one->mode. mode is trustworthy even when
1796 * !(one->sha1_valid), as long as
1797 * DIFF_FILE_VALID(one).
1799 sprintf(temp
->mode
, "%06o", one
->mode
);
1804 if (diff_populate_filespec(one
, 0))
1805 die("cannot read data blob for %s", one
->path
);
1806 prep_temp_blob(temp
, one
->data
, one
->size
,
1807 one
->sha1
, one
->mode
);
1811 static void remove_tempfile(void)
1815 for (i
= 0; i
< 2; i
++)
1816 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1817 unlink(diff_temp
[i
].name
);
1818 diff_temp
[i
].name
= NULL
;
1822 static void remove_tempfile_on_signal(int signo
)
1825 signal(SIGINT
, SIG_DFL
);
1829 /* An external diff command takes:
1831 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1832 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1835 static void run_external_diff(const char *pgm
,
1838 struct diff_filespec
*one
,
1839 struct diff_filespec
*two
,
1840 const char *xfrm_msg
,
1841 int complete_rewrite
)
1843 const char *spawn_arg
[10];
1844 struct diff_tempfile
*temp
= diff_temp
;
1846 static int atexit_asked
= 0;
1847 const char *othername
;
1848 const char **arg
= &spawn_arg
[0];
1850 othername
= (other
? other
: name
);
1852 prepare_temp_file(name
, &temp
[0], one
);
1853 prepare_temp_file(othername
, &temp
[1], two
);
1854 if (! atexit_asked
&&
1855 (temp
[0].name
== temp
[0].tmp_path
||
1856 temp
[1].name
== temp
[1].tmp_path
)) {
1858 atexit(remove_tempfile
);
1860 signal(SIGINT
, remove_tempfile_on_signal
);
1866 *arg
++ = temp
[0].name
;
1867 *arg
++ = temp
[0].hex
;
1868 *arg
++ = temp
[0].mode
;
1869 *arg
++ = temp
[1].name
;
1870 *arg
++ = temp
[1].hex
;
1871 *arg
++ = temp
[1].mode
;
1882 retval
= run_command_v_opt(spawn_arg
, 0);
1885 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1890 static const char *external_diff_attr(const char *name
)
1892 struct git_attr_check attr_diff_check
;
1894 setup_diff_attr_check(&attr_diff_check
);
1895 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
1896 const char *value
= attr_diff_check
.value
;
1897 if (!ATTR_TRUE(value
) &&
1898 !ATTR_FALSE(value
) &&
1899 !ATTR_UNSET(value
)) {
1900 struct ll_diff_driver
*drv
;
1902 read_config_if_needed();
1903 for (drv
= user_diff
; drv
; drv
= drv
->next
)
1904 if (!strcmp(drv
->name
, value
))
1911 static void run_diff_cmd(const char *pgm
,
1914 struct diff_filespec
*one
,
1915 struct diff_filespec
*two
,
1916 const char *xfrm_msg
,
1917 struct diff_options
*o
,
1918 int complete_rewrite
)
1920 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
1923 const char *cmd
= external_diff_attr(name
);
1929 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
1934 builtin_diff(name
, other
? other
: name
,
1935 one
, two
, xfrm_msg
, o
, complete_rewrite
);
1937 printf("* Unmerged path %s\n", name
);
1940 static void diff_fill_sha1_info(struct diff_filespec
*one
)
1942 if (DIFF_FILE_VALID(one
)) {
1943 if (!one
->sha1_valid
) {
1945 if (!strcmp(one
->path
, "-")) {
1946 hashcpy(one
->sha1
, null_sha1
);
1949 if (lstat(one
->path
, &st
) < 0)
1950 die("stat %s", one
->path
);
1951 if (index_path(one
->sha1
, one
->path
, &st
, 0))
1952 die("cannot hash %s\n", one
->path
);
1959 static int similarity_index(struct diff_filepair
*p
)
1961 return p
->score
* 100 / MAX_SCORE
;
1964 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
1966 const char *pgm
= external_diff();
1969 struct diff_filespec
*one
= p
->one
;
1970 struct diff_filespec
*two
= p
->two
;
1973 int complete_rewrite
= 0;
1976 if (DIFF_PAIR_UNMERGED(p
)) {
1977 run_diff_cmd(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
, o
, 0);
1981 name
= p
->one
->path
;
1982 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1983 diff_fill_sha1_info(one
);
1984 diff_fill_sha1_info(two
);
1986 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
1987 switch (p
->status
) {
1988 case DIFF_STATUS_COPIED
:
1989 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1990 strbuf_addstr(&msg
, "\ncopy from ");
1991 quote_c_style(name
, &msg
, NULL
, 0);
1992 strbuf_addstr(&msg
, "\ncopy to ");
1993 quote_c_style(other
, &msg
, NULL
, 0);
1994 strbuf_addch(&msg
, '\n');
1996 case DIFF_STATUS_RENAMED
:
1997 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
1998 strbuf_addstr(&msg
, "\nrename from ");
1999 quote_c_style(name
, &msg
, NULL
, 0);
2000 strbuf_addstr(&msg
, "\nrename to ");
2001 quote_c_style(other
, &msg
, NULL
, 0);
2002 strbuf_addch(&msg
, '\n');
2004 case DIFF_STATUS_MODIFIED
:
2006 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
2007 similarity_index(p
));
2008 complete_rewrite
= 1;
2017 if (hashcmp(one
->sha1
, two
->sha1
)) {
2018 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2020 if (DIFF_OPT_TST(o
, BINARY
)) {
2022 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2023 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2026 strbuf_addf(&msg
, "index %.*s..%.*s",
2027 abbrev
, sha1_to_hex(one
->sha1
),
2028 abbrev
, sha1_to_hex(two
->sha1
));
2029 if (one
->mode
== two
->mode
)
2030 strbuf_addf(&msg
, " %06o", one
->mode
);
2031 strbuf_addch(&msg
, '\n');
2035 strbuf_setlen(&msg
, msg
.len
- 1);
2036 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
2039 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2040 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2041 /* a filepair that changes between file and symlink
2042 * needs to be split into deletion and creation.
2044 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2045 run_diff_cmd(NULL
, name
, other
, one
, null
, xfrm_msg
, o
, 0);
2047 null
= alloc_filespec(one
->path
);
2048 run_diff_cmd(NULL
, name
, other
, null
, two
, xfrm_msg
, o
, 0);
2052 run_diff_cmd(pgm
, name
, other
, one
, two
, xfrm_msg
, o
,
2055 strbuf_release(&msg
);
2058 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2059 struct diffstat_t
*diffstat
)
2063 int complete_rewrite
= 0;
2065 if (DIFF_PAIR_UNMERGED(p
)) {
2067 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2071 name
= p
->one
->path
;
2072 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2074 diff_fill_sha1_info(p
->one
);
2075 diff_fill_sha1_info(p
->two
);
2077 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2078 complete_rewrite
= 1;
2079 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2082 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2087 if (DIFF_PAIR_UNMERGED(p
)) {
2092 name
= p
->one
->path
;
2093 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2095 diff_fill_sha1_info(p
->one
);
2096 diff_fill_sha1_info(p
->two
);
2098 builtin_checkdiff(name
, other
, p
->one
, p
->two
, o
);
2101 void diff_setup(struct diff_options
*options
)
2103 memset(options
, 0, sizeof(*options
));
2104 options
->line_termination
= '\n';
2105 options
->break_opt
= -1;
2106 options
->rename_limit
= -1;
2107 options
->context
= 3;
2108 options
->msg_sep
= "";
2110 options
->change
= diff_change
;
2111 options
->add_remove
= diff_addremove
;
2112 if (diff_use_color_default
)
2113 DIFF_OPT_SET(options
, COLOR_DIFF
);
2115 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2116 options
->detect_rename
= diff_detect_rename_default
;
2119 int diff_setup_done(struct diff_options
*options
)
2123 if (options
->output_format
& DIFF_FORMAT_NAME
)
2125 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2127 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2129 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2132 die("--name-only, --name-status, --check and -s are mutually exclusive");
2134 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2135 options
->detect_rename
= DIFF_DETECT_COPY
;
2137 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2138 DIFF_FORMAT_NAME_STATUS
|
2139 DIFF_FORMAT_CHECKDIFF
|
2140 DIFF_FORMAT_NO_OUTPUT
))
2141 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2142 DIFF_FORMAT_NUMSTAT
|
2143 DIFF_FORMAT_DIFFSTAT
|
2144 DIFF_FORMAT_SHORTSTAT
|
2145 DIFF_FORMAT_SUMMARY
|
2149 * These cases always need recursive; we do not drop caller-supplied
2150 * recursive bits for other formats here.
2152 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2153 DIFF_FORMAT_NUMSTAT
|
2154 DIFF_FORMAT_DIFFSTAT
|
2155 DIFF_FORMAT_SHORTSTAT
|
2156 DIFF_FORMAT_SUMMARY
|
2157 DIFF_FORMAT_CHECKDIFF
))
2158 DIFF_OPT_SET(options
, RECURSIVE
);
2160 * Also pickaxe would not work very well if you do not say recursive
2162 if (options
->pickaxe
)
2163 DIFF_OPT_SET(options
, RECURSIVE
);
2165 if (options
->detect_rename
&& options
->rename_limit
< 0)
2166 options
->rename_limit
= diff_rename_limit_default
;
2167 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2169 /* read-cache does not die even when it fails
2170 * so it is safe for us to do this here. Also
2171 * it does not smudge active_cache or active_nr
2172 * when it fails, so we do not have to worry about
2173 * cleaning it up ourselves either.
2177 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2178 options
->abbrev
= 40; /* full */
2181 * It does not make sense to show the first hit we happened
2182 * to have found. It does not make sense not to return with
2183 * exit code in such a case either.
2185 if (DIFF_OPT_TST(options
, QUIET
)) {
2186 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2187 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2191 * If we postprocess in diffcore, we cannot simply return
2192 * upon the first hit. We need to run diff as usual.
2194 if (options
->pickaxe
|| options
->filter
)
2195 DIFF_OPT_CLR(options
, QUIET
);
2200 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2210 if (c
== arg_short
) {
2214 if (val
&& isdigit(c
)) {
2216 int n
= strtoul(arg
, &end
, 10);
2227 eq
= strchr(arg
, '=');
2232 if (!len
|| strncmp(arg
, arg_long
, len
))
2237 if (!isdigit(*++eq
))
2239 n
= strtoul(eq
, &end
, 10);
2247 static int diff_scoreopt_parse(const char *opt
);
2249 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2251 const char *arg
= av
[0];
2253 /* Output format options */
2254 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2255 options
->output_format
|= DIFF_FORMAT_PATCH
;
2256 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2257 options
->output_format
|= DIFF_FORMAT_PATCH
;
2258 else if (!strcmp(arg
, "--raw"))
2259 options
->output_format
|= DIFF_FORMAT_RAW
;
2260 else if (!strcmp(arg
, "--patch-with-raw"))
2261 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2262 else if (!strcmp(arg
, "--numstat"))
2263 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2264 else if (!strcmp(arg
, "--shortstat"))
2265 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2266 else if (!strcmp(arg
, "--check"))
2267 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2268 else if (!strcmp(arg
, "--summary"))
2269 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2270 else if (!strcmp(arg
, "--patch-with-stat"))
2271 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2272 else if (!strcmp(arg
, "--name-only"))
2273 options
->output_format
|= DIFF_FORMAT_NAME
;
2274 else if (!strcmp(arg
, "--name-status"))
2275 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2276 else if (!strcmp(arg
, "-s"))
2277 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2278 else if (!prefixcmp(arg
, "--stat")) {
2280 int width
= options
->stat_width
;
2281 int name_width
= options
->stat_name_width
;
2287 if (!prefixcmp(arg
, "-width="))
2288 width
= strtoul(arg
+ 7, &end
, 10);
2289 else if (!prefixcmp(arg
, "-name-width="))
2290 name_width
= strtoul(arg
+ 12, &end
, 10);
2293 width
= strtoul(arg
+1, &end
, 10);
2295 name_width
= strtoul(end
+1, &end
, 10);
2298 /* Important! This checks all the error cases! */
2301 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2302 options
->stat_name_width
= name_width
;
2303 options
->stat_width
= width
;
2306 /* renames options */
2307 else if (!prefixcmp(arg
, "-B")) {
2308 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2311 else if (!prefixcmp(arg
, "-M")) {
2312 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2314 options
->detect_rename
= DIFF_DETECT_RENAME
;
2316 else if (!prefixcmp(arg
, "-C")) {
2317 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2318 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2319 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2321 options
->detect_rename
= DIFF_DETECT_COPY
;
2323 else if (!strcmp(arg
, "--no-renames"))
2324 options
->detect_rename
= 0;
2327 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2328 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2329 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2330 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2331 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2332 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2335 else if (!strcmp(arg
, "--binary")) {
2336 options
->output_format
|= DIFF_FORMAT_PATCH
;
2337 DIFF_OPT_SET(options
, BINARY
);
2339 else if (!strcmp(arg
, "--full-index"))
2340 DIFF_OPT_SET(options
, FULL_INDEX
);
2341 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2342 DIFF_OPT_SET(options
, TEXT
);
2343 else if (!strcmp(arg
, "-R"))
2344 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2345 else if (!strcmp(arg
, "--find-copies-harder"))
2346 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2347 else if (!strcmp(arg
, "--follow"))
2348 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2349 else if (!strcmp(arg
, "--color"))
2350 DIFF_OPT_SET(options
, COLOR_DIFF
);
2351 else if (!strcmp(arg
, "--no-color"))
2352 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2353 else if (!strcmp(arg
, "--color-words"))
2354 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2355 else if (!strcmp(arg
, "--exit-code"))
2356 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2357 else if (!strcmp(arg
, "--quiet"))
2358 DIFF_OPT_SET(options
, QUIET
);
2359 else if (!strcmp(arg
, "--ext-diff"))
2360 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2361 else if (!strcmp(arg
, "--no-ext-diff"))
2362 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2365 else if (!strcmp(arg
, "-z"))
2366 options
->line_termination
= 0;
2367 else if (!prefixcmp(arg
, "-l"))
2368 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2369 else if (!prefixcmp(arg
, "-S"))
2370 options
->pickaxe
= arg
+ 2;
2371 else if (!strcmp(arg
, "--pickaxe-all"))
2372 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2373 else if (!strcmp(arg
, "--pickaxe-regex"))
2374 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2375 else if (!prefixcmp(arg
, "-O"))
2376 options
->orderfile
= arg
+ 2;
2377 else if (!prefixcmp(arg
, "--diff-filter="))
2378 options
->filter
= arg
+ 14;
2379 else if (!strcmp(arg
, "--abbrev"))
2380 options
->abbrev
= DEFAULT_ABBREV
;
2381 else if (!prefixcmp(arg
, "--abbrev=")) {
2382 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2383 if (options
->abbrev
< MINIMUM_ABBREV
)
2384 options
->abbrev
= MINIMUM_ABBREV
;
2385 else if (40 < options
->abbrev
)
2386 options
->abbrev
= 40;
2393 static int parse_num(const char **cp_p
)
2395 unsigned long num
, scale
;
2397 const char *cp
= *cp_p
;
2404 if ( !dot
&& ch
== '.' ) {
2407 } else if ( ch
== '%' ) {
2408 scale
= dot
? scale
*100 : 100;
2409 cp
++; /* % is always at the end */
2411 } else if ( ch
>= '0' && ch
<= '9' ) {
2412 if ( scale
< 100000 ) {
2414 num
= (num
*10) + (ch
-'0');
2423 /* user says num divided by scale and we say internally that
2424 * is MAX_SCORE * num / scale.
2426 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2429 static int diff_scoreopt_parse(const char *opt
)
2431 int opt1
, opt2
, cmd
;
2436 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2437 return -1; /* that is not a -M, -C nor -B option */
2439 opt1
= parse_num(&opt
);
2445 else if (*opt
!= '/')
2446 return -1; /* we expect -B80/99 or -B80 */
2449 opt2
= parse_num(&opt
);
2454 return opt1
| (opt2
<< 16);
2457 struct diff_queue_struct diff_queued_diff
;
2459 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2461 if (queue
->alloc
<= queue
->nr
) {
2462 queue
->alloc
= alloc_nr(queue
->alloc
);
2463 queue
->queue
= xrealloc(queue
->queue
,
2464 sizeof(dp
) * queue
->alloc
);
2466 queue
->queue
[queue
->nr
++] = dp
;
2469 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2470 struct diff_filespec
*one
,
2471 struct diff_filespec
*two
)
2473 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2481 void diff_free_filepair(struct diff_filepair
*p
)
2483 free_filespec(p
->one
);
2484 free_filespec(p
->two
);
2488 /* This is different from find_unique_abbrev() in that
2489 * it stuffs the result with dots for alignment.
2491 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2496 return sha1_to_hex(sha1
);
2498 abbrev
= find_unique_abbrev(sha1
, len
);
2500 return sha1_to_hex(sha1
);
2501 abblen
= strlen(abbrev
);
2503 static char hex
[41];
2504 if (len
< abblen
&& abblen
<= len
+ 2)
2505 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2507 sprintf(hex
, "%s...", abbrev
);
2510 return sha1_to_hex(sha1
);
2513 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2515 int line_termination
= opt
->line_termination
;
2516 int inter_name_termination
= line_termination
? '\t' : '\0';
2518 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2519 printf(":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2520 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2521 printf("%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2524 printf("%c%03d%c", p
->status
, similarity_index(p
),
2525 inter_name_termination
);
2527 printf("%c%c", p
->status
, inter_name_termination
);
2530 if (p
->status
== DIFF_STATUS_COPIED
|| p
->status
== DIFF_STATUS_RENAMED
) {
2531 write_name_quoted(p
->one
->path
, stdout
, inter_name_termination
);
2532 write_name_quoted(p
->two
->path
, stdout
, line_termination
);
2534 const char *path
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2535 write_name_quoted(path
, stdout
, line_termination
);
2539 int diff_unmodified_pair(struct diff_filepair
*p
)
2541 /* This function is written stricter than necessary to support
2542 * the currently implemented transformers, but the idea is to
2543 * let transformers to produce diff_filepairs any way they want,
2544 * and filter and clean them up here before producing the output.
2546 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2548 if (DIFF_PAIR_UNMERGED(p
))
2549 return 0; /* unmerged is interesting */
2551 /* deletion, addition, mode or type change
2552 * and rename are all interesting.
2554 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2555 DIFF_PAIR_MODE_CHANGED(p
) ||
2556 strcmp(one
->path
, two
->path
))
2559 /* both are valid and point at the same path. that is, we are
2560 * dealing with a change.
2562 if (one
->sha1_valid
&& two
->sha1_valid
&&
2563 !hashcmp(one
->sha1
, two
->sha1
))
2564 return 1; /* no change */
2565 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2566 return 1; /* both look at the same file on the filesystem. */
2570 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2572 if (diff_unmodified_pair(p
))
2575 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2576 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2577 return; /* no tree diffs in patch format */
2582 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2583 struct diffstat_t
*diffstat
)
2585 if (diff_unmodified_pair(p
))
2588 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2589 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2590 return; /* no tree diffs in patch format */
2592 run_diffstat(p
, o
, diffstat
);
2595 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2596 struct diff_options
*o
)
2598 if (diff_unmodified_pair(p
))
2601 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2602 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2603 return; /* no tree diffs in patch format */
2605 run_checkdiff(p
, o
);
2608 int diff_queue_is_empty(void)
2610 struct diff_queue_struct
*q
= &diff_queued_diff
;
2612 for (i
= 0; i
< q
->nr
; i
++)
2613 if (!diff_unmodified_pair(q
->queue
[i
]))
2619 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2621 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2624 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2626 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2627 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2629 s
->size
, s
->xfrm_flags
);
2632 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2634 diff_debug_filespec(p
->one
, i
, "one");
2635 diff_debug_filespec(p
->two
, i
, "two");
2636 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2637 p
->score
, p
->status
? p
->status
: '?',
2638 p
->one
->rename_used
, p
->broken_pair
);
2641 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2645 fprintf(stderr
, "%s\n", msg
);
2646 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2647 for (i
= 0; i
< q
->nr
; i
++) {
2648 struct diff_filepair
*p
= q
->queue
[i
];
2649 diff_debug_filepair(p
, i
);
2654 static void diff_resolve_rename_copy(void)
2657 struct diff_filepair
*p
;
2658 struct diff_queue_struct
*q
= &diff_queued_diff
;
2660 diff_debug_queue("resolve-rename-copy", q
);
2662 for (i
= 0; i
< q
->nr
; i
++) {
2664 p
->status
= 0; /* undecided */
2665 if (DIFF_PAIR_UNMERGED(p
))
2666 p
->status
= DIFF_STATUS_UNMERGED
;
2667 else if (!DIFF_FILE_VALID(p
->one
))
2668 p
->status
= DIFF_STATUS_ADDED
;
2669 else if (!DIFF_FILE_VALID(p
->two
))
2670 p
->status
= DIFF_STATUS_DELETED
;
2671 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2672 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2674 /* from this point on, we are dealing with a pair
2675 * whose both sides are valid and of the same type, i.e.
2676 * either in-place edit or rename/copy edit.
2678 else if (DIFF_PAIR_RENAME(p
)) {
2680 * A rename might have re-connected a broken
2681 * pair up, causing the pathnames to be the
2682 * same again. If so, that's not a rename at
2683 * all, just a modification..
2685 * Otherwise, see if this source was used for
2686 * multiple renames, in which case we decrement
2687 * the count, and call it a copy.
2689 if (!strcmp(p
->one
->path
, p
->two
->path
))
2690 p
->status
= DIFF_STATUS_MODIFIED
;
2691 else if (--p
->one
->rename_used
> 0)
2692 p
->status
= DIFF_STATUS_COPIED
;
2694 p
->status
= DIFF_STATUS_RENAMED
;
2696 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2697 p
->one
->mode
!= p
->two
->mode
||
2698 is_null_sha1(p
->one
->sha1
))
2699 p
->status
= DIFF_STATUS_MODIFIED
;
2701 /* This is a "no-change" entry and should not
2702 * happen anymore, but prepare for broken callers.
2704 error("feeding unmodified %s to diffcore",
2706 p
->status
= DIFF_STATUS_UNKNOWN
;
2709 diff_debug_queue("resolve-rename-copy done", q
);
2712 static int check_pair_status(struct diff_filepair
*p
)
2714 switch (p
->status
) {
2715 case DIFF_STATUS_UNKNOWN
:
2718 die("internal error in diff-resolve-rename-copy");
2724 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2726 int fmt
= opt
->output_format
;
2728 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2729 diff_flush_checkdiff(p
, opt
);
2730 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2731 diff_flush_raw(p
, opt
);
2732 else if (fmt
& DIFF_FORMAT_NAME
)
2733 write_name_quoted(p
->two
->path
, stdout
, opt
->line_termination
);
2736 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2739 printf(" %s mode %06o ", newdelete
, fs
->mode
);
2741 printf(" %s ", newdelete
);
2742 write_name_quoted(fs
->path
, stdout
, '\n');
2746 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2748 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2749 printf(" mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2750 show_name
? ' ' : '\n');
2752 write_name_quoted(p
->two
->path
, stdout
, '\n');
2757 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2759 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2761 printf(" %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2763 show_mode_change(p
, 0);
2766 static void diff_summary(struct diff_filepair
*p
)
2769 case DIFF_STATUS_DELETED
:
2770 show_file_mode_name("delete", p
->one
);
2772 case DIFF_STATUS_ADDED
:
2773 show_file_mode_name("create", p
->two
);
2775 case DIFF_STATUS_COPIED
:
2776 show_rename_copy("copy", p
);
2778 case DIFF_STATUS_RENAMED
:
2779 show_rename_copy("rename", p
);
2783 fputs(" rewrite ", stdout
);
2784 write_name_quoted(p
->two
->path
, stdout
, ' ');
2785 printf("(%d%%)\n", similarity_index(p
));
2787 show_mode_change(p
, !p
->score
);
2793 struct xdiff_emit_state xm
;
2798 static int remove_space(char *line
, int len
)
2804 for (i
= 0; i
< len
; i
++)
2805 if (!isspace((c
= line
[i
])))
2811 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2813 struct patch_id_t
*data
= priv
;
2816 /* Ignore line numbers when computing the SHA1 of the patch */
2817 if (!prefixcmp(line
, "@@ -"))
2820 new_len
= remove_space(line
, len
);
2822 SHA1_Update(data
->ctx
, line
, new_len
);
2823 data
->patchlen
+= new_len
;
2826 /* returns 0 upon success, and writes result into sha1 */
2827 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2829 struct diff_queue_struct
*q
= &diff_queued_diff
;
2832 struct patch_id_t data
;
2833 char buffer
[PATH_MAX
* 4 + 20];
2836 memset(&data
, 0, sizeof(struct patch_id_t
));
2838 data
.xm
.consume
= patch_id_consume
;
2840 for (i
= 0; i
< q
->nr
; i
++) {
2845 struct diff_filepair
*p
= q
->queue
[i
];
2848 memset(&xecfg
, 0, sizeof(xecfg
));
2850 return error("internal diff status error");
2851 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2853 if (diff_unmodified_pair(p
))
2855 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2856 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2858 if (DIFF_PAIR_UNMERGED(p
))
2861 diff_fill_sha1_info(p
->one
);
2862 diff_fill_sha1_info(p
->two
);
2863 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2864 fill_mmfile(&mf2
, p
->two
) < 0)
2865 return error("unable to read files to diff");
2867 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2868 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2869 if (p
->one
->mode
== 0)
2870 len1
= snprintf(buffer
, sizeof(buffer
),
2871 "diff--gita/%.*sb/%.*s"
2878 len2
, p
->two
->path
);
2879 else if (p
->two
->mode
== 0)
2880 len1
= snprintf(buffer
, sizeof(buffer
),
2881 "diff--gita/%.*sb/%.*s"
2882 "deletedfilemode%06o"
2888 len1
, p
->one
->path
);
2890 len1
= snprintf(buffer
, sizeof(buffer
),
2891 "diff--gita/%.*sb/%.*s"
2897 len2
, p
->two
->path
);
2898 SHA1_Update(&ctx
, buffer
, len1
);
2900 xpp
.flags
= XDF_NEED_MINIMAL
;
2902 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2903 ecb
.outf
= xdiff_outf
;
2905 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2908 SHA1_Final(sha1
, &ctx
);
2912 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2914 struct diff_queue_struct
*q
= &diff_queued_diff
;
2916 int result
= diff_get_patch_id(options
, sha1
);
2918 for (i
= 0; i
< q
->nr
; i
++)
2919 diff_free_filepair(q
->queue
[i
]);
2923 q
->nr
= q
->alloc
= 0;
2928 static int is_summary_empty(const struct diff_queue_struct
*q
)
2932 for (i
= 0; i
< q
->nr
; i
++) {
2933 const struct diff_filepair
*p
= q
->queue
[i
];
2935 switch (p
->status
) {
2936 case DIFF_STATUS_DELETED
:
2937 case DIFF_STATUS_ADDED
:
2938 case DIFF_STATUS_COPIED
:
2939 case DIFF_STATUS_RENAMED
:
2944 if (p
->one
->mode
&& p
->two
->mode
&&
2945 p
->one
->mode
!= p
->two
->mode
)
2953 void diff_flush(struct diff_options
*options
)
2955 struct diff_queue_struct
*q
= &diff_queued_diff
;
2956 int i
, output_format
= options
->output_format
;
2960 * Order: raw, stat, summary, patch
2961 * or: name/name-status/checkdiff (other bits clear)
2966 if (output_format
& (DIFF_FORMAT_RAW
|
2968 DIFF_FORMAT_NAME_STATUS
|
2969 DIFF_FORMAT_CHECKDIFF
)) {
2970 for (i
= 0; i
< q
->nr
; i
++) {
2971 struct diff_filepair
*p
= q
->queue
[i
];
2972 if (check_pair_status(p
))
2973 flush_one_pair(p
, options
);
2978 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
2979 struct diffstat_t diffstat
;
2981 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
2982 diffstat
.xm
.consume
= diffstat_consume
;
2983 for (i
= 0; i
< q
->nr
; i
++) {
2984 struct diff_filepair
*p
= q
->queue
[i
];
2985 if (check_pair_status(p
))
2986 diff_flush_stat(p
, options
, &diffstat
);
2988 if (output_format
& DIFF_FORMAT_NUMSTAT
)
2989 show_numstat(&diffstat
, options
);
2990 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
2991 show_stats(&diffstat
, options
);
2992 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
2993 show_shortstats(&diffstat
);
2994 free_diffstat_info(&diffstat
);
2998 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
2999 for (i
= 0; i
< q
->nr
; i
++)
3000 diff_summary(q
->queue
[i
]);
3004 if (output_format
& DIFF_FORMAT_PATCH
) {
3006 if (options
->stat_sep
) {
3007 /* attach patch instead of inline */
3008 fputs(options
->stat_sep
, stdout
);
3010 putchar(options
->line_termination
);
3014 for (i
= 0; i
< q
->nr
; i
++) {
3015 struct diff_filepair
*p
= q
->queue
[i
];
3016 if (check_pair_status(p
))
3017 diff_flush_patch(p
, options
);
3021 if (output_format
& DIFF_FORMAT_CALLBACK
)
3022 options
->format_callback(q
, options
, options
->format_callback_data
);
3024 for (i
= 0; i
< q
->nr
; i
++)
3025 diff_free_filepair(q
->queue
[i
]);
3029 q
->nr
= q
->alloc
= 0;
3032 static void diffcore_apply_filter(const char *filter
)
3035 struct diff_queue_struct
*q
= &diff_queued_diff
;
3036 struct diff_queue_struct outq
;
3038 outq
.nr
= outq
.alloc
= 0;
3043 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3045 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3046 struct diff_filepair
*p
= q
->queue
[i
];
3047 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3049 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3051 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3052 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3053 strchr(filter
, p
->status
)))
3059 /* otherwise we will clear the whole queue
3060 * by copying the empty outq at the end of this
3061 * function, but first clear the current entries
3064 for (i
= 0; i
< q
->nr
; i
++)
3065 diff_free_filepair(q
->queue
[i
]);
3068 /* Only the matching ones */
3069 for (i
= 0; i
< q
->nr
; i
++) {
3070 struct diff_filepair
*p
= q
->queue
[i
];
3072 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3074 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3076 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3077 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3078 strchr(filter
, p
->status
)))
3081 diff_free_filepair(p
);
3088 /* Check whether two filespecs with the same mode and size are identical */
3089 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3090 struct diff_filespec
*two
)
3092 if (S_ISGITLINK(one
->mode
)) {
3093 diff_fill_sha1_info(one
);
3094 diff_fill_sha1_info(two
);
3095 return !hashcmp(one
->sha1
, two
->sha1
);
3097 if (diff_populate_filespec(one
, 0))
3099 if (diff_populate_filespec(two
, 0))
3101 return !memcmp(one
->data
, two
->data
, one
->size
);
3104 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3107 struct diff_queue_struct
*q
= &diff_queued_diff
;
3108 struct diff_queue_struct outq
;
3110 outq
.nr
= outq
.alloc
= 0;
3112 for (i
= 0; i
< q
->nr
; i
++) {
3113 struct diff_filepair
*p
= q
->queue
[i
];
3116 * 1. Entries that come from stat info dirtyness
3117 * always have both sides (iow, not create/delete),
3118 * one side of the object name is unknown, with
3119 * the same mode and size. Keep the ones that
3120 * do not match these criteria. They have real
3123 * 2. At this point, the file is known to be modified,
3124 * with the same mode and size, and the object
3125 * name of one side is unknown. Need to inspect
3126 * the identical contents.
3128 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3129 !DIFF_FILE_VALID(p
->two
) ||
3130 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3131 (p
->one
->mode
!= p
->two
->mode
) ||
3132 diff_populate_filespec(p
->one
, 1) ||
3133 diff_populate_filespec(p
->two
, 1) ||
3134 (p
->one
->size
!= p
->two
->size
) ||
3135 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3139 * The caller can subtract 1 from skip_stat_unmatch
3140 * to determine how many paths were dirty only
3141 * due to stat info mismatch.
3143 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3144 diffopt
->skip_stat_unmatch
++;
3145 diff_free_filepair(p
);
3152 void diffcore_std(struct diff_options
*options
)
3154 if (DIFF_OPT_TST(options
, QUIET
))
3157 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3158 diffcore_skip_stat_unmatch(options
);
3159 if (options
->break_opt
!= -1)
3160 diffcore_break(options
->break_opt
);
3161 if (options
->detect_rename
)
3162 diffcore_rename(options
);
3163 if (options
->break_opt
!= -1)
3164 diffcore_merge_broken();
3165 if (options
->pickaxe
)
3166 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3167 if (options
->orderfile
)
3168 diffcore_order(options
->orderfile
);
3169 diff_resolve_rename_copy();
3170 diffcore_apply_filter(options
->filter
);
3172 if (diff_queued_diff
.nr
)
3173 DIFF_OPT_SET(options
, HAS_CHANGES
);
3175 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3178 int diff_result_code(struct diff_options
*opt
, int status
)
3181 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3182 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3184 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3185 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3187 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3188 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3193 void diff_addremove(struct diff_options
*options
,
3194 int addremove
, unsigned mode
,
3195 const unsigned char *sha1
,
3196 const char *base
, const char *path
)
3198 char concatpath
[PATH_MAX
];
3199 struct diff_filespec
*one
, *two
;
3201 /* This may look odd, but it is a preparation for
3202 * feeding "there are unchanged files which should
3203 * not produce diffs, but when you are doing copy
3204 * detection you would need them, so here they are"
3205 * entries to the diff-core. They will be prefixed
3206 * with something like '=' or '*' (I haven't decided
3207 * which but should not make any difference).
3208 * Feeding the same new and old to diff_change()
3209 * also has the same effect.
3210 * Before the final output happens, they are pruned after
3211 * merged into rename/copy pairs as appropriate.
3213 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3214 addremove
= (addremove
== '+' ? '-' :
3215 addremove
== '-' ? '+' : addremove
);
3217 if (!path
) path
= "";
3218 sprintf(concatpath
, "%s%s", base
, path
);
3219 one
= alloc_filespec(concatpath
);
3220 two
= alloc_filespec(concatpath
);
3222 if (addremove
!= '+')
3223 fill_filespec(one
, sha1
, mode
);
3224 if (addremove
!= '-')
3225 fill_filespec(two
, sha1
, mode
);
3227 diff_queue(&diff_queued_diff
, one
, two
);
3228 DIFF_OPT_SET(options
, HAS_CHANGES
);
3231 void diff_change(struct diff_options
*options
,
3232 unsigned old_mode
, unsigned new_mode
,
3233 const unsigned char *old_sha1
,
3234 const unsigned char *new_sha1
,
3235 const char *base
, const char *path
)
3237 char concatpath
[PATH_MAX
];
3238 struct diff_filespec
*one
, *two
;
3240 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3242 const unsigned char *tmp_c
;
3243 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3244 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3246 if (!path
) path
= "";
3247 sprintf(concatpath
, "%s%s", base
, path
);
3248 one
= alloc_filespec(concatpath
);
3249 two
= alloc_filespec(concatpath
);
3250 fill_filespec(one
, old_sha1
, old_mode
);
3251 fill_filespec(two
, new_sha1
, new_mode
);
3253 diff_queue(&diff_queued_diff
, one
, two
);
3254 DIFF_OPT_SET(options
, HAS_CHANGES
);
3257 void diff_unmerge(struct diff_options
*options
,
3259 unsigned mode
, const unsigned char *sha1
)
3261 struct diff_filespec
*one
, *two
;
3262 one
= alloc_filespec(path
);
3263 two
= alloc_filespec(path
);
3264 fill_filespec(one
, sha1
, mode
);
3265 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;