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
= 200;
23 int diff_use_color_default
= -1;
24 static const char *external_diff_cmd_cfg
;
25 int diff_auto_refresh_index
= 1;
27 static char diff_colors
[][COLOR_MAXLEN
] = {
29 "", /* PLAIN (normal) */
30 "\033[1m", /* METAINFO (bold) */
31 "\033[36m", /* FRAGINFO (cyan) */
32 "\033[31m", /* OLD (red) */
33 "\033[32m", /* NEW (green) */
34 "\033[33m", /* COMMIT (yellow) */
35 "\033[41m", /* WHITESPACE (red background) */
38 static int parse_diff_color_slot(const char *var
, int ofs
)
40 if (!strcasecmp(var
+ofs
, "plain"))
42 if (!strcasecmp(var
+ofs
, "meta"))
44 if (!strcasecmp(var
+ofs
, "frag"))
46 if (!strcasecmp(var
+ofs
, "old"))
48 if (!strcasecmp(var
+ofs
, "new"))
50 if (!strcasecmp(var
+ofs
, "commit"))
52 if (!strcasecmp(var
+ofs
, "whitespace"))
53 return DIFF_WHITESPACE
;
54 die("bad config variable '%s'", var
);
57 static struct ll_diff_driver
{
59 struct ll_diff_driver
*next
;
61 } *user_diff
, **user_diff_tail
;
64 * Currently there is only "diff.<drivername>.command" variable;
65 * because there are "diff.color.<slot>" variables, we are parsing
66 * this in a bit convoluted way to allow low level diff driver
69 static int parse_lldiff_command(const char *var
, const char *ep
, const char *value
)
73 struct ll_diff_driver
*drv
;
77 for (drv
= user_diff
; drv
; drv
= drv
->next
)
78 if (!strncmp(drv
->name
, name
, namelen
) && !drv
->name
[namelen
])
81 drv
= xcalloc(1, sizeof(struct ll_diff_driver
));
82 drv
->name
= xmemdupz(name
, namelen
);
84 user_diff_tail
= &user_diff
;
85 *user_diff_tail
= drv
;
86 user_diff_tail
= &(drv
->next
);
89 return git_config_string(&(drv
->cmd
), var
, value
);
93 * 'diff.<what>.funcname' attribute can be specified in the configuration
94 * to define a customized regexp to find the beginning of a function to
95 * be used for hunk header lines of "diff -p" style output.
97 static struct funcname_pattern
{
100 struct funcname_pattern
*next
;
101 } *funcname_pattern_list
;
103 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
)
107 struct funcname_pattern
*pp
;
109 name
= var
+ 5; /* "diff." */
112 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
113 if (!strncmp(pp
->name
, name
, namelen
) && !pp
->name
[namelen
])
116 pp
= xcalloc(1, sizeof(*pp
));
117 pp
->name
= xmemdupz(name
, namelen
);
118 pp
->next
= funcname_pattern_list
;
119 funcname_pattern_list
= pp
;
122 pp
->pattern
= xstrdup(value
);
127 * These are to give UI layer defaults.
128 * The core-level commands such as git-diff-files should
129 * never be affected by the setting of diff.renames
130 * the user happens to have in the configuration file.
132 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
134 if (!strcmp(var
, "diff.renamelimit")) {
135 diff_rename_limit_default
= git_config_int(var
, value
);
138 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
139 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
142 if (!strcmp(var
, "diff.renames")) {
144 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
145 else if (!strcasecmp(value
, "copies") ||
146 !strcasecmp(value
, "copy"))
147 diff_detect_rename_default
= DIFF_DETECT_COPY
;
148 else if (git_config_bool(var
,value
))
149 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
152 if (!strcmp(var
, "diff.autorefreshindex")) {
153 diff_auto_refresh_index
= git_config_bool(var
, value
);
156 if (!strcmp(var
, "diff.external"))
157 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
158 if (!prefixcmp(var
, "diff.")) {
159 const char *ep
= strrchr(var
, '.');
161 if (ep
!= var
+ 4 && !strcmp(ep
, ".command"))
162 return parse_lldiff_command(var
, ep
, value
);
165 return git_diff_basic_config(var
, value
, cb
);
168 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
170 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
171 int slot
= parse_diff_color_slot(var
, 11);
173 return config_error_nonbool(var
);
174 color_parse(value
, var
, diff_colors
[slot
]);
178 if (!prefixcmp(var
, "diff.")) {
179 const char *ep
= strrchr(var
, '.');
181 if (!strcmp(ep
, ".funcname")) {
183 return config_error_nonbool(var
);
184 return parse_funcname_pattern(var
, ep
, value
);
189 return git_color_default_config(var
, value
, cb
);
192 static char *quote_two(const char *one
, const char *two
)
194 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
195 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
198 strbuf_init(&res
, 0);
199 if (need_one
+ need_two
) {
200 strbuf_addch(&res
, '"');
201 quote_c_style(one
, &res
, NULL
, 1);
202 quote_c_style(two
, &res
, NULL
, 1);
203 strbuf_addch(&res
, '"');
205 strbuf_addstr(&res
, one
);
206 strbuf_addstr(&res
, two
);
208 return strbuf_detach(&res
, NULL
);
211 static const char *external_diff(void)
213 static const char *external_diff_cmd
= NULL
;
214 static int done_preparing
= 0;
217 return external_diff_cmd
;
218 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
219 if (!external_diff_cmd
)
220 external_diff_cmd
= external_diff_cmd_cfg
;
222 return external_diff_cmd
;
225 static struct diff_tempfile
{
226 const char *name
; /* filename external diff should read from */
229 char tmp_path
[PATH_MAX
];
232 static int count_lines(const char *data
, int size
)
234 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
241 completely_empty
= 0;
245 completely_empty
= 0;
248 if (completely_empty
)
251 count
++; /* no trailing newline */
255 static void print_line_count(FILE *file
, int count
)
259 fprintf(file
, "0,0");
265 fprintf(file
, "1,%d", count
);
270 static void copy_file_with_prefix(FILE *file
,
271 int prefix
, const char *data
, int size
,
272 const char *set
, const char *reset
)
274 int ch
, nl_just_seen
= 1;
289 fprintf(file
, "%s\n\\ No newline at end of file\n", reset
);
292 static void emit_rewrite_diff(const char *name_a
,
294 struct diff_filespec
*one
,
295 struct diff_filespec
*two
,
296 struct diff_options
*o
)
299 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
300 const char *name_a_tab
, *name_b_tab
;
301 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
302 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
303 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
304 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
305 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
306 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
308 name_a
+= (*name_a
== '/');
309 name_b
+= (*name_b
== '/');
310 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
311 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
313 strbuf_reset(&a_name
);
314 strbuf_reset(&b_name
);
315 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
316 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
318 diff_populate_filespec(one
, 0);
319 diff_populate_filespec(two
, 0);
320 lc_a
= count_lines(one
->data
, one
->size
);
321 lc_b
= count_lines(two
->data
, two
->size
);
323 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
324 metainfo
, a_name
.buf
, name_a_tab
, reset
,
325 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
326 print_line_count(o
->file
, lc_a
);
327 fprintf(o
->file
, " +");
328 print_line_count(o
->file
, lc_b
);
329 fprintf(o
->file
, " @@%s\n", reset
);
331 copy_file_with_prefix(o
->file
, '-', one
->data
, one
->size
, old
, reset
);
333 copy_file_with_prefix(o
->file
, '+', two
->data
, two
->size
, new, reset
);
336 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
338 if (!DIFF_FILE_VALID(one
)) {
339 mf
->ptr
= (char *)""; /* does not matter */
343 else if (diff_populate_filespec(one
, 0))
346 mf
->size
= one
->size
;
350 struct diff_words_buffer
{
353 long current
; /* output pointer */
354 int suppressed_newline
;
357 static void diff_words_append(char *line
, unsigned long len
,
358 struct diff_words_buffer
*buffer
)
360 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
361 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
362 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
366 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
367 buffer
->text
.size
+= len
;
370 struct diff_words_data
{
371 struct xdiff_emit_state xm
;
372 struct diff_words_buffer minus
, plus
;
376 static void print_word(FILE *file
, struct diff_words_buffer
*buffer
, int len
, int color
,
377 int suppress_newline
)
385 ptr
= buffer
->text
.ptr
+ buffer
->current
;
386 buffer
->current
+= len
;
388 if (ptr
[len
- 1] == '\n') {
393 fputs(diff_get_color(1, color
), file
);
394 fwrite(ptr
, len
, 1, file
);
395 fputs(diff_get_color(1, DIFF_RESET
), file
);
398 if (suppress_newline
)
399 buffer
->suppressed_newline
= 1;
405 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
407 struct diff_words_data
*diff_words
= priv
;
409 if (diff_words
->minus
.suppressed_newline
) {
411 putc('\n', diff_words
->file
);
412 diff_words
->minus
.suppressed_newline
= 0;
418 print_word(diff_words
->file
,
419 &diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
422 print_word(diff_words
->file
,
423 &diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
426 print_word(diff_words
->file
,
427 &diff_words
->plus
, len
, DIFF_PLAIN
, 0);
428 diff_words
->minus
.current
+= len
;
433 /* this executes the word diff on the accumulated buffers */
434 static void diff_words_show(struct diff_words_data
*diff_words
)
439 mmfile_t minus
, plus
;
442 memset(&xecfg
, 0, sizeof(xecfg
));
443 minus
.size
= diff_words
->minus
.text
.size
;
444 minus
.ptr
= xmalloc(minus
.size
);
445 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
446 for (i
= 0; i
< minus
.size
; i
++)
447 if (isspace(minus
.ptr
[i
]))
449 diff_words
->minus
.current
= 0;
451 plus
.size
= diff_words
->plus
.text
.size
;
452 plus
.ptr
= xmalloc(plus
.size
);
453 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
454 for (i
= 0; i
< plus
.size
; i
++)
455 if (isspace(plus
.ptr
[i
]))
457 diff_words
->plus
.current
= 0;
459 xpp
.flags
= XDF_NEED_MINIMAL
;
460 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
461 ecb
.outf
= xdiff_outf
;
462 ecb
.priv
= diff_words
;
463 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
464 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
468 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
470 if (diff_words
->minus
.suppressed_newline
) {
471 putc('\n', diff_words
->file
);
472 diff_words
->minus
.suppressed_newline
= 0;
476 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
478 struct emit_callback
{
479 struct xdiff_emit_state xm
;
480 int nparents
, color_diff
;
482 sane_truncate_fn truncate
;
483 const char **label_path
;
484 struct diff_words_data
*diff_words
;
489 static void free_diff_words_data(struct emit_callback
*ecbdata
)
491 if (ecbdata
->diff_words
) {
493 if (ecbdata
->diff_words
->minus
.text
.size
||
494 ecbdata
->diff_words
->plus
.text
.size
)
495 diff_words_show(ecbdata
->diff_words
);
497 free (ecbdata
->diff_words
->minus
.text
.ptr
);
498 free (ecbdata
->diff_words
->plus
.text
.ptr
);
499 free(ecbdata
->diff_words
);
500 ecbdata
->diff_words
= NULL
;
504 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
507 return diff_colors
[ix
];
511 static void emit_line(FILE *file
, const char *set
, const char *reset
, const char *line
, int len
)
513 int has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
514 if (has_trailing_newline
)
518 fwrite(line
, len
, 1, file
);
520 if (has_trailing_newline
)
524 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
526 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
527 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
530 emit_line(ecbdata
->file
, set
, reset
, line
, len
);
532 /* Emit just the prefix, then the rest. */
533 emit_line(ecbdata
->file
, set
, reset
, line
, ecbdata
->nparents
);
534 (void)check_and_emit_line(line
+ ecbdata
->nparents
,
535 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
536 ecbdata
->file
, set
, reset
, ws
);
540 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
547 return ecb
->truncate(line
, len
);
551 (void) utf8_width(&cp
, &l
);
553 break; /* truncated in the middle? */
558 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
562 struct emit_callback
*ecbdata
= priv
;
563 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
564 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
565 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
567 *(ecbdata
->found_changesp
) = 1;
569 if (ecbdata
->label_path
[0]) {
570 const char *name_a_tab
, *name_b_tab
;
572 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
573 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
575 fprintf(ecbdata
->file
, "%s--- %s%s%s\n",
576 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
577 fprintf(ecbdata
->file
, "%s+++ %s%s%s\n",
578 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
579 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
582 /* This is not really necessary for now because
583 * this codepath only deals with two-way diffs.
585 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
587 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
588 ecbdata
->nparents
= i
- 1;
589 len
= sane_truncate_line(ecbdata
, line
, len
);
590 emit_line(ecbdata
->file
,
591 diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
593 if (line
[len
-1] != '\n')
594 putc('\n', ecbdata
->file
);
598 if (len
< ecbdata
->nparents
) {
599 emit_line(ecbdata
->file
, reset
, reset
, line
, len
);
604 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
605 /* fall back to normal diff */
606 free_diff_words_data(ecbdata
);
607 if (ecbdata
->diff_words
) {
608 if (line
[0] == '-') {
609 diff_words_append(line
, len
,
610 &ecbdata
->diff_words
->minus
);
612 } else if (line
[0] == '+') {
613 diff_words_append(line
, len
,
614 &ecbdata
->diff_words
->plus
);
617 if (ecbdata
->diff_words
->minus
.text
.size
||
618 ecbdata
->diff_words
->plus
.text
.size
)
619 diff_words_show(ecbdata
->diff_words
);
622 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
625 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
627 color
= DIFF_FILE_OLD
;
628 else if (line
[i
] == '+')
629 color
= DIFF_FILE_NEW
;
632 if (color
!= DIFF_FILE_NEW
) {
633 emit_line(ecbdata
->file
,
634 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(FILE *file
,
774 const char *prefix
, const char *name
, int len
,
775 const char *reset
, const char *set
)
777 fprintf(file
, " %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
780 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
784 fprintf(file
, "%s", set
);
787 fprintf(file
, "%s", reset
);
790 static void fill_print_name(struct diffstat_file
*file
)
794 if (file
->print_name
)
797 if (!file
->is_renamed
) {
799 strbuf_init(&buf
, 0);
800 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
801 pname
= strbuf_detach(&buf
, NULL
);
804 strbuf_release(&buf
);
807 pname
= pprint_rename(file
->from_name
, file
->name
);
809 file
->print_name
= pname
;
812 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
814 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
815 int max_change
= 0, max_len
= 0;
816 int total_files
= data
->nr
;
817 int width
, name_width
;
818 const char *reset
, *set
, *add_c
, *del_c
;
823 width
= options
->stat_width
? options
->stat_width
: 80;
824 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
826 /* Sanity: give at least 5 columns to the graph,
827 * but leave at least 10 columns for the name.
829 if (width
< name_width
+ 15) {
830 if (name_width
<= 25)
831 width
= name_width
+ 15;
833 name_width
= width
- 15;
836 /* Find the longest filename and max number of changes */
837 reset
= diff_get_color_opt(options
, DIFF_RESET
);
838 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
839 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
840 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
842 for (i
= 0; i
< data
->nr
; i
++) {
843 struct diffstat_file
*file
= data
->files
[i
];
844 int change
= file
->added
+ file
->deleted
;
845 fill_print_name(file
);
846 len
= strlen(file
->print_name
);
850 if (file
->is_binary
|| file
->is_unmerged
)
852 if (max_change
< change
)
856 /* Compute the width of the graph part;
857 * 10 is for one blank at the beginning of the line plus
858 * " | count " between the name and the graph.
860 * From here on, name_width is the width of the name area,
861 * and width is the width of the graph area.
863 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
864 if (width
< (name_width
+ 10) + max_change
)
865 width
= width
- (name_width
+ 10);
869 for (i
= 0; i
< data
->nr
; i
++) {
870 const char *prefix
= "";
871 char *name
= data
->files
[i
]->print_name
;
872 int added
= data
->files
[i
]->added
;
873 int deleted
= data
->files
[i
]->deleted
;
877 * "scale" the filename
880 name_len
= strlen(name
);
881 if (name_width
< name_len
) {
885 name
+= name_len
- len
;
886 slash
= strchr(name
, '/');
891 if (data
->files
[i
]->is_binary
) {
892 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
893 fprintf(options
->file
, " Bin ");
894 fprintf(options
->file
, "%s%d%s", del_c
, deleted
, reset
);
895 fprintf(options
->file
, " -> ");
896 fprintf(options
->file
, "%s%d%s", add_c
, added
, reset
);
897 fprintf(options
->file
, " bytes");
898 fprintf(options
->file
, "\n");
901 else if (data
->files
[i
]->is_unmerged
) {
902 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
903 fprintf(options
->file
, " Unmerged\n");
906 else if (!data
->files
[i
]->is_renamed
&&
907 (added
+ deleted
== 0)) {
913 * scale the add/delete
921 if (width
<= max_change
) {
922 add
= scale_linear(add
, width
, max_change
);
923 del
= scale_linear(del
, width
, max_change
);
926 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
927 fprintf(options
->file
, "%5d ", added
+ deleted
);
928 show_graph(options
->file
, '+', add
, add_c
, reset
);
929 show_graph(options
->file
, '-', del
, del_c
, reset
);
930 fprintf(options
->file
, "\n");
932 fprintf(options
->file
,
933 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
934 set
, total_files
, adds
, dels
, reset
);
937 static void show_shortstats(struct diffstat_t
* data
, struct diff_options
*options
)
939 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
944 for (i
= 0; i
< data
->nr
; i
++) {
945 if (!data
->files
[i
]->is_binary
&&
946 !data
->files
[i
]->is_unmerged
) {
947 int added
= data
->files
[i
]->added
;
948 int deleted
= data
->files
[i
]->deleted
;
949 if (!data
->files
[i
]->is_renamed
&&
950 (added
+ deleted
== 0)) {
958 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
959 total_files
, adds
, dels
);
962 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
969 for (i
= 0; i
< data
->nr
; i
++) {
970 struct diffstat_file
*file
= data
->files
[i
];
973 fprintf(options
->file
, "-\t-\t");
975 fprintf(options
->file
,
976 "%d\t%d\t", file
->added
, file
->deleted
);
977 if (options
->line_termination
) {
978 fill_print_name(file
);
979 if (!file
->is_renamed
)
980 write_name_quoted(file
->name
, options
->file
,
981 options
->line_termination
);
983 fputs(file
->print_name
, options
->file
);
984 putc(options
->line_termination
, options
->file
);
987 if (file
->is_renamed
) {
988 putc('\0', options
->file
);
989 write_name_quoted(file
->from_name
, options
->file
, '\0');
991 write_name_quoted(file
->name
, options
->file
, '\0');
996 struct dirstat_file
{
998 unsigned long changed
;
1001 struct dirstat_dir
{
1002 struct dirstat_file
*files
;
1003 int alloc
, nr
, percent
, cumulative
;
1006 static long gather_dirstat(FILE *file
, struct dirstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1008 unsigned long this_dir
= 0;
1009 unsigned int sources
= 0;
1012 struct dirstat_file
*f
= dir
->files
;
1013 int namelen
= strlen(f
->name
);
1017 if (namelen
< baselen
)
1019 if (memcmp(f
->name
, base
, baselen
))
1021 slash
= strchr(f
->name
+ baselen
, '/');
1023 int newbaselen
= slash
+ 1 - f
->name
;
1024 this = gather_dirstat(file
, dir
, changed
, f
->name
, newbaselen
);
1036 * We don't report dirstat's for
1038 * - or cases where everything came from a single directory
1039 * under this directory (sources == 1).
1041 if (baselen
&& sources
!= 1) {
1042 int permille
= this_dir
* 1000 / changed
;
1044 int percent
= permille
/ 10;
1045 if (percent
>= dir
->percent
) {
1046 fprintf(file
, "%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1047 if (!dir
->cumulative
)
1055 static void show_dirstat(struct diff_options
*options
)
1058 unsigned long changed
;
1059 struct dirstat_dir dir
;
1060 struct diff_queue_struct
*q
= &diff_queued_diff
;
1065 dir
.percent
= options
->dirstat_percent
;
1066 dir
.cumulative
= options
->output_format
& DIFF_FORMAT_CUMULATIVE
;
1069 for (i
= 0; i
< q
->nr
; i
++) {
1070 struct diff_filepair
*p
= q
->queue
[i
];
1072 unsigned long copied
, added
, damage
;
1074 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1076 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1077 diff_populate_filespec(p
->one
, 0);
1078 diff_populate_filespec(p
->two
, 0);
1079 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1081 diff_free_filespec_data(p
->one
);
1082 diff_free_filespec_data(p
->two
);
1083 } else if (DIFF_FILE_VALID(p
->one
)) {
1084 diff_populate_filespec(p
->one
, 1);
1086 diff_free_filespec_data(p
->one
);
1087 } else if (DIFF_FILE_VALID(p
->two
)) {
1088 diff_populate_filespec(p
->two
, 1);
1090 added
= p
->two
->size
;
1091 diff_free_filespec_data(p
->two
);
1096 * Original minus copied is the removed material,
1097 * added is the new material. They are both damages
1098 * made to the preimage.
1100 damage
= (p
->one
->size
- copied
) + added
;
1102 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1103 dir
.files
[dir
.nr
].name
= name
;
1104 dir
.files
[dir
.nr
].changed
= damage
;
1109 /* This can happen even with many files, if everything was renames */
1113 /* Show all directories with more than x% of the changes */
1114 gather_dirstat(options
->file
, &dir
, changed
, "", 0);
1117 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1120 for (i
= 0; i
< diffstat
->nr
; i
++) {
1121 struct diffstat_file
*f
= diffstat
->files
[i
];
1122 if (f
->name
!= f
->print_name
)
1123 free(f
->print_name
);
1128 free(diffstat
->files
);
1131 struct checkdiff_t
{
1132 struct xdiff_emit_state xm
;
1133 const char *filename
;
1134 int lineno
, color_diff
;
1140 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1142 struct checkdiff_t
*data
= priv
;
1143 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
1144 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
1145 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
1148 if (line
[0] == '+') {
1151 bad
= check_and_emit_line(line
+ 1, len
- 1,
1152 data
->ws_rule
, NULL
, NULL
, NULL
, NULL
);
1155 data
->status
|= bad
;
1156 err
= whitespace_error_string(bad
);
1157 fprintf(data
->file
, "%s:%d: %s.\n", data
->filename
, data
->lineno
, err
);
1159 emit_line(data
->file
, set
, reset
, line
, 1);
1160 (void)check_and_emit_line(line
+ 1, len
- 1, data
->ws_rule
,
1161 data
->file
, set
, reset
, ws
);
1162 } else if (line
[0] == ' ')
1164 else if (line
[0] == '@') {
1165 char *plus
= strchr(line
, '+');
1167 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1169 die("invalid diff");
1173 static unsigned char *deflate_it(char *data
,
1175 unsigned long *result_size
)
1178 unsigned char *deflated
;
1181 memset(&stream
, 0, sizeof(stream
));
1182 deflateInit(&stream
, zlib_compression_level
);
1183 bound
= deflateBound(&stream
, size
);
1184 deflated
= xmalloc(bound
);
1185 stream
.next_out
= deflated
;
1186 stream
.avail_out
= bound
;
1188 stream
.next_in
= (unsigned char *)data
;
1189 stream
.avail_in
= size
;
1190 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1192 deflateEnd(&stream
);
1193 *result_size
= stream
.total_out
;
1197 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1203 unsigned long orig_size
;
1204 unsigned long delta_size
;
1205 unsigned long deflate_size
;
1206 unsigned long data_size
;
1208 /* We could do deflated delta, or we could do just deflated two,
1209 * whichever is smaller.
1212 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1213 if (one
->size
&& two
->size
) {
1214 delta
= diff_delta(one
->ptr
, one
->size
,
1215 two
->ptr
, two
->size
,
1216 &delta_size
, deflate_size
);
1218 void *to_free
= delta
;
1219 orig_size
= delta_size
;
1220 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1225 if (delta
&& delta_size
< deflate_size
) {
1226 fprintf(file
, "delta %lu\n", orig_size
);
1229 data_size
= delta_size
;
1232 fprintf(file
, "literal %lu\n", two
->size
);
1235 data_size
= deflate_size
;
1238 /* emit data encoded in base85 */
1241 int bytes
= (52 < data_size
) ? 52 : data_size
;
1245 line
[0] = bytes
+ 'A' - 1;
1247 line
[0] = bytes
- 26 + 'a' - 1;
1248 encode_85(line
+ 1, cp
, bytes
);
1249 cp
= (char *) cp
+ bytes
;
1253 fprintf(file
, "\n");
1257 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1259 fprintf(file
, "GIT binary patch\n");
1260 emit_binary_diff_body(file
, one
, two
);
1261 emit_binary_diff_body(file
, two
, one
);
1264 static void setup_diff_attr_check(struct git_attr_check
*check
)
1266 static struct git_attr
*attr_diff
;
1269 attr_diff
= git_attr("diff", 4);
1271 check
[0].attr
= attr_diff
;
1274 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1276 struct git_attr_check attr_diff_check
;
1277 int check_from_data
= 0;
1279 if (one
->checked_attr
)
1282 setup_diff_attr_check(&attr_diff_check
);
1284 one
->funcname_pattern_ident
= NULL
;
1286 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1290 value
= attr_diff_check
.value
;
1291 if (ATTR_TRUE(value
))
1293 else if (ATTR_FALSE(value
))
1296 check_from_data
= 1;
1298 /* funcname pattern ident */
1299 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1302 one
->funcname_pattern_ident
= value
;
1305 if (check_from_data
) {
1306 if (!one
->data
&& DIFF_FILE_VALID(one
))
1307 diff_populate_filespec(one
, 0);
1310 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1314 int diff_filespec_is_binary(struct diff_filespec
*one
)
1316 diff_filespec_check_attr(one
);
1317 return one
->is_binary
;
1320 static const char *funcname_pattern(const char *ident
)
1322 struct funcname_pattern
*pp
;
1324 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1325 if (!strcmp(ident
, pp
->name
))
1330 static struct builtin_funcname_pattern
{
1332 const char *pattern
;
1333 } builtin_funcname_pattern
[] = {
1334 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1335 "new\\|return\\|switch\\|throw\\|while\\)\n"
1337 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1339 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1342 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1344 const char *ident
, *pattern
;
1347 diff_filespec_check_attr(one
);
1348 ident
= one
->funcname_pattern_ident
;
1352 * If the config file has "funcname.default" defined, that
1353 * regexp is used; otherwise NULL is returned and xemit uses
1354 * the built-in default.
1356 return funcname_pattern("default");
1358 /* Look up custom "funcname.$ident" regexp from config. */
1359 pattern
= funcname_pattern(ident
);
1364 * And define built-in fallback patterns here. Note that
1365 * these can be overridden by the user's config settings.
1367 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1368 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1369 return builtin_funcname_pattern
[i
].pattern
;
1374 static void builtin_diff(const char *name_a
,
1376 struct diff_filespec
*one
,
1377 struct diff_filespec
*two
,
1378 const char *xfrm_msg
,
1379 struct diff_options
*o
,
1380 int complete_rewrite
)
1384 char *a_one
, *b_two
;
1385 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1386 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1388 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1389 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1390 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1391 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1392 fprintf(o
->file
, "%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1393 if (lbl
[0][0] == '/') {
1395 fprintf(o
->file
, "%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1396 if (xfrm_msg
&& xfrm_msg
[0])
1397 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1399 else if (lbl
[1][0] == '/') {
1400 fprintf(o
->file
, "%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1401 if (xfrm_msg
&& xfrm_msg
[0])
1402 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1405 if (one
->mode
!= two
->mode
) {
1406 fprintf(o
->file
, "%sold mode %06o%s\n", set
, one
->mode
, reset
);
1407 fprintf(o
->file
, "%snew mode %06o%s\n", set
, two
->mode
, reset
);
1409 if (xfrm_msg
&& xfrm_msg
[0])
1410 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1412 * we do not run diff between different kind
1415 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1416 goto free_ab_and_return
;
1417 if (complete_rewrite
) {
1418 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1419 o
->found_changes
= 1;
1420 goto free_ab_and_return
;
1424 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1425 die("unable to read files to diff");
1427 if (!DIFF_OPT_TST(o
, TEXT
) &&
1428 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1429 /* Quite common confusing case */
1430 if (mf1
.size
== mf2
.size
&&
1431 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1432 goto free_ab_and_return
;
1433 if (DIFF_OPT_TST(o
, BINARY
))
1434 emit_binary_diff(o
->file
, &mf1
, &mf2
);
1436 fprintf(o
->file
, "Binary files %s and %s differ\n",
1438 o
->found_changes
= 1;
1441 /* Crazy xdl interfaces.. */
1442 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1446 struct emit_callback ecbdata
;
1447 const char *funcname_pattern
;
1449 funcname_pattern
= diff_funcname_pattern(one
);
1450 if (!funcname_pattern
)
1451 funcname_pattern
= diff_funcname_pattern(two
);
1453 memset(&xecfg
, 0, sizeof(xecfg
));
1454 memset(&ecbdata
, 0, sizeof(ecbdata
));
1455 ecbdata
.label_path
= lbl
;
1456 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1457 ecbdata
.found_changesp
= &o
->found_changes
;
1458 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1459 ecbdata
.file
= o
->file
;
1460 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1461 xecfg
.ctxlen
= o
->context
;
1462 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1463 if (funcname_pattern
)
1464 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1467 else if (!prefixcmp(diffopts
, "--unified="))
1468 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1469 else if (!prefixcmp(diffopts
, "-u"))
1470 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1471 ecb
.outf
= xdiff_outf
;
1472 ecb
.priv
= &ecbdata
;
1473 ecbdata
.xm
.consume
= fn_out_consume
;
1474 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
)) {
1475 ecbdata
.diff_words
=
1476 xcalloc(1, sizeof(struct diff_words_data
));
1477 ecbdata
.diff_words
->file
= o
->file
;
1479 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1480 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1481 free_diff_words_data(&ecbdata
);
1485 diff_free_filespec_data(one
);
1486 diff_free_filespec_data(two
);
1492 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1493 struct diff_filespec
*one
,
1494 struct diff_filespec
*two
,
1495 struct diffstat_t
*diffstat
,
1496 struct diff_options
*o
,
1497 int complete_rewrite
)
1500 struct diffstat_file
*data
;
1502 data
= diffstat_add(diffstat
, name_a
, name_b
);
1505 data
->is_unmerged
= 1;
1508 if (complete_rewrite
) {
1509 diff_populate_filespec(one
, 0);
1510 diff_populate_filespec(two
, 0);
1511 data
->deleted
= count_lines(one
->data
, one
->size
);
1512 data
->added
= count_lines(two
->data
, two
->size
);
1513 goto free_and_return
;
1515 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1516 die("unable to read files to diff");
1518 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1519 data
->is_binary
= 1;
1520 data
->added
= mf2
.size
;
1521 data
->deleted
= mf1
.size
;
1523 /* Crazy xdl interfaces.. */
1528 memset(&xecfg
, 0, sizeof(xecfg
));
1529 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1530 ecb
.outf
= xdiff_outf
;
1531 ecb
.priv
= diffstat
;
1532 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1536 diff_free_filespec_data(one
);
1537 diff_free_filespec_data(two
);
1540 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1541 const char *attr_path
,
1542 struct diff_filespec
*one
,
1543 struct diff_filespec
*two
, struct diff_options
*o
)
1546 struct checkdiff_t data
;
1551 memset(&data
, 0, sizeof(data
));
1552 data
.xm
.consume
= checkdiff_consume
;
1553 data
.filename
= name_b
? name_b
: name_a
;
1555 data
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1556 data
.ws_rule
= whitespace_rule(attr_path
);
1557 data
.file
= o
->file
;
1559 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1560 die("unable to read files to diff");
1562 if (diff_filespec_is_binary(two
))
1563 goto free_and_return
;
1565 /* Crazy xdl interfaces.. */
1570 memset(&xecfg
, 0, sizeof(xecfg
));
1571 xpp
.flags
= XDF_NEED_MINIMAL
;
1572 ecb
.outf
= xdiff_outf
;
1574 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1577 diff_free_filespec_data(one
);
1578 diff_free_filespec_data(two
);
1580 DIFF_OPT_SET(o
, CHECK_FAILED
);
1583 struct diff_filespec
*alloc_filespec(const char *path
)
1585 int namelen
= strlen(path
);
1586 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1588 memset(spec
, 0, sizeof(*spec
));
1589 spec
->path
= (char *)(spec
+ 1);
1590 memcpy(spec
->path
, path
, namelen
+1);
1595 void free_filespec(struct diff_filespec
*spec
)
1597 if (!--spec
->count
) {
1598 diff_free_filespec_data(spec
);
1603 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1604 unsigned short mode
)
1607 spec
->mode
= canon_mode(mode
);
1608 hashcpy(spec
->sha1
, sha1
);
1609 spec
->sha1_valid
= !is_null_sha1(sha1
);
1614 * Given a name and sha1 pair, if the index tells us the file in
1615 * the work tree has that object contents, return true, so that
1616 * prepare_temp_file() does not have to inflate and extract.
1618 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1620 struct cache_entry
*ce
;
1624 /* We do not read the cache ourselves here, because the
1625 * benchmark with my previous version that always reads cache
1626 * shows that it makes things worse for diff-tree comparing
1627 * two linux-2.6 kernel trees in an already checked out work
1628 * tree. This is because most diff-tree comparisons deal with
1629 * only a small number of files, while reading the cache is
1630 * expensive for a large project, and its cost outweighs the
1631 * savings we get by not inflating the object to a temporary
1632 * file. Practically, this code only helps when we are used
1633 * by diff-cache --cached, which does read the cache before
1639 /* We want to avoid the working directory if our caller
1640 * doesn't need the data in a normal file, this system
1641 * is rather slow with its stat/open/mmap/close syscalls,
1642 * and the object is contained in a pack file. The pack
1643 * is probably already open and will be faster to obtain
1644 * the data through than the working directory. Loose
1645 * objects however would tend to be slower as they need
1646 * to be individually opened and inflated.
1648 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1652 pos
= cache_name_pos(name
, len
);
1655 ce
= active_cache
[pos
];
1658 * This is not the sha1 we are looking for, or
1659 * unreusable because it is not a regular file.
1661 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1665 * If ce matches the file in the work tree, we can reuse it.
1667 if (ce_uptodate(ce
) ||
1668 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1674 static int populate_from_stdin(struct diff_filespec
*s
)
1679 strbuf_init(&buf
, 0);
1680 if (strbuf_read(&buf
, 0, 0) < 0)
1681 return error("error while reading from stdin %s",
1684 s
->should_munmap
= 0;
1685 s
->data
= strbuf_detach(&buf
, &size
);
1691 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1694 char *data
= xmalloc(100);
1695 len
= snprintf(data
, 100,
1696 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1708 * While doing rename detection and pickaxe operation, we may need to
1709 * grab the data for the blob (or file) for our own in-core comparison.
1710 * diff_filespec has data and size fields for this purpose.
1712 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1715 if (!DIFF_FILE_VALID(s
))
1716 die("internal error: asking to populate invalid file.");
1717 if (S_ISDIR(s
->mode
))
1723 if (size_only
&& 0 < s
->size
)
1726 if (S_ISGITLINK(s
->mode
))
1727 return diff_populate_gitlink(s
, size_only
);
1729 if (!s
->sha1_valid
||
1730 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1735 if (!strcmp(s
->path
, "-"))
1736 return populate_from_stdin(s
);
1738 if (lstat(s
->path
, &st
) < 0) {
1739 if (errno
== ENOENT
) {
1743 s
->data
= (char *)"";
1748 s
->size
= xsize_t(st
.st_size
);
1753 if (S_ISLNK(st
.st_mode
)) {
1755 s
->data
= xmalloc(s
->size
);
1757 ret
= readlink(s
->path
, s
->data
, s
->size
);
1764 fd
= open(s
->path
, O_RDONLY
);
1767 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1769 s
->should_munmap
= 1;
1772 * Convert from working tree format to canonical git format
1774 strbuf_init(&buf
, 0);
1775 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
1777 munmap(s
->data
, s
->size
);
1778 s
->should_munmap
= 0;
1779 s
->data
= strbuf_detach(&buf
, &size
);
1785 enum object_type type
;
1787 type
= sha1_object_info(s
->sha1
, &s
->size
);
1789 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1796 void diff_free_filespec_blob(struct diff_filespec
*s
)
1800 else if (s
->should_munmap
)
1801 munmap(s
->data
, s
->size
);
1803 if (s
->should_free
|| s
->should_munmap
) {
1804 s
->should_free
= s
->should_munmap
= 0;
1809 void diff_free_filespec_data(struct diff_filespec
*s
)
1811 diff_free_filespec_blob(s
);
1816 static void prep_temp_blob(struct diff_tempfile
*temp
,
1819 const unsigned char *sha1
,
1824 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1826 die("unable to create temp-file: %s", strerror(errno
));
1827 if (write_in_full(fd
, blob
, size
) != size
)
1828 die("unable to write temp-file");
1830 temp
->name
= temp
->tmp_path
;
1831 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1833 sprintf(temp
->mode
, "%06o", mode
);
1836 static void prepare_temp_file(const char *name
,
1837 struct diff_tempfile
*temp
,
1838 struct diff_filespec
*one
)
1840 if (!DIFF_FILE_VALID(one
)) {
1842 /* A '-' entry produces this for file-2, and
1843 * a '+' entry produces this for file-1.
1845 temp
->name
= "/dev/null";
1846 strcpy(temp
->hex
, ".");
1847 strcpy(temp
->mode
, ".");
1851 if (!one
->sha1_valid
||
1852 reuse_worktree_file(name
, one
->sha1
, 1)) {
1854 if (lstat(name
, &st
) < 0) {
1855 if (errno
== ENOENT
)
1856 goto not_a_valid_file
;
1857 die("stat(%s): %s", name
, strerror(errno
));
1859 if (S_ISLNK(st
.st_mode
)) {
1861 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1862 size_t sz
= xsize_t(st
.st_size
);
1863 if (sizeof(buf
) <= st
.st_size
)
1864 die("symlink too long: %s", name
);
1865 ret
= readlink(name
, buf
, sz
);
1867 die("readlink(%s)", name
);
1868 prep_temp_blob(temp
, buf
, sz
,
1870 one
->sha1
: null_sha1
),
1872 one
->mode
: S_IFLNK
));
1875 /* we can borrow from the file in the work tree */
1877 if (!one
->sha1_valid
)
1878 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1880 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1881 /* Even though we may sometimes borrow the
1882 * contents from the work tree, we always want
1883 * one->mode. mode is trustworthy even when
1884 * !(one->sha1_valid), as long as
1885 * DIFF_FILE_VALID(one).
1887 sprintf(temp
->mode
, "%06o", one
->mode
);
1892 if (diff_populate_filespec(one
, 0))
1893 die("cannot read data blob for %s", one
->path
);
1894 prep_temp_blob(temp
, one
->data
, one
->size
,
1895 one
->sha1
, one
->mode
);
1899 static void remove_tempfile(void)
1903 for (i
= 0; i
< 2; i
++)
1904 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1905 unlink(diff_temp
[i
].name
);
1906 diff_temp
[i
].name
= NULL
;
1910 static void remove_tempfile_on_signal(int signo
)
1913 signal(SIGINT
, SIG_DFL
);
1917 /* An external diff command takes:
1919 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1920 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1923 static void run_external_diff(const char *pgm
,
1926 struct diff_filespec
*one
,
1927 struct diff_filespec
*two
,
1928 const char *xfrm_msg
,
1929 int complete_rewrite
)
1931 const char *spawn_arg
[10];
1932 struct diff_tempfile
*temp
= diff_temp
;
1934 static int atexit_asked
= 0;
1935 const char *othername
;
1936 const char **arg
= &spawn_arg
[0];
1938 othername
= (other
? other
: name
);
1940 prepare_temp_file(name
, &temp
[0], one
);
1941 prepare_temp_file(othername
, &temp
[1], two
);
1942 if (! atexit_asked
&&
1943 (temp
[0].name
== temp
[0].tmp_path
||
1944 temp
[1].name
== temp
[1].tmp_path
)) {
1946 atexit(remove_tempfile
);
1948 signal(SIGINT
, remove_tempfile_on_signal
);
1954 *arg
++ = temp
[0].name
;
1955 *arg
++ = temp
[0].hex
;
1956 *arg
++ = temp
[0].mode
;
1957 *arg
++ = temp
[1].name
;
1958 *arg
++ = temp
[1].hex
;
1959 *arg
++ = temp
[1].mode
;
1970 retval
= run_command_v_opt(spawn_arg
, 0);
1973 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1978 static const char *external_diff_attr(const char *name
)
1980 struct git_attr_check attr_diff_check
;
1985 setup_diff_attr_check(&attr_diff_check
);
1986 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
1987 const char *value
= attr_diff_check
.value
;
1988 if (!ATTR_TRUE(value
) &&
1989 !ATTR_FALSE(value
) &&
1990 !ATTR_UNSET(value
)) {
1991 struct ll_diff_driver
*drv
;
1993 for (drv
= user_diff
; drv
; drv
= drv
->next
)
1994 if (!strcmp(drv
->name
, value
))
2001 static void run_diff_cmd(const char *pgm
,
2004 const char *attr_path
,
2005 struct diff_filespec
*one
,
2006 struct diff_filespec
*two
,
2007 const char *xfrm_msg
,
2008 struct diff_options
*o
,
2009 int complete_rewrite
)
2011 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2014 const char *cmd
= external_diff_attr(attr_path
);
2020 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2025 builtin_diff(name
, other
? other
: name
,
2026 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2028 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2031 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2033 if (DIFF_FILE_VALID(one
)) {
2034 if (!one
->sha1_valid
) {
2036 if (!strcmp(one
->path
, "-")) {
2037 hashcpy(one
->sha1
, null_sha1
);
2040 if (lstat(one
->path
, &st
) < 0)
2041 die("stat %s", one
->path
);
2042 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2043 die("cannot hash %s\n", one
->path
);
2050 static int similarity_index(struct diff_filepair
*p
)
2052 return p
->score
* 100 / MAX_SCORE
;
2055 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2057 /* Strip the prefix but do not molest /dev/null and absolute paths */
2058 if (*namep
&& **namep
!= '/')
2059 *namep
+= prefix_length
;
2060 if (*otherp
&& **otherp
!= '/')
2061 *otherp
+= prefix_length
;
2064 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2066 const char *pgm
= external_diff();
2069 struct diff_filespec
*one
= p
->one
;
2070 struct diff_filespec
*two
= p
->two
;
2073 const char *attr_path
;
2074 int complete_rewrite
= 0;
2076 name
= p
->one
->path
;
2077 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2079 if (o
->prefix_length
)
2080 strip_prefix(o
->prefix_length
, &name
, &other
);
2082 if (DIFF_PAIR_UNMERGED(p
)) {
2083 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2084 NULL
, NULL
, NULL
, o
, 0);
2088 diff_fill_sha1_info(one
);
2089 diff_fill_sha1_info(two
);
2091 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
2092 switch (p
->status
) {
2093 case DIFF_STATUS_COPIED
:
2094 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2095 strbuf_addstr(&msg
, "\ncopy from ");
2096 quote_c_style(name
, &msg
, NULL
, 0);
2097 strbuf_addstr(&msg
, "\ncopy to ");
2098 quote_c_style(other
, &msg
, NULL
, 0);
2099 strbuf_addch(&msg
, '\n');
2101 case DIFF_STATUS_RENAMED
:
2102 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2103 strbuf_addstr(&msg
, "\nrename from ");
2104 quote_c_style(name
, &msg
, NULL
, 0);
2105 strbuf_addstr(&msg
, "\nrename to ");
2106 quote_c_style(other
, &msg
, NULL
, 0);
2107 strbuf_addch(&msg
, '\n');
2109 case DIFF_STATUS_MODIFIED
:
2111 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
2112 similarity_index(p
));
2113 complete_rewrite
= 1;
2122 if (hashcmp(one
->sha1
, two
->sha1
)) {
2123 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2125 if (DIFF_OPT_TST(o
, BINARY
)) {
2127 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2128 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2131 strbuf_addf(&msg
, "index %.*s..%.*s",
2132 abbrev
, sha1_to_hex(one
->sha1
),
2133 abbrev
, sha1_to_hex(two
->sha1
));
2134 if (one
->mode
== two
->mode
)
2135 strbuf_addf(&msg
, " %06o", one
->mode
);
2136 strbuf_addch(&msg
, '\n');
2140 strbuf_setlen(&msg
, msg
.len
- 1);
2141 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
2144 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2145 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2146 /* a filepair that changes between file and symlink
2147 * needs to be split into deletion and creation.
2149 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2150 run_diff_cmd(NULL
, name
, other
, attr_path
,
2151 one
, null
, xfrm_msg
, o
, 0);
2153 null
= alloc_filespec(one
->path
);
2154 run_diff_cmd(NULL
, name
, other
, attr_path
,
2155 null
, two
, xfrm_msg
, o
, 0);
2159 run_diff_cmd(pgm
, name
, other
, attr_path
,
2160 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2162 strbuf_release(&msg
);
2165 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2166 struct diffstat_t
*diffstat
)
2170 int complete_rewrite
= 0;
2172 if (DIFF_PAIR_UNMERGED(p
)) {
2174 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2178 name
= p
->one
->path
;
2179 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2181 if (o
->prefix_length
)
2182 strip_prefix(o
->prefix_length
, &name
, &other
);
2184 diff_fill_sha1_info(p
->one
);
2185 diff_fill_sha1_info(p
->two
);
2187 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2188 complete_rewrite
= 1;
2189 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2192 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2196 const char *attr_path
;
2198 if (DIFF_PAIR_UNMERGED(p
)) {
2203 name
= p
->one
->path
;
2204 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2205 attr_path
= other
? other
: name
;
2207 if (o
->prefix_length
)
2208 strip_prefix(o
->prefix_length
, &name
, &other
);
2210 diff_fill_sha1_info(p
->one
);
2211 diff_fill_sha1_info(p
->two
);
2213 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2216 void diff_setup(struct diff_options
*options
)
2218 memset(options
, 0, sizeof(*options
));
2220 options
->file
= stdout
;
2222 options
->line_termination
= '\n';
2223 options
->break_opt
= -1;
2224 options
->rename_limit
= -1;
2225 options
->dirstat_percent
= 3;
2226 options
->context
= 3;
2228 options
->change
= diff_change
;
2229 options
->add_remove
= diff_addremove
;
2230 if (diff_use_color_default
> 0)
2231 DIFF_OPT_SET(options
, COLOR_DIFF
);
2233 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2234 options
->detect_rename
= diff_detect_rename_default
;
2236 options
->a_prefix
= "a/";
2237 options
->b_prefix
= "b/";
2240 int diff_setup_done(struct diff_options
*options
)
2244 if (options
->output_format
& DIFF_FORMAT_NAME
)
2246 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2248 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2250 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2253 die("--name-only, --name-status, --check and -s are mutually exclusive");
2255 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2256 options
->detect_rename
= DIFF_DETECT_COPY
;
2258 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2259 options
->prefix
= NULL
;
2260 if (options
->prefix
)
2261 options
->prefix_length
= strlen(options
->prefix
);
2263 options
->prefix_length
= 0;
2265 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2266 DIFF_FORMAT_NAME_STATUS
|
2267 DIFF_FORMAT_CHECKDIFF
|
2268 DIFF_FORMAT_NO_OUTPUT
))
2269 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2270 DIFF_FORMAT_NUMSTAT
|
2271 DIFF_FORMAT_DIFFSTAT
|
2272 DIFF_FORMAT_SHORTSTAT
|
2273 DIFF_FORMAT_DIRSTAT
|
2274 DIFF_FORMAT_SUMMARY
|
2278 * These cases always need recursive; we do not drop caller-supplied
2279 * recursive bits for other formats here.
2281 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2282 DIFF_FORMAT_NUMSTAT
|
2283 DIFF_FORMAT_DIFFSTAT
|
2284 DIFF_FORMAT_SHORTSTAT
|
2285 DIFF_FORMAT_DIRSTAT
|
2286 DIFF_FORMAT_SUMMARY
|
2287 DIFF_FORMAT_CHECKDIFF
))
2288 DIFF_OPT_SET(options
, RECURSIVE
);
2290 * Also pickaxe would not work very well if you do not say recursive
2292 if (options
->pickaxe
)
2293 DIFF_OPT_SET(options
, RECURSIVE
);
2295 if (options
->detect_rename
&& options
->rename_limit
< 0)
2296 options
->rename_limit
= diff_rename_limit_default
;
2297 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2299 /* read-cache does not die even when it fails
2300 * so it is safe for us to do this here. Also
2301 * it does not smudge active_cache or active_nr
2302 * when it fails, so we do not have to worry about
2303 * cleaning it up ourselves either.
2307 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2308 options
->abbrev
= 40; /* full */
2311 * It does not make sense to show the first hit we happened
2312 * to have found. It does not make sense not to return with
2313 * exit code in such a case either.
2315 if (DIFF_OPT_TST(options
, QUIET
)) {
2316 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2317 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2321 * If we postprocess in diffcore, we cannot simply return
2322 * upon the first hit. We need to run diff as usual.
2324 if (options
->pickaxe
|| options
->filter
)
2325 DIFF_OPT_CLR(options
, QUIET
);
2330 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2340 if (c
== arg_short
) {
2344 if (val
&& isdigit(c
)) {
2346 int n
= strtoul(arg
, &end
, 10);
2357 eq
= strchr(arg
, '=');
2362 if (!len
|| strncmp(arg
, arg_long
, len
))
2367 if (!isdigit(*++eq
))
2369 n
= strtoul(eq
, &end
, 10);
2377 static int diff_scoreopt_parse(const char *opt
);
2379 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2381 const char *arg
= av
[0];
2383 /* Output format options */
2384 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2385 options
->output_format
|= DIFF_FORMAT_PATCH
;
2386 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2387 options
->output_format
|= DIFF_FORMAT_PATCH
;
2388 else if (!strcmp(arg
, "--raw"))
2389 options
->output_format
|= DIFF_FORMAT_RAW
;
2390 else if (!strcmp(arg
, "--patch-with-raw"))
2391 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2392 else if (!strcmp(arg
, "--numstat"))
2393 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2394 else if (!strcmp(arg
, "--shortstat"))
2395 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2396 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2397 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2398 else if (!strcmp(arg
, "--cumulative"))
2399 options
->output_format
|= DIFF_FORMAT_CUMULATIVE
;
2400 else if (!strcmp(arg
, "--check"))
2401 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2402 else if (!strcmp(arg
, "--summary"))
2403 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2404 else if (!strcmp(arg
, "--patch-with-stat"))
2405 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2406 else if (!strcmp(arg
, "--name-only"))
2407 options
->output_format
|= DIFF_FORMAT_NAME
;
2408 else if (!strcmp(arg
, "--name-status"))
2409 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2410 else if (!strcmp(arg
, "-s"))
2411 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2412 else if (!prefixcmp(arg
, "--stat")) {
2414 int width
= options
->stat_width
;
2415 int name_width
= options
->stat_name_width
;
2421 if (!prefixcmp(arg
, "-width="))
2422 width
= strtoul(arg
+ 7, &end
, 10);
2423 else if (!prefixcmp(arg
, "-name-width="))
2424 name_width
= strtoul(arg
+ 12, &end
, 10);
2427 width
= strtoul(arg
+1, &end
, 10);
2429 name_width
= strtoul(end
+1, &end
, 10);
2432 /* Important! This checks all the error cases! */
2435 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2436 options
->stat_name_width
= name_width
;
2437 options
->stat_width
= width
;
2440 /* renames options */
2441 else if (!prefixcmp(arg
, "-B")) {
2442 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2445 else if (!prefixcmp(arg
, "-M")) {
2446 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2448 options
->detect_rename
= DIFF_DETECT_RENAME
;
2450 else if (!prefixcmp(arg
, "-C")) {
2451 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2452 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2453 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2455 options
->detect_rename
= DIFF_DETECT_COPY
;
2457 else if (!strcmp(arg
, "--no-renames"))
2458 options
->detect_rename
= 0;
2459 else if (!strcmp(arg
, "--relative"))
2460 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2461 else if (!prefixcmp(arg
, "--relative=")) {
2462 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2463 options
->prefix
= arg
+ 11;
2467 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2468 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2469 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2470 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2471 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2472 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2475 else if (!strcmp(arg
, "--binary")) {
2476 options
->output_format
|= DIFF_FORMAT_PATCH
;
2477 DIFF_OPT_SET(options
, BINARY
);
2479 else if (!strcmp(arg
, "--full-index"))
2480 DIFF_OPT_SET(options
, FULL_INDEX
);
2481 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2482 DIFF_OPT_SET(options
, TEXT
);
2483 else if (!strcmp(arg
, "-R"))
2484 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2485 else if (!strcmp(arg
, "--find-copies-harder"))
2486 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2487 else if (!strcmp(arg
, "--follow"))
2488 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2489 else if (!strcmp(arg
, "--color"))
2490 DIFF_OPT_SET(options
, COLOR_DIFF
);
2491 else if (!strcmp(arg
, "--no-color"))
2492 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2493 else if (!strcmp(arg
, "--color-words"))
2494 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2495 else if (!strcmp(arg
, "--exit-code"))
2496 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2497 else if (!strcmp(arg
, "--quiet"))
2498 DIFF_OPT_SET(options
, QUIET
);
2499 else if (!strcmp(arg
, "--ext-diff"))
2500 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2501 else if (!strcmp(arg
, "--no-ext-diff"))
2502 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2503 else if (!strcmp(arg
, "--ignore-submodules"))
2504 DIFF_OPT_SET(options
, IGNORE_SUBMODULES
);
2507 else if (!strcmp(arg
, "-z"))
2508 options
->line_termination
= 0;
2509 else if (!prefixcmp(arg
, "-l"))
2510 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2511 else if (!prefixcmp(arg
, "-S"))
2512 options
->pickaxe
= arg
+ 2;
2513 else if (!strcmp(arg
, "--pickaxe-all"))
2514 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2515 else if (!strcmp(arg
, "--pickaxe-regex"))
2516 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2517 else if (!prefixcmp(arg
, "-O"))
2518 options
->orderfile
= arg
+ 2;
2519 else if (!prefixcmp(arg
, "--diff-filter="))
2520 options
->filter
= arg
+ 14;
2521 else if (!strcmp(arg
, "--abbrev"))
2522 options
->abbrev
= DEFAULT_ABBREV
;
2523 else if (!prefixcmp(arg
, "--abbrev=")) {
2524 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2525 if (options
->abbrev
< MINIMUM_ABBREV
)
2526 options
->abbrev
= MINIMUM_ABBREV
;
2527 else if (40 < options
->abbrev
)
2528 options
->abbrev
= 40;
2530 else if (!prefixcmp(arg
, "--src-prefix="))
2531 options
->a_prefix
= arg
+ 13;
2532 else if (!prefixcmp(arg
, "--dst-prefix="))
2533 options
->b_prefix
= arg
+ 13;
2534 else if (!strcmp(arg
, "--no-prefix"))
2535 options
->a_prefix
= options
->b_prefix
= "";
2536 else if (!prefixcmp(arg
, "--output=")) {
2537 options
->file
= fopen(arg
+ strlen("--output="), "w");
2538 options
->close_file
= 1;
2544 static int parse_num(const char **cp_p
)
2546 unsigned long num
, scale
;
2548 const char *cp
= *cp_p
;
2555 if ( !dot
&& ch
== '.' ) {
2558 } else if ( ch
== '%' ) {
2559 scale
= dot
? scale
*100 : 100;
2560 cp
++; /* % is always at the end */
2562 } else if ( ch
>= '0' && ch
<= '9' ) {
2563 if ( scale
< 100000 ) {
2565 num
= (num
*10) + (ch
-'0');
2574 /* user says num divided by scale and we say internally that
2575 * is MAX_SCORE * num / scale.
2577 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2580 static int diff_scoreopt_parse(const char *opt
)
2582 int opt1
, opt2
, cmd
;
2587 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2588 return -1; /* that is not a -M, -C nor -B option */
2590 opt1
= parse_num(&opt
);
2596 else if (*opt
!= '/')
2597 return -1; /* we expect -B80/99 or -B80 */
2600 opt2
= parse_num(&opt
);
2605 return opt1
| (opt2
<< 16);
2608 struct diff_queue_struct diff_queued_diff
;
2610 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2612 if (queue
->alloc
<= queue
->nr
) {
2613 queue
->alloc
= alloc_nr(queue
->alloc
);
2614 queue
->queue
= xrealloc(queue
->queue
,
2615 sizeof(dp
) * queue
->alloc
);
2617 queue
->queue
[queue
->nr
++] = dp
;
2620 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2621 struct diff_filespec
*one
,
2622 struct diff_filespec
*two
)
2624 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2632 void diff_free_filepair(struct diff_filepair
*p
)
2634 free_filespec(p
->one
);
2635 free_filespec(p
->two
);
2639 /* This is different from find_unique_abbrev() in that
2640 * it stuffs the result with dots for alignment.
2642 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2647 return sha1_to_hex(sha1
);
2649 abbrev
= find_unique_abbrev(sha1
, len
);
2650 abblen
= strlen(abbrev
);
2652 static char hex
[41];
2653 if (len
< abblen
&& abblen
<= len
+ 2)
2654 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2656 sprintf(hex
, "%s...", abbrev
);
2659 return sha1_to_hex(sha1
);
2662 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2664 int line_termination
= opt
->line_termination
;
2665 int inter_name_termination
= line_termination
? '\t' : '\0';
2667 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2668 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2669 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2670 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2673 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
2674 inter_name_termination
);
2676 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
2679 if (p
->status
== DIFF_STATUS_COPIED
||
2680 p
->status
== DIFF_STATUS_RENAMED
) {
2681 const char *name_a
, *name_b
;
2682 name_a
= p
->one
->path
;
2683 name_b
= p
->two
->path
;
2684 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2685 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
2686 write_name_quoted(name_b
, opt
->file
, line_termination
);
2688 const char *name_a
, *name_b
;
2689 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2691 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2692 write_name_quoted(name_a
, opt
->file
, line_termination
);
2696 int diff_unmodified_pair(struct diff_filepair
*p
)
2698 /* This function is written stricter than necessary to support
2699 * the currently implemented transformers, but the idea is to
2700 * let transformers to produce diff_filepairs any way they want,
2701 * and filter and clean them up here before producing the output.
2703 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2705 if (DIFF_PAIR_UNMERGED(p
))
2706 return 0; /* unmerged is interesting */
2708 /* deletion, addition, mode or type change
2709 * and rename are all interesting.
2711 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2712 DIFF_PAIR_MODE_CHANGED(p
) ||
2713 strcmp(one
->path
, two
->path
))
2716 /* both are valid and point at the same path. that is, we are
2717 * dealing with a change.
2719 if (one
->sha1_valid
&& two
->sha1_valid
&&
2720 !hashcmp(one
->sha1
, two
->sha1
))
2721 return 1; /* no change */
2722 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2723 return 1; /* both look at the same file on the filesystem. */
2727 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2729 if (diff_unmodified_pair(p
))
2732 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2733 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2734 return; /* no tree diffs in patch format */
2739 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2740 struct diffstat_t
*diffstat
)
2742 if (diff_unmodified_pair(p
))
2745 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2746 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2747 return; /* no tree diffs in patch format */
2749 run_diffstat(p
, o
, diffstat
);
2752 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2753 struct diff_options
*o
)
2755 if (diff_unmodified_pair(p
))
2758 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2759 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2760 return; /* no tree diffs in patch format */
2762 run_checkdiff(p
, o
);
2765 int diff_queue_is_empty(void)
2767 struct diff_queue_struct
*q
= &diff_queued_diff
;
2769 for (i
= 0; i
< q
->nr
; i
++)
2770 if (!diff_unmodified_pair(q
->queue
[i
]))
2776 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2778 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2781 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2783 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2784 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2786 s
->size
, s
->xfrm_flags
);
2789 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2791 diff_debug_filespec(p
->one
, i
, "one");
2792 diff_debug_filespec(p
->two
, i
, "two");
2793 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2794 p
->score
, p
->status
? p
->status
: '?',
2795 p
->one
->rename_used
, p
->broken_pair
);
2798 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2802 fprintf(stderr
, "%s\n", msg
);
2803 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2804 for (i
= 0; i
< q
->nr
; i
++) {
2805 struct diff_filepair
*p
= q
->queue
[i
];
2806 diff_debug_filepair(p
, i
);
2811 static void diff_resolve_rename_copy(void)
2814 struct diff_filepair
*p
;
2815 struct diff_queue_struct
*q
= &diff_queued_diff
;
2817 diff_debug_queue("resolve-rename-copy", q
);
2819 for (i
= 0; i
< q
->nr
; i
++) {
2821 p
->status
= 0; /* undecided */
2822 if (DIFF_PAIR_UNMERGED(p
))
2823 p
->status
= DIFF_STATUS_UNMERGED
;
2824 else if (!DIFF_FILE_VALID(p
->one
))
2825 p
->status
= DIFF_STATUS_ADDED
;
2826 else if (!DIFF_FILE_VALID(p
->two
))
2827 p
->status
= DIFF_STATUS_DELETED
;
2828 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2829 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2831 /* from this point on, we are dealing with a pair
2832 * whose both sides are valid and of the same type, i.e.
2833 * either in-place edit or rename/copy edit.
2835 else if (DIFF_PAIR_RENAME(p
)) {
2837 * A rename might have re-connected a broken
2838 * pair up, causing the pathnames to be the
2839 * same again. If so, that's not a rename at
2840 * all, just a modification..
2842 * Otherwise, see if this source was used for
2843 * multiple renames, in which case we decrement
2844 * the count, and call it a copy.
2846 if (!strcmp(p
->one
->path
, p
->two
->path
))
2847 p
->status
= DIFF_STATUS_MODIFIED
;
2848 else if (--p
->one
->rename_used
> 0)
2849 p
->status
= DIFF_STATUS_COPIED
;
2851 p
->status
= DIFF_STATUS_RENAMED
;
2853 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2854 p
->one
->mode
!= p
->two
->mode
||
2855 is_null_sha1(p
->one
->sha1
))
2856 p
->status
= DIFF_STATUS_MODIFIED
;
2858 /* This is a "no-change" entry and should not
2859 * happen anymore, but prepare for broken callers.
2861 error("feeding unmodified %s to diffcore",
2863 p
->status
= DIFF_STATUS_UNKNOWN
;
2866 diff_debug_queue("resolve-rename-copy done", q
);
2869 static int check_pair_status(struct diff_filepair
*p
)
2871 switch (p
->status
) {
2872 case DIFF_STATUS_UNKNOWN
:
2875 die("internal error in diff-resolve-rename-copy");
2881 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2883 int fmt
= opt
->output_format
;
2885 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2886 diff_flush_checkdiff(p
, opt
);
2887 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2888 diff_flush_raw(p
, opt
);
2889 else if (fmt
& DIFF_FORMAT_NAME
) {
2890 const char *name_a
, *name_b
;
2891 name_a
= p
->two
->path
;
2893 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2894 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
2898 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
2901 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
2903 fprintf(file
, " %s ", newdelete
);
2904 write_name_quoted(fs
->path
, file
, '\n');
2908 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
)
2910 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2911 fprintf(file
, " mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2912 show_name
? ' ' : '\n');
2914 write_name_quoted(p
->two
->path
, file
, '\n');
2919 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
)
2921 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2923 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2925 show_mode_change(file
, p
, 0);
2928 static void diff_summary(FILE *file
, struct diff_filepair
*p
)
2931 case DIFF_STATUS_DELETED
:
2932 show_file_mode_name(file
, "delete", p
->one
);
2934 case DIFF_STATUS_ADDED
:
2935 show_file_mode_name(file
, "create", p
->two
);
2937 case DIFF_STATUS_COPIED
:
2938 show_rename_copy(file
, "copy", p
);
2940 case DIFF_STATUS_RENAMED
:
2941 show_rename_copy(file
, "rename", p
);
2945 fputs(" rewrite ", file
);
2946 write_name_quoted(p
->two
->path
, file
, ' ');
2947 fprintf(file
, "(%d%%)\n", similarity_index(p
));
2949 show_mode_change(file
, p
, !p
->score
);
2955 struct xdiff_emit_state xm
;
2960 static int remove_space(char *line
, int len
)
2966 for (i
= 0; i
< len
; i
++)
2967 if (!isspace((c
= line
[i
])))
2973 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2975 struct patch_id_t
*data
= priv
;
2978 /* Ignore line numbers when computing the SHA1 of the patch */
2979 if (!prefixcmp(line
, "@@ -"))
2982 new_len
= remove_space(line
, len
);
2984 SHA1_Update(data
->ctx
, line
, new_len
);
2985 data
->patchlen
+= new_len
;
2988 /* returns 0 upon success, and writes result into sha1 */
2989 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2991 struct diff_queue_struct
*q
= &diff_queued_diff
;
2994 struct patch_id_t data
;
2995 char buffer
[PATH_MAX
* 4 + 20];
2998 memset(&data
, 0, sizeof(struct patch_id_t
));
3000 data
.xm
.consume
= patch_id_consume
;
3002 for (i
= 0; i
< q
->nr
; i
++) {
3007 struct diff_filepair
*p
= q
->queue
[i
];
3010 memset(&xecfg
, 0, sizeof(xecfg
));
3012 return error("internal diff status error");
3013 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3015 if (diff_unmodified_pair(p
))
3017 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3018 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3020 if (DIFF_PAIR_UNMERGED(p
))
3023 diff_fill_sha1_info(p
->one
);
3024 diff_fill_sha1_info(p
->two
);
3025 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3026 fill_mmfile(&mf2
, p
->two
) < 0)
3027 return error("unable to read files to diff");
3029 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3030 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3031 if (p
->one
->mode
== 0)
3032 len1
= snprintf(buffer
, sizeof(buffer
),
3033 "diff--gita/%.*sb/%.*s"
3040 len2
, p
->two
->path
);
3041 else if (p
->two
->mode
== 0)
3042 len1
= snprintf(buffer
, sizeof(buffer
),
3043 "diff--gita/%.*sb/%.*s"
3044 "deletedfilemode%06o"
3050 len1
, p
->one
->path
);
3052 len1
= snprintf(buffer
, sizeof(buffer
),
3053 "diff--gita/%.*sb/%.*s"
3059 len2
, p
->two
->path
);
3060 SHA1_Update(&ctx
, buffer
, len1
);
3062 xpp
.flags
= XDF_NEED_MINIMAL
;
3064 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3065 ecb
.outf
= xdiff_outf
;
3067 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
3070 SHA1_Final(sha1
, &ctx
);
3074 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3076 struct diff_queue_struct
*q
= &diff_queued_diff
;
3078 int result
= diff_get_patch_id(options
, sha1
);
3080 for (i
= 0; i
< q
->nr
; i
++)
3081 diff_free_filepair(q
->queue
[i
]);
3085 q
->nr
= q
->alloc
= 0;
3090 static int is_summary_empty(const struct diff_queue_struct
*q
)
3094 for (i
= 0; i
< q
->nr
; i
++) {
3095 const struct diff_filepair
*p
= q
->queue
[i
];
3097 switch (p
->status
) {
3098 case DIFF_STATUS_DELETED
:
3099 case DIFF_STATUS_ADDED
:
3100 case DIFF_STATUS_COPIED
:
3101 case DIFF_STATUS_RENAMED
:
3106 if (p
->one
->mode
&& p
->two
->mode
&&
3107 p
->one
->mode
!= p
->two
->mode
)
3115 void diff_flush(struct diff_options
*options
)
3117 struct diff_queue_struct
*q
= &diff_queued_diff
;
3118 int i
, output_format
= options
->output_format
;
3122 * Order: raw, stat, summary, patch
3123 * or: name/name-status/checkdiff (other bits clear)
3128 if (output_format
& (DIFF_FORMAT_RAW
|
3130 DIFF_FORMAT_NAME_STATUS
|
3131 DIFF_FORMAT_CHECKDIFF
)) {
3132 for (i
= 0; i
< q
->nr
; i
++) {
3133 struct diff_filepair
*p
= q
->queue
[i
];
3134 if (check_pair_status(p
))
3135 flush_one_pair(p
, options
);
3140 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3141 struct diffstat_t diffstat
;
3143 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3144 diffstat
.xm
.consume
= diffstat_consume
;
3145 for (i
= 0; i
< q
->nr
; i
++) {
3146 struct diff_filepair
*p
= q
->queue
[i
];
3147 if (check_pair_status(p
))
3148 diff_flush_stat(p
, options
, &diffstat
);
3150 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3151 show_numstat(&diffstat
, options
);
3152 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3153 show_stats(&diffstat
, options
);
3154 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3155 show_shortstats(&diffstat
, options
);
3156 free_diffstat_info(&diffstat
);
3159 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3160 show_dirstat(options
);
3162 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3163 for (i
= 0; i
< q
->nr
; i
++)
3164 diff_summary(options
->file
, q
->queue
[i
]);
3168 if (output_format
& DIFF_FORMAT_PATCH
) {
3170 if (options
->stat_sep
) {
3171 /* attach patch instead of inline */
3172 fputs(options
->stat_sep
, options
->file
);
3174 putc(options
->line_termination
, options
->file
);
3178 for (i
= 0; i
< q
->nr
; i
++) {
3179 struct diff_filepair
*p
= q
->queue
[i
];
3180 if (check_pair_status(p
))
3181 diff_flush_patch(p
, options
);
3185 if (output_format
& DIFF_FORMAT_CALLBACK
)
3186 options
->format_callback(q
, options
, options
->format_callback_data
);
3188 for (i
= 0; i
< q
->nr
; i
++)
3189 diff_free_filepair(q
->queue
[i
]);
3193 q
->nr
= q
->alloc
= 0;
3194 if (options
->close_file
)
3195 fclose(options
->file
);
3198 static void diffcore_apply_filter(const char *filter
)
3201 struct diff_queue_struct
*q
= &diff_queued_diff
;
3202 struct diff_queue_struct outq
;
3204 outq
.nr
= outq
.alloc
= 0;
3209 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3211 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3212 struct diff_filepair
*p
= q
->queue
[i
];
3213 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3215 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3217 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3218 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3219 strchr(filter
, p
->status
)))
3225 /* otherwise we will clear the whole queue
3226 * by copying the empty outq at the end of this
3227 * function, but first clear the current entries
3230 for (i
= 0; i
< q
->nr
; i
++)
3231 diff_free_filepair(q
->queue
[i
]);
3234 /* Only the matching ones */
3235 for (i
= 0; i
< q
->nr
; i
++) {
3236 struct diff_filepair
*p
= q
->queue
[i
];
3238 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3240 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3242 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3243 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3244 strchr(filter
, p
->status
)))
3247 diff_free_filepair(p
);
3254 /* Check whether two filespecs with the same mode and size are identical */
3255 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3256 struct diff_filespec
*two
)
3258 if (S_ISGITLINK(one
->mode
))
3260 if (diff_populate_filespec(one
, 0))
3262 if (diff_populate_filespec(two
, 0))
3264 return !memcmp(one
->data
, two
->data
, one
->size
);
3267 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3270 struct diff_queue_struct
*q
= &diff_queued_diff
;
3271 struct diff_queue_struct outq
;
3273 outq
.nr
= outq
.alloc
= 0;
3275 for (i
= 0; i
< q
->nr
; i
++) {
3276 struct diff_filepair
*p
= q
->queue
[i
];
3279 * 1. Entries that come from stat info dirtyness
3280 * always have both sides (iow, not create/delete),
3281 * one side of the object name is unknown, with
3282 * the same mode and size. Keep the ones that
3283 * do not match these criteria. They have real
3286 * 2. At this point, the file is known to be modified,
3287 * with the same mode and size, and the object
3288 * name of one side is unknown. Need to inspect
3289 * the identical contents.
3291 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3292 !DIFF_FILE_VALID(p
->two
) ||
3293 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3294 (p
->one
->mode
!= p
->two
->mode
) ||
3295 diff_populate_filespec(p
->one
, 1) ||
3296 diff_populate_filespec(p
->two
, 1) ||
3297 (p
->one
->size
!= p
->two
->size
) ||
3298 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3302 * The caller can subtract 1 from skip_stat_unmatch
3303 * to determine how many paths were dirty only
3304 * due to stat info mismatch.
3306 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3307 diffopt
->skip_stat_unmatch
++;
3308 diff_free_filepair(p
);
3315 void diffcore_std(struct diff_options
*options
)
3317 if (DIFF_OPT_TST(options
, QUIET
))
3320 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3321 diffcore_skip_stat_unmatch(options
);
3322 if (options
->break_opt
!= -1)
3323 diffcore_break(options
->break_opt
);
3324 if (options
->detect_rename
)
3325 diffcore_rename(options
);
3326 if (options
->break_opt
!= -1)
3327 diffcore_merge_broken();
3328 if (options
->pickaxe
)
3329 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3330 if (options
->orderfile
)
3331 diffcore_order(options
->orderfile
);
3332 diff_resolve_rename_copy();
3333 diffcore_apply_filter(options
->filter
);
3335 if (diff_queued_diff
.nr
)
3336 DIFF_OPT_SET(options
, HAS_CHANGES
);
3338 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3341 int diff_result_code(struct diff_options
*opt
, int status
)
3344 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3345 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3347 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3348 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3350 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3351 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3356 void diff_addremove(struct diff_options
*options
,
3357 int addremove
, unsigned mode
,
3358 const unsigned char *sha1
,
3359 const char *concatpath
)
3361 struct diff_filespec
*one
, *two
;
3363 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(mode
))
3366 /* This may look odd, but it is a preparation for
3367 * feeding "there are unchanged files which should
3368 * not produce diffs, but when you are doing copy
3369 * detection you would need them, so here they are"
3370 * entries to the diff-core. They will be prefixed
3371 * with something like '=' or '*' (I haven't decided
3372 * which but should not make any difference).
3373 * Feeding the same new and old to diff_change()
3374 * also has the same effect.
3375 * Before the final output happens, they are pruned after
3376 * merged into rename/copy pairs as appropriate.
3378 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3379 addremove
= (addremove
== '+' ? '-' :
3380 addremove
== '-' ? '+' : addremove
);
3382 if (options
->prefix
&&
3383 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3386 one
= alloc_filespec(concatpath
);
3387 two
= alloc_filespec(concatpath
);
3389 if (addremove
!= '+')
3390 fill_filespec(one
, sha1
, mode
);
3391 if (addremove
!= '-')
3392 fill_filespec(two
, sha1
, mode
);
3394 diff_queue(&diff_queued_diff
, one
, two
);
3395 DIFF_OPT_SET(options
, HAS_CHANGES
);
3398 void diff_change(struct diff_options
*options
,
3399 unsigned old_mode
, unsigned new_mode
,
3400 const unsigned char *old_sha1
,
3401 const unsigned char *new_sha1
,
3402 const char *concatpath
)
3404 struct diff_filespec
*one
, *two
;
3406 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(old_mode
)
3407 && S_ISGITLINK(new_mode
))
3410 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3412 const unsigned char *tmp_c
;
3413 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3414 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3417 if (options
->prefix
&&
3418 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3421 one
= alloc_filespec(concatpath
);
3422 two
= alloc_filespec(concatpath
);
3423 fill_filespec(one
, old_sha1
, old_mode
);
3424 fill_filespec(two
, new_sha1
, new_mode
);
3426 diff_queue(&diff_queued_diff
, one
, two
);
3427 DIFF_OPT_SET(options
, HAS_CHANGES
);
3430 void diff_unmerge(struct diff_options
*options
,
3432 unsigned mode
, const unsigned char *sha1
)
3434 struct diff_filespec
*one
, *two
;
3436 if (options
->prefix
&&
3437 strncmp(path
, options
->prefix
, options
->prefix_length
))
3440 one
= alloc_filespec(path
);
3441 two
= alloc_filespec(path
);
3442 fill_filespec(one
, sha1
, mode
);
3443 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;