2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
15 #ifdef NO_FAST_WORKING_DIRECTORY
16 #define FAST_WORKING_DIRECTORY 0
18 #define FAST_WORKING_DIRECTORY 1
21 static int diff_detect_rename_default
;
22 static int diff_rename_limit_default
= 100;
23 static int diff_use_color_default
;
24 static const char *external_diff_cmd_cfg
;
25 int diff_auto_refresh_index
= 1;
27 static char diff_colors
[][COLOR_MAXLEN
] = {
29 "", /* PLAIN (normal) */
30 "\033[1m", /* METAINFO (bold) */
31 "\033[36m", /* FRAGINFO (cyan) */
32 "\033[31m", /* OLD (red) */
33 "\033[32m", /* NEW (green) */
34 "\033[33m", /* COMMIT (yellow) */
35 "\033[41m", /* WHITESPACE (red background) */
38 static int parse_diff_color_slot(const char *var
, int ofs
)
40 if (!strcasecmp(var
+ofs
, "plain"))
42 if (!strcasecmp(var
+ofs
, "meta"))
44 if (!strcasecmp(var
+ofs
, "frag"))
46 if (!strcasecmp(var
+ofs
, "old"))
48 if (!strcasecmp(var
+ofs
, "new"))
50 if (!strcasecmp(var
+ofs
, "commit"))
52 if (!strcasecmp(var
+ofs
, "whitespace"))
53 return DIFF_WHITESPACE
;
54 die("bad config variable '%s'", var
);
57 static struct ll_diff_driver
{
59 struct ll_diff_driver
*next
;
61 } *user_diff
, **user_diff_tail
;
64 * Currently there is only "diff.<drivername>.command" variable;
65 * because there are "diff.color.<slot>" variables, we are parsing
66 * this in a bit convoluted way to allow low level diff driver
69 static int parse_lldiff_command(const char *var
, const char *ep
, const char *value
)
73 struct ll_diff_driver
*drv
;
77 for (drv
= user_diff
; drv
; drv
= drv
->next
)
78 if (!strncmp(drv
->name
, name
, namelen
) && !drv
->name
[namelen
])
81 drv
= xcalloc(1, sizeof(struct ll_diff_driver
));
82 drv
->name
= xmemdupz(name
, namelen
);
84 user_diff_tail
= &user_diff
;
85 *user_diff_tail
= drv
;
86 user_diff_tail
= &(drv
->next
);
90 return error("%s: lacks value", var
);
91 drv
->cmd
= strdup(value
);
96 * 'diff.<what>.funcname' attribute can be specified in the configuration
97 * to define a customized regexp to find the beginning of a function to
98 * be used for hunk header lines of "diff -p" style output.
100 static struct funcname_pattern
{
103 struct funcname_pattern
*next
;
104 } *funcname_pattern_list
;
106 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
)
110 struct funcname_pattern
*pp
;
112 name
= var
+ 5; /* "diff." */
115 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
116 if (!strncmp(pp
->name
, name
, namelen
) && !pp
->name
[namelen
])
119 pp
= xcalloc(1, sizeof(*pp
));
120 pp
->name
= xmemdupz(name
, namelen
);
121 pp
->next
= funcname_pattern_list
;
122 funcname_pattern_list
= pp
;
126 pp
->pattern
= xstrdup(value
);
131 * These are to give UI layer defaults.
132 * The core-level commands such as git-diff-files should
133 * never be affected by the setting of diff.renames
134 * the user happens to have in the configuration file.
136 int git_diff_ui_config(const char *var
, const char *value
)
138 if (!strcmp(var
, "diff.renamelimit")) {
139 diff_rename_limit_default
= git_config_int(var
, value
);
142 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
143 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
146 if (!strcmp(var
, "diff.renames")) {
148 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
149 else if (!strcasecmp(value
, "copies") ||
150 !strcasecmp(value
, "copy"))
151 diff_detect_rename_default
= DIFF_DETECT_COPY
;
152 else if (git_config_bool(var
,value
))
153 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
156 if (!strcmp(var
, "diff.autorefreshindex")) {
157 diff_auto_refresh_index
= git_config_bool(var
, value
);
160 if (!strcmp(var
, "diff.external")) {
162 return config_error_nonbool(var
);
163 external_diff_cmd_cfg
= xstrdup(value
);
166 if (!prefixcmp(var
, "diff.")) {
167 const char *ep
= strrchr(var
, '.');
170 if (!strcmp(ep
, ".command")) {
172 return config_error_nonbool(var
);
173 return parse_lldiff_command(var
, ep
, value
);
178 return git_diff_basic_config(var
, value
);
181 int git_diff_basic_config(const char *var
, const char *value
)
183 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
184 int slot
= parse_diff_color_slot(var
, 11);
186 return config_error_nonbool(var
);
187 color_parse(value
, var
, diff_colors
[slot
]);
191 if (!prefixcmp(var
, "diff.")) {
192 const char *ep
= strrchr(var
, '.');
194 if (!strcmp(ep
, ".funcname")) {
196 return config_error_nonbool(var
);
197 return parse_funcname_pattern(var
, ep
, value
);
202 return git_default_config(var
, value
);
205 static char *quote_two(const char *one
, const char *two
)
207 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
208 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
211 strbuf_init(&res
, 0);
212 if (need_one
+ need_two
) {
213 strbuf_addch(&res
, '"');
214 quote_c_style(one
, &res
, NULL
, 1);
215 quote_c_style(two
, &res
, NULL
, 1);
216 strbuf_addch(&res
, '"');
218 strbuf_addstr(&res
, one
);
219 strbuf_addstr(&res
, two
);
221 return strbuf_detach(&res
, NULL
);
224 static const char *external_diff(void)
226 static const char *external_diff_cmd
= NULL
;
227 static int done_preparing
= 0;
230 return external_diff_cmd
;
231 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
232 if (!external_diff_cmd
)
233 external_diff_cmd
= external_diff_cmd_cfg
;
235 return external_diff_cmd
;
238 static struct diff_tempfile
{
239 const char *name
; /* filename external diff should read from */
242 char tmp_path
[PATH_MAX
];
245 static int count_lines(const char *data
, int size
)
247 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
254 completely_empty
= 0;
258 completely_empty
= 0;
261 if (completely_empty
)
264 count
++; /* no trailing newline */
268 static void print_line_count(int count
)
278 printf("1,%d", count
);
283 static void copy_file(int prefix
, const char *data
, int size
,
284 const char *set
, const char *reset
)
286 int ch
, nl_just_seen
= 1;
295 fputs(reset
, stdout
);
301 printf("%s\n\\ No newline at end of file\n", reset
);
304 static void emit_rewrite_diff(const char *name_a
,
306 struct diff_filespec
*one
,
307 struct diff_filespec
*two
,
308 struct diff_options
*o
)
311 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
312 const char *name_a_tab
, *name_b_tab
;
313 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
314 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
315 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
316 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
317 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
318 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
320 name_a
+= (*name_a
== '/');
321 name_b
+= (*name_b
== '/');
322 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
323 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
325 strbuf_reset(&a_name
);
326 strbuf_reset(&b_name
);
327 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
328 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
330 diff_populate_filespec(one
, 0);
331 diff_populate_filespec(two
, 0);
332 lc_a
= count_lines(one
->data
, one
->size
);
333 lc_b
= count_lines(two
->data
, two
->size
);
334 printf("%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
335 metainfo
, a_name
.buf
, name_a_tab
, reset
,
336 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
337 print_line_count(lc_a
);
339 print_line_count(lc_b
);
340 printf(" @@%s\n", reset
);
342 copy_file('-', one
->data
, one
->size
, old
, reset
);
344 copy_file('+', two
->data
, two
->size
, new, reset
);
347 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
349 if (!DIFF_FILE_VALID(one
)) {
350 mf
->ptr
= (char *)""; /* does not matter */
354 else if (diff_populate_filespec(one
, 0))
357 mf
->size
= one
->size
;
361 struct diff_words_buffer
{
364 long current
; /* output pointer */
365 int suppressed_newline
;
368 static void diff_words_append(char *line
, unsigned long len
,
369 struct diff_words_buffer
*buffer
)
371 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
372 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
373 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
377 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
378 buffer
->text
.size
+= len
;
381 struct diff_words_data
{
382 struct xdiff_emit_state xm
;
383 struct diff_words_buffer minus
, plus
;
386 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
387 int suppress_newline
)
395 ptr
= buffer
->text
.ptr
+ buffer
->current
;
396 buffer
->current
+= len
;
398 if (ptr
[len
- 1] == '\n') {
403 fputs(diff_get_color(1, color
), stdout
);
404 fwrite(ptr
, len
, 1, stdout
);
405 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
408 if (suppress_newline
)
409 buffer
->suppressed_newline
= 1;
415 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
417 struct diff_words_data
*diff_words
= priv
;
419 if (diff_words
->minus
.suppressed_newline
) {
422 diff_words
->minus
.suppressed_newline
= 0;
428 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
431 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
434 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
435 diff_words
->minus
.current
+= len
;
440 /* this executes the word diff on the accumulated buffers */
441 static void diff_words_show(struct diff_words_data
*diff_words
)
446 mmfile_t minus
, plus
;
449 memset(&xecfg
, 0, sizeof(xecfg
));
450 minus
.size
= diff_words
->minus
.text
.size
;
451 minus
.ptr
= xmalloc(minus
.size
);
452 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
453 for (i
= 0; i
< minus
.size
; i
++)
454 if (isspace(minus
.ptr
[i
]))
456 diff_words
->minus
.current
= 0;
458 plus
.size
= diff_words
->plus
.text
.size
;
459 plus
.ptr
= xmalloc(plus
.size
);
460 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
461 for (i
= 0; i
< plus
.size
; i
++)
462 if (isspace(plus
.ptr
[i
]))
464 diff_words
->plus
.current
= 0;
466 xpp
.flags
= XDF_NEED_MINIMAL
;
467 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
468 ecb
.outf
= xdiff_outf
;
469 ecb
.priv
= diff_words
;
470 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
471 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
475 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
477 if (diff_words
->minus
.suppressed_newline
) {
479 diff_words
->minus
.suppressed_newline
= 0;
483 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
485 struct emit_callback
{
486 struct xdiff_emit_state xm
;
487 int nparents
, color_diff
;
489 sane_truncate_fn truncate
;
490 const char **label_path
;
491 struct diff_words_data
*diff_words
;
495 static void free_diff_words_data(struct emit_callback
*ecbdata
)
497 if (ecbdata
->diff_words
) {
499 if (ecbdata
->diff_words
->minus
.text
.size
||
500 ecbdata
->diff_words
->plus
.text
.size
)
501 diff_words_show(ecbdata
->diff_words
);
503 if (ecbdata
->diff_words
->minus
.text
.ptr
)
504 free (ecbdata
->diff_words
->minus
.text
.ptr
);
505 if (ecbdata
->diff_words
->plus
.text
.ptr
)
506 free (ecbdata
->diff_words
->plus
.text
.ptr
);
507 free(ecbdata
->diff_words
);
508 ecbdata
->diff_words
= NULL
;
512 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
515 return diff_colors
[ix
];
519 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
522 fwrite(line
, len
, 1, stdout
);
523 fputs(reset
, stdout
);
526 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
528 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
529 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
532 emit_line(set
, reset
, line
, len
);
534 /* Emit just the prefix, then the rest. */
535 emit_line(set
, reset
, line
, ecbdata
->nparents
);
536 (void)check_and_emit_line(line
+ ecbdata
->nparents
,
537 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
538 stdout
, set
, reset
, ws
);
542 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
549 return ecb
->truncate(line
, len
);
553 (void) utf8_width(&cp
, &l
);
555 break; /* truncated in the middle? */
560 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
564 struct emit_callback
*ecbdata
= priv
;
565 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
566 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
567 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
569 *(ecbdata
->found_changesp
) = 1;
571 if (ecbdata
->label_path
[0]) {
572 const char *name_a_tab
, *name_b_tab
;
574 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
575 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
577 printf("%s--- %s%s%s\n",
578 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
579 printf("%s+++ %s%s%s\n",
580 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
581 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
584 /* This is not really necessary for now because
585 * this codepath only deals with two-way diffs.
587 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
589 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
590 ecbdata
->nparents
= i
- 1;
591 len
= sane_truncate_line(ecbdata
, line
, len
);
592 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
594 if (line
[len
-1] != '\n')
599 if (len
< ecbdata
->nparents
) {
600 emit_line(reset
, reset
, line
, len
);
605 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
606 /* fall back to normal diff */
607 free_diff_words_data(ecbdata
);
608 if (ecbdata
->diff_words
) {
609 if (line
[0] == '-') {
610 diff_words_append(line
, len
,
611 &ecbdata
->diff_words
->minus
);
613 } else if (line
[0] == '+') {
614 diff_words_append(line
, len
,
615 &ecbdata
->diff_words
->plus
);
618 if (ecbdata
->diff_words
->minus
.text
.size
||
619 ecbdata
->diff_words
->plus
.text
.size
)
620 diff_words_show(ecbdata
->diff_words
);
623 emit_line(plain
, reset
, line
, len
);
626 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
628 color
= DIFF_FILE_OLD
;
629 else if (line
[i
] == '+')
630 color
= DIFF_FILE_NEW
;
633 if (color
!= DIFF_FILE_NEW
) {
634 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
638 emit_add_line(reset
, ecbdata
, line
, len
);
641 static char *pprint_rename(const char *a
, const char *b
)
646 int pfx_length
, sfx_length
;
647 int len_a
= strlen(a
);
648 int len_b
= strlen(b
);
649 int a_midlen
, b_midlen
;
650 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
651 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
653 strbuf_init(&name
, 0);
654 if (qlen_a
|| qlen_b
) {
655 quote_c_style(a
, &name
, NULL
, 0);
656 strbuf_addstr(&name
, " => ");
657 quote_c_style(b
, &name
, NULL
, 0);
658 return strbuf_detach(&name
, NULL
);
661 /* Find common prefix */
663 while (*old
&& *new && *old
== *new) {
665 pfx_length
= old
- a
+ 1;
670 /* Find common suffix */
674 while (a
<= old
&& b
<= new && *old
== *new) {
676 sfx_length
= len_a
- (old
- a
);
682 * pfx{mid-a => mid-b}sfx
683 * {pfx-a => pfx-b}sfx
684 * pfx{sfx-a => sfx-b}
687 a_midlen
= len_a
- pfx_length
- sfx_length
;
688 b_midlen
= len_b
- pfx_length
- sfx_length
;
694 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
695 if (pfx_length
+ sfx_length
) {
696 strbuf_add(&name
, a
, pfx_length
);
697 strbuf_addch(&name
, '{');
699 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
700 strbuf_addstr(&name
, " => ");
701 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
702 if (pfx_length
+ sfx_length
) {
703 strbuf_addch(&name
, '}');
704 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
706 return strbuf_detach(&name
, NULL
);
710 struct xdiff_emit_state xm
;
714 struct diffstat_file
{
718 unsigned is_unmerged
:1;
719 unsigned is_binary
:1;
720 unsigned is_renamed
:1;
721 unsigned int added
, deleted
;
725 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
729 struct diffstat_file
*x
;
730 x
= xcalloc(sizeof (*x
), 1);
731 if (diffstat
->nr
== diffstat
->alloc
) {
732 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
733 diffstat
->files
= xrealloc(diffstat
->files
,
734 diffstat
->alloc
* sizeof(x
));
736 diffstat
->files
[diffstat
->nr
++] = x
;
738 x
->from_name
= xstrdup(name_a
);
739 x
->name
= xstrdup(name_b
);
744 x
->name
= xstrdup(name_a
);
749 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
751 struct diffstat_t
*diffstat
= priv
;
752 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
756 else if (line
[0] == '-')
760 const char mime_boundary_leader
[] = "------------";
762 static int scale_linear(int it
, int width
, int max_change
)
765 * make sure that at least one '-' is printed if there were deletions,
766 * and likewise for '+'.
770 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
773 static void show_name(const char *prefix
, const char *name
, int len
,
774 const char *reset
, const char *set
)
776 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
779 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
789 static void fill_print_name(struct diffstat_file
*file
)
793 if (file
->print_name
)
796 if (!file
->is_renamed
) {
798 strbuf_init(&buf
, 0);
799 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
800 pname
= strbuf_detach(&buf
, NULL
);
803 strbuf_release(&buf
);
806 pname
= pprint_rename(file
->from_name
, file
->name
);
808 file
->print_name
= pname
;
811 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
813 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
814 int max_change
= 0, max_len
= 0;
815 int total_files
= data
->nr
;
816 int width
, name_width
;
817 const char *reset
, *set
, *add_c
, *del_c
;
822 width
= options
->stat_width
? options
->stat_width
: 80;
823 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
825 /* Sanity: give at least 5 columns to the graph,
826 * but leave at least 10 columns for the name.
828 if (width
< name_width
+ 15) {
829 if (name_width
<= 25)
830 width
= name_width
+ 15;
832 name_width
= width
- 15;
835 /* Find the longest filename and max number of changes */
836 reset
= diff_get_color_opt(options
, DIFF_RESET
);
837 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
838 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
839 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
841 for (i
= 0; i
< data
->nr
; i
++) {
842 struct diffstat_file
*file
= data
->files
[i
];
843 int change
= file
->added
+ file
->deleted
;
844 fill_print_name(file
);
845 len
= strlen(file
->print_name
);
849 if (file
->is_binary
|| file
->is_unmerged
)
851 if (max_change
< change
)
855 /* Compute the width of the graph part;
856 * 10 is for one blank at the beginning of the line plus
857 * " | count " between the name and the graph.
859 * From here on, name_width is the width of the name area,
860 * and width is the width of the graph area.
862 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
863 if (width
< (name_width
+ 10) + max_change
)
864 width
= width
- (name_width
+ 10);
868 for (i
= 0; i
< data
->nr
; i
++) {
869 const char *prefix
= "";
870 char *name
= data
->files
[i
]->print_name
;
871 int added
= data
->files
[i
]->added
;
872 int deleted
= data
->files
[i
]->deleted
;
876 * "scale" the filename
879 name_len
= strlen(name
);
880 if (name_width
< name_len
) {
884 name
+= name_len
- len
;
885 slash
= strchr(name
, '/');
890 if (data
->files
[i
]->is_binary
) {
891 show_name(prefix
, name
, len
, reset
, set
);
893 printf("%s%d%s", del_c
, deleted
, reset
);
895 printf("%s%d%s", add_c
, added
, reset
);
900 else if (data
->files
[i
]->is_unmerged
) {
901 show_name(prefix
, name
, len
, reset
, set
);
902 printf(" Unmerged\n");
905 else if (!data
->files
[i
]->is_renamed
&&
906 (added
+ deleted
== 0)) {
912 * scale the add/delete
920 if (width
<= max_change
) {
921 add
= scale_linear(add
, width
, max_change
);
922 del
= scale_linear(del
, width
, max_change
);
925 show_name(prefix
, name
, len
, reset
, set
);
926 printf("%5d ", added
+ deleted
);
927 show_graph('+', add
, add_c
, reset
);
928 show_graph('-', del
, del_c
, reset
);
931 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
932 set
, total_files
, adds
, dels
, reset
);
935 static void show_shortstats(struct diffstat_t
* data
)
937 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
942 for (i
= 0; i
< data
->nr
; i
++) {
943 if (!data
->files
[i
]->is_binary
&&
944 !data
->files
[i
]->is_unmerged
) {
945 int added
= data
->files
[i
]->added
;
946 int deleted
= data
->files
[i
]->deleted
;
947 if (!data
->files
[i
]->is_renamed
&&
948 (added
+ deleted
== 0)) {
956 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
957 total_files
, adds
, dels
);
960 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
967 for (i
= 0; i
< data
->nr
; i
++) {
968 struct diffstat_file
*file
= data
->files
[i
];
973 printf("%d\t%d\t", file
->added
, file
->deleted
);
974 if (options
->line_termination
) {
975 fill_print_name(file
);
976 if (!file
->is_renamed
)
977 write_name_quoted(file
->name
, stdout
,
978 options
->line_termination
);
980 fputs(file
->print_name
, stdout
);
981 putchar(options
->line_termination
);
984 if (file
->is_renamed
) {
986 write_name_quoted(file
->from_name
, stdout
, '\0');
988 write_name_quoted(file
->name
, stdout
, '\0');
993 struct diffstat_dir
{
994 struct diffstat_file
**files
;
995 int nr
, percent
, cumulative
;
998 static long gather_dirstat(struct diffstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1000 unsigned long this_dir
= 0;
1001 unsigned int sources
= 0;
1004 struct diffstat_file
*f
= *dir
->files
;
1005 int namelen
= strlen(f
->name
);
1009 if (namelen
< baselen
)
1011 if (memcmp(f
->name
, base
, baselen
))
1013 slash
= strchr(f
->name
+ baselen
, '/');
1015 int newbaselen
= slash
+ 1 - f
->name
;
1016 this = gather_dirstat(dir
, changed
, f
->name
, newbaselen
);
1019 if (f
->is_unmerged
|| f
->is_binary
)
1022 this = f
->added
+ f
->deleted
;
1031 * We don't report dirstat's for
1033 * - or cases where everything came from a single directory
1034 * under this directory (sources == 1).
1036 if (baselen
&& sources
!= 1) {
1037 int permille
= this_dir
* 1000 / changed
;
1039 int percent
= permille
/ 10;
1040 if (percent
>= dir
->percent
) {
1041 printf("%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1042 if (!dir
->cumulative
)
1050 static void show_dirstat(struct diffstat_t
*data
, struct diff_options
*options
)
1053 unsigned long changed
;
1054 struct diffstat_dir dir
;
1056 /* Calculate total changes */
1058 for (i
= 0; i
< data
->nr
; i
++) {
1059 if (data
->files
[i
]->is_binary
|| data
->files
[i
]->is_unmerged
)
1061 changed
+= data
->files
[i
]->added
;
1062 changed
+= data
->files
[i
]->deleted
;
1065 /* This can happen even with many files, if everything was renames */
1069 /* Show all directories with more than x% of the changes */
1070 dir
.files
= data
->files
;
1072 dir
.percent
= options
->dirstat_percent
;
1073 dir
.cumulative
= options
->output_format
& DIFF_FORMAT_CUMULATIVE
;
1074 gather_dirstat(&dir
, changed
, "", 0);
1077 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1080 for (i
= 0; i
< diffstat
->nr
; i
++) {
1081 struct diffstat_file
*f
= diffstat
->files
[i
];
1082 if (f
->name
!= f
->print_name
)
1083 free(f
->print_name
);
1088 free(diffstat
->files
);
1091 struct checkdiff_t
{
1092 struct xdiff_emit_state xm
;
1093 const char *filename
;
1094 int lineno
, color_diff
;
1099 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1101 struct checkdiff_t
*data
= priv
;
1102 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
1103 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
1104 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
1107 if (line
[0] == '+') {
1108 data
->status
= check_and_emit_line(line
+ 1, len
- 1,
1109 data
->ws_rule
, NULL
, NULL
, NULL
, NULL
);
1112 err
= whitespace_error_string(data
->status
);
1113 printf("%s:%d: %s.\n", data
->filename
, data
->lineno
, err
);
1115 emit_line(set
, reset
, line
, 1);
1116 (void)check_and_emit_line(line
+ 1, len
- 1, data
->ws_rule
,
1117 stdout
, set
, reset
, ws
);
1119 } else if (line
[0] == ' ')
1121 else if (line
[0] == '@') {
1122 char *plus
= strchr(line
, '+');
1124 data
->lineno
= strtol(plus
, NULL
, 10);
1126 die("invalid diff");
1130 static unsigned char *deflate_it(char *data
,
1132 unsigned long *result_size
)
1135 unsigned char *deflated
;
1138 memset(&stream
, 0, sizeof(stream
));
1139 deflateInit(&stream
, zlib_compression_level
);
1140 bound
= deflateBound(&stream
, size
);
1141 deflated
= xmalloc(bound
);
1142 stream
.next_out
= deflated
;
1143 stream
.avail_out
= bound
;
1145 stream
.next_in
= (unsigned char *)data
;
1146 stream
.avail_in
= size
;
1147 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1149 deflateEnd(&stream
);
1150 *result_size
= stream
.total_out
;
1154 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
1160 unsigned long orig_size
;
1161 unsigned long delta_size
;
1162 unsigned long deflate_size
;
1163 unsigned long data_size
;
1165 /* We could do deflated delta, or we could do just deflated two,
1166 * whichever is smaller.
1169 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1170 if (one
->size
&& two
->size
) {
1171 delta
= diff_delta(one
->ptr
, one
->size
,
1172 two
->ptr
, two
->size
,
1173 &delta_size
, deflate_size
);
1175 void *to_free
= delta
;
1176 orig_size
= delta_size
;
1177 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1182 if (delta
&& delta_size
< deflate_size
) {
1183 printf("delta %lu\n", orig_size
);
1186 data_size
= delta_size
;
1189 printf("literal %lu\n", two
->size
);
1192 data_size
= deflate_size
;
1195 /* emit data encoded in base85 */
1198 int bytes
= (52 < data_size
) ? 52 : data_size
;
1202 line
[0] = bytes
+ 'A' - 1;
1204 line
[0] = bytes
- 26 + 'a' - 1;
1205 encode_85(line
+ 1, cp
, bytes
);
1206 cp
= (char *) cp
+ bytes
;
1213 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1215 printf("GIT binary patch\n");
1216 emit_binary_diff_body(one
, two
);
1217 emit_binary_diff_body(two
, one
);
1220 static void setup_diff_attr_check(struct git_attr_check
*check
)
1222 static struct git_attr
*attr_diff
;
1225 attr_diff
= git_attr("diff", 4);
1227 check
[0].attr
= attr_diff
;
1230 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1232 struct git_attr_check attr_diff_check
;
1233 int check_from_data
= 0;
1235 if (one
->checked_attr
)
1238 setup_diff_attr_check(&attr_diff_check
);
1240 one
->funcname_pattern_ident
= NULL
;
1242 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1246 value
= attr_diff_check
.value
;
1247 if (ATTR_TRUE(value
))
1249 else if (ATTR_FALSE(value
))
1252 check_from_data
= 1;
1254 /* funcname pattern ident */
1255 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1258 one
->funcname_pattern_ident
= value
;
1261 if (check_from_data
) {
1262 if (!one
->data
&& DIFF_FILE_VALID(one
))
1263 diff_populate_filespec(one
, 0);
1266 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1270 int diff_filespec_is_binary(struct diff_filespec
*one
)
1272 diff_filespec_check_attr(one
);
1273 return one
->is_binary
;
1276 static const char *funcname_pattern(const char *ident
)
1278 struct funcname_pattern
*pp
;
1280 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1281 if (!strcmp(ident
, pp
->name
))
1286 static struct builtin_funcname_pattern
{
1288 const char *pattern
;
1289 } builtin_funcname_pattern
[] = {
1290 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1291 "new\\|return\\|switch\\|throw\\|while\\)\n"
1293 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1295 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1298 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1300 const char *ident
, *pattern
;
1303 diff_filespec_check_attr(one
);
1304 ident
= one
->funcname_pattern_ident
;
1308 * If the config file has "funcname.default" defined, that
1309 * regexp is used; otherwise NULL is returned and xemit uses
1310 * the built-in default.
1312 return funcname_pattern("default");
1314 /* Look up custom "funcname.$ident" regexp from config. */
1315 pattern
= funcname_pattern(ident
);
1320 * And define built-in fallback patterns here. Note that
1321 * these can be overridden by the user's config settings.
1323 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1324 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1325 return builtin_funcname_pattern
[i
].pattern
;
1330 static void builtin_diff(const char *name_a
,
1332 struct diff_filespec
*one
,
1333 struct diff_filespec
*two
,
1334 const char *xfrm_msg
,
1335 struct diff_options
*o
,
1336 int complete_rewrite
)
1340 char *a_one
, *b_two
;
1341 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1342 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1344 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1345 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1346 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1347 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1348 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1349 if (lbl
[0][0] == '/') {
1351 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1352 if (xfrm_msg
&& xfrm_msg
[0])
1353 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1355 else if (lbl
[1][0] == '/') {
1356 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1357 if (xfrm_msg
&& xfrm_msg
[0])
1358 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1361 if (one
->mode
!= two
->mode
) {
1362 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1363 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1365 if (xfrm_msg
&& xfrm_msg
[0])
1366 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1368 * we do not run diff between different kind
1371 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1372 goto free_ab_and_return
;
1373 if (complete_rewrite
) {
1374 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1375 o
->found_changes
= 1;
1376 goto free_ab_and_return
;
1380 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1381 die("unable to read files to diff");
1383 if (!DIFF_OPT_TST(o
, TEXT
) &&
1384 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1385 /* Quite common confusing case */
1386 if (mf1
.size
== mf2
.size
&&
1387 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1388 goto free_ab_and_return
;
1389 if (DIFF_OPT_TST(o
, BINARY
))
1390 emit_binary_diff(&mf1
, &mf2
);
1392 printf("Binary files %s and %s differ\n",
1394 o
->found_changes
= 1;
1397 /* Crazy xdl interfaces.. */
1398 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1402 struct emit_callback ecbdata
;
1403 const char *funcname_pattern
;
1405 funcname_pattern
= diff_funcname_pattern(one
);
1406 if (!funcname_pattern
)
1407 funcname_pattern
= diff_funcname_pattern(two
);
1409 memset(&xecfg
, 0, sizeof(xecfg
));
1410 memset(&ecbdata
, 0, sizeof(ecbdata
));
1411 ecbdata
.label_path
= lbl
;
1412 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1413 ecbdata
.found_changesp
= &o
->found_changes
;
1414 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1415 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1416 xecfg
.ctxlen
= o
->context
;
1417 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1418 if (funcname_pattern
)
1419 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1422 else if (!prefixcmp(diffopts
, "--unified="))
1423 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1424 else if (!prefixcmp(diffopts
, "-u"))
1425 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1426 ecb
.outf
= xdiff_outf
;
1427 ecb
.priv
= &ecbdata
;
1428 ecbdata
.xm
.consume
= fn_out_consume
;
1429 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1430 ecbdata
.diff_words
=
1431 xcalloc(1, sizeof(struct diff_words_data
));
1432 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1433 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1434 free_diff_words_data(&ecbdata
);
1438 diff_free_filespec_data(one
);
1439 diff_free_filespec_data(two
);
1445 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1446 struct diff_filespec
*one
,
1447 struct diff_filespec
*two
,
1448 struct diffstat_t
*diffstat
,
1449 struct diff_options
*o
,
1450 int complete_rewrite
)
1453 struct diffstat_file
*data
;
1455 data
= diffstat_add(diffstat
, name_a
, name_b
);
1458 data
->is_unmerged
= 1;
1461 if (complete_rewrite
) {
1462 diff_populate_filespec(one
, 0);
1463 diff_populate_filespec(two
, 0);
1464 data
->deleted
= count_lines(one
->data
, one
->size
);
1465 data
->added
= count_lines(two
->data
, two
->size
);
1466 goto free_and_return
;
1468 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1469 die("unable to read files to diff");
1471 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1472 data
->is_binary
= 1;
1473 data
->added
= mf2
.size
;
1474 data
->deleted
= mf1
.size
;
1476 /* Crazy xdl interfaces.. */
1481 memset(&xecfg
, 0, sizeof(xecfg
));
1482 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1483 ecb
.outf
= xdiff_outf
;
1484 ecb
.priv
= diffstat
;
1485 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1489 diff_free_filespec_data(one
);
1490 diff_free_filespec_data(two
);
1493 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1494 struct diff_filespec
*one
,
1495 struct diff_filespec
*two
, struct diff_options
*o
)
1498 struct checkdiff_t data
;
1503 memset(&data
, 0, sizeof(data
));
1504 data
.xm
.consume
= checkdiff_consume
;
1505 data
.filename
= name_b
? name_b
: name_a
;
1507 data
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1508 data
.ws_rule
= whitespace_rule(data
.filename
);
1510 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1511 die("unable to read files to diff");
1513 if (diff_filespec_is_binary(two
))
1514 goto free_and_return
;
1516 /* Crazy xdl interfaces.. */
1521 memset(&xecfg
, 0, sizeof(xecfg
));
1522 xpp
.flags
= XDF_NEED_MINIMAL
;
1523 ecb
.outf
= xdiff_outf
;
1525 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1528 diff_free_filespec_data(one
);
1529 diff_free_filespec_data(two
);
1531 DIFF_OPT_SET(o
, CHECK_FAILED
);
1534 struct diff_filespec
*alloc_filespec(const char *path
)
1536 int namelen
= strlen(path
);
1537 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1539 memset(spec
, 0, sizeof(*spec
));
1540 spec
->path
= (char *)(spec
+ 1);
1541 memcpy(spec
->path
, path
, namelen
+1);
1546 void free_filespec(struct diff_filespec
*spec
)
1548 if (!--spec
->count
) {
1549 diff_free_filespec_data(spec
);
1554 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1555 unsigned short mode
)
1558 spec
->mode
= canon_mode(mode
);
1559 hashcpy(spec
->sha1
, sha1
);
1560 spec
->sha1_valid
= !is_null_sha1(sha1
);
1565 * Given a name and sha1 pair, if the index tells us the file in
1566 * the work tree has that object contents, return true, so that
1567 * prepare_temp_file() does not have to inflate and extract.
1569 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1571 struct cache_entry
*ce
;
1575 /* We do not read the cache ourselves here, because the
1576 * benchmark with my previous version that always reads cache
1577 * shows that it makes things worse for diff-tree comparing
1578 * two linux-2.6 kernel trees in an already checked out work
1579 * tree. This is because most diff-tree comparisons deal with
1580 * only a small number of files, while reading the cache is
1581 * expensive for a large project, and its cost outweighs the
1582 * savings we get by not inflating the object to a temporary
1583 * file. Practically, this code only helps when we are used
1584 * by diff-cache --cached, which does read the cache before
1590 /* We want to avoid the working directory if our caller
1591 * doesn't need the data in a normal file, this system
1592 * is rather slow with its stat/open/mmap/close syscalls,
1593 * and the object is contained in a pack file. The pack
1594 * is probably already open and will be faster to obtain
1595 * the data through than the working directory. Loose
1596 * objects however would tend to be slower as they need
1597 * to be individually opened and inflated.
1599 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1603 pos
= cache_name_pos(name
, len
);
1606 ce
= active_cache
[pos
];
1609 * This is not the sha1 we are looking for, or
1610 * unreusable because it is not a regular file.
1612 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1616 * If ce matches the file in the work tree, we can reuse it.
1618 if (ce_uptodate(ce
) ||
1619 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1625 static int populate_from_stdin(struct diff_filespec
*s
)
1630 strbuf_init(&buf
, 0);
1631 if (strbuf_read(&buf
, 0, 0) < 0)
1632 return error("error while reading from stdin %s",
1635 s
->should_munmap
= 0;
1636 s
->data
= strbuf_detach(&buf
, &size
);
1642 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1645 char *data
= xmalloc(100);
1646 len
= snprintf(data
, 100,
1647 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1659 * While doing rename detection and pickaxe operation, we may need to
1660 * grab the data for the blob (or file) for our own in-core comparison.
1661 * diff_filespec has data and size fields for this purpose.
1663 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1666 if (!DIFF_FILE_VALID(s
))
1667 die("internal error: asking to populate invalid file.");
1668 if (S_ISDIR(s
->mode
))
1674 if (size_only
&& 0 < s
->size
)
1677 if (S_ISGITLINK(s
->mode
))
1678 return diff_populate_gitlink(s
, size_only
);
1680 if (!s
->sha1_valid
||
1681 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1686 if (!strcmp(s
->path
, "-"))
1687 return populate_from_stdin(s
);
1689 if (lstat(s
->path
, &st
) < 0) {
1690 if (errno
== ENOENT
) {
1694 s
->data
= (char *)"";
1699 s
->size
= xsize_t(st
.st_size
);
1704 if (S_ISLNK(st
.st_mode
)) {
1706 s
->data
= xmalloc(s
->size
);
1708 ret
= readlink(s
->path
, s
->data
, s
->size
);
1715 fd
= open(s
->path
, O_RDONLY
);
1718 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1720 s
->should_munmap
= 1;
1723 * Convert from working tree format to canonical git format
1725 strbuf_init(&buf
, 0);
1726 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
)) {
1728 munmap(s
->data
, s
->size
);
1729 s
->should_munmap
= 0;
1730 s
->data
= strbuf_detach(&buf
, &size
);
1736 enum object_type type
;
1738 type
= sha1_object_info(s
->sha1
, &s
->size
);
1740 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1747 void diff_free_filespec_blob(struct diff_filespec
*s
)
1751 else if (s
->should_munmap
)
1752 munmap(s
->data
, s
->size
);
1754 if (s
->should_free
|| s
->should_munmap
) {
1755 s
->should_free
= s
->should_munmap
= 0;
1760 void diff_free_filespec_data(struct diff_filespec
*s
)
1762 diff_free_filespec_blob(s
);
1767 static void prep_temp_blob(struct diff_tempfile
*temp
,
1770 const unsigned char *sha1
,
1775 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1777 die("unable to create temp-file: %s", strerror(errno
));
1778 if (write_in_full(fd
, blob
, size
) != size
)
1779 die("unable to write temp-file");
1781 temp
->name
= temp
->tmp_path
;
1782 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1784 sprintf(temp
->mode
, "%06o", mode
);
1787 static void prepare_temp_file(const char *name
,
1788 struct diff_tempfile
*temp
,
1789 struct diff_filespec
*one
)
1791 if (!DIFF_FILE_VALID(one
)) {
1793 /* A '-' entry produces this for file-2, and
1794 * a '+' entry produces this for file-1.
1796 temp
->name
= "/dev/null";
1797 strcpy(temp
->hex
, ".");
1798 strcpy(temp
->mode
, ".");
1802 if (!one
->sha1_valid
||
1803 reuse_worktree_file(name
, one
->sha1
, 1)) {
1805 if (lstat(name
, &st
) < 0) {
1806 if (errno
== ENOENT
)
1807 goto not_a_valid_file
;
1808 die("stat(%s): %s", name
, strerror(errno
));
1810 if (S_ISLNK(st
.st_mode
)) {
1812 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1813 size_t sz
= xsize_t(st
.st_size
);
1814 if (sizeof(buf
) <= st
.st_size
)
1815 die("symlink too long: %s", name
);
1816 ret
= readlink(name
, buf
, sz
);
1818 die("readlink(%s)", name
);
1819 prep_temp_blob(temp
, buf
, sz
,
1821 one
->sha1
: null_sha1
),
1823 one
->mode
: S_IFLNK
));
1826 /* we can borrow from the file in the work tree */
1828 if (!one
->sha1_valid
)
1829 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1831 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1832 /* Even though we may sometimes borrow the
1833 * contents from the work tree, we always want
1834 * one->mode. mode is trustworthy even when
1835 * !(one->sha1_valid), as long as
1836 * DIFF_FILE_VALID(one).
1838 sprintf(temp
->mode
, "%06o", one
->mode
);
1843 if (diff_populate_filespec(one
, 0))
1844 die("cannot read data blob for %s", one
->path
);
1845 prep_temp_blob(temp
, one
->data
, one
->size
,
1846 one
->sha1
, one
->mode
);
1850 static void remove_tempfile(void)
1854 for (i
= 0; i
< 2; i
++)
1855 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1856 unlink(diff_temp
[i
].name
);
1857 diff_temp
[i
].name
= NULL
;
1861 static void remove_tempfile_on_signal(int signo
)
1864 signal(SIGINT
, SIG_DFL
);
1868 /* An external diff command takes:
1870 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1871 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1874 static void run_external_diff(const char *pgm
,
1877 struct diff_filespec
*one
,
1878 struct diff_filespec
*two
,
1879 const char *xfrm_msg
,
1880 int complete_rewrite
)
1882 const char *spawn_arg
[10];
1883 struct diff_tempfile
*temp
= diff_temp
;
1885 static int atexit_asked
= 0;
1886 const char *othername
;
1887 const char **arg
= &spawn_arg
[0];
1889 othername
= (other
? other
: name
);
1891 prepare_temp_file(name
, &temp
[0], one
);
1892 prepare_temp_file(othername
, &temp
[1], two
);
1893 if (! atexit_asked
&&
1894 (temp
[0].name
== temp
[0].tmp_path
||
1895 temp
[1].name
== temp
[1].tmp_path
)) {
1897 atexit(remove_tempfile
);
1899 signal(SIGINT
, remove_tempfile_on_signal
);
1905 *arg
++ = temp
[0].name
;
1906 *arg
++ = temp
[0].hex
;
1907 *arg
++ = temp
[0].mode
;
1908 *arg
++ = temp
[1].name
;
1909 *arg
++ = temp
[1].hex
;
1910 *arg
++ = temp
[1].mode
;
1921 retval
= run_command_v_opt(spawn_arg
, 0);
1924 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1929 static const char *external_diff_attr(const char *name
)
1931 struct git_attr_check attr_diff_check
;
1933 setup_diff_attr_check(&attr_diff_check
);
1934 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
1935 const char *value
= attr_diff_check
.value
;
1936 if (!ATTR_TRUE(value
) &&
1937 !ATTR_FALSE(value
) &&
1938 !ATTR_UNSET(value
)) {
1939 struct ll_diff_driver
*drv
;
1941 for (drv
= user_diff
; drv
; drv
= drv
->next
)
1942 if (!strcmp(drv
->name
, value
))
1949 static void run_diff_cmd(const char *pgm
,
1952 struct diff_filespec
*one
,
1953 struct diff_filespec
*two
,
1954 const char *xfrm_msg
,
1955 struct diff_options
*o
,
1956 int complete_rewrite
)
1958 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
1961 const char *cmd
= external_diff_attr(name
);
1967 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
1972 builtin_diff(name
, other
? other
: name
,
1973 one
, two
, xfrm_msg
, o
, complete_rewrite
);
1975 printf("* Unmerged path %s\n", name
);
1978 static void diff_fill_sha1_info(struct diff_filespec
*one
)
1980 if (DIFF_FILE_VALID(one
)) {
1981 if (!one
->sha1_valid
) {
1983 if (!strcmp(one
->path
, "-")) {
1984 hashcpy(one
->sha1
, null_sha1
);
1987 if (lstat(one
->path
, &st
) < 0)
1988 die("stat %s", one
->path
);
1989 if (index_path(one
->sha1
, one
->path
, &st
, 0))
1990 die("cannot hash %s\n", one
->path
);
1997 static int similarity_index(struct diff_filepair
*p
)
1999 return p
->score
* 100 / MAX_SCORE
;
2002 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2004 const char *pgm
= external_diff();
2007 struct diff_filespec
*one
= p
->one
;
2008 struct diff_filespec
*two
= p
->two
;
2011 int complete_rewrite
= 0;
2014 if (DIFF_PAIR_UNMERGED(p
)) {
2015 run_diff_cmd(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
, o
, 0);
2019 name
= p
->one
->path
;
2020 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2021 diff_fill_sha1_info(one
);
2022 diff_fill_sha1_info(two
);
2024 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
2025 switch (p
->status
) {
2026 case DIFF_STATUS_COPIED
:
2027 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2028 strbuf_addstr(&msg
, "\ncopy from ");
2029 quote_c_style(name
, &msg
, NULL
, 0);
2030 strbuf_addstr(&msg
, "\ncopy to ");
2031 quote_c_style(other
, &msg
, NULL
, 0);
2032 strbuf_addch(&msg
, '\n');
2034 case DIFF_STATUS_RENAMED
:
2035 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2036 strbuf_addstr(&msg
, "\nrename from ");
2037 quote_c_style(name
, &msg
, NULL
, 0);
2038 strbuf_addstr(&msg
, "\nrename to ");
2039 quote_c_style(other
, &msg
, NULL
, 0);
2040 strbuf_addch(&msg
, '\n');
2042 case DIFF_STATUS_MODIFIED
:
2044 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
2045 similarity_index(p
));
2046 complete_rewrite
= 1;
2055 if (hashcmp(one
->sha1
, two
->sha1
)) {
2056 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2058 if (DIFF_OPT_TST(o
, BINARY
)) {
2060 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2061 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2064 strbuf_addf(&msg
, "index %.*s..%.*s",
2065 abbrev
, sha1_to_hex(one
->sha1
),
2066 abbrev
, sha1_to_hex(two
->sha1
));
2067 if (one
->mode
== two
->mode
)
2068 strbuf_addf(&msg
, " %06o", one
->mode
);
2069 strbuf_addch(&msg
, '\n');
2073 strbuf_setlen(&msg
, msg
.len
- 1);
2074 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
2077 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2078 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2079 /* a filepair that changes between file and symlink
2080 * needs to be split into deletion and creation.
2082 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2083 run_diff_cmd(NULL
, name
, other
, one
, null
, xfrm_msg
, o
, 0);
2085 null
= alloc_filespec(one
->path
);
2086 run_diff_cmd(NULL
, name
, other
, null
, two
, xfrm_msg
, o
, 0);
2090 run_diff_cmd(pgm
, name
, other
, one
, two
, xfrm_msg
, o
,
2093 strbuf_release(&msg
);
2096 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2097 struct diffstat_t
*diffstat
)
2101 int complete_rewrite
= 0;
2103 if (DIFF_PAIR_UNMERGED(p
)) {
2105 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2109 name
= p
->one
->path
;
2110 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2112 diff_fill_sha1_info(p
->one
);
2113 diff_fill_sha1_info(p
->two
);
2115 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2116 complete_rewrite
= 1;
2117 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2120 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2125 if (DIFF_PAIR_UNMERGED(p
)) {
2130 name
= p
->one
->path
;
2131 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2133 diff_fill_sha1_info(p
->one
);
2134 diff_fill_sha1_info(p
->two
);
2136 builtin_checkdiff(name
, other
, p
->one
, p
->two
, o
);
2139 void diff_setup(struct diff_options
*options
)
2141 memset(options
, 0, sizeof(*options
));
2142 options
->line_termination
= '\n';
2143 options
->break_opt
= -1;
2144 options
->rename_limit
= -1;
2145 options
->dirstat_percent
= 3;
2146 options
->context
= 3;
2147 options
->msg_sep
= "";
2149 options
->change
= diff_change
;
2150 options
->add_remove
= diff_addremove
;
2151 if (diff_use_color_default
)
2152 DIFF_OPT_SET(options
, COLOR_DIFF
);
2154 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2155 options
->detect_rename
= diff_detect_rename_default
;
2157 options
->a_prefix
= "a/";
2158 options
->b_prefix
= "b/";
2161 int diff_setup_done(struct diff_options
*options
)
2165 if (options
->output_format
& DIFF_FORMAT_NAME
)
2167 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2169 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2171 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2174 die("--name-only, --name-status, --check and -s are mutually exclusive");
2176 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2177 options
->detect_rename
= DIFF_DETECT_COPY
;
2179 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2180 DIFF_FORMAT_NAME_STATUS
|
2181 DIFF_FORMAT_CHECKDIFF
|
2182 DIFF_FORMAT_NO_OUTPUT
))
2183 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2184 DIFF_FORMAT_NUMSTAT
|
2185 DIFF_FORMAT_DIFFSTAT
|
2186 DIFF_FORMAT_SHORTSTAT
|
2187 DIFF_FORMAT_DIRSTAT
|
2188 DIFF_FORMAT_SUMMARY
|
2192 * These cases always need recursive; we do not drop caller-supplied
2193 * recursive bits for other formats here.
2195 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2196 DIFF_FORMAT_NUMSTAT
|
2197 DIFF_FORMAT_DIFFSTAT
|
2198 DIFF_FORMAT_SHORTSTAT
|
2199 DIFF_FORMAT_DIRSTAT
|
2200 DIFF_FORMAT_SUMMARY
|
2201 DIFF_FORMAT_CHECKDIFF
))
2202 DIFF_OPT_SET(options
, RECURSIVE
);
2204 * Also pickaxe would not work very well if you do not say recursive
2206 if (options
->pickaxe
)
2207 DIFF_OPT_SET(options
, RECURSIVE
);
2209 if (options
->detect_rename
&& options
->rename_limit
< 0)
2210 options
->rename_limit
= diff_rename_limit_default
;
2211 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2213 /* read-cache does not die even when it fails
2214 * so it is safe for us to do this here. Also
2215 * it does not smudge active_cache or active_nr
2216 * when it fails, so we do not have to worry about
2217 * cleaning it up ourselves either.
2221 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2222 options
->abbrev
= 40; /* full */
2225 * It does not make sense to show the first hit we happened
2226 * to have found. It does not make sense not to return with
2227 * exit code in such a case either.
2229 if (DIFF_OPT_TST(options
, QUIET
)) {
2230 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2231 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2235 * If we postprocess in diffcore, we cannot simply return
2236 * upon the first hit. We need to run diff as usual.
2238 if (options
->pickaxe
|| options
->filter
)
2239 DIFF_OPT_CLR(options
, QUIET
);
2244 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2254 if (c
== arg_short
) {
2258 if (val
&& isdigit(c
)) {
2260 int n
= strtoul(arg
, &end
, 10);
2271 eq
= strchr(arg
, '=');
2276 if (!len
|| strncmp(arg
, arg_long
, len
))
2281 if (!isdigit(*++eq
))
2283 n
= strtoul(eq
, &end
, 10);
2291 static int diff_scoreopt_parse(const char *opt
);
2293 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2295 const char *arg
= av
[0];
2297 /* Output format options */
2298 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2299 options
->output_format
|= DIFF_FORMAT_PATCH
;
2300 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2301 options
->output_format
|= DIFF_FORMAT_PATCH
;
2302 else if (!strcmp(arg
, "--raw"))
2303 options
->output_format
|= DIFF_FORMAT_RAW
;
2304 else if (!strcmp(arg
, "--patch-with-raw"))
2305 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2306 else if (!strcmp(arg
, "--numstat"))
2307 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2308 else if (!strcmp(arg
, "--shortstat"))
2309 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2310 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2311 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2312 else if (!strcmp(arg
, "--cumulative"))
2313 options
->output_format
|= DIFF_FORMAT_CUMULATIVE
;
2314 else if (!strcmp(arg
, "--check"))
2315 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2316 else if (!strcmp(arg
, "--summary"))
2317 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2318 else if (!strcmp(arg
, "--patch-with-stat"))
2319 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2320 else if (!strcmp(arg
, "--name-only"))
2321 options
->output_format
|= DIFF_FORMAT_NAME
;
2322 else if (!strcmp(arg
, "--name-status"))
2323 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2324 else if (!strcmp(arg
, "-s"))
2325 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2326 else if (!prefixcmp(arg
, "--stat")) {
2328 int width
= options
->stat_width
;
2329 int name_width
= options
->stat_name_width
;
2335 if (!prefixcmp(arg
, "-width="))
2336 width
= strtoul(arg
+ 7, &end
, 10);
2337 else if (!prefixcmp(arg
, "-name-width="))
2338 name_width
= strtoul(arg
+ 12, &end
, 10);
2341 width
= strtoul(arg
+1, &end
, 10);
2343 name_width
= strtoul(end
+1, &end
, 10);
2346 /* Important! This checks all the error cases! */
2349 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2350 options
->stat_name_width
= name_width
;
2351 options
->stat_width
= width
;
2354 /* renames options */
2355 else if (!prefixcmp(arg
, "-B")) {
2356 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2359 else if (!prefixcmp(arg
, "-M")) {
2360 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2362 options
->detect_rename
= DIFF_DETECT_RENAME
;
2364 else if (!prefixcmp(arg
, "-C")) {
2365 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2366 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2367 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2369 options
->detect_rename
= DIFF_DETECT_COPY
;
2371 else if (!strcmp(arg
, "--no-renames"))
2372 options
->detect_rename
= 0;
2375 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2376 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2377 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2378 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2379 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2380 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2383 else if (!strcmp(arg
, "--binary")) {
2384 options
->output_format
|= DIFF_FORMAT_PATCH
;
2385 DIFF_OPT_SET(options
, BINARY
);
2387 else if (!strcmp(arg
, "--full-index"))
2388 DIFF_OPT_SET(options
, FULL_INDEX
);
2389 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2390 DIFF_OPT_SET(options
, TEXT
);
2391 else if (!strcmp(arg
, "-R"))
2392 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2393 else if (!strcmp(arg
, "--find-copies-harder"))
2394 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2395 else if (!strcmp(arg
, "--follow"))
2396 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2397 else if (!strcmp(arg
, "--color"))
2398 DIFF_OPT_SET(options
, COLOR_DIFF
);
2399 else if (!strcmp(arg
, "--no-color"))
2400 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2401 else if (!strcmp(arg
, "--color-words"))
2402 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2403 else if (!strcmp(arg
, "--exit-code"))
2404 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2405 else if (!strcmp(arg
, "--quiet"))
2406 DIFF_OPT_SET(options
, QUIET
);
2407 else if (!strcmp(arg
, "--ext-diff"))
2408 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2409 else if (!strcmp(arg
, "--no-ext-diff"))
2410 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2413 else if (!strcmp(arg
, "-z"))
2414 options
->line_termination
= 0;
2415 else if (!prefixcmp(arg
, "-l"))
2416 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2417 else if (!prefixcmp(arg
, "-S"))
2418 options
->pickaxe
= arg
+ 2;
2419 else if (!strcmp(arg
, "--pickaxe-all"))
2420 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2421 else if (!strcmp(arg
, "--pickaxe-regex"))
2422 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2423 else if (!prefixcmp(arg
, "-O"))
2424 options
->orderfile
= arg
+ 2;
2425 else if (!prefixcmp(arg
, "--diff-filter="))
2426 options
->filter
= arg
+ 14;
2427 else if (!strcmp(arg
, "--abbrev"))
2428 options
->abbrev
= DEFAULT_ABBREV
;
2429 else if (!prefixcmp(arg
, "--abbrev=")) {
2430 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2431 if (options
->abbrev
< MINIMUM_ABBREV
)
2432 options
->abbrev
= MINIMUM_ABBREV
;
2433 else if (40 < options
->abbrev
)
2434 options
->abbrev
= 40;
2436 else if (!prefixcmp(arg
, "--src-prefix="))
2437 options
->a_prefix
= arg
+ 13;
2438 else if (!prefixcmp(arg
, "--dst-prefix="))
2439 options
->b_prefix
= arg
+ 13;
2440 else if (!strcmp(arg
, "--no-prefix"))
2441 options
->a_prefix
= options
->b_prefix
= "";
2447 static int parse_num(const char **cp_p
)
2449 unsigned long num
, scale
;
2451 const char *cp
= *cp_p
;
2458 if ( !dot
&& ch
== '.' ) {
2461 } else if ( ch
== '%' ) {
2462 scale
= dot
? scale
*100 : 100;
2463 cp
++; /* % is always at the end */
2465 } else if ( ch
>= '0' && ch
<= '9' ) {
2466 if ( scale
< 100000 ) {
2468 num
= (num
*10) + (ch
-'0');
2477 /* user says num divided by scale and we say internally that
2478 * is MAX_SCORE * num / scale.
2480 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2483 static int diff_scoreopt_parse(const char *opt
)
2485 int opt1
, opt2
, cmd
;
2490 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2491 return -1; /* that is not a -M, -C nor -B option */
2493 opt1
= parse_num(&opt
);
2499 else if (*opt
!= '/')
2500 return -1; /* we expect -B80/99 or -B80 */
2503 opt2
= parse_num(&opt
);
2508 return opt1
| (opt2
<< 16);
2511 struct diff_queue_struct diff_queued_diff
;
2513 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2515 if (queue
->alloc
<= queue
->nr
) {
2516 queue
->alloc
= alloc_nr(queue
->alloc
);
2517 queue
->queue
= xrealloc(queue
->queue
,
2518 sizeof(dp
) * queue
->alloc
);
2520 queue
->queue
[queue
->nr
++] = dp
;
2523 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2524 struct diff_filespec
*one
,
2525 struct diff_filespec
*two
)
2527 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2535 void diff_free_filepair(struct diff_filepair
*p
)
2537 free_filespec(p
->one
);
2538 free_filespec(p
->two
);
2542 /* This is different from find_unique_abbrev() in that
2543 * it stuffs the result with dots for alignment.
2545 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2550 return sha1_to_hex(sha1
);
2552 abbrev
= find_unique_abbrev(sha1
, len
);
2554 return sha1_to_hex(sha1
);
2555 abblen
= strlen(abbrev
);
2557 static char hex
[41];
2558 if (len
< abblen
&& abblen
<= len
+ 2)
2559 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2561 sprintf(hex
, "%s...", abbrev
);
2564 return sha1_to_hex(sha1
);
2567 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2569 int line_termination
= opt
->line_termination
;
2570 int inter_name_termination
= line_termination
? '\t' : '\0';
2572 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2573 printf(":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2574 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2575 printf("%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2578 printf("%c%03d%c", p
->status
, similarity_index(p
),
2579 inter_name_termination
);
2581 printf("%c%c", p
->status
, inter_name_termination
);
2584 if (p
->status
== DIFF_STATUS_COPIED
|| p
->status
== DIFF_STATUS_RENAMED
) {
2585 write_name_quoted(p
->one
->path
, stdout
, inter_name_termination
);
2586 write_name_quoted(p
->two
->path
, stdout
, line_termination
);
2588 const char *path
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2589 write_name_quoted(path
, stdout
, line_termination
);
2593 int diff_unmodified_pair(struct diff_filepair
*p
)
2595 /* This function is written stricter than necessary to support
2596 * the currently implemented transformers, but the idea is to
2597 * let transformers to produce diff_filepairs any way they want,
2598 * and filter and clean them up here before producing the output.
2600 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2602 if (DIFF_PAIR_UNMERGED(p
))
2603 return 0; /* unmerged is interesting */
2605 /* deletion, addition, mode or type change
2606 * and rename are all interesting.
2608 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2609 DIFF_PAIR_MODE_CHANGED(p
) ||
2610 strcmp(one
->path
, two
->path
))
2613 /* both are valid and point at the same path. that is, we are
2614 * dealing with a change.
2616 if (one
->sha1_valid
&& two
->sha1_valid
&&
2617 !hashcmp(one
->sha1
, two
->sha1
))
2618 return 1; /* no change */
2619 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2620 return 1; /* both look at the same file on the filesystem. */
2624 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2626 if (diff_unmodified_pair(p
))
2629 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2630 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2631 return; /* no tree diffs in patch format */
2636 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2637 struct diffstat_t
*diffstat
)
2639 if (diff_unmodified_pair(p
))
2642 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2643 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2644 return; /* no tree diffs in patch format */
2646 run_diffstat(p
, o
, diffstat
);
2649 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2650 struct diff_options
*o
)
2652 if (diff_unmodified_pair(p
))
2655 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2656 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2657 return; /* no tree diffs in patch format */
2659 run_checkdiff(p
, o
);
2662 int diff_queue_is_empty(void)
2664 struct diff_queue_struct
*q
= &diff_queued_diff
;
2666 for (i
= 0; i
< q
->nr
; i
++)
2667 if (!diff_unmodified_pair(q
->queue
[i
]))
2673 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2675 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2678 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2680 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2681 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2683 s
->size
, s
->xfrm_flags
);
2686 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2688 diff_debug_filespec(p
->one
, i
, "one");
2689 diff_debug_filespec(p
->two
, i
, "two");
2690 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2691 p
->score
, p
->status
? p
->status
: '?',
2692 p
->one
->rename_used
, p
->broken_pair
);
2695 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2699 fprintf(stderr
, "%s\n", msg
);
2700 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2701 for (i
= 0; i
< q
->nr
; i
++) {
2702 struct diff_filepair
*p
= q
->queue
[i
];
2703 diff_debug_filepair(p
, i
);
2708 static void diff_resolve_rename_copy(void)
2711 struct diff_filepair
*p
;
2712 struct diff_queue_struct
*q
= &diff_queued_diff
;
2714 diff_debug_queue("resolve-rename-copy", q
);
2716 for (i
= 0; i
< q
->nr
; i
++) {
2718 p
->status
= 0; /* undecided */
2719 if (DIFF_PAIR_UNMERGED(p
))
2720 p
->status
= DIFF_STATUS_UNMERGED
;
2721 else if (!DIFF_FILE_VALID(p
->one
))
2722 p
->status
= DIFF_STATUS_ADDED
;
2723 else if (!DIFF_FILE_VALID(p
->two
))
2724 p
->status
= DIFF_STATUS_DELETED
;
2725 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2726 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2728 /* from this point on, we are dealing with a pair
2729 * whose both sides are valid and of the same type, i.e.
2730 * either in-place edit or rename/copy edit.
2732 else if (DIFF_PAIR_RENAME(p
)) {
2734 * A rename might have re-connected a broken
2735 * pair up, causing the pathnames to be the
2736 * same again. If so, that's not a rename at
2737 * all, just a modification..
2739 * Otherwise, see if this source was used for
2740 * multiple renames, in which case we decrement
2741 * the count, and call it a copy.
2743 if (!strcmp(p
->one
->path
, p
->two
->path
))
2744 p
->status
= DIFF_STATUS_MODIFIED
;
2745 else if (--p
->one
->rename_used
> 0)
2746 p
->status
= DIFF_STATUS_COPIED
;
2748 p
->status
= DIFF_STATUS_RENAMED
;
2750 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2751 p
->one
->mode
!= p
->two
->mode
||
2752 is_null_sha1(p
->one
->sha1
))
2753 p
->status
= DIFF_STATUS_MODIFIED
;
2755 /* This is a "no-change" entry and should not
2756 * happen anymore, but prepare for broken callers.
2758 error("feeding unmodified %s to diffcore",
2760 p
->status
= DIFF_STATUS_UNKNOWN
;
2763 diff_debug_queue("resolve-rename-copy done", q
);
2766 static int check_pair_status(struct diff_filepair
*p
)
2768 switch (p
->status
) {
2769 case DIFF_STATUS_UNKNOWN
:
2772 die("internal error in diff-resolve-rename-copy");
2778 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2780 int fmt
= opt
->output_format
;
2782 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2783 diff_flush_checkdiff(p
, opt
);
2784 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2785 diff_flush_raw(p
, opt
);
2786 else if (fmt
& DIFF_FORMAT_NAME
)
2787 write_name_quoted(p
->two
->path
, stdout
, opt
->line_termination
);
2790 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2793 printf(" %s mode %06o ", newdelete
, fs
->mode
);
2795 printf(" %s ", newdelete
);
2796 write_name_quoted(fs
->path
, stdout
, '\n');
2800 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2802 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2803 printf(" mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2804 show_name
? ' ' : '\n');
2806 write_name_quoted(p
->two
->path
, stdout
, '\n');
2811 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2813 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2815 printf(" %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2817 show_mode_change(p
, 0);
2820 static void diff_summary(struct diff_filepair
*p
)
2823 case DIFF_STATUS_DELETED
:
2824 show_file_mode_name("delete", p
->one
);
2826 case DIFF_STATUS_ADDED
:
2827 show_file_mode_name("create", p
->two
);
2829 case DIFF_STATUS_COPIED
:
2830 show_rename_copy("copy", p
);
2832 case DIFF_STATUS_RENAMED
:
2833 show_rename_copy("rename", p
);
2837 fputs(" rewrite ", stdout
);
2838 write_name_quoted(p
->two
->path
, stdout
, ' ');
2839 printf("(%d%%)\n", similarity_index(p
));
2841 show_mode_change(p
, !p
->score
);
2847 struct xdiff_emit_state xm
;
2852 static int remove_space(char *line
, int len
)
2858 for (i
= 0; i
< len
; i
++)
2859 if (!isspace((c
= line
[i
])))
2865 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2867 struct patch_id_t
*data
= priv
;
2870 /* Ignore line numbers when computing the SHA1 of the patch */
2871 if (!prefixcmp(line
, "@@ -"))
2874 new_len
= remove_space(line
, len
);
2876 SHA1_Update(data
->ctx
, line
, new_len
);
2877 data
->patchlen
+= new_len
;
2880 /* returns 0 upon success, and writes result into sha1 */
2881 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2883 struct diff_queue_struct
*q
= &diff_queued_diff
;
2886 struct patch_id_t data
;
2887 char buffer
[PATH_MAX
* 4 + 20];
2890 memset(&data
, 0, sizeof(struct patch_id_t
));
2892 data
.xm
.consume
= patch_id_consume
;
2894 for (i
= 0; i
< q
->nr
; i
++) {
2899 struct diff_filepair
*p
= q
->queue
[i
];
2902 memset(&xecfg
, 0, sizeof(xecfg
));
2904 return error("internal diff status error");
2905 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2907 if (diff_unmodified_pair(p
))
2909 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2910 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2912 if (DIFF_PAIR_UNMERGED(p
))
2915 diff_fill_sha1_info(p
->one
);
2916 diff_fill_sha1_info(p
->two
);
2917 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2918 fill_mmfile(&mf2
, p
->two
) < 0)
2919 return error("unable to read files to diff");
2921 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2922 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2923 if (p
->one
->mode
== 0)
2924 len1
= snprintf(buffer
, sizeof(buffer
),
2925 "diff--gita/%.*sb/%.*s"
2932 len2
, p
->two
->path
);
2933 else if (p
->two
->mode
== 0)
2934 len1
= snprintf(buffer
, sizeof(buffer
),
2935 "diff--gita/%.*sb/%.*s"
2936 "deletedfilemode%06o"
2942 len1
, p
->one
->path
);
2944 len1
= snprintf(buffer
, sizeof(buffer
),
2945 "diff--gita/%.*sb/%.*s"
2951 len2
, p
->two
->path
);
2952 SHA1_Update(&ctx
, buffer
, len1
);
2954 xpp
.flags
= XDF_NEED_MINIMAL
;
2956 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2957 ecb
.outf
= xdiff_outf
;
2959 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2962 SHA1_Final(sha1
, &ctx
);
2966 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2968 struct diff_queue_struct
*q
= &diff_queued_diff
;
2970 int result
= diff_get_patch_id(options
, sha1
);
2972 for (i
= 0; i
< q
->nr
; i
++)
2973 diff_free_filepair(q
->queue
[i
]);
2977 q
->nr
= q
->alloc
= 0;
2982 static int is_summary_empty(const struct diff_queue_struct
*q
)
2986 for (i
= 0; i
< q
->nr
; i
++) {
2987 const struct diff_filepair
*p
= q
->queue
[i
];
2989 switch (p
->status
) {
2990 case DIFF_STATUS_DELETED
:
2991 case DIFF_STATUS_ADDED
:
2992 case DIFF_STATUS_COPIED
:
2993 case DIFF_STATUS_RENAMED
:
2998 if (p
->one
->mode
&& p
->two
->mode
&&
2999 p
->one
->mode
!= p
->two
->mode
)
3007 void diff_flush(struct diff_options
*options
)
3009 struct diff_queue_struct
*q
= &diff_queued_diff
;
3010 int i
, output_format
= options
->output_format
;
3014 * Order: raw, stat, summary, patch
3015 * or: name/name-status/checkdiff (other bits clear)
3020 if (output_format
& (DIFF_FORMAT_RAW
|
3022 DIFF_FORMAT_NAME_STATUS
|
3023 DIFF_FORMAT_CHECKDIFF
)) {
3024 for (i
= 0; i
< q
->nr
; i
++) {
3025 struct diff_filepair
*p
= q
->queue
[i
];
3026 if (check_pair_status(p
))
3027 flush_one_pair(p
, options
);
3032 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
|DIFF_FORMAT_DIRSTAT
)) {
3033 struct diffstat_t diffstat
;
3035 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3036 diffstat
.xm
.consume
= diffstat_consume
;
3037 for (i
= 0; i
< q
->nr
; i
++) {
3038 struct diff_filepair
*p
= q
->queue
[i
];
3039 if (check_pair_status(p
))
3040 diff_flush_stat(p
, options
, &diffstat
);
3042 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3043 show_dirstat(&diffstat
, options
);
3044 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3045 show_numstat(&diffstat
, options
);
3046 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3047 show_stats(&diffstat
, options
);
3048 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3049 show_shortstats(&diffstat
);
3050 free_diffstat_info(&diffstat
);
3054 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3055 for (i
= 0; i
< q
->nr
; i
++)
3056 diff_summary(q
->queue
[i
]);
3060 if (output_format
& DIFF_FORMAT_PATCH
) {
3062 if (options
->stat_sep
) {
3063 /* attach patch instead of inline */
3064 fputs(options
->stat_sep
, stdout
);
3066 putchar(options
->line_termination
);
3070 for (i
= 0; i
< q
->nr
; i
++) {
3071 struct diff_filepair
*p
= q
->queue
[i
];
3072 if (check_pair_status(p
))
3073 diff_flush_patch(p
, options
);
3077 if (output_format
& DIFF_FORMAT_CALLBACK
)
3078 options
->format_callback(q
, options
, options
->format_callback_data
);
3080 for (i
= 0; i
< q
->nr
; i
++)
3081 diff_free_filepair(q
->queue
[i
]);
3085 q
->nr
= q
->alloc
= 0;
3088 static void diffcore_apply_filter(const char *filter
)
3091 struct diff_queue_struct
*q
= &diff_queued_diff
;
3092 struct diff_queue_struct outq
;
3094 outq
.nr
= outq
.alloc
= 0;
3099 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3101 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3102 struct diff_filepair
*p
= q
->queue
[i
];
3103 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3105 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3107 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3108 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3109 strchr(filter
, p
->status
)))
3115 /* otherwise we will clear the whole queue
3116 * by copying the empty outq at the end of this
3117 * function, but first clear the current entries
3120 for (i
= 0; i
< q
->nr
; i
++)
3121 diff_free_filepair(q
->queue
[i
]);
3124 /* Only the matching ones */
3125 for (i
= 0; i
< q
->nr
; i
++) {
3126 struct diff_filepair
*p
= q
->queue
[i
];
3128 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3130 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3132 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3133 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3134 strchr(filter
, p
->status
)))
3137 diff_free_filepair(p
);
3144 /* Check whether two filespecs with the same mode and size are identical */
3145 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3146 struct diff_filespec
*two
)
3148 if (S_ISGITLINK(one
->mode
)) {
3149 diff_fill_sha1_info(one
);
3150 diff_fill_sha1_info(two
);
3151 return !hashcmp(one
->sha1
, two
->sha1
);
3153 if (diff_populate_filespec(one
, 0))
3155 if (diff_populate_filespec(two
, 0))
3157 return !memcmp(one
->data
, two
->data
, one
->size
);
3160 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3163 struct diff_queue_struct
*q
= &diff_queued_diff
;
3164 struct diff_queue_struct outq
;
3166 outq
.nr
= outq
.alloc
= 0;
3168 for (i
= 0; i
< q
->nr
; i
++) {
3169 struct diff_filepair
*p
= q
->queue
[i
];
3172 * 1. Entries that come from stat info dirtyness
3173 * always have both sides (iow, not create/delete),
3174 * one side of the object name is unknown, with
3175 * the same mode and size. Keep the ones that
3176 * do not match these criteria. They have real
3179 * 2. At this point, the file is known to be modified,
3180 * with the same mode and size, and the object
3181 * name of one side is unknown. Need to inspect
3182 * the identical contents.
3184 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3185 !DIFF_FILE_VALID(p
->two
) ||
3186 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3187 (p
->one
->mode
!= p
->two
->mode
) ||
3188 diff_populate_filespec(p
->one
, 1) ||
3189 diff_populate_filespec(p
->two
, 1) ||
3190 (p
->one
->size
!= p
->two
->size
) ||
3191 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3195 * The caller can subtract 1 from skip_stat_unmatch
3196 * to determine how many paths were dirty only
3197 * due to stat info mismatch.
3199 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3200 diffopt
->skip_stat_unmatch
++;
3201 diff_free_filepair(p
);
3208 void diffcore_std(struct diff_options
*options
)
3210 if (DIFF_OPT_TST(options
, QUIET
))
3213 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3214 diffcore_skip_stat_unmatch(options
);
3215 if (options
->break_opt
!= -1)
3216 diffcore_break(options
->break_opt
);
3217 if (options
->detect_rename
)
3218 diffcore_rename(options
);
3219 if (options
->break_opt
!= -1)
3220 diffcore_merge_broken();
3221 if (options
->pickaxe
)
3222 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3223 if (options
->orderfile
)
3224 diffcore_order(options
->orderfile
);
3225 diff_resolve_rename_copy();
3226 diffcore_apply_filter(options
->filter
);
3228 if (diff_queued_diff
.nr
)
3229 DIFF_OPT_SET(options
, HAS_CHANGES
);
3231 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3234 int diff_result_code(struct diff_options
*opt
, int status
)
3237 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3238 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3240 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3241 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3243 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3244 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3249 void diff_addremove(struct diff_options
*options
,
3250 int addremove
, unsigned mode
,
3251 const unsigned char *sha1
,
3252 const char *base
, const char *path
)
3254 char concatpath
[PATH_MAX
];
3255 struct diff_filespec
*one
, *two
;
3257 /* This may look odd, but it is a preparation for
3258 * feeding "there are unchanged files which should
3259 * not produce diffs, but when you are doing copy
3260 * detection you would need them, so here they are"
3261 * entries to the diff-core. They will be prefixed
3262 * with something like '=' or '*' (I haven't decided
3263 * which but should not make any difference).
3264 * Feeding the same new and old to diff_change()
3265 * also has the same effect.
3266 * Before the final output happens, they are pruned after
3267 * merged into rename/copy pairs as appropriate.
3269 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3270 addremove
= (addremove
== '+' ? '-' :
3271 addremove
== '-' ? '+' : addremove
);
3273 if (!path
) path
= "";
3274 sprintf(concatpath
, "%s%s", base
, path
);
3275 one
= alloc_filespec(concatpath
);
3276 two
= alloc_filespec(concatpath
);
3278 if (addremove
!= '+')
3279 fill_filespec(one
, sha1
, mode
);
3280 if (addremove
!= '-')
3281 fill_filespec(two
, sha1
, mode
);
3283 diff_queue(&diff_queued_diff
, one
, two
);
3284 DIFF_OPT_SET(options
, HAS_CHANGES
);
3287 void diff_change(struct diff_options
*options
,
3288 unsigned old_mode
, unsigned new_mode
,
3289 const unsigned char *old_sha1
,
3290 const unsigned char *new_sha1
,
3291 const char *base
, const char *path
)
3293 char concatpath
[PATH_MAX
];
3294 struct diff_filespec
*one
, *two
;
3296 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3298 const unsigned char *tmp_c
;
3299 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3300 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3302 if (!path
) path
= "";
3303 sprintf(concatpath
, "%s%s", base
, path
);
3304 one
= alloc_filespec(concatpath
);
3305 two
= alloc_filespec(concatpath
);
3306 fill_filespec(one
, old_sha1
, old_mode
);
3307 fill_filespec(two
, new_sha1
, new_mode
);
3309 diff_queue(&diff_queued_diff
, one
, two
);
3310 DIFF_OPT_SET(options
, HAS_CHANGES
);
3313 void diff_unmerge(struct diff_options
*options
,
3315 unsigned mode
, const unsigned char *sha1
)
3317 struct diff_filespec
*one
, *two
;
3318 one
= alloc_filespec(path
);
3319 two
= alloc_filespec(path
);
3320 fill_filespec(one
, sha1
, mode
);
3321 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;