2 * Copyright (C) 2005 Junio C Hamano
10 #include "cache-tree.h"
11 #include "unpack-trees.h"
13 #include "submodule.h"
20 * Has the work tree entity been removed?
22 * Return 1 if it was removed from the work tree, 0 if an entity to be
23 * compared with the cache entry ce still exists (the latter includes
24 * the case where a directory that is not a submodule repository
25 * exists for ce that is a submodule -- it is a submodule that is not
26 * checked out). Return negative for an error.
28 static int check_removed(const struct cache_entry *ce, struct stat *st)
30 if (lstat(ce->name, st) < 0) {
31 if (errno != ENOENT && errno != ENOTDIR)
35 if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
37 if (S_ISDIR(st->st_mode)) {
38 unsigned char sub[20];
41 * If ce is already a gitlink, we can have a plain
42 * directory (i.e. the submodule is not checked out),
43 * or a checked out submodule. Either case this is not
44 * a case where something was removed from the work tree,
45 * so we will return 0.
47 * Otherwise, if the directory is not a submodule
48 * repository, that means ce which was a blob turned into
49 * a directory --- the blob was removed!
51 if (!S_ISGITLINK(ce->ce_mode) &&
52 resolve_gitlink_ref(ce->name, "HEAD", sub))
58 int run_diff_files(struct rev_info *revs, unsigned int option)
61 int diff_unmerged_stage = revs->max_count;
62 int silent_on_removed = option & DIFF_SILENT_ON_REMOVED;
63 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
64 ? CE_MATCH_RACY_IS_DIRTY : 0);
66 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
68 if (diff_unmerged_stage < 0)
69 diff_unmerged_stage = 2;
71 for (i = 0; i < entries; i++) {
73 unsigned int oldmode, newmode;
74 struct cache_entry *ce = active_cache[i];
76 unsigned dirty_submodule = 0;
78 if (DIFF_OPT_TST(&revs->diffopt, QUICK) &&
79 DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
82 if (!ce_path_match(ce, revs->prune_data))
86 struct combine_diff_path *dpath;
87 int num_compare_stages = 0;
90 path_len = ce_namelen(ce);
92 dpath = xmalloc(combine_diff_path_size(5, path_len));
93 dpath->path = (char *) &(dpath->parent[5]);
96 dpath->len = path_len;
97 memcpy(dpath->path, ce->name, path_len);
98 dpath->path[path_len] = '\0';
100 memset(&(dpath->parent[0]), 0,
101 sizeof(struct combine_diff_parent)*5);
103 changed = check_removed(ce, &st);
105 dpath->mode = ce_mode_from_stat(ce, st.st_mode);
111 if (silent_on_removed)
115 while (i < entries) {
116 struct cache_entry *nce = active_cache[i];
119 if (strcmp(ce->name, nce->name))
122 /* Stage #2 (ours) is the first parent,
123 * stage #3 (theirs) is the second.
125 stage = ce_stage(nce);
127 int mode = nce->ce_mode;
128 num_compare_stages++;
129 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
130 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
131 dpath->parent[stage-2].status =
132 DIFF_STATUS_MODIFIED;
135 /* diff against the proper unmerged stage */
136 if (stage == diff_unmerged_stage)
141 * Compensate for loop update
145 if (revs->combine_merges && num_compare_stages == 2) {
146 show_combined_diff(dpath, 2,
147 revs->dense_combined_merges,
156 * Show the diff for the 'ce' if we found the one
157 * from the desired stage.
159 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
160 if (ce_stage(ce) != diff_unmerged_stage)
164 if (ce_uptodate(ce) || ce_skip_worktree(ce))
167 /* If CE_VALID is set, don't look at workdir for file removal */
168 changed = (ce->ce_flags & CE_VALID) ? 0 : check_removed(ce, &st);
174 if (silent_on_removed)
176 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
177 ce->sha1, ce->name, 0);
180 changed = ce_match_stat(ce, &st, ce_option);
181 if (S_ISGITLINK(ce->ce_mode)
182 && !DIFF_OPT_TST(&revs->diffopt, IGNORE_SUBMODULES)
183 && (!changed || (revs->diffopt.output_format & DIFF_FORMAT_PATCH)
184 || DIFF_OPT_TST(&revs->diffopt, DIRTY_SUBMODULES))) {
185 dirty_submodule = is_submodule_modified(ce->name);
190 ce_mark_uptodate(ce);
191 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
194 oldmode = ce->ce_mode;
195 newmode = ce_mode_from_stat(ce, st.st_mode);
196 diff_change(&revs->diffopt, oldmode, newmode,
197 ce->sha1, (changed ? null_sha1 : ce->sha1),
198 ce->name, 0, dirty_submodule);
201 diffcore_std(&revs->diffopt);
202 diff_flush(&revs->diffopt);
210 /* A file entry went away or appeared */
211 static void diff_index_show_file(struct rev_info *revs,
213 struct cache_entry *ce,
214 const unsigned char *sha1, unsigned int mode,
215 unsigned dirty_submodule)
217 diff_addremove(&revs->diffopt, prefix[0], mode,
218 sha1, ce->name, dirty_submodule);
221 static int get_stat_data(struct cache_entry *ce,
222 const unsigned char **sha1p,
224 int cached, int match_missing,
225 unsigned *dirty_submodule, struct diff_options *diffopt)
227 const unsigned char *sha1 = ce->sha1;
228 unsigned int mode = ce->ce_mode;
230 if (!cached && !ce_uptodate(ce)) {
233 changed = check_removed(ce, &st);
244 changed = ce_match_stat(ce, &st, 0);
245 if (S_ISGITLINK(ce->ce_mode)
246 && !DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES)
247 && (!changed || (diffopt->output_format & DIFF_FORMAT_PATCH)
248 || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES))) {
249 *dirty_submodule = is_submodule_modified(ce->name);
250 if (*dirty_submodule)
254 mode = ce_mode_from_stat(ce, st.st_mode);
264 static void show_new_file(struct rev_info *revs,
265 struct cache_entry *new,
266 int cached, int match_missing)
268 const unsigned char *sha1;
270 unsigned dirty_submodule = 0;
273 * New file in the index: it might actually be different in
276 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
277 &dirty_submodule, &revs->diffopt) < 0)
280 diff_index_show_file(revs, "+", new, sha1, mode, dirty_submodule);
283 static int show_modified(struct rev_info *revs,
284 struct cache_entry *old,
285 struct cache_entry *new,
287 int cached, int match_missing)
289 unsigned int mode, oldmode;
290 const unsigned char *sha1;
291 unsigned dirty_submodule = 0;
293 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
294 &dirty_submodule, &revs->diffopt) < 0) {
296 diff_index_show_file(revs, "-", old,
297 old->sha1, old->ce_mode, 0);
301 if (revs->combine_merges && !cached &&
302 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
303 struct combine_diff_path *p;
304 int pathlen = ce_namelen(new);
306 p = xmalloc(combine_diff_path_size(2, pathlen));
307 p->path = (char *) &p->parent[2];
310 memcpy(p->path, new->name, pathlen);
311 p->path[pathlen] = 0;
314 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
315 p->parent[0].status = DIFF_STATUS_MODIFIED;
316 p->parent[0].mode = new->ce_mode;
317 hashcpy(p->parent[0].sha1, new->sha1);
318 p->parent[1].status = DIFF_STATUS_MODIFIED;
319 p->parent[1].mode = old->ce_mode;
320 hashcpy(p->parent[1].sha1, old->sha1);
321 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
326 oldmode = old->ce_mode;
327 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
328 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
331 diff_change(&revs->diffopt, oldmode, mode,
332 old->sha1, sha1, old->name, 0, dirty_submodule);
337 * This gets a mix of an existing index and a tree, one pathname entry
338 * at a time. The index entry may be a single stage-0 one, but it could
339 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
340 * give you the position and number of entries in the index).
342 static void do_oneway_diff(struct unpack_trees_options *o,
343 struct cache_entry *idx,
344 struct cache_entry *tree)
346 struct rev_info *revs = o->unpack_data;
347 int match_missing, cached;
349 /* if the entry is not checked out, don't examine work tree */
350 cached = o->index_only ||
351 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
353 * Backward compatibility wart - "diff-index -m" does
354 * not mean "do not ignore merges", but "match_missing".
356 * But with the revision flag parsing, that's found in
357 * "!revs->ignore_merges".
359 match_missing = !revs->ignore_merges;
361 if (cached && idx && ce_stage(idx)) {
362 diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode,
368 * Something added to the tree?
371 show_new_file(revs, idx, cached, match_missing);
376 * Something removed from the tree?
379 diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode, 0);
383 /* Show difference between old and new */
384 show_modified(revs, tree, idx, 1, cached, match_missing);
388 * The unpack_trees() interface is designed for merging, so
389 * the different source entries are designed primarily for
390 * the source trees, with the old index being really mainly
391 * used for being replaced by the result.
393 * For diffing, the index is more important, and we only have a
396 * We're supposed to advance o->pos to skip what we have already processed.
398 * This wrapper makes it all more readable, and takes care of all
399 * the fairly complex unpack_trees() semantic requirements, including
400 * the skipping, the path matching, the type conflict cases etc.
402 static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
404 struct cache_entry *idx = src[0];
405 struct cache_entry *tree = src[1];
406 struct rev_info *revs = o->unpack_data;
409 * Unpack-trees generates a DF/conflict entry if
410 * there was a directory in the index and a tree
411 * in the tree. From a diff standpoint, that's a
412 * delete of the tree and a create of the file.
414 if (tree == o->df_conflict_entry)
417 if (ce_path_match(idx ? idx : tree, revs->prune_data))
418 do_oneway_diff(o, idx, tree);
423 int run_diff_index(struct rev_info *revs, int cached)
427 const char *tree_name;
428 struct unpack_trees_options opts;
431 ent = revs->pending.objects[0].item;
432 tree_name = revs->pending.objects[0].name;
433 tree = parse_tree_indirect(ent->sha1);
435 return error("bad tree object %s", tree_name);
437 memset(&opts, 0, sizeof(opts));
439 opts.index_only = cached;
440 opts.diff_index_cached = (cached &&
441 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
443 opts.fn = oneway_diff;
444 opts.unpack_data = revs;
445 opts.src_index = &the_index;
446 opts.dst_index = NULL;
448 init_tree_desc(&t, tree->buffer, tree->size);
449 if (unpack_trees(1, &t, &opts))
452 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
453 diffcore_fix_diff_index(&revs->diffopt);
454 diffcore_std(&revs->diffopt);
455 diff_flush(&revs->diffopt);
459 int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
462 struct rev_info revs;
464 struct cache_entry **dst;
465 struct cache_entry *last = NULL;
466 struct unpack_trees_options opts;
470 * This is used by git-blame to run diff-cache internally;
471 * it potentially needs to repeatedly run this, so we will
472 * start by removing the higher order entries the last round
476 for (i = 0; i < active_nr; i++) {
477 struct cache_entry *ce = active_cache[i];
479 if (last && !strcmp(ce->name, last->name))
481 cache_tree_invalidate_path(active_cache_tree,
484 ce->ce_flags |= CE_REMOVE;
488 active_nr = dst - active_cache;
490 init_revisions(&revs, NULL);
491 revs.prune_data = opt->paths;
492 tree = parse_tree_indirect(tree_sha1);
494 die("bad tree object %s", sha1_to_hex(tree_sha1));
496 memset(&opts, 0, sizeof(opts));
499 opts.diff_index_cached = !DIFF_OPT_TST(opt, FIND_COPIES_HARDER);
501 opts.fn = oneway_diff;
502 opts.unpack_data = &revs;
503 opts.src_index = &the_index;
504 opts.dst_index = &the_index;
506 init_tree_desc(&t, tree->buffer, tree->size);
507 if (unpack_trees(1, &t, &opts))
512 int index_differs_from(const char *def, int diff_flags)
516 init_revisions(&rev, NULL);
517 setup_revisions(0, NULL, &rev, def);
518 DIFF_OPT_SET(&rev.diffopt, QUICK);
519 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
520 rev.diffopt.flags |= diff_flags;
521 run_diff_index(&rev, 1);
522 if (rev.pending.alloc)
523 free(rev.pending.objects);
524 return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);