2 * Copyright (C) 2005 Junio C Hamano
10 #include "cache-tree.h"
11 #include "unpack-trees.h"
13 #include "submodule.h"
15 #include "fsmonitor.h"
22 * Has the work tree entity been removed?
24 * Return 1 if it was removed from the work tree, 0 if an entity to be
25 * compared with the cache entry ce still exists (the latter includes
26 * the case where a directory that is not a submodule repository
27 * exists for ce that is a submodule -- it is a submodule that is not
28 * checked out). Return negative for an error.
30 static int check_removed(const struct cache_entry
*ce
, struct stat
*st
)
32 if (lstat(ce
->name
, st
) < 0) {
33 if (!is_missing_file_error(errno
))
37 if (has_symlink_leading_path(ce
->name
, ce_namelen(ce
)))
39 if (S_ISDIR(st
->st_mode
)) {
43 * If ce is already a gitlink, we can have a plain
44 * directory (i.e. the submodule is not checked out),
45 * or a checked out submodule. Either case this is not
46 * a case where something was removed from the work tree,
47 * so we will return 0.
49 * Otherwise, if the directory is not a submodule
50 * repository, that means ce which was a blob turned into
51 * a directory --- the blob was removed!
53 if (!S_ISGITLINK(ce
->ce_mode
) &&
54 resolve_gitlink_ref(ce
->name
, "HEAD", &sub
))
61 * Has a file changed or has a submodule new commits or a dirty work tree?
63 * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES
64 * option is set, the caller does not only want to know if a submodule is
65 * modified at all but wants to know all the conditions that are met (new
66 * commits, untracked content and/or modified content).
68 static int match_stat_with_submodule(struct diff_options
*diffopt
,
69 const struct cache_entry
*ce
,
70 struct stat
*st
, unsigned ce_option
,
71 unsigned *dirty_submodule
)
73 int changed
= ie_match_stat(diffopt
->repo
->index
, ce
, st
, ce_option
);
74 if (S_ISGITLINK(ce
->ce_mode
)) {
75 struct diff_flags orig_flags
= diffopt
->flags
;
76 if (!diffopt
->flags
.override_submodule_config
)
77 set_diffopt_flags_from_submodule_config(diffopt
, ce
->name
);
78 if (diffopt
->flags
.ignore_submodules
)
80 else if (!diffopt
->flags
.ignore_dirty_submodules
&&
81 (!changed
|| diffopt
->flags
.dirty_submodules
))
82 *dirty_submodule
= is_submodule_modified(ce
->name
,
83 diffopt
->flags
.ignore_untracked_in_submodules
);
84 diffopt
->flags
= orig_flags
;
89 int run_diff_files(struct rev_info
*revs
, unsigned int option
)
92 int diff_unmerged_stage
= revs
->max_count
;
93 unsigned ce_option
= ((option
& DIFF_RACY_IS_MODIFIED
)
94 ? CE_MATCH_RACY_IS_DIRTY
: 0);
95 uint64_t start
= getnanotime();
96 struct index_state
*istate
= revs
->diffopt
.repo
->index
;
98 diff_set_mnemonic_prefix(&revs
->diffopt
, "i/", "w/");
100 refresh_fsmonitor(istate
);
102 if (diff_unmerged_stage
< 0)
103 diff_unmerged_stage
= 2;
104 entries
= istate
->cache_nr
;
105 for (i
= 0; i
< entries
; i
++) {
106 unsigned int oldmode
, newmode
;
107 struct cache_entry
*ce
= istate
->cache
[i
];
109 unsigned dirty_submodule
= 0;
110 const struct object_id
*old_oid
, *new_oid
;
112 if (diff_can_quit_early(&revs
->diffopt
))
115 if (!ce_path_match(istate
, ce
, &revs
->prune_data
, NULL
))
119 struct combine_diff_path
*dpath
;
120 struct diff_filepair
*pair
;
121 unsigned int wt_mode
= 0;
122 int num_compare_stages
= 0;
126 path_len
= ce_namelen(ce
);
128 dpath
= xmalloc(combine_diff_path_size(5, path_len
));
129 dpath
->path
= (char *) &(dpath
->parent
[5]);
132 memcpy(dpath
->path
, ce
->name
, path_len
);
133 dpath
->path
[path_len
] = '\0';
135 memset(&(dpath
->parent
[0]), 0,
136 sizeof(struct combine_diff_parent
)*5);
138 changed
= check_removed(ce
, &st
);
140 wt_mode
= ce_mode_from_stat(ce
, st
.st_mode
);
148 dpath
->mode
= wt_mode
;
150 while (i
< entries
) {
151 struct cache_entry
*nce
= istate
->cache
[i
];
154 if (strcmp(ce
->name
, nce
->name
))
157 /* Stage #2 (ours) is the first parent,
158 * stage #3 (theirs) is the second.
160 stage
= ce_stage(nce
);
162 int mode
= nce
->ce_mode
;
163 num_compare_stages
++;
164 oidcpy(&dpath
->parent
[stage
- 2].oid
,
166 dpath
->parent
[stage
-2].mode
= ce_mode_from_stat(nce
, mode
);
167 dpath
->parent
[stage
-2].status
=
168 DIFF_STATUS_MODIFIED
;
171 /* diff against the proper unmerged stage */
172 if (stage
== diff_unmerged_stage
)
177 * Compensate for loop update
181 if (revs
->combine_merges
&& num_compare_stages
== 2) {
182 show_combined_diff(dpath
, 2, revs
);
186 FREE_AND_NULL(dpath
);
189 * Show the diff for the 'ce' if we found the one
190 * from the desired stage.
192 pair
= diff_unmerge(&revs
->diffopt
, ce
->name
);
194 pair
->two
->mode
= wt_mode
;
195 if (ce_stage(ce
) != diff_unmerged_stage
)
199 if (ce_uptodate(ce
) || ce_skip_worktree(ce
))
203 * When CE_VALID is set (via "update-index --assume-unchanged"
204 * or via adding paths while core.ignorestat is set to true),
205 * the user has promised that the working tree file for that
206 * path will not be modified. When CE_FSMONITOR_VALID is true,
207 * the fsmonitor knows that the path hasn't been modified since
208 * we refreshed the cached stat information. In either case,
209 * we do not have to stat to see if the path has been removed
212 if (ce
->ce_flags
& (CE_VALID
| CE_FSMONITOR_VALID
)) {
214 newmode
= ce
->ce_mode
;
218 changed
= check_removed(ce
, &st
);
224 diff_addremove(&revs
->diffopt
, '-', ce
->ce_mode
,
226 !is_null_oid(&ce
->oid
),
229 } else if (revs
->diffopt
.ita_invisible_in_index
&&
230 ce_intent_to_add(ce
)) {
231 newmode
= ce_mode_from_stat(ce
, st
.st_mode
);
232 diff_addremove(&revs
->diffopt
, '+', newmode
,
233 &null_oid
, 0, ce
->name
, 0);
237 changed
= match_stat_with_submodule(&revs
->diffopt
, ce
, &st
,
238 ce_option
, &dirty_submodule
);
239 newmode
= ce_mode_from_stat(ce
, st
.st_mode
);
242 if (!changed
&& !dirty_submodule
) {
243 ce_mark_uptodate(ce
);
244 mark_fsmonitor_valid(istate
, ce
);
245 if (!revs
->diffopt
.flags
.find_copies_harder
)
248 oldmode
= ce
->ce_mode
;
250 new_oid
= changed
? &null_oid
: &ce
->oid
;
251 diff_change(&revs
->diffopt
, oldmode
, newmode
,
253 !is_null_oid(old_oid
),
254 !is_null_oid(new_oid
),
255 ce
->name
, 0, dirty_submodule
);
258 diffcore_std(&revs
->diffopt
);
259 diff_flush(&revs
->diffopt
);
260 trace_performance_since(start
, "diff-files");
268 /* A file entry went away or appeared */
269 static void diff_index_show_file(struct rev_info
*revs
,
271 const struct cache_entry
*ce
,
272 const struct object_id
*oid
, int oid_valid
,
274 unsigned dirty_submodule
)
276 diff_addremove(&revs
->diffopt
, prefix
[0], mode
,
277 oid
, oid_valid
, ce
->name
, dirty_submodule
);
280 static int get_stat_data(const struct cache_entry
*ce
,
281 const struct object_id
**oidp
,
283 int cached
, int match_missing
,
284 unsigned *dirty_submodule
, struct diff_options
*diffopt
)
286 const struct object_id
*oid
= &ce
->oid
;
287 unsigned int mode
= ce
->ce_mode
;
289 if (!cached
&& !ce_uptodate(ce
)) {
292 changed
= check_removed(ce
, &st
);
303 changed
= match_stat_with_submodule(diffopt
, ce
, &st
,
306 mode
= ce_mode_from_stat(ce
, st
.st_mode
);
316 static void show_new_file(struct rev_info
*revs
,
317 const struct cache_entry
*new_file
,
318 int cached
, int match_missing
)
320 const struct object_id
*oid
;
322 unsigned dirty_submodule
= 0;
325 * New file in the index: it might actually be different in
328 if (get_stat_data(new_file
, &oid
, &mode
, cached
, match_missing
,
329 &dirty_submodule
, &revs
->diffopt
) < 0)
332 diff_index_show_file(revs
, "+", new_file
, oid
, !is_null_oid(oid
), mode
, dirty_submodule
);
335 static int show_modified(struct rev_info
*revs
,
336 const struct cache_entry
*old_entry
,
337 const struct cache_entry
*new_entry
,
339 int cached
, int match_missing
)
341 unsigned int mode
, oldmode
;
342 const struct object_id
*oid
;
343 unsigned dirty_submodule
= 0;
345 if (get_stat_data(new_entry
, &oid
, &mode
, cached
, match_missing
,
346 &dirty_submodule
, &revs
->diffopt
) < 0) {
348 diff_index_show_file(revs
, "-", old_entry
,
349 &old_entry
->oid
, 1, old_entry
->ce_mode
,
354 if (revs
->combine_merges
&& !cached
&&
355 (!oideq(oid
, &old_entry
->oid
) || !oideq(&old_entry
->oid
, &new_entry
->oid
))) {
356 struct combine_diff_path
*p
;
357 int pathlen
= ce_namelen(new_entry
);
359 p
= xmalloc(combine_diff_path_size(2, pathlen
));
360 p
->path
= (char *) &p
->parent
[2];
362 memcpy(p
->path
, new_entry
->name
, pathlen
);
363 p
->path
[pathlen
] = 0;
366 memset(p
->parent
, 0, 2 * sizeof(struct combine_diff_parent
));
367 p
->parent
[0].status
= DIFF_STATUS_MODIFIED
;
368 p
->parent
[0].mode
= new_entry
->ce_mode
;
369 oidcpy(&p
->parent
[0].oid
, &new_entry
->oid
);
370 p
->parent
[1].status
= DIFF_STATUS_MODIFIED
;
371 p
->parent
[1].mode
= old_entry
->ce_mode
;
372 oidcpy(&p
->parent
[1].oid
, &old_entry
->oid
);
373 show_combined_diff(p
, 2, revs
);
378 oldmode
= old_entry
->ce_mode
;
379 if (mode
== oldmode
&& oideq(oid
, &old_entry
->oid
) && !dirty_submodule
&&
380 !revs
->diffopt
.flags
.find_copies_harder
)
383 diff_change(&revs
->diffopt
, oldmode
, mode
,
384 &old_entry
->oid
, oid
, 1, !is_null_oid(oid
),
385 old_entry
->name
, 0, dirty_submodule
);
390 * This gets a mix of an existing index and a tree, one pathname entry
391 * at a time. The index entry may be a single stage-0 one, but it could
392 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
393 * give you the position and number of entries in the index).
395 static void do_oneway_diff(struct unpack_trees_options
*o
,
396 const struct cache_entry
*idx
,
397 const struct cache_entry
*tree
)
399 struct rev_info
*revs
= o
->unpack_data
;
400 int match_missing
, cached
;
403 * i-t-a entries do not actually exist in the index (if we're
404 * looking at its content)
407 revs
->diffopt
.ita_invisible_in_index
&&
408 idx
&& ce_intent_to_add(idx
)) {
411 return; /* nothing to diff.. */
414 /* if the entry is not checked out, don't examine work tree */
415 cached
= o
->index_only
||
416 (idx
&& ((idx
->ce_flags
& CE_VALID
) || ce_skip_worktree(idx
)));
418 match_missing
= revs
->match_missing
;
420 if (cached
&& idx
&& ce_stage(idx
)) {
421 struct diff_filepair
*pair
;
422 pair
= diff_unmerge(&revs
->diffopt
, idx
->name
);
424 fill_filespec(pair
->one
, &tree
->oid
, 1,
430 * Something added to the tree?
433 show_new_file(revs
, idx
, cached
, match_missing
);
438 * Something removed from the tree?
441 diff_index_show_file(revs
, "-", tree
, &tree
->oid
, 1,
446 /* Show difference between old and new */
447 show_modified(revs
, tree
, idx
, 1, cached
, match_missing
);
451 * The unpack_trees() interface is designed for merging, so
452 * the different source entries are designed primarily for
453 * the source trees, with the old index being really mainly
454 * used for being replaced by the result.
456 * For diffing, the index is more important, and we only have a
459 * We're supposed to advance o->pos to skip what we have already processed.
461 * This wrapper makes it all more readable, and takes care of all
462 * the fairly complex unpack_trees() semantic requirements, including
463 * the skipping, the path matching, the type conflict cases etc.
465 static int oneway_diff(const struct cache_entry
* const *src
,
466 struct unpack_trees_options
*o
)
468 const struct cache_entry
*idx
= src
[0];
469 const struct cache_entry
*tree
= src
[1];
470 struct rev_info
*revs
= o
->unpack_data
;
473 * Unpack-trees generates a DF/conflict entry if
474 * there was a directory in the index and a tree
475 * in the tree. From a diff standpoint, that's a
476 * delete of the tree and a create of the file.
478 if (tree
== o
->df_conflict_entry
)
481 if (ce_path_match(revs
->diffopt
.repo
->index
,
483 &revs
->prune_data
, NULL
)) {
484 do_oneway_diff(o
, idx
, tree
);
485 if (diff_can_quit_early(&revs
->diffopt
)) {
486 o
->exiting_early
= 1;
494 static int diff_cache(struct rev_info
*revs
,
495 const struct object_id
*tree_oid
,
496 const char *tree_name
,
501 struct unpack_trees_options opts
;
503 tree
= parse_tree_indirect(tree_oid
);
505 return error("bad tree object %s",
506 tree_name
? tree_name
: oid_to_hex(tree_oid
));
507 memset(&opts
, 0, sizeof(opts
));
509 opts
.index_only
= cached
;
510 opts
.diff_index_cached
= (cached
&&
511 !revs
->diffopt
.flags
.find_copies_harder
);
513 opts
.fn
= oneway_diff
;
514 opts
.unpack_data
= revs
;
515 opts
.src_index
= revs
->diffopt
.repo
->index
;
516 opts
.dst_index
= NULL
;
517 opts
.pathspec
= &revs
->diffopt
.pathspec
;
518 opts
.pathspec
->recursive
= 1;
520 init_tree_desc(&t
, tree
->buffer
, tree
->size
);
521 return unpack_trees(1, &t
, &opts
);
524 int run_diff_index(struct rev_info
*revs
, int cached
)
526 struct object_array_entry
*ent
;
528 if (revs
->pending
.nr
!= 1)
529 BUG("run_diff_index must be passed exactly one tree");
531 trace_performance_enter();
532 ent
= revs
->pending
.objects
;
533 if (diff_cache(revs
, &ent
->item
->oid
, ent
->name
, cached
))
536 diff_set_mnemonic_prefix(&revs
->diffopt
, "c/", cached
? "i/" : "w/");
537 diffcore_fix_diff_index();
538 diffcore_std(&revs
->diffopt
);
539 diff_flush(&revs
->diffopt
);
540 trace_performance_leave("diff-index");
544 int do_diff_cache(const struct object_id
*tree_oid
, struct diff_options
*opt
)
546 struct rev_info revs
;
548 repo_init_revisions(opt
->repo
, &revs
, NULL
);
549 copy_pathspec(&revs
.prune_data
, &opt
->pathspec
);
552 if (diff_cache(&revs
, tree_oid
, NULL
, 1))
557 int index_differs_from(struct repository
*r
,
558 const char *def
, const struct diff_flags
*flags
,
559 int ita_invisible_in_index
)
562 struct setup_revision_opt opt
;
564 repo_init_revisions(r
, &rev
, NULL
);
565 memset(&opt
, 0, sizeof(opt
));
567 setup_revisions(0, NULL
, &rev
, &opt
);
568 rev
.diffopt
.flags
.quick
= 1;
569 rev
.diffopt
.flags
.exit_with_status
= 1;
571 diff_flags_or(&rev
.diffopt
.flags
, flags
);
572 rev
.diffopt
.ita_invisible_in_index
= ita_invisible_in_index
;
573 run_diff_index(&rev
, 1);
574 object_array_clear(&rev
.pending
);
575 return (rev
.diffopt
.flags
.has_changes
!= 0);
578 static struct strbuf
*idiff_prefix_cb(struct diff_options
*opt
, void *data
)
583 void show_interdiff(const struct object_id
*oid1
, const struct object_id
*oid2
,
584 int indent
, struct diff_options
*diffopt
)
586 struct diff_options opts
;
587 struct strbuf prefix
= STRBUF_INIT
;
589 memcpy(&opts
, diffopt
, sizeof(opts
));
590 opts
.output_format
= DIFF_FORMAT_PATCH
;
591 opts
.output_prefix
= idiff_prefix_cb
;
592 strbuf_addchars(&prefix
, ' ', indent
);
593 opts
.output_prefix_data
= &prefix
;
594 diff_setup_done(&opts
);
596 diff_tree_oid(oid1
, oid2
, "", &opts
);
600 strbuf_release(&prefix
);