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)) {
40 unsigned char sub[20];
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 = ce_match_stat(ce, st, ce_option);
74 if (S_ISGITLINK(ce->ce_mode)) {
75 unsigned orig_flags = diffopt->flags;
76 if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG))
77 set_diffopt_flags_from_submodule_config(diffopt, ce->name);
78 if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES))
80 else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES)
81 && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES)))
82 *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
83 diffopt->flags = orig_flags;
88 int run_diff_files(struct rev_info *revs, unsigned int option)
91 int diff_unmerged_stage = revs->max_count;
92 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
93 ? CE_MATCH_RACY_IS_DIRTY : 0);
95 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
97 if (diff_unmerged_stage < 0)
98 diff_unmerged_stage = 2;
100 for (i = 0; i < entries; i++) {
101 unsigned int oldmode, newmode;
102 struct cache_entry *ce = active_cache[i];
104 unsigned dirty_submodule = 0;
105 const struct object_id *old_oid, *new_oid;
107 if (diff_can_quit_early(&revs->diffopt))
110 if (!ce_path_match(ce, &revs->prune_data, NULL))
114 struct combine_diff_path *dpath;
115 struct diff_filepair *pair;
116 unsigned int wt_mode = 0;
117 int num_compare_stages = 0;
121 path_len = ce_namelen(ce);
123 dpath = xmalloc(combine_diff_path_size(5, path_len));
124 dpath->path = (char *) &(dpath->parent[5]);
127 memcpy(dpath->path, ce->name, path_len);
128 dpath->path[path_len] = '\0';
130 memset(&(dpath->parent[0]), 0,
131 sizeof(struct combine_diff_parent)*5);
133 changed = check_removed(ce, &st);
135 wt_mode = ce_mode_from_stat(ce, st.st_mode);
143 dpath->mode = wt_mode;
145 while (i < entries) {
146 struct cache_entry *nce = active_cache[i];
149 if (strcmp(ce->name, nce->name))
152 /* Stage #2 (ours) is the first parent,
153 * stage #3 (theirs) is the second.
155 stage = ce_stage(nce);
157 int mode = nce->ce_mode;
158 num_compare_stages++;
159 oidcpy(&dpath->parent[stage - 2].oid,
161 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
162 dpath->parent[stage-2].status =
163 DIFF_STATUS_MODIFIED;
166 /* diff against the proper unmerged stage */
167 if (stage == diff_unmerged_stage)
172 * Compensate for loop update
176 if (revs->combine_merges && num_compare_stages == 2) {
177 show_combined_diff(dpath, 2,
178 revs->dense_combined_merges,
183 FREE_AND_NULL(dpath);
186 * Show the diff for the 'ce' if we found the one
187 * from the desired stage.
189 pair = diff_unmerge(&revs->diffopt, ce->name);
191 pair->two->mode = wt_mode;
192 if (ce_stage(ce) != diff_unmerged_stage)
196 if (ce_uptodate(ce) || ce_skip_worktree(ce))
199 /* If CE_VALID is set, don't look at workdir for file removal */
200 if (ce->ce_flags & CE_VALID) {
202 newmode = ce->ce_mode;
206 changed = check_removed(ce, &st);
212 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
214 !is_null_oid(&ce->oid),
217 } else if (revs->diffopt.ita_invisible_in_index &&
218 ce_intent_to_add(ce)) {
219 diff_addremove(&revs->diffopt, '+', ce->ce_mode,
225 changed = match_stat_with_submodule(&revs->diffopt, ce, &st,
226 ce_option, &dirty_submodule);
227 newmode = ce_mode_from_stat(ce, st.st_mode);
230 if (!changed && !dirty_submodule) {
231 ce_mark_uptodate(ce);
232 mark_fsmonitor_valid(ce);
233 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
236 oldmode = ce->ce_mode;
238 new_oid = changed ? &null_oid : &ce->oid;
239 diff_change(&revs->diffopt, oldmode, newmode,
241 !is_null_oid(old_oid),
242 !is_null_oid(new_oid),
243 ce->name, 0, dirty_submodule);
246 diffcore_std(&revs->diffopt);
247 diff_flush(&revs->diffopt);
255 /* A file entry went away or appeared */
256 static void diff_index_show_file(struct rev_info *revs,
258 const struct cache_entry *ce,
259 const struct object_id *oid, int oid_valid,
261 unsigned dirty_submodule)
263 diff_addremove(&revs->diffopt, prefix[0], mode,
264 oid, oid_valid, ce->name, dirty_submodule);
267 static int get_stat_data(const struct cache_entry *ce,
268 const struct object_id **oidp,
270 int cached, int match_missing,
271 unsigned *dirty_submodule, struct diff_options *diffopt)
273 const struct object_id *oid = &ce->oid;
274 unsigned int mode = ce->ce_mode;
276 if (!cached && !ce_uptodate(ce)) {
279 changed = check_removed(ce, &st);
290 changed = match_stat_with_submodule(diffopt, ce, &st,
293 mode = ce_mode_from_stat(ce, st.st_mode);
303 static void show_new_file(struct rev_info *revs,
304 const struct cache_entry *new,
305 int cached, int match_missing)
307 const struct object_id *oid;
309 unsigned dirty_submodule = 0;
312 * New file in the index: it might actually be different in
315 if (get_stat_data(new, &oid, &mode, cached, match_missing,
316 &dirty_submodule, &revs->diffopt) < 0)
319 diff_index_show_file(revs, "+", new, oid, !is_null_oid(oid), mode, dirty_submodule);
322 static int show_modified(struct rev_info *revs,
323 const struct cache_entry *old,
324 const struct cache_entry *new,
326 int cached, int match_missing)
328 unsigned int mode, oldmode;
329 const struct object_id *oid;
330 unsigned dirty_submodule = 0;
332 if (get_stat_data(new, &oid, &mode, cached, match_missing,
333 &dirty_submodule, &revs->diffopt) < 0) {
335 diff_index_show_file(revs, "-", old,
336 &old->oid, 1, old->ce_mode,
341 if (revs->combine_merges && !cached &&
342 (oidcmp(oid, &old->oid) || oidcmp(&old->oid, &new->oid))) {
343 struct combine_diff_path *p;
344 int pathlen = ce_namelen(new);
346 p = xmalloc(combine_diff_path_size(2, pathlen));
347 p->path = (char *) &p->parent[2];
349 memcpy(p->path, new->name, pathlen);
350 p->path[pathlen] = 0;
353 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
354 p->parent[0].status = DIFF_STATUS_MODIFIED;
355 p->parent[0].mode = new->ce_mode;
356 oidcpy(&p->parent[0].oid, &new->oid);
357 p->parent[1].status = DIFF_STATUS_MODIFIED;
358 p->parent[1].mode = old->ce_mode;
359 oidcpy(&p->parent[1].oid, &old->oid);
360 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
365 oldmode = old->ce_mode;
366 if (mode == oldmode && !oidcmp(oid, &old->oid) && !dirty_submodule &&
367 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
370 diff_change(&revs->diffopt, oldmode, mode,
371 &old->oid, oid, 1, !is_null_oid(oid),
372 old->name, 0, dirty_submodule);
377 * This gets a mix of an existing index and a tree, one pathname entry
378 * at a time. The index entry may be a single stage-0 one, but it could
379 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
380 * give you the position and number of entries in the index).
382 static void do_oneway_diff(struct unpack_trees_options *o,
383 const struct cache_entry *idx,
384 const struct cache_entry *tree)
386 struct rev_info *revs = o->unpack_data;
387 int match_missing, cached;
389 /* i-t-a entries do not actually exist in the index */
390 if (revs->diffopt.ita_invisible_in_index &&
391 idx && ce_intent_to_add(idx)) {
394 return; /* nothing to diff.. */
397 /* if the entry is not checked out, don't examine work tree */
398 cached = o->index_only ||
399 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
401 * Backward compatibility wart - "diff-index -m" does
402 * not mean "do not ignore merges", but "match_missing".
404 * But with the revision flag parsing, that's found in
405 * "!revs->ignore_merges".
407 match_missing = !revs->ignore_merges;
409 if (cached && idx && ce_stage(idx)) {
410 struct diff_filepair *pair;
411 pair = diff_unmerge(&revs->diffopt, idx->name);
413 fill_filespec(pair->one, &tree->oid, 1,
419 * Something added to the tree?
422 show_new_file(revs, idx, cached, match_missing);
427 * Something removed from the tree?
430 diff_index_show_file(revs, "-", tree, &tree->oid, 1,
435 /* Show difference between old and new */
436 show_modified(revs, tree, idx, 1, cached, match_missing);
440 * The unpack_trees() interface is designed for merging, so
441 * the different source entries are designed primarily for
442 * the source trees, with the old index being really mainly
443 * used for being replaced by the result.
445 * For diffing, the index is more important, and we only have a
448 * We're supposed to advance o->pos to skip what we have already processed.
450 * This wrapper makes it all more readable, and takes care of all
451 * the fairly complex unpack_trees() semantic requirements, including
452 * the skipping, the path matching, the type conflict cases etc.
454 static int oneway_diff(const struct cache_entry * const *src,
455 struct unpack_trees_options *o)
457 const struct cache_entry *idx = src[0];
458 const struct cache_entry *tree = src[1];
459 struct rev_info *revs = o->unpack_data;
462 * Unpack-trees generates a DF/conflict entry if
463 * there was a directory in the index and a tree
464 * in the tree. From a diff standpoint, that's a
465 * delete of the tree and a create of the file.
467 if (tree == o->df_conflict_entry)
470 if (ce_path_match(idx ? idx : tree, &revs->prune_data, NULL)) {
471 do_oneway_diff(o, idx, tree);
472 if (diff_can_quit_early(&revs->diffopt)) {
473 o->exiting_early = 1;
481 static int diff_cache(struct rev_info *revs,
482 const struct object_id *tree_oid,
483 const char *tree_name,
488 struct unpack_trees_options opts;
490 tree = parse_tree_indirect(tree_oid);
492 return error("bad tree object %s",
493 tree_name ? tree_name : oid_to_hex(tree_oid));
494 memset(&opts, 0, sizeof(opts));
496 opts.index_only = cached;
497 opts.diff_index_cached = (cached &&
498 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
500 opts.fn = oneway_diff;
501 opts.unpack_data = revs;
502 opts.src_index = &the_index;
503 opts.dst_index = NULL;
504 opts.pathspec = &revs->diffopt.pathspec;
505 opts.pathspec->recursive = 1;
507 init_tree_desc(&t, tree->buffer, tree->size);
508 return unpack_trees(1, &t, &opts);
511 int run_diff_index(struct rev_info *revs, int cached)
513 struct object_array_entry *ent;
515 ent = revs->pending.objects;
516 if (diff_cache(revs, &ent->item->oid, ent->name, cached))
519 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
520 diffcore_fix_diff_index(&revs->diffopt);
521 diffcore_std(&revs->diffopt);
522 diff_flush(&revs->diffopt);
526 int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)
528 struct rev_info revs;
530 init_revisions(&revs, NULL);
531 copy_pathspec(&revs.prune_data, &opt->pathspec);
534 if (diff_cache(&revs, tree_oid, NULL, 1))
539 int index_differs_from(const char *def, int diff_flags,
540 int ita_invisible_in_index)
543 struct setup_revision_opt opt;
545 init_revisions(&rev, NULL);
546 memset(&opt, 0, sizeof(opt));
548 setup_revisions(0, NULL, &rev, &opt);
549 DIFF_OPT_SET(&rev.diffopt, QUICK);
550 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
551 rev.diffopt.flags |= diff_flags;
552 rev.diffopt.ita_invisible_in_index = ita_invisible_in_index;
553 run_diff_index(&rev, 1);
554 if (rev.pending.alloc)
555 free(rev.pending.objects);
556 return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);