2 * Copyright (C) 2005 Junio C Hamano
12 static const char *diff_opts
= "-pu";
14 static int use_size_cache
;
16 static const char *external_diff(void)
18 static const char *external_diff_cmd
= NULL
;
19 static int done_preparing
= 0;
20 const char *env_diff_opts
;
23 return external_diff_cmd
;
26 * Default values above are meant to match the
27 * Linux kernel development style. Examples of
28 * alternative styles you can specify via environment
33 external_diff_cmd
= getenv("GIT_EXTERNAL_DIFF");
35 /* In case external diff fails... */
36 env_diff_opts
= getenv("GIT_DIFF_OPTS");
37 if (env_diff_opts
) diff_opts
= env_diff_opts
;
40 return external_diff_cmd
;
43 #define TEMPFILE_PATH_LEN 50
45 static struct diff_tempfile
{
46 const char *name
; /* filename external diff should read from */
49 char tmp_path
[TEMPFILE_PATH_LEN
];
52 static int count_lines(const char *filename
)
55 int count
, ch
, completely_empty
= 1, nl_just_seen
= 0;
56 in
= fopen(filename
, "r");
58 while ((ch
= fgetc(in
)) != EOF
)
72 count
++; /* no trailing newline */
76 static void print_line_count(int count
)
86 printf("1,%d", count
);
91 static void copy_file(int prefix
, const char *filename
)
94 int ch
, nl_just_seen
= 1;
95 in
= fopen(filename
, "r");
96 while ((ch
= fgetc(in
)) != EOF
) {
107 printf("\n\\ No newline at end of file\n");
110 static void emit_rewrite_diff(const char *name_a
,
112 struct diff_tempfile
*temp
)
114 /* Use temp[i].name as input, name_a and name_b as labels */
116 lc_a
= count_lines(temp
[0].name
);
117 lc_b
= count_lines(temp
[1].name
);
118 printf("--- %s\n+++ %s\n@@ -", name_a
, name_b
);
119 print_line_count(lc_a
);
121 print_line_count(lc_b
);
124 copy_file('-', temp
[0].name
);
126 copy_file('+', temp
[1].name
);
129 static void builtin_diff(const char *name_a
,
131 struct diff_tempfile
*temp
,
132 const char *xfrm_msg
,
133 int complete_rewrite
)
135 int i
, next_at
, cmd_size
;
136 const char *const diff_cmd
= "diff -L%s%s -L%s%s";
137 const char *const diff_arg
= "%s %s||:"; /* "||:" is to return 0 */
138 const char *input_name_sq
[2];
139 const char *path0
[2];
140 const char *path1
[2];
141 const char *name_sq
[2];
144 name_sq
[0] = sq_quote(name_a
);
145 name_sq
[1] = sq_quote(name_b
);
147 /* diff_cmd and diff_arg have 6 %s in total which makes
148 * the sum of these strings 12 bytes larger than required.
149 * we use 2 spaces around diff-opts, and we need to count
150 * terminating NUL, so we subtract 9 here.
152 cmd_size
= (strlen(diff_cmd
) + strlen(diff_opts
) +
153 strlen(diff_arg
) - 9);
154 for (i
= 0; i
< 2; i
++) {
155 input_name_sq
[i
] = sq_quote(temp
[i
].name
);
156 if (!strcmp(temp
[i
].name
, "/dev/null")) {
157 path0
[i
] = "/dev/null";
160 path0
[i
] = i
? "b/" : "a/";
161 path1
[i
] = name_sq
[i
];
163 cmd_size
+= (strlen(path0
[i
]) + strlen(path1
[i
]) +
164 strlen(input_name_sq
[i
]));
167 cmd
= xmalloc(cmd_size
);
170 next_at
+= snprintf(cmd
+next_at
, cmd_size
-next_at
,
172 path0
[0], path1
[0], path0
[1], path1
[1]);
173 next_at
+= snprintf(cmd
+next_at
, cmd_size
-next_at
,
175 next_at
+= snprintf(cmd
+next_at
, cmd_size
-next_at
,
176 diff_arg
, input_name_sq
[0], input_name_sq
[1]);
178 printf("diff --git a/%s b/%s\n", name_a
, name_b
);
180 printf("new file mode %s\n", temp
[1].mode
);
181 if (xfrm_msg
&& xfrm_msg
[0])
184 else if (!path1
[1][0]) {
185 printf("deleted file mode %s\n", temp
[0].mode
);
186 if (xfrm_msg
&& xfrm_msg
[0])
190 if (strcmp(temp
[0].mode
, temp
[1].mode
)) {
191 printf("old mode %s\n", temp
[0].mode
);
192 printf("new mode %s\n", temp
[1].mode
);
194 if (xfrm_msg
&& xfrm_msg
[0])
196 if (strncmp(temp
[0].mode
, temp
[1].mode
, 3))
197 /* we do not run diff between different kind
201 if (complete_rewrite
) {
203 emit_rewrite_diff(name_a
, name_b
, temp
);
208 execlp("/bin/sh","sh", "-c", cmd
, NULL
);
211 struct diff_filespec
*alloc_filespec(const char *path
)
213 int namelen
= strlen(path
);
214 struct diff_filespec
*spec
= xmalloc(sizeof(*spec
) + namelen
+ 1);
216 memset(spec
, 0, sizeof(*spec
));
217 spec
->path
= (char *)(spec
+ 1);
218 memcpy(spec
->path
, path
, namelen
+1);
222 void fill_filespec(struct diff_filespec
*spec
, const unsigned char *sha1
,
226 spec
->mode
= DIFF_FILE_CANON_MODE(mode
);
227 memcpy(spec
->sha1
, sha1
, 20);
228 spec
->sha1_valid
= !!memcmp(sha1
, null_sha1
, 20);
233 * Given a name and sha1 pair, if the dircache tells us the file in
234 * the work tree has that object contents, return true, so that
235 * prepare_temp_file() does not have to inflate and extract.
237 static int work_tree_matches(const char *name
, const unsigned char *sha1
)
239 struct cache_entry
*ce
;
243 /* We do not read the cache ourselves here, because the
244 * benchmark with my previous version that always reads cache
245 * shows that it makes things worse for diff-tree comparing
246 * two linux-2.6 kernel trees in an already checked out work
247 * tree. This is because most diff-tree comparisons deal with
248 * only a small number of files, while reading the cache is
249 * expensive for a large project, and its cost outweighs the
250 * savings we get by not inflating the object to a temporary
251 * file. Practically, this code only helps when we are used
252 * by diff-cache --cached, which does read the cache before
259 pos
= cache_name_pos(name
, len
);
262 ce
= active_cache
[pos
];
263 if ((lstat(name
, &st
) < 0) ||
264 !S_ISREG(st
.st_mode
) || /* careful! */
265 ce_match_stat(ce
, &st
) ||
266 memcmp(sha1
, ce
->sha1
, 20))
268 /* we return 1 only when we can stat, it is a regular file,
269 * stat information matches, and sha1 recorded in the cache
270 * matches. I.e. we know the file in the work tree really is
271 * the same as the <name, sha1> pair.
276 static struct sha1_size_cache
{
277 unsigned char sha1
[20];
280 static int sha1_size_cache_nr
, sha1_size_cache_alloc
;
282 static struct sha1_size_cache
*locate_size_cache(unsigned char *sha1
,
287 struct sha1_size_cache
*e
;
290 last
= sha1_size_cache_nr
;
291 while (last
> first
) {
292 int cmp
, next
= (last
+ first
) >> 1;
293 e
= sha1_size_cache
[next
];
294 cmp
= memcmp(e
->sha1
, sha1
, 20);
306 /* insert to make it at "first" */
307 if (sha1_size_cache_alloc
<= sha1_size_cache_nr
) {
308 sha1_size_cache_alloc
= alloc_nr(sha1_size_cache_alloc
);
309 sha1_size_cache
= xrealloc(sha1_size_cache
,
310 sha1_size_cache_alloc
*
311 sizeof(*sha1_size_cache
));
313 sha1_size_cache_nr
++;
314 if (first
< sha1_size_cache_nr
)
315 memmove(sha1_size_cache
+ first
+ 1, sha1_size_cache
+ first
,
316 (sha1_size_cache_nr
- first
- 1) *
317 sizeof(*sha1_size_cache
));
318 e
= xmalloc(sizeof(struct sha1_size_cache
));
319 sha1_size_cache
[first
] = e
;
320 memcpy(e
->sha1
, sha1
, 20);
326 * While doing rename detection and pickaxe operation, we may need to
327 * grab the data for the blob (or file) for our own in-core comparison.
328 * diff_filespec has data and size fields for this purpose.
330 int diff_populate_filespec(struct diff_filespec
*s
, int size_only
)
333 if (!DIFF_FILE_VALID(s
))
334 die("internal error: asking to populate invalid file.");
335 if (S_ISDIR(s
->mode
))
343 if (!s
->sha1_valid
||
344 work_tree_matches(s
->path
, s
->sha1
)) {
347 if (lstat(s
->path
, &st
) < 0) {
348 if (errno
== ENOENT
) {
357 s
->size
= st
.st_size
;
362 if (S_ISLNK(st
.st_mode
)) {
364 s
->data
= xmalloc(s
->size
);
366 ret
= readlink(s
->path
, s
->data
, s
->size
);
373 fd
= open(s
->path
, O_RDONLY
);
376 s
->data
= mmap(NULL
, s
->size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
378 if (s
->data
== MAP_FAILED
)
380 s
->should_munmap
= 1;
384 struct sha1_size_cache
*e
;
387 e
= locate_size_cache(s
->sha1
, 1, 0);
392 if (!sha1_object_info(s
->sha1
, type
, &s
->size
))
393 locate_size_cache(s
->sha1
, 0, s
->size
);
396 s
->data
= read_sha1_file(s
->sha1
, type
, &s
->size
);
403 void diff_free_filespec_data(struct diff_filespec
*s
)
407 else if (s
->should_munmap
)
408 munmap(s
->data
, s
->size
);
409 s
->should_free
= s
->should_munmap
= 0;
413 static void prep_temp_blob(struct diff_tempfile
*temp
,
416 const unsigned char *sha1
,
421 fd
= git_mkstemp(temp
->tmp_path
, TEMPFILE_PATH_LEN
, ".diff_XXXXXX");
423 die("unable to create temp-file");
424 if (write(fd
, blob
, size
) != size
)
425 die("unable to write temp-file");
427 temp
->name
= temp
->tmp_path
;
428 strcpy(temp
->hex
, sha1_to_hex(sha1
));
430 sprintf(temp
->mode
, "%06o", mode
);
433 static void prepare_temp_file(const char *name
,
434 struct diff_tempfile
*temp
,
435 struct diff_filespec
*one
)
437 if (!DIFF_FILE_VALID(one
)) {
439 /* A '-' entry produces this for file-2, and
440 * a '+' entry produces this for file-1.
442 temp
->name
= "/dev/null";
443 strcpy(temp
->hex
, ".");
444 strcpy(temp
->mode
, ".");
448 if (!one
->sha1_valid
||
449 work_tree_matches(name
, one
->sha1
)) {
451 if (lstat(name
, &st
) < 0) {
453 goto not_a_valid_file
;
454 die("stat(%s): %s", name
, strerror(errno
));
456 if (S_ISLNK(st
.st_mode
)) {
458 char *buf
, buf_
[1024];
459 buf
= ((sizeof(buf_
) < st
.st_size
) ?
460 xmalloc(st
.st_size
) : buf_
);
461 ret
= readlink(name
, buf
, st
.st_size
);
463 die("readlink(%s)", name
);
464 prep_temp_blob(temp
, buf
, st
.st_size
,
466 one
->sha1
: null_sha1
),
468 one
->mode
: S_IFLNK
));
471 /* we can borrow from the file in the work tree */
473 if (!one
->sha1_valid
)
474 strcpy(temp
->hex
, sha1_to_hex(null_sha1
));
476 strcpy(temp
->hex
, sha1_to_hex(one
->sha1
));
477 /* Even though we may sometimes borrow the
478 * contents from the work tree, we always want
479 * one->mode. mode is trustworthy even when
480 * !(one->sha1_valid), as long as
481 * DIFF_FILE_VALID(one).
483 sprintf(temp
->mode
, "%06o", one
->mode
);
488 if (diff_populate_filespec(one
, 0))
489 die("cannot read data blob for %s", one
->path
);
490 prep_temp_blob(temp
, one
->data
, one
->size
,
491 one
->sha1
, one
->mode
);
495 static void remove_tempfile(void)
499 for (i
= 0; i
< 2; i
++)
500 if (diff_temp
[i
].name
== diff_temp
[i
].tmp_path
) {
501 unlink(diff_temp
[i
].name
);
502 diff_temp
[i
].name
= NULL
;
506 static void remove_tempfile_on_signal(int signo
)
511 /* An external diff command takes:
513 * diff-cmd name infile1 infile1-sha1 infile1-mode \
514 * infile2 infile2-sha1 infile2-mode [ rename-to ]
517 static void run_external_diff(const char *pgm
,
520 struct diff_filespec
*one
,
521 struct diff_filespec
*two
,
522 const char *xfrm_msg
,
523 int complete_rewrite
)
525 struct diff_tempfile
*temp
= diff_temp
;
528 static int atexit_asked
= 0;
529 const char *othername
;
531 othername
= (other
? other
: name
);
533 prepare_temp_file(name
, &temp
[0], one
);
534 prepare_temp_file(othername
, &temp
[1], two
);
535 if (! atexit_asked
&&
536 (temp
[0].name
== temp
[0].tmp_path
||
537 temp
[1].name
== temp
[1].tmp_path
)) {
539 atexit(remove_tempfile
);
541 signal(SIGINT
, remove_tempfile_on_signal
);
547 die("unable to fork");
551 const char *exec_arg
[10];
552 const char **arg
= &exec_arg
[0];
555 *arg
++ = temp
[0].name
;
556 *arg
++ = temp
[0].hex
;
557 *arg
++ = temp
[0].mode
;
558 *arg
++ = temp
[1].name
;
559 *arg
++ = temp
[1].hex
;
560 *arg
++ = temp
[1].mode
;
566 execvp(pgm
, (char *const*) exec_arg
);
569 execlp(pgm
, pgm
, name
, NULL
);
572 * otherwise we use the built-in one.
575 builtin_diff(name
, othername
, temp
, xfrm_msg
,
578 printf("* Unmerged path %s\n", name
);
581 if (waitpid(pid
, &status
, 0) < 0 ||
582 !WIFEXITED(status
) || WEXITSTATUS(status
)) {
583 /* Earlier we did not check the exit status because
584 * diff exits non-zero if files are different, and
585 * we are not interested in knowing that. It was a
586 * mistake which made it harder to quit a diff-*
587 * session that uses the git-apply-patch-script as
588 * the GIT_EXTERNAL_DIFF. A custom GIT_EXTERNAL_DIFF
589 * should also exit non-zero only when it wants to
590 * abort the entire diff-* session.
593 fprintf(stderr
, "external diff died, stopping at %s.\n", name
);
599 static void diff_fill_sha1_info(struct diff_filespec
*one
)
601 if (DIFF_FILE_VALID(one
)) {
602 if (!one
->sha1_valid
) {
604 if (stat(one
->path
, &st
) < 0)
605 die("stat %s", one
->path
);
606 if (index_path(one
->sha1
, one
->path
, &st
, 0))
607 die("cannot hash %s\n", one
->path
);
611 memset(one
->sha1
, 0, 20);
614 static void run_diff(struct diff_filepair
*p
)
616 const char *pgm
= external_diff();
617 char msg
[PATH_MAX
*2+300], *xfrm_msg
;
618 struct diff_filespec
*one
;
619 struct diff_filespec
*two
;
622 int complete_rewrite
= 0;
625 if (DIFF_PAIR_UNMERGED(p
)) {
627 run_external_diff(pgm
, p
->one
->path
, NULL
, NULL
, NULL
, NULL
,
633 other
= (strcmp(name
, p
->two
->path
) ? p
->two
->path
: NULL
);
634 one
= p
->one
; two
= p
->two
;
636 diff_fill_sha1_info(one
);
637 diff_fill_sha1_info(two
);
641 case DIFF_STATUS_COPIED
:
642 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
643 "similarity index %d%%\n"
646 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
),
649 case DIFF_STATUS_RENAMED
:
650 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
651 "similarity index %d%%\n"
654 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
),
657 case DIFF_STATUS_MODIFIED
:
659 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
660 "dissimilarity index %d%%\n",
661 (int)(0.5 + p
->score
*
663 complete_rewrite
= 1;
672 if (memcmp(one
->sha1
, two
->sha1
, 20)) {
674 memcpy(one_sha1
, sha1_to_hex(one
->sha1
), 41);
676 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
677 "index %.7s..%.7s", one_sha1
,
678 sha1_to_hex(two
->sha1
));
679 if (one
->mode
== two
->mode
)
680 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
,
682 len
+= snprintf(msg
+ len
, sizeof(msg
) - len
, "\n");
687 xfrm_msg
= len
? msg
: NULL
;
690 DIFF_FILE_VALID(one
) && DIFF_FILE_VALID(two
) &&
691 (S_IFMT
& one
->mode
) != (S_IFMT
& two
->mode
)) {
692 /* a filepair that changes between file and symlink
693 * needs to be split into deletion and creation.
695 struct diff_filespec
*null
= alloc_filespec(two
->path
);
696 run_external_diff(NULL
, name
, other
, one
, null
, xfrm_msg
, 0);
698 null
= alloc_filespec(one
->path
);
699 run_external_diff(NULL
, name
, other
, null
, two
, xfrm_msg
, 0);
703 run_external_diff(pgm
, name
, other
, one
, two
, xfrm_msg
,
707 void diff_setup(struct diff_options
*options
)
709 memset(options
, 0, sizeof(*options
));
710 options
->output_format
= DIFF_FORMAT_RAW
;
711 options
->line_termination
= '\n';
712 options
->break_opt
= -1;
713 options
->rename_limit
= -1;
716 int diff_setup_done(struct diff_options
*options
)
718 if ((options
->find_copies_harder
|| 0 <= options
->rename_limit
) &&
719 options
->detect_rename
!= DIFF_DETECT_COPY
)
721 if (options
->setup
& DIFF_SETUP_USE_CACHE
) {
723 /* read-cache does not die even when it fails
724 * so it is safe for us to do this here. Also
725 * it does not smudge active_cache or active_nr
726 * when it fails, so we do not have to worry about
727 * cleaning it up oufselves either.
731 if (options
->setup
& DIFF_SETUP_USE_SIZE_CACHE
)
737 int diff_opt_parse(struct diff_options
*options
, const char **av
, int ac
)
739 const char *arg
= av
[0];
740 if (!strcmp(arg
, "-p") || !strcmp(arg
, "-u"))
741 options
->output_format
= DIFF_FORMAT_PATCH
;
742 else if (!strcmp(arg
, "-z"))
743 options
->line_termination
= 0;
744 else if (!strncmp(arg
, "-l", 2))
745 options
->rename_limit
= strtoul(arg
+2, NULL
, 10);
746 else if (!strcmp(arg
, "--name-only"))
747 options
->output_format
= DIFF_FORMAT_NAME
;
748 else if (!strcmp(arg
, "--name-status"))
749 options
->output_format
= DIFF_FORMAT_NAME_STATUS
;
750 else if (!strcmp(arg
, "-R"))
751 options
->reverse_diff
= 1;
752 else if (!strncmp(arg
, "-S", 2))
753 options
->pickaxe
= arg
+ 2;
754 else if (!strcmp(arg
, "-s"))
755 options
->output_format
= DIFF_FORMAT_NO_OUTPUT
;
756 else if (!strncmp(arg
, "-O", 2))
757 options
->orderfile
= arg
+ 2;
758 else if (!strncmp(arg
, "--diff-filter=", 14))
759 options
->filter
= arg
+ 14;
760 else if (!strcmp(arg
, "--pickaxe-all"))
761 options
->pickaxe_opts
= DIFF_PICKAXE_ALL
;
762 else if (!strncmp(arg
, "-B", 2)) {
763 if ((options
->break_opt
=
764 diff_scoreopt_parse(arg
)) == -1)
767 else if (!strncmp(arg
, "-M", 2)) {
768 if ((options
->rename_score
=
769 diff_scoreopt_parse(arg
)) == -1)
771 options
->detect_rename
= DIFF_DETECT_RENAME
;
773 else if (!strncmp(arg
, "-C", 2)) {
774 if ((options
->rename_score
=
775 diff_scoreopt_parse(arg
)) == -1)
777 options
->detect_rename
= DIFF_DETECT_COPY
;
779 else if (!strcmp(arg
, "--find-copies-harder"))
780 options
->find_copies_harder
= 1;
786 static int parse_num(const char **cp_p
)
788 int num
, scale
, ch
, cnt
;
789 const char *cp
= *cp_p
;
793 while ('0' <= (ch
= *cp
) && ch
<= '9') {
795 /* We simply ignore more than 5 digits precision. */
797 num
= num
* 10 + ch
- '0';
803 /* user says num divided by scale and we say internally that
804 * is MAX_SCORE * num / scale.
806 return (MAX_SCORE
* num
/ scale
);
809 int diff_scoreopt_parse(const char *opt
)
816 if (cmd
!= 'M' && cmd
!= 'C' && cmd
!= 'B')
817 return -1; /* that is not a -M, -C nor -B option */
819 opt1
= parse_num(&opt
);
825 else if (*opt
!= '/')
826 return -1; /* we expect -B80/99 or -B80 */
829 opt2
= parse_num(&opt
);
834 return opt1
| (opt2
<< 16);
837 struct diff_queue_struct diff_queued_diff
;
839 void diff_q(struct diff_queue_struct
*queue
, struct diff_filepair
*dp
)
841 if (queue
->alloc
<= queue
->nr
) {
842 queue
->alloc
= alloc_nr(queue
->alloc
);
843 queue
->queue
= xrealloc(queue
->queue
,
844 sizeof(dp
) * queue
->alloc
);
846 queue
->queue
[queue
->nr
++] = dp
;
849 struct diff_filepair
*diff_queue(struct diff_queue_struct
*queue
,
850 struct diff_filespec
*one
,
851 struct diff_filespec
*two
)
853 struct diff_filepair
*dp
= xmalloc(sizeof(*dp
));
858 dp
->source_stays
= 0;
865 void diff_free_filepair(struct diff_filepair
*p
)
867 diff_free_filespec_data(p
->one
);
868 diff_free_filespec_data(p
->two
);
874 static void diff_flush_raw(struct diff_filepair
*p
,
875 int line_termination
,
876 int inter_name_termination
,
882 if (line_termination
) {
883 const char *const err
=
884 "path %s cannot be expressed without -z";
885 if (strchr(p
->one
->path
, line_termination
) ||
886 strchr(p
->one
->path
, inter_name_termination
))
887 die(err
, p
->one
->path
);
888 if (strchr(p
->two
->path
, line_termination
) ||
889 strchr(p
->two
->path
, inter_name_termination
))
890 die(err
, p
->two
->path
);
894 sprintf(status
, "%c%03d", p
->status
,
895 (int)(0.5 + p
->score
* 100.0/MAX_SCORE
));
897 status
[0] = p
->status
;
901 case DIFF_STATUS_COPIED
:
902 case DIFF_STATUS_RENAMED
:
905 case DIFF_STATUS_ADDED
:
906 case DIFF_STATUS_DELETED
:
913 if (output_format
!= DIFF_FORMAT_NAME_STATUS
) {
914 printf(":%06o %06o %s ",
915 p
->one
->mode
, p
->two
->mode
, sha1_to_hex(p
->one
->sha1
));
916 printf("%s ", sha1_to_hex(p
->two
->sha1
));
918 printf("%s%c%s",status
, inter_name_termination
, p
->one
->path
);
920 printf("%c%s", inter_name_termination
, p
->two
->path
);
921 putchar(line_termination
);
924 static void diff_flush_name(struct diff_filepair
*p
,
925 int line_termination
)
927 printf("%s%c", p
->two
->path
, line_termination
);
930 int diff_unmodified_pair(struct diff_filepair
*p
)
932 /* This function is written stricter than necessary to support
933 * the currently implemented transformers, but the idea is to
934 * let transformers to produce diff_filepairs any way they want,
935 * and filter and clean them up here before producing the output.
937 struct diff_filespec
*one
, *two
;
939 if (DIFF_PAIR_UNMERGED(p
))
940 return 0; /* unmerged is interesting */
945 /* deletion, addition, mode or type change
946 * and rename are all interesting.
948 if (DIFF_FILE_VALID(one
) != DIFF_FILE_VALID(two
) ||
949 DIFF_PAIR_MODE_CHANGED(p
) ||
950 strcmp(one
->path
, two
->path
))
953 /* both are valid and point at the same path. that is, we are
954 * dealing with a change.
956 if (one
->sha1_valid
&& two
->sha1_valid
&&
957 !memcmp(one
->sha1
, two
->sha1
, sizeof(one
->sha1
)))
958 return 1; /* no change */
959 if (!one
->sha1_valid
&& !two
->sha1_valid
)
960 return 1; /* both look at the same file on the filesystem. */
964 static void diff_flush_patch(struct diff_filepair
*p
)
966 if (diff_unmodified_pair(p
))
969 if ((DIFF_FILE_VALID(p
->one
) && S_ISDIR(p
->one
->mode
)) ||
970 (DIFF_FILE_VALID(p
->two
) && S_ISDIR(p
->two
->mode
)))
971 return; /* no tree diffs in patch format */
976 int diff_queue_is_empty(void)
978 struct diff_queue_struct
*q
= &diff_queued_diff
;
980 for (i
= 0; i
< q
->nr
; i
++)
981 if (!diff_unmodified_pair(q
->queue
[i
]))
987 void diff_debug_filespec(struct diff_filespec
*s
, int x
, const char *one
)
989 fprintf(stderr
, "queue[%d] %s (%s) %s %06o %s\n",
992 DIFF_FILE_VALID(s
) ? "valid" : "invalid",
994 s
->sha1_valid
? sha1_to_hex(s
->sha1
) : "");
995 fprintf(stderr
, "queue[%d] %s size %lu flags %d\n",
997 s
->size
, s
->xfrm_flags
);
1000 void diff_debug_filepair(const struct diff_filepair
*p
, int i
)
1002 diff_debug_filespec(p
->one
, i
, "one");
1003 diff_debug_filespec(p
->two
, i
, "two");
1004 fprintf(stderr
, "score %d, status %c stays %d broken %d\n",
1005 p
->score
, p
->status
? p
->status
: '?',
1006 p
->source_stays
, p
->broken_pair
);
1009 void diff_debug_queue(const char *msg
, struct diff_queue_struct
*q
)
1013 fprintf(stderr
, "%s\n", msg
);
1014 fprintf(stderr
, "q->nr = %d\n", q
->nr
);
1015 for (i
= 0; i
< q
->nr
; i
++) {
1016 struct diff_filepair
*p
= q
->queue
[i
];
1017 diff_debug_filepair(p
, i
);
1022 static void diff_resolve_rename_copy(void)
1025 struct diff_filepair
*p
, *pp
;
1026 struct diff_queue_struct
*q
= &diff_queued_diff
;
1028 diff_debug_queue("resolve-rename-copy", q
);
1030 for (i
= 0; i
< q
->nr
; i
++) {
1032 p
->status
= 0; /* undecided */
1033 if (DIFF_PAIR_UNMERGED(p
))
1034 p
->status
= DIFF_STATUS_UNMERGED
;
1035 else if (!DIFF_FILE_VALID(p
->one
))
1036 p
->status
= DIFF_STATUS_ADDED
;
1037 else if (!DIFF_FILE_VALID(p
->two
))
1038 p
->status
= DIFF_STATUS_DELETED
;
1039 else if (DIFF_PAIR_TYPE_CHANGED(p
))
1040 p
->status
= DIFF_STATUS_TYPE_CHANGED
;
1042 /* from this point on, we are dealing with a pair
1043 * whose both sides are valid and of the same type, i.e.
1044 * either in-place edit or rename/copy edit.
1046 else if (DIFF_PAIR_RENAME(p
)) {
1047 if (p
->source_stays
) {
1048 p
->status
= DIFF_STATUS_COPIED
;
1051 /* See if there is some other filepair that
1052 * copies from the same source as us. If so
1053 * we are a copy. Otherwise we are either a
1054 * copy if the path stays, or a rename if it
1055 * does not, but we already handled "stays" case.
1057 for (j
= i
+ 1; j
< q
->nr
; j
++) {
1059 if (strcmp(pp
->one
->path
, p
->one
->path
))
1060 continue; /* not us */
1061 if (!DIFF_PAIR_RENAME(pp
))
1062 continue; /* not a rename/copy */
1063 /* pp is a rename/copy from the same source */
1064 p
->status
= DIFF_STATUS_COPIED
;
1068 p
->status
= DIFF_STATUS_RENAMED
;
1070 else if (memcmp(p
->one
->sha1
, p
->two
->sha1
, 20) ||
1071 p
->one
->mode
!= p
->two
->mode
)
1072 p
->status
= DIFF_STATUS_MODIFIED
;
1074 /* This is a "no-change" entry and should not
1075 * happen anymore, but prepare for broken callers.
1077 error("feeding unmodified %s to diffcore",
1079 p
->status
= DIFF_STATUS_UNKNOWN
;
1082 diff_debug_queue("resolve-rename-copy done", q
);
1085 void diff_flush(struct diff_options
*options
)
1087 struct diff_queue_struct
*q
= &diff_queued_diff
;
1089 int inter_name_termination
= '\t';
1090 int diff_output_format
= options
->output_format
;
1091 int line_termination
= options
->line_termination
;
1093 if (!line_termination
)
1094 inter_name_termination
= 0;
1096 for (i
= 0; i
< q
->nr
; i
++) {
1097 struct diff_filepair
*p
= q
->queue
[i
];
1098 if ((diff_output_format
== DIFF_FORMAT_NO_OUTPUT
) ||
1099 (p
->status
== DIFF_STATUS_UNKNOWN
))
1102 die("internal error in diff-resolve-rename-copy");
1103 switch (diff_output_format
) {
1104 case DIFF_FORMAT_PATCH
:
1105 diff_flush_patch(p
);
1107 case DIFF_FORMAT_RAW
:
1108 case DIFF_FORMAT_NAME_STATUS
:
1109 diff_flush_raw(p
, line_termination
,
1110 inter_name_termination
,
1111 diff_output_format
);
1113 case DIFF_FORMAT_NAME
:
1114 diff_flush_name(p
, line_termination
);
1117 diff_free_filepair(q
->queue
[i
]);
1121 q
->nr
= q
->alloc
= 0;
1124 static void diffcore_apply_filter(const char *filter
)
1127 struct diff_queue_struct
*q
= &diff_queued_diff
;
1128 struct diff_queue_struct outq
;
1130 outq
.nr
= outq
.alloc
= 0;
1135 if (strchr(filter
, DIFF_STATUS_FILTER_AON
)) {
1137 for (i
= found
= 0; !found
&& i
< q
->nr
; i
++) {
1138 struct diff_filepair
*p
= q
->queue
[i
];
1139 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
1141 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
1143 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
1144 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
1145 strchr(filter
, p
->status
)))
1151 /* otherwise we will clear the whole queue
1152 * by copying the empty outq at the end of this
1153 * function, but first clear the current entries
1156 for (i
= 0; i
< q
->nr
; i
++)
1157 diff_free_filepair(q
->queue
[i
]);
1160 /* Only the matching ones */
1161 for (i
= 0; i
< q
->nr
; i
++) {
1162 struct diff_filepair
*p
= q
->queue
[i
];
1164 if (((p
->status
== DIFF_STATUS_MODIFIED
) &&
1166 strchr(filter
, DIFF_STATUS_FILTER_BROKEN
)) ||
1168 strchr(filter
, DIFF_STATUS_MODIFIED
)))) ||
1169 ((p
->status
!= DIFF_STATUS_MODIFIED
) &&
1170 strchr(filter
, p
->status
)))
1173 diff_free_filepair(p
);
1180 void diffcore_std(struct diff_options
*options
)
1182 if (options
->paths
&& options
->paths
[0])
1183 diffcore_pathspec(options
->paths
);
1184 if (options
->break_opt
!= -1)
1185 diffcore_break(options
->break_opt
);
1186 if (options
->detect_rename
)
1187 diffcore_rename(options
);
1188 if (options
->break_opt
!= -1)
1189 diffcore_merge_broken();
1190 if (options
->pickaxe
)
1191 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
1192 if (options
->orderfile
)
1193 diffcore_order(options
->orderfile
);
1194 diff_resolve_rename_copy();
1195 diffcore_apply_filter(options
->filter
);
1199 void diffcore_std_no_resolve(struct diff_options
*options
)
1201 if (options
->pickaxe
)
1202 diffcore_pickaxe(options
->pickaxe
, options
->pickaxe_opts
);
1203 if (options
->orderfile
)
1204 diffcore_order(options
->orderfile
);
1205 diffcore_apply_filter(options
->filter
);
1208 void diff_addremove(struct diff_options
*options
,
1209 int addremove
, unsigned mode
,
1210 const unsigned char *sha1
,
1211 const char *base
, const char *path
)
1213 char concatpath
[PATH_MAX
];
1214 struct diff_filespec
*one
, *two
;
1216 /* This may look odd, but it is a preparation for
1217 * feeding "there are unchanged files which should
1218 * not produce diffs, but when you are doing copy
1219 * detection you would need them, so here they are"
1220 * entries to the diff-core. They will be prefixed
1221 * with something like '=' or '*' (I haven't decided
1222 * which but should not make any difference).
1223 * Feeding the same new and old to diff_change()
1224 * also has the same effect.
1225 * Before the final output happens, they are pruned after
1226 * merged into rename/copy pairs as appropriate.
1228 if (options
->reverse_diff
)
1229 addremove
= (addremove
== '+' ? '-' :
1230 addremove
== '-' ? '+' : addremove
);
1232 if (!path
) path
= "";
1233 sprintf(concatpath
, "%s%s", base
, path
);
1234 one
= alloc_filespec(concatpath
);
1235 two
= alloc_filespec(concatpath
);
1237 if (addremove
!= '+')
1238 fill_filespec(one
, sha1
, mode
);
1239 if (addremove
!= '-')
1240 fill_filespec(two
, sha1
, mode
);
1242 diff_queue(&diff_queued_diff
, one
, two
);
1245 void diff_change(struct diff_options
*options
,
1246 unsigned old_mode
, unsigned new_mode
,
1247 const unsigned char *old_sha1
,
1248 const unsigned char *new_sha1
,
1249 const char *base
, const char *path
)
1251 char concatpath
[PATH_MAX
];
1252 struct diff_filespec
*one
, *two
;
1254 if (options
->reverse_diff
) {
1256 const unsigned char *tmp_c
;
1257 tmp
= old_mode
; old_mode
= new_mode
; new_mode
= tmp
;
1258 tmp_c
= old_sha1
; old_sha1
= new_sha1
; new_sha1
= tmp_c
;
1260 if (!path
) path
= "";
1261 sprintf(concatpath
, "%s%s", base
, path
);
1262 one
= alloc_filespec(concatpath
);
1263 two
= alloc_filespec(concatpath
);
1264 fill_filespec(one
, old_sha1
, old_mode
);
1265 fill_filespec(two
, new_sha1
, new_mode
);
1267 diff_queue(&diff_queued_diff
, one
, two
);
1270 void diff_unmerge(struct diff_options
*options
,
1273 struct diff_filespec
*one
, *two
;
1274 one
= alloc_filespec(path
);
1275 two
= alloc_filespec(path
);
1276 diff_queue(&diff_queued_diff
, one
, two
);