2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #ifdef NO_FAST_WORKING_DIRECTORY
13 #define FAST_WORKING_DIRECTORY 0
15 #define FAST_WORKING_DIRECTORY 1
18 static int use_size_cache
;
20 static int diff_detect_rename_default
;
21 static int diff_rename_limit_default
= -1;
22 static int diff_use_color_default
;
24 static char diff_colors
[][COLOR_MAXLEN
] = {
26 "", /* PLAIN (normal) */
27 "\033[1m", /* METAINFO (bold) */
28 "\033[36m", /* FRAGINFO (cyan) */
29 "\033[31m", /* OLD (red) */
30 "\033[32m", /* NEW (green) */
31 "\033[33m", /* COMMIT (yellow) */
32 "\033[41m", /* WHITESPACE (red background) */
35 static int parse_diff_color_slot(const char *var
, int ofs
)
37 if (!strcasecmp(var
+ofs
, "plain"))
39 if (!strcasecmp(var
+ofs
, "meta"))
41 if (!strcasecmp(var
+ofs
, "frag"))
43 if (!strcasecmp(var
+ofs
, "old"))
45 if (!strcasecmp(var
+ofs
, "new"))
47 if (!strcasecmp(var
+ofs
, "commit"))
49 if (!strcasecmp(var
+ofs
, "whitespace"))
50 return DIFF_WHITESPACE
;
51 die("bad config variable '%s'", var
);
55 * These are to give UI layer defaults.
56 * The core-level commands such as git-diff-files should
57 * never be affected by the setting of diff.renames
58 * the user happens to have in the configuration file.
60 int git_diff_ui_config(const char *var
, const char *value
)
62 if (!strcmp(var
, "diff.renamelimit")) {
63 diff_rename_limit_default
= git_config_int(var
, value
);
66 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff")) {
67 diff_use_color_default
= git_config_colorbool(var
, value
);
70 if (!strcmp(var
, "diff.renames")) {
72 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
73 else if (!strcasecmp(value
, "copies") ||
74 !strcasecmp(value
, "copy"))
75 diff_detect_rename_default
= DIFF_DETECT_COPY
;
76 else if (git_config_bool(var
,value
))
77 diff_detect_rename_default
= DIFF_DETECT_RENAME
;
80 if (!strncmp(var
, "diff.color.", 11) || !strncmp(var
, "color.diff.", 11)) {
81 int slot
= parse_diff_color_slot(var
, 11);
82 color_parse(value
, var
, diff_colors
[slot
]);
85 return git_default_config(var
, value
);
88 static char *quote_one(const char *str
)
95 needlen
= quote_c_style(str
, NULL
, NULL
, 0);
98 xp
= xmalloc(needlen
+ 1);
99 quote_c_style(str
, xp
, NULL
, 0);
103 static char *quote_two(const char *one
, const char *two
)
105 int need_one
= quote_c_style(one
, NULL
, NULL
, 1);
106 int need_two
= quote_c_style(two
, NULL
, NULL
, 1);
109 if (need_one
+ need_two
) {
110 if (!need_one
) need_one
= strlen(one
);
111 if (!need_two
) need_one
= strlen(two
);
113 xp
= xmalloc(need_one
+ need_two
+ 3);
115 quote_c_style(one
, xp
+ 1, NULL
, 1);
116 quote_c_style(two
, xp
+ need_one
+ 1, NULL
, 1);
117 strcpy(xp
+ need_one
+ need_two
+ 1, "\"");
120 need_one
= strlen(one
);
121 need_two
= strlen(two
);
122 xp
= xmalloc(need_one
+ need_two
+ 1);
124 strcpy(xp
+ need_one
, two
);
128 static const char *external_diff(void)
130 static const char *external_diff_cmd
= NULL
;
131 static int done_preparing
= 0;
134 return external_diff_cmd
;
135 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
137 return external_diff_cmd
;
140 #define TEMPFILE_PATH_LEN 50
142 static struct diff_tempfile
{
143 const char *name
; /* filename external diff should read from */
146 char tmp_path
[TEMPFILE_PATH_LEN
];
149 static int count_lines(const char *data
, int size
)
151 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
158 completely_empty
= 0;
162 completely_empty
= 0;
165 if (completely_empty
)
168 count
++; /* no trailing newline */
172 static void print_line_count(int count
)
182 printf("1,%d", count
);
187 static void copy_file(int prefix
, const char *data
, int size
)
189 int ch
, nl_just_seen
= 1;
201 printf("\n\\ No newline at end of file\n");
204 static void emit_rewrite_diff(const char *name_a
,
206 struct diff_filespec
*one
,
207 struct diff_filespec
*two
)
210 diff_populate_filespec(one
, 0);
211 diff_populate_filespec(two
, 0);
212 lc_a
= count_lines(one
->data
, one
->size
);
213 lc_b
= count_lines(two
->data
, two
->size
);
214 printf("--- a/%s\n+++ b/%s\n@@ -", name_a
, name_b
);
215 print_line_count(lc_a
);
217 print_line_count(lc_b
);
220 copy_file('-', one
->data
, one
->size
);
222 copy_file('+', two
->data
, two
->size
);
225 static int fill_mmfile(mmfile_t
*mf
, struct diff_filespec
*one
)
227 if (!DIFF_FILE_VALID(one
)) {
228 mf
->ptr
= (char *)""; /* does not matter */
232 else if (diff_populate_filespec(one
, 0))
235 mf
->size
= one
->size
;
239 struct diff_words_buffer
{
242 long current
; /* output pointer */
243 int suppressed_newline
;
246 static void diff_words_append(char *line
, unsigned long len
,
247 struct diff_words_buffer
*buffer
)
249 if (buffer
->text
.size
+ len
> buffer
->alloc
) {
250 buffer
->alloc
= (buffer
->text
.size
+ len
) * 3 / 2;
251 buffer
->text
.ptr
= xrealloc(buffer
->text
.ptr
, buffer
->alloc
);
255 memcpy(buffer
->text
.ptr
+ buffer
->text
.size
, line
, len
);
256 buffer
->text
.size
+= len
;
259 struct diff_words_data
{
260 struct xdiff_emit_state xm
;
261 struct diff_words_buffer minus
, plus
;
264 static void print_word(struct diff_words_buffer
*buffer
, int len
, int color
,
265 int suppress_newline
)
273 ptr
= buffer
->text
.ptr
+ buffer
->current
;
274 buffer
->current
+= len
;
276 if (ptr
[len
- 1] == '\n') {
281 fputs(diff_get_color(1, color
), stdout
);
282 fwrite(ptr
, len
, 1, stdout
);
283 fputs(diff_get_color(1, DIFF_RESET
), stdout
);
286 if (suppress_newline
)
287 buffer
->suppressed_newline
= 1;
293 static void fn_out_diff_words_aux(void *priv
, char *line
, unsigned long len
)
295 struct diff_words_data
*diff_words
= priv
;
297 if (diff_words
->minus
.suppressed_newline
) {
300 diff_words
->minus
.suppressed_newline
= 0;
306 print_word(&diff_words
->minus
, len
, DIFF_FILE_OLD
, 1);
309 print_word(&diff_words
->plus
, len
, DIFF_FILE_NEW
, 0);
312 print_word(&diff_words
->plus
, len
, DIFF_PLAIN
, 0);
313 diff_words
->minus
.current
+= len
;
318 /* this executes the word diff on the accumulated buffers */
319 static void diff_words_show(struct diff_words_data
*diff_words
)
324 mmfile_t minus
, plus
;
327 minus
.size
= diff_words
->minus
.text
.size
;
328 minus
.ptr
= xmalloc(minus
.size
);
329 memcpy(minus
.ptr
, diff_words
->minus
.text
.ptr
, minus
.size
);
330 for (i
= 0; i
< minus
.size
; i
++)
331 if (isspace(minus
.ptr
[i
]))
333 diff_words
->minus
.current
= 0;
335 plus
.size
= diff_words
->plus
.text
.size
;
336 plus
.ptr
= xmalloc(plus
.size
);
337 memcpy(plus
.ptr
, diff_words
->plus
.text
.ptr
, plus
.size
);
338 for (i
= 0; i
< plus
.size
; i
++)
339 if (isspace(plus
.ptr
[i
]))
341 diff_words
->plus
.current
= 0;
343 xpp
.flags
= XDF_NEED_MINIMAL
;
344 xecfg
.ctxlen
= diff_words
->minus
.alloc
+ diff_words
->plus
.alloc
;
346 ecb
.outf
= xdiff_outf
;
347 ecb
.priv
= diff_words
;
348 diff_words
->xm
.consume
= fn_out_diff_words_aux
;
349 xdl_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
353 diff_words
->minus
.text
.size
= diff_words
->plus
.text
.size
= 0;
355 if (diff_words
->minus
.suppressed_newline
) {
357 diff_words
->minus
.suppressed_newline
= 0;
361 struct emit_callback
{
362 struct xdiff_emit_state xm
;
363 int nparents
, color_diff
;
364 const char **label_path
;
365 struct diff_words_data
*diff_words
;
368 static void free_diff_words_data(struct emit_callback
*ecbdata
)
370 if (ecbdata
->diff_words
) {
372 if (ecbdata
->diff_words
->minus
.text
.size
||
373 ecbdata
->diff_words
->plus
.text
.size
)
374 diff_words_show(ecbdata
->diff_words
);
376 if (ecbdata
->diff_words
->minus
.text
.ptr
)
377 free (ecbdata
->diff_words
->minus
.text
.ptr
);
378 if (ecbdata
->diff_words
->plus
.text
.ptr
)
379 free (ecbdata
->diff_words
->plus
.text
.ptr
);
380 free(ecbdata
->diff_words
);
381 ecbdata
->diff_words
= NULL
;
385 const char *diff_get_color(int diff_use_color
, enum color_diff ix
)
388 return diff_colors
[ix
];
392 static void emit_line(const char *set
, const char *reset
, const char *line
, int len
)
394 if (len
> 0 && line
[len
-1] == '\n')
397 fwrite(line
, len
, 1, stdout
);
401 static void emit_line_with_ws(int nparents
,
402 const char *set
, const char *reset
, const char *ws
,
403 const char *line
, int len
)
406 int last_tab_in_indent
= -1;
407 int last_space_in_indent
= -1;
410 int need_highlight_leading_space
= 0;
411 /* The line is a newly added line. Does it have funny leading
412 * whitespaces? In indent, SP should never precede a TAB.
414 for (i
= col0
; i
< len
; i
++) {
415 if (line
[i
] == '\t') {
416 last_tab_in_indent
= i
;
417 if (0 <= last_space_in_indent
)
418 need_highlight_leading_space
= 1;
420 else if (line
[i
] == ' ')
421 last_space_in_indent
= i
;
426 fwrite(line
, col0
, 1, stdout
);
427 fputs(reset
, stdout
);
428 if (((i
== len
) || line
[i
] == '\n') && i
!= col0
) {
429 /* The whole line was indent */
430 emit_line(ws
, reset
, line
+ col0
, len
- col0
);
434 if (need_highlight_leading_space
) {
435 while (i
< last_tab_in_indent
) {
436 if (line
[i
] == ' ') {
439 fputs(reset
, stdout
);
447 if (line
[tail
] == '\n' && i
< tail
)
450 if (!isspace(line
[tail
]))
454 if ((i
< tail
&& line
[tail
+ 1] != '\n')) {
455 /* This has whitespace between tail+1..len */
457 fwrite(line
+ i
, tail
- i
+ 1, 1, stdout
);
458 fputs(reset
, stdout
);
459 emit_line(ws
, reset
, line
+ tail
+ 1, len
- tail
- 1);
462 emit_line(set
, reset
, line
+ i
, len
- i
);
465 static void emit_add_line(const char *reset
, struct emit_callback
*ecbdata
, const char *line
, int len
)
467 const char *ws
= diff_get_color(ecbdata
->color_diff
, DIFF_WHITESPACE
);
468 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_FILE_NEW
);
471 emit_line(set
, reset
, line
, len
);
473 emit_line_with_ws(ecbdata
->nparents
, set
, reset
, ws
,
477 static void fn_out_consume(void *priv
, char *line
, unsigned long len
)
481 struct emit_callback
*ecbdata
= priv
;
482 const char *set
= diff_get_color(ecbdata
->color_diff
, DIFF_METAINFO
);
483 const char *reset
= diff_get_color(ecbdata
->color_diff
, DIFF_RESET
);
485 if (ecbdata
->label_path
[0]) {
486 printf("%s--- %s%s\n", set
, ecbdata
->label_path
[0], reset
);
487 printf("%s+++ %s%s\n", set
, ecbdata
->label_path
[1], reset
);
488 ecbdata
->label_path
[0] = ecbdata
->label_path
[1] = NULL
;
491 /* This is not really necessary for now because
492 * this codepath only deals with two-way diffs.
494 for (i
= 0; i
< len
&& line
[i
] == '@'; i
++)
496 if (2 <= i
&& i
< len
&& line
[i
] == ' ') {
497 ecbdata
->nparents
= i
- 1;
498 emit_line(diff_get_color(ecbdata
->color_diff
, DIFF_FRAGINFO
),
503 if (len
< ecbdata
->nparents
) {
505 emit_line(reset
, reset
, line
, len
);
510 if (ecbdata
->diff_words
&& ecbdata
->nparents
!= 1)
511 /* fall back to normal diff */
512 free_diff_words_data(ecbdata
);
513 if (ecbdata
->diff_words
) {
514 if (line
[0] == '-') {
515 diff_words_append(line
, len
,
516 &ecbdata
->diff_words
->minus
);
518 } else if (line
[0] == '+') {
519 diff_words_append(line
, len
,
520 &ecbdata
->diff_words
->plus
);
523 if (ecbdata
->diff_words
->minus
.text
.size
||
524 ecbdata
->diff_words
->plus
.text
.size
)
525 diff_words_show(ecbdata
->diff_words
);
528 emit_line(set
, reset
, line
, len
);
531 for (i
= 0; i
< ecbdata
->nparents
&& len
; i
++) {
533 color
= DIFF_FILE_OLD
;
534 else if (line
[i
] == '+')
535 color
= DIFF_FILE_NEW
;
538 if (color
!= DIFF_FILE_NEW
) {
539 emit_line(diff_get_color(ecbdata
->color_diff
, color
),
543 emit_add_line(reset
, ecbdata
, line
, len
);
546 static char *pprint_rename(const char *a
, const char *b
)
551 int pfx_length
, sfx_length
;
552 int len_a
= strlen(a
);
553 int len_b
= strlen(b
);
554 int qlen_a
= quote_c_style(a
, NULL
, NULL
, 0);
555 int qlen_b
= quote_c_style(b
, NULL
, NULL
, 0);
557 if (qlen_a
|| qlen_b
) {
558 if (qlen_a
) len_a
= qlen_a
;
559 if (qlen_b
) len_b
= qlen_b
;
560 name
= xmalloc( len_a
+ len_b
+ 5 );
562 quote_c_style(a
, name
, NULL
, 0);
564 memcpy(name
, a
, len_a
);
565 memcpy(name
+ len_a
, " => ", 4);
567 quote_c_style(b
, name
+ len_a
+ 4, NULL
, 0);
569 memcpy(name
+ len_a
+ 4, b
, len_b
+ 1);
573 /* Find common prefix */
575 while (*old
&& *new && *old
== *new) {
577 pfx_length
= old
- a
+ 1;
582 /* Find common suffix */
586 while (a
<= old
&& b
<= new && *old
== *new) {
588 sfx_length
= len_a
- (old
- a
);
594 * pfx{mid-a => mid-b}sfx
595 * {pfx-a => pfx-b}sfx
596 * pfx{sfx-a => sfx-b}
599 if (pfx_length
+ sfx_length
) {
600 int a_midlen
= len_a
- pfx_length
- sfx_length
;
601 int b_midlen
= len_b
- pfx_length
- sfx_length
;
602 if (a_midlen
< 0) a_midlen
= 0;
603 if (b_midlen
< 0) b_midlen
= 0;
605 name
= xmalloc(pfx_length
+ a_midlen
+ b_midlen
+ sfx_length
+ 7);
606 sprintf(name
, "%.*s{%.*s => %.*s}%s",
608 a_midlen
, a
+ pfx_length
,
609 b_midlen
, b
+ pfx_length
,
610 a
+ len_a
- sfx_length
);
613 name
= xmalloc(len_a
+ len_b
+ 5);
614 sprintf(name
, "%s => %s", a
, b
);
620 struct xdiff_emit_state xm
;
624 struct diffstat_file
{
626 unsigned is_unmerged
:1;
627 unsigned is_binary
:1;
628 unsigned is_renamed
:1;
629 unsigned int added
, deleted
;
633 static struct diffstat_file
*diffstat_add(struct diffstat_t
*diffstat
,
637 struct diffstat_file
*x
;
638 x
= xcalloc(sizeof (*x
), 1);
639 if (diffstat
->nr
== diffstat
->alloc
) {
640 diffstat
->alloc
= alloc_nr(diffstat
->alloc
);
641 diffstat
->files
= xrealloc(diffstat
->files
,
642 diffstat
->alloc
* sizeof(x
));
644 diffstat
->files
[diffstat
->nr
++] = x
;
646 x
->name
= pprint_rename(name_a
, name_b
);
650 x
->name
= xstrdup(name_a
);
654 static void diffstat_consume(void *priv
, char *line
, unsigned long len
)
656 struct diffstat_t
*diffstat
= priv
;
657 struct diffstat_file
*x
= diffstat
->files
[diffstat
->nr
- 1];
661 else if (line
[0] == '-')
665 const char mime_boundary_leader
[] = "------------";
667 static int scale_linear(int it
, int width
, int max_change
)
670 * make sure that at least one '-' is printed if there were deletions,
671 * and likewise for '+'.
675 return ((it
- 1) * (width
- 1) + max_change
- 1) / (max_change
- 1);
678 static void show_name(const char *prefix
, const char *name
, int len
,
679 const char *reset
, const char *set
)
681 printf(" %s%s%-*s%s |", set
, prefix
, len
, name
, reset
);
684 static void show_graph(char ch
, int cnt
, const char *set
, const char *reset
)
694 static void show_stats(struct diffstat_t
* data
, struct diff_options
*options
)
696 int i
, len
, add
, del
, total
, adds
= 0, dels
= 0;
697 int max_change
= 0, max_len
= 0;
698 int total_files
= data
->nr
;
699 int width
, name_width
;
700 const char *reset
, *set
, *add_c
, *del_c
;
705 width
= options
->stat_width
? options
->stat_width
: 80;
706 name_width
= options
->stat_name_width
? options
->stat_name_width
: 50;
708 /* Sanity: give at least 5 columns to the graph,
709 * but leave at least 10 columns for the name.
711 if (width
< name_width
+ 15) {
712 if (name_width
<= 25)
713 width
= name_width
+ 15;
715 name_width
= width
- 15;
718 /* Find the longest filename and max number of changes */
719 reset
= diff_get_color(options
->color_diff
, DIFF_RESET
);
720 set
= diff_get_color(options
->color_diff
, DIFF_PLAIN
);
721 add_c
= diff_get_color(options
->color_diff
, DIFF_FILE_NEW
);
722 del_c
= diff_get_color(options
->color_diff
, DIFF_FILE_OLD
);
724 for (i
= 0; i
< data
->nr
; i
++) {
725 struct diffstat_file
*file
= data
->files
[i
];
726 int change
= file
->added
+ file
->deleted
;
728 if (!file
->is_renamed
) { /* renames are already quoted by pprint_rename */
729 len
= quote_c_style(file
->name
, NULL
, NULL
, 0);
731 char *qname
= xmalloc(len
+ 1);
732 quote_c_style(file
->name
, qname
, NULL
, 0);
738 len
= strlen(file
->name
);
742 if (file
->is_binary
|| file
->is_unmerged
)
744 if (max_change
< change
)
748 /* Compute the width of the graph part;
749 * 10 is for one blank at the beginning of the line plus
750 * " | count " between the name and the graph.
752 * From here on, name_width is the width of the name area,
753 * and width is the width of the graph area.
755 name_width
= (name_width
< max_len
) ? name_width
: max_len
;
756 if (width
< (name_width
+ 10) + max_change
)
757 width
= width
- (name_width
+ 10);
761 for (i
= 0; i
< data
->nr
; i
++) {
762 const char *prefix
= "";
763 char *name
= data
->files
[i
]->name
;
764 int added
= data
->files
[i
]->added
;
765 int deleted
= data
->files
[i
]->deleted
;
769 * "scale" the filename
772 name_len
= strlen(name
);
773 if (name_width
< name_len
) {
777 name
+= name_len
- len
;
778 slash
= strchr(name
, '/');
783 if (data
->files
[i
]->is_binary
) {
784 show_name(prefix
, name
, len
, reset
, set
);
786 goto free_diffstat_file
;
788 else if (data
->files
[i
]->is_unmerged
) {
789 show_name(prefix
, name
, len
, reset
, set
);
790 printf(" Unmerged\n");
791 goto free_diffstat_file
;
793 else if (!data
->files
[i
]->is_renamed
&&
794 (added
+ deleted
== 0)) {
796 goto free_diffstat_file
;
800 * scale the add/delete
808 if (width
<= max_change
) {
809 add
= scale_linear(add
, width
, max_change
);
810 del
= scale_linear(del
, width
, max_change
);
813 show_name(prefix
, name
, len
, reset
, set
);
814 printf("%5d ", added
+ deleted
);
815 show_graph('+', add
, add_c
, reset
);
816 show_graph('-', del
, del_c
, reset
);
819 free(data
->files
[i
]->name
);
820 free(data
->files
[i
]);
823 printf("%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
824 set
, total_files
, adds
, dels
, reset
);
827 static void show_shortstats(struct diffstat_t
* data
)
829 int i
, adds
= 0, dels
= 0, total_files
= data
->nr
;
834 for (i
= 0; i
< data
->nr
; i
++) {
835 if (!data
->files
[i
]->is_binary
&&
836 !data
->files
[i
]->is_unmerged
) {
837 int added
= data
->files
[i
]->added
;
838 int deleted
= data
->files
[i
]->deleted
;
839 if (!data
->files
[i
]->is_renamed
&&
840 (added
+ deleted
== 0)) {
847 free(data
->files
[i
]->name
);
848 free(data
->files
[i
]);
852 printf(" %d files changed, %d insertions(+), %d deletions(-)\n",
853 total_files
, adds
, dels
);
856 static void show_numstat(struct diffstat_t
* data
, struct diff_options
*options
)
860 for (i
= 0; i
< data
->nr
; i
++) {
861 struct diffstat_file
*file
= data
->files
[i
];
866 printf("%d\t%d\t", file
->added
, file
->deleted
);
867 if (options
->line_termination
&& !file
->is_renamed
&&
868 quote_c_style(file
->name
, NULL
, NULL
, 0))
869 quote_c_style(file
->name
, NULL
, stdout
, 0);
871 fputs(file
->name
, stdout
);
872 putchar(options
->line_termination
);
877 struct xdiff_emit_state xm
;
878 const char *filename
;
879 int lineno
, color_diff
;
882 static void checkdiff_consume(void *priv
, char *line
, unsigned long len
)
884 struct checkdiff_t
*data
= priv
;
885 const char *ws
= diff_get_color(data
->color_diff
, DIFF_WHITESPACE
);
886 const char *reset
= diff_get_color(data
->color_diff
, DIFF_RESET
);
887 const char *set
= diff_get_color(data
->color_diff
, DIFF_FILE_NEW
);
889 if (line
[0] == '+') {
890 int i
, spaces
= 0, space_before_tab
= 0, white_space_at_end
= 0;
892 /* check space before tab */
893 for (i
= 1; i
< len
&& (line
[i
] == ' ' || line
[i
] == '\t'); i
++)
896 if (line
[i
- 1] == '\t' && spaces
)
897 space_before_tab
= 1;
899 /* check white space at line end */
900 if (line
[len
- 1] == '\n')
902 if (isspace(line
[len
- 1]))
903 white_space_at_end
= 1;
905 if (space_before_tab
|| white_space_at_end
) {
906 printf("%s:%d: %s", data
->filename
, data
->lineno
, ws
);
907 if (space_before_tab
) {
908 printf("space before tab");
909 if (white_space_at_end
)
912 if (white_space_at_end
)
913 printf("white space at end");
914 printf(":%s ", reset
);
915 emit_line_with_ws(1, set
, reset
, ws
, line
, len
);
919 } else if (line
[0] == ' ')
921 else if (line
[0] == '@') {
922 char *plus
= strchr(line
, '+');
924 data
->lineno
= strtol(plus
, NULL
, 10);
930 static unsigned char *deflate_it(char *data
,
932 unsigned long *result_size
)
935 unsigned char *deflated
;
938 memset(&stream
, 0, sizeof(stream
));
939 deflateInit(&stream
, zlib_compression_level
);
940 bound
= deflateBound(&stream
, size
);
941 deflated
= xmalloc(bound
);
942 stream
.next_out
= deflated
;
943 stream
.avail_out
= bound
;
945 stream
.next_in
= (unsigned char *)data
;
946 stream
.avail_in
= size
;
947 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
950 *result_size
= stream
.total_out
;
954 static void emit_binary_diff_body(mmfile_t
*one
, mmfile_t
*two
)
960 unsigned long orig_size
;
961 unsigned long delta_size
;
962 unsigned long deflate_size
;
963 unsigned long data_size
;
965 /* We could do deflated delta, or we could do just deflated two,
966 * whichever is smaller.
969 deflated
= deflate_it(two
->ptr
, two
->size
, &deflate_size
);
970 if (one
->size
&& two
->size
) {
971 delta
= diff_delta(one
->ptr
, one
->size
,
973 &delta_size
, deflate_size
);
975 void *to_free
= delta
;
976 orig_size
= delta_size
;
977 delta
= deflate_it(delta
, delta_size
, &delta_size
);
982 if (delta
&& delta_size
< deflate_size
) {
983 printf("delta %lu\n", orig_size
);
986 data_size
= delta_size
;
989 printf("literal %lu\n", two
->size
);
992 data_size
= deflate_size
;
995 /* emit data encoded in base85 */
998 int bytes
= (52 < data_size
) ? 52 : data_size
;
1002 line
[0] = bytes
+ 'A' - 1;
1004 line
[0] = bytes
- 26 + 'a' - 1;
1005 encode_85(line
+ 1, cp
, bytes
);
1006 cp
= (char *) cp
+ bytes
;
1013 static void emit_binary_diff(mmfile_t
*one
, mmfile_t
*two
)
1015 printf("GIT binary patch\n");
1016 emit_binary_diff_body(one
, two
);
1017 emit_binary_diff_body(two
, one
);
1020 #define FIRST_FEW_BYTES 8000
1021 static int mmfile_is_binary(mmfile_t
*mf
)
1024 if (FIRST_FEW_BYTES
< sz
)
1025 sz
= FIRST_FEW_BYTES
;
1026 return !!memchr(mf
->ptr
, 0, sz
);
1029 static void builtin_diff(const char *name_a
,
1031 struct diff_filespec
*one
,
1032 struct diff_filespec
*two
,
1033 const char *xfrm_msg
,
1034 struct diff_options
*o
,
1035 int complete_rewrite
)
1039 char *a_one
, *b_two
;
1040 const char *set
= diff_get_color(o
->color_diff
, DIFF_METAINFO
);
1041 const char *reset
= diff_get_color(o
->color_diff
, DIFF_RESET
);
1043 a_one
= quote_two("a/", name_a
);
1044 b_two
= quote_two("b/", name_b
);
1045 lbl
[0] = DIFF_FILE_VALID(one
) ? a_one
: "/dev/null";
1046 lbl
[1] = DIFF_FILE_VALID(two
) ? b_two
: "/dev/null";
1047 printf("%sdiff --git %s %s%s\n", set
, a_one
, b_two
, reset
);
1048 if (lbl
[0][0] == '/') {
1050 printf("%snew file mode %06o%s\n", set
, two
->mode
, reset
);
1051 if (xfrm_msg
&& xfrm_msg
[0])
1052 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1054 else if (lbl
[1][0] == '/') {
1055 printf("%sdeleted file mode %06o%s\n", set
, one
->mode
, reset
);
1056 if (xfrm_msg
&& xfrm_msg
[0])
1057 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1060 if (one
->mode
!= two
->mode
) {
1061 printf("%sold mode %06o%s\n", set
, one
->mode
, reset
);
1062 printf("%snew mode %06o%s\n", set
, two
->mode
, reset
);
1064 if (xfrm_msg
&& xfrm_msg
[0])
1065 printf("%s%s%s\n", set
, xfrm_msg
, reset
);
1067 * we do not run diff between different kind
1070 if ((one
->mode
^ two
->mode
) & S_IFMT
)
1071 goto free_ab_and_return
;
1072 if (complete_rewrite
) {
1073 emit_rewrite_diff(name_a
, name_b
, one
, two
);
1074 goto free_ab_and_return
;
1078 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1079 die("unable to read files to diff");
1081 if (!o
->text
&& (mmfile_is_binary(&mf1
) || mmfile_is_binary(&mf2
))) {
1082 /* Quite common confusing case */
1083 if (mf1
.size
== mf2
.size
&&
1084 !memcmp(mf1
.ptr
, mf2
.ptr
, mf1
.size
))
1085 goto free_ab_and_return
;
1087 emit_binary_diff(&mf1
, &mf2
);
1089 printf("Binary files %s and %s differ\n",
1093 /* Crazy xdl interfaces.. */
1094 const char *diffopts
= getenv("GIT_DIFF_OPTS");
1098 struct emit_callback ecbdata
;
1100 memset(&ecbdata
, 0, sizeof(ecbdata
));
1101 ecbdata
.label_path
= lbl
;
1102 ecbdata
.color_diff
= o
->color_diff
;
1103 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1104 xecfg
.ctxlen
= o
->context
;
1105 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
1108 else if (!strncmp(diffopts
, "--unified=", 10))
1109 xecfg
.ctxlen
= strtoul(diffopts
+ 10, NULL
, 10);
1110 else if (!strncmp(diffopts
, "-u", 2))
1111 xecfg
.ctxlen
= strtoul(diffopts
+ 2, NULL
, 10);
1112 ecb
.outf
= xdiff_outf
;
1113 ecb
.priv
= &ecbdata
;
1114 ecbdata
.xm
.consume
= fn_out_consume
;
1115 if (o
->color_diff_words
)
1116 ecbdata
.diff_words
=
1117 xcalloc(1, sizeof(struct diff_words_data
));
1118 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1119 if (o
->color_diff_words
)
1120 free_diff_words_data(&ecbdata
);
1129 static void builtin_diffstat(const char *name_a
, const char *name_b
,
1130 struct diff_filespec
*one
,
1131 struct diff_filespec
*two
,
1132 struct diffstat_t
*diffstat
,
1133 struct diff_options
*o
,
1134 int complete_rewrite
)
1137 struct diffstat_file
*data
;
1139 data
= diffstat_add(diffstat
, name_a
, name_b
);
1142 data
->is_unmerged
= 1;
1145 if (complete_rewrite
) {
1146 diff_populate_filespec(one
, 0);
1147 diff_populate_filespec(two
, 0);
1148 data
->deleted
= count_lines(one
->data
, one
->size
);
1149 data
->added
= count_lines(two
->data
, two
->size
);
1152 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1153 die("unable to read files to diff");
1155 if (mmfile_is_binary(&mf1
) || mmfile_is_binary(&mf2
))
1156 data
->is_binary
= 1;
1158 /* Crazy xdl interfaces.. */
1163 xpp
.flags
= XDF_NEED_MINIMAL
| o
->xdl_opts
;
1166 ecb
.outf
= xdiff_outf
;
1167 ecb
.priv
= diffstat
;
1168 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1172 static void builtin_checkdiff(const char *name_a
, const char *name_b
,
1173 struct diff_filespec
*one
,
1174 struct diff_filespec
*two
, struct diff_options
*o
)
1177 struct checkdiff_t data
;
1182 memset(&data
, 0, sizeof(data
));
1183 data
.xm
.consume
= checkdiff_consume
;
1184 data
.filename
= name_b
? name_b
: name_a
;
1186 data
.color_diff
= o
->color_diff
;
1188 if (fill_mmfile(&mf1
, one
) < 0 || fill_mmfile(&mf2
, two
) < 0)
1189 die("unable to read files to diff");
1191 if (mmfile_is_binary(&mf2
))
1194 /* Crazy xdl interfaces.. */
1199 xpp
.flags
= XDF_NEED_MINIMAL
;
1202 ecb
.outf
= xdiff_outf
;
1204 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
1208 struct diff_filespec
*alloc_filespec(const char *path
)
1210 int namelen
= strlen(path
);
1211 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
1213 memset(spec
, 0, sizeof(*spec
));
1214 spec
->path
= (char *)(spec
+ 1);
1215 memcpy(spec
->path
, path
, namelen
+1);
1219 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
1220 unsigned short mode
)
1223 spec
->mode
= canon_mode(mode
);
1224 hashcpy(spec
->sha1
, sha1
);
1225 spec
->sha1_valid
= !is_null_sha1(sha1
);
1230 * Given a name and sha1 pair, if the dircache tells us the file in
1231 * the work tree has that object contents, return true, so that
1232 * prepare_temp_file() does not have to inflate and extract.
1234 static int reuse_worktree_file(const char *name
, const unsigned char *sha1
, int want_file
)
1236 struct cache_entry
*ce
;
1240 /* We do not read the cache ourselves here, because the
1241 * benchmark with my previous version that always reads cache
1242 * shows that it makes things worse for diff-tree comparing
1243 * two linux-2.6 kernel trees in an already checked out work
1244 * tree. This is because most diff-tree comparisons deal with
1245 * only a small number of files, while reading the cache is
1246 * expensive for a large project, and its cost outweighs the
1247 * savings we get by not inflating the object to a temporary
1248 * file. Practically, this code only helps when we are used
1249 * by diff-cache --cached, which does read the cache before
1255 /* We want to avoid the working directory if our caller
1256 * doesn't need the data in a normal file, this system
1257 * is rather slow with its stat/open/mmap/close syscalls,
1258 * and the object is contained in a pack file. The pack
1259 * is probably already open and will be faster to obtain
1260 * the data through than the working directory. Loose
1261 * objects however would tend to be slower as they need
1262 * to be individually opened and inflated.
1264 if (!FAST_WORKING_DIRECTORY
&& !want_file
&& has_sha1_pack(sha1
, NULL
))
1268 pos
= cache_name_pos(name
, len
);
1271 ce
= active_cache
[pos
];
1272 if ((lstat(name
, &st
) < 0) ||
1273 !S_ISREG(st
.st_mode
) || /* careful! */
1274 ce_match_stat(ce
, &st
, 0) ||
1275 hashcmp(sha1
, ce
->sha1
))
1277 /* we return 1 only when we can stat, it is a regular file,
1278 * stat information matches, and sha1 recorded in the cache
1279 * matches. I.e. we know the file in the work tree really is
1280 * the same as the <name, sha1> pair.
1285 static struct sha1_size_cache
{
1286 unsigned char sha1
[20];
1288 } **sha1_size_cache
;
1289 static int sha1_size_cache_nr
, sha1_size_cache_alloc
;
1291 static struct sha1_size_cache
*locate_size_cache(unsigned char *sha1
,
1296 struct sha1_size_cache
*e
;
1299 last
= sha1_size_cache_nr
;
1300 while (last
> first
) {
1301 int cmp
, next
= (last
+ first
) >> 1;
1302 e
= sha1_size_cache
[next
];
1303 cmp
= hashcmp(e
->sha1
, sha1
);
1315 /* insert to make it at "first" */
1316 if (sha1_size_cache_alloc
<= sha1_size_cache_nr
) {
1317 sha1_size_cache_alloc
= alloc_nr(sha1_size_cache_alloc
);
1318 sha1_size_cache
= xrealloc(sha1_size_cache
,
1319 sha1_size_cache_alloc
*
1320 sizeof(*sha1_size_cache
));
1322 sha1_size_cache_nr
++;
1323 if (first
< sha1_size_cache_nr
)
1324 memmove(sha1_size_cache
+ first
+ 1, sha1_size_cache
+ first
,
1325 (sha1_size_cache_nr
- first
- 1) *
1326 sizeof(*sha1_size_cache
));
1327 e
= xmalloc(sizeof(struct sha1_size_cache
));
1328 sha1_size_cache
[first
] = e
;
1329 hashcpy(e
->sha1
, sha1
);
1335 * While doing rename detection and pickaxe operation, we may need to
1336 * grab the data for the blob (or file) for our own in-core comparison.
1337 * diff_filespec has data and size fields for this purpose.
1339 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
1342 if (!DIFF_FILE_VALID(s
))
1343 die("internal error: asking to populate invalid file.");
1344 if (S_ISDIR(s
->mode
))
1347 if (!use_size_cache
)
1352 if (!s
->sha1_valid
||
1353 reuse_worktree_file(s
->path
, s
->sha1
, 0)) {
1356 if (lstat(s
->path
, &st
) < 0) {
1357 if (errno
== ENOENT
) {
1361 s
->data
= (char *)"";
1366 s
->size
= st
.st_size
;
1371 if (S_ISLNK(st
.st_mode
)) {
1373 s
->data
= xmalloc(s
->size
);
1375 ret
= readlink(s
->path
, s
->data
, s
->size
);
1382 fd
= open(s
->path
, O_RDONLY
);
1385 s
->data
= xmmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
1387 s
->should_munmap
= 1;
1388 /* FIXME! CRLF -> LF conversion goes here, based on "s->path" */
1392 struct sha1_size_cache
*e
;
1395 e
= locate_size_cache(s
->sha1
, 1, 0);
1400 if (!sha1_object_info(s
->sha1
, type
, &s
->size
))
1401 locate_size_cache(s
->sha1
, 0, s
->size
);
1404 s
->data
= read_sha1_file(s
->sha1
, type
, &s
->size
);
1411 void diff_free_filespec_data(struct diff_filespec
*s
)
1415 else if (s
->should_munmap
)
1416 munmap(s
->data
, s
->size
);
1417 s
->should_free
= s
->should_munmap
= 0;
1423 static void prep_temp_blob(struct diff_tempfile
*temp
,
1426 const unsigned char *sha1
,
1431 fd
= git_mkstemp(temp
->tmp_path
, TEMPFILE_PATH_LEN
, ".diff_XXXXXX");
1433 die("unable to create temp-file");
1434 if (write_in_full(fd
, blob
, size
) != size
)
1435 die("unable to write temp-file");
1437 temp
->name
= temp
->tmp_path
;
1438 strcpy(temp
->hex
, sha1_to_hex(sha1
));
1440 sprintf(temp
->mode
, "%06o", mode
);
1443 static void prepare_temp_file(const char *name
,
1444 struct diff_tempfile
*temp
,
1445 struct diff_filespec
*one
)
1447 if (!DIFF_FILE_VALID(one
)) {
1449 /* A '-' entry produces this for file-2, and
1450 * a '+' entry produces this for file-1.
1452 temp
->name
= "/dev/null";
1453 strcpy(temp
->hex
, ".");
1454 strcpy(temp
->mode
, ".");
1458 if (!one
->sha1_valid
||
1459 reuse_worktree_file(name
, one
->sha1
, 1)) {
1461 if (lstat(name
, &st
) < 0) {
1462 if (errno
== ENOENT
)
1463 goto not_a_valid_file
;
1464 die("stat(%s): %s", name
, strerror(errno
));
1466 if (S_ISLNK(st
.st_mode
)) {
1468 char buf
[PATH_MAX
+ 1]; /* ought to be SYMLINK_MAX */
1469 if (sizeof(buf
) <= st
.st_size
)
1470 die("symlink too long: %s", name
);
1471 ret
= readlink(name
, buf
, st
.st_size
);
1473 die("readlink(%s)", name
);
1474 prep_temp_blob(temp
, buf
, st
.st_size
,
1476 one
->sha1
: null_sha1
),
1478 one
->mode
: S_IFLNK
));
1481 /* we can borrow from the file in the work tree */
1483 if (!one
->sha1_valid
)
1484 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
1486 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
1487 /* Even though we may sometimes borrow the
1488 * contents from the work tree, we always want
1489 * one->mode. mode is trustworthy even when
1490 * !(one->sha1_valid), as long as
1491 * DIFF_FILE_VALID(one).
1493 sprintf(temp
->mode
, "%06o", one
->mode
);
1498 if (diff_populate_filespec(one
, 0))
1499 die("cannot read data blob for %s", one
->path
);
1500 prep_temp_blob(temp
, one
->data
, one
->size
,
1501 one
->sha1
, one
->mode
);
1505 static void remove_tempfile(void)
1509 for (i
= 0; i
< 2; i
++)
1510 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
1511 unlink(diff_temp
[i
].name
);
1512 diff_temp
[i
].name
= NULL
;
1516 static void remove_tempfile_on_signal(int signo
)
1519 signal(SIGINT
, SIG_DFL
);
1523 static int spawn_prog(const char *pgm
, const char **arg
)
1531 die("unable to fork");
1533 execvp(pgm
, (char *const*) arg
);
1537 while (waitpid(pid
, &status
, 0) < 0) {
1543 /* Earlier we did not check the exit status because
1544 * diff exits non-zero if files are different, and
1545 * we are not interested in knowing that. It was a
1546 * mistake which made it harder to quit a diff-*
1547 * session that uses the git-apply-patch-script as
1548 * the GIT_EXTERNAL_DIFF. A custom GIT_EXTERNAL_DIFF
1549 * should also exit non-zero only when it wants to
1550 * abort the entire diff-* session.
1552 if (WIFEXITED(status
) && !WEXITSTATUS(status
))
1557 /* An external diff command takes:
1559 * diff-cmd name infile1 infile1-sha1 infile1-mode \
1560 * infile2 infile2-sha1 infile2-mode [ rename-to ]
1563 static void run_external_diff(const char *pgm
,
1566 struct diff_filespec
*one
,
1567 struct diff_filespec
*two
,
1568 const char *xfrm_msg
,
1569 int complete_rewrite
)
1571 const char *spawn_arg
[10];
1572 struct diff_tempfile
*temp
= diff_temp
;
1574 static int atexit_asked
= 0;
1575 const char *othername
;
1576 const char **arg
= &spawn_arg
[0];
1578 othername
= (other
? other
: name
);
1580 prepare_temp_file(name
, &temp
[0], one
);
1581 prepare_temp_file(othername
, &temp
[1], two
);
1582 if (! atexit_asked
&&
1583 (temp
[0].name
== temp
[0].tmp_path
||
1584 temp
[1].name
== temp
[1].tmp_path
)) {
1586 atexit(remove_tempfile
);
1588 signal(SIGINT
, remove_tempfile_on_signal
);
1594 *arg
++ = temp
[0].name
;
1595 *arg
++ = temp
[0].hex
;
1596 *arg
++ = temp
[0].mode
;
1597 *arg
++ = temp
[1].name
;
1598 *arg
++ = temp
[1].hex
;
1599 *arg
++ = temp
[1].mode
;
1609 retval
= spawn_prog(pgm
, spawn_arg
);
1612 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
1617 static void run_diff_cmd(const char *pgm
,
1620 struct diff_filespec
*one
,
1621 struct diff_filespec
*two
,
1622 const char *xfrm_msg
,
1623 struct diff_options
*o
,
1624 int complete_rewrite
)
1627 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
1632 builtin_diff(name
, other
? other
: name
,
1633 one
, two
, xfrm_msg
, o
, complete_rewrite
);
1635 printf("* Unmerged path %s\n", name
);
1638 static void diff_fill_sha1_info(struct diff_filespec
*one
)
1640 if (DIFF_FILE_VALID(one
)) {
1641 if (!one
->sha1_valid
) {
1643 if (lstat(one
->path
, &st
) < 0)
1644 die("stat %s", one
->path
);
1645 if (index_path(one
->sha1
, one
->path
, &st
, 0))
1646 die("cannot hash %s\n", one
->path
);
1653 static void run_diff(struct diff_filepair
*p
, struct diff_options
*o
)
1655 const char *pgm
= external_diff();
1656 char msg
[PATH_MAX
*2+300], *xfrm_msg
;
1657 struct diff_filespec
*one
;
1658 struct diff_filespec
*two
;
1661 char *name_munged
, *other_munged
;
1662 int complete_rewrite
= 0;
1665 if (DIFF_PAIR_UNMERGED(p
)) {
1667 run_diff_cmd(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
, o
, 0);
1671 name
= p
->one
->path
;
1672 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1673 name_munged
= quote_one(name
);
1674 other_munged
= quote_one(other
);
1675 one
= p
->one
; two
= p
->two
;
1677 diff_fill_sha1_info(one
);
1678 diff_fill_sha1_info(two
);
1681 switch (p
->status
) {
1682 case DIFF_STATUS_COPIED
:
1683 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1684 "similarity index %d%%\n"
1687 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
),
1688 name_munged
, other_munged
);
1690 case DIFF_STATUS_RENAMED
:
1691 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1692 "similarity index %d%%\n"
1695 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
),
1696 name_munged
, other_munged
);
1698 case DIFF_STATUS_MODIFIED
:
1700 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1701 "dissimilarity index %d%%\n",
1702 (int)(0.5 + p
->score
*
1704 complete_rewrite
= 1;
1713 if (hashcmp(one
->sha1
, two
->sha1
)) {
1714 int abbrev
= o
->full_index
? 40 : DEFAULT_ABBREV
;
1718 if ((!fill_mmfile(&mf
, one
) && mmfile_is_binary(&mf
)) ||
1719 (!fill_mmfile(&mf
, two
) && mmfile_is_binary(&mf
)))
1722 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1724 abbrev
, sha1_to_hex(one
->sha1
),
1725 abbrev
, sha1_to_hex(two
->sha1
));
1726 if (one
->mode
== two
->mode
)
1727 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
1728 " %06o", one
->mode
);
1729 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
, "\n");
1734 xfrm_msg
= len
? msg
: NULL
;
1737 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
1738 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
1739 /* a filepair that changes between file and symlink
1740 * needs to be split into deletion and creation.
1742 struct diff_filespec
*null
= alloc_filespec(two
->path
);
1743 run_diff_cmd(NULL
, name
, other
, one
, null
, xfrm_msg
, o
, 0);
1745 null
= alloc_filespec(one
->path
);
1746 run_diff_cmd(NULL
, name
, other
, null
, two
, xfrm_msg
, o
, 0);
1750 run_diff_cmd(pgm
, name
, other
, one
, two
, xfrm_msg
, o
,
1757 static void run_diffstat(struct diff_filepair
*p
, struct diff_options
*o
,
1758 struct diffstat_t
*diffstat
)
1762 int complete_rewrite
= 0;
1764 if (DIFF_PAIR_UNMERGED(p
)) {
1766 builtin_diffstat(p
->one
->path
, NULL
, NULL
, NULL
, diffstat
, o
, 0);
1770 name
= p
->one
->path
;
1771 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1773 diff_fill_sha1_info(p
->one
);
1774 diff_fill_sha1_info(p
->two
);
1776 if (p
->status
== DIFF_STATUS_MODIFIED
&& p
->score
)
1777 complete_rewrite
= 1;
1778 builtin_diffstat(name
, other
, p
->one
, p
->two
, diffstat
, o
, complete_rewrite
);
1781 static void run_checkdiff(struct diff_filepair
*p
, struct diff_options
*o
)
1786 if (DIFF_PAIR_UNMERGED(p
)) {
1791 name
= p
->one
->path
;
1792 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
1794 diff_fill_sha1_info(p
->one
);
1795 diff_fill_sha1_info(p
->two
);
1797 builtin_checkdiff(name
, other
, p
->one
, p
->two
, o
);
1800 void diff_setup(struct diff_options
*options
)
1802 memset(options
, 0, sizeof(*options
));
1803 options
->line_termination
= '\n';
1804 options
->break_opt
= -1;
1805 options
->rename_limit
= -1;
1806 options
->context
= 3;
1807 options
->msg_sep
= "";
1809 options
->change
= diff_change
;
1810 options
->add_remove
= diff_addremove
;
1811 options
->color_diff
= diff_use_color_default
;
1812 options
->detect_rename
= diff_detect_rename_default
;
1815 int diff_setup_done(struct diff_options
*options
)
1819 if (options
->output_format
& DIFF_FORMAT_NAME
)
1821 if (options
->output_format
& DIFF_FORMAT_NAME_STATUS
)
1823 if (options
->output_format
& DIFF_FORMAT_CHECKDIFF
)
1825 if (options
->output_format
& DIFF_FORMAT_NO_OUTPUT
)
1828 die("--name-only, --name-status, --check and -s are mutually exclusive");
1830 if (options
->find_copies_harder
)
1831 options
->detect_rename
= DIFF_DETECT_COPY
;
1833 if (options
->output_format
& (DIFF_FORMAT_NAME
|
1834 DIFF_FORMAT_NAME_STATUS
|
1835 DIFF_FORMAT_CHECKDIFF
|
1836 DIFF_FORMAT_NO_OUTPUT
))
1837 options
->output_format
&= ~(DIFF_FORMAT_RAW
|
1838 DIFF_FORMAT_NUMSTAT
|
1839 DIFF_FORMAT_DIFFSTAT
|
1840 DIFF_FORMAT_SHORTSTAT
|
1841 DIFF_FORMAT_SUMMARY
|
1845 * These cases always need recursive; we do not drop caller-supplied
1846 * recursive bits for other formats here.
1848 if (options
->output_format
& (DIFF_FORMAT_PATCH
|
1849 DIFF_FORMAT_NUMSTAT
|
1850 DIFF_FORMAT_DIFFSTAT
|
1851 DIFF_FORMAT_SHORTSTAT
|
1852 DIFF_FORMAT_SUMMARY
|
1853 DIFF_FORMAT_CHECKDIFF
))
1854 options
->recursive
= 1;
1856 * Also pickaxe would not work very well if you do not say recursive
1858 if (options
->pickaxe
)
1859 options
->recursive
= 1;
1861 if (options
->detect_rename
&& options
->rename_limit
< 0)
1862 options
->rename_limit
= diff_rename_limit_default
;
1863 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
1865 /* read-cache does not die even when it fails
1866 * so it is safe for us to do this here. Also
1867 * it does not smudge active_cache or active_nr
1868 * when it fails, so we do not have to worry about
1869 * cleaning it up ourselves either.
1873 if (options
->setup
& DIFF_SETUP_USE_SIZE_CACHE
)
1875 if (options
->abbrev
<= 0 || 40 < options
->abbrev
)
1876 options
->abbrev
= 40; /* full */
1881 static int opt_arg(const char *arg
, int arg_short
, const char *arg_long
, int *val
)
1891 if (c
== arg_short
) {
1895 if (val
&& isdigit(c
)) {
1897 int n
= strtoul(arg
, &end
, 10);
1908 eq
= strchr(arg
, '=');
1913 if (!len
|| strncmp(arg
, arg_long
, len
))
1918 if (!isdigit(*++eq
))
1920 n
= strtoul(eq
, &end
, 10);
1928 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
1930 const char *arg
= av
[0];
1931 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
1932 options
->output_format
|= DIFF_FORMAT_PATCH
;
1933 else if (opt_arg(arg
, 'U', "unified", &options
->context
))
1934 options
->output_format
|= DIFF_FORMAT_PATCH
;
1935 else if (!strcmp(arg
, "--raw"))
1936 options
->output_format
|= DIFF_FORMAT_RAW
;
1937 else if (!strcmp(arg
, "--patch-with-raw")) {
1938 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_RAW
;
1940 else if (!strcmp(arg
, "--numstat")) {
1941 options
->output_format
|= DIFF_FORMAT_NUMSTAT
;
1943 else if (!strcmp(arg
, "--shortstat")) {
1944 options
->output_format
|= DIFF_FORMAT_SHORTSTAT
;
1946 else if (!strncmp(arg
, "--stat", 6)) {
1948 int width
= options
->stat_width
;
1949 int name_width
= options
->stat_name_width
;
1955 if (!strncmp(arg
, "-width=", 7))
1956 width
= strtoul(arg
+ 7, &end
, 10);
1957 else if (!strncmp(arg
, "-name-width=", 12))
1958 name_width
= strtoul(arg
+ 12, &end
, 10);
1961 width
= strtoul(arg
+1, &end
, 10);
1963 name_width
= strtoul(end
+1, &end
, 10);
1966 /* Important! This checks all the error cases! */
1969 options
->output_format
|= DIFF_FORMAT_DIFFSTAT
;
1970 options
->stat_name_width
= name_width
;
1971 options
->stat_width
= width
;
1973 else if (!strcmp(arg
, "--check"))
1974 options
->output_format
|= DIFF_FORMAT_CHECKDIFF
;
1975 else if (!strcmp(arg
, "--summary"))
1976 options
->output_format
|= DIFF_FORMAT_SUMMARY
;
1977 else if (!strcmp(arg
, "--patch-with-stat")) {
1978 options
->output_format
|= DIFF_FORMAT_PATCH
| DIFF_FORMAT_DIFFSTAT
;
1980 else if (!strcmp(arg
, "-z"))
1981 options
->line_termination
= 0;
1982 else if (!strncmp(arg
, "-l", 2))
1983 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
1984 else if (!strcmp(arg
, "--full-index"))
1985 options
->full_index
= 1;
1986 else if (!strcmp(arg
, "--binary")) {
1987 options
->output_format
|= DIFF_FORMAT_PATCH
;
1988 options
->binary
= 1;
1990 else if (!strcmp(arg
, "-a") || !strcmp(arg
, "--text")) {
1993 else if (!strcmp(arg
, "--name-only"))
1994 options
->output_format
|= DIFF_FORMAT_NAME
;
1995 else if (!strcmp(arg
, "--name-status"))
1996 options
->output_format
|= DIFF_FORMAT_NAME_STATUS
;
1997 else if (!strcmp(arg
, "-R"))
1998 options
->reverse_diff
= 1;
1999 else if (!strncmp(arg
, "-S", 2))
2000 options
->pickaxe
= arg
+ 2;
2001 else if (!strcmp(arg
, "-s")) {
2002 options
->output_format
|= DIFF_FORMAT_NO_OUTPUT
;
2004 else if (!strncmp(arg
, "-O", 2))
2005 options
->orderfile
= arg
+ 2;
2006 else if (!strncmp(arg
, "--diff-filter=", 14))
2007 options
->filter
= arg
+ 14;
2008 else if (!strcmp(arg
, "--pickaxe-all"))
2009 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
2010 else if (!strcmp(arg
, "--pickaxe-regex"))
2011 options
->pickaxe_opts
= DIFF_PICKAXE_REGEX
;
2012 else if (!strncmp(arg
, "-B", 2)) {
2013 if ((options
->break_opt
=
2014 diff_scoreopt_parse(arg
)) == -1)
2017 else if (!strncmp(arg
, "-M", 2)) {
2018 if ((options
->rename_score
=
2019 diff_scoreopt_parse(arg
)) == -1)
2021 options
->detect_rename
= DIFF_DETECT_RENAME
;
2023 else if (!strncmp(arg
, "-C", 2)) {
2024 if ((options
->rename_score
=
2025 diff_scoreopt_parse(arg
)) == -1)
2027 options
->detect_rename
= DIFF_DETECT_COPY
;
2029 else if (!strcmp(arg
, "--find-copies-harder"))
2030 options
->find_copies_harder
= 1;
2031 else if (!strcmp(arg
, "--abbrev"))
2032 options
->abbrev
= DEFAULT_ABBREV
;
2033 else if (!strncmp(arg
, "--abbrev=", 9)) {
2034 options
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
2035 if (options
->abbrev
< MINIMUM_ABBREV
)
2036 options
->abbrev
= MINIMUM_ABBREV
;
2037 else if (40 < options
->abbrev
)
2038 options
->abbrev
= 40;
2040 else if (!strcmp(arg
, "--color"))
2041 options
->color_diff
= 1;
2042 else if (!strcmp(arg
, "--no-color"))
2043 options
->color_diff
= 0;
2044 else if (!strcmp(arg
, "-w") || !strcmp(arg
, "--ignore-all-space"))
2045 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2046 else if (!strcmp(arg
, "-b") || !strcmp(arg
, "--ignore-space-change"))
2047 options
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2048 else if (!strcmp(arg
, "--color-words"))
2049 options
->color_diff
= options
->color_diff_words
= 1;
2050 else if (!strcmp(arg
, "--no-renames"))
2051 options
->detect_rename
= 0;
2057 static int parse_num(const char **cp_p
)
2059 unsigned long num
, scale
;
2061 const char *cp
= *cp_p
;
2068 if ( !dot
&& ch
== '.' ) {
2071 } else if ( ch
== '%' ) {
2072 scale
= dot
? scale
*100 : 100;
2073 cp
++; /* % is always at the end */
2075 } else if ( ch
>= '0' && ch
<= '9' ) {
2076 if ( scale
< 100000 ) {
2078 num
= (num
*10) + (ch
-'0');
2087 /* user says num divided by scale and we say internally that
2088 * is MAX_SCORE * num / scale.
2090 return (num
>= scale
) ? MAX_SCORE
: (MAX_SCORE
* num
/ scale
);
2093 int diff_scoreopt_parse(const char *opt
)
2095 int opt1
, opt2
, cmd
;
2100 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
2101 return -1; /* that is not a -M, -C nor -B option */
2103 opt1
= parse_num(&opt
);
2109 else if (*opt
!= '/')
2110 return -1; /* we expect -B80/99 or -B80 */
2113 opt2
= parse_num(&opt
);
2118 return opt1
| (opt2
<< 16);
2121 struct diff_queue_struct diff_queued_diff
;
2123 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
2125 if (queue
->alloc
<= queue
->nr
) {
2126 queue
->alloc
= alloc_nr(queue
->alloc
);
2127 queue
->queue
= xrealloc(queue
->queue
,
2128 sizeof(dp
) * queue
->alloc
);
2130 queue
->queue
[queue
->nr
++] = dp
;
2133 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
2134 struct diff_filespec
*one
,
2135 struct diff_filespec
*two
)
2137 struct diff_filepair
*dp
= xcalloc(1, sizeof(*dp
));
2145 void diff_free_filepair(struct diff_filepair
*p
)
2147 diff_free_filespec_data(p
->one
);
2148 diff_free_filespec_data(p
->two
);
2154 /* This is different from find_unique_abbrev() in that
2155 * it stuffs the result with dots for alignment.
2157 const char *diff_unique_abbrev(const unsigned char *sha1
, int len
)
2162 return sha1_to_hex(sha1
);
2164 abbrev
= find_unique_abbrev(sha1
, len
);
2166 return sha1_to_hex(sha1
);
2167 abblen
= strlen(abbrev
);
2169 static char hex
[41];
2170 if (len
< abblen
&& abblen
<= len
+ 2)
2171 sprintf(hex
, "%s%.*s", abbrev
, len
+3-abblen
, "..");
2173 sprintf(hex
, "%s...", abbrev
);
2176 return sha1_to_hex(sha1
);
2179 static void diff_flush_raw(struct diff_filepair
*p
,
2180 struct diff_options
*options
)
2184 int abbrev
= options
->abbrev
;
2185 const char *path_one
, *path_two
;
2186 int inter_name_termination
= '\t';
2187 int line_termination
= options
->line_termination
;
2189 if (!line_termination
)
2190 inter_name_termination
= 0;
2192 path_one
= p
->one
->path
;
2193 path_two
= p
->two
->path
;
2194 if (line_termination
) {
2195 path_one
= quote_one(path_one
);
2196 path_two
= quote_one(path_two
);
2200 sprintf(status
, "%c%03d", p
->status
,
2201 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
));
2203 status
[0] = p
->status
;
2206 switch (p
->status
) {
2207 case DIFF_STATUS_COPIED
:
2208 case DIFF_STATUS_RENAMED
:
2211 case DIFF_STATUS_ADDED
:
2212 case DIFF_STATUS_DELETED
:
2219 if (!(options
->output_format
& DIFF_FORMAT_NAME_STATUS
)) {
2220 printf(":%06o %06o %s ",
2221 p
->one
->mode
, p
->two
->mode
,
2222 diff_unique_abbrev(p
->one
->sha1
, abbrev
));
2224 diff_unique_abbrev(p
->two
->sha1
, abbrev
));
2226 printf("%s%c%s", status
, inter_name_termination
, path_one
);
2228 printf("%c%s", inter_name_termination
, path_two
);
2229 putchar(line_termination
);
2230 if (path_one
!= p
->one
->path
)
2231 free((void*)path_one
);
2232 if (path_two
!= p
->two
->path
)
2233 free((void*)path_two
);
2236 static void diff_flush_name(struct diff_filepair
*p
, struct diff_options
*opt
)
2238 char *path
= p
->two
->path
;
2240 if (opt
->line_termination
)
2241 path
= quote_one(p
->two
->path
);
2242 printf("%s%c", path
, opt
->line_termination
);
2243 if (p
->two
->path
!= path
)
2247 int diff_unmodified_pair(struct diff_filepair
*p
)
2249 /* This function is written stricter than necessary to support
2250 * the currently implemented transformers, but the idea is to
2251 * let transformers to produce diff_filepairs any way they want,
2252 * and filter and clean them up here before producing the output.
2254 struct diff_filespec
*one
, *two
;
2256 if (DIFF_PAIR_UNMERGED(p
))
2257 return 0; /* unmerged is interesting */
2262 /* deletion, addition, mode or type change
2263 * and rename are all interesting.
2265 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
2266 DIFF_PAIR_MODE_CHANGED(p
) ||
2267 strcmp(one
->path
, two
->path
))
2270 /* both are valid and point at the same path. that is, we are
2271 * dealing with a change.
2273 if (one
->sha1_valid
&& two
->sha1_valid
&&
2274 !hashcmp(one
->sha1
, two
->sha1
))
2275 return 1; /* no change */
2276 if (!one
->sha1_valid
&& !two
->sha1_valid
)
2277 return 1; /* both look at the same file on the filesystem. */
2281 static void diff_flush_patch(struct diff_filepair
*p
, struct diff_options
*o
)
2283 if (diff_unmodified_pair(p
))
2286 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2287 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2288 return; /* no tree diffs in patch format */
2293 static void diff_flush_stat(struct diff_filepair
*p
, struct diff_options
*o
,
2294 struct diffstat_t
*diffstat
)
2296 if (diff_unmodified_pair(p
))
2299 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2300 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2301 return; /* no tree diffs in patch format */
2303 run_diffstat(p
, o
, diffstat
);
2306 static void diff_flush_checkdiff(struct diff_filepair
*p
,
2307 struct diff_options
*o
)
2309 if (diff_unmodified_pair(p
))
2312 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2313 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2314 return; /* no tree diffs in patch format */
2316 run_checkdiff(p
, o
);
2319 int diff_queue_is_empty(void)
2321 struct diff_queue_struct
*q
= &diff_queued_diff
;
2323 for (i
= 0; i
< q
->nr
; i
++)
2324 if (!diff_unmodified_pair(q
->queue
[i
]))
2330 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
2332 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
2335 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
2337 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
2338 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
2340 s
->size
, s
->xfrm_flags
);
2343 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
2345 diff_debug_filespec(p
->one
, i
, "one");
2346 diff_debug_filespec(p
->two
, i
, "two");
2347 fprintf(stderr
, "score %d, status %c stays %d broken %d\n",
2348 p
->score
, p
->status
? p
->status
: '?',
2349 p
->source_stays
, p
->broken_pair
);
2352 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
2356 fprintf(stderr
, "%s\n", msg
);
2357 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
2358 for (i
= 0; i
< q
->nr
; i
++) {
2359 struct diff_filepair
*p
= q
->queue
[i
];
2360 diff_debug_filepair(p
, i
);
2365 static void diff_resolve_rename_copy(void)
2368 struct diff_filepair
*p
, *pp
;
2369 struct diff_queue_struct
*q
= &diff_queued_diff
;
2371 diff_debug_queue("resolve-rename-copy", q
);
2373 for (i
= 0; i
< q
->nr
; i
++) {
2375 p
->status
= 0; /* undecided */
2376 if (DIFF_PAIR_UNMERGED(p
))
2377 p
->status
= DIFF_STATUS_UNMERGED
;
2378 else if (!DIFF_FILE_VALID(p
->one
))
2379 p
->status
= DIFF_STATUS_ADDED
;
2380 else if (!DIFF_FILE_VALID(p
->two
))
2381 p
->status
= DIFF_STATUS_DELETED
;
2382 else if (DIFF_PAIR_TYPE_CHANGED(p
))
2383 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
2385 /* from this point on, we are dealing with a pair
2386 * whose both sides are valid and of the same type, i.e.
2387 * either in-place edit or rename/copy edit.
2389 else if (DIFF_PAIR_RENAME(p
)) {
2390 if (p
->source_stays
) {
2391 p
->status
= DIFF_STATUS_COPIED
;
2394 /* See if there is some other filepair that
2395 * copies from the same source as us. If so
2396 * we are a copy. Otherwise we are either a
2397 * copy if the path stays, or a rename if it
2398 * does not, but we already handled "stays" case.
2400 for (j
= i
+ 1; j
< q
->nr
; j
++) {
2402 if (strcmp(pp
->one
->path
, p
->one
->path
))
2403 continue; /* not us */
2404 if (!DIFF_PAIR_RENAME(pp
))
2405 continue; /* not a rename/copy */
2406 /* pp is a rename/copy from the same source */
2407 p
->status
= DIFF_STATUS_COPIED
;
2411 p
->status
= DIFF_STATUS_RENAMED
;
2413 else if (hashcmp(p
->one
->sha1
, p
->two
->sha1
) ||
2414 p
->one
->mode
!= p
->two
->mode
)
2415 p
->status
= DIFF_STATUS_MODIFIED
;
2417 /* This is a "no-change" entry and should not
2418 * happen anymore, but prepare for broken callers.
2420 error("feeding unmodified %s to diffcore",
2422 p
->status
= DIFF_STATUS_UNKNOWN
;
2425 diff_debug_queue("resolve-rename-copy done", q
);
2428 static int check_pair_status(struct diff_filepair
*p
)
2430 switch (p
->status
) {
2431 case DIFF_STATUS_UNKNOWN
:
2434 die("internal error in diff-resolve-rename-copy");
2440 static void flush_one_pair(struct diff_filepair
*p
, struct diff_options
*opt
)
2442 int fmt
= opt
->output_format
;
2444 if (fmt
& DIFF_FORMAT_CHECKDIFF
)
2445 diff_flush_checkdiff(p
, opt
);
2446 else if (fmt
& (DIFF_FORMAT_RAW
| DIFF_FORMAT_NAME_STATUS
))
2447 diff_flush_raw(p
, opt
);
2448 else if (fmt
& DIFF_FORMAT_NAME
)
2449 diff_flush_name(p
, opt
);
2452 static void show_file_mode_name(const char *newdelete
, struct diff_filespec
*fs
)
2454 char *name
= quote_one(fs
->path
);
2456 printf(" %s mode %06o %s\n", newdelete
, fs
->mode
, name
);
2458 printf(" %s %s\n", newdelete
, name
);
2463 static void show_mode_change(struct diff_filepair
*p
, int show_name
)
2465 if (p
->one
->mode
&& p
->two
->mode
&& p
->one
->mode
!= p
->two
->mode
) {
2467 char *name
= quote_one(p
->two
->path
);
2468 printf(" mode change %06o => %06o %s\n",
2469 p
->one
->mode
, p
->two
->mode
, name
);
2473 printf(" mode change %06o => %06o\n",
2474 p
->one
->mode
, p
->two
->mode
);
2478 static void show_rename_copy(const char *renamecopy
, struct diff_filepair
*p
)
2480 char *names
= pprint_rename(p
->one
->path
, p
->two
->path
);
2482 printf(" %s %s (%d%%)\n", renamecopy
, names
,
2483 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
));
2485 show_mode_change(p
, 0);
2488 static void diff_summary(struct diff_filepair
*p
)
2491 case DIFF_STATUS_DELETED
:
2492 show_file_mode_name("delete", p
->one
);
2494 case DIFF_STATUS_ADDED
:
2495 show_file_mode_name("create", p
->two
);
2497 case DIFF_STATUS_COPIED
:
2498 show_rename_copy("copy", p
);
2500 case DIFF_STATUS_RENAMED
:
2501 show_rename_copy("rename", p
);
2505 char *name
= quote_one(p
->two
->path
);
2506 printf(" rewrite %s (%d%%)\n", name
,
2507 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
));
2509 show_mode_change(p
, 0);
2510 } else show_mode_change(p
, 1);
2516 struct xdiff_emit_state xm
;
2521 static int remove_space(char *line
, int len
)
2527 for (i
= 0; i
< len
; i
++)
2528 if (!isspace((c
= line
[i
])))
2534 static void patch_id_consume(void *priv
, char *line
, unsigned long len
)
2536 struct patch_id_t
*data
= priv
;
2539 /* Ignore line numbers when computing the SHA1 of the patch */
2540 if (!strncmp(line
, "@@ -", 4))
2543 new_len
= remove_space(line
, len
);
2545 SHA1_Update(data
->ctx
, line
, new_len
);
2546 data
->patchlen
+= new_len
;
2549 /* returns 0 upon success, and writes result into sha1 */
2550 static int diff_get_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2552 struct diff_queue_struct
*q
= &diff_queued_diff
;
2555 struct patch_id_t data
;
2556 char buffer
[PATH_MAX
* 4 + 20];
2559 memset(&data
, 0, sizeof(struct patch_id_t
));
2561 data
.xm
.consume
= patch_id_consume
;
2563 for (i
= 0; i
< q
->nr
; i
++) {
2568 struct diff_filepair
*p
= q
->queue
[i
];
2572 return error("internal diff status error");
2573 if (p
->status
== DIFF_STATUS_UNKNOWN
)
2575 if (diff_unmodified_pair(p
))
2577 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
2578 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
2580 if (DIFF_PAIR_UNMERGED(p
))
2583 diff_fill_sha1_info(p
->one
);
2584 diff_fill_sha1_info(p
->two
);
2585 if (fill_mmfile(&mf1
, p
->one
) < 0 ||
2586 fill_mmfile(&mf2
, p
->two
) < 0)
2587 return error("unable to read files to diff");
2589 /* Maybe hash p->two? into the patch id? */
2590 if (mmfile_is_binary(&mf2
))
2593 len1
= remove_space(p
->one
->path
, strlen(p
->one
->path
));
2594 len2
= remove_space(p
->two
->path
, strlen(p
->two
->path
));
2595 if (p
->one
->mode
== 0)
2596 len1
= snprintf(buffer
, sizeof(buffer
),
2597 "diff--gita/%.*sb/%.*s"
2604 len2
, p
->two
->path
);
2605 else if (p
->two
->mode
== 0)
2606 len1
= snprintf(buffer
, sizeof(buffer
),
2607 "diff--gita/%.*sb/%.*s"
2608 "deletedfilemode%06o"
2614 len1
, p
->one
->path
);
2616 len1
= snprintf(buffer
, sizeof(buffer
),
2617 "diff--gita/%.*sb/%.*s"
2623 len2
, p
->two
->path
);
2624 SHA1_Update(&ctx
, buffer
, len1
);
2626 xpp
.flags
= XDF_NEED_MINIMAL
;
2628 xecfg
.flags
= XDL_EMIT_FUNCNAMES
;
2629 ecb
.outf
= xdiff_outf
;
2631 xdl_diff(&mf1
, &mf2
, &xpp
, &xecfg
, &ecb
);
2634 SHA1_Final(sha1
, &ctx
);
2638 int diff_flush_patch_id(struct diff_options
*options
, unsigned char *sha1
)
2640 struct diff_queue_struct
*q
= &diff_queued_diff
;
2642 int result
= diff_get_patch_id(options
, sha1
);
2644 for (i
= 0; i
< q
->nr
; i
++)
2645 diff_free_filepair(q
->queue
[i
]);
2649 q
->nr
= q
->alloc
= 0;
2654 static int is_summary_empty(const struct diff_queue_struct
*q
)
2658 for (i
= 0; i
< q
->nr
; i
++) {
2659 const struct diff_filepair
*p
= q
->queue
[i
];
2661 switch (p
->status
) {
2662 case DIFF_STATUS_DELETED
:
2663 case DIFF_STATUS_ADDED
:
2664 case DIFF_STATUS_COPIED
:
2665 case DIFF_STATUS_RENAMED
:
2670 if (p
->one
->mode
&& p
->two
->mode
&&
2671 p
->one
->mode
!= p
->two
->mode
)
2679 void diff_flush(struct diff_options
*options
)
2681 struct diff_queue_struct
*q
= &diff_queued_diff
;
2682 int i
, output_format
= options
->output_format
;
2686 * Order: raw, stat, summary, patch
2687 * or: name/name-status/checkdiff (other bits clear)
2692 if (output_format
& (DIFF_FORMAT_RAW
|
2694 DIFF_FORMAT_NAME_STATUS
|
2695 DIFF_FORMAT_CHECKDIFF
)) {
2696 for (i
= 0; i
< q
->nr
; i
++) {
2697 struct diff_filepair
*p
= q
->queue
[i
];
2698 if (check_pair_status(p
))
2699 flush_one_pair(p
, options
);
2704 if (output_format
& (DIFF_FORMAT_DIFFSTAT
|DIFF_FORMAT_SHORTSTAT
|DIFF_FORMAT_NUMSTAT
)) {
2705 struct diffstat_t diffstat
;
2707 memset(&diffstat
, 0, sizeof(struct diffstat_t
));
2708 diffstat
.xm
.consume
= diffstat_consume
;
2709 for (i
= 0; i
< q
->nr
; i
++) {
2710 struct diff_filepair
*p
= q
->queue
[i
];
2711 if (check_pair_status(p
))
2712 diff_flush_stat(p
, options
, &diffstat
);
2714 if (output_format
& DIFF_FORMAT_NUMSTAT
)
2715 show_numstat(&diffstat
, options
);
2716 if (output_format
& DIFF_FORMAT_DIFFSTAT
)
2717 show_stats(&diffstat
, options
);
2718 else if (output_format
& DIFF_FORMAT_SHORTSTAT
)
2719 show_shortstats(&diffstat
);
2723 if (output_format
& DIFF_FORMAT_SUMMARY
&& !is_summary_empty(q
)) {
2724 for (i
= 0; i
< q
->nr
; i
++)
2725 diff_summary(q
->queue
[i
]);
2729 if (output_format
& DIFF_FORMAT_PATCH
) {
2731 if (options
->stat_sep
) {
2732 /* attach patch instead of inline */
2733 fputs(options
->stat_sep
, stdout
);
2735 putchar(options
->line_termination
);
2739 for (i
= 0; i
< q
->nr
; i
++) {
2740 struct diff_filepair
*p
= q
->queue
[i
];
2741 if (check_pair_status(p
))
2742 diff_flush_patch(p
, options
);
2746 if (output_format
& DIFF_FORMAT_CALLBACK
)
2747 options
->format_callback(q
, options
, options
->format_callback_data
);
2749 for (i
= 0; i
< q
->nr
; i
++)
2750 diff_free_filepair(q
->queue
[i
]);
2754 q
->nr
= q
->alloc
= 0;
2757 static void diffcore_apply_filter(const char *filter
)
2760 struct diff_queue_struct
*q
= &diff_queued_diff
;
2761 struct diff_queue_struct outq
;
2763 outq
.nr
= outq
.alloc
= 0;
2768 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
2770 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
2771 struct diff_filepair
*p
= q
->queue
[i
];
2772 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
2774 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
2776 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
2777 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
2778 strchr(filter
, p
->status
)))
2784 /* otherwise we will clear the whole queue
2785 * by copying the empty outq at the end of this
2786 * function, but first clear the current entries
2789 for (i
= 0; i
< q
->nr
; i
++)
2790 diff_free_filepair(q
->queue
[i
]);
2793 /* Only the matching ones */
2794 for (i
= 0; i
< q
->nr
; i
++) {
2795 struct diff_filepair
*p
= q
->queue
[i
];
2797 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
2799 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
2801 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
2802 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
2803 strchr(filter
, p
->status
)))
2806 diff_free_filepair(p
);
2813 void diffcore_std(struct diff_options
*options
)
2815 if (options
->break_opt
!= -1)
2816 diffcore_break(options
->break_opt
);
2817 if (options
->detect_rename
)
2818 diffcore_rename(options
);
2819 if (options
->break_opt
!= -1)
2820 diffcore_merge_broken();
2821 if (options
->pickaxe
)
2822 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
2823 if (options
->orderfile
)
2824 diffcore_order(options
->orderfile
);
2825 diff_resolve_rename_copy();
2826 diffcore_apply_filter(options
->filter
);
2830 void diffcore_std_no_resolve(struct diff_options
*options
)
2832 if (options
->pickaxe
)
2833 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
2834 if (options
->orderfile
)
2835 diffcore_order(options
->orderfile
);
2836 diffcore_apply_filter(options
->filter
);
2839 void diff_addremove(struct diff_options
*options
,
2840 int addremove
, unsigned mode
,
2841 const unsigned char *sha1
,
2842 const char *base
, const char *path
)
2844 char concatpath
[PATH_MAX
];
2845 struct diff_filespec
*one
, *two
;
2847 /* This may look odd, but it is a preparation for
2848 * feeding "there are unchanged files which should
2849 * not produce diffs, but when you are doing copy
2850 * detection you would need them, so here they are"
2851 * entries to the diff-core. They will be prefixed
2852 * with something like '=' or '*' (I haven't decided
2853 * which but should not make any difference).
2854 * Feeding the same new and old to diff_change()
2855 * also has the same effect.
2856 * Before the final output happens, they are pruned after
2857 * merged into rename/copy pairs as appropriate.
2859 if (options
->reverse_diff
)
2860 addremove
= (addremove
== '+' ? '-' :
2861 addremove
== '-' ? '+' : addremove
);
2863 if (!path
) path
= "";
2864 sprintf(concatpath
, "%s%s", base
, path
);
2865 one
= alloc_filespec(concatpath
);
2866 two
= alloc_filespec(concatpath
);
2868 if (addremove
!= '+')
2869 fill_filespec(one
, sha1
, mode
);
2870 if (addremove
!= '-')
2871 fill_filespec(two
, sha1
, mode
);
2873 diff_queue(&diff_queued_diff
, one
, two
);
2876 void diff_change(struct diff_options
*options
,
2877 unsigned old_mode
, unsigned new_mode
,
2878 const unsigned char *old_sha1
,
2879 const unsigned char *new_sha1
,
2880 const char *base
, const char *path
)
2882 char concatpath
[PATH_MAX
];
2883 struct diff_filespec
*one
, *two
;
2885 if (options
->reverse_diff
) {
2887 const unsigned char *tmp_c
;
2888 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
2889 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
2891 if (!path
) path
= "";
2892 sprintf(concatpath
, "%s%s", base
, path
);
2893 one
= alloc_filespec(concatpath
);
2894 two
= alloc_filespec(concatpath
);
2895 fill_filespec(one
, old_sha1
, old_mode
);
2896 fill_filespec(two
, new_sha1
, new_mode
);
2898 diff_queue(&diff_queued_diff
, one
, two
);
2901 void diff_unmerge(struct diff_options
*options
,
2903 unsigned mode
, const unsigned char *sha1
)
2905 struct diff_filespec
*one
, *two
;
2906 one
= alloc_filespec(path
);
2907 two
= alloc_filespec(path
);
2908 fill_filespec(one
, sha1
, mode
);
2909 diff_queue(&diff_queued_diff
, one
, two
)->is_unmerged
= 1;