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 struct funcname_pattern_entry
{
101 static struct funcname_pattern_list
{
102 struct funcname_pattern_list
*next
;
103 struct funcname_pattern_entry e
;
104 } *funcname_pattern_list
;
106 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
)
110 struct funcname_pattern_list
*pp
;
112 name
= var
+ 5; /* "diff." */
115 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
116 if (!strncmp(pp
->e
.name
, name
, namelen
) && !pp
->e
.name
[namelen
])
119 pp
= xcalloc(1, sizeof(*pp
));
120 pp
->e
.name
= xmemdupz(name
, namelen
);
121 pp
->next
= funcname_pattern_list
;
122 funcname_pattern_list
= pp
;
125 pp
->e
.pattern
= xstrdup(value
);
130 * These are to give UI layer defaults.
131 * The core-level commands such as git-diff-files should
132 * never be affected by the setting of diff.renames
133 * the user happens to have in the configuration file.
135 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
137 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
138 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
141 if (!strcmp(var
, "diff.renames")) {
143 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
144 else if (!strcasecmp(value
, "copies") ||
145 !strcasecmp(value
, "copy"))
146 diff_detect_rename_default
= DIFF_DETECT_COPY
;
147 else if (git_config_bool(var
,value
))
148 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
151 if (!strcmp(var
, "diff.autorefreshindex")) {
152 diff_auto_refresh_index
= git_config_bool(var
, value
);
155 if (!strcmp(var
, "diff.external"))
156 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
157 if (!prefixcmp(var
, "diff.")) {
158 const char *ep
= strrchr(var
, '.');
160 if (ep
!= var
+ 4 && !strcmp(ep
, ".command"))
161 return parse_lldiff_command(var
, ep
, value
);
164 return git_diff_basic_config(var
, value
, cb
);
167 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
169 if (!strcmp(var
, "diff.renamelimit")) {
170 diff_rename_limit_default
= git_config_int(var
, value
);
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
, has_trailing_carriage_return
;
519 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
520 if (has_trailing_newline
)
522 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
523 if (has_trailing_carriage_return
)
527 fwrite(line
, len
, 1, file
);
529 if (has_trailing_carriage_return
)
531 if (has_trailing_newline
)
535 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
537 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
538 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
541 emit_line(ecbdata
->file
, set
, reset
, line
, len
);
543 /* Emit just the prefix, then the rest. */
544 emit_line(ecbdata
->file
, set
, reset
, line
, ecbdata
->nparents
);
545 ws_check_emit(line
+ ecbdata
->nparents
,
546 len
- ecbdata
->nparents
, ecbdata
->ws_rule
,
547 ecbdata
->file
, set
, reset
, ws
);
551 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
558 return ecb
->truncate(line
, len
);
562 (void) utf8_width(&cp
, &l
);
564 break; /* truncated in the middle? */
569 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
573 struct emit_callback
*ecbdata
= priv
;
574 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
575 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
576 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
578 *(ecbdata
->found_changesp
) = 1;
580 if (ecbdata
->label_path
[0]) {
581 const char *name_a_tab
, *name_b_tab
;
583 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
584 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
586 fprintf(ecbdata
->file
, "%s--- %s%s%s\n",
587 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
588 fprintf(ecbdata
->file
, "%s+++ %s%s%s\n",
589 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
590 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
593 /* This is not really necessary for now because
594 * this codepath only deals with two-way diffs.
596 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
598 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
599 ecbdata
->nparents
= i
- 1;
600 len
= sane_truncate_line(ecbdata
, line
, len
);
601 emit_line(ecbdata
->file
,
602 diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
604 if (line
[len
-1] != '\n')
605 putc('\n', ecbdata
->file
);
609 if (len
< ecbdata
->nparents
) {
610 emit_line(ecbdata
->file
, reset
, reset
, line
, len
);
615 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
616 /* fall back to normal diff */
617 free_diff_words_data(ecbdata
);
618 if (ecbdata
->diff_words
) {
619 if (line
[0] == '-') {
620 diff_words_append(line
, len
,
621 &ecbdata
->diff_words
->minus
);
623 } else if (line
[0] == '+') {
624 diff_words_append(line
, len
,
625 &ecbdata
->diff_words
->plus
);
628 if (ecbdata
->diff_words
->minus
.text
.size
||
629 ecbdata
->diff_words
->plus
.text
.size
)
630 diff_words_show(ecbdata
->diff_words
);
633 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
636 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
638 color
= DIFF_FILE_OLD
;
639 else if (line
[i
] == '+')
640 color
= DIFF_FILE_NEW
;
643 if (color
!= DIFF_FILE_NEW
) {
644 emit_line(ecbdata
->file
,
645 diff_get_color(ecbdata
->color_diff
, color
),
649 emit_add_line(reset
, ecbdata
, line
, len
);
652 static char *pprint_rename(const char *a
, const char *b
)
657 int pfx_length
, sfx_length
;
658 int len_a
= strlen(a
);
659 int len_b
= strlen(b
);
660 int a_midlen
, b_midlen
;
661 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
662 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
664 strbuf_init(&name
, 0);
665 if (qlen_a
|| qlen_b
) {
666 quote_c_style(a
, &name
, NULL
, 0);
667 strbuf_addstr(&name
, " => ");
668 quote_c_style(b
, &name
, NULL
, 0);
669 return strbuf_detach(&name
, NULL
);
672 /* Find common prefix */
674 while (*old
&& *new && *old
== *new) {
676 pfx_length
= old
- a
+ 1;
681 /* Find common suffix */
685 while (a
<= old
&& b
<= new && *old
== *new) {
687 sfx_length
= len_a
- (old
- a
);
693 * pfx{mid-a => mid-b}sfx
694 * {pfx-a => pfx-b}sfx
695 * pfx{sfx-a => sfx-b}
698 a_midlen
= len_a
- pfx_length
- sfx_length
;
699 b_midlen
= len_b
- pfx_length
- sfx_length
;
705 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
706 if (pfx_length
+ sfx_length
) {
707 strbuf_add(&name
, a
, pfx_length
);
708 strbuf_addch(&name
, '{');
710 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
711 strbuf_addstr(&name
, " => ");
712 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
713 if (pfx_length
+ sfx_length
) {
714 strbuf_addch(&name
, '}');
715 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
717 return strbuf_detach(&name
, NULL
);
721 struct xdiff_emit_state xm
;
725 struct diffstat_file
{
729 unsigned is_unmerged
:1;
730 unsigned is_binary
:1;
731 unsigned is_renamed
:1;
732 unsigned int added
, deleted
;
736 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
740 struct diffstat_file
*x
;
741 x
= xcalloc(sizeof (*x
), 1);
742 if (diffstat
->nr
== diffstat
->alloc
) {
743 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
744 diffstat
->files
= xrealloc(diffstat
->files
,
745 diffstat
->alloc
* sizeof(x
));
747 diffstat
->files
[diffstat
->nr
++] = x
;
749 x
->from_name
= xstrdup(name_a
);
750 x
->name
= xstrdup(name_b
);
755 x
->name
= xstrdup(name_a
);
760 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
762 struct diffstat_t
*diffstat
= priv
;
763 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
767 else if (line
[0] == '-')
771 const char mime_boundary_leader
[] = "------------";
773 static int scale_linear(int it
, int width
, int max_change
)
776 * make sure that at least one '-' is printed if there were deletions,
777 * and likewise for '+'.
781 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
784 static void show_name(FILE *file
,
785 const char *prefix
, const char *name
, int len
,
786 const char *reset
, const char *set
)
788 fprintf(file
, " %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
791 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
795 fprintf(file
, "%s", set
);
798 fprintf(file
, "%s", reset
);
801 static void fill_print_name(struct diffstat_file
*file
)
805 if (file
->print_name
)
808 if (!file
->is_renamed
) {
810 strbuf_init(&buf
, 0);
811 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
812 pname
= strbuf_detach(&buf
, NULL
);
815 strbuf_release(&buf
);
818 pname
= pprint_rename(file
->from_name
, file
->name
);
820 file
->print_name
= pname
;
823 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
825 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
826 int max_change
= 0, max_len
= 0;
827 int total_files
= data
->nr
;
828 int width
, name_width
;
829 const char *reset
, *set
, *add_c
, *del_c
;
834 width
= options
->stat_width
? options
->stat_width
: 80;
835 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
837 /* Sanity: give at least 5 columns to the graph,
838 * but leave at least 10 columns for the name.
844 else if (width
< name_width
+ 15)
845 name_width
= width
- 15;
847 /* Find the longest filename and max number of changes */
848 reset
= diff_get_color_opt(options
, DIFF_RESET
);
849 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
850 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
851 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
853 for (i
= 0; i
< data
->nr
; i
++) {
854 struct diffstat_file
*file
= data
->files
[i
];
855 int change
= file
->added
+ file
->deleted
;
856 fill_print_name(file
);
857 len
= strlen(file
->print_name
);
861 if (file
->is_binary
|| file
->is_unmerged
)
863 if (max_change
< change
)
867 /* Compute the width of the graph part;
868 * 10 is for one blank at the beginning of the line plus
869 * " | count " between the name and the graph.
871 * From here on, name_width is the width of the name area,
872 * and width is the width of the graph area.
874 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
875 if (width
< (name_width
+ 10) + max_change
)
876 width
= width
- (name_width
+ 10);
880 for (i
= 0; i
< data
->nr
; i
++) {
881 const char *prefix
= "";
882 char *name
= data
->files
[i
]->print_name
;
883 int added
= data
->files
[i
]->added
;
884 int deleted
= data
->files
[i
]->deleted
;
888 * "scale" the filename
891 name_len
= strlen(name
);
892 if (name_width
< name_len
) {
896 name
+= name_len
- len
;
897 slash
= strchr(name
, '/');
902 if (data
->files
[i
]->is_binary
) {
903 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
904 fprintf(options
->file
, " Bin ");
905 fprintf(options
->file
, "%s%d%s", del_c
, deleted
, reset
);
906 fprintf(options
->file
, " -> ");
907 fprintf(options
->file
, "%s%d%s", add_c
, added
, reset
);
908 fprintf(options
->file
, " bytes");
909 fprintf(options
->file
, "\n");
912 else if (data
->files
[i
]->is_unmerged
) {
913 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
914 fprintf(options
->file
, " Unmerged\n");
917 else if (!data
->files
[i
]->is_renamed
&&
918 (added
+ deleted
== 0)) {
924 * scale the add/delete
932 if (width
<= max_change
) {
933 add
= scale_linear(add
, width
, max_change
);
934 del
= scale_linear(del
, width
, max_change
);
937 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
938 fprintf(options
->file
, "%5d%s", added
+ deleted
,
939 added
+ deleted
? " " : "");
940 show_graph(options
->file
, '+', add
, add_c
, reset
);
941 show_graph(options
->file
, '-', del
, del_c
, reset
);
942 fprintf(options
->file
, "\n");
944 fprintf(options
->file
,
945 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
946 set
, total_files
, adds
, dels
, reset
);
949 static void show_shortstats(struct diffstat_t
* data
, struct diff_options
*options
)
951 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
956 for (i
= 0; i
< data
->nr
; i
++) {
957 if (!data
->files
[i
]->is_binary
&&
958 !data
->files
[i
]->is_unmerged
) {
959 int added
= data
->files
[i
]->added
;
960 int deleted
= data
->files
[i
]->deleted
;
961 if (!data
->files
[i
]->is_renamed
&&
962 (added
+ deleted
== 0)) {
970 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
971 total_files
, adds
, dels
);
974 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
981 for (i
= 0; i
< data
->nr
; i
++) {
982 struct diffstat_file
*file
= data
->files
[i
];
985 fprintf(options
->file
, "-\t-\t");
987 fprintf(options
->file
,
988 "%d\t%d\t", file
->added
, file
->deleted
);
989 if (options
->line_termination
) {
990 fill_print_name(file
);
991 if (!file
->is_renamed
)
992 write_name_quoted(file
->name
, options
->file
,
993 options
->line_termination
);
995 fputs(file
->print_name
, options
->file
);
996 putc(options
->line_termination
, options
->file
);
999 if (file
->is_renamed
) {
1000 putc('\0', options
->file
);
1001 write_name_quoted(file
->from_name
, options
->file
, '\0');
1003 write_name_quoted(file
->name
, options
->file
, '\0');
1008 struct dirstat_file
{
1010 unsigned long changed
;
1013 struct dirstat_dir
{
1014 struct dirstat_file
*files
;
1015 int alloc
, nr
, percent
, cumulative
;
1018 static long gather_dirstat(FILE *file
, struct dirstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1020 unsigned long this_dir
= 0;
1021 unsigned int sources
= 0;
1024 struct dirstat_file
*f
= dir
->files
;
1025 int namelen
= strlen(f
->name
);
1029 if (namelen
< baselen
)
1031 if (memcmp(f
->name
, base
, baselen
))
1033 slash
= strchr(f
->name
+ baselen
, '/');
1035 int newbaselen
= slash
+ 1 - f
->name
;
1036 this = gather_dirstat(file
, dir
, changed
, f
->name
, newbaselen
);
1048 * We don't report dirstat's for
1050 * - or cases where everything came from a single directory
1051 * under this directory (sources == 1).
1053 if (baselen
&& sources
!= 1) {
1054 int permille
= this_dir
* 1000 / changed
;
1056 int percent
= permille
/ 10;
1057 if (percent
>= dir
->percent
) {
1058 fprintf(file
, "%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1059 if (!dir
->cumulative
)
1067 static int dirstat_compare(const void *_a
, const void *_b
)
1069 const struct dirstat_file
*a
= _a
;
1070 const struct dirstat_file
*b
= _b
;
1071 return strcmp(a
->name
, b
->name
);
1074 static void show_dirstat(struct diff_options
*options
)
1077 unsigned long changed
;
1078 struct dirstat_dir dir
;
1079 struct diff_queue_struct
*q
= &diff_queued_diff
;
1084 dir
.percent
= options
->dirstat_percent
;
1085 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1088 for (i
= 0; i
< q
->nr
; i
++) {
1089 struct diff_filepair
*p
= q
->queue
[i
];
1091 unsigned long copied
, added
, damage
;
1093 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1095 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1096 diff_populate_filespec(p
->one
, 0);
1097 diff_populate_filespec(p
->two
, 0);
1098 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1100 diff_free_filespec_data(p
->one
);
1101 diff_free_filespec_data(p
->two
);
1102 } else if (DIFF_FILE_VALID(p
->one
)) {
1103 diff_populate_filespec(p
->one
, 1);
1105 diff_free_filespec_data(p
->one
);
1106 } else if (DIFF_FILE_VALID(p
->two
)) {
1107 diff_populate_filespec(p
->two
, 1);
1109 added
= p
->two
->size
;
1110 diff_free_filespec_data(p
->two
);
1115 * Original minus copied is the removed material,
1116 * added is the new material. They are both damages
1117 * made to the preimage.
1119 damage
= (p
->one
->size
- copied
) + added
;
1121 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1122 dir
.files
[dir
.nr
].name
= name
;
1123 dir
.files
[dir
.nr
].changed
= damage
;
1128 /* This can happen even with many files, if everything was renames */
1132 /* Show all directories with more than x% of the changes */
1133 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1134 gather_dirstat(options
->file
, &dir
, changed
, "", 0);
1137 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1140 for (i
= 0; i
< diffstat
->nr
; i
++) {
1141 struct diffstat_file
*f
= diffstat
->files
[i
];
1142 if (f
->name
!= f
->print_name
)
1143 free(f
->print_name
);
1148 free(diffstat
->files
);
1151 struct checkdiff_t
{
1152 struct xdiff_emit_state xm
;
1153 const char *filename
;
1155 struct diff_options
*o
;
1158 int trailing_blanks_start
;
1161 static int is_conflict_marker(const char *line
, unsigned long len
)
1168 firstchar
= line
[0];
1169 switch (firstchar
) {
1170 case '=': case '>': case '<':
1175 for (cnt
= 1; cnt
< 7; cnt
++)
1176 if (line
[cnt
] != firstchar
)
1178 /* line[0] thru line[6] are same as firstchar */
1179 if (firstchar
== '=') {
1180 /* divider between ours and theirs? */
1181 if (len
!= 8 || line
[7] != '\n')
1183 } else if (len
< 8 || !isspace(line
[7])) {
1184 /* not divider before ours nor after theirs */
1190 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1192 struct checkdiff_t
*data
= priv
;
1193 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1194 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1195 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1196 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1199 if (line
[0] == '+') {
1202 if (!ws_blank_line(line
+ 1, len
- 1, data
->ws_rule
))
1203 data
->trailing_blanks_start
= 0;
1204 else if (!data
->trailing_blanks_start
)
1205 data
->trailing_blanks_start
= data
->lineno
;
1206 if (is_conflict_marker(line
+ 1, len
- 1)) {
1208 fprintf(data
->o
->file
,
1209 "%s:%d: leftover conflict marker\n",
1210 data
->filename
, data
->lineno
);
1212 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1215 data
->status
|= bad
;
1216 err
= whitespace_error_string(bad
);
1217 fprintf(data
->o
->file
, "%s:%d: %s.\n",
1218 data
->filename
, data
->lineno
, err
);
1220 emit_line(data
->o
->file
, set
, reset
, line
, 1);
1221 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1222 data
->o
->file
, set
, reset
, ws
);
1223 } else if (line
[0] == ' ') {
1225 data
->trailing_blanks_start
= 0;
1226 } else if (line
[0] == '@') {
1227 char *plus
= strchr(line
, '+');
1229 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1231 die("invalid diff");
1232 data
->trailing_blanks_start
= 0;
1236 static unsigned char *deflate_it(char *data
,
1238 unsigned long *result_size
)
1241 unsigned char *deflated
;
1244 memset(&stream
, 0, sizeof(stream
));
1245 deflateInit(&stream
, zlib_compression_level
);
1246 bound
= deflateBound(&stream
, size
);
1247 deflated
= xmalloc(bound
);
1248 stream
.next_out
= deflated
;
1249 stream
.avail_out
= bound
;
1251 stream
.next_in
= (unsigned char *)data
;
1252 stream
.avail_in
= size
;
1253 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1255 deflateEnd(&stream
);
1256 *result_size
= stream
.total_out
;
1260 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1266 unsigned long orig_size
;
1267 unsigned long delta_size
;
1268 unsigned long deflate_size
;
1269 unsigned long data_size
;
1271 /* We could do deflated delta, or we could do just deflated two,
1272 * whichever is smaller.
1275 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1276 if (one
->size
&& two
->size
) {
1277 delta
= diff_delta(one
->ptr
, one
->size
,
1278 two
->ptr
, two
->size
,
1279 &delta_size
, deflate_size
);
1281 void *to_free
= delta
;
1282 orig_size
= delta_size
;
1283 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1288 if (delta
&& delta_size
< deflate_size
) {
1289 fprintf(file
, "delta %lu\n", orig_size
);
1292 data_size
= delta_size
;
1295 fprintf(file
, "literal %lu\n", two
->size
);
1298 data_size
= deflate_size
;
1301 /* emit data encoded in base85 */
1304 int bytes
= (52 < data_size
) ? 52 : data_size
;
1308 line
[0] = bytes
+ 'A' - 1;
1310 line
[0] = bytes
- 26 + 'a' - 1;
1311 encode_85(line
+ 1, cp
, bytes
);
1312 cp
= (char *) cp
+ bytes
;
1316 fprintf(file
, "\n");
1320 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1322 fprintf(file
, "GIT binary patch\n");
1323 emit_binary_diff_body(file
, one
, two
);
1324 emit_binary_diff_body(file
, two
, one
);
1327 static void setup_diff_attr_check(struct git_attr_check
*check
)
1329 static struct git_attr
*attr_diff
;
1332 attr_diff
= git_attr("diff", 4);
1334 check
[0].attr
= attr_diff
;
1337 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1339 struct git_attr_check attr_diff_check
;
1340 int check_from_data
= 0;
1342 if (one
->checked_attr
)
1345 setup_diff_attr_check(&attr_diff_check
);
1347 one
->funcname_pattern_ident
= NULL
;
1349 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1353 value
= attr_diff_check
.value
;
1354 if (ATTR_TRUE(value
))
1356 else if (ATTR_FALSE(value
))
1359 check_from_data
= 1;
1361 /* funcname pattern ident */
1362 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1365 one
->funcname_pattern_ident
= value
;
1368 if (check_from_data
) {
1369 if (!one
->data
&& DIFF_FILE_VALID(one
))
1370 diff_populate_filespec(one
, 0);
1373 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1377 int diff_filespec_is_binary(struct diff_filespec
*one
)
1379 diff_filespec_check_attr(one
);
1380 return one
->is_binary
;
1383 static const struct funcname_pattern_entry
*funcname_pattern(const char *ident
)
1385 struct funcname_pattern_list
*pp
;
1387 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1388 if (!strcmp(ident
, pp
->e
.name
))
1393 static const struct funcname_pattern_entry builtin_funcname_pattern
[] = {
1394 { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1395 "new\\|return\\|switch\\|throw\\|while\\)\n"
1397 "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
1399 { "pascal", "^\\(\\(procedure\\|function\\|constructor\\|"
1400 "destructor\\|interface\\|implementation\\|"
1401 "initialization\\|finalization\\)[ \t]*.*\\)$"
1403 "^\\(.*=[ \t]*\\(class\\|record\\).*\\)$"
1405 { "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$" },
1406 { "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$" },
1407 { "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
1410 static const struct funcname_pattern_entry
*diff_funcname_pattern(struct diff_filespec
*one
)
1413 const struct funcname_pattern_entry
*pe
;
1416 diff_filespec_check_attr(one
);
1417 ident
= one
->funcname_pattern_ident
;
1421 * If the config file has "funcname.default" defined, that
1422 * regexp is used; otherwise NULL is returned and xemit uses
1423 * the built-in default.
1425 return funcname_pattern("default");
1427 /* Look up custom "funcname.$ident" regexp from config. */
1428 pe
= funcname_pattern(ident
);
1433 * And define built-in fallback patterns here. Note that
1434 * these can be overridden by the user's config settings.
1436 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1437 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1438 return &builtin_funcname_pattern
[i
];
1443 static void builtin_diff(const char *name_a
,
1445 struct diff_filespec
*one
,
1446 struct diff_filespec
*two
,
1447 const char *xfrm_msg
,
1448 struct diff_options
*o
,
1449 int complete_rewrite
)
1453 char *a_one
, *b_two
;
1454 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1455 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1457 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1458 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1459 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1460 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1461 fprintf(o
->file
, "%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1462 if (lbl
[0][0] == '/') {
1464 fprintf(o
->file
, "%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1465 if (xfrm_msg
&& xfrm_msg
[0])
1466 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1468 else if (lbl
[1][0] == '/') {
1469 fprintf(o
->file
, "%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1470 if (xfrm_msg
&& xfrm_msg
[0])
1471 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1474 if (one
->mode
!= two
->mode
) {
1475 fprintf(o
->file
, "%sold mode %06o%s\n", set
, one
->mode
, reset
);
1476 fprintf(o
->file
, "%snew mode %06o%s\n", set
, two
->mode
, reset
);
1478 if (xfrm_msg
&& xfrm_msg
[0])
1479 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1481 * we do not run diff between different kind
1484 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1485 goto free_ab_and_return
;
1486 if (complete_rewrite
) {
1487 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1488 o
->found_changes
= 1;
1489 goto free_ab_and_return
;
1493 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1494 die("unable to read files to diff");
1496 if (!DIFF_OPT_TST(o
, TEXT
) &&
1497 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1498 /* Quite common confusing case */
1499 if (mf1
.size
== mf2
.size
&&
1500 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1501 goto free_ab_and_return
;
1502 if (DIFF_OPT_TST(o
, BINARY
))
1503 emit_binary_diff(o
->file
, &mf1
, &mf2
);
1505 fprintf(o
->file
, "Binary files %s and %s differ\n",
1507 o
->found_changes
= 1;
1510 /* Crazy xdl interfaces.. */
1511 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1515 struct emit_callback ecbdata
;
1516 const struct funcname_pattern_entry
*pe
;
1518 pe
= diff_funcname_pattern(one
);
1520 pe
= diff_funcname_pattern(two
);
1522 memset(&xecfg
, 0, sizeof(xecfg
));
1523 memset(&ecbdata
, 0, sizeof(ecbdata
));
1524 ecbdata
.label_path
= lbl
;
1525 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1526 ecbdata
.found_changesp
= &o
->found_changes
;
1527 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1528 ecbdata
.file
= o
->file
;
1529 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1530 xecfg
.ctxlen
= o
->context
;
1531 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1533 xdiff_set_find_func(&xecfg
, pe
->pattern
);
1536 else if (!prefixcmp(diffopts
, "--unified="))
1537 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1538 else if (!prefixcmp(diffopts
, "-u"))
1539 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1540 ecb
.outf
= xdiff_outf
;
1541 ecb
.priv
= &ecbdata
;
1542 ecbdata
.xm
.consume
= fn_out_consume
;
1543 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
)) {
1544 ecbdata
.diff_words
=
1545 xcalloc(1, sizeof(struct diff_words_data
));
1546 ecbdata
.diff_words
->file
= o
->file
;
1548 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1549 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1550 free_diff_words_data(&ecbdata
);
1554 diff_free_filespec_data(one
);
1555 diff_free_filespec_data(two
);
1561 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1562 struct diff_filespec
*one
,
1563 struct diff_filespec
*two
,
1564 struct diffstat_t
*diffstat
,
1565 struct diff_options
*o
,
1566 int complete_rewrite
)
1569 struct diffstat_file
*data
;
1571 data
= diffstat_add(diffstat
, name_a
, name_b
);
1574 data
->is_unmerged
= 1;
1577 if (complete_rewrite
) {
1578 diff_populate_filespec(one
, 0);
1579 diff_populate_filespec(two
, 0);
1580 data
->deleted
= count_lines(one
->data
, one
->size
);
1581 data
->added
= count_lines(two
->data
, two
->size
);
1582 goto free_and_return
;
1584 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1585 die("unable to read files to diff");
1587 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1588 data
->is_binary
= 1;
1589 data
->added
= mf2
.size
;
1590 data
->deleted
= mf1
.size
;
1592 /* Crazy xdl interfaces.. */
1597 memset(&xecfg
, 0, sizeof(xecfg
));
1598 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1599 ecb
.outf
= xdiff_outf
;
1600 ecb
.priv
= diffstat
;
1601 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1605 diff_free_filespec_data(one
);
1606 diff_free_filespec_data(two
);
1609 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1610 const char *attr_path
,
1611 struct diff_filespec
*one
,
1612 struct diff_filespec
*two
,
1613 struct diff_options
*o
)
1616 struct checkdiff_t data
;
1621 memset(&data
, 0, sizeof(data
));
1622 data
.xm
.consume
= checkdiff_consume
;
1623 data
.filename
= name_b
? name_b
: name_a
;
1626 data
.ws_rule
= whitespace_rule(attr_path
);
1628 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1629 die("unable to read files to diff");
1632 * All the other codepaths check both sides, but not checking
1633 * the "old" side here is deliberate. We are checking the newly
1634 * introduced changes, and as long as the "new" side is text, we
1635 * can and should check what it introduces.
1637 if (diff_filespec_is_binary(two
))
1638 goto free_and_return
;
1640 /* Crazy xdl interfaces.. */
1645 memset(&xecfg
, 0, sizeof(xecfg
));
1646 xecfg
.ctxlen
= 1; /* at least one context line */
1647 xpp
.flags
= XDF_NEED_MINIMAL
;
1648 ecb
.outf
= xdiff_outf
;
1650 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1652 if ((data
.ws_rule
& WS_TRAILING_SPACE
) &&
1653 data
.trailing_blanks_start
) {
1654 fprintf(o
->file
, "%s:%d: ends with blank lines.\n",
1655 data
.filename
, data
.trailing_blanks_start
);
1656 data
.status
= 1; /* report errors */
1660 diff_free_filespec_data(one
);
1661 diff_free_filespec_data(two
);
1663 DIFF_OPT_SET(o
, CHECK_FAILED
);
1666 struct diff_filespec
*alloc_filespec(const char *path
)
1668 int namelen
= strlen(path
);
1669 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1671 memset(spec
, 0, sizeof(*spec
));
1672 spec
->path
= (char *)(spec
+ 1);
1673 memcpy(spec
->path
, path
, namelen
+1);
1678 void free_filespec(struct diff_filespec
*spec
)
1680 if (!--spec
->count
) {
1681 diff_free_filespec_data(spec
);
1686 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1687 unsigned short mode
)
1690 spec
->mode
= canon_mode(mode
);
1691 hashcpy(spec
->sha1
, sha1
);
1692 spec
->sha1_valid
= !is_null_sha1(sha1
);
1697 * Given a name and sha1 pair, if the index tells us the file in
1698 * the work tree has that object contents, return true, so that
1699 * prepare_temp_file() does not have to inflate and extract.
1701 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1703 struct cache_entry
*ce
;
1707 /* We do not read the cache ourselves here, because the
1708 * benchmark with my previous version that always reads cache
1709 * shows that it makes things worse for diff-tree comparing
1710 * two linux-2.6 kernel trees in an already checked out work
1711 * tree. This is because most diff-tree comparisons deal with
1712 * only a small number of files, while reading the cache is
1713 * expensive for a large project, and its cost outweighs the
1714 * savings we get by not inflating the object to a temporary
1715 * file. Practically, this code only helps when we are used
1716 * by diff-cache --cached, which does read the cache before
1722 /* We want to avoid the working directory if our caller
1723 * doesn't need the data in a normal file, this system
1724 * is rather slow with its stat/open/mmap/close syscalls,
1725 * and the object is contained in a pack file. The pack
1726 * is probably already open and will be faster to obtain
1727 * the data through than the working directory. Loose
1728 * objects however would tend to be slower as they need
1729 * to be individually opened and inflated.
1731 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1735 pos
= cache_name_pos(name
, len
);
1738 ce
= active_cache
[pos
];
1741 * This is not the sha1 we are looking for, or
1742 * unreusable because it is not a regular file.
1744 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1748 * If ce matches the file in the work tree, we can reuse it.
1750 if (ce_uptodate(ce
) ||
1751 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1757 static int populate_from_stdin(struct diff_filespec
*s
)
1762 strbuf_init(&buf
, 0);
1763 if (strbuf_read(&buf
, 0, 0) < 0)
1764 return error("error while reading from stdin %s",
1767 s
->should_munmap
= 0;
1768 s
->data
= strbuf_detach(&buf
, &size
);
1774 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1777 char *data
= xmalloc(100);
1778 len
= snprintf(data
, 100,
1779 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1791 * While doing rename detection and pickaxe operation, we may need to
1792 * grab the data for the blob (or file) for our own in-core comparison.
1793 * diff_filespec has data and size fields for this purpose.
1795 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1798 if (!DIFF_FILE_VALID(s
))
1799 die("internal error: asking to populate invalid file.");
1800 if (S_ISDIR(s
->mode
))
1806 if (size_only
&& 0 < s
->size
)
1809 if (S_ISGITLINK(s
->mode
))
1810 return diff_populate_gitlink(s
, size_only
);
1812 if (!s
->sha1_valid
||
1813 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1818 if (!strcmp(s
->path
, "-"))
1819 return populate_from_stdin(s
);
1821 if (lstat(s
->path
, &st
) < 0) {
1822 if (errno
== ENOENT
) {
1826 s
->data
= (char *)"";
1831 s
->size
= xsize_t(st
.st_size
);
1836 if (S_ISLNK(st
.st_mode
)) {
1838 s
->data
= xmalloc(s
->size
);
1840 ret
= readlink(s
->path
, s
->data
, s
->size
);
1847 fd
= open(s
->path
, O_RDONLY
);
1850 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1852 s
->should_munmap
= 1;
1855 * Convert from working tree format to canonical git format
1857 strbuf_init(&buf
, 0);
1858 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
1860 munmap(s
->data
, s
->size
);
1861 s
->should_munmap
= 0;
1862 s
->data
= strbuf_detach(&buf
, &size
);
1868 enum object_type type
;
1870 type
= sha1_object_info(s
->sha1
, &s
->size
);
1872 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1879 void diff_free_filespec_blob(struct diff_filespec
*s
)
1883 else if (s
->should_munmap
)
1884 munmap(s
->data
, s
->size
);
1886 if (s
->should_free
|| s
->should_munmap
) {
1887 s
->should_free
= s
->should_munmap
= 0;
1892 void diff_free_filespec_data(struct diff_filespec
*s
)
1894 diff_free_filespec_blob(s
);
1899 static void prep_temp_blob(struct diff_tempfile
*temp
,
1902 const unsigned char *sha1
,
1907 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1909 die("unable to create temp-file: %s", strerror(errno
));
1910 if (write_in_full(fd
, blob
, size
) != size
)
1911 die("unable to write temp-file");
1913 temp
->name
= temp
->tmp_path
;
1914 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1916 sprintf(temp
->mode
, "%06o", mode
);
1919 static void prepare_temp_file(const char *name
,
1920 struct diff_tempfile
*temp
,
1921 struct diff_filespec
*one
)
1923 if (!DIFF_FILE_VALID(one
)) {
1925 /* A '-' entry produces this for file-2, and
1926 * a '+' entry produces this for file-1.
1928 temp
->name
= "/dev/null";
1929 strcpy(temp
->hex
, ".");
1930 strcpy(temp
->mode
, ".");
1934 if (!one
->sha1_valid
||
1935 reuse_worktree_file(name
, one
->sha1
, 1)) {
1937 if (lstat(name
, &st
) < 0) {
1938 if (errno
== ENOENT
)
1939 goto not_a_valid_file
;
1940 die("stat(%s): %s", name
, strerror(errno
));
1942 if (S_ISLNK(st
.st_mode
)) {
1944 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1945 size_t sz
= xsize_t(st
.st_size
);
1946 if (sizeof(buf
) <= st
.st_size
)
1947 die("symlink too long: %s", name
);
1948 ret
= readlink(name
, buf
, sz
);
1950 die("readlink(%s)", name
);
1951 prep_temp_blob(temp
, buf
, sz
,
1953 one
->sha1
: null_sha1
),
1955 one
->mode
: S_IFLNK
));
1958 /* we can borrow from the file in the work tree */
1960 if (!one
->sha1_valid
)
1961 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1963 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1964 /* Even though we may sometimes borrow the
1965 * contents from the work tree, we always want
1966 * one->mode. mode is trustworthy even when
1967 * !(one->sha1_valid), as long as
1968 * DIFF_FILE_VALID(one).
1970 sprintf(temp
->mode
, "%06o", one
->mode
);
1975 if (diff_populate_filespec(one
, 0))
1976 die("cannot read data blob for %s", one
->path
);
1977 prep_temp_blob(temp
, one
->data
, one
->size
,
1978 one
->sha1
, one
->mode
);
1982 static void remove_tempfile(void)
1986 for (i
= 0; i
< 2; i
++)
1987 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1988 unlink(diff_temp
[i
].name
);
1989 diff_temp
[i
].name
= NULL
;
1993 static void remove_tempfile_on_signal(int signo
)
1996 signal(SIGINT
, SIG_DFL
);
2000 /* An external diff command takes:
2002 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2003 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2006 static void run_external_diff(const char *pgm
,
2009 struct diff_filespec
*one
,
2010 struct diff_filespec
*two
,
2011 const char *xfrm_msg
,
2012 int complete_rewrite
)
2014 const char *spawn_arg
[10];
2015 struct diff_tempfile
*temp
= diff_temp
;
2017 static int atexit_asked
= 0;
2018 const char *othername
;
2019 const char **arg
= &spawn_arg
[0];
2021 othername
= (other
? other
: name
);
2023 prepare_temp_file(name
, &temp
[0], one
);
2024 prepare_temp_file(othername
, &temp
[1], two
);
2025 if (! atexit_asked
&&
2026 (temp
[0].name
== temp
[0].tmp_path
||
2027 temp
[1].name
== temp
[1].tmp_path
)) {
2029 atexit(remove_tempfile
);
2031 signal(SIGINT
, remove_tempfile_on_signal
);
2037 *arg
++ = temp
[0].name
;
2038 *arg
++ = temp
[0].hex
;
2039 *arg
++ = temp
[0].mode
;
2040 *arg
++ = temp
[1].name
;
2041 *arg
++ = temp
[1].hex
;
2042 *arg
++ = temp
[1].mode
;
2053 retval
= run_command_v_opt(spawn_arg
, 0);
2056 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2061 static const char *external_diff_attr(const char *name
)
2063 struct git_attr_check attr_diff_check
;
2068 setup_diff_attr_check(&attr_diff_check
);
2069 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
2070 const char *value
= attr_diff_check
.value
;
2071 if (!ATTR_TRUE(value
) &&
2072 !ATTR_FALSE(value
) &&
2073 !ATTR_UNSET(value
)) {
2074 struct ll_diff_driver
*drv
;
2076 for (drv
= user_diff
; drv
; drv
= drv
->next
)
2077 if (!strcmp(drv
->name
, value
))
2084 static void run_diff_cmd(const char *pgm
,
2087 const char *attr_path
,
2088 struct diff_filespec
*one
,
2089 struct diff_filespec
*two
,
2090 const char *xfrm_msg
,
2091 struct diff_options
*o
,
2092 int complete_rewrite
)
2094 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2097 const char *cmd
= external_diff_attr(attr_path
);
2103 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2108 builtin_diff(name
, other
? other
: name
,
2109 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2111 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2114 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2116 if (DIFF_FILE_VALID(one
)) {
2117 if (!one
->sha1_valid
) {
2119 if (!strcmp(one
->path
, "-")) {
2120 hashcpy(one
->sha1
, null_sha1
);
2123 if (lstat(one
->path
, &st
) < 0)
2124 die("stat %s", one
->path
);
2125 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2126 die("cannot hash %s\n", one
->path
);
2133 static int similarity_index(struct diff_filepair
*p
)
2135 return p
->score
* 100 / MAX_SCORE
;
2138 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2140 /* Strip the prefix but do not molest /dev/null and absolute paths */
2141 if (*namep
&& **namep
!= '/')
2142 *namep
+= prefix_length
;
2143 if (*otherp
&& **otherp
!= '/')
2144 *otherp
+= prefix_length
;
2147 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2149 const char *pgm
= external_diff();
2152 struct diff_filespec
*one
= p
->one
;
2153 struct diff_filespec
*two
= p
->two
;
2156 const char *attr_path
;
2157 int complete_rewrite
= 0;
2159 name
= p
->one
->path
;
2160 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2162 if (o
->prefix_length
)
2163 strip_prefix(o
->prefix_length
, &name
, &other
);
2165 if (DIFF_PAIR_UNMERGED(p
)) {
2166 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2167 NULL
, NULL
, NULL
, o
, 0);
2171 diff_fill_sha1_info(one
);
2172 diff_fill_sha1_info(two
);
2174 strbuf_init(&msg
, PATH_MAX
* 2 + 300);
2175 switch (p
->status
) {
2176 case DIFF_STATUS_COPIED
:
2177 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2178 strbuf_addstr(&msg
, "\ncopy from ");
2179 quote_c_style(name
, &msg
, NULL
, 0);
2180 strbuf_addstr(&msg
, "\ncopy to ");
2181 quote_c_style(other
, &msg
, NULL
, 0);
2182 strbuf_addch(&msg
, '\n');
2184 case DIFF_STATUS_RENAMED
:
2185 strbuf_addf(&msg
, "similarity index %d%%", similarity_index(p
));
2186 strbuf_addstr(&msg
, "\nrename from ");
2187 quote_c_style(name
, &msg
, NULL
, 0);
2188 strbuf_addstr(&msg
, "\nrename to ");
2189 quote_c_style(other
, &msg
, NULL
, 0);
2190 strbuf_addch(&msg
, '\n');
2192 case DIFF_STATUS_MODIFIED
:
2194 strbuf_addf(&msg
, "dissimilarity index %d%%\n",
2195 similarity_index(p
));
2196 complete_rewrite
= 1;
2205 if (hashcmp(one
->sha1
, two
->sha1
)) {
2206 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2208 if (DIFF_OPT_TST(o
, BINARY
)) {
2210 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2211 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2214 strbuf_addf(&msg
, "index %.*s..%.*s",
2215 abbrev
, sha1_to_hex(one
->sha1
),
2216 abbrev
, sha1_to_hex(two
->sha1
));
2217 if (one
->mode
== two
->mode
)
2218 strbuf_addf(&msg
, " %06o", one
->mode
);
2219 strbuf_addch(&msg
, '\n');
2223 strbuf_setlen(&msg
, msg
.len
- 1);
2224 xfrm_msg
= msg
.len
? msg
.buf
: NULL
;
2227 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2228 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2229 /* a filepair that changes between file and symlink
2230 * needs to be split into deletion and creation.
2232 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2233 run_diff_cmd(NULL
, name
, other
, attr_path
,
2234 one
, null
, xfrm_msg
, o
, 0);
2236 null
= alloc_filespec(one
->path
);
2237 run_diff_cmd(NULL
, name
, other
, attr_path
,
2238 null
, two
, xfrm_msg
, o
, 0);
2242 run_diff_cmd(pgm
, name
, other
, attr_path
,
2243 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2245 strbuf_release(&msg
);
2248 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2249 struct diffstat_t
*diffstat
)
2253 int complete_rewrite
= 0;
2255 if (DIFF_PAIR_UNMERGED(p
)) {
2257 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2261 name
= p
->one
->path
;
2262 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2264 if (o
->prefix_length
)
2265 strip_prefix(o
->prefix_length
, &name
, &other
);
2267 diff_fill_sha1_info(p
->one
);
2268 diff_fill_sha1_info(p
->two
);
2270 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2271 complete_rewrite
= 1;
2272 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2275 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2279 const char *attr_path
;
2281 if (DIFF_PAIR_UNMERGED(p
)) {
2286 name
= p
->one
->path
;
2287 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2288 attr_path
= other
? other
: name
;
2290 if (o
->prefix_length
)
2291 strip_prefix(o
->prefix_length
, &name
, &other
);
2293 diff_fill_sha1_info(p
->one
);
2294 diff_fill_sha1_info(p
->two
);
2296 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2299 void diff_setup(struct diff_options
*options
)
2301 memset(options
, 0, sizeof(*options
));
2303 options
->file
= stdout
;
2305 options
->line_termination
= '\n';
2306 options
->break_opt
= -1;
2307 options
->rename_limit
= -1;
2308 options
->dirstat_percent
= 3;
2309 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
2310 options
->context
= 3;
2312 options
->change
= diff_change
;
2313 options
->add_remove
= diff_addremove
;
2314 if (diff_use_color_default
> 0)
2315 DIFF_OPT_SET(options
, COLOR_DIFF
);
2317 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2318 options
->detect_rename
= diff_detect_rename_default
;
2320 options
->a_prefix
= "a/";
2321 options
->b_prefix
= "b/";
2324 int diff_setup_done(struct diff_options
*options
)
2328 if (options
->output_format
& DIFF_FORMAT_NAME
)
2330 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2332 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2334 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2337 die("--name-only, --name-status, --check and -s are mutually exclusive");
2339 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2340 options
->detect_rename
= DIFF_DETECT_COPY
;
2342 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2343 options
->prefix
= NULL
;
2344 if (options
->prefix
)
2345 options
->prefix_length
= strlen(options
->prefix
);
2347 options
->prefix_length
= 0;
2349 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2350 DIFF_FORMAT_NAME_STATUS
|
2351 DIFF_FORMAT_CHECKDIFF
|
2352 DIFF_FORMAT_NO_OUTPUT
))
2353 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2354 DIFF_FORMAT_NUMSTAT
|
2355 DIFF_FORMAT_DIFFSTAT
|
2356 DIFF_FORMAT_SHORTSTAT
|
2357 DIFF_FORMAT_DIRSTAT
|
2358 DIFF_FORMAT_SUMMARY
|
2362 * These cases always need recursive; we do not drop caller-supplied
2363 * recursive bits for other formats here.
2365 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2366 DIFF_FORMAT_NUMSTAT
|
2367 DIFF_FORMAT_DIFFSTAT
|
2368 DIFF_FORMAT_SHORTSTAT
|
2369 DIFF_FORMAT_DIRSTAT
|
2370 DIFF_FORMAT_SUMMARY
|
2371 DIFF_FORMAT_CHECKDIFF
))
2372 DIFF_OPT_SET(options
, RECURSIVE
);
2374 * Also pickaxe would not work very well if you do not say recursive
2376 if (options
->pickaxe
)
2377 DIFF_OPT_SET(options
, RECURSIVE
);
2379 if (options
->detect_rename
&& options
->rename_limit
< 0)
2380 options
->rename_limit
= diff_rename_limit_default
;
2381 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2383 /* read-cache does not die even when it fails
2384 * so it is safe for us to do this here. Also
2385 * it does not smudge active_cache or active_nr
2386 * when it fails, so we do not have to worry about
2387 * cleaning it up ourselves either.
2391 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2392 options
->abbrev
= 40; /* full */
2395 * It does not make sense to show the first hit we happened
2396 * to have found. It does not make sense not to return with
2397 * exit code in such a case either.
2399 if (DIFF_OPT_TST(options
, QUIET
)) {
2400 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2401 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2405 * If we postprocess in diffcore, we cannot simply return
2406 * upon the first hit. We need to run diff as usual.
2408 if (options
->pickaxe
|| options
->filter
)
2409 DIFF_OPT_CLR(options
, QUIET
);
2414 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2424 if (c
== arg_short
) {
2428 if (val
&& isdigit(c
)) {
2430 int n
= strtoul(arg
, &end
, 10);
2441 eq
= strchr(arg
, '=');
2446 if (!len
|| strncmp(arg
, arg_long
, len
))
2451 if (!isdigit(*++eq
))
2453 n
= strtoul(eq
, &end
, 10);
2461 static int diff_scoreopt_parse(const char *opt
);
2463 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2465 const char *arg
= av
[0];
2467 /* Output format options */
2468 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2469 options
->output_format
|= DIFF_FORMAT_PATCH
;
2470 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2471 options
->output_format
|= DIFF_FORMAT_PATCH
;
2472 else if (!strcmp(arg
, "--raw"))
2473 options
->output_format
|= DIFF_FORMAT_RAW
;
2474 else if (!strcmp(arg
, "--patch-with-raw"))
2475 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2476 else if (!strcmp(arg
, "--numstat"))
2477 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2478 else if (!strcmp(arg
, "--shortstat"))
2479 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2480 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2481 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2482 else if (!strcmp(arg
, "--cumulative")) {
2483 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2484 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
2486 else if (!strcmp(arg
, "--check"))
2487 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2488 else if (!strcmp(arg
, "--summary"))
2489 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2490 else if (!strcmp(arg
, "--patch-with-stat"))
2491 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2492 else if (!strcmp(arg
, "--name-only"))
2493 options
->output_format
|= DIFF_FORMAT_NAME
;
2494 else if (!strcmp(arg
, "--name-status"))
2495 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2496 else if (!strcmp(arg
, "-s"))
2497 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2498 else if (!prefixcmp(arg
, "--stat")) {
2500 int width
= options
->stat_width
;
2501 int name_width
= options
->stat_name_width
;
2507 if (!prefixcmp(arg
, "-width="))
2508 width
= strtoul(arg
+ 7, &end
, 10);
2509 else if (!prefixcmp(arg
, "-name-width="))
2510 name_width
= strtoul(arg
+ 12, &end
, 10);
2513 width
= strtoul(arg
+1, &end
, 10);
2515 name_width
= strtoul(end
+1, &end
, 10);
2518 /* Important! This checks all the error cases! */
2521 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2522 options
->stat_name_width
= name_width
;
2523 options
->stat_width
= width
;
2526 /* renames options */
2527 else if (!prefixcmp(arg
, "-B")) {
2528 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2531 else if (!prefixcmp(arg
, "-M")) {
2532 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2534 options
->detect_rename
= DIFF_DETECT_RENAME
;
2536 else if (!prefixcmp(arg
, "-C")) {
2537 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2538 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2539 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2541 options
->detect_rename
= DIFF_DETECT_COPY
;
2543 else if (!strcmp(arg
, "--no-renames"))
2544 options
->detect_rename
= 0;
2545 else if (!strcmp(arg
, "--relative"))
2546 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2547 else if (!prefixcmp(arg
, "--relative=")) {
2548 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2549 options
->prefix
= arg
+ 11;
2553 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2554 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2555 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2556 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2557 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2558 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2561 else if (!strcmp(arg
, "--binary")) {
2562 options
->output_format
|= DIFF_FORMAT_PATCH
;
2563 DIFF_OPT_SET(options
, BINARY
);
2565 else if (!strcmp(arg
, "--full-index"))
2566 DIFF_OPT_SET(options
, FULL_INDEX
);
2567 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2568 DIFF_OPT_SET(options
, TEXT
);
2569 else if (!strcmp(arg
, "-R"))
2570 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2571 else if (!strcmp(arg
, "--find-copies-harder"))
2572 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2573 else if (!strcmp(arg
, "--follow"))
2574 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2575 else if (!strcmp(arg
, "--color"))
2576 DIFF_OPT_SET(options
, COLOR_DIFF
);
2577 else if (!strcmp(arg
, "--no-color"))
2578 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2579 else if (!strcmp(arg
, "--color-words"))
2580 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2581 else if (!strcmp(arg
, "--exit-code"))
2582 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2583 else if (!strcmp(arg
, "--quiet"))
2584 DIFF_OPT_SET(options
, QUIET
);
2585 else if (!strcmp(arg
, "--ext-diff"))
2586 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2587 else if (!strcmp(arg
, "--no-ext-diff"))
2588 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2589 else if (!strcmp(arg
, "--ignore-submodules"))
2590 DIFF_OPT_SET(options
, IGNORE_SUBMODULES
);
2593 else if (!strcmp(arg
, "-z"))
2594 options
->line_termination
= 0;
2595 else if (!prefixcmp(arg
, "-l"))
2596 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2597 else if (!prefixcmp(arg
, "-S"))
2598 options
->pickaxe
= arg
+ 2;
2599 else if (!strcmp(arg
, "--pickaxe-all"))
2600 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2601 else if (!strcmp(arg
, "--pickaxe-regex"))
2602 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2603 else if (!prefixcmp(arg
, "-O"))
2604 options
->orderfile
= arg
+ 2;
2605 else if (!prefixcmp(arg
, "--diff-filter="))
2606 options
->filter
= arg
+ 14;
2607 else if (!strcmp(arg
, "--abbrev"))
2608 options
->abbrev
= DEFAULT_ABBREV
;
2609 else if (!prefixcmp(arg
, "--abbrev=")) {
2610 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2611 if (options
->abbrev
< MINIMUM_ABBREV
)
2612 options
->abbrev
= MINIMUM_ABBREV
;
2613 else if (40 < options
->abbrev
)
2614 options
->abbrev
= 40;
2616 else if (!prefixcmp(arg
, "--src-prefix="))
2617 options
->a_prefix
= arg
+ 13;
2618 else if (!prefixcmp(arg
, "--dst-prefix="))
2619 options
->b_prefix
= arg
+ 13;
2620 else if (!strcmp(arg
, "--no-prefix"))
2621 options
->a_prefix
= options
->b_prefix
= "";
2622 else if (!prefixcmp(arg
, "--output=")) {
2623 options
->file
= fopen(arg
+ strlen("--output="), "w");
2624 options
->close_file
= 1;
2630 static int parse_num(const char **cp_p
)
2632 unsigned long num
, scale
;
2634 const char *cp
= *cp_p
;
2641 if ( !dot
&& ch
== '.' ) {
2644 } else if ( ch
== '%' ) {
2645 scale
= dot
? scale
*100 : 100;
2646 cp
++; /* % is always at the end */
2648 } else if ( ch
>= '0' && ch
<= '9' ) {
2649 if ( scale
< 100000 ) {
2651 num
= (num
*10) + (ch
-'0');
2660 /* user says num divided by scale and we say internally that
2661 * is MAX_SCORE * num / scale.
2663 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2666 static int diff_scoreopt_parse(const char *opt
)
2668 int opt1
, opt2
, cmd
;
2673 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2674 return -1; /* that is not a -M, -C nor -B option */
2676 opt1
= parse_num(&opt
);
2682 else if (*opt
!= '/')
2683 return -1; /* we expect -B80/99 or -B80 */
2686 opt2
= parse_num(&opt
);
2691 return opt1
| (opt2
<< 16);
2694 struct diff_queue_struct diff_queued_diff
;
2696 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2698 if (queue
->alloc
<= queue
->nr
) {
2699 queue
->alloc
= alloc_nr(queue
->alloc
);
2700 queue
->queue
= xrealloc(queue
->queue
,
2701 sizeof(dp
) * queue
->alloc
);
2703 queue
->queue
[queue
->nr
++] = dp
;
2706 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2707 struct diff_filespec
*one
,
2708 struct diff_filespec
*two
)
2710 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2718 void diff_free_filepair(struct diff_filepair
*p
)
2720 free_filespec(p
->one
);
2721 free_filespec(p
->two
);
2725 /* This is different from find_unique_abbrev() in that
2726 * it stuffs the result with dots for alignment.
2728 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2733 return sha1_to_hex(sha1
);
2735 abbrev
= find_unique_abbrev(sha1
, len
);
2736 abblen
= strlen(abbrev
);
2738 static char hex
[41];
2739 if (len
< abblen
&& abblen
<= len
+ 2)
2740 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2742 sprintf(hex
, "%s...", abbrev
);
2745 return sha1_to_hex(sha1
);
2748 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2750 int line_termination
= opt
->line_termination
;
2751 int inter_name_termination
= line_termination
? '\t' : '\0';
2753 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2754 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2755 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2756 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2759 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
2760 inter_name_termination
);
2762 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
2765 if (p
->status
== DIFF_STATUS_COPIED
||
2766 p
->status
== DIFF_STATUS_RENAMED
) {
2767 const char *name_a
, *name_b
;
2768 name_a
= p
->one
->path
;
2769 name_b
= p
->two
->path
;
2770 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2771 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
2772 write_name_quoted(name_b
, opt
->file
, line_termination
);
2774 const char *name_a
, *name_b
;
2775 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2777 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2778 write_name_quoted(name_a
, opt
->file
, line_termination
);
2782 int diff_unmodified_pair(struct diff_filepair
*p
)
2784 /* This function is written stricter than necessary to support
2785 * the currently implemented transformers, but the idea is to
2786 * let transformers to produce diff_filepairs any way they want,
2787 * and filter and clean them up here before producing the output.
2789 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2791 if (DIFF_PAIR_UNMERGED(p
))
2792 return 0; /* unmerged is interesting */
2794 /* deletion, addition, mode or type change
2795 * and rename are all interesting.
2797 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2798 DIFF_PAIR_MODE_CHANGED(p
) ||
2799 strcmp(one
->path
, two
->path
))
2802 /* both are valid and point at the same path. that is, we are
2803 * dealing with a change.
2805 if (one
->sha1_valid
&& two
->sha1_valid
&&
2806 !hashcmp(one
->sha1
, two
->sha1
))
2807 return 1; /* no change */
2808 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2809 return 1; /* both look at the same file on the filesystem. */
2813 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2815 if (diff_unmodified_pair(p
))
2818 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2819 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2820 return; /* no tree diffs in patch format */
2825 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2826 struct diffstat_t
*diffstat
)
2828 if (diff_unmodified_pair(p
))
2831 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2832 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2833 return; /* no tree diffs in patch format */
2835 run_diffstat(p
, o
, diffstat
);
2838 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2839 struct diff_options
*o
)
2841 if (diff_unmodified_pair(p
))
2844 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2845 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2846 return; /* no tree diffs in patch format */
2848 run_checkdiff(p
, o
);
2851 int diff_queue_is_empty(void)
2853 struct diff_queue_struct
*q
= &diff_queued_diff
;
2855 for (i
= 0; i
< q
->nr
; i
++)
2856 if (!diff_unmodified_pair(q
->queue
[i
]))
2862 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2864 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2867 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2869 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2870 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2872 s
->size
, s
->xfrm_flags
);
2875 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2877 diff_debug_filespec(p
->one
, i
, "one");
2878 diff_debug_filespec(p
->two
, i
, "two");
2879 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2880 p
->score
, p
->status
? p
->status
: '?',
2881 p
->one
->rename_used
, p
->broken_pair
);
2884 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2888 fprintf(stderr
, "%s\n", msg
);
2889 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2890 for (i
= 0; i
< q
->nr
; i
++) {
2891 struct diff_filepair
*p
= q
->queue
[i
];
2892 diff_debug_filepair(p
, i
);
2897 static void diff_resolve_rename_copy(void)
2900 struct diff_filepair
*p
;
2901 struct diff_queue_struct
*q
= &diff_queued_diff
;
2903 diff_debug_queue("resolve-rename-copy", q
);
2905 for (i
= 0; i
< q
->nr
; i
++) {
2907 p
->status
= 0; /* undecided */
2908 if (DIFF_PAIR_UNMERGED(p
))
2909 p
->status
= DIFF_STATUS_UNMERGED
;
2910 else if (!DIFF_FILE_VALID(p
->one
))
2911 p
->status
= DIFF_STATUS_ADDED
;
2912 else if (!DIFF_FILE_VALID(p
->two
))
2913 p
->status
= DIFF_STATUS_DELETED
;
2914 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2915 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2917 /* from this point on, we are dealing with a pair
2918 * whose both sides are valid and of the same type, i.e.
2919 * either in-place edit or rename/copy edit.
2921 else if (DIFF_PAIR_RENAME(p
)) {
2923 * A rename might have re-connected a broken
2924 * pair up, causing the pathnames to be the
2925 * same again. If so, that's not a rename at
2926 * all, just a modification..
2928 * Otherwise, see if this source was used for
2929 * multiple renames, in which case we decrement
2930 * the count, and call it a copy.
2932 if (!strcmp(p
->one
->path
, p
->two
->path
))
2933 p
->status
= DIFF_STATUS_MODIFIED
;
2934 else if (--p
->one
->rename_used
> 0)
2935 p
->status
= DIFF_STATUS_COPIED
;
2937 p
->status
= DIFF_STATUS_RENAMED
;
2939 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2940 p
->one
->mode
!= p
->two
->mode
||
2941 is_null_sha1(p
->one
->sha1
))
2942 p
->status
= DIFF_STATUS_MODIFIED
;
2944 /* This is a "no-change" entry and should not
2945 * happen anymore, but prepare for broken callers.
2947 error("feeding unmodified %s to diffcore",
2949 p
->status
= DIFF_STATUS_UNKNOWN
;
2952 diff_debug_queue("resolve-rename-copy done", q
);
2955 static int check_pair_status(struct diff_filepair
*p
)
2957 switch (p
->status
) {
2958 case DIFF_STATUS_UNKNOWN
:
2961 die("internal error in diff-resolve-rename-copy");
2967 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2969 int fmt
= opt
->output_format
;
2971 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2972 diff_flush_checkdiff(p
, opt
);
2973 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2974 diff_flush_raw(p
, opt
);
2975 else if (fmt
& DIFF_FORMAT_NAME
) {
2976 const char *name_a
, *name_b
;
2977 name_a
= p
->two
->path
;
2979 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2980 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
2984 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
2987 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
2989 fprintf(file
, " %s ", newdelete
);
2990 write_name_quoted(fs
->path
, file
, '\n');
2994 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
)
2996 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2997 fprintf(file
, " mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
2998 show_name
? ' ' : '\n');
3000 write_name_quoted(p
->two
->path
, file
, '\n');
3005 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
)
3007 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
3009 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
3011 show_mode_change(file
, p
, 0);
3014 static void diff_summary(FILE *file
, struct diff_filepair
*p
)
3017 case DIFF_STATUS_DELETED
:
3018 show_file_mode_name(file
, "delete", p
->one
);
3020 case DIFF_STATUS_ADDED
:
3021 show_file_mode_name(file
, "create", p
->two
);
3023 case DIFF_STATUS_COPIED
:
3024 show_rename_copy(file
, "copy", p
);
3026 case DIFF_STATUS_RENAMED
:
3027 show_rename_copy(file
, "rename", p
);
3031 fputs(" rewrite ", file
);
3032 write_name_quoted(p
->two
->path
, file
, ' ');
3033 fprintf(file
, "(%d%%)\n", similarity_index(p
));
3035 show_mode_change(file
, p
, !p
->score
);
3041 struct xdiff_emit_state xm
;
3046 static int remove_space(char *line
, int len
)
3052 for (i
= 0; i
< len
; i
++)
3053 if (!isspace((c
= line
[i
])))
3059 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3061 struct patch_id_t
*data
= priv
;
3064 /* Ignore line numbers when computing the SHA1 of the patch */
3065 if (!prefixcmp(line
, "@@ -"))
3068 new_len
= remove_space(line
, len
);
3070 SHA1_Update(data
->ctx
, line
, new_len
);
3071 data
->patchlen
+= new_len
;
3074 /* returns 0 upon success, and writes result into sha1 */
3075 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3077 struct diff_queue_struct
*q
= &diff_queued_diff
;
3080 struct patch_id_t data
;
3081 char buffer
[PATH_MAX
* 4 + 20];
3084 memset(&data
, 0, sizeof(struct patch_id_t
));
3086 data
.xm
.consume
= patch_id_consume
;
3088 for (i
= 0; i
< q
->nr
; i
++) {
3093 struct diff_filepair
*p
= q
->queue
[i
];
3096 memset(&xecfg
, 0, sizeof(xecfg
));
3098 return error("internal diff status error");
3099 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3101 if (diff_unmodified_pair(p
))
3103 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3104 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3106 if (DIFF_PAIR_UNMERGED(p
))
3109 diff_fill_sha1_info(p
->one
);
3110 diff_fill_sha1_info(p
->two
);
3111 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3112 fill_mmfile(&mf2
, p
->two
) < 0)
3113 return error("unable to read files to diff");
3115 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3116 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3117 if (p
->one
->mode
== 0)
3118 len1
= snprintf(buffer
, sizeof(buffer
),
3119 "diff--gita/%.*sb/%.*s"
3126 len2
, p
->two
->path
);
3127 else if (p
->two
->mode
== 0)
3128 len1
= snprintf(buffer
, sizeof(buffer
),
3129 "diff--gita/%.*sb/%.*s"
3130 "deletedfilemode%06o"
3136 len1
, p
->one
->path
);
3138 len1
= snprintf(buffer
, sizeof(buffer
),
3139 "diff--gita/%.*sb/%.*s"
3145 len2
, p
->two
->path
);
3146 SHA1_Update(&ctx
, buffer
, len1
);
3148 xpp
.flags
= XDF_NEED_MINIMAL
;
3150 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3151 ecb
.outf
= xdiff_outf
;
3153 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
3156 SHA1_Final(sha1
, &ctx
);
3160 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3162 struct diff_queue_struct
*q
= &diff_queued_diff
;
3164 int result
= diff_get_patch_id(options
, sha1
);
3166 for (i
= 0; i
< q
->nr
; i
++)
3167 diff_free_filepair(q
->queue
[i
]);
3171 q
->nr
= q
->alloc
= 0;
3176 static int is_summary_empty(const struct diff_queue_struct
*q
)
3180 for (i
= 0; i
< q
->nr
; i
++) {
3181 const struct diff_filepair
*p
= q
->queue
[i
];
3183 switch (p
->status
) {
3184 case DIFF_STATUS_DELETED
:
3185 case DIFF_STATUS_ADDED
:
3186 case DIFF_STATUS_COPIED
:
3187 case DIFF_STATUS_RENAMED
:
3192 if (p
->one
->mode
&& p
->two
->mode
&&
3193 p
->one
->mode
!= p
->two
->mode
)
3201 void diff_flush(struct diff_options
*options
)
3203 struct diff_queue_struct
*q
= &diff_queued_diff
;
3204 int i
, output_format
= options
->output_format
;
3208 * Order: raw, stat, summary, patch
3209 * or: name/name-status/checkdiff (other bits clear)
3214 if (output_format
& (DIFF_FORMAT_RAW
|
3216 DIFF_FORMAT_NAME_STATUS
|
3217 DIFF_FORMAT_CHECKDIFF
)) {
3218 for (i
= 0; i
< q
->nr
; i
++) {
3219 struct diff_filepair
*p
= q
->queue
[i
];
3220 if (check_pair_status(p
))
3221 flush_one_pair(p
, options
);
3226 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3227 struct diffstat_t diffstat
;
3229 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3230 diffstat
.xm
.consume
= diffstat_consume
;
3231 for (i
= 0; i
< q
->nr
; i
++) {
3232 struct diff_filepair
*p
= q
->queue
[i
];
3233 if (check_pair_status(p
))
3234 diff_flush_stat(p
, options
, &diffstat
);
3236 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3237 show_numstat(&diffstat
, options
);
3238 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3239 show_stats(&diffstat
, options
);
3240 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3241 show_shortstats(&diffstat
, options
);
3242 free_diffstat_info(&diffstat
);
3245 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3246 show_dirstat(options
);
3248 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3249 for (i
= 0; i
< q
->nr
; i
++)
3250 diff_summary(options
->file
, q
->queue
[i
]);
3254 if (output_format
& DIFF_FORMAT_PATCH
) {
3256 putc(options
->line_termination
, options
->file
);
3257 if (options
->stat_sep
) {
3258 /* attach patch instead of inline */
3259 fputs(options
->stat_sep
, options
->file
);
3263 for (i
= 0; i
< q
->nr
; i
++) {
3264 struct diff_filepair
*p
= q
->queue
[i
];
3265 if (check_pair_status(p
))
3266 diff_flush_patch(p
, options
);
3270 if (output_format
& DIFF_FORMAT_CALLBACK
)
3271 options
->format_callback(q
, options
, options
->format_callback_data
);
3273 for (i
= 0; i
< q
->nr
; i
++)
3274 diff_free_filepair(q
->queue
[i
]);
3278 q
->nr
= q
->alloc
= 0;
3279 if (options
->close_file
)
3280 fclose(options
->file
);
3283 static void diffcore_apply_filter(const char *filter
)
3286 struct diff_queue_struct
*q
= &diff_queued_diff
;
3287 struct diff_queue_struct outq
;
3289 outq
.nr
= outq
.alloc
= 0;
3294 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3296 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3297 struct diff_filepair
*p
= q
->queue
[i
];
3298 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3300 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3302 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3303 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3304 strchr(filter
, p
->status
)))
3310 /* otherwise we will clear the whole queue
3311 * by copying the empty outq at the end of this
3312 * function, but first clear the current entries
3315 for (i
= 0; i
< q
->nr
; i
++)
3316 diff_free_filepair(q
->queue
[i
]);
3319 /* Only the matching ones */
3320 for (i
= 0; i
< q
->nr
; i
++) {
3321 struct diff_filepair
*p
= q
->queue
[i
];
3323 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3325 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3327 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3328 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3329 strchr(filter
, p
->status
)))
3332 diff_free_filepair(p
);
3339 /* Check whether two filespecs with the same mode and size are identical */
3340 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3341 struct diff_filespec
*two
)
3343 if (S_ISGITLINK(one
->mode
))
3345 if (diff_populate_filespec(one
, 0))
3347 if (diff_populate_filespec(two
, 0))
3349 return !memcmp(one
->data
, two
->data
, one
->size
);
3352 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3355 struct diff_queue_struct
*q
= &diff_queued_diff
;
3356 struct diff_queue_struct outq
;
3358 outq
.nr
= outq
.alloc
= 0;
3360 for (i
= 0; i
< q
->nr
; i
++) {
3361 struct diff_filepair
*p
= q
->queue
[i
];
3364 * 1. Entries that come from stat info dirtyness
3365 * always have both sides (iow, not create/delete),
3366 * one side of the object name is unknown, with
3367 * the same mode and size. Keep the ones that
3368 * do not match these criteria. They have real
3371 * 2. At this point, the file is known to be modified,
3372 * with the same mode and size, and the object
3373 * name of one side is unknown. Need to inspect
3374 * the identical contents.
3376 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3377 !DIFF_FILE_VALID(p
->two
) ||
3378 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3379 (p
->one
->mode
!= p
->two
->mode
) ||
3380 diff_populate_filespec(p
->one
, 1) ||
3381 diff_populate_filespec(p
->two
, 1) ||
3382 (p
->one
->size
!= p
->two
->size
) ||
3383 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3387 * The caller can subtract 1 from skip_stat_unmatch
3388 * to determine how many paths were dirty only
3389 * due to stat info mismatch.
3391 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3392 diffopt
->skip_stat_unmatch
++;
3393 diff_free_filepair(p
);
3400 void diffcore_std(struct diff_options
*options
)
3402 if (DIFF_OPT_TST(options
, QUIET
))
3405 if (options
->skip_stat_unmatch
&& !DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
3406 diffcore_skip_stat_unmatch(options
);
3407 if (options
->break_opt
!= -1)
3408 diffcore_break(options
->break_opt
);
3409 if (options
->detect_rename
)
3410 diffcore_rename(options
);
3411 if (options
->break_opt
!= -1)
3412 diffcore_merge_broken();
3413 if (options
->pickaxe
)
3414 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3415 if (options
->orderfile
)
3416 diffcore_order(options
->orderfile
);
3417 diff_resolve_rename_copy();
3418 diffcore_apply_filter(options
->filter
);
3420 if (diff_queued_diff
.nr
)
3421 DIFF_OPT_SET(options
, HAS_CHANGES
);
3423 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3426 int diff_result_code(struct diff_options
*opt
, int status
)
3429 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3430 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3432 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3433 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3435 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3436 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3441 void diff_addremove(struct diff_options
*options
,
3442 int addremove
, unsigned mode
,
3443 const unsigned char *sha1
,
3444 const char *concatpath
)
3446 struct diff_filespec
*one
, *two
;
3448 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(mode
))
3451 /* This may look odd, but it is a preparation for
3452 * feeding "there are unchanged files which should
3453 * not produce diffs, but when you are doing copy
3454 * detection you would need them, so here they are"
3455 * entries to the diff-core. They will be prefixed
3456 * with something like '=' or '*' (I haven't decided
3457 * which but should not make any difference).
3458 * Feeding the same new and old to diff_change()
3459 * also has the same effect.
3460 * Before the final output happens, they are pruned after
3461 * merged into rename/copy pairs as appropriate.
3463 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3464 addremove
= (addremove
== '+' ? '-' :
3465 addremove
== '-' ? '+' : addremove
);
3467 if (options
->prefix
&&
3468 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3471 one
= alloc_filespec(concatpath
);
3472 two
= alloc_filespec(concatpath
);
3474 if (addremove
!= '+')
3475 fill_filespec(one
, sha1
, mode
);
3476 if (addremove
!= '-')
3477 fill_filespec(two
, sha1
, mode
);
3479 diff_queue(&diff_queued_diff
, one
, two
);
3480 DIFF_OPT_SET(options
, HAS_CHANGES
);
3483 void diff_change(struct diff_options
*options
,
3484 unsigned old_mode
, unsigned new_mode
,
3485 const unsigned char *old_sha1
,
3486 const unsigned char *new_sha1
,
3487 const char *concatpath
)
3489 struct diff_filespec
*one
, *two
;
3491 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(old_mode
)
3492 && S_ISGITLINK(new_mode
))
3495 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3497 const unsigned char *tmp_c
;
3498 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3499 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3502 if (options
->prefix
&&
3503 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3506 one
= alloc_filespec(concatpath
);
3507 two
= alloc_filespec(concatpath
);
3508 fill_filespec(one
, old_sha1
, old_mode
);
3509 fill_filespec(two
, new_sha1
, new_mode
);
3511 diff_queue(&diff_queued_diff
, one
, two
);
3512 DIFF_OPT_SET(options
, HAS_CHANGES
);
3515 void diff_unmerge(struct diff_options
*options
,
3517 unsigned mode
, const unsigned char *sha1
)
3519 struct diff_filespec
*one
, *two
;
3521 if (options
->prefix
&&
3522 strncmp(path
, options
->prefix
, options
->prefix_length
))
3525 one
= alloc_filespec(path
);
3526 two
= alloc_filespec(path
);
3527 fill_filespec(one
, sha1
, mode
);
3528 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;