]>
git.ipfire.org Git - thirdparty/git.git/blob - diff-lib.c
2 * Copyright (C) 2005 Junio C Hamano
10 #include "cache-tree.h"
11 #include "path-list.h"
17 static int read_directory(const char *path
, struct path_list
*list
)
22 if (!(dir
= opendir(path
)))
23 return error("Could not open directory %s", path
);
25 while ((e
= readdir(dir
)))
26 if (strcmp(".", e
->d_name
) && strcmp("..", e
->d_name
))
27 path_list_insert(xstrdup(e
->d_name
), list
);
33 static int get_mode(const char *path
, int *mode
)
37 if (!path
|| !strcmp(path
, "/dev/null"))
39 else if (!strcmp(path
, "-"))
40 *mode
= ntohl(create_ce_mode(0666));
41 else if (stat(path
, &st
))
42 return error("Could not access '%s'", path
);
48 static int queue_diff(struct diff_options
*o
,
49 const char *name1
, const char *name2
)
51 int mode1
= 0, mode2
= 0;
53 if (get_mode(name1
, &mode1
) || get_mode(name2
, &mode2
))
56 if (mode1
&& mode2
&& S_ISDIR(mode1
) != S_ISDIR(mode2
))
57 return error("file/directory conflict: %s, %s", name1
, name2
);
59 if (S_ISDIR(mode1
) || S_ISDIR(mode2
)) {
60 char buffer1
[PATH_MAX
], buffer2
[PATH_MAX
];
61 struct path_list p1
= {NULL
, 0, 0, 1}, p2
= {NULL
, 0, 0, 1};
62 int len1
= 0, len2
= 0, i1
, i2
, ret
= 0;
64 if (name1
&& read_directory(name1
, &p1
))
66 if (name2
&& read_directory(name2
, &p2
)) {
67 path_list_clear(&p1
, 0);
73 if (len1
> 0 && name1
[len1
- 1] == '/')
75 memcpy(buffer1
, name1
, len1
);
76 buffer1
[len1
++] = '/';
81 if (len2
> 0 && name2
[len2
- 1] == '/')
83 memcpy(buffer2
, name2
, len2
);
84 buffer2
[len2
++] = '/';
87 for (i1
= i2
= 0; !ret
&& (i1
< p1
.nr
|| i2
< p2
.nr
); ) {
96 comp
= strcmp(p1
.items
[i1
].path
,
103 strncpy(buffer1
+ len1
, p1
.items
[i1
++].path
,
111 strncpy(buffer2
+ len2
, p2
.items
[i2
++].path
,
115 ret
= queue_diff(o
, n1
, n2
);
117 path_list_clear(&p1
, 0);
118 path_list_clear(&p2
, 0);
122 struct diff_filespec
*d1
, *d2
;
124 if (o
->reverse_diff
) {
127 tmp
= mode1
; mode1
= mode2
; mode2
= tmp
;
128 tmp_c
= name1
; name1
= name2
; name2
= tmp_c
;
135 d1
= alloc_filespec(name1
);
136 d2
= alloc_filespec(name2
);
137 fill_filespec(d1
, null_sha1
, mode1
);
138 fill_filespec(d2
, null_sha1
, mode2
);
140 diff_queue(&diff_queued_diff
, d1
, d2
);
145 static int is_in_index(const char *path
)
147 int len
= strlen(path
);
148 int pos
= cache_name_pos(path
, len
);
153 if (strncmp(active_cache
[pos
]->name
, path
, len
))
155 c
= active_cache
[pos
]->name
[len
];
156 return c
== '\0' || c
== '/';
159 static int handle_diff_files_args(struct rev_info
*revs
,
160 int argc
, const char **argv
, int *silent
)
164 /* revs->max_count == -2 means --no-index */
165 while (1 < argc
&& argv
[1][0] == '-') {
166 if (!strcmp(argv
[1], "--base"))
168 else if (!strcmp(argv
[1], "--ours"))
170 else if (!strcmp(argv
[1], "--theirs"))
172 else if (!strcmp(argv
[1], "-n") ||
173 !strcmp(argv
[1], "--no-index")) {
174 revs
->max_count
= -2;
175 revs
->diffopt
.exit_with_status
= 1;
177 else if (!strcmp(argv
[1], "-q"))
180 return error("invalid option: %s", argv
[1]);
184 if (revs
->max_count
== -1 && revs
->diffopt
.nr_paths
== 2) {
186 * If two files are specified, and at least one is untracked,
187 * default to no-index.
190 if (!is_in_index(revs
->diffopt
.paths
[0]) ||
191 !is_in_index(revs
->diffopt
.paths
[1]))
192 revs
->max_count
= -2;
196 * Make sure there are NO revision (i.e. pending object) parameter,
197 * rev.max_count is reasonable (0 <= n <= 3),
198 * there is no other revision filtering parameters.
200 if (revs
->pending
.nr
|| revs
->max_count
> 3 ||
201 revs
->min_age
!= -1 || revs
->max_age
!= -1)
202 return error("no revision allowed with diff-files");
204 if (revs
->max_count
== -1 &&
205 (revs
->diffopt
.output_format
& DIFF_FORMAT_PATCH
))
206 revs
->combine_merges
= revs
->dense_combined_merges
= 1;
211 static int is_outside_repo(const char *path
, int nongit
, const char *prefix
)
214 if (nongit
|| !strcmp(path
, "-") || path
[0] == '/')
216 if (prefixcmp(path
, "../"))
220 for (i
= strlen(prefix
); !prefixcmp(path
, "../"); ) {
221 while (i
> 0 && prefix
[i
- 1] != '/')
230 int setup_diff_no_index(struct rev_info
*revs
,
231 int argc
, const char ** argv
, int nongit
, const char *prefix
)
234 for (i
= 1; i
< argc
; i
++)
235 if (argv
[i
][0] != '-' || argv
[i
][1] == '\0')
237 else if (!strcmp(argv
[i
], "--")) {
240 } else if (i
< argc
- 3 && !strcmp(argv
[i
], "--no-index")) {
242 revs
->diffopt
.exit_with_status
= 1;
245 if (argc
!= i
+ 2 || (!is_outside_repo(argv
[i
+ 1], nongit
, prefix
) &&
246 !is_outside_repo(argv
[i
], nongit
, prefix
)))
249 diff_setup(&revs
->diffopt
);
250 for (i
= 1; i
< argc
- 2; )
251 if (!strcmp(argv
[i
], "--no-index"))
254 int j
= diff_opt_parse(&revs
->diffopt
,
257 die("invalid diff option/value: %s", argv
[i
]);
262 int len
= strlen(prefix
);
264 revs
->diffopt
.paths
= xcalloc(2, sizeof(char*));
265 for (i
= 0; i
< 2; i
++) {
266 const char *p
= argv
[argc
- 2 + i
];
268 * stdin should be spelled as '-'; if you have
269 * path that is '-', spell it as ./-.
272 ? xstrdup(prefix_filename(prefix
, len
, p
))
274 revs
->diffopt
.paths
[i
] = p
;
278 revs
->diffopt
.paths
= argv
+ argc
- 2;
279 revs
->diffopt
.nr_paths
= 2;
280 revs
->max_count
= -2;
284 int run_diff_files_cmd(struct rev_info
*revs
, int argc
, const char **argv
)
286 int silent_on_removed
;
288 if (handle_diff_files_args(revs
, argc
, argv
, &silent_on_removed
))
291 if (revs
->max_count
== -2) {
292 if (revs
->diffopt
.nr_paths
!= 2)
293 return error("need two files/directories with --no-index");
294 if (queue_diff(&revs
->diffopt
, revs
->diffopt
.paths
[0],
295 revs
->diffopt
.paths
[1]))
297 diffcore_std(&revs
->diffopt
);
298 diff_flush(&revs
->diffopt
);
300 * The return code for --no-index imitates diff(1):
301 * 0 = no changes, 1 = changes, else error
303 return revs
->diffopt
.found_changes
;
306 if (read_cache() < 0) {
307 perror("read_cache");
310 return run_diff_files(revs
, silent_on_removed
);
313 int run_diff_files(struct rev_info
*revs
, int silent_on_removed
)
316 int diff_unmerged_stage
= revs
->max_count
;
318 if (diff_unmerged_stage
< 0)
319 diff_unmerged_stage
= 2;
321 for (i
= 0; i
< entries
; i
++) {
323 unsigned int oldmode
, newmode
;
324 struct cache_entry
*ce
= active_cache
[i
];
327 if (!ce_path_match(ce
, revs
->prune_data
))
331 struct combine_diff_path
*dpath
;
332 int num_compare_stages
= 0;
335 path_len
= ce_namelen(ce
);
337 dpath
= xmalloc(combine_diff_path_size(5, path_len
));
338 dpath
->path
= (char *) &(dpath
->parent
[5]);
341 dpath
->len
= path_len
;
342 memcpy(dpath
->path
, ce
->name
, path_len
);
343 dpath
->path
[path_len
] = '\0';
344 hashclr(dpath
->sha1
);
345 memset(&(dpath
->parent
[0]), 0,
346 sizeof(struct combine_diff_parent
)*5);
348 if (lstat(ce
->name
, &st
) < 0) {
349 if (errno
!= ENOENT
&& errno
!= ENOTDIR
) {
353 if (silent_on_removed
)
357 dpath
->mode
= canon_mode(st
.st_mode
);
359 while (i
< entries
) {
360 struct cache_entry
*nce
= active_cache
[i
];
363 if (strcmp(ce
->name
, nce
->name
))
366 /* Stage #2 (ours) is the first parent,
367 * stage #3 (theirs) is the second.
369 stage
= ce_stage(nce
);
371 int mode
= ntohl(nce
->ce_mode
);
372 num_compare_stages
++;
373 hashcpy(dpath
->parent
[stage
-2].sha1
, nce
->sha1
);
374 dpath
->parent
[stage
-2].mode
=
376 dpath
->parent
[stage
-2].status
=
377 DIFF_STATUS_MODIFIED
;
380 /* diff against the proper unmerged stage */
381 if (stage
== diff_unmerged_stage
)
386 * Compensate for loop update
390 if (revs
->combine_merges
&& num_compare_stages
== 2) {
391 show_combined_diff(dpath
, 2,
392 revs
->dense_combined_merges
,
401 * Show the diff for the 'ce' if we found the one
402 * from the desired stage.
404 diff_unmerge(&revs
->diffopt
, ce
->name
, 0, null_sha1
);
405 if (ce_stage(ce
) != diff_unmerged_stage
)
409 if (lstat(ce
->name
, &st
) < 0) {
410 if (errno
!= ENOENT
&& errno
!= ENOTDIR
) {
414 if (silent_on_removed
)
416 diff_addremove(&revs
->diffopt
, '-', ntohl(ce
->ce_mode
),
417 ce
->sha1
, ce
->name
, NULL
);
420 changed
= ce_match_stat(ce
, &st
, 0);
421 if (!changed
&& !revs
->diffopt
.find_copies_harder
)
423 oldmode
= ntohl(ce
->ce_mode
);
425 newmode
= canon_mode(st
.st_mode
);
426 if (!trust_executable_bit
&&
427 S_ISREG(newmode
) && S_ISREG(oldmode
) &&
428 ((newmode
^ oldmode
) == 0111))
430 else if (!has_symlinks
&&
431 S_ISREG(newmode
) && S_ISLNK(oldmode
))
433 diff_change(&revs
->diffopt
, oldmode
, newmode
,
434 ce
->sha1
, (changed
? null_sha1
: ce
->sha1
),
438 diffcore_std(&revs
->diffopt
);
439 diff_flush(&revs
->diffopt
);
447 /* A file entry went away or appeared */
448 static void diff_index_show_file(struct rev_info
*revs
,
450 struct cache_entry
*ce
,
451 unsigned char *sha1
, unsigned int mode
)
453 diff_addremove(&revs
->diffopt
, prefix
[0], ntohl(mode
),
454 sha1
, ce
->name
, NULL
);
457 static int get_stat_data(struct cache_entry
*ce
,
458 unsigned char **sha1p
,
460 int cached
, int match_missing
)
462 unsigned char *sha1
= ce
->sha1
;
463 unsigned int mode
= ce
->ce_mode
;
466 static unsigned char no_sha1
[20];
469 if (lstat(ce
->name
, &st
) < 0) {
470 if (errno
== ENOENT
&& match_missing
) {
477 changed
= ce_match_stat(ce
, &st
, 0);
479 mode
= ce_mode_from_stat(ce
, st
.st_mode
);
489 static void show_new_file(struct rev_info
*revs
,
490 struct cache_entry
*new,
491 int cached
, int match_missing
)
496 /* New file in the index: it might actually be different in
499 if (get_stat_data(new, &sha1
, &mode
, cached
, match_missing
) < 0)
502 diff_index_show_file(revs
, "+", new, sha1
, mode
);
505 static int show_modified(struct rev_info
*revs
,
506 struct cache_entry
*old
,
507 struct cache_entry
*new,
509 int cached
, int match_missing
)
511 unsigned int mode
, oldmode
;
514 if (get_stat_data(new, &sha1
, &mode
, cached
, match_missing
) < 0) {
516 diff_index_show_file(revs
, "-", old
,
517 old
->sha1
, old
->ce_mode
);
521 if (revs
->combine_merges
&& !cached
&&
522 (hashcmp(sha1
, old
->sha1
) || hashcmp(old
->sha1
, new->sha1
))) {
523 struct combine_diff_path
*p
;
524 int pathlen
= ce_namelen(new);
526 p
= xmalloc(combine_diff_path_size(2, pathlen
));
527 p
->path
= (char *) &p
->parent
[2];
530 memcpy(p
->path
, new->name
, pathlen
);
531 p
->path
[pathlen
] = 0;
532 p
->mode
= ntohl(mode
);
534 memset(p
->parent
, 0, 2 * sizeof(struct combine_diff_parent
));
535 p
->parent
[0].status
= DIFF_STATUS_MODIFIED
;
536 p
->parent
[0].mode
= ntohl(new->ce_mode
);
537 hashcpy(p
->parent
[0].sha1
, new->sha1
);
538 p
->parent
[1].status
= DIFF_STATUS_MODIFIED
;
539 p
->parent
[1].mode
= ntohl(old
->ce_mode
);
540 hashcpy(p
->parent
[1].sha1
, old
->sha1
);
541 show_combined_diff(p
, 2, revs
->dense_combined_merges
, revs
);
546 oldmode
= old
->ce_mode
;
547 if (mode
== oldmode
&& !hashcmp(sha1
, old
->sha1
) &&
548 !revs
->diffopt
.find_copies_harder
)
552 oldmode
= ntohl(oldmode
);
554 diff_change(&revs
->diffopt
, oldmode
, mode
,
555 old
->sha1
, sha1
, old
->name
, NULL
);
559 static int diff_cache(struct rev_info
*revs
,
560 struct cache_entry
**ac
, int entries
,
561 const char **pathspec
,
562 int cached
, int match_missing
)
565 struct cache_entry
*ce
= *ac
;
566 int same
= (entries
> 1) && ce_same_name(ce
, ac
[1]);
568 if (!ce_path_match(ce
, pathspec
))
571 switch (ce_stage(ce
)) {
573 /* No stage 1 entry? That means it's a new file */
575 show_new_file(revs
, ce
, cached
, match_missing
);
578 /* Show difference between old and new */
579 show_modified(revs
, ac
[1], ce
, 1,
580 cached
, match_missing
);
583 /* No stage 3 (merge) entry?
584 * That means it's been deleted.
587 diff_index_show_file(revs
, "-", ce
,
588 ce
->sha1
, ce
->ce_mode
);
591 /* We come here with ce pointing at stage 1
592 * (original tree) and ac[1] pointing at stage
593 * 3 (unmerged). show-modified with
594 * report-missing set to false does not say the
595 * file is deleted but reports true if work
596 * tree does not have it, in which case we
597 * fall through to report the unmerged state.
598 * Otherwise, we show the differences between
599 * the original tree and the work tree.
602 !show_modified(revs
, ce
, ac
[1], 0,
603 cached
, match_missing
))
605 diff_unmerge(&revs
->diffopt
, ce
->name
,
606 ntohl(ce
->ce_mode
), ce
->sha1
);
609 diff_unmerge(&revs
->diffopt
, ce
->name
,
614 die("impossible cache entry stage");
619 * Ignore all the different stages for this file,
620 * we've handled the relevant cases now.
625 } while (entries
&& ce_same_name(ce
, ac
[0]));
631 * This turns all merge entries into "stage 3". That guarantees that
632 * when we read in the new tree (into "stage 1"), we won't lose sight
633 * of the fact that we had unmerged entries.
635 static void mark_merge_entries(void)
638 for (i
= 0; i
< active_nr
; i
++) {
639 struct cache_entry
*ce
= active_cache
[i
];
642 ce
->ce_flags
|= htons(CE_STAGEMASK
);
646 int run_diff_index(struct rev_info
*revs
, int cached
)
651 const char *tree_name
;
652 int match_missing
= 0;
655 * Backward compatibility wart - "diff-index -m" does
656 * not mean "do not ignore merges", but totally different.
658 if (!revs
->ignore_merges
)
661 mark_merge_entries();
663 ent
= revs
->pending
.objects
[0].item
;
664 tree_name
= revs
->pending
.objects
[0].name
;
665 tree
= parse_tree_indirect(ent
->sha1
);
667 return error("bad tree object %s", tree_name
);
668 if (read_tree(tree
, 1, revs
->prune_data
))
669 return error("unable to read tree object %s", tree_name
);
670 ret
= diff_cache(revs
, active_cache
, active_nr
, revs
->prune_data
,
671 cached
, match_missing
);
672 diffcore_std(&revs
->diffopt
);
673 diff_flush(&revs
->diffopt
);
677 int do_diff_cache(const unsigned char *tree_sha1
, struct diff_options
*opt
)
680 struct rev_info revs
;
682 struct cache_entry
**dst
;
683 struct cache_entry
*last
= NULL
;
686 * This is used by git-blame to run diff-cache internally;
687 * it potentially needs to repeatedly run this, so we will
688 * start by removing the higher order entries the last round
692 for (i
= 0; i
< active_nr
; i
++) {
693 struct cache_entry
*ce
= active_cache
[i
];
695 if (last
&& !strcmp(ce
->name
, last
->name
))
697 cache_tree_invalidate_path(active_cache_tree
,
701 ce
->ce_flags
&= ~htons(CE_STAGEMASK
);
705 active_nr
= dst
- active_cache
;
707 init_revisions(&revs
, NULL
);
708 revs
.prune_data
= opt
->paths
;
709 tree
= parse_tree_indirect(tree_sha1
);
711 die("bad tree object %s", sha1_to_hex(tree_sha1
));
712 if (read_tree(tree
, 1, opt
->paths
))
713 return error("unable to read tree %s", sha1_to_hex(tree_sha1
));
714 return diff_cache(&revs
, active_cache
, active_nr
, revs
.prune_data
,