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
{
102 static struct funcname_pattern_list
{
103 struct funcname_pattern_list
*next
;
104 struct funcname_pattern_entry e
;
105 } *funcname_pattern_list
;
107 static int parse_funcname_pattern(const char *var
, const char *ep
, const char *value
, int cflags
)
111 struct funcname_pattern_list
*pp
;
113 name
= var
+ 5; /* "diff." */
116 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
117 if (!strncmp(pp
->e
.name
, name
, namelen
) && !pp
->e
.name
[namelen
])
120 pp
= xcalloc(1, sizeof(*pp
));
121 pp
->e
.name
= xmemdupz(name
, namelen
);
122 pp
->next
= funcname_pattern_list
;
123 funcname_pattern_list
= pp
;
126 pp
->e
.pattern
= xstrdup(value
);
127 pp
->e
.cflags
= cflags
;
132 * These are to give UI layer defaults.
133 * The core-level commands such as git-diff-files should
134 * never be affected by the setting of diff.renames
135 * the user happens to have in the configuration file.
137 int git_diff_ui_config(const char *var
, const char *value
, void *cb
)
139 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
140 diff_use_color_default
= git_config_colorbool(var
, value
, -1);
143 if (!strcmp(var
, "diff.renames")) {
145 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
146 else if (!strcasecmp(value
, "copies") ||
147 !strcasecmp(value
, "copy"))
148 diff_detect_rename_default
= DIFF_DETECT_COPY
;
149 else if (git_config_bool(var
,value
))
150 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
153 if (!strcmp(var
, "diff.autorefreshindex")) {
154 diff_auto_refresh_index
= git_config_bool(var
, value
);
157 if (!strcmp(var
, "diff.external"))
158 return git_config_string(&external_diff_cmd_cfg
, var
, value
);
159 if (!prefixcmp(var
, "diff.")) {
160 const char *ep
= strrchr(var
, '.');
162 if (ep
!= var
+ 4 && !strcmp(ep
, ".command"))
163 return parse_lldiff_command(var
, ep
, value
);
166 return git_diff_basic_config(var
, value
, cb
);
169 int git_diff_basic_config(const char *var
, const char *value
, void *cb
)
171 if (!strcmp(var
, "diff.renamelimit")) {
172 diff_rename_limit_default
= git_config_int(var
, value
);
176 if (!prefixcmp(var
, "diff.color.") || !prefixcmp(var
, "color.diff.")) {
177 int slot
= parse_diff_color_slot(var
, 11);
179 return config_error_nonbool(var
);
180 color_parse(value
, var
, diff_colors
[slot
]);
184 if (!prefixcmp(var
, "diff.")) {
185 const char *ep
= strrchr(var
, '.');
187 if (!strcmp(ep
, ".funcname")) {
189 return config_error_nonbool(var
);
190 return parse_funcname_pattern(var
, ep
, value
,
192 } else if (!strcmp(ep
, ".xfuncname")) {
194 return config_error_nonbool(var
);
195 return parse_funcname_pattern(var
, ep
, value
,
201 return git_color_default_config(var
, value
, cb
);
204 static char *quote_two(const char *one
, const char *two
)
206 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
207 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
210 strbuf_init(&res
, 0);
211 if (need_one
+ need_two
) {
212 strbuf_addch(&res
, '"');
213 quote_c_style(one
, &res
, NULL
, 1);
214 quote_c_style(two
, &res
, NULL
, 1);
215 strbuf_addch(&res
, '"');
217 strbuf_addstr(&res
, one
);
218 strbuf_addstr(&res
, two
);
220 return strbuf_detach(&res
, NULL
);
223 static const char *external_diff(void)
225 static const char *external_diff_cmd
= NULL
;
226 static int done_preparing
= 0;
229 return external_diff_cmd
;
230 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
231 if (!external_diff_cmd
)
232 external_diff_cmd
= external_diff_cmd_cfg
;
234 return external_diff_cmd
;
237 static struct diff_tempfile
{
238 const char *name
; /* filename external diff should read from */
241 char tmp_path
[PATH_MAX
];
244 static int count_lines(const char *data
, int size
)
246 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
253 completely_empty
= 0;
257 completely_empty
= 0;
260 if (completely_empty
)
263 count
++; /* no trailing newline */
267 static void print_line_count(FILE *file
, int count
)
271 fprintf(file
, "0,0");
277 fprintf(file
, "1,%d", count
);
282 static void copy_file_with_prefix(FILE *file
,
283 int prefix
, const char *data
, int size
,
284 const char *set
, const char *reset
)
286 int ch
, nl_just_seen
= 1;
301 fprintf(file
, "%s\n\\ No newline at end of file\n", reset
);
304 static void emit_rewrite_diff(const char *name_a
,
306 struct diff_filespec
*one
,
307 struct diff_filespec
*two
,
308 struct diff_options
*o
)
311 int color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
312 const char *name_a_tab
, *name_b_tab
;
313 const char *metainfo
= diff_get_color(color_diff
, DIFF_METAINFO
);
314 const char *fraginfo
= diff_get_color(color_diff
, DIFF_FRAGINFO
);
315 const char *old
= diff_get_color(color_diff
, DIFF_FILE_OLD
);
316 const char *new = diff_get_color(color_diff
, DIFF_FILE_NEW
);
317 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
318 static struct strbuf a_name
= STRBUF_INIT
, b_name
= STRBUF_INIT
;
320 name_a
+= (*name_a
== '/');
321 name_b
+= (*name_b
== '/');
322 name_a_tab
= strchr(name_a
, ' ') ? "\t" : "";
323 name_b_tab
= strchr(name_b
, ' ') ? "\t" : "";
325 strbuf_reset(&a_name
);
326 strbuf_reset(&b_name
);
327 quote_two_c_style(&a_name
, o
->a_prefix
, name_a
, 0);
328 quote_two_c_style(&b_name
, o
->b_prefix
, name_b
, 0);
330 diff_populate_filespec(one
, 0);
331 diff_populate_filespec(two
, 0);
332 lc_a
= count_lines(one
->data
, one
->size
);
333 lc_b
= count_lines(two
->data
, two
->size
);
335 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
336 metainfo
, a_name
.buf
, name_a_tab
, reset
,
337 metainfo
, b_name
.buf
, name_b_tab
, reset
, fraginfo
);
338 print_line_count(o
->file
, lc_a
);
339 fprintf(o
->file
, " +");
340 print_line_count(o
->file
, lc_b
);
341 fprintf(o
->file
, " @@%s\n", reset
);
343 copy_file_with_prefix(o
->file
, '-', one
->data
, one
->size
, old
, reset
);
345 copy_file_with_prefix(o
->file
, '+', two
->data
, two
->size
, new, reset
);
348 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
350 if (!DIFF_FILE_VALID(one
)) {
351 mf
->ptr
= (char *)""; /* does not matter */
355 else if (diff_populate_filespec(one
, 0))
358 mf
->size
= one
->size
;
362 struct diff_words_buffer
{
365 long current
; /* output pointer */
366 int suppressed_newline
;
369 static void diff_words_append(char *line
, unsigned long len
,
370 struct diff_words_buffer
*buffer
)
372 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
373 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
374 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
378 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
379 buffer
->text
.size
+= len
;
382 struct diff_words_data
{
383 struct xdiff_emit_state xm
;
384 struct diff_words_buffer minus
, plus
;
388 static void print_word(FILE *file
, struct diff_words_buffer
*buffer
, int len
, int color
,
389 int suppress_newline
)
397 ptr
= buffer
->text
.ptr
+ buffer
->current
;
398 buffer
->current
+= len
;
400 if (ptr
[len
- 1] == '\n') {
405 fputs(diff_get_color(1, color
), file
);
406 fwrite(ptr
, len
, 1, file
);
407 fputs(diff_get_color(1, DIFF_RESET
), file
);
410 if (suppress_newline
)
411 buffer
->suppressed_newline
= 1;
417 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
419 struct diff_words_data
*diff_words
= priv
;
421 if (diff_words
->minus
.suppressed_newline
) {
423 putc('\n', diff_words
->file
);
424 diff_words
->minus
.suppressed_newline
= 0;
430 print_word(diff_words
->file
,
431 &diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
434 print_word(diff_words
->file
,
435 &diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
438 print_word(diff_words
->file
,
439 &diff_words
->plus
, len
, DIFF_PLAIN
, 0);
440 diff_words
->minus
.current
+= len
;
445 /* this executes the word diff on the accumulated buffers */
446 static void diff_words_show(struct diff_words_data
*diff_words
)
451 mmfile_t minus
, plus
;
454 memset(&xecfg
, 0, sizeof(xecfg
));
455 minus
.size
= diff_words
->minus
.text
.size
;
456 minus
.ptr
= xmalloc(minus
.size
);
457 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
458 for (i
= 0; i
< minus
.size
; i
++)
459 if (isspace(minus
.ptr
[i
]))
461 diff_words
->minus
.current
= 0;
463 plus
.size
= diff_words
->plus
.text
.size
;
464 plus
.ptr
= xmalloc(plus
.size
);
465 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
466 for (i
= 0; i
< plus
.size
; i
++)
467 if (isspace(plus
.ptr
[i
]))
469 diff_words
->plus
.current
= 0;
471 xpp
.flags
= XDF_NEED_MINIMAL
;
472 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
473 ecb
.outf
= xdiff_outf
;
474 ecb
.priv
= diff_words
;
475 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
476 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
480 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
482 if (diff_words
->minus
.suppressed_newline
) {
483 putc('\n', diff_words
->file
);
484 diff_words
->minus
.suppressed_newline
= 0;
488 typedef unsigned long (*sane_truncate_fn
)(char *line
, unsigned long len
);
490 struct emit_callback
{
491 struct xdiff_emit_state xm
;
494 sane_truncate_fn truncate
;
495 const char **label_path
;
496 struct diff_words_data
*diff_words
;
501 static void free_diff_words_data(struct emit_callback
*ecbdata
)
503 if (ecbdata
->diff_words
) {
505 if (ecbdata
->diff_words
->minus
.text
.size
||
506 ecbdata
->diff_words
->plus
.text
.size
)
507 diff_words_show(ecbdata
->diff_words
);
509 free (ecbdata
->diff_words
->minus
.text
.ptr
);
510 free (ecbdata
->diff_words
->plus
.text
.ptr
);
511 free(ecbdata
->diff_words
);
512 ecbdata
->diff_words
= NULL
;
516 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
519 return diff_colors
[ix
];
523 static void emit_line(FILE *file
, const char *set
, const char *reset
, const char *line
, int len
)
525 int has_trailing_newline
, has_trailing_carriage_return
;
527 has_trailing_newline
= (len
> 0 && line
[len
-1] == '\n');
528 if (has_trailing_newline
)
530 has_trailing_carriage_return
= (len
> 0 && line
[len
-1] == '\r');
531 if (has_trailing_carriage_return
)
535 fwrite(line
, len
, 1, file
);
537 if (has_trailing_carriage_return
)
539 if (has_trailing_newline
)
543 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
545 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
546 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
549 emit_line(ecbdata
->file
, set
, reset
, line
, len
);
551 /* Emit just the prefix, then the rest. */
552 emit_line(ecbdata
->file
, set
, reset
, line
, 1);
553 ws_check_emit(line
+ 1, len
- 1, ecbdata
->ws_rule
,
554 ecbdata
->file
, set
, reset
, ws
);
558 static unsigned long sane_truncate_line(struct emit_callback
*ecb
, char *line
, unsigned long len
)
565 return ecb
->truncate(line
, len
);
569 (void) utf8_width(&cp
, &l
);
571 break; /* truncated in the middle? */
576 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
579 struct emit_callback
*ecbdata
= priv
;
580 const char *meta
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
581 const char *plain
= diff_get_color(ecbdata
->color_diff
, DIFF_PLAIN
);
582 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
584 *(ecbdata
->found_changesp
) = 1;
586 if (ecbdata
->label_path
[0]) {
587 const char *name_a_tab
, *name_b_tab
;
589 name_a_tab
= strchr(ecbdata
->label_path
[0], ' ') ? "\t" : "";
590 name_b_tab
= strchr(ecbdata
->label_path
[1], ' ') ? "\t" : "";
592 fprintf(ecbdata
->file
, "%s--- %s%s%s\n",
593 meta
, ecbdata
->label_path
[0], reset
, name_a_tab
);
594 fprintf(ecbdata
->file
, "%s+++ %s%s%s\n",
595 meta
, ecbdata
->label_path
[1], reset
, name_b_tab
);
596 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
599 if (line
[0] == '@') {
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
);
610 emit_line(ecbdata
->file
, reset
, reset
, line
, len
);
615 if (ecbdata
->diff_words
) {
616 if (line
[0] == '-') {
617 diff_words_append(line
, len
,
618 &ecbdata
->diff_words
->minus
);
620 } else if (line
[0] == '+') {
621 diff_words_append(line
, len
,
622 &ecbdata
->diff_words
->plus
);
625 if (ecbdata
->diff_words
->minus
.text
.size
||
626 ecbdata
->diff_words
->plus
.text
.size
)
627 diff_words_show(ecbdata
->diff_words
);
630 emit_line(ecbdata
->file
, plain
, reset
, line
, len
);
634 color
= DIFF_FILE_OLD
;
635 else if (line
[0] == '+')
636 color
= DIFF_FILE_NEW
;
637 if (color
!= DIFF_FILE_NEW
) {
638 emit_line(ecbdata
->file
,
639 diff_get_color(ecbdata
->color_diff
, color
),
643 emit_add_line(reset
, ecbdata
, line
, len
);
646 static char *pprint_rename(const char *a
, const char *b
)
651 int pfx_length
, sfx_length
;
652 int len_a
= strlen(a
);
653 int len_b
= strlen(b
);
654 int a_midlen
, b_midlen
;
655 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
656 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
658 strbuf_init(&name
, 0);
659 if (qlen_a
|| qlen_b
) {
660 quote_c_style(a
, &name
, NULL
, 0);
661 strbuf_addstr(&name
, " => ");
662 quote_c_style(b
, &name
, NULL
, 0);
663 return strbuf_detach(&name
, NULL
);
666 /* Find common prefix */
668 while (*old
&& *new && *old
== *new) {
670 pfx_length
= old
- a
+ 1;
675 /* Find common suffix */
679 while (a
<= old
&& b
<= new && *old
== *new) {
681 sfx_length
= len_a
- (old
- a
);
687 * pfx{mid-a => mid-b}sfx
688 * {pfx-a => pfx-b}sfx
689 * pfx{sfx-a => sfx-b}
692 a_midlen
= len_a
- pfx_length
- sfx_length
;
693 b_midlen
= len_b
- pfx_length
- sfx_length
;
699 strbuf_grow(&name
, pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
700 if (pfx_length
+ sfx_length
) {
701 strbuf_add(&name
, a
, pfx_length
);
702 strbuf_addch(&name
, '{');
704 strbuf_add(&name
, a
+ pfx_length
, a_midlen
);
705 strbuf_addstr(&name
, " => ");
706 strbuf_add(&name
, b
+ pfx_length
, b_midlen
);
707 if (pfx_length
+ sfx_length
) {
708 strbuf_addch(&name
, '}');
709 strbuf_add(&name
, a
+ len_a
- sfx_length
, sfx_length
);
711 return strbuf_detach(&name
, NULL
);
715 struct xdiff_emit_state xm
;
719 struct diffstat_file
{
723 unsigned is_unmerged
:1;
724 unsigned is_binary
:1;
725 unsigned is_renamed
:1;
726 unsigned int added
, deleted
;
730 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
734 struct diffstat_file
*x
;
735 x
= xcalloc(sizeof (*x
), 1);
736 if (diffstat
->nr
== diffstat
->alloc
) {
737 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
738 diffstat
->files
= xrealloc(diffstat
->files
,
739 diffstat
->alloc
* sizeof(x
));
741 diffstat
->files
[diffstat
->nr
++] = x
;
743 x
->from_name
= xstrdup(name_a
);
744 x
->name
= xstrdup(name_b
);
749 x
->name
= xstrdup(name_a
);
754 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
756 struct diffstat_t
*diffstat
= priv
;
757 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
761 else if (line
[0] == '-')
765 const char mime_boundary_leader
[] = "------------";
767 static int scale_linear(int it
, int width
, int max_change
)
770 * make sure that at least one '-' is printed if there were deletions,
771 * and likewise for '+'.
775 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
778 static void show_name(FILE *file
,
779 const char *prefix
, const char *name
, int len
,
780 const char *reset
, const char *set
)
782 fprintf(file
, " %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
785 static void show_graph(FILE *file
, char ch
, int cnt
, const char *set
, const char *reset
)
789 fprintf(file
, "%s", set
);
792 fprintf(file
, "%s", reset
);
795 static void fill_print_name(struct diffstat_file
*file
)
799 if (file
->print_name
)
802 if (!file
->is_renamed
) {
804 strbuf_init(&buf
, 0);
805 if (quote_c_style(file
->name
, &buf
, NULL
, 0)) {
806 pname
= strbuf_detach(&buf
, NULL
);
809 strbuf_release(&buf
);
812 pname
= pprint_rename(file
->from_name
, file
->name
);
814 file
->print_name
= pname
;
817 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
819 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
820 int max_change
= 0, max_len
= 0;
821 int total_files
= data
->nr
;
822 int width
, name_width
;
823 const char *reset
, *set
, *add_c
, *del_c
;
828 width
= options
->stat_width
? options
->stat_width
: 80;
829 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
831 /* Sanity: give at least 5 columns to the graph,
832 * but leave at least 10 columns for the name.
838 else if (width
< name_width
+ 15)
839 name_width
= width
- 15;
841 /* Find the longest filename and max number of changes */
842 reset
= diff_get_color_opt(options
, DIFF_RESET
);
843 set
= diff_get_color_opt(options
, DIFF_PLAIN
);
844 add_c
= diff_get_color_opt(options
, DIFF_FILE_NEW
);
845 del_c
= diff_get_color_opt(options
, DIFF_FILE_OLD
);
847 for (i
= 0; i
< data
->nr
; i
++) {
848 struct diffstat_file
*file
= data
->files
[i
];
849 int change
= file
->added
+ file
->deleted
;
850 fill_print_name(file
);
851 len
= strlen(file
->print_name
);
855 if (file
->is_binary
|| file
->is_unmerged
)
857 if (max_change
< change
)
861 /* Compute the width of the graph part;
862 * 10 is for one blank at the beginning of the line plus
863 * " | count " between the name and the graph.
865 * From here on, name_width is the width of the name area,
866 * and width is the width of the graph area.
868 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
869 if (width
< (name_width
+ 10) + max_change
)
870 width
= width
- (name_width
+ 10);
874 for (i
= 0; i
< data
->nr
; i
++) {
875 const char *prefix
= "";
876 char *name
= data
->files
[i
]->print_name
;
877 int added
= data
->files
[i
]->added
;
878 int deleted
= data
->files
[i
]->deleted
;
882 * "scale" the filename
885 name_len
= strlen(name
);
886 if (name_width
< name_len
) {
890 name
+= name_len
- len
;
891 slash
= strchr(name
, '/');
896 if (data
->files
[i
]->is_binary
) {
897 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
898 fprintf(options
->file
, " Bin ");
899 fprintf(options
->file
, "%s%d%s", del_c
, deleted
, reset
);
900 fprintf(options
->file
, " -> ");
901 fprintf(options
->file
, "%s%d%s", add_c
, added
, reset
);
902 fprintf(options
->file
, " bytes");
903 fprintf(options
->file
, "\n");
906 else if (data
->files
[i
]->is_unmerged
) {
907 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
908 fprintf(options
->file
, " Unmerged\n");
911 else if (!data
->files
[i
]->is_renamed
&&
912 (added
+ deleted
== 0)) {
918 * scale the add/delete
926 if (width
<= max_change
) {
927 add
= scale_linear(add
, width
, max_change
);
928 del
= scale_linear(del
, width
, max_change
);
931 show_name(options
->file
, prefix
, name
, len
, reset
, set
);
932 fprintf(options
->file
, "%5d%s", added
+ deleted
,
933 added
+ deleted
? " " : "");
934 show_graph(options
->file
, '+', add
, add_c
, reset
);
935 show_graph(options
->file
, '-', del
, del_c
, reset
);
936 fprintf(options
->file
, "\n");
938 fprintf(options
->file
,
939 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
940 set
, total_files
, adds
, dels
, reset
);
943 static void show_shortstats(struct diffstat_t
* data
, struct diff_options
*options
)
945 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
950 for (i
= 0; i
< data
->nr
; i
++) {
951 if (!data
->files
[i
]->is_binary
&&
952 !data
->files
[i
]->is_unmerged
) {
953 int added
= data
->files
[i
]->added
;
954 int deleted
= data
->files
[i
]->deleted
;
955 if (!data
->files
[i
]->is_renamed
&&
956 (added
+ deleted
== 0)) {
964 fprintf(options
->file
, " %d files changed, %d insertions(+), %d deletions(-)\n",
965 total_files
, adds
, dels
);
968 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
975 for (i
= 0; i
< data
->nr
; i
++) {
976 struct diffstat_file
*file
= data
->files
[i
];
979 fprintf(options
->file
, "-\t-\t");
981 fprintf(options
->file
,
982 "%d\t%d\t", file
->added
, file
->deleted
);
983 if (options
->line_termination
) {
984 fill_print_name(file
);
985 if (!file
->is_renamed
)
986 write_name_quoted(file
->name
, options
->file
,
987 options
->line_termination
);
989 fputs(file
->print_name
, options
->file
);
990 putc(options
->line_termination
, options
->file
);
993 if (file
->is_renamed
) {
994 putc('\0', options
->file
);
995 write_name_quoted(file
->from_name
, options
->file
, '\0');
997 write_name_quoted(file
->name
, options
->file
, '\0');
1002 struct dirstat_file
{
1004 unsigned long changed
;
1007 struct dirstat_dir
{
1008 struct dirstat_file
*files
;
1009 int alloc
, nr
, percent
, cumulative
;
1012 static long gather_dirstat(FILE *file
, struct dirstat_dir
*dir
, unsigned long changed
, const char *base
, int baselen
)
1014 unsigned long this_dir
= 0;
1015 unsigned int sources
= 0;
1018 struct dirstat_file
*f
= dir
->files
;
1019 int namelen
= strlen(f
->name
);
1023 if (namelen
< baselen
)
1025 if (memcmp(f
->name
, base
, baselen
))
1027 slash
= strchr(f
->name
+ baselen
, '/');
1029 int newbaselen
= slash
+ 1 - f
->name
;
1030 this = gather_dirstat(file
, dir
, changed
, f
->name
, newbaselen
);
1042 * We don't report dirstat's for
1044 * - or cases where everything came from a single directory
1045 * under this directory (sources == 1).
1047 if (baselen
&& sources
!= 1) {
1048 int permille
= this_dir
* 1000 / changed
;
1050 int percent
= permille
/ 10;
1051 if (percent
>= dir
->percent
) {
1052 fprintf(file
, "%4d.%01d%% %.*s\n", percent
, permille
% 10, baselen
, base
);
1053 if (!dir
->cumulative
)
1061 static int dirstat_compare(const void *_a
, const void *_b
)
1063 const struct dirstat_file
*a
= _a
;
1064 const struct dirstat_file
*b
= _b
;
1065 return strcmp(a
->name
, b
->name
);
1068 static void show_dirstat(struct diff_options
*options
)
1071 unsigned long changed
;
1072 struct dirstat_dir dir
;
1073 struct diff_queue_struct
*q
= &diff_queued_diff
;
1078 dir
.percent
= options
->dirstat_percent
;
1079 dir
.cumulative
= DIFF_OPT_TST(options
, DIRSTAT_CUMULATIVE
);
1082 for (i
= 0; i
< q
->nr
; i
++) {
1083 struct diff_filepair
*p
= q
->queue
[i
];
1085 unsigned long copied
, added
, damage
;
1087 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
1089 if (DIFF_FILE_VALID(p
->one
) && DIFF_FILE_VALID(p
->two
)) {
1090 diff_populate_filespec(p
->one
, 0);
1091 diff_populate_filespec(p
->two
, 0);
1092 diffcore_count_changes(p
->one
, p
->two
, NULL
, NULL
, 0,
1094 diff_free_filespec_data(p
->one
);
1095 diff_free_filespec_data(p
->two
);
1096 } else if (DIFF_FILE_VALID(p
->one
)) {
1097 diff_populate_filespec(p
->one
, 1);
1099 diff_free_filespec_data(p
->one
);
1100 } else if (DIFF_FILE_VALID(p
->two
)) {
1101 diff_populate_filespec(p
->two
, 1);
1103 added
= p
->two
->size
;
1104 diff_free_filespec_data(p
->two
);
1109 * Original minus copied is the removed material,
1110 * added is the new material. They are both damages
1111 * made to the preimage.
1113 damage
= (p
->one
->size
- copied
) + added
;
1115 ALLOC_GROW(dir
.files
, dir
.nr
+ 1, dir
.alloc
);
1116 dir
.files
[dir
.nr
].name
= name
;
1117 dir
.files
[dir
.nr
].changed
= damage
;
1122 /* This can happen even with many files, if everything was renames */
1126 /* Show all directories with more than x% of the changes */
1127 qsort(dir
.files
, dir
.nr
, sizeof(dir
.files
[0]), dirstat_compare
);
1128 gather_dirstat(options
->file
, &dir
, changed
, "", 0);
1131 static void free_diffstat_info(struct diffstat_t
*diffstat
)
1134 for (i
= 0; i
< diffstat
->nr
; i
++) {
1135 struct diffstat_file
*f
= diffstat
->files
[i
];
1136 if (f
->name
!= f
->print_name
)
1137 free(f
->print_name
);
1142 free(diffstat
->files
);
1145 struct checkdiff_t
{
1146 struct xdiff_emit_state xm
;
1147 const char *filename
;
1149 struct diff_options
*o
;
1154 static int is_conflict_marker(const char *line
, unsigned long len
)
1161 firstchar
= line
[0];
1162 switch (firstchar
) {
1163 case '=': case '>': case '<':
1168 for (cnt
= 1; cnt
< 7; cnt
++)
1169 if (line
[cnt
] != firstchar
)
1171 /* line[0] thru line[6] are same as firstchar */
1172 if (firstchar
== '=') {
1173 /* divider between ours and theirs? */
1174 if (len
!= 8 || line
[7] != '\n')
1176 } else if (len
< 8 || !isspace(line
[7])) {
1177 /* not divider before ours nor after theirs */
1183 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
1185 struct checkdiff_t
*data
= priv
;
1186 int color_diff
= DIFF_OPT_TST(data
->o
, COLOR_DIFF
);
1187 const char *ws
= diff_get_color(color_diff
, DIFF_WHITESPACE
);
1188 const char *reset
= diff_get_color(color_diff
, DIFF_RESET
);
1189 const char *set
= diff_get_color(color_diff
, DIFF_FILE_NEW
);
1192 if (line
[0] == '+') {
1195 if (is_conflict_marker(line
+ 1, len
- 1)) {
1197 fprintf(data
->o
->file
,
1198 "%s:%d: leftover conflict marker\n",
1199 data
->filename
, data
->lineno
);
1201 bad
= ws_check(line
+ 1, len
- 1, data
->ws_rule
);
1204 data
->status
|= bad
;
1205 err
= whitespace_error_string(bad
);
1206 fprintf(data
->o
->file
, "%s:%d: %s.\n",
1207 data
->filename
, data
->lineno
, err
);
1209 emit_line(data
->o
->file
, set
, reset
, line
, 1);
1210 ws_check_emit(line
+ 1, len
- 1, data
->ws_rule
,
1211 data
->o
->file
, set
, reset
, ws
);
1212 } else if (line
[0] == ' ') {
1214 } else if (line
[0] == '@') {
1215 char *plus
= strchr(line
, '+');
1217 data
->lineno
= strtol(plus
, NULL
, 10) - 1;
1219 die("invalid diff");
1223 static unsigned char *deflate_it(char *data
,
1225 unsigned long *result_size
)
1228 unsigned char *deflated
;
1231 memset(&stream
, 0, sizeof(stream
));
1232 deflateInit(&stream
, zlib_compression_level
);
1233 bound
= deflateBound(&stream
, size
);
1234 deflated
= xmalloc(bound
);
1235 stream
.next_out
= deflated
;
1236 stream
.avail_out
= bound
;
1238 stream
.next_in
= (unsigned char *)data
;
1239 stream
.avail_in
= size
;
1240 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
1242 deflateEnd(&stream
);
1243 *result_size
= stream
.total_out
;
1247 static void emit_binary_diff_body(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1253 unsigned long orig_size
;
1254 unsigned long delta_size
;
1255 unsigned long deflate_size
;
1256 unsigned long data_size
;
1258 /* We could do deflated delta, or we could do just deflated two,
1259 * whichever is smaller.
1262 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
1263 if (one
->size
&& two
->size
) {
1264 delta
= diff_delta(one
->ptr
, one
->size
,
1265 two
->ptr
, two
->size
,
1266 &delta_size
, deflate_size
);
1268 void *to_free
= delta
;
1269 orig_size
= delta_size
;
1270 delta
= deflate_it(delta
, delta_size
, &delta_size
);
1275 if (delta
&& delta_size
< deflate_size
) {
1276 fprintf(file
, "delta %lu\n", orig_size
);
1279 data_size
= delta_size
;
1282 fprintf(file
, "literal %lu\n", two
->size
);
1285 data_size
= deflate_size
;
1288 /* emit data encoded in base85 */
1291 int bytes
= (52 < data_size
) ? 52 : data_size
;
1295 line
[0] = bytes
+ 'A' - 1;
1297 line
[0] = bytes
- 26 + 'a' - 1;
1298 encode_85(line
+ 1, cp
, bytes
);
1299 cp
= (char *) cp
+ bytes
;
1303 fprintf(file
, "\n");
1307 static void emit_binary_diff(FILE *file
, mmfile_t
*one
, mmfile_t
*two
)
1309 fprintf(file
, "GIT binary patch\n");
1310 emit_binary_diff_body(file
, one
, two
);
1311 emit_binary_diff_body(file
, two
, one
);
1314 static void setup_diff_attr_check(struct git_attr_check
*check
)
1316 static struct git_attr
*attr_diff
;
1319 attr_diff
= git_attr("diff", 4);
1321 check
[0].attr
= attr_diff
;
1324 static void diff_filespec_check_attr(struct diff_filespec
*one
)
1326 struct git_attr_check attr_diff_check
;
1327 int check_from_data
= 0;
1329 if (one
->checked_attr
)
1332 setup_diff_attr_check(&attr_diff_check
);
1334 one
->funcname_pattern_ident
= NULL
;
1336 if (!git_checkattr(one
->path
, 1, &attr_diff_check
)) {
1340 value
= attr_diff_check
.value
;
1341 if (ATTR_TRUE(value
))
1343 else if (ATTR_FALSE(value
))
1346 check_from_data
= 1;
1348 /* funcname pattern ident */
1349 if (ATTR_TRUE(value
) || ATTR_FALSE(value
) || ATTR_UNSET(value
))
1352 one
->funcname_pattern_ident
= value
;
1355 if (check_from_data
) {
1356 if (!one
->data
&& DIFF_FILE_VALID(one
))
1357 diff_populate_filespec(one
, 0);
1360 one
->is_binary
= buffer_is_binary(one
->data
, one
->size
);
1364 int diff_filespec_is_binary(struct diff_filespec
*one
)
1366 diff_filespec_check_attr(one
);
1367 return one
->is_binary
;
1370 static const struct funcname_pattern_entry
*funcname_pattern(const char *ident
)
1372 struct funcname_pattern_list
*pp
;
1374 for (pp
= funcname_pattern_list
; pp
; pp
= pp
->next
)
1375 if (!strcmp(ident
, pp
->e
.name
))
1380 static const struct funcname_pattern_entry builtin_funcname_pattern
[] = {
1382 "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
1383 "^[ \t]*(([ \t]*[A-Za-z_][A-Za-z_0-9]*){2,}[ \t]*\\([^;]*)$",
1386 "^((procedure|function|constructor|destructor|interface|"
1387 "implementation|initialization|finalization)[ \t]*.*)$"
1389 "^(.*=[ \t]*(class|record).*)$",
1391 { "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
1394 "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
1396 { "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
1400 static const struct funcname_pattern_entry
*diff_funcname_pattern(struct diff_filespec
*one
)
1403 const struct funcname_pattern_entry
*pe
;
1406 diff_filespec_check_attr(one
);
1407 ident
= one
->funcname_pattern_ident
;
1411 * If the config file has "funcname.default" defined, that
1412 * regexp is used; otherwise NULL is returned and xemit uses
1413 * the built-in default.
1415 return funcname_pattern("default");
1417 /* Look up custom "funcname.$ident" regexp from config. */
1418 pe
= funcname_pattern(ident
);
1423 * And define built-in fallback patterns here. Note that
1424 * these can be overridden by the user's config settings.
1426 for (i
= 0; i
< ARRAY_SIZE(builtin_funcname_pattern
); i
++)
1427 if (!strcmp(ident
, builtin_funcname_pattern
[i
].name
))
1428 return &builtin_funcname_pattern
[i
];
1433 static int count_trailing_blank(mmfile_t
*mf
, unsigned ws_rule
)
1435 char *ptr
= mf
->ptr
;
1436 long size
= mf
->size
;
1441 ptr
+= size
- 1; /* pointing at the very end */
1443 ; /* incomplete line */
1445 ptr
--; /* skip the last LF */
1446 while (mf
->ptr
< ptr
) {
1448 for (prev_eol
= ptr
; mf
->ptr
<= prev_eol
; prev_eol
--)
1449 if (*prev_eol
== '\n')
1451 if (!ws_blank_line(prev_eol
+ 1, ptr
- prev_eol
, ws_rule
))
1459 static int adds_blank_at_eof(mmfile_t
*mf1
, mmfile_t
*mf2
, unsigned ws_rule
)
1462 l1
= count_trailing_blank(mf1
, ws_rule
);
1463 l2
= count_trailing_blank(mf2
, ws_rule
);
1466 /* starting where? */
1467 at
= count_lines(mf1
->ptr
, mf1
->size
);
1468 return (at
- l1
) + 1; /* the line number counts from 1 */
1471 static void builtin_diff(const char *name_a
,
1473 struct diff_filespec
*one
,
1474 struct diff_filespec
*two
,
1475 const char *xfrm_msg
,
1476 struct diff_options
*o
,
1477 int complete_rewrite
)
1481 char *a_one
, *b_two
;
1482 const char *set
= diff_get_color_opt(o
, DIFF_METAINFO
);
1483 const char *reset
= diff_get_color_opt(o
, DIFF_RESET
);
1485 /* Never use a non-valid filename anywhere if at all possible */
1486 name_a
= DIFF_FILE_VALID(one
) ? name_a
: name_b
;
1487 name_b
= DIFF_FILE_VALID(two
) ? name_b
: name_a
;
1489 a_one
= quote_two(o
->a_prefix
, name_a
+ (*name_a
== '/'));
1490 b_two
= quote_two(o
->b_prefix
, name_b
+ (*name_b
== '/'));
1491 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1492 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1493 fprintf(o
->file
, "%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1494 if (lbl
[0][0] == '/') {
1496 fprintf(o
->file
, "%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1497 if (xfrm_msg
&& xfrm_msg
[0])
1498 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1500 else if (lbl
[1][0] == '/') {
1501 fprintf(o
->file
, "%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1502 if (xfrm_msg
&& xfrm_msg
[0])
1503 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1506 if (one
->mode
!= two
->mode
) {
1507 fprintf(o
->file
, "%sold mode %06o%s\n", set
, one
->mode
, reset
);
1508 fprintf(o
->file
, "%snew mode %06o%s\n", set
, two
->mode
, reset
);
1510 if (xfrm_msg
&& xfrm_msg
[0])
1511 fprintf(o
->file
, "%s%s%s\n", set
, xfrm_msg
, reset
);
1513 * we do not run diff between different kind
1516 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1517 goto free_ab_and_return
;
1518 if (complete_rewrite
) {
1519 emit_rewrite_diff(name_a
, name_b
, one
, two
, o
);
1520 o
->found_changes
= 1;
1521 goto free_ab_and_return
;
1525 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1526 die("unable to read files to diff");
1528 if (!DIFF_OPT_TST(o
, TEXT
) &&
1529 (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
))) {
1530 /* Quite common confusing case */
1531 if (mf1
.size
== mf2
.size
&&
1532 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1533 goto free_ab_and_return
;
1534 if (DIFF_OPT_TST(o
, BINARY
))
1535 emit_binary_diff(o
->file
, &mf1
, &mf2
);
1537 fprintf(o
->file
, "Binary files %s and %s differ\n",
1539 o
->found_changes
= 1;
1542 /* Crazy xdl interfaces.. */
1543 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1547 struct emit_callback ecbdata
;
1548 const struct funcname_pattern_entry
*pe
;
1550 pe
= diff_funcname_pattern(one
);
1552 pe
= diff_funcname_pattern(two
);
1554 memset(&xecfg
, 0, sizeof(xecfg
));
1555 memset(&ecbdata
, 0, sizeof(ecbdata
));
1556 ecbdata
.label_path
= lbl
;
1557 ecbdata
.color_diff
= DIFF_OPT_TST(o
, COLOR_DIFF
);
1558 ecbdata
.found_changesp
= &o
->found_changes
;
1559 ecbdata
.ws_rule
= whitespace_rule(name_b
? name_b
: name_a
);
1560 ecbdata
.file
= o
->file
;
1561 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1562 xecfg
.ctxlen
= o
->context
;
1563 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1565 xdiff_set_find_func(&xecfg
, pe
->pattern
, pe
->cflags
);
1568 else if (!prefixcmp(diffopts
, "--unified="))
1569 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1570 else if (!prefixcmp(diffopts
, "-u"))
1571 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1572 ecb
.outf
= xdiff_outf
;
1573 ecb
.priv
= &ecbdata
;
1574 ecbdata
.xm
.consume
= fn_out_consume
;
1575 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
)) {
1576 ecbdata
.diff_words
=
1577 xcalloc(1, sizeof(struct diff_words_data
));
1578 ecbdata
.diff_words
->file
= o
->file
;
1580 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1581 if (DIFF_OPT_TST(o
, COLOR_DIFF_WORDS
))
1582 free_diff_words_data(&ecbdata
);
1586 diff_free_filespec_data(one
);
1587 diff_free_filespec_data(two
);
1593 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1594 struct diff_filespec
*one
,
1595 struct diff_filespec
*two
,
1596 struct diffstat_t
*diffstat
,
1597 struct diff_options
*o
,
1598 int complete_rewrite
)
1601 struct diffstat_file
*data
;
1603 data
= diffstat_add(diffstat
, name_a
, name_b
);
1606 data
->is_unmerged
= 1;
1609 if (complete_rewrite
) {
1610 diff_populate_filespec(one
, 0);
1611 diff_populate_filespec(two
, 0);
1612 data
->deleted
= count_lines(one
->data
, one
->size
);
1613 data
->added
= count_lines(two
->data
, two
->size
);
1614 goto free_and_return
;
1616 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1617 die("unable to read files to diff");
1619 if (diff_filespec_is_binary(one
) || diff_filespec_is_binary(two
)) {
1620 data
->is_binary
= 1;
1621 data
->added
= mf2
.size
;
1622 data
->deleted
= mf1
.size
;
1624 /* Crazy xdl interfaces.. */
1629 memset(&xecfg
, 0, sizeof(xecfg
));
1630 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1631 ecb
.outf
= xdiff_outf
;
1632 ecb
.priv
= diffstat
;
1633 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1637 diff_free_filespec_data(one
);
1638 diff_free_filespec_data(two
);
1641 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1642 const char *attr_path
,
1643 struct diff_filespec
*one
,
1644 struct diff_filespec
*two
,
1645 struct diff_options
*o
)
1648 struct checkdiff_t data
;
1653 memset(&data
, 0, sizeof(data
));
1654 data
.xm
.consume
= checkdiff_consume
;
1655 data
.filename
= name_b
? name_b
: name_a
;
1658 data
.ws_rule
= whitespace_rule(attr_path
);
1660 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1661 die("unable to read files to diff");
1664 * All the other codepaths check both sides, but not checking
1665 * the "old" side here is deliberate. We are checking the newly
1666 * introduced changes, and as long as the "new" side is text, we
1667 * can and should check what it introduces.
1669 if (diff_filespec_is_binary(two
))
1670 goto free_and_return
;
1672 /* Crazy xdl interfaces.. */
1677 memset(&xecfg
, 0, sizeof(xecfg
));
1678 xecfg
.ctxlen
= 1; /* at least one context line */
1679 xpp
.flags
= XDF_NEED_MINIMAL
;
1680 ecb
.outf
= xdiff_outf
;
1682 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1684 if (data
.ws_rule
& WS_BLANK_AT_EOF
) {
1685 int blank_at_eof
= adds_blank_at_eof(&mf1
, &mf2
, data
.ws_rule
);
1689 err
= whitespace_error_string(WS_BLANK_AT_EOF
);
1690 fprintf(o
->file
, "%s:%d: %s.\n",
1691 data
.filename
, blank_at_eof
, err
);
1692 data
.status
= 1; /* report errors */
1697 diff_free_filespec_data(one
);
1698 diff_free_filespec_data(two
);
1700 DIFF_OPT_SET(o
, CHECK_FAILED
);
1703 struct diff_filespec
*alloc_filespec(const char *path
)
1705 int namelen
= strlen(path
);
1706 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1708 memset(spec
, 0, sizeof(*spec
));
1709 spec
->path
= (char *)(spec
+ 1);
1710 memcpy(spec
->path
, path
, namelen
+1);
1715 void free_filespec(struct diff_filespec
*spec
)
1717 if (!--spec
->count
) {
1718 diff_free_filespec_data(spec
);
1723 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1724 unsigned short mode
)
1727 spec
->mode
= canon_mode(mode
);
1728 hashcpy(spec
->sha1
, sha1
);
1729 spec
->sha1_valid
= !is_null_sha1(sha1
);
1734 * Given a name and sha1 pair, if the index tells us the file in
1735 * the work tree has that object contents, return true, so that
1736 * prepare_temp_file() does not have to inflate and extract.
1738 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1740 struct cache_entry
*ce
;
1744 /* We do not read the cache ourselves here, because the
1745 * benchmark with my previous version that always reads cache
1746 * shows that it makes things worse for diff-tree comparing
1747 * two linux-2.6 kernel trees in an already checked out work
1748 * tree. This is because most diff-tree comparisons deal with
1749 * only a small number of files, while reading the cache is
1750 * expensive for a large project, and its cost outweighs the
1751 * savings we get by not inflating the object to a temporary
1752 * file. Practically, this code only helps when we are used
1753 * by diff-cache --cached, which does read the cache before
1759 /* We want to avoid the working directory if our caller
1760 * doesn't need the data in a normal file, this system
1761 * is rather slow with its stat/open/mmap/close syscalls,
1762 * and the object is contained in a pack file. The pack
1763 * is probably already open and will be faster to obtain
1764 * the data through than the working directory. Loose
1765 * objects however would tend to be slower as they need
1766 * to be individually opened and inflated.
1768 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1772 pos
= cache_name_pos(name
, len
);
1775 ce
= active_cache
[pos
];
1778 * This is not the sha1 we are looking for, or
1779 * unreusable because it is not a regular file.
1781 if (hashcmp(sha1
, ce
->sha1
) || !S_ISREG(ce
->ce_mode
))
1785 * If ce matches the file in the work tree, we can reuse it.
1787 if (ce_uptodate(ce
) ||
1788 (!lstat(name
, &st
) && !ce_match_stat(ce
, &st
, 0)))
1794 static int populate_from_stdin(struct diff_filespec
*s
)
1799 strbuf_init(&buf
, 0);
1800 if (strbuf_read(&buf
, 0, 0) < 0)
1801 return error("error while reading from stdin %s",
1804 s
->should_munmap
= 0;
1805 s
->data
= strbuf_detach(&buf
, &size
);
1811 static int diff_populate_gitlink(struct diff_filespec
*s
, int size_only
)
1814 char *data
= xmalloc(100);
1815 len
= snprintf(data
, 100,
1816 "Subproject commit %s\n", sha1_to_hex(s
->sha1
));
1828 * While doing rename detection and pickaxe operation, we may need to
1829 * grab the data for the blob (or file) for our own in-core comparison.
1830 * diff_filespec has data and size fields for this purpose.
1832 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1835 if (!DIFF_FILE_VALID(s
))
1836 die("internal error: asking to populate invalid file.");
1837 if (S_ISDIR(s
->mode
))
1843 if (size_only
&& 0 < s
->size
)
1846 if (S_ISGITLINK(s
->mode
))
1847 return diff_populate_gitlink(s
, size_only
);
1849 if (!s
->sha1_valid
||
1850 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1855 if (!strcmp(s
->path
, "-"))
1856 return populate_from_stdin(s
);
1858 if (lstat(s
->path
, &st
) < 0) {
1859 if (errno
== ENOENT
) {
1863 s
->data
= (char *)"";
1868 s
->size
= xsize_t(st
.st_size
);
1873 if (S_ISLNK(st
.st_mode
)) {
1875 s
->data
= xmalloc(s
->size
);
1877 ret
= readlink(s
->path
, s
->data
, s
->size
);
1884 fd
= open(s
->path
, O_RDONLY
);
1887 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1889 s
->should_munmap
= 1;
1892 * Convert from working tree format to canonical git format
1894 strbuf_init(&buf
, 0);
1895 if (convert_to_git(s
->path
, s
->data
, s
->size
, &buf
, safe_crlf
)) {
1897 munmap(s
->data
, s
->size
);
1898 s
->should_munmap
= 0;
1899 s
->data
= strbuf_detach(&buf
, &size
);
1905 enum object_type type
;
1907 type
= sha1_object_info(s
->sha1
, &s
->size
);
1909 s
->data
= read_sha1_file(s
->sha1
, &type
, &s
->size
);
1916 void diff_free_filespec_blob(struct diff_filespec
*s
)
1920 else if (s
->should_munmap
)
1921 munmap(s
->data
, s
->size
);
1923 if (s
->should_free
|| s
->should_munmap
) {
1924 s
->should_free
= s
->should_munmap
= 0;
1929 void diff_free_filespec_data(struct diff_filespec
*s
)
1931 diff_free_filespec_blob(s
);
1936 static void prep_temp_blob(struct diff_tempfile
*temp
,
1939 const unsigned char *sha1
,
1944 fd
= git_mkstemp(temp
->tmp_path
, PATH_MAX
, ".diff_XXXXXX");
1946 die("unable to create temp-file: %s", strerror(errno
));
1947 if (write_in_full(fd
, blob
, size
) != size
)
1948 die("unable to write temp-file");
1950 temp
->name
= temp
->tmp_path
;
1951 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1953 sprintf(temp
->mode
, "%06o", mode
);
1956 static void prepare_temp_file(const char *name
,
1957 struct diff_tempfile
*temp
,
1958 struct diff_filespec
*one
)
1960 if (!DIFF_FILE_VALID(one
)) {
1962 /* A '-' entry produces this for file-2, and
1963 * a '+' entry produces this for file-1.
1965 temp
->name
= "/dev/null";
1966 strcpy(temp
->hex
, ".");
1967 strcpy(temp
->mode
, ".");
1971 if (!one
->sha1_valid
||
1972 reuse_worktree_file(name
, one
->sha1
, 1)) {
1974 if (lstat(name
, &st
) < 0) {
1975 if (errno
== ENOENT
)
1976 goto not_a_valid_file
;
1977 die("stat(%s): %s", name
, strerror(errno
));
1979 if (S_ISLNK(st
.st_mode
)) {
1981 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1982 size_t sz
= xsize_t(st
.st_size
);
1983 if (sizeof(buf
) <= st
.st_size
)
1984 die("symlink too long: %s", name
);
1985 ret
= readlink(name
, buf
, sz
);
1987 die("readlink(%s)", name
);
1988 prep_temp_blob(temp
, buf
, sz
,
1990 one
->sha1
: null_sha1
),
1992 one
->mode
: S_IFLNK
));
1995 /* we can borrow from the file in the work tree */
1997 if (!one
->sha1_valid
)
1998 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
2000 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
2001 /* Even though we may sometimes borrow the
2002 * contents from the work tree, we always want
2003 * one->mode. mode is trustworthy even when
2004 * !(one->sha1_valid), as long as
2005 * DIFF_FILE_VALID(one).
2007 sprintf(temp
->mode
, "%06o", one
->mode
);
2012 if (diff_populate_filespec(one
, 0))
2013 die("cannot read data blob for %s", one
->path
);
2014 prep_temp_blob(temp
, one
->data
, one
->size
,
2015 one
->sha1
, one
->mode
);
2019 static void remove_tempfile(void)
2023 for (i
= 0; i
< 2; i
++)
2024 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
2025 unlink(diff_temp
[i
].name
);
2026 diff_temp
[i
].name
= NULL
;
2030 static void remove_tempfile_on_signal(int signo
)
2033 signal(SIGINT
, SIG_DFL
);
2037 /* An external diff command takes:
2039 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2040 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2043 static void run_external_diff(const char *pgm
,
2046 struct diff_filespec
*one
,
2047 struct diff_filespec
*two
,
2048 const char *xfrm_msg
,
2049 int complete_rewrite
)
2051 const char *spawn_arg
[10];
2052 struct diff_tempfile
*temp
= diff_temp
;
2054 static int atexit_asked
= 0;
2055 const char *othername
;
2056 const char **arg
= &spawn_arg
[0];
2058 othername
= (other
? other
: name
);
2060 prepare_temp_file(name
, &temp
[0], one
);
2061 prepare_temp_file(othername
, &temp
[1], two
);
2062 if (! atexit_asked
&&
2063 (temp
[0].name
== temp
[0].tmp_path
||
2064 temp
[1].name
== temp
[1].tmp_path
)) {
2066 atexit(remove_tempfile
);
2068 signal(SIGINT
, remove_tempfile_on_signal
);
2074 *arg
++ = temp
[0].name
;
2075 *arg
++ = temp
[0].hex
;
2076 *arg
++ = temp
[0].mode
;
2077 *arg
++ = temp
[1].name
;
2078 *arg
++ = temp
[1].hex
;
2079 *arg
++ = temp
[1].mode
;
2090 retval
= run_command_v_opt(spawn_arg
, 0);
2093 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
2098 static const char *external_diff_attr(const char *name
)
2100 struct git_attr_check attr_diff_check
;
2105 setup_diff_attr_check(&attr_diff_check
);
2106 if (!git_checkattr(name
, 1, &attr_diff_check
)) {
2107 const char *value
= attr_diff_check
.value
;
2108 if (!ATTR_TRUE(value
) &&
2109 !ATTR_FALSE(value
) &&
2110 !ATTR_UNSET(value
)) {
2111 struct ll_diff_driver
*drv
;
2113 for (drv
= user_diff
; drv
; drv
= drv
->next
)
2114 if (!strcmp(drv
->name
, value
))
2121 static int similarity_index(struct diff_filepair
*p
)
2123 return p
->score
* 100 / MAX_SCORE
;
2126 static void fill_metainfo(struct strbuf
*msg
,
2129 struct diff_filespec
*one
,
2130 struct diff_filespec
*two
,
2131 struct diff_options
*o
,
2132 struct diff_filepair
*p
)
2134 strbuf_init(msg
, PATH_MAX
* 2 + 300);
2135 switch (p
->status
) {
2136 case DIFF_STATUS_COPIED
:
2137 strbuf_addf(msg
, "similarity index %d%%", similarity_index(p
));
2138 strbuf_addstr(msg
, "\ncopy from ");
2139 quote_c_style(name
, msg
, NULL
, 0);
2140 strbuf_addstr(msg
, "\ncopy to ");
2141 quote_c_style(other
, msg
, NULL
, 0);
2142 strbuf_addch(msg
, '\n');
2144 case DIFF_STATUS_RENAMED
:
2145 strbuf_addf(msg
, "similarity index %d%%", similarity_index(p
));
2146 strbuf_addstr(msg
, "\nrename from ");
2147 quote_c_style(name
, msg
, NULL
, 0);
2148 strbuf_addstr(msg
, "\nrename to ");
2149 quote_c_style(other
, msg
, NULL
, 0);
2150 strbuf_addch(msg
, '\n');
2152 case DIFF_STATUS_MODIFIED
:
2154 strbuf_addf(msg
, "dissimilarity index %d%%\n",
2155 similarity_index(p
));
2163 if (one
&& two
&& hashcmp(one
->sha1
, two
->sha1
)) {
2164 int abbrev
= DIFF_OPT_TST(o
, FULL_INDEX
) ? 40 : DEFAULT_ABBREV
;
2166 if (DIFF_OPT_TST(o
, BINARY
)) {
2168 if ((!fill_mmfile(&mf
, one
) && diff_filespec_is_binary(one
)) ||
2169 (!fill_mmfile(&mf
, two
) && diff_filespec_is_binary(two
)))
2172 strbuf_addf(msg
, "index %.*s..%.*s",
2173 abbrev
, sha1_to_hex(one
->sha1
),
2174 abbrev
, sha1_to_hex(two
->sha1
));
2175 if (one
->mode
== two
->mode
)
2176 strbuf_addf(msg
, " %06o", one
->mode
);
2177 strbuf_addch(msg
, '\n');
2180 strbuf_setlen(msg
, msg
->len
- 1);
2183 static void run_diff_cmd(const char *pgm
,
2186 const char *attr_path
,
2187 struct diff_filespec
*one
,
2188 struct diff_filespec
*two
,
2190 struct diff_options
*o
,
2191 struct diff_filepair
*p
)
2193 const char *xfrm_msg
= NULL
;
2194 int complete_rewrite
= (p
->status
== DIFF_STATUS_MODIFIED
) && p
->score
;
2197 fill_metainfo(msg
, name
, other
, one
, two
, o
, p
);
2198 xfrm_msg
= msg
->len
? msg
->buf
: NULL
;
2201 if (!DIFF_OPT_TST(o
, ALLOW_EXTERNAL
))
2204 const char *cmd
= external_diff_attr(attr_path
);
2210 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
2215 builtin_diff(name
, other
? other
: name
,
2216 one
, two
, xfrm_msg
, o
, complete_rewrite
);
2218 fprintf(o
->file
, "* Unmerged path %s\n", name
);
2221 static void diff_fill_sha1_info(struct diff_filespec
*one
)
2223 if (DIFF_FILE_VALID(one
)) {
2224 if (!one
->sha1_valid
) {
2226 if (!strcmp(one
->path
, "-")) {
2227 hashcpy(one
->sha1
, null_sha1
);
2230 if (lstat(one
->path
, &st
) < 0)
2231 die("stat %s", one
->path
);
2232 if (index_path(one
->sha1
, one
->path
, &st
, 0))
2233 die("cannot hash %s\n", one
->path
);
2240 static void strip_prefix(int prefix_length
, const char **namep
, const char **otherp
)
2242 /* Strip the prefix but do not molest /dev/null and absolute paths */
2243 if (*namep
&& **namep
!= '/')
2244 *namep
+= prefix_length
;
2245 if (*otherp
&& **otherp
!= '/')
2246 *otherp
+= prefix_length
;
2249 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
2251 const char *pgm
= external_diff();
2253 struct diff_filespec
*one
= p
->one
;
2254 struct diff_filespec
*two
= p
->two
;
2257 const char *attr_path
;
2259 name
= p
->one
->path
;
2260 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2262 if (o
->prefix_length
)
2263 strip_prefix(o
->prefix_length
, &name
, &other
);
2265 if (DIFF_PAIR_UNMERGED(p
)) {
2266 run_diff_cmd(pgm
, name
, NULL
, attr_path
,
2267 NULL
, NULL
, NULL
, o
, p
);
2271 diff_fill_sha1_info(one
);
2272 diff_fill_sha1_info(two
);
2275 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
2276 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
2278 * a filepair that changes between file and symlink
2279 * needs to be split into deletion and creation.
2281 struct diff_filespec
*null
= alloc_filespec(two
->path
);
2282 run_diff_cmd(NULL
, name
, other
, attr_path
,
2283 one
, null
, &msg
, o
, p
);
2285 strbuf_release(&msg
);
2287 null
= alloc_filespec(one
->path
);
2288 run_diff_cmd(NULL
, name
, other
, attr_path
,
2289 null
, two
, &msg
, o
, p
);
2293 run_diff_cmd(pgm
, name
, other
, attr_path
,
2294 one
, two
, &msg
, o
, p
);
2296 strbuf_release(&msg
);
2299 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
2300 struct diffstat_t
*diffstat
)
2304 int complete_rewrite
= 0;
2306 if (DIFF_PAIR_UNMERGED(p
)) {
2308 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
2312 name
= p
->one
->path
;
2313 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2315 if (o
->prefix_length
)
2316 strip_prefix(o
->prefix_length
, &name
, &other
);
2318 diff_fill_sha1_info(p
->one
);
2319 diff_fill_sha1_info(p
->two
);
2321 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
2322 complete_rewrite
= 1;
2323 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
2326 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
2330 const char *attr_path
;
2332 if (DIFF_PAIR_UNMERGED(p
)) {
2337 name
= p
->one
->path
;
2338 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
2339 attr_path
= other
? other
: name
;
2341 if (o
->prefix_length
)
2342 strip_prefix(o
->prefix_length
, &name
, &other
);
2344 diff_fill_sha1_info(p
->one
);
2345 diff_fill_sha1_info(p
->two
);
2347 builtin_checkdiff(name
, other
, attr_path
, p
->one
, p
->two
, o
);
2350 void diff_setup(struct diff_options
*options
)
2352 memset(options
, 0, sizeof(*options
));
2354 options
->file
= stdout
;
2356 options
->line_termination
= '\n';
2357 options
->break_opt
= -1;
2358 options
->rename_limit
= -1;
2359 options
->dirstat_percent
= 3;
2360 DIFF_OPT_CLR(options
, DIRSTAT_CUMULATIVE
);
2361 options
->context
= 3;
2363 options
->change
= diff_change
;
2364 options
->add_remove
= diff_addremove
;
2365 if (diff_use_color_default
> 0)
2366 DIFF_OPT_SET(options
, COLOR_DIFF
);
2368 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2369 options
->detect_rename
= diff_detect_rename_default
;
2371 options
->a_prefix
= "a/";
2372 options
->b_prefix
= "b/";
2375 int diff_setup_done(struct diff_options
*options
)
2379 if (options
->output_format
& DIFF_FORMAT_NAME
)
2381 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
2383 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
2385 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
2388 die("--name-only, --name-status, --check and -s are mutually exclusive");
2390 if (DIFF_OPT_TST(options
, FIND_COPIES_HARDER
))
2391 options
->detect_rename
= DIFF_DETECT_COPY
;
2393 if (!DIFF_OPT_TST(options
, RELATIVE_NAME
))
2394 options
->prefix
= NULL
;
2395 if (options
->prefix
)
2396 options
->prefix_length
= strlen(options
->prefix
);
2398 options
->prefix_length
= 0;
2400 if (options
->output_format
& (DIFF_FORMAT_NAME
|
2401 DIFF_FORMAT_NAME_STATUS
|
2402 DIFF_FORMAT_CHECKDIFF
|
2403 DIFF_FORMAT_NO_OUTPUT
))
2404 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
2405 DIFF_FORMAT_NUMSTAT
|
2406 DIFF_FORMAT_DIFFSTAT
|
2407 DIFF_FORMAT_SHORTSTAT
|
2408 DIFF_FORMAT_DIRSTAT
|
2409 DIFF_FORMAT_SUMMARY
|
2413 * These cases always need recursive; we do not drop caller-supplied
2414 * recursive bits for other formats here.
2416 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
2417 DIFF_FORMAT_NUMSTAT
|
2418 DIFF_FORMAT_DIFFSTAT
|
2419 DIFF_FORMAT_SHORTSTAT
|
2420 DIFF_FORMAT_DIRSTAT
|
2421 DIFF_FORMAT_SUMMARY
|
2422 DIFF_FORMAT_CHECKDIFF
))
2423 DIFF_OPT_SET(options
, RECURSIVE
);
2425 * Also pickaxe would not work very well if you do not say recursive
2427 if (options
->pickaxe
)
2428 DIFF_OPT_SET(options
, RECURSIVE
);
2430 if (options
->detect_rename
&& options
->rename_limit
< 0)
2431 options
->rename_limit
= diff_rename_limit_default
;
2432 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
2434 /* read-cache does not die even when it fails
2435 * so it is safe for us to do this here. Also
2436 * it does not smudge active_cache or active_nr
2437 * when it fails, so we do not have to worry about
2438 * cleaning it up ourselves either.
2442 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
2443 options
->abbrev
= 40; /* full */
2446 * It does not make sense to show the first hit we happened
2447 * to have found. It does not make sense not to return with
2448 * exit code in such a case either.
2450 if (DIFF_OPT_TST(options
, QUIET
)) {
2451 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
2452 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2458 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
2468 if (c
== arg_short
) {
2472 if (val
&& isdigit(c
)) {
2474 int n
= strtoul(arg
, &end
, 10);
2485 eq
= strchr(arg
, '=');
2490 if (!len
|| strncmp(arg
, arg_long
, len
))
2495 if (!isdigit(*++eq
))
2497 n
= strtoul(eq
, &end
, 10);
2505 static int diff_scoreopt_parse(const char *opt
);
2507 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
2509 const char *arg
= av
[0];
2511 /* Output format options */
2512 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
2513 options
->output_format
|= DIFF_FORMAT_PATCH
;
2514 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
2515 options
->output_format
|= DIFF_FORMAT_PATCH
;
2516 else if (!strcmp(arg
, "--raw"))
2517 options
->output_format
|= DIFF_FORMAT_RAW
;
2518 else if (!strcmp(arg
, "--patch-with-raw"))
2519 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
2520 else if (!strcmp(arg
, "--numstat"))
2521 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
2522 else if (!strcmp(arg
, "--shortstat"))
2523 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
2524 else if (opt_arg(arg
, 'X', "dirstat", &options
->dirstat_percent
))
2525 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2526 else if (!strcmp(arg
, "--cumulative")) {
2527 options
->output_format
|= DIFF_FORMAT_DIRSTAT
;
2528 DIFF_OPT_SET(options
, DIRSTAT_CUMULATIVE
);
2530 else if (!strcmp(arg
, "--check"))
2531 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
2532 else if (!strcmp(arg
, "--summary"))
2533 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
2534 else if (!strcmp(arg
, "--patch-with-stat"))
2535 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
2536 else if (!strcmp(arg
, "--name-only"))
2537 options
->output_format
|= DIFF_FORMAT_NAME
;
2538 else if (!strcmp(arg
, "--name-status"))
2539 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
2540 else if (!strcmp(arg
, "-s"))
2541 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2542 else if (!prefixcmp(arg
, "--stat")) {
2544 int width
= options
->stat_width
;
2545 int name_width
= options
->stat_name_width
;
2551 if (!prefixcmp(arg
, "-width="))
2552 width
= strtoul(arg
+ 7, &end
, 10);
2553 else if (!prefixcmp(arg
, "-name-width="))
2554 name_width
= strtoul(arg
+ 12, &end
, 10);
2557 width
= strtoul(arg
+1, &end
, 10);
2559 name_width
= strtoul(end
+1, &end
, 10);
2562 /* Important! This checks all the error cases! */
2565 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
2566 options
->stat_name_width
= name_width
;
2567 options
->stat_width
= width
;
2570 /* renames options */
2571 else if (!prefixcmp(arg
, "-B")) {
2572 if ((options
->break_opt
= diff_scoreopt_parse(arg
)) == -1)
2575 else if (!prefixcmp(arg
, "-M")) {
2576 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2578 options
->detect_rename
= DIFF_DETECT_RENAME
;
2580 else if (!prefixcmp(arg
, "-C")) {
2581 if (options
->detect_rename
== DIFF_DETECT_COPY
)
2582 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2583 if ((options
->rename_score
= diff_scoreopt_parse(arg
)) == -1)
2585 options
->detect_rename
= DIFF_DETECT_COPY
;
2587 else if (!strcmp(arg
, "--no-renames"))
2588 options
->detect_rename
= 0;
2589 else if (!strcmp(arg
, "--relative"))
2590 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2591 else if (!prefixcmp(arg
, "--relative=")) {
2592 DIFF_OPT_SET(options
, RELATIVE_NAME
);
2593 options
->prefix
= arg
+ 11;
2597 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2598 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2599 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2600 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2601 else if (!strcmp(arg
, "--ignore-space-at-eol"))
2602 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2605 else if (!strcmp(arg
, "--binary")) {
2606 options
->output_format
|= DIFF_FORMAT_PATCH
;
2607 DIFF_OPT_SET(options
, BINARY
);
2609 else if (!strcmp(arg
, "--full-index"))
2610 DIFF_OPT_SET(options
, FULL_INDEX
);
2611 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text"))
2612 DIFF_OPT_SET(options
, TEXT
);
2613 else if (!strcmp(arg
, "-R"))
2614 DIFF_OPT_SET(options
, REVERSE_DIFF
);
2615 else if (!strcmp(arg
, "--find-copies-harder"))
2616 DIFF_OPT_SET(options
, FIND_COPIES_HARDER
);
2617 else if (!strcmp(arg
, "--follow"))
2618 DIFF_OPT_SET(options
, FOLLOW_RENAMES
);
2619 else if (!strcmp(arg
, "--color"))
2620 DIFF_OPT_SET(options
, COLOR_DIFF
);
2621 else if (!strcmp(arg
, "--no-color"))
2622 DIFF_OPT_CLR(options
, COLOR_DIFF
);
2623 else if (!strcmp(arg
, "--color-words"))
2624 options
->flags
|= DIFF_OPT_COLOR_DIFF
| DIFF_OPT_COLOR_DIFF_WORDS
;
2625 else if (!strcmp(arg
, "--exit-code"))
2626 DIFF_OPT_SET(options
, EXIT_WITH_STATUS
);
2627 else if (!strcmp(arg
, "--quiet"))
2628 DIFF_OPT_SET(options
, QUIET
);
2629 else if (!strcmp(arg
, "--ext-diff"))
2630 DIFF_OPT_SET(options
, ALLOW_EXTERNAL
);
2631 else if (!strcmp(arg
, "--no-ext-diff"))
2632 DIFF_OPT_CLR(options
, ALLOW_EXTERNAL
);
2633 else if (!strcmp(arg
, "--ignore-submodules"))
2634 DIFF_OPT_SET(options
, IGNORE_SUBMODULES
);
2637 else if (!strcmp(arg
, "-z"))
2638 options
->line_termination
= 0;
2639 else if (!prefixcmp(arg
, "-l"))
2640 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
2641 else if (!prefixcmp(arg
, "-S"))
2642 options
->pickaxe
= arg
+ 2;
2643 else if (!strcmp(arg
, "--pickaxe-all"))
2644 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2645 else if (!strcmp(arg
, "--pickaxe-regex"))
2646 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2647 else if (!prefixcmp(arg
, "-O"))
2648 options
->orderfile
= arg
+ 2;
2649 else if (!prefixcmp(arg
, "--diff-filter="))
2650 options
->filter
= arg
+ 14;
2651 else if (!strcmp(arg
, "--abbrev"))
2652 options
->abbrev
= DEFAULT_ABBREV
;
2653 else if (!prefixcmp(arg
, "--abbrev=")) {
2654 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2655 if (options
->abbrev
< MINIMUM_ABBREV
)
2656 options
->abbrev
= MINIMUM_ABBREV
;
2657 else if (40 < options
->abbrev
)
2658 options
->abbrev
= 40;
2660 else if (!prefixcmp(arg
, "--src-prefix="))
2661 options
->a_prefix
= arg
+ 13;
2662 else if (!prefixcmp(arg
, "--dst-prefix="))
2663 options
->b_prefix
= arg
+ 13;
2664 else if (!strcmp(arg
, "--no-prefix"))
2665 options
->a_prefix
= options
->b_prefix
= "";
2666 else if (!prefixcmp(arg
, "--output=")) {
2667 options
->file
= fopen(arg
+ strlen("--output="), "w");
2668 options
->close_file
= 1;
2674 static int parse_num(const char **cp_p
)
2676 unsigned long num
, scale
;
2678 const char *cp
= *cp_p
;
2685 if ( !dot
&& ch
== '.' ) {
2688 } else if ( ch
== '%' ) {
2689 scale
= dot
? scale
*100 : 100;
2690 cp
++; /* % is always at the end */
2692 } else if ( ch
>= '0' && ch
<= '9' ) {
2693 if ( scale
< 100000 ) {
2695 num
= (num
*10) + (ch
-'0');
2704 /* user says num divided by scale and we say internally that
2705 * is MAX_SCORE * num / scale.
2707 return (int)((num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
));
2710 static int diff_scoreopt_parse(const char *opt
)
2712 int opt1
, opt2
, cmd
;
2717 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2718 return -1; /* that is not a -M, -C nor -B option */
2720 opt1
= parse_num(&opt
);
2726 else if (*opt
!= '/')
2727 return -1; /* we expect -B80/99 or -B80 */
2730 opt2
= parse_num(&opt
);
2735 return opt1
| (opt2
<< 16);
2738 struct diff_queue_struct diff_queued_diff
;
2740 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2742 if (queue
->alloc
<= queue
->nr
) {
2743 queue
->alloc
= alloc_nr(queue
->alloc
);
2744 queue
->queue
= xrealloc(queue
->queue
,
2745 sizeof(dp
) * queue
->alloc
);
2747 queue
->queue
[queue
->nr
++] = dp
;
2750 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2751 struct diff_filespec
*one
,
2752 struct diff_filespec
*two
)
2754 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2762 void diff_free_filepair(struct diff_filepair
*p
)
2764 free_filespec(p
->one
);
2765 free_filespec(p
->two
);
2769 /* This is different from find_unique_abbrev() in that
2770 * it stuffs the result with dots for alignment.
2772 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2777 return sha1_to_hex(sha1
);
2779 abbrev
= find_unique_abbrev(sha1
, len
);
2780 abblen
= strlen(abbrev
);
2782 static char hex
[41];
2783 if (len
< abblen
&& abblen
<= len
+ 2)
2784 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2786 sprintf(hex
, "%s...", abbrev
);
2789 return sha1_to_hex(sha1
);
2792 static void diff_flush_raw(struct diff_filepair
*p
, struct diff_options
*opt
)
2794 int line_termination
= opt
->line_termination
;
2795 int inter_name_termination
= line_termination
? '\t' : '\0';
2797 if (!(opt
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2798 fprintf(opt
->file
, ":%06o %06o %s ", p
->one
->mode
, p
->two
->mode
,
2799 diff_unique_abbrev(p
->one
->sha1
, opt
->abbrev
));
2800 fprintf(opt
->file
, "%s ", diff_unique_abbrev(p
->two
->sha1
, opt
->abbrev
));
2803 fprintf(opt
->file
, "%c%03d%c", p
->status
, similarity_index(p
),
2804 inter_name_termination
);
2806 fprintf(opt
->file
, "%c%c", p
->status
, inter_name_termination
);
2809 if (p
->status
== DIFF_STATUS_COPIED
||
2810 p
->status
== DIFF_STATUS_RENAMED
) {
2811 const char *name_a
, *name_b
;
2812 name_a
= p
->one
->path
;
2813 name_b
= p
->two
->path
;
2814 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2815 write_name_quoted(name_a
, opt
->file
, inter_name_termination
);
2816 write_name_quoted(name_b
, opt
->file
, line_termination
);
2818 const char *name_a
, *name_b
;
2819 name_a
= p
->one
->mode
? p
->one
->path
: p
->two
->path
;
2821 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
2822 write_name_quoted(name_a
, opt
->file
, line_termination
);
2826 int diff_unmodified_pair(struct diff_filepair
*p
)
2828 /* This function is written stricter than necessary to support
2829 * the currently implemented transformers, but the idea is to
2830 * let transformers to produce diff_filepairs any way they want,
2831 * and filter and clean them up here before producing the output.
2833 struct diff_filespec
*one
= p
->one
, *two
= p
->two
;
2835 if (DIFF_PAIR_UNMERGED(p
))
2836 return 0; /* unmerged is interesting */
2838 /* deletion, addition, mode or type change
2839 * and rename are all interesting.
2841 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2842 DIFF_PAIR_MODE_CHANGED(p
) ||
2843 strcmp(one
->path
, two
->path
))
2846 /* both are valid and point at the same path. that is, we are
2847 * dealing with a change.
2849 if (one
->sha1_valid
&& two
->sha1_valid
&&
2850 !hashcmp(one
->sha1
, two
->sha1
))
2851 return 1; /* no change */
2852 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2853 return 1; /* both look at the same file on the filesystem. */
2857 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2859 if (diff_unmodified_pair(p
))
2862 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2863 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2864 return; /* no tree diffs in patch format */
2869 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2870 struct diffstat_t
*diffstat
)
2872 if (diff_unmodified_pair(p
))
2875 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2876 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2877 return; /* no tree diffs in patch format */
2879 run_diffstat(p
, o
, diffstat
);
2882 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2883 struct diff_options
*o
)
2885 if (diff_unmodified_pair(p
))
2888 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2889 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2890 return; /* no tree diffs in patch format */
2892 run_checkdiff(p
, o
);
2895 int diff_queue_is_empty(void)
2897 struct diff_queue_struct
*q
= &diff_queued_diff
;
2899 for (i
= 0; i
< q
->nr
; i
++)
2900 if (!diff_unmodified_pair(q
->queue
[i
]))
2906 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2908 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2911 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2913 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2914 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2916 s
->size
, s
->xfrm_flags
);
2919 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2921 diff_debug_filespec(p
->one
, i
, "one");
2922 diff_debug_filespec(p
->two
, i
, "two");
2923 fprintf(stderr
, "score %d, status %c rename_used %d broken %d\n",
2924 p
->score
, p
->status
? p
->status
: '?',
2925 p
->one
->rename_used
, p
->broken_pair
);
2928 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2932 fprintf(stderr
, "%s\n", msg
);
2933 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2934 for (i
= 0; i
< q
->nr
; i
++) {
2935 struct diff_filepair
*p
= q
->queue
[i
];
2936 diff_debug_filepair(p
, i
);
2941 static void diff_resolve_rename_copy(void)
2944 struct diff_filepair
*p
;
2945 struct diff_queue_struct
*q
= &diff_queued_diff
;
2947 diff_debug_queue("resolve-rename-copy", q
);
2949 for (i
= 0; i
< q
->nr
; i
++) {
2951 p
->status
= 0; /* undecided */
2952 if (DIFF_PAIR_UNMERGED(p
))
2953 p
->status
= DIFF_STATUS_UNMERGED
;
2954 else if (!DIFF_FILE_VALID(p
->one
))
2955 p
->status
= DIFF_STATUS_ADDED
;
2956 else if (!DIFF_FILE_VALID(p
->two
))
2957 p
->status
= DIFF_STATUS_DELETED
;
2958 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2959 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2961 /* from this point on, we are dealing with a pair
2962 * whose both sides are valid and of the same type, i.e.
2963 * either in-place edit or rename/copy edit.
2965 else if (DIFF_PAIR_RENAME(p
)) {
2967 * A rename might have re-connected a broken
2968 * pair up, causing the pathnames to be the
2969 * same again. If so, that's not a rename at
2970 * all, just a modification..
2972 * Otherwise, see if this source was used for
2973 * multiple renames, in which case we decrement
2974 * the count, and call it a copy.
2976 if (!strcmp(p
->one
->path
, p
->two
->path
))
2977 p
->status
= DIFF_STATUS_MODIFIED
;
2978 else if (--p
->one
->rename_used
> 0)
2979 p
->status
= DIFF_STATUS_COPIED
;
2981 p
->status
= DIFF_STATUS_RENAMED
;
2983 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2984 p
->one
->mode
!= p
->two
->mode
||
2985 is_null_sha1(p
->one
->sha1
))
2986 p
->status
= DIFF_STATUS_MODIFIED
;
2988 /* This is a "no-change" entry and should not
2989 * happen anymore, but prepare for broken callers.
2991 error("feeding unmodified %s to diffcore",
2993 p
->status
= DIFF_STATUS_UNKNOWN
;
2996 diff_debug_queue("resolve-rename-copy done", q
);
2999 static int check_pair_status(struct diff_filepair
*p
)
3001 switch (p
->status
) {
3002 case DIFF_STATUS_UNKNOWN
:
3005 die("internal error in diff-resolve-rename-copy");
3011 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
3013 int fmt
= opt
->output_format
;
3015 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
3016 diff_flush_checkdiff(p
, opt
);
3017 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
3018 diff_flush_raw(p
, opt
);
3019 else if (fmt
& DIFF_FORMAT_NAME
) {
3020 const char *name_a
, *name_b
;
3021 name_a
= p
->two
->path
;
3023 strip_prefix(opt
->prefix_length
, &name_a
, &name_b
);
3024 write_name_quoted(name_a
, opt
->file
, opt
->line_termination
);
3028 static void show_file_mode_name(FILE *file
, const char *newdelete
, struct diff_filespec
*fs
)
3031 fprintf(file
, " %s mode %06o ", newdelete
, fs
->mode
);
3033 fprintf(file
, " %s ", newdelete
);
3034 write_name_quoted(fs
->path
, file
, '\n');
3038 static void show_mode_change(FILE *file
, struct diff_filepair
*p
, int show_name
)
3040 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
3041 fprintf(file
, " mode change %06o => %06o%c", p
->one
->mode
, p
->two
->mode
,
3042 show_name
? ' ' : '\n');
3044 write_name_quoted(p
->two
->path
, file
, '\n');
3049 static void show_rename_copy(FILE *file
, const char *renamecopy
, struct diff_filepair
*p
)
3051 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
3053 fprintf(file
, " %s %s (%d%%)\n", renamecopy
, names
, similarity_index(p
));
3055 show_mode_change(file
, p
, 0);
3058 static void diff_summary(FILE *file
, struct diff_filepair
*p
)
3061 case DIFF_STATUS_DELETED
:
3062 show_file_mode_name(file
, "delete", p
->one
);
3064 case DIFF_STATUS_ADDED
:
3065 show_file_mode_name(file
, "create", p
->two
);
3067 case DIFF_STATUS_COPIED
:
3068 show_rename_copy(file
, "copy", p
);
3070 case DIFF_STATUS_RENAMED
:
3071 show_rename_copy(file
, "rename", p
);
3075 fputs(" rewrite ", file
);
3076 write_name_quoted(p
->two
->path
, file
, ' ');
3077 fprintf(file
, "(%d%%)\n", similarity_index(p
));
3079 show_mode_change(file
, p
, !p
->score
);
3085 struct xdiff_emit_state xm
;
3090 static int remove_space(char *line
, int len
)
3096 for (i
= 0; i
< len
; i
++)
3097 if (!isspace((c
= line
[i
])))
3103 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
3105 struct patch_id_t
*data
= priv
;
3108 /* Ignore line numbers when computing the SHA1 of the patch */
3109 if (!prefixcmp(line
, "@@ -"))
3112 new_len
= remove_space(line
, len
);
3114 SHA1_Update(data
->ctx
, line
, new_len
);
3115 data
->patchlen
+= new_len
;
3118 /* returns 0 upon success, and writes result into sha1 */
3119 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3121 struct diff_queue_struct
*q
= &diff_queued_diff
;
3124 struct patch_id_t data
;
3125 char buffer
[PATH_MAX
* 4 + 20];
3128 memset(&data
, 0, sizeof(struct patch_id_t
));
3130 data
.xm
.consume
= patch_id_consume
;
3132 for (i
= 0; i
< q
->nr
; i
++) {
3137 struct diff_filepair
*p
= q
->queue
[i
];
3140 memset(&xecfg
, 0, sizeof(xecfg
));
3142 return error("internal diff status error");
3143 if (p
->status
== DIFF_STATUS_UNKNOWN
)
3145 if (diff_unmodified_pair(p
))
3147 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
3148 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
3150 if (DIFF_PAIR_UNMERGED(p
))
3153 diff_fill_sha1_info(p
->one
);
3154 diff_fill_sha1_info(p
->two
);
3155 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
3156 fill_mmfile(&mf2
, p
->two
) < 0)
3157 return error("unable to read files to diff");
3159 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
3160 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
3161 if (p
->one
->mode
== 0)
3162 len1
= snprintf(buffer
, sizeof(buffer
),
3163 "diff--gita/%.*sb/%.*s"
3170 len2
, p
->two
->path
);
3171 else if (p
->two
->mode
== 0)
3172 len1
= snprintf(buffer
, sizeof(buffer
),
3173 "diff--gita/%.*sb/%.*s"
3174 "deletedfilemode%06o"
3180 len1
, p
->one
->path
);
3182 len1
= snprintf(buffer
, sizeof(buffer
),
3183 "diff--gita/%.*sb/%.*s"
3189 len2
, p
->two
->path
);
3190 SHA1_Update(&ctx
, buffer
, len1
);
3192 xpp
.flags
= XDF_NEED_MINIMAL
;
3194 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
3195 ecb
.outf
= xdiff_outf
;
3197 xdi_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
3200 SHA1_Final(sha1
, &ctx
);
3204 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
3206 struct diff_queue_struct
*q
= &diff_queued_diff
;
3208 int result
= diff_get_patch_id(options
, sha1
);
3210 for (i
= 0; i
< q
->nr
; i
++)
3211 diff_free_filepair(q
->queue
[i
]);
3215 q
->nr
= q
->alloc
= 0;
3220 static int is_summary_empty(const struct diff_queue_struct
*q
)
3224 for (i
= 0; i
< q
->nr
; i
++) {
3225 const struct diff_filepair
*p
= q
->queue
[i
];
3227 switch (p
->status
) {
3228 case DIFF_STATUS_DELETED
:
3229 case DIFF_STATUS_ADDED
:
3230 case DIFF_STATUS_COPIED
:
3231 case DIFF_STATUS_RENAMED
:
3236 if (p
->one
->mode
&& p
->two
->mode
&&
3237 p
->one
->mode
!= p
->two
->mode
)
3245 void diff_flush(struct diff_options
*options
)
3247 struct diff_queue_struct
*q
= &diff_queued_diff
;
3248 int i
, output_format
= options
->output_format
;
3252 * Order: raw, stat, summary, patch
3253 * or: name/name-status/checkdiff (other bits clear)
3258 if (output_format
& (DIFF_FORMAT_RAW
|
3260 DIFF_FORMAT_NAME_STATUS
|
3261 DIFF_FORMAT_CHECKDIFF
)) {
3262 for (i
= 0; i
< q
->nr
; i
++) {
3263 struct diff_filepair
*p
= q
->queue
[i
];
3264 if (check_pair_status(p
))
3265 flush_one_pair(p
, options
);
3270 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
3271 struct diffstat_t diffstat
;
3273 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
3274 diffstat
.xm
.consume
= diffstat_consume
;
3275 for (i
= 0; i
< q
->nr
; i
++) {
3276 struct diff_filepair
*p
= q
->queue
[i
];
3277 if (check_pair_status(p
))
3278 diff_flush_stat(p
, options
, &diffstat
);
3280 if (output_format
& DIFF_FORMAT_NUMSTAT
)
3281 show_numstat(&diffstat
, options
);
3282 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
3283 show_stats(&diffstat
, options
);
3284 if (output_format
& DIFF_FORMAT_SHORTSTAT
)
3285 show_shortstats(&diffstat
, options
);
3286 free_diffstat_info(&diffstat
);
3289 if (output_format
& DIFF_FORMAT_DIRSTAT
)
3290 show_dirstat(options
);
3292 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
3293 for (i
= 0; i
< q
->nr
; i
++)
3294 diff_summary(options
->file
, q
->queue
[i
]);
3298 if (output_format
& DIFF_FORMAT_PATCH
) {
3300 putc(options
->line_termination
, options
->file
);
3301 if (options
->stat_sep
) {
3302 /* attach patch instead of inline */
3303 fputs(options
->stat_sep
, options
->file
);
3307 for (i
= 0; i
< q
->nr
; i
++) {
3308 struct diff_filepair
*p
= q
->queue
[i
];
3309 if (check_pair_status(p
))
3310 diff_flush_patch(p
, options
);
3314 if (output_format
& DIFF_FORMAT_CALLBACK
)
3315 options
->format_callback(q
, options
, options
->format_callback_data
);
3317 for (i
= 0; i
< q
->nr
; i
++)
3318 diff_free_filepair(q
->queue
[i
]);
3322 q
->nr
= q
->alloc
= 0;
3323 if (options
->close_file
)
3324 fclose(options
->file
);
3327 static void diffcore_apply_filter(const char *filter
)
3330 struct diff_queue_struct
*q
= &diff_queued_diff
;
3331 struct diff_queue_struct outq
;
3333 outq
.nr
= outq
.alloc
= 0;
3338 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
3340 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
3341 struct diff_filepair
*p
= q
->queue
[i
];
3342 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3344 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3346 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3347 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3348 strchr(filter
, p
->status
)))
3354 /* otherwise we will clear the whole queue
3355 * by copying the empty outq at the end of this
3356 * function, but first clear the current entries
3359 for (i
= 0; i
< q
->nr
; i
++)
3360 diff_free_filepair(q
->queue
[i
]);
3363 /* Only the matching ones */
3364 for (i
= 0; i
< q
->nr
; i
++) {
3365 struct diff_filepair
*p
= q
->queue
[i
];
3367 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
3369 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
3371 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
3372 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
3373 strchr(filter
, p
->status
)))
3376 diff_free_filepair(p
);
3383 /* Check whether two filespecs with the same mode and size are identical */
3384 static int diff_filespec_is_identical(struct diff_filespec
*one
,
3385 struct diff_filespec
*two
)
3387 if (S_ISGITLINK(one
->mode
))
3389 if (diff_populate_filespec(one
, 0))
3391 if (diff_populate_filespec(two
, 0))
3393 return !memcmp(one
->data
, two
->data
, one
->size
);
3396 static void diffcore_skip_stat_unmatch(struct diff_options
*diffopt
)
3399 struct diff_queue_struct
*q
= &diff_queued_diff
;
3400 struct diff_queue_struct outq
;
3402 outq
.nr
= outq
.alloc
= 0;
3404 for (i
= 0; i
< q
->nr
; i
++) {
3405 struct diff_filepair
*p
= q
->queue
[i
];
3408 * 1. Entries that come from stat info dirtyness
3409 * always have both sides (iow, not create/delete),
3410 * one side of the object name is unknown, with
3411 * the same mode and size. Keep the ones that
3412 * do not match these criteria. They have real
3415 * 2. At this point, the file is known to be modified,
3416 * with the same mode and size, and the object
3417 * name of one side is unknown. Need to inspect
3418 * the identical contents.
3420 if (!DIFF_FILE_VALID(p
->one
) || /* (1) */
3421 !DIFF_FILE_VALID(p
->two
) ||
3422 (p
->one
->sha1_valid
&& p
->two
->sha1_valid
) ||
3423 (p
->one
->mode
!= p
->two
->mode
) ||
3424 diff_populate_filespec(p
->one
, 1) ||
3425 diff_populate_filespec(p
->two
, 1) ||
3426 (p
->one
->size
!= p
->two
->size
) ||
3427 !diff_filespec_is_identical(p
->one
, p
->two
)) /* (2) */
3431 * The caller can subtract 1 from skip_stat_unmatch
3432 * to determine how many paths were dirty only
3433 * due to stat info mismatch.
3435 if (!DIFF_OPT_TST(diffopt
, NO_INDEX
))
3436 diffopt
->skip_stat_unmatch
++;
3437 diff_free_filepair(p
);
3444 void diffcore_std(struct diff_options
*options
)
3446 if (options
->skip_stat_unmatch
)
3447 diffcore_skip_stat_unmatch(options
);
3448 if (options
->break_opt
!= -1)
3449 diffcore_break(options
->break_opt
);
3450 if (options
->detect_rename
)
3451 diffcore_rename(options
);
3452 if (options
->break_opt
!= -1)
3453 diffcore_merge_broken();
3454 if (options
->pickaxe
)
3455 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
3456 if (options
->orderfile
)
3457 diffcore_order(options
->orderfile
);
3458 diff_resolve_rename_copy();
3459 diffcore_apply_filter(options
->filter
);
3461 if (diff_queued_diff
.nr
)
3462 DIFF_OPT_SET(options
, HAS_CHANGES
);
3464 DIFF_OPT_CLR(options
, HAS_CHANGES
);
3467 int diff_result_code(struct diff_options
*opt
, int status
)
3470 if (!DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3471 !(opt
->output_format
& DIFF_FORMAT_CHECKDIFF
))
3473 if (DIFF_OPT_TST(opt
, EXIT_WITH_STATUS
) &&
3474 DIFF_OPT_TST(opt
, HAS_CHANGES
))
3476 if ((opt
->output_format
& DIFF_FORMAT_CHECKDIFF
) &&
3477 DIFF_OPT_TST(opt
, CHECK_FAILED
))
3482 void diff_addremove(struct diff_options
*options
,
3483 int addremove
, unsigned mode
,
3484 const unsigned char *sha1
,
3485 const char *concatpath
)
3487 struct diff_filespec
*one
, *two
;
3489 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(mode
))
3492 /* This may look odd, but it is a preparation for
3493 * feeding "there are unchanged files which should
3494 * not produce diffs, but when you are doing copy
3495 * detection you would need them, so here they are"
3496 * entries to the diff-core. They will be prefixed
3497 * with something like '=' or '*' (I haven't decided
3498 * which but should not make any difference).
3499 * Feeding the same new and old to diff_change()
3500 * also has the same effect.
3501 * Before the final output happens, they are pruned after
3502 * merged into rename/copy pairs as appropriate.
3504 if (DIFF_OPT_TST(options
, REVERSE_DIFF
))
3505 addremove
= (addremove
== '+' ? '-' :
3506 addremove
== '-' ? '+' : addremove
);
3508 if (options
->prefix
&&
3509 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3512 one
= alloc_filespec(concatpath
);
3513 two
= alloc_filespec(concatpath
);
3515 if (addremove
!= '+')
3516 fill_filespec(one
, sha1
, mode
);
3517 if (addremove
!= '-')
3518 fill_filespec(two
, sha1
, mode
);
3520 diff_queue(&diff_queued_diff
, one
, two
);
3521 DIFF_OPT_SET(options
, HAS_CHANGES
);
3524 void diff_change(struct diff_options
*options
,
3525 unsigned old_mode
, unsigned new_mode
,
3526 const unsigned char *old_sha1
,
3527 const unsigned char *new_sha1
,
3528 const char *concatpath
)
3530 struct diff_filespec
*one
, *two
;
3532 if (DIFF_OPT_TST(options
, IGNORE_SUBMODULES
) && S_ISGITLINK(old_mode
)
3533 && S_ISGITLINK(new_mode
))
3536 if (DIFF_OPT_TST(options
, REVERSE_DIFF
)) {
3538 const unsigned char *tmp_c
;
3539 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
3540 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
3543 if (options
->prefix
&&
3544 strncmp(concatpath
, options
->prefix
, options
->prefix_length
))
3547 one
= alloc_filespec(concatpath
);
3548 two
= alloc_filespec(concatpath
);
3549 fill_filespec(one
, old_sha1
, old_mode
);
3550 fill_filespec(two
, new_sha1
, new_mode
);
3552 diff_queue(&diff_queued_diff
, one
, two
);
3553 DIFF_OPT_SET(options
, HAS_CHANGES
);
3556 void diff_unmerge(struct diff_options
*options
,
3558 unsigned mode
, const unsigned char *sha1
)
3560 struct diff_filespec
*one
, *two
;
3562 if (options
->prefix
&&
3563 strncmp(path
, options
->prefix
, options
->prefix_length
))
3566 one
= alloc_filespec(path
);
3567 two
= alloc_filespec(path
);
3568 fill_filespec(one
, sha1
, mode
);
3569 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;