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")) {
158 return config_error_nonbool(var
);
159 external_diff_cmd_cfg
= xstrdup(value
);
162 if (!prefixcmp(var
, "diff.")) {
163 const char *ep
= strrchr(var
, '.');
165 if (ep
!= var
+ 4 && !strcmp(ep
, ".command"))
166 return parse_lldiff_command(var
, ep
, value
);
169 return git_diff_basic_config(var
, value
, cb
);
172 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
174 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
175 int slot
= parse_diff_color_slot(var
, 11);
177 return config_error_nonbool(var
);
178 color_parse(value
, var
, diff_colors
[slot
]);
182 if (!prefixcmp(var
, "diff.")) {
183 const char *ep
= strrchr(var
, '.');
185 if (!strcmp(ep
, ".funcname")) {
187 return config_error_nonbool(var
);
188 return parse_funcname_pattern(var
, ep
, value
);
193 return git_color_default_config(var
, value
, cb
);
196 static char *quote_two(const char *one
, const char *two
)
198 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
199 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
202 strbuf_init(&res
, 0);
203 if (need_one
+ need_two
) {
204 strbuf_addch(&res
, '"');
205 quote_c_style(one
, &res
, NULL
, 1);
206 quote_c_style(two
, &res
, NULL
, 1);
207 strbuf_addch(&res
, '"');
209 strbuf_addstr(&res
, one
);
210 strbuf_addstr(&res
, two
);
212 return strbuf_detach(&res
, NULL
);
215 static const char *external_diff(void)
217 static const char *external_diff_cmd
= NULL
;
218 static int done_preparing
= 0;
221 return external_diff_cmd
;
222 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
223 if (!external_diff_cmd
)
224 external_diff_cmd
= external_diff_cmd_cfg
;
226 return external_diff_cmd
;
229 static struct diff_tempfile
{
230 const char *name
; /* filename external diff should read from */
233 char tmp_path
[PATH_MAX
];
236 static int count_lines(const char *data
, int size
)
238 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
245 completely_empty
= 0;
249 completely_empty
= 0;
252 if (completely_empty
)
255 count
++; /* no trailing newline */
259 static void print_line_count(FILE *file
, int count
)
263 fprintf(file
, "0,0");
269 fprintf(file
, "1,%d", count
);
274 static void copy_file_with_prefix(FILE *file
,
275 int prefix
, const char *data
, int size
,
276 const char *set
, const char *reset
)
278 int ch
, nl_just_seen
= 1;
293 fprintf(file
, "%s\n\\ No newline at end of file\n", reset
);
296 static void emit_rewrite_diff(const char *name_a
,
298 struct diff_filespec
*one
,
299 struct diff_filespec
*two
,
300 struct diff_options
*o
)
303 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
304 const char *name_a_tab
, *name_b_tab
;
305 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
306 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
307 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
308 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
309 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
310 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
312 name_a
+= (*name_a
== '/');
313 name_b
+= (*name_b
== '/');
314 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
315 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
317 strbuf_reset(&a_name
);
318 strbuf_reset(&b_name
);
319 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
320 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
322 diff_populate_filespec(one
, 0);
323 diff_populate_filespec(two
, 0);
324 lc_a
= count_lines(one
->data
, one
->size
);
325 lc_b
= count_lines(two
->data
, two
->size
);
327 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
328 metainfo
, a_name
.buf
, name_a_tab
, reset
,
329 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
330 print_line_count(o
->file
, lc_a
);
331 fprintf(o
->file
, " +");
332 print_line_count(o
->file
, lc_b
);
333 fprintf(o
->file
, " @@%s\n", reset
);
335 copy_file_with_prefix(o
->file
, '-', one
->data
, one
->size
, old
, reset
);
337 copy_file_with_prefix(o
->file
, '+', two
->data
, two
->size
, new, reset
);
340 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
342 if (!DIFF_FILE_VALID(one
)) {
343 mf
->ptr
= (char *)""; /* does not matter */
347 else if (diff_populate_filespec(one
, 0))
350 mf
->size
= one
->size
;
354 struct diff_words_buffer
{
357 long current
; /* output pointer */
358 int suppressed_newline
;
361 static void diff_words_append(char *line
, unsigned long len
,
362 struct diff_words_buffer
*buffer
)
364 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
365 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
366 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
370 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
371 buffer
->text
.size
+= len
;
374 struct diff_words_data
{
375 struct xdiff_emit_state xm
;
376 struct diff_words_buffer minus
, plus
;
380 static void print_word(FILE *file
, struct diff_words_buffer
*buffer
, int len
, int color
,
381 int suppress_newline
)
389 ptr
= buffer
->text
.ptr
+ buffer
->current
;
390 buffer
->current
+= len
;
392 if (ptr
[len
- 1] == '\n') {
397 fputs(diff_get_color(1, color
), file
);
398 fwrite(ptr
, len
, 1, file
);
399 fputs(diff_get_color(1, DIFF_RESET
), file
);
402 if (suppress_newline
)
403 buffer
->suppressed_newline
= 1;
409 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
411 struct diff_words_data
*diff_words
= priv
;
413 if (diff_words
->minus
.suppressed_newline
) {
415 putc('\n', diff_words
->file
);
416 diff_words
->minus
.suppressed_newline
= 0;
422 print_word(diff_words
->file
,
423 &diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
426 print_word(diff_words
->file
,
427 &diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
430 print_word(diff_words
->file
,
431 &diff_words
->plus
, len
, DIFF_PLAIN
, 0);
432 diff_words
->minus
.current
+= len
;
437 /* this executes the word diff on the accumulated buffers */
438 static void diff_words_show(struct diff_words_data
*diff_words
)
443 mmfile_t minus
, plus
;
446 memset(&xecfg
, 0, sizeof(xecfg
));
447 minus
.size
= diff_words
->minus
.text
.size
;
448 minus
.ptr
= xmalloc(minus
.size
);
449 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
450 for (i
= 0; i
< minus
.size
; i
++)
451 if (isspace(minus
.ptr
[i
]))
453 diff_words
->minus
.current
= 0;
455 plus
.size
= diff_words
->plus
.text
.size
;
456 plus
.ptr
= xmalloc(plus
.size
);
457 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
458 for (i
= 0; i
< plus
.size
; i
++)
459 if (isspace(plus
.ptr
[i
]))
461 diff_words
->plus
.current
= 0;
463 xpp
.flags
= XDF_NEED_MINIMAL
;
464 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
465 ecb
.outf
= xdiff_outf
;
466 ecb
.priv
= diff_words
;
467 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
468 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
472 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
474 if (diff_words
->minus
.suppressed_newline
) {
475 putc('\n', diff_words
->file
);
476 diff_words
->minus
.suppressed_newline
= 0;
480 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
482 struct emit_callback
{
483 struct xdiff_emit_state xm
;
484 int nparents
, color_diff
;
486 sane_truncate_fn truncate
;
487 const char **label_path
;
488 struct diff_words_data
*diff_words
;
493 static void free_diff_words_data(struct emit_callback
*ecbdata
)
495 if (ecbdata
->diff_words
) {
497 if (ecbdata
->diff_words
->minus
.text
.size
||
498 ecbdata
->diff_words
->plus
.text
.size
)
499 diff_words_show(ecbdata
->diff_words
);
501 free (ecbdata
->diff_words
->minus
.text
.ptr
);
502 free (ecbdata
->diff_words
->plus
.text
.ptr
);
503 free(ecbdata
->diff_words
);
504 ecbdata
->diff_words
= NULL
;
508 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
511 return diff_colors
[ix
];
515 static void emit_line(FILE *file
, const char *set
, const char *reset
, const char *line
, int len
)
517 int has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
518 if (has_trailing_newline
)
522 fwrite(line
, len
, 1, file
);
524 if (has_trailing_newline
)
528 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
530 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
531 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
534 emit_line(ecbdata
->file
, set
, reset
, line
, len
);
536 /* Emit just the prefix, then the rest. */
537 emit_line(ecbdata
->file
, set
, reset
, line
, ecbdata
->nparents
);
538 ws_check_emit(line
+ ecbdata
->nparents
,
539 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
540 ecbdata
->file
, set
, reset
, ws
);
544 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
551 return ecb
->truncate(line
, len
);
555 (void) utf8_width(&cp
, &l
);
557 break; /* truncated in the middle? */
562 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
566 struct emit_callback
*ecbdata
= priv
;
567 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
568 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
569 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
571 *(ecbdata
->found_changesp
) = 1;
573 if (ecbdata
->label_path
[0]) {
574 const char *name_a_tab
, *name_b_tab
;
576 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
577 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
579 fprintf(ecbdata
->file
, "%s--- %s%s%s\n",
580 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
581 fprintf(ecbdata
->file
, "%s+++ %s%s%s\n",
582 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
583 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
586 /* This is not really necessary for now because
587 * this codepath only deals with two-way diffs.
589 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
591 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
592 ecbdata
->nparents
= i
- 1;
593 len
= sane_truncate_line(ecbdata
, line
, len
);
594 emit_line(ecbdata
->file
,
595 diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
597 if (line
[len
-1] != '\n')
598 putc('\n', ecbdata
->file
);
602 if (len
< ecbdata
->nparents
) {
603 emit_line(ecbdata
->file
, reset
, reset
, line
, len
);
608 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
609 /* fall back to normal diff */
610 free_diff_words_data(ecbdata
);
611 if (ecbdata
->diff_words
) {
612 if (line
[0] == '-') {
613 diff_words_append(line
, len
,
614 &ecbdata
->diff_words
->minus
);
616 } else if (line
[0] == '+') {
617 diff_words_append(line
, len
,
618 &ecbdata
->diff_words
->plus
);
621 if (ecbdata
->diff_words
->minus
.text
.size
||
622 ecbdata
->diff_words
->plus
.text
.size
)
623 diff_words_show(ecbdata
->diff_words
);
626 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
629 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
631 color
= DIFF_FILE_OLD
;
632 else if (line
[i
] == '+')
633 color
= DIFF_FILE_NEW
;
636 if (color
!= DIFF_FILE_NEW
) {
637 emit_line(ecbdata
->file
,
638 diff_get_color(ecbdata
->color_diff
, color
),
642 emit_add_line(reset
, ecbdata
, line
, len
);
645 static char *pprint_rename(const char *a
, const char *b
)
650 int pfx_length
, sfx_length
;
651 int len_a
= strlen(a
);
652 int len_b
= strlen(b
);
653 int a_midlen
, b_midlen
;
654 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
655 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
657 strbuf_init(&name
, 0);
658 if (qlen_a
|| qlen_b
) {
659 quote_c_style(a
, &name
, NULL
, 0);
660 strbuf_addstr(&name
, " => ");
661 quote_c_style(b
, &name
, NULL
, 0);
662 return strbuf_detach(&name
, NULL
);
665 /* Find common prefix */
667 while (*old
&& *new && *old
== *new) {
669 pfx_length
= old
- a
+ 1;
674 /* Find common suffix */
678 while (a
<= old
&& b
<= new && *old
== *new) {
680 sfx_length
= len_a
- (old
- a
);
686 * pfx{mid-a => mid-b}sfx
687 * {pfx-a => pfx-b}sfx
688 * pfx{sfx-a => sfx-b}
691 a_midlen
= len_a
- pfx_length
- sfx_length
;
692 b_midlen
= len_b
- pfx_length
- sfx_length
;
698 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
699 if (pfx_length
+ sfx_length
) {
700 strbuf_add(&name
, a
, pfx_length
);
701 strbuf_addch(&name
, '{');
703 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
704 strbuf_addstr(&name
, " => ");
705 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
706 if (pfx_length
+ sfx_length
) {
707 strbuf_addch(&name
, '}');
708 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
710 return strbuf_detach(&name
, NULL
);
714 struct xdiff_emit_state xm
;
718 struct diffstat_file
{
722 unsigned is_unmerged
:1;
723 unsigned is_binary
:1;
724 unsigned is_renamed
:1;
725 unsigned int added
, deleted
;
729 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
733 struct diffstat_file
*x
;
734 x
= xcalloc(sizeof (*x
), 1);
735 if (diffstat
->nr
== diffstat
->alloc
) {
736 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
737 diffstat
->files
= xrealloc(diffstat
->files
,
738 diffstat
->alloc
* sizeof(x
));
740 diffstat
->files
[diffstat
->nr
++] = x
;
742 x
->from_name
= xstrdup(name_a
);
743 x
->name
= xstrdup(name_b
);
748 x
->name
= xstrdup(name_a
);
753 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
755 struct diffstat_t
*diffstat
= priv
;
756 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
760 else if (line
[0] == '-')
764 const char mime_boundary_leader
[] = "------------";
766 static int scale_linear(int it
, int width
, int max_change
)
769 * make sure that at least one '-' is printed if there were deletions,
770 * and likewise for '+'.
774 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
777 static void show_name(FILE *file
,
778 const char *prefix
, const char *name
, int len
,
779 const char *reset
, const char *set
)
781 fprintf(file
, " %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
784 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
788 fprintf(file
, "%s", set
);
791 fprintf(file
, "%s", reset
);
794 static void fill_print_name(struct diffstat_file
*file
)
798 if (file
->print_name
)
801 if (!file
->is_renamed
) {
803 strbuf_init(&buf
, 0);
804 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
805 pname
= strbuf_detach(&buf
, NULL
);
808 strbuf_release(&buf
);
811 pname
= pprint_rename(file
->from_name
, file
->name
);
813 file
->print_name
= pname
;
816 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
818 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
819 int max_change
= 0, max_len
= 0;
820 int total_files
= data
->nr
;
821 int width
, name_width
;
822 const char *reset
, *set
, *add_c
, *del_c
;
827 width
= options
->stat_width
? options
->stat_width
: 80;
828 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
830 /* Sanity: give at least 5 columns to the graph,
831 * but leave at least 10 columns for the name.
833 if (width
< name_width
+ 15) {
834 if (name_width
<= 25)
835 width
= name_width
+ 15;
837 name_width
= width
- 15;
840 /* Find the longest filename and max number of changes */
841 reset
= diff_get_color_opt(options
, DIFF_RESET
);
842 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
843 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
844 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
846 for (i
= 0; i
< data
->nr
; i
++) {
847 struct diffstat_file
*file
= data
->files
[i
];
848 int change
= file
->added
+ file
->deleted
;
849 fill_print_name(file
);
850 len
= strlen(file
->print_name
);
854 if (file
->is_binary
|| file
->is_unmerged
)
856 if (max_change
< change
)
860 /* Compute the width of the graph part;
861 * 10 is for one blank at the beginning of the line plus
862 * " | count " between the name and the graph.
864 * From here on, name_width is the width of the name area,
865 * and width is the width of the graph area.
867 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
868 if (width
< (name_width
+ 10) + max_change
)
869 width
= width
- (name_width
+ 10);
873 for (i
= 0; i
< data
->nr
; i
++) {
874 const char *prefix
= "";
875 char *name
= data
->files
[i
]->print_name
;
876 int added
= data
->files
[i
]->added
;
877 int deleted
= data
->files
[i
]->deleted
;
881 * "scale" the filename
884 name_len
= strlen(name
);
885 if (name_width
< name_len
) {
889 name
+= name_len
- len
;
890 slash
= strchr(name
, '/');
895 if (data
->files
[i
]->is_binary
) {
896 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
897 fprintf(options
->file
, " Bin ");
898 fprintf(options
->file
, "%s%d%s", del_c
, deleted
, reset
);
899 fprintf(options
->file
, " -> ");
900 fprintf(options
->file
, "%s%d%s", add_c
, added
, reset
);
901 fprintf(options
->file
, " bytes");
902 fprintf(options
->file
, "\n");
905 else if (data
->files
[i
]->is_unmerged
) {
906 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
907 fprintf(options
->file
, " Unmerged\n");
910 else if (!data
->files
[i
]->is_renamed
&&
911 (added
+ deleted
== 0)) {
917 * scale the add/delete
925 if (width
<= max_change
) {
926 add
= scale_linear(add
, width
, max_change
);
927 del
= scale_linear(del
, width
, max_change
);
930 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
931 fprintf(options
->file
, "%5d%s", added
+ deleted
,
932 added
+ deleted
? " " : "");
933 show_graph(options
->file
, '+', add
, add_c
, reset
);
934 show_graph(options
->file
, '-', del
, del_c
, reset
);
935 fprintf(options
->file
, "\n");
937 fprintf(options
->file
,
938 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
939 set
, total_files
, adds
, dels
, reset
);
942 static void show_shortstats(struct diffstat_t
* data
, struct diff_options
*options
)
944 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
949 for (i
= 0; i
< data
->nr
; i
++) {
950 if (!data
->files
[i
]->is_binary
&&
951 !data
->files
[i
]->is_unmerged
) {
952 int added
= data
->files
[i
]->added
;
953 int deleted
= data
->files
[i
]->deleted
;
954 if (!data
->files
[i
]->is_renamed
&&
955 (added
+ deleted
== 0)) {
963 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
964 total_files
, adds
, dels
);
967 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
974 for (i
= 0; i
< data
->nr
; i
++) {
975 struct diffstat_file
*file
= data
->files
[i
];
978 fprintf(options
->file
, "-\t-\t");
980 fprintf(options
->file
,
981 "%d\t%d\t", file
->added
, file
->deleted
);
982 if (options
->line_termination
) {
983 fill_print_name(file
);
984 if (!file
->is_renamed
)
985 write_name_quoted(file
->name
, options
->file
,
986 options
->line_termination
);
988 fputs(file
->print_name
, options
->file
);
989 putc(options
->line_termination
, options
->file
);
992 if (file
->is_renamed
) {
993 putc('\0', options
->file
);
994 write_name_quoted(file
->from_name
, options
->file
, '\0');
996 write_name_quoted(file
->name
, options
->file
, '\0');
1001 struct dirstat_file
{
1003 unsigned long changed
;
1006 struct dirstat_dir
{
1007 struct dirstat_file
*files
;
1008 int alloc
, nr
, percent
, cumulative
;
1011 static long gather_dirstat(FILE *file
, struct dirstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1013 unsigned long this_dir
= 0;
1014 unsigned int sources
= 0;
1017 struct dirstat_file
*f
= dir
->files
;
1018 int namelen
= strlen(f
->name
);
1022 if (namelen
< baselen
)
1024 if (memcmp(f
->name
, base
, baselen
))
1026 slash
= strchr(f
->name
+ baselen
, '/');
1028 int newbaselen
= slash
+ 1 - f
->name
;
1029 this = gather_dirstat(file
, dir
, changed
, f
->name
, newbaselen
);
1041 * We don't report dirstat's for
1043 * - or cases where everything came from a single directory
1044 * under this directory (sources == 1).
1046 if (baselen
&& sources
!= 1) {
1047 int permille
= this_dir
* 1000 / changed
;
1049 int percent
= permille
/ 10;
1050 if (percent
>= dir
->percent
) {
1051 fprintf(file
, "%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1052 if (!dir
->cumulative
)
1060 static void show_dirstat(struct diff_options
*options
)
1063 unsigned long changed
;
1064 struct dirstat_dir dir
;
1065 struct diff_queue_struct
*q
= &diff_queued_diff
;
1070 dir
.percent
= options
->dirstat_percent
;
1071 dir
.cumulative
= options
->output_format
& DIFF_FORMAT_CUMULATIVE
;
1074 for (i
= 0; i
< q
->nr
; i
++) {
1075 struct diff_filepair
*p
= q
->queue
[i
];
1077 unsigned long copied
, added
, damage
;
1079 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1081 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1082 diff_populate_filespec(p
->one
, 0);
1083 diff_populate_filespec(p
->two
, 0);
1084 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1086 diff_free_filespec_data(p
->one
);
1087 diff_free_filespec_data(p
->two
);
1088 } else if (DIFF_FILE_VALID(p
->one
)) {
1089 diff_populate_filespec(p
->one
, 1);
1091 diff_free_filespec_data(p
->one
);
1092 } else if (DIFF_FILE_VALID(p
->two
)) {
1093 diff_populate_filespec(p
->two
, 1);
1095 added
= p
->two
->size
;
1096 diff_free_filespec_data(p
->two
);
1101 * Original minus copied is the removed material,
1102 * added is the new material. They are both damages
1103 * made to the preimage.
1105 damage
= (p
->one
->size
- copied
) + added
;
1107 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1108 dir
.files
[dir
.nr
].name
= name
;
1109 dir
.files
[dir
.nr
].changed
= damage
;
1114 /* This can happen even with many files, if everything was renames */
1118 /* Show all directories with more than x% of the changes */
1119 gather_dirstat(options
->file
, &dir
, changed
, "", 0);
1122 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1125 for (i
= 0; i
< diffstat
->nr
; i
++) {
1126 struct diffstat_file
*f
= diffstat
->files
[i
];
1127 if (f
->name
!= f
->print_name
)
1128 free(f
->print_name
);
1133 free(diffstat
->files
);
1136 struct checkdiff_t
{
1137 struct xdiff_emit_state xm
;
1138 const char *filename
;
1140 struct diff_options
*o
;
1143 int trailing_blanks_start
;
1146 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1148 struct checkdiff_t
*data
= priv
;
1149 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1150 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1151 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1152 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1155 if (line
[0] == '+') {
1158 if (!ws_blank_line(line
+ 1, len
- 1, data
->ws_rule
))
1159 data
->trailing_blanks_start
= 0;
1160 else if (!data
->trailing_blanks_start
)
1161 data
->trailing_blanks_start
= data
->lineno
;
1162 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1165 data
->status
|= bad
;
1166 err
= whitespace_error_string(bad
);
1167 fprintf(data
->o
->file
, "%s:%d: %s.\n",
1168 data
->filename
, data
->lineno
, err
);
1170 emit_line(data
->o
->file
, set
, reset
, line
, 1);
1171 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1172 data
->o
->file
, set
, reset
, ws
);
1173 } else if (line
[0] == ' ') {
1175 data
->trailing_blanks_start
= 0;
1176 } else if (line
[0] == '@') {
1177 char *plus
= strchr(line
, '+');
1179 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1181 die("invalid diff");
1182 data
->trailing_blanks_start
= 0;
1186 static unsigned char *deflate_it(char *data
,
1188 unsigned long *result_size
)
1191 unsigned char *deflated
;
1194 memset(&stream
, 0, sizeof(stream
));
1195 deflateInit(&stream
, zlib_compression_level
);
1196 bound
= deflateBound(&stream
, size
);
1197 deflated
= xmalloc(bound
);
1198 stream
.next_out
= deflated
;
1199 stream
.avail_out
= bound
;
1201 stream
.next_in
= (unsigned char *)data
;
1202 stream
.avail_in
= size
;
1203 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1205 deflateEnd(&stream
);
1206 *result_size
= stream
.total_out
;
1210 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1216 unsigned long orig_size
;
1217 unsigned long delta_size
;
1218 unsigned long deflate_size
;
1219 unsigned long data_size
;
1221 /* We could do deflated delta, or we could do just deflated two,
1222 * whichever is smaller.
1225 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1226 if (one
->size
&& two
->size
) {
1227 delta
= diff_delta(one
->ptr
, one
->size
,
1228 two
->ptr
, two
->size
,
1229 &delta_size
, deflate_size
);
1231 void *to_free
= delta
;
1232 orig_size
= delta_size
;
1233 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1238 if (delta
&& delta_size
< deflate_size
) {
1239 fprintf(file
, "delta %lu\n", orig_size
);
1242 data_size
= delta_size
;
1245 fprintf(file
, "literal %lu\n", two
->size
);
1248 data_size
= deflate_size
;
1251 /* emit data encoded in base85 */
1254 int bytes
= (52 < data_size
) ? 52 : data_size
;
1258 line
[0] = bytes
+ 'A' - 1;
1260 line
[0] = bytes
- 26 + 'a' - 1;
1261 encode_85(line
+ 1, cp
, bytes
);
1262 cp
= (char *) cp
+ bytes
;
1266 fprintf(file
, "\n");
1270 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1272 fprintf(file
, "GIT binary patch\n");
1273 emit_binary_diff_body(file
, one
, two
);
1274 emit_binary_diff_body(file
, two
, one
);
1277 static void setup_diff_attr_check(struct git_attr_check
*check
)
1279 static struct git_attr
*attr_diff
;
1282 attr_diff
= git_attr("diff", 4);
1284 check
[0].attr
= attr_diff
;
1287 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1289 struct git_attr_check attr_diff_check
;
1290 int check_from_data
= 0;
1292 if (one
->checked_attr
)
1295 setup_diff_attr_check(&attr_diff_check
);
1297 one
->funcname_pattern_ident
= NULL
;
1299 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1303 value
= attr_diff_check
.value
;
1304 if (ATTR_TRUE(value
))
1306 else if (ATTR_FALSE(value
))
1309 check_from_data
= 1;
1311 /* funcname pattern ident */
1312 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1315 one
->funcname_pattern_ident
= value
;
1318 if (check_from_data
) {
1319 if (!one
->data
&& DIFF_FILE_VALID(one
))
1320 diff_populate_filespec(one
, 0);
1323 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1327 int diff_filespec_is_binary(struct diff_filespec
*one
)
1329 diff_filespec_check_attr(one
);
1330 return one
->is_binary
;
1333 static const char *funcname_pattern(const char *ident
)
1335 struct funcname_pattern
*pp
;
1337 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1338 if (!strcmp(ident
, pp
->name
))
1343 static struct builtin_funcname_pattern
{
1345 const char *pattern
;
1346 } builtin_funcname_pattern
[] = {
1347 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1348 "new\\|return\\|switch\\|throw\\|while\\)\n"
1350 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1352 { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
1355 static const char *diff_funcname_pattern(struct diff_filespec
*one
)
1357 const char *ident
, *pattern
;
1360 diff_filespec_check_attr(one
);
1361 ident
= one
->funcname_pattern_ident
;
1365 * If the config file has "funcname.default" defined, that
1366 * regexp is used; otherwise NULL is returned and xemit uses
1367 * the built-in default.
1369 return funcname_pattern("default");
1371 /* Look up custom "funcname.$ident" regexp from config. */
1372 pattern
= funcname_pattern(ident
);
1377 * And define built-in fallback patterns here. Note that
1378 * these can be overridden by the user's config settings.
1380 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1381 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1382 return builtin_funcname_pattern
[i
].pattern
;
1387 static void builtin_diff(const char *name_a
,
1389 struct diff_filespec
*one
,
1390 struct diff_filespec
*two
,
1391 const char *xfrm_msg
,
1392 struct diff_options
*o
,
1393 int complete_rewrite
)
1397 char *a_one
, *b_two
;
1398 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1399 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1401 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1402 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1403 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1404 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1405 fprintf(o
->file
, "%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1406 if (lbl
[0][0] == '/') {
1408 fprintf(o
->file
, "%snew file 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 else if (lbl
[1][0] == '/') {
1413 fprintf(o
->file
, "%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1414 if (xfrm_msg
&& xfrm_msg
[0])
1415 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1418 if (one
->mode
!= two
->mode
) {
1419 fprintf(o
->file
, "%sold mode %06o%s\n", set
, one
->mode
, reset
);
1420 fprintf(o
->file
, "%snew mode %06o%s\n", set
, two
->mode
, reset
);
1422 if (xfrm_msg
&& xfrm_msg
[0])
1423 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1425 * we do not run diff between different kind
1428 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1429 goto free_ab_and_return
;
1430 if (complete_rewrite
) {
1431 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1432 o
->found_changes
= 1;
1433 goto free_ab_and_return
;
1437 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1438 die("unable to read files to diff");
1440 if (!DIFF_OPT_TST(o
, TEXT
) &&
1441 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1442 /* Quite common confusing case */
1443 if (mf1
.size
== mf2
.size
&&
1444 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1445 goto free_ab_and_return
;
1446 if (DIFF_OPT_TST(o
, BINARY
))
1447 emit_binary_diff(o
->file
, &mf1
, &mf2
);
1449 fprintf(o
->file
, "Binary files %s and %s differ\n",
1451 o
->found_changes
= 1;
1454 /* Crazy xdl interfaces.. */
1455 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1459 struct emit_callback ecbdata
;
1460 const char *funcname_pattern
;
1462 funcname_pattern
= diff_funcname_pattern(one
);
1463 if (!funcname_pattern
)
1464 funcname_pattern
= diff_funcname_pattern(two
);
1466 memset(&xecfg
, 0, sizeof(xecfg
));
1467 memset(&ecbdata
, 0, sizeof(ecbdata
));
1468 ecbdata
.label_path
= lbl
;
1469 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1470 ecbdata
.found_changesp
= &o
->found_changes
;
1471 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1472 ecbdata
.file
= o
->file
;
1473 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1474 xecfg
.ctxlen
= o
->context
;
1475 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1476 if (funcname_pattern
)
1477 xdiff_set_find_func(&xecfg
, funcname_pattern
);
1480 else if (!prefixcmp(diffopts
, "--unified="))
1481 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1482 else if (!prefixcmp(diffopts
, "-u"))
1483 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1484 ecb
.outf
= xdiff_outf
;
1485 ecb
.priv
= &ecbdata
;
1486 ecbdata
.xm
.consume
= fn_out_consume
;
1487 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
)) {
1488 ecbdata
.diff_words
=
1489 xcalloc(1, sizeof(struct diff_words_data
));
1490 ecbdata
.diff_words
->file
= o
->file
;
1492 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1493 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1494 free_diff_words_data(&ecbdata
);
1498 diff_free_filespec_data(one
);
1499 diff_free_filespec_data(two
);
1505 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1506 struct diff_filespec
*one
,
1507 struct diff_filespec
*two
,
1508 struct diffstat_t
*diffstat
,
1509 struct diff_options
*o
,
1510 int complete_rewrite
)
1513 struct diffstat_file
*data
;
1515 data
= diffstat_add(diffstat
, name_a
, name_b
);
1518 data
->is_unmerged
= 1;
1521 if (complete_rewrite
) {
1522 diff_populate_filespec(one
, 0);
1523 diff_populate_filespec(two
, 0);
1524 data
->deleted
= count_lines(one
->data
, one
->size
);
1525 data
->added
= count_lines(two
->data
, two
->size
);
1526 goto free_and_return
;
1528 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1529 die("unable to read files to diff");
1531 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1532 data
->is_binary
= 1;
1533 data
->added
= mf2
.size
;
1534 data
->deleted
= mf1
.size
;
1536 /* Crazy xdl interfaces.. */
1541 memset(&xecfg
, 0, sizeof(xecfg
));
1542 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1543 ecb
.outf
= xdiff_outf
;
1544 ecb
.priv
= diffstat
;
1545 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1549 diff_free_filespec_data(one
);
1550 diff_free_filespec_data(two
);
1553 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1554 const char *attr_path
,
1555 struct diff_filespec
*one
,
1556 struct diff_filespec
*two
,
1557 struct diff_options
*o
)
1560 struct checkdiff_t data
;
1565 memset(&data
, 0, sizeof(data
));
1566 data
.xm
.consume
= checkdiff_consume
;
1567 data
.filename
= name_b
? name_b
: name_a
;
1570 data
.ws_rule
= whitespace_rule(attr_path
);
1572 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1573 die("unable to read files to diff");
1576 * All the other codepaths check both sides, but not checking
1577 * the "old" side here is deliberate. We are checking the newly
1578 * introduced changes, and as long as the "new" side is text, we
1579 * can and should check what it introduces.
1581 if (diff_filespec_is_binary(two
))
1582 goto free_and_return
;
1584 /* Crazy xdl interfaces.. */
1589 memset(&xecfg
, 0, sizeof(xecfg
));
1590 xpp
.flags
= XDF_NEED_MINIMAL
;
1591 ecb
.outf
= xdiff_outf
;
1593 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1595 if (data
.trailing_blanks_start
) {
1596 fprintf(o
->file
, "%s:%d: ends with blank lines.\n",
1597 data
.filename
, data
.trailing_blanks_start
);
1598 data
.status
= 1; /* report errors */
1602 diff_free_filespec_data(one
);
1603 diff_free_filespec_data(two
);
1605 DIFF_OPT_SET(o
, CHECK_FAILED
);
1608 struct diff_filespec
*alloc_filespec(const char *path
)
1610 int namelen
= strlen(path
);
1611 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1613 memset(spec
, 0, sizeof(*spec
));
1614 spec
->path
= (char *)(spec
+ 1);
1615 memcpy(spec
->path
, path
, namelen
+1);
1620 void free_filespec(struct diff_filespec
*spec
)
1622 if (!--spec
->count
) {
1623 diff_free_filespec_data(spec
);
1628 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1629 unsigned short mode
)
1632 spec
->mode
= canon_mode(mode
);
1633 hashcpy(spec
->sha1
, sha1
);
1634 spec
->sha1_valid
= !is_null_sha1(sha1
);
1639 * Given a name and sha1 pair, if the index tells us the file in
1640 * the work tree has that object contents, return true, so that
1641 * prepare_temp_file() does not have to inflate and extract.
1643 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1645 struct cache_entry
*ce
;
1649 /* We do not read the cache ourselves here, because the
1650 * benchmark with my previous version that always reads cache
1651 * shows that it makes things worse for diff-tree comparing
1652 * two linux-2.6 kernel trees in an already checked out work
1653 * tree. This is because most diff-tree comparisons deal with
1654 * only a small number of files, while reading the cache is
1655 * expensive for a large project, and its cost outweighs the
1656 * savings we get by not inflating the object to a temporary
1657 * file. Practically, this code only helps when we are used
1658 * by diff-cache --cached, which does read the cache before
1664 /* We want to avoid the working directory if our caller
1665 * doesn't need the data in a normal file, this system
1666 * is rather slow with its stat/open/mmap/close syscalls,
1667 * and the object is contained in a pack file. The pack
1668 * is probably already open and will be faster to obtain
1669 * the data through than the working directory. Loose
1670 * objects however would tend to be slower as they need
1671 * to be individually opened and inflated.
1673 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1677 pos
= cache_name_pos(name
, len
);
1680 ce
= active_cache
[pos
];
1683 * This is not the sha1 we are looking for, or
1684 * unreusable because it is not a regular file.
1686 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1690 * If ce matches the file in the work tree, we can reuse it.
1692 if (ce_uptodate(ce
) ||
1693 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1699 static int populate_from_stdin(struct diff_filespec
*s
)
1704 strbuf_init(&buf
, 0);
1705 if (strbuf_read(&buf
, 0, 0) < 0)
1706 return error("error while reading from stdin %s",
1709 s
->should_munmap
= 0;
1710 s
->data
= strbuf_detach(&buf
, &size
);
1716 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1719 char *data
= xmalloc(100);
1720 len
= snprintf(data
, 100,
1721 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1733 * While doing rename detection and pickaxe operation, we may need to
1734 * grab the data for the blob (or file) for our own in-core comparison.
1735 * diff_filespec has data and size fields for this purpose.
1737 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1740 if (!DIFF_FILE_VALID(s
))
1741 die("internal error: asking to populate invalid file.");
1742 if (S_ISDIR(s
->mode
))
1748 if (size_only
&& 0 < s
->size
)
1751 if (S_ISGITLINK(s
->mode
))
1752 return diff_populate_gitlink(s
, size_only
);
1754 if (!s
->sha1_valid
||
1755 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1760 if (!strcmp(s
->path
, "-"))
1761 return populate_from_stdin(s
);
1763 if (lstat(s
->path
, &st
) < 0) {
1764 if (errno
== ENOENT
) {
1768 s
->data
= (char *)"";
1773 s
->size
= xsize_t(st
.st_size
);
1778 if (S_ISLNK(st
.st_mode
)) {
1780 s
->data
= xmalloc(s
->size
);
1782 ret
= readlink(s
->path
, s
->data
, s
->size
);
1789 fd
= open(s
->path
, O_RDONLY
);
1792 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1794 s
->should_munmap
= 1;
1797 * Convert from working tree format to canonical git format
1799 strbuf_init(&buf
, 0);
1800 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
1802 munmap(s
->data
, s
->size
);
1803 s
->should_munmap
= 0;
1804 s
->data
= strbuf_detach(&buf
, &size
);
1810 enum object_type type
;
1812 type
= sha1_object_info(s
->sha1
, &s
->size
);
1814 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1821 void diff_free_filespec_blob(struct diff_filespec
*s
)
1825 else if (s
->should_munmap
)
1826 munmap(s
->data
, s
->size
);
1828 if (s
->should_free
|| s
->should_munmap
) {
1829 s
->should_free
= s
->should_munmap
= 0;
1834 void diff_free_filespec_data(struct diff_filespec
*s
)
1836 diff_free_filespec_blob(s
);
1841 static void prep_temp_blob(struct diff_tempfile
*temp
,
1844 const unsigned char *sha1
,
1849 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1851 die("unable to create temp-file: %s", strerror(errno
));
1852 if (write_in_full(fd
, blob
, size
) != size
)
1853 die("unable to write temp-file");
1855 temp
->name
= temp
->tmp_path
;
1856 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1858 sprintf(temp
->mode
, "%06o", mode
);
1861 static void prepare_temp_file(const char *name
,
1862 struct diff_tempfile
*temp
,
1863 struct diff_filespec
*one
)
1865 if (!DIFF_FILE_VALID(one
)) {
1867 /* A '-' entry produces this for file-2, and
1868 * a '+' entry produces this for file-1.
1870 temp
->name
= "/dev/null";
1871 strcpy(temp
->hex
, ".");
1872 strcpy(temp
->mode
, ".");
1876 if (!one
->sha1_valid
||
1877 reuse_worktree_file(name
, one
->sha1
, 1)) {
1879 if (lstat(name
, &st
) < 0) {
1880 if (errno
== ENOENT
)
1881 goto not_a_valid_file
;
1882 die("stat(%s): %s", name
, strerror(errno
));
1884 if (S_ISLNK(st
.st_mode
)) {
1886 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1887 size_t sz
= xsize_t(st
.st_size
);
1888 if (sizeof(buf
) <= st
.st_size
)
1889 die("symlink too long: %s", name
);
1890 ret
= readlink(name
, buf
, sz
);
1892 die("readlink(%s)", name
);
1893 prep_temp_blob(temp
, buf
, sz
,
1895 one
->sha1
: null_sha1
),
1897 one
->mode
: S_IFLNK
));
1900 /* we can borrow from the file in the work tree */
1902 if (!one
->sha1_valid
)
1903 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1905 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1906 /* Even though we may sometimes borrow the
1907 * contents from the work tree, we always want
1908 * one->mode. mode is trustworthy even when
1909 * !(one->sha1_valid), as long as
1910 * DIFF_FILE_VALID(one).
1912 sprintf(temp
->mode
, "%06o", one
->mode
);
1917 if (diff_populate_filespec(one
, 0))
1918 die("cannot read data blob for %s", one
->path
);
1919 prep_temp_blob(temp
, one
->data
, one
->size
,
1920 one
->sha1
, one
->mode
);
1924 static void remove_tempfile(void)
1928 for (i
= 0; i
< 2; i
++)
1929 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1930 unlink(diff_temp
[i
].name
);
1931 diff_temp
[i
].name
= NULL
;
1935 static void remove_tempfile_on_signal(int signo
)
1938 signal(SIGINT
, SIG_DFL
);
1942 /* An external diff command takes:
1944 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1945 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1948 static void run_external_diff(const char *pgm
,
1951 struct diff_filespec
*one
,
1952 struct diff_filespec
*two
,
1953 const char *xfrm_msg
,
1954 int complete_rewrite
)
1956 const char *spawn_arg
[10];
1957 struct diff_tempfile
*temp
= diff_temp
;
1959 static int atexit_asked
= 0;
1960 const char *othername
;
1961 const char **arg
= &spawn_arg
[0];
1963 othername
= (other
? other
: name
);
1965 prepare_temp_file(name
, &temp
[0], one
);
1966 prepare_temp_file(othername
, &temp
[1], two
);
1967 if (! atexit_asked
&&
1968 (temp
[0].name
== temp
[0].tmp_path
||
1969 temp
[1].name
== temp
[1].tmp_path
)) {
1971 atexit(remove_tempfile
);
1973 signal(SIGINT
, remove_tempfile_on_signal
);
1979 *arg
++ = temp
[0].name
;
1980 *arg
++ = temp
[0].hex
;
1981 *arg
++ = temp
[0].mode
;
1982 *arg
++ = temp
[1].name
;
1983 *arg
++ = temp
[1].hex
;
1984 *arg
++ = temp
[1].mode
;
1995 retval
= run_command_v_opt(spawn_arg
, 0);
1998 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2003 static const char *external_diff_attr(const char *name
)
2005 struct git_attr_check attr_diff_check
;
2010 setup_diff_attr_check(&attr_diff_check
);
2011 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
2012 const char *value
= attr_diff_check
.value
;
2013 if (!ATTR_TRUE(value
) &&
2014 !ATTR_FALSE(value
) &&
2015 !ATTR_UNSET(value
)) {
2016 struct ll_diff_driver
*drv
;
2018 for (drv
= user_diff
; drv
; drv
= drv
->next
)
2019 if (!strcmp(drv
->name
, value
))
2026 static void run_diff_cmd(const char *pgm
,
2029 const char *attr_path
,
2030 struct diff_filespec
*one
,
2031 struct diff_filespec
*two
,
2032 const char *xfrm_msg
,
2033 struct diff_options
*o
,
2034 int complete_rewrite
)
2036 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2039 const char *cmd
= external_diff_attr(attr_path
);
2045 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2050 builtin_diff(name
, other
? other
: name
,
2051 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2053 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2056 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2058 if (DIFF_FILE_VALID(one
)) {
2059 if (!one
->sha1_valid
) {
2061 if (!strcmp(one
->path
, "-")) {
2062 hashcpy(one
->sha1
, null_sha1
);
2065 if (lstat(one
->path
, &st
) < 0)
2066 die("stat %s", one
->path
);
2067 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2068 die("cannot hash %s\n", one
->path
);
2075 static int similarity_index(struct diff_filepair
*p
)
2077 return p
->score
* 100 / MAX_SCORE
;
2080 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2082 /* Strip the prefix but do not molest /dev/null and absolute paths */
2083 if (*namep
&& **namep
!= '/')
2084 *namep
+= prefix_length
;
2085 if (*otherp
&& **otherp
!= '/')
2086 *otherp
+= prefix_length
;
2089 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2091 const char *pgm
= external_diff();
2094 struct diff_filespec
*one
= p
->one
;
2095 struct diff_filespec
*two
= p
->two
;
2098 const char *attr_path
;
2099 int complete_rewrite
= 0;
2101 name
= p
->one
->path
;
2102 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2104 if (o
->prefix_length
)
2105 strip_prefix(o
->prefix_length
, &name
, &other
);
2107 if (DIFF_PAIR_UNMERGED(p
)) {
2108 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2109 NULL
, NULL
, NULL
, o
, 0);
2113 diff_fill_sha1_info(one
);
2114 diff_fill_sha1_info(two
);
2116 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
2117 switch (p
->status
) {
2118 case DIFF_STATUS_COPIED
:
2119 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2120 strbuf_addstr(&msg
, "\ncopy from ");
2121 quote_c_style(name
, &msg
, NULL
, 0);
2122 strbuf_addstr(&msg
, "\ncopy to ");
2123 quote_c_style(other
, &msg
, NULL
, 0);
2124 strbuf_addch(&msg
, '\n');
2126 case DIFF_STATUS_RENAMED
:
2127 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2128 strbuf_addstr(&msg
, "\nrename from ");
2129 quote_c_style(name
, &msg
, NULL
, 0);
2130 strbuf_addstr(&msg
, "\nrename to ");
2131 quote_c_style(other
, &msg
, NULL
, 0);
2132 strbuf_addch(&msg
, '\n');
2134 case DIFF_STATUS_MODIFIED
:
2136 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
2137 similarity_index(p
));
2138 complete_rewrite
= 1;
2147 if (hashcmp(one
->sha1
, two
->sha1
)) {
2148 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2150 if (DIFF_OPT_TST(o
, BINARY
)) {
2152 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2153 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2156 strbuf_addf(&msg
, "index %.*s..%.*s",
2157 abbrev
, sha1_to_hex(one
->sha1
),
2158 abbrev
, sha1_to_hex(two
->sha1
));
2159 if (one
->mode
== two
->mode
)
2160 strbuf_addf(&msg
, " %06o", one
->mode
);
2161 strbuf_addch(&msg
, '\n');
2165 strbuf_setlen(&msg
, msg
.len
- 1);
2166 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
2169 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2170 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2171 /* a filepair that changes between file and symlink
2172 * needs to be split into deletion and creation.
2174 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2175 run_diff_cmd(NULL
, name
, other
, attr_path
,
2176 one
, null
, xfrm_msg
, o
, 0);
2178 null
= alloc_filespec(one
->path
);
2179 run_diff_cmd(NULL
, name
, other
, attr_path
,
2180 null
, two
, xfrm_msg
, o
, 0);
2184 run_diff_cmd(pgm
, name
, other
, attr_path
,
2185 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2187 strbuf_release(&msg
);
2190 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2191 struct diffstat_t
*diffstat
)
2195 int complete_rewrite
= 0;
2197 if (DIFF_PAIR_UNMERGED(p
)) {
2199 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2203 name
= p
->one
->path
;
2204 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2206 if (o
->prefix_length
)
2207 strip_prefix(o
->prefix_length
, &name
, &other
);
2209 diff_fill_sha1_info(p
->one
);
2210 diff_fill_sha1_info(p
->two
);
2212 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2213 complete_rewrite
= 1;
2214 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2217 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2221 const char *attr_path
;
2223 if (DIFF_PAIR_UNMERGED(p
)) {
2228 name
= p
->one
->path
;
2229 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2230 attr_path
= other
? other
: name
;
2232 if (o
->prefix_length
)
2233 strip_prefix(o
->prefix_length
, &name
, &other
);
2235 diff_fill_sha1_info(p
->one
);
2236 diff_fill_sha1_info(p
->two
);
2238 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2241 void diff_setup(struct diff_options
*options
)
2243 memset(options
, 0, sizeof(*options
));
2245 options
->file
= stdout
;
2247 options
->line_termination
= '\n';
2248 options
->break_opt
= -1;
2249 options
->rename_limit
= -1;
2250 options
->dirstat_percent
= 3;
2251 options
->context
= 3;
2253 options
->change
= diff_change
;
2254 options
->add_remove
= diff_addremove
;
2255 if (diff_use_color_default
> 0)
2256 DIFF_OPT_SET(options
, COLOR_DIFF
);
2258 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2259 options
->detect_rename
= diff_detect_rename_default
;
2261 options
->a_prefix
= "a/";
2262 options
->b_prefix
= "b/";
2265 int diff_setup_done(struct diff_options
*options
)
2269 if (options
->output_format
& DIFF_FORMAT_NAME
)
2271 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2273 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2275 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2278 die("--name-only, --name-status, --check and -s are mutually exclusive");
2280 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2281 options
->detect_rename
= DIFF_DETECT_COPY
;
2283 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2284 options
->prefix
= NULL
;
2285 if (options
->prefix
)
2286 options
->prefix_length
= strlen(options
->prefix
);
2288 options
->prefix_length
= 0;
2290 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2291 DIFF_FORMAT_NAME_STATUS
|
2292 DIFF_FORMAT_CHECKDIFF
|
2293 DIFF_FORMAT_NO_OUTPUT
))
2294 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2295 DIFF_FORMAT_NUMSTAT
|
2296 DIFF_FORMAT_DIFFSTAT
|
2297 DIFF_FORMAT_SHORTSTAT
|
2298 DIFF_FORMAT_DIRSTAT
|
2299 DIFF_FORMAT_SUMMARY
|
2303 * These cases always need recursive; we do not drop caller-supplied
2304 * recursive bits for other formats here.
2306 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2307 DIFF_FORMAT_NUMSTAT
|
2308 DIFF_FORMAT_DIFFSTAT
|
2309 DIFF_FORMAT_SHORTSTAT
|
2310 DIFF_FORMAT_DIRSTAT
|
2311 DIFF_FORMAT_SUMMARY
|
2312 DIFF_FORMAT_CHECKDIFF
))
2313 DIFF_OPT_SET(options
, RECURSIVE
);
2315 * Also pickaxe would not work very well if you do not say recursive
2317 if (options
->pickaxe
)
2318 DIFF_OPT_SET(options
, RECURSIVE
);
2320 if (options
->detect_rename
&& options
->rename_limit
< 0)
2321 options
->rename_limit
= diff_rename_limit_default
;
2322 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2324 /* read-cache does not die even when it fails
2325 * so it is safe for us to do this here. Also
2326 * it does not smudge active_cache or active_nr
2327 * when it fails, so we do not have to worry about
2328 * cleaning it up ourselves either.
2332 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2333 options
->abbrev
= 40; /* full */
2336 * It does not make sense to show the first hit we happened
2337 * to have found. It does not make sense not to return with
2338 * exit code in such a case either.
2340 if (DIFF_OPT_TST(options
, QUIET
)) {
2341 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2342 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2346 * If we postprocess in diffcore, we cannot simply return
2347 * upon the first hit. We need to run diff as usual.
2349 if (options
->pickaxe
|| options
->filter
)
2350 DIFF_OPT_CLR(options
, QUIET
);
2355 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2365 if (c
== arg_short
) {
2369 if (val
&& isdigit(c
)) {
2371 int n
= strtoul(arg
, &end
, 10);
2382 eq
= strchr(arg
, '=');
2387 if (!len
|| strncmp(arg
, arg_long
, len
))
2392 if (!isdigit(*++eq
))
2394 n
= strtoul(eq
, &end
, 10);
2402 static int diff_scoreopt_parse(const char *opt
);
2404 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2406 const char *arg
= av
[0];
2408 /* Output format options */
2409 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2410 options
->output_format
|= DIFF_FORMAT_PATCH
;
2411 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2412 options
->output_format
|= DIFF_FORMAT_PATCH
;
2413 else if (!strcmp(arg
, "--raw"))
2414 options
->output_format
|= DIFF_FORMAT_RAW
;
2415 else if (!strcmp(arg
, "--patch-with-raw"))
2416 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2417 else if (!strcmp(arg
, "--numstat"))
2418 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2419 else if (!strcmp(arg
, "--shortstat"))
2420 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2421 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2422 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2423 else if (!strcmp(arg
, "--cumulative"))
2424 options
->output_format
|= DIFF_FORMAT_CUMULATIVE
;
2425 else if (!strcmp(arg
, "--check"))
2426 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2427 else if (!strcmp(arg
, "--summary"))
2428 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2429 else if (!strcmp(arg
, "--patch-with-stat"))
2430 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2431 else if (!strcmp(arg
, "--name-only"))
2432 options
->output_format
|= DIFF_FORMAT_NAME
;
2433 else if (!strcmp(arg
, "--name-status"))
2434 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2435 else if (!strcmp(arg
, "-s"))
2436 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2437 else if (!prefixcmp(arg
, "--stat")) {
2439 int width
= options
->stat_width
;
2440 int name_width
= options
->stat_name_width
;
2446 if (!prefixcmp(arg
, "-width="))
2447 width
= strtoul(arg
+ 7, &end
, 10);
2448 else if (!prefixcmp(arg
, "-name-width="))
2449 name_width
= strtoul(arg
+ 12, &end
, 10);
2452 width
= strtoul(arg
+1, &end
, 10);
2454 name_width
= strtoul(end
+1, &end
, 10);
2457 /* Important! This checks all the error cases! */
2460 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2461 options
->stat_name_width
= name_width
;
2462 options
->stat_width
= width
;
2465 /* renames options */
2466 else if (!prefixcmp(arg
, "-B")) {
2467 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2470 else if (!prefixcmp(arg
, "-M")) {
2471 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2473 options
->detect_rename
= DIFF_DETECT_RENAME
;
2475 else if (!prefixcmp(arg
, "-C")) {
2476 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2477 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2478 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2480 options
->detect_rename
= DIFF_DETECT_COPY
;
2482 else if (!strcmp(arg
, "--no-renames"))
2483 options
->detect_rename
= 0;
2484 else if (!strcmp(arg
, "--relative"))
2485 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2486 else if (!prefixcmp(arg
, "--relative=")) {
2487 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2488 options
->prefix
= arg
+ 11;
2492 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2493 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2494 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2495 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2496 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2497 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2500 else if (!strcmp(arg
, "--binary")) {
2501 options
->output_format
|= DIFF_FORMAT_PATCH
;
2502 DIFF_OPT_SET(options
, BINARY
);
2504 else if (!strcmp(arg
, "--full-index"))
2505 DIFF_OPT_SET(options
, FULL_INDEX
);
2506 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2507 DIFF_OPT_SET(options
, TEXT
);
2508 else if (!strcmp(arg
, "-R"))
2509 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2510 else if (!strcmp(arg
, "--find-copies-harder"))
2511 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2512 else if (!strcmp(arg
, "--follow"))
2513 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2514 else if (!strcmp(arg
, "--color"))
2515 DIFF_OPT_SET(options
, COLOR_DIFF
);
2516 else if (!strcmp(arg
, "--no-color"))
2517 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2518 else if (!strcmp(arg
, "--color-words"))
2519 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2520 else if (!strcmp(arg
, "--exit-code"))
2521 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2522 else if (!strcmp(arg
, "--quiet"))
2523 DIFF_OPT_SET(options
, QUIET
);
2524 else if (!strcmp(arg
, "--ext-diff"))
2525 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2526 else if (!strcmp(arg
, "--no-ext-diff"))
2527 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2528 else if (!strcmp(arg
, "--ignore-submodules"))
2529 DIFF_OPT_SET(options
, IGNORE_SUBMODULES
);
2532 else if (!strcmp(arg
, "-z"))
2533 options
->line_termination
= 0;
2534 else if (!prefixcmp(arg
, "-l"))
2535 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2536 else if (!prefixcmp(arg
, "-S"))
2537 options
->pickaxe
= arg
+ 2;
2538 else if (!strcmp(arg
, "--pickaxe-all"))
2539 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2540 else if (!strcmp(arg
, "--pickaxe-regex"))
2541 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2542 else if (!prefixcmp(arg
, "-O"))
2543 options
->orderfile
= arg
+ 2;
2544 else if (!prefixcmp(arg
, "--diff-filter="))
2545 options
->filter
= arg
+ 14;
2546 else if (!strcmp(arg
, "--abbrev"))
2547 options
->abbrev
= DEFAULT_ABBREV
;
2548 else if (!prefixcmp(arg
, "--abbrev=")) {
2549 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2550 if (options
->abbrev
< MINIMUM_ABBREV
)
2551 options
->abbrev
= MINIMUM_ABBREV
;
2552 else if (40 < options
->abbrev
)
2553 options
->abbrev
= 40;
2555 else if (!prefixcmp(arg
, "--src-prefix="))
2556 options
->a_prefix
= arg
+ 13;
2557 else if (!prefixcmp(arg
, "--dst-prefix="))
2558 options
->b_prefix
= arg
+ 13;
2559 else if (!strcmp(arg
, "--no-prefix"))
2560 options
->a_prefix
= options
->b_prefix
= "";
2561 else if (!prefixcmp(arg
, "--output=")) {
2562 options
->file
= fopen(arg
+ strlen("--output="), "w");
2563 options
->close_file
= 1;
2569 static int parse_num(const char **cp_p
)
2571 unsigned long num
, scale
;
2573 const char *cp
= *cp_p
;
2580 if ( !dot
&& ch
== '.' ) {
2583 } else if ( ch
== '%' ) {
2584 scale
= dot
? scale
*100 : 100;
2585 cp
++; /* % is always at the end */
2587 } else if ( ch
>= '0' && ch
<= '9' ) {
2588 if ( scale
< 100000 ) {
2590 num
= (num
*10) + (ch
-'0');
2599 /* user says num divided by scale and we say internally that
2600 * is MAX_SCORE * num / scale.
2602 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2605 static int diff_scoreopt_parse(const char *opt
)
2607 int opt1
, opt2
, cmd
;
2612 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2613 return -1; /* that is not a -M, -C nor -B option */
2615 opt1
= parse_num(&opt
);
2621 else if (*opt
!= '/')
2622 return -1; /* we expect -B80/99 or -B80 */
2625 opt2
= parse_num(&opt
);
2630 return opt1
| (opt2
<< 16);
2633 struct diff_queue_struct diff_queued_diff
;
2635 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2637 if (queue
->alloc
<= queue
->nr
) {
2638 queue
->alloc
= alloc_nr(queue
->alloc
);
2639 queue
->queue
= xrealloc(queue
->queue
,
2640 sizeof(dp
) * queue
->alloc
);
2642 queue
->queue
[queue
->nr
++] = dp
;
2645 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2646 struct diff_filespec
*one
,
2647 struct diff_filespec
*two
)
2649 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2657 void diff_free_filepair(struct diff_filepair
*p
)
2659 free_filespec(p
->one
);
2660 free_filespec(p
->two
);
2664 /* This is different from find_unique_abbrev() in that
2665 * it stuffs the result with dots for alignment.
2667 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2672 return sha1_to_hex(sha1
);
2674 abbrev
= find_unique_abbrev(sha1
, len
);
2675 abblen
= strlen(abbrev
);
2677 static char hex
[41];
2678 if (len
< abblen
&& abblen
<= len
+ 2)
2679 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2681 sprintf(hex
, "%s...", abbrev
);
2684 return sha1_to_hex(sha1
);
2687 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2689 int line_termination
= opt
->line_termination
;
2690 int inter_name_termination
= line_termination
? '\t' : '\0';
2692 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2693 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2694 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2695 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2698 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
2699 inter_name_termination
);
2701 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
2704 if (p
->status
== DIFF_STATUS_COPIED
||
2705 p
->status
== DIFF_STATUS_RENAMED
) {
2706 const char *name_a
, *name_b
;
2707 name_a
= p
->one
->path
;
2708 name_b
= p
->two
->path
;
2709 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2710 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
2711 write_name_quoted(name_b
, opt
->file
, line_termination
);
2713 const char *name_a
, *name_b
;
2714 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2716 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2717 write_name_quoted(name_a
, opt
->file
, line_termination
);
2721 int diff_unmodified_pair(struct diff_filepair
*p
)
2723 /* This function is written stricter than necessary to support
2724 * the currently implemented transformers, but the idea is to
2725 * let transformers to produce diff_filepairs any way they want,
2726 * and filter and clean them up here before producing the output.
2728 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2730 if (DIFF_PAIR_UNMERGED(p
))
2731 return 0; /* unmerged is interesting */
2733 /* deletion, addition, mode or type change
2734 * and rename are all interesting.
2736 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2737 DIFF_PAIR_MODE_CHANGED(p
) ||
2738 strcmp(one
->path
, two
->path
))
2741 /* both are valid and point at the same path. that is, we are
2742 * dealing with a change.
2744 if (one
->sha1_valid
&& two
->sha1_valid
&&
2745 !hashcmp(one
->sha1
, two
->sha1
))
2746 return 1; /* no change */
2747 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2748 return 1; /* both look at the same file on the filesystem. */
2752 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2754 if (diff_unmodified_pair(p
))
2757 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2758 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2759 return; /* no tree diffs in patch format */
2764 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2765 struct diffstat_t
*diffstat
)
2767 if (diff_unmodified_pair(p
))
2770 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2771 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2772 return; /* no tree diffs in patch format */
2774 run_diffstat(p
, o
, diffstat
);
2777 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2778 struct diff_options
*o
)
2780 if (diff_unmodified_pair(p
))
2783 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2784 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2785 return; /* no tree diffs in patch format */
2787 run_checkdiff(p
, o
);
2790 int diff_queue_is_empty(void)
2792 struct diff_queue_struct
*q
= &diff_queued_diff
;
2794 for (i
= 0; i
< q
->nr
; i
++)
2795 if (!diff_unmodified_pair(q
->queue
[i
]))
2801 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2803 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2806 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2808 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2809 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2811 s
->size
, s
->xfrm_flags
);
2814 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2816 diff_debug_filespec(p
->one
, i
, "one");
2817 diff_debug_filespec(p
->two
, i
, "two");
2818 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2819 p
->score
, p
->status
? p
->status
: '?',
2820 p
->one
->rename_used
, p
->broken_pair
);
2823 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2827 fprintf(stderr
, "%s\n", msg
);
2828 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2829 for (i
= 0; i
< q
->nr
; i
++) {
2830 struct diff_filepair
*p
= q
->queue
[i
];
2831 diff_debug_filepair(p
, i
);
2836 static void diff_resolve_rename_copy(void)
2839 struct diff_filepair
*p
;
2840 struct diff_queue_struct
*q
= &diff_queued_diff
;
2842 diff_debug_queue("resolve-rename-copy", q
);
2844 for (i
= 0; i
< q
->nr
; i
++) {
2846 p
->status
= 0; /* undecided */
2847 if (DIFF_PAIR_UNMERGED(p
))
2848 p
->status
= DIFF_STATUS_UNMERGED
;
2849 else if (!DIFF_FILE_VALID(p
->one
))
2850 p
->status
= DIFF_STATUS_ADDED
;
2851 else if (!DIFF_FILE_VALID(p
->two
))
2852 p
->status
= DIFF_STATUS_DELETED
;
2853 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2854 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2856 /* from this point on, we are dealing with a pair
2857 * whose both sides are valid and of the same type, i.e.
2858 * either in-place edit or rename/copy edit.
2860 else if (DIFF_PAIR_RENAME(p
)) {
2862 * A rename might have re-connected a broken
2863 * pair up, causing the pathnames to be the
2864 * same again. If so, that's not a rename at
2865 * all, just a modification..
2867 * Otherwise, see if this source was used for
2868 * multiple renames, in which case we decrement
2869 * the count, and call it a copy.
2871 if (!strcmp(p
->one
->path
, p
->two
->path
))
2872 p
->status
= DIFF_STATUS_MODIFIED
;
2873 else if (--p
->one
->rename_used
> 0)
2874 p
->status
= DIFF_STATUS_COPIED
;
2876 p
->status
= DIFF_STATUS_RENAMED
;
2878 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2879 p
->one
->mode
!= p
->two
->mode
||
2880 is_null_sha1(p
->one
->sha1
))
2881 p
->status
= DIFF_STATUS_MODIFIED
;
2883 /* This is a "no-change" entry and should not
2884 * happen anymore, but prepare for broken callers.
2886 error("feeding unmodified %s to diffcore",
2888 p
->status
= DIFF_STATUS_UNKNOWN
;
2891 diff_debug_queue("resolve-rename-copy done", q
);
2894 static int check_pair_status(struct diff_filepair
*p
)
2896 switch (p
->status
) {
2897 case DIFF_STATUS_UNKNOWN
:
2900 die("internal error in diff-resolve-rename-copy");
2906 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2908 int fmt
= opt
->output_format
;
2910 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2911 diff_flush_checkdiff(p
, opt
);
2912 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2913 diff_flush_raw(p
, opt
);
2914 else if (fmt
& DIFF_FORMAT_NAME
) {
2915 const char *name_a
, *name_b
;
2916 name_a
= p
->two
->path
;
2918 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2919 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
2923 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
2926 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
2928 fprintf(file
, " %s ", newdelete
);
2929 write_name_quoted(fs
->path
, file
, '\n');
2933 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
)
2935 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2936 fprintf(file
, " mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2937 show_name
? ' ' : '\n');
2939 write_name_quoted(p
->two
->path
, file
, '\n');
2944 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
)
2946 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2948 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
2950 show_mode_change(file
, p
, 0);
2953 static void diff_summary(FILE *file
, struct diff_filepair
*p
)
2956 case DIFF_STATUS_DELETED
:
2957 show_file_mode_name(file
, "delete", p
->one
);
2959 case DIFF_STATUS_ADDED
:
2960 show_file_mode_name(file
, "create", p
->two
);
2962 case DIFF_STATUS_COPIED
:
2963 show_rename_copy(file
, "copy", p
);
2965 case DIFF_STATUS_RENAMED
:
2966 show_rename_copy(file
, "rename", p
);
2970 fputs(" rewrite ", file
);
2971 write_name_quoted(p
->two
->path
, file
, ' ');
2972 fprintf(file
, "(%d%%)\n", similarity_index(p
));
2974 show_mode_change(file
, p
, !p
->score
);
2980 struct xdiff_emit_state xm
;
2985 static int remove_space(char *line
, int len
)
2991 for (i
= 0; i
< len
; i
++)
2992 if (!isspace((c
= line
[i
])))
2998 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3000 struct patch_id_t
*data
= priv
;
3003 /* Ignore line numbers when computing the SHA1 of the patch */
3004 if (!prefixcmp(line
, "@@ -"))
3007 new_len
= remove_space(line
, len
);
3009 SHA1_Update(data
->ctx
, line
, new_len
);
3010 data
->patchlen
+= new_len
;
3013 /* returns 0 upon success, and writes result into sha1 */
3014 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3016 struct diff_queue_struct
*q
= &diff_queued_diff
;
3019 struct patch_id_t data
;
3020 char buffer
[PATH_MAX
* 4 + 20];
3023 memset(&data
, 0, sizeof(struct patch_id_t
));
3025 data
.xm
.consume
= patch_id_consume
;
3027 for (i
= 0; i
< q
->nr
; i
++) {
3032 struct diff_filepair
*p
= q
->queue
[i
];
3035 memset(&xecfg
, 0, sizeof(xecfg
));
3037 return error("internal diff status error");
3038 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3040 if (diff_unmodified_pair(p
))
3042 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3043 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3045 if (DIFF_PAIR_UNMERGED(p
))
3048 diff_fill_sha1_info(p
->one
);
3049 diff_fill_sha1_info(p
->two
);
3050 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3051 fill_mmfile(&mf2
, p
->two
) < 0)
3052 return error("unable to read files to diff");
3054 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3055 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3056 if (p
->one
->mode
== 0)
3057 len1
= snprintf(buffer
, sizeof(buffer
),
3058 "diff--gita/%.*sb/%.*s"
3065 len2
, p
->two
->path
);
3066 else if (p
->two
->mode
== 0)
3067 len1
= snprintf(buffer
, sizeof(buffer
),
3068 "diff--gita/%.*sb/%.*s"
3069 "deletedfilemode%06o"
3075 len1
, p
->one
->path
);
3077 len1
= snprintf(buffer
, sizeof(buffer
),
3078 "diff--gita/%.*sb/%.*s"
3084 len2
, p
->two
->path
);
3085 SHA1_Update(&ctx
, buffer
, len1
);
3087 xpp
.flags
= XDF_NEED_MINIMAL
;
3089 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3090 ecb
.outf
= xdiff_outf
;
3092 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
3095 SHA1_Final(sha1
, &ctx
);
3099 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3101 struct diff_queue_struct
*q
= &diff_queued_diff
;
3103 int result
= diff_get_patch_id(options
, sha1
);
3105 for (i
= 0; i
< q
->nr
; i
++)
3106 diff_free_filepair(q
->queue
[i
]);
3110 q
->nr
= q
->alloc
= 0;
3115 static int is_summary_empty(const struct diff_queue_struct
*q
)
3119 for (i
= 0; i
< q
->nr
; i
++) {
3120 const struct diff_filepair
*p
= q
->queue
[i
];
3122 switch (p
->status
) {
3123 case DIFF_STATUS_DELETED
:
3124 case DIFF_STATUS_ADDED
:
3125 case DIFF_STATUS_COPIED
:
3126 case DIFF_STATUS_RENAMED
:
3131 if (p
->one
->mode
&& p
->two
->mode
&&
3132 p
->one
->mode
!= p
->two
->mode
)
3140 void diff_flush(struct diff_options
*options
)
3142 struct diff_queue_struct
*q
= &diff_queued_diff
;
3143 int i
, output_format
= options
->output_format
;
3147 * Order: raw, stat, summary, patch
3148 * or: name/name-status/checkdiff (other bits clear)
3153 if (output_format
& (DIFF_FORMAT_RAW
|
3155 DIFF_FORMAT_NAME_STATUS
|
3156 DIFF_FORMAT_CHECKDIFF
)) {
3157 for (i
= 0; i
< q
->nr
; i
++) {
3158 struct diff_filepair
*p
= q
->queue
[i
];
3159 if (check_pair_status(p
))
3160 flush_one_pair(p
, options
);
3165 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3166 struct diffstat_t diffstat
;
3168 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3169 diffstat
.xm
.consume
= diffstat_consume
;
3170 for (i
= 0; i
< q
->nr
; i
++) {
3171 struct diff_filepair
*p
= q
->queue
[i
];
3172 if (check_pair_status(p
))
3173 diff_flush_stat(p
, options
, &diffstat
);
3175 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3176 show_numstat(&diffstat
, options
);
3177 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3178 show_stats(&diffstat
, options
);
3179 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3180 show_shortstats(&diffstat
, options
);
3181 free_diffstat_info(&diffstat
);
3184 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3185 show_dirstat(options
);
3187 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3188 for (i
= 0; i
< q
->nr
; i
++)
3189 diff_summary(options
->file
, q
->queue
[i
]);
3193 if (output_format
& DIFF_FORMAT_PATCH
) {
3195 if (options
->stat_sep
) {
3196 /* attach patch instead of inline */
3197 fputs(options
->stat_sep
, options
->file
);
3199 putc(options
->line_termination
, options
->file
);
3203 for (i
= 0; i
< q
->nr
; i
++) {
3204 struct diff_filepair
*p
= q
->queue
[i
];
3205 if (check_pair_status(p
))
3206 diff_flush_patch(p
, options
);
3210 if (output_format
& DIFF_FORMAT_CALLBACK
)
3211 options
->format_callback(q
, options
, options
->format_callback_data
);
3213 for (i
= 0; i
< q
->nr
; i
++)
3214 diff_free_filepair(q
->queue
[i
]);
3218 q
->nr
= q
->alloc
= 0;
3219 if (options
->close_file
)
3220 fclose(options
->file
);
3223 static void diffcore_apply_filter(const char *filter
)
3226 struct diff_queue_struct
*q
= &diff_queued_diff
;
3227 struct diff_queue_struct outq
;
3229 outq
.nr
= outq
.alloc
= 0;
3234 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3236 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3237 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
)))
3250 /* otherwise we will clear the whole queue
3251 * by copying the empty outq at the end of this
3252 * function, but first clear the current entries
3255 for (i
= 0; i
< q
->nr
; i
++)
3256 diff_free_filepair(q
->queue
[i
]);
3259 /* Only the matching ones */
3260 for (i
= 0; i
< q
->nr
; i
++) {
3261 struct diff_filepair
*p
= q
->queue
[i
];
3263 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3265 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3267 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3268 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3269 strchr(filter
, p
->status
)))
3272 diff_free_filepair(p
);
3279 /* Check whether two filespecs with the same mode and size are identical */
3280 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3281 struct diff_filespec
*two
)
3283 if (S_ISGITLINK(one
->mode
))
3285 if (diff_populate_filespec(one
, 0))
3287 if (diff_populate_filespec(two
, 0))
3289 return !memcmp(one
->data
, two
->data
, one
->size
);
3292 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3295 struct diff_queue_struct
*q
= &diff_queued_diff
;
3296 struct diff_queue_struct outq
;
3298 outq
.nr
= outq
.alloc
= 0;
3300 for (i
= 0; i
< q
->nr
; i
++) {
3301 struct diff_filepair
*p
= q
->queue
[i
];
3304 * 1. Entries that come from stat info dirtyness
3305 * always have both sides (iow, not create/delete),
3306 * one side of the object name is unknown, with
3307 * the same mode and size. Keep the ones that
3308 * do not match these criteria. They have real
3311 * 2. At this point, the file is known to be modified,
3312 * with the same mode and size, and the object
3313 * name of one side is unknown. Need to inspect
3314 * the identical contents.
3316 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3317 !DIFF_FILE_VALID(p
->two
) ||
3318 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3319 (p
->one
->mode
!= p
->two
->mode
) ||
3320 diff_populate_filespec(p
->one
, 1) ||
3321 diff_populate_filespec(p
->two
, 1) ||
3322 (p
->one
->size
!= p
->two
->size
) ||
3323 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3327 * The caller can subtract 1 from skip_stat_unmatch
3328 * to determine how many paths were dirty only
3329 * due to stat info mismatch.
3331 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3332 diffopt
->skip_stat_unmatch
++;
3333 diff_free_filepair(p
);
3340 void diffcore_std(struct diff_options
*options
)
3342 if (DIFF_OPT_TST(options
, QUIET
))
3345 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3346 diffcore_skip_stat_unmatch(options
);
3347 if (options
->break_opt
!= -1)
3348 diffcore_break(options
->break_opt
);
3349 if (options
->detect_rename
)
3350 diffcore_rename(options
);
3351 if (options
->break_opt
!= -1)
3352 diffcore_merge_broken();
3353 if (options
->pickaxe
)
3354 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3355 if (options
->orderfile
)
3356 diffcore_order(options
->orderfile
);
3357 diff_resolve_rename_copy();
3358 diffcore_apply_filter(options
->filter
);
3360 if (diff_queued_diff
.nr
)
3361 DIFF_OPT_SET(options
, HAS_CHANGES
);
3363 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3366 int diff_result_code(struct diff_options
*opt
, int status
)
3369 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3370 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3372 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3373 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3375 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3376 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3381 void diff_addremove(struct diff_options
*options
,
3382 int addremove
, unsigned mode
,
3383 const unsigned char *sha1
,
3384 const char *base
, const char *path
)
3386 char concatpath
[PATH_MAX
];
3387 struct diff_filespec
*one
, *two
;
3389 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(mode
))
3392 /* This may look odd, but it is a preparation for
3393 * feeding "there are unchanged files which should
3394 * not produce diffs, but when you are doing copy
3395 * detection you would need them, so here they are"
3396 * entries to the diff-core. They will be prefixed
3397 * with something like '=' or '*' (I haven't decided
3398 * which but should not make any difference).
3399 * Feeding the same new and old to diff_change()
3400 * also has the same effect.
3401 * Before the final output happens, they are pruned after
3402 * merged into rename/copy pairs as appropriate.
3404 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3405 addremove
= (addremove
== '+' ? '-' :
3406 addremove
== '-' ? '+' : addremove
);
3408 if (!path
) path
= "";
3409 sprintf(concatpath
, "%s%s", base
, path
);
3411 if (options
->prefix
&&
3412 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3415 one
= alloc_filespec(concatpath
);
3416 two
= alloc_filespec(concatpath
);
3418 if (addremove
!= '+')
3419 fill_filespec(one
, sha1
, mode
);
3420 if (addremove
!= '-')
3421 fill_filespec(two
, sha1
, mode
);
3423 diff_queue(&diff_queued_diff
, one
, two
);
3424 DIFF_OPT_SET(options
, HAS_CHANGES
);
3427 void diff_change(struct diff_options
*options
,
3428 unsigned old_mode
, unsigned new_mode
,
3429 const unsigned char *old_sha1
,
3430 const unsigned char *new_sha1
,
3431 const char *base
, const char *path
)
3433 char concatpath
[PATH_MAX
];
3434 struct diff_filespec
*one
, *two
;
3436 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(old_mode
)
3437 && S_ISGITLINK(new_mode
))
3440 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3442 const unsigned char *tmp_c
;
3443 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3444 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3446 if (!path
) path
= "";
3447 sprintf(concatpath
, "%s%s", base
, path
);
3449 if (options
->prefix
&&
3450 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3453 one
= alloc_filespec(concatpath
);
3454 two
= alloc_filespec(concatpath
);
3455 fill_filespec(one
, old_sha1
, old_mode
);
3456 fill_filespec(two
, new_sha1
, new_mode
);
3458 diff_queue(&diff_queued_diff
, one
, two
);
3459 DIFF_OPT_SET(options
, HAS_CHANGES
);
3462 void diff_unmerge(struct diff_options
*options
,
3464 unsigned mode
, const unsigned char *sha1
)
3466 struct diff_filespec
*one
, *two
;
3468 if (options
->prefix
&&
3469 strncmp(path
, options
->prefix
, options
->prefix_length
))
3472 one
= alloc_filespec(path
);
3473 two
= alloc_filespec(path
);
3474 fill_filespec(one
, sha1
, mode
);
3475 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;