2 * Copyright (C) 2005 Junio C Hamano
4 #include "git-compat-util.h"
11 #include "object-name.h"
12 #include "read-cache.h"
14 #include "cache-tree.h"
15 #include "unpack-trees.h"
17 #include "submodule.h"
21 #include "fsmonitor.h"
22 #include "commit-reach.h"
29 * Has the work tree entity been removed?
31 * Return 1 if it was removed from the work tree, 0 if an entity to be
32 * compared with the cache entry ce still exists (the latter includes
33 * the case where a directory that is not a submodule repository
34 * exists for ce that is a submodule -- it is a submodule that is not
35 * checked out). Return negative for an error.
37 static int check_removed(const struct index_state
*istate
, const struct cache_entry
*ce
, struct stat
*st
)
39 assert(is_fsmonitor_refreshed(istate
));
40 if (!(ce
->ce_flags
& CE_FSMONITOR_VALID
) && lstat(ce
->name
, st
) < 0) {
41 if (!is_missing_file_error(errno
))
45 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
)))
47 if (S_ISDIR(st
->st_mode
)) {
51 * If ce is already a gitlink, we can have a plain
52 * directory (i.e. the submodule is not checked out),
53 * or a checked out submodule. Either case this is not
54 * a case where something was removed from the work tree,
55 * so we will return 0.
57 * Otherwise, if the directory is not a submodule
58 * repository, that means ce which was a blob turned into
59 * a directory --- the blob was removed!
61 if (!S_ISGITLINK(ce
->ce_mode
) &&
62 resolve_gitlink_ref(ce
->name
, "HEAD", &sub
))
69 * Has a file changed or has a submodule new commits or a dirty work tree?
71 * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES
72 * option is set, the caller does not only want to know if a submodule is
73 * modified at all but wants to know all the conditions that are met (new
74 * commits, untracked content and/or modified content).
76 static int match_stat_with_submodule(struct diff_options
*diffopt
,
77 const struct cache_entry
*ce
,
78 struct stat
*st
, unsigned ce_option
,
79 unsigned *dirty_submodule
)
81 int changed
= ie_match_stat(diffopt
->repo
->index
, ce
, st
, ce_option
);
82 if (S_ISGITLINK(ce
->ce_mode
)) {
83 struct diff_flags orig_flags
= diffopt
->flags
;
84 if (!diffopt
->flags
.override_submodule_config
)
85 set_diffopt_flags_from_submodule_config(diffopt
, ce
->name
);
86 if (diffopt
->flags
.ignore_submodules
)
88 else if (!diffopt
->flags
.ignore_dirty_submodules
&&
89 (!changed
|| diffopt
->flags
.dirty_submodules
))
90 *dirty_submodule
= is_submodule_modified(ce
->name
,
91 diffopt
->flags
.ignore_untracked_in_submodules
);
92 diffopt
->flags
= orig_flags
;
97 int run_diff_files(struct rev_info
*revs
, unsigned int option
)
100 int diff_unmerged_stage
= revs
->max_count
;
101 unsigned ce_option
= ((option
& DIFF_RACY_IS_MODIFIED
)
102 ? CE_MATCH_RACY_IS_DIRTY
: 0);
103 uint64_t start
= getnanotime();
104 struct index_state
*istate
= revs
->diffopt
.repo
->index
;
106 diff_set_mnemonic_prefix(&revs
->diffopt
, "i/", "w/");
108 refresh_fsmonitor(istate
);
110 if (diff_unmerged_stage
< 0)
111 diff_unmerged_stage
= 2;
112 entries
= istate
->cache_nr
;
113 for (i
= 0; i
< entries
; i
++) {
114 unsigned int oldmode
, newmode
;
115 struct cache_entry
*ce
= istate
->cache
[i
];
117 unsigned dirty_submodule
= 0;
118 const struct object_id
*old_oid
, *new_oid
;
120 if (diff_can_quit_early(&revs
->diffopt
))
123 if (!ce_path_match(istate
, ce
, &revs
->prune_data
, NULL
))
126 if (revs
->diffopt
.prefix
&&
127 strncmp(ce
->name
, revs
->diffopt
.prefix
, revs
->diffopt
.prefix_length
))
131 struct combine_diff_path
*dpath
;
132 struct diff_filepair
*pair
;
133 unsigned int wt_mode
= 0;
134 int num_compare_stages
= 0;
138 path_len
= ce_namelen(ce
);
140 dpath
= xmalloc(combine_diff_path_size(5, path_len
));
141 dpath
->path
= (char *) &(dpath
->parent
[5]);
144 memcpy(dpath
->path
, ce
->name
, path_len
);
145 dpath
->path
[path_len
] = '\0';
147 memset(&(dpath
->parent
[0]), 0,
148 sizeof(struct combine_diff_parent
)*5);
150 changed
= check_removed(istate
, ce
, &st
);
152 wt_mode
= ce_mode_from_stat(ce
, st
.st_mode
);
160 dpath
->mode
= wt_mode
;
162 while (i
< entries
) {
163 struct cache_entry
*nce
= istate
->cache
[i
];
166 if (strcmp(ce
->name
, nce
->name
))
169 /* Stage #2 (ours) is the first parent,
170 * stage #3 (theirs) is the second.
172 stage
= ce_stage(nce
);
174 int mode
= nce
->ce_mode
;
175 num_compare_stages
++;
176 oidcpy(&dpath
->parent
[stage
- 2].oid
,
178 dpath
->parent
[stage
-2].mode
= ce_mode_from_stat(nce
, mode
);
179 dpath
->parent
[stage
-2].status
=
180 DIFF_STATUS_MODIFIED
;
183 /* diff against the proper unmerged stage */
184 if (stage
== diff_unmerged_stage
)
189 * Compensate for loop update
193 if (revs
->combine_merges
&& num_compare_stages
== 2) {
194 show_combined_diff(dpath
, 2, revs
);
198 FREE_AND_NULL(dpath
);
201 * Show the diff for the 'ce' if we found the one
202 * from the desired stage.
204 pair
= diff_unmerge(&revs
->diffopt
, ce
->name
);
206 pair
->two
->mode
= wt_mode
;
207 if (ce_stage(ce
) != diff_unmerged_stage
)
211 if (ce_uptodate(ce
) || ce_skip_worktree(ce
))
215 * When CE_VALID is set (via "update-index --assume-unchanged"
216 * or via adding paths while core.ignorestat is set to true),
217 * the user has promised that the working tree file for that
218 * path will not be modified. When CE_FSMONITOR_VALID is true,
219 * the fsmonitor knows that the path hasn't been modified since
220 * we refreshed the cached stat information. In either case,
221 * we do not have to stat to see if the path has been removed
224 if (ce
->ce_flags
& (CE_VALID
| CE_FSMONITOR_VALID
)) {
226 newmode
= ce
->ce_mode
;
230 changed
= check_removed(istate
, ce
, &st
);
236 diff_addremove(&revs
->diffopt
, '-', ce
->ce_mode
,
238 !is_null_oid(&ce
->oid
),
241 } else if (revs
->diffopt
.ita_invisible_in_index
&&
242 ce_intent_to_add(ce
)) {
243 newmode
= ce_mode_from_stat(ce
, st
.st_mode
);
244 diff_addremove(&revs
->diffopt
, '+', newmode
,
245 null_oid(), 0, ce
->name
, 0);
249 changed
= match_stat_with_submodule(&revs
->diffopt
, ce
, &st
,
250 ce_option
, &dirty_submodule
);
251 newmode
= ce_mode_from_stat(ce
, st
.st_mode
);
254 if (!changed
&& !dirty_submodule
) {
255 ce_mark_uptodate(ce
);
256 mark_fsmonitor_valid(istate
, ce
);
257 if (!revs
->diffopt
.flags
.find_copies_harder
)
260 oldmode
= ce
->ce_mode
;
262 new_oid
= changed
? null_oid() : &ce
->oid
;
263 diff_change(&revs
->diffopt
, oldmode
, newmode
,
265 !is_null_oid(old_oid
),
266 !is_null_oid(new_oid
),
267 ce
->name
, 0, dirty_submodule
);
270 diffcore_std(&revs
->diffopt
);
271 diff_flush(&revs
->diffopt
);
272 trace_performance_since(start
, "diff-files");
280 /* A file entry went away or appeared */
281 static void diff_index_show_file(struct rev_info
*revs
,
283 const struct cache_entry
*ce
,
284 const struct object_id
*oid
, int oid_valid
,
286 unsigned dirty_submodule
)
288 diff_addremove(&revs
->diffopt
, prefix
[0], mode
,
289 oid
, oid_valid
, ce
->name
, dirty_submodule
);
292 static int get_stat_data(const struct index_state
*istate
,
293 const struct cache_entry
*ce
,
294 const struct object_id
**oidp
,
296 int cached
, int match_missing
,
297 unsigned *dirty_submodule
, struct diff_options
*diffopt
)
299 const struct object_id
*oid
= &ce
->oid
;
300 unsigned int mode
= ce
->ce_mode
;
302 if (!cached
&& !ce_uptodate(ce
)) {
305 changed
= check_removed(istate
, ce
, &st
);
316 changed
= match_stat_with_submodule(diffopt
, ce
, &st
,
319 mode
= ce_mode_from_stat(ce
, st
.st_mode
);
329 static void show_new_file(struct rev_info
*revs
,
330 const struct cache_entry
*new_file
,
331 int cached
, int match_missing
)
333 const struct object_id
*oid
;
335 unsigned dirty_submodule
= 0;
336 struct index_state
*istate
= revs
->diffopt
.repo
->index
;
338 if (new_file
&& S_ISSPARSEDIR(new_file
->ce_mode
)) {
339 diff_tree_oid(NULL
, &new_file
->oid
, new_file
->name
, &revs
->diffopt
);
344 * New file in the index: it might actually be different in
347 if (get_stat_data(istate
, new_file
, &oid
, &mode
, cached
, match_missing
,
348 &dirty_submodule
, &revs
->diffopt
) < 0)
351 diff_index_show_file(revs
, "+", new_file
, oid
, !is_null_oid(oid
), mode
, dirty_submodule
);
354 static int show_modified(struct rev_info
*revs
,
355 const struct cache_entry
*old_entry
,
356 const struct cache_entry
*new_entry
,
358 int cached
, int match_missing
)
360 unsigned int mode
, oldmode
;
361 const struct object_id
*oid
;
362 unsigned dirty_submodule
= 0;
363 struct index_state
*istate
= revs
->diffopt
.repo
->index
;
365 assert(S_ISSPARSEDIR(old_entry
->ce_mode
) ==
366 S_ISSPARSEDIR(new_entry
->ce_mode
));
369 * If both are sparse directory entries, then expand the
370 * modifications to the file level. If only one was a sparse
371 * directory, then they appear as an add and delete instead of
374 if (S_ISSPARSEDIR(new_entry
->ce_mode
)) {
375 diff_tree_oid(&old_entry
->oid
, &new_entry
->oid
, new_entry
->name
, &revs
->diffopt
);
379 if (get_stat_data(istate
, new_entry
, &oid
, &mode
, cached
, match_missing
,
380 &dirty_submodule
, &revs
->diffopt
) < 0) {
382 diff_index_show_file(revs
, "-", old_entry
,
383 &old_entry
->oid
, 1, old_entry
->ce_mode
,
388 if (revs
->combine_merges
&& !cached
&&
389 (!oideq(oid
, &old_entry
->oid
) || !oideq(&old_entry
->oid
, &new_entry
->oid
))) {
390 struct combine_diff_path
*p
;
391 int pathlen
= ce_namelen(new_entry
);
393 p
= xmalloc(combine_diff_path_size(2, pathlen
));
394 p
->path
= (char *) &p
->parent
[2];
396 memcpy(p
->path
, new_entry
->name
, pathlen
);
397 p
->path
[pathlen
] = 0;
400 memset(p
->parent
, 0, 2 * sizeof(struct combine_diff_parent
));
401 p
->parent
[0].status
= DIFF_STATUS_MODIFIED
;
402 p
->parent
[0].mode
= new_entry
->ce_mode
;
403 oidcpy(&p
->parent
[0].oid
, &new_entry
->oid
);
404 p
->parent
[1].status
= DIFF_STATUS_MODIFIED
;
405 p
->parent
[1].mode
= old_entry
->ce_mode
;
406 oidcpy(&p
->parent
[1].oid
, &old_entry
->oid
);
407 show_combined_diff(p
, 2, revs
);
412 oldmode
= old_entry
->ce_mode
;
413 if (mode
== oldmode
&& oideq(oid
, &old_entry
->oid
) && !dirty_submodule
&&
414 !revs
->diffopt
.flags
.find_copies_harder
)
417 diff_change(&revs
->diffopt
, oldmode
, mode
,
418 &old_entry
->oid
, oid
, 1, !is_null_oid(oid
),
419 old_entry
->name
, 0, dirty_submodule
);
424 * This gets a mix of an existing index and a tree, one pathname entry
425 * at a time. The index entry may be a single stage-0 one, but it could
426 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
427 * give you the position and number of entries in the index).
429 static void do_oneway_diff(struct unpack_trees_options
*o
,
430 const struct cache_entry
*idx
,
431 const struct cache_entry
*tree
)
433 struct rev_info
*revs
= o
->unpack_data
;
434 int match_missing
, cached
;
437 * i-t-a entries do not actually exist in the index (if we're
438 * looking at its content)
441 revs
->diffopt
.ita_invisible_in_index
&&
442 idx
&& ce_intent_to_add(idx
)) {
445 return; /* nothing to diff.. */
448 /* if the entry is not checked out, don't examine work tree */
449 cached
= o
->index_only
||
450 (idx
&& ((idx
->ce_flags
& CE_VALID
) || ce_skip_worktree(idx
)));
452 match_missing
= revs
->match_missing
;
454 if (cached
&& idx
&& ce_stage(idx
)) {
455 struct diff_filepair
*pair
;
456 pair
= diff_unmerge(&revs
->diffopt
, idx
->name
);
458 fill_filespec(pair
->one
, &tree
->oid
, 1,
464 * Something added to the tree?
467 show_new_file(revs
, idx
, cached
, match_missing
);
472 * Something removed from the tree?
475 if (S_ISSPARSEDIR(tree
->ce_mode
)) {
476 diff_tree_oid(&tree
->oid
, NULL
, tree
->name
, &revs
->diffopt
);
480 diff_index_show_file(revs
, "-", tree
, &tree
->oid
, 1,
485 /* Show difference between old and new */
486 show_modified(revs
, tree
, idx
, 1, cached
, match_missing
);
490 * The unpack_trees() interface is designed for merging, so
491 * the different source entries are designed primarily for
492 * the source trees, with the old index being really mainly
493 * used for being replaced by the result.
495 * For diffing, the index is more important, and we only have a
498 * We're supposed to advance o->pos to skip what we have already processed.
500 * This wrapper makes it all more readable, and takes care of all
501 * the fairly complex unpack_trees() semantic requirements, including
502 * the skipping, the path matching, the type conflict cases etc.
504 static int oneway_diff(const struct cache_entry
* const *src
,
505 struct unpack_trees_options
*o
)
507 const struct cache_entry
*idx
= src
[0];
508 const struct cache_entry
*tree
= src
[1];
509 struct rev_info
*revs
= o
->unpack_data
;
512 * Unpack-trees generates a DF/conflict entry if
513 * there was a directory in the index and a tree
514 * in the tree. From a diff standpoint, that's a
515 * delete of the tree and a create of the file.
517 if (tree
== o
->df_conflict_entry
)
520 if (ce_path_match(revs
->diffopt
.repo
->index
,
522 &revs
->prune_data
, NULL
)) {
523 do_oneway_diff(o
, idx
, tree
);
524 if (diff_can_quit_early(&revs
->diffopt
)) {
525 o
->exiting_early
= 1;
533 static int diff_cache(struct rev_info
*revs
,
534 const struct object_id
*tree_oid
,
535 const char *tree_name
,
540 struct unpack_trees_options opts
;
542 tree
= parse_tree_indirect(tree_oid
);
544 return error("bad tree object %s",
545 tree_name
? tree_name
: oid_to_hex(tree_oid
));
546 memset(&opts
, 0, sizeof(opts
));
548 opts
.index_only
= cached
;
549 opts
.diff_index_cached
= (cached
&&
550 !revs
->diffopt
.flags
.find_copies_harder
);
552 opts
.fn
= oneway_diff
;
553 opts
.unpack_data
= revs
;
554 opts
.src_index
= revs
->diffopt
.repo
->index
;
555 opts
.dst_index
= NULL
;
556 opts
.pathspec
= &revs
->diffopt
.pathspec
;
557 opts
.pathspec
->recursive
= 1;
559 init_tree_desc(&t
, tree
->buffer
, tree
->size
);
560 return unpack_trees(1, &t
, &opts
);
563 void diff_get_merge_base(const struct rev_info
*revs
, struct object_id
*mb
)
566 struct commit
*mb_child
[2] = {0};
567 struct commit_list
*merge_bases
;
569 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
570 struct object
*obj
= revs
->pending
.objects
[i
].item
;
572 die(_("--merge-base does not work with ranges"));
573 if (obj
->type
!= OBJ_COMMIT
)
574 die(_("--merge-base only works with commits"));
578 * This check must go after the for loop above because A...B
579 * ranges produce three pending commits, resulting in a
580 * misleading error message.
582 if (revs
->pending
.nr
< 1 || revs
->pending
.nr
> 2)
583 BUG("unexpected revs->pending.nr: %d", revs
->pending
.nr
);
585 for (i
= 0; i
< revs
->pending
.nr
; i
++)
586 mb_child
[i
] = lookup_commit_reference(the_repository
, &revs
->pending
.objects
[i
].item
->oid
);
587 if (revs
->pending
.nr
== 1) {
588 struct object_id oid
;
590 if (repo_get_oid(the_repository
, "HEAD", &oid
))
591 die(_("unable to get HEAD"));
593 mb_child
[1] = lookup_commit_reference(the_repository
, &oid
);
596 merge_bases
= repo_get_merge_bases(the_repository
, mb_child
[0], mb_child
[1]);
598 die(_("no merge base found"));
599 if (merge_bases
->next
)
600 die(_("multiple merge bases found"));
602 oidcpy(mb
, &merge_bases
->item
->object
.oid
);
604 free_commit_list(merge_bases
);
607 int run_diff_index(struct rev_info
*revs
, unsigned int option
)
609 struct object_array_entry
*ent
;
610 int cached
= !!(option
& DIFF_INDEX_CACHED
);
611 int merge_base
= !!(option
& DIFF_INDEX_MERGE_BASE
);
612 struct object_id oid
;
614 char merge_base_hex
[GIT_MAX_HEXSZ
+ 1];
615 struct index_state
*istate
= revs
->diffopt
.repo
->index
;
617 if (revs
->pending
.nr
!= 1)
618 BUG("run_diff_index must be passed exactly one tree");
620 trace_performance_enter();
621 ent
= revs
->pending
.objects
;
623 refresh_fsmonitor(istate
);
626 diff_get_merge_base(revs
, &oid
);
627 name
= oid_to_hex_r(merge_base_hex
, &oid
);
629 oidcpy(&oid
, &ent
->item
->oid
);
633 if (diff_cache(revs
, &oid
, name
, cached
))
636 diff_set_mnemonic_prefix(&revs
->diffopt
, "c/", cached
? "i/" : "w/");
637 diffcore_fix_diff_index();
638 diffcore_std(&revs
->diffopt
);
639 diff_flush(&revs
->diffopt
);
640 trace_performance_leave("diff-index");
644 int do_diff_cache(const struct object_id
*tree_oid
, struct diff_options
*opt
)
646 struct rev_info revs
;
648 repo_init_revisions(opt
->repo
, &revs
, NULL
);
649 copy_pathspec(&revs
.prune_data
, &opt
->pathspec
);
650 diff_setup_done(&revs
.diffopt
);
653 if (diff_cache(&revs
, tree_oid
, NULL
, 1))
655 release_revisions(&revs
);
659 int index_differs_from(struct repository
*r
,
660 const char *def
, const struct diff_flags
*flags
,
661 int ita_invisible_in_index
)
664 struct setup_revision_opt opt
;
665 unsigned has_changes
;
667 repo_init_revisions(r
, &rev
, NULL
);
668 memset(&opt
, 0, sizeof(opt
));
670 setup_revisions(0, NULL
, &rev
, &opt
);
671 rev
.diffopt
.flags
.quick
= 1;
672 rev
.diffopt
.flags
.exit_with_status
= 1;
674 diff_flags_or(&rev
.diffopt
.flags
, flags
);
675 rev
.diffopt
.ita_invisible_in_index
= ita_invisible_in_index
;
676 run_diff_index(&rev
, 1);
677 has_changes
= rev
.diffopt
.flags
.has_changes
;
678 release_revisions(&rev
);
679 return (has_changes
!= 0);
682 static struct strbuf
*idiff_prefix_cb(struct diff_options
*opt UNUSED
, void *data
)
687 void show_interdiff(const struct object_id
*oid1
, const struct object_id
*oid2
,
688 int indent
, struct diff_options
*diffopt
)
690 struct diff_options opts
;
691 struct strbuf prefix
= STRBUF_INIT
;
693 memcpy(&opts
, diffopt
, sizeof(opts
));
694 opts
.output_format
= DIFF_FORMAT_PATCH
;
695 opts
.output_prefix
= idiff_prefix_cb
;
696 strbuf_addchars(&prefix
, ' ', indent
);
697 opts
.output_prefix_data
= &prefix
;
698 diff_setup_done(&opts
);
700 diff_tree_oid(oid1
, oid2
, "", &opts
);
704 strbuf_release(&prefix
);