Merge branch 'rs/parse-options-with-keep-unknown-abbrev-fix' into maint-2.43
[alt-git.git] / diff-lib.c
blob8fde93d7cac78d9fee3f3326ae4fff2e36a6c009
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #include "git-compat-util.h"
5 #include "commit.h"
6 #include "diff.h"
7 #include "diffcore.h"
8 #include "gettext.h"
9 #include "hash.h"
10 #include "hex.h"
11 #include "object-name.h"
12 #include "read-cache.h"
13 #include "revision.h"
14 #include "cache-tree.h"
15 #include "unpack-trees.h"
16 #include "refs.h"
17 #include "repository.h"
18 #include "submodule.h"
19 #include "symlinks.h"
20 #include "trace.h"
21 #include "dir.h"
22 #include "fsmonitor.h"
23 #include "commit-reach.h"
26 * diff-files
30 * Has the work tree entity been removed?
32 * Return 1 if it was removed from the work tree, 0 if an entity to be
33 * compared with the cache entry ce still exists (the latter includes
34 * the case where a directory that is not a submodule repository
35 * exists for ce that is a submodule -- it is a submodule that is not
36 * checked out). Return negative for an error.
38 static int check_removed(const struct cache_entry *ce, struct stat *st)
40 if (lstat(ce->name, st) < 0) {
41 if (!is_missing_file_error(errno))
42 return -1;
43 return 1;
46 if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
47 return 1;
48 if (S_ISDIR(st->st_mode)) {
49 struct object_id sub;
52 * If ce is already a gitlink, we can have a plain
53 * directory (i.e. the submodule is not checked out),
54 * or a checked out submodule. Either case this is not
55 * a case where something was removed from the work tree,
56 * so we will return 0.
58 * Otherwise, if the directory is not a submodule
59 * repository, that means ce which was a blob turned into
60 * a directory --- the blob was removed!
62 if (!S_ISGITLINK(ce->ce_mode) &&
63 resolve_gitlink_ref(ce->name, "HEAD", &sub))
64 return 1;
66 return 0;
70 * Has a file changed or has a submodule new commits or a dirty work tree?
72 * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES
73 * option is set, the caller does not only want to know if a submodule is
74 * modified at all but wants to know all the conditions that are met (new
75 * commits, untracked content and/or modified content).
77 static int match_stat_with_submodule(struct diff_options *diffopt,
78 const struct cache_entry *ce,
79 struct stat *st, unsigned ce_option,
80 unsigned *dirty_submodule)
82 int changed = ie_match_stat(diffopt->repo->index, ce, st, ce_option);
83 if (S_ISGITLINK(ce->ce_mode)) {
84 struct diff_flags orig_flags = diffopt->flags;
85 if (!diffopt->flags.override_submodule_config)
86 set_diffopt_flags_from_submodule_config(diffopt, ce->name);
87 if (diffopt->flags.ignore_submodules)
88 changed = 0;
89 else if (!diffopt->flags.ignore_dirty_submodules &&
90 (!changed || diffopt->flags.dirty_submodules))
91 *dirty_submodule = is_submodule_modified(ce->name,
92 diffopt->flags.ignore_untracked_in_submodules);
93 diffopt->flags = orig_flags;
95 return changed;
98 void run_diff_files(struct rev_info *revs, unsigned int option)
100 int entries, i;
101 int diff_unmerged_stage = revs->max_count;
102 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
103 ? CE_MATCH_RACY_IS_DIRTY : 0);
104 uint64_t start = getnanotime();
105 struct index_state *istate = revs->diffopt.repo->index;
107 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
109 refresh_fsmonitor(istate);
111 if (diff_unmerged_stage < 0)
112 diff_unmerged_stage = 2;
113 entries = istate->cache_nr;
114 for (i = 0; i < entries; i++) {
115 unsigned int oldmode, newmode;
116 struct cache_entry *ce = istate->cache[i];
117 int changed;
118 unsigned dirty_submodule = 0;
119 const struct object_id *old_oid, *new_oid;
121 if (diff_can_quit_early(&revs->diffopt))
122 break;
124 if (!ce_path_match(istate, ce, &revs->prune_data, NULL))
125 continue;
127 if (revs->diffopt.prefix &&
128 strncmp(ce->name, revs->diffopt.prefix, revs->diffopt.prefix_length))
129 continue;
131 if (ce_stage(ce)) {
132 struct combine_diff_path *dpath;
133 struct diff_filepair *pair;
134 unsigned int wt_mode = 0;
135 int num_compare_stages = 0;
136 size_t path_len;
137 struct stat st;
139 path_len = ce_namelen(ce);
141 dpath = xmalloc(combine_diff_path_size(5, path_len));
142 dpath->path = (char *) &(dpath->parent[5]);
144 dpath->next = NULL;
145 memcpy(dpath->path, ce->name, path_len);
146 dpath->path[path_len] = '\0';
147 oidclr(&dpath->oid);
148 memset(&(dpath->parent[0]), 0,
149 sizeof(struct combine_diff_parent)*5);
151 changed = check_removed(ce, &st);
152 if (!changed)
153 wt_mode = ce_mode_from_stat(ce, st.st_mode);
154 else {
155 if (changed < 0) {
156 perror(ce->name);
157 continue;
159 wt_mode = 0;
161 dpath->mode = wt_mode;
163 while (i < entries) {
164 struct cache_entry *nce = istate->cache[i];
165 int stage;
167 if (strcmp(ce->name, nce->name))
168 break;
170 /* Stage #2 (ours) is the first parent,
171 * stage #3 (theirs) is the second.
173 stage = ce_stage(nce);
174 if (2 <= stage) {
175 int mode = nce->ce_mode;
176 num_compare_stages++;
177 oidcpy(&dpath->parent[stage - 2].oid,
178 &nce->oid);
179 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
180 dpath->parent[stage-2].status =
181 DIFF_STATUS_MODIFIED;
184 /* diff against the proper unmerged stage */
185 if (stage == diff_unmerged_stage)
186 ce = nce;
187 i++;
190 * Compensate for loop update
192 i--;
194 if (revs->combine_merges && num_compare_stages == 2) {
195 show_combined_diff(dpath, 2, revs);
196 free(dpath);
197 continue;
199 FREE_AND_NULL(dpath);
202 * Show the diff for the 'ce' if we found the one
203 * from the desired stage.
205 pair = diff_unmerge(&revs->diffopt, ce->name);
206 if (wt_mode)
207 pair->two->mode = wt_mode;
208 if (ce_stage(ce) != diff_unmerged_stage)
209 continue;
212 if (ce_uptodate(ce) || ce_skip_worktree(ce))
213 continue;
216 * When CE_VALID is set (via "update-index --assume-unchanged"
217 * or via adding paths while core.ignorestat is set to true),
218 * the user has promised that the working tree file for that
219 * path will not be modified. When CE_FSMONITOR_VALID is true,
220 * the fsmonitor knows that the path hasn't been modified since
221 * we refreshed the cached stat information. In either case,
222 * we do not have to stat to see if the path has been removed
223 * or modified.
225 if (ce->ce_flags & (CE_VALID | CE_FSMONITOR_VALID)) {
226 changed = 0;
227 newmode = ce->ce_mode;
228 } else {
229 struct stat st;
231 changed = check_removed(ce, &st);
232 if (changed) {
233 if (changed < 0) {
234 perror(ce->name);
235 continue;
237 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
238 &ce->oid,
239 !is_null_oid(&ce->oid),
240 ce->name, 0);
241 continue;
242 } else if (revs->diffopt.ita_invisible_in_index &&
243 ce_intent_to_add(ce)) {
244 newmode = ce_mode_from_stat(ce, st.st_mode);
245 diff_addremove(&revs->diffopt, '+', newmode,
246 null_oid(), 0, ce->name, 0);
247 continue;
250 changed = match_stat_with_submodule(&revs->diffopt, ce, &st,
251 ce_option, &dirty_submodule);
252 newmode = ce_mode_from_stat(ce, st.st_mode);
255 if (!changed && !dirty_submodule) {
256 ce_mark_uptodate(ce);
257 mark_fsmonitor_valid(istate, ce);
258 if (!revs->diffopt.flags.find_copies_harder)
259 continue;
261 oldmode = ce->ce_mode;
262 old_oid = &ce->oid;
263 new_oid = changed ? null_oid() : &ce->oid;
264 diff_change(&revs->diffopt, oldmode, newmode,
265 old_oid, new_oid,
266 !is_null_oid(old_oid),
267 !is_null_oid(new_oid),
268 ce->name, 0, dirty_submodule);
271 diffcore_std(&revs->diffopt);
272 diff_flush(&revs->diffopt);
273 trace_performance_since(start, "diff-files");
277 * diff-index
280 /* A file entry went away or appeared */
281 static void diff_index_show_file(struct rev_info *revs,
282 const char *prefix,
283 const struct cache_entry *ce,
284 const struct object_id *oid, int oid_valid,
285 unsigned int mode,
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,
295 unsigned int *modep,
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)) {
303 int changed;
304 struct stat st;
305 changed = check_removed(ce, &st);
306 if (changed < 0)
307 return -1;
308 else if (changed) {
309 if (match_missing) {
310 *oidp = oid;
311 *modep = mode;
312 return 0;
314 return -1;
316 changed = match_stat_with_submodule(diffopt, ce, &st,
317 0, dirty_submodule);
318 if (changed) {
319 mode = ce_mode_from_stat(ce, st.st_mode);
320 oid = null_oid();
324 *oidp = oid;
325 *modep = mode;
326 return 0;
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;
334 unsigned int mode;
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);
340 return;
344 * New file in the index: it might actually be different in
345 * the working tree.
347 if (get_stat_data(istate, new_file, &oid, &mode, cached, match_missing,
348 &dirty_submodule, &revs->diffopt) < 0)
349 return;
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,
357 int report_missing,
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
372 * a modification.
374 if (S_ISSPARSEDIR(new_entry->ce_mode)) {
375 diff_tree_oid(&old_entry->oid, &new_entry->oid, new_entry->name, &revs->diffopt);
376 return 0;
379 if (get_stat_data(istate, new_entry, &oid, &mode, cached, match_missing,
380 &dirty_submodule, &revs->diffopt) < 0) {
381 if (report_missing)
382 diff_index_show_file(revs, "-", old_entry,
383 &old_entry->oid, 1, old_entry->ce_mode,
385 return -1;
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];
395 p->next = NULL;
396 memcpy(p->path, new_entry->name, pathlen);
397 p->path[pathlen] = 0;
398 p->mode = mode;
399 oidclr(&p->oid);
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);
408 free(p);
409 return 0;
412 oldmode = old_entry->ce_mode;
413 if (mode == oldmode && oideq(oid, &old_entry->oid) && !dirty_submodule &&
414 !revs->diffopt.flags.find_copies_harder)
415 return 0;
417 diff_change(&revs->diffopt, oldmode, mode,
418 &old_entry->oid, oid, 1, !is_null_oid(oid),
419 old_entry->name, 0, dirty_submodule);
420 return 0;
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)
440 if (o->index_only &&
441 revs->diffopt.ita_invisible_in_index &&
442 idx && ce_intent_to_add(idx)) {
443 idx = NULL;
444 if (!tree)
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);
457 if (tree)
458 fill_filespec(pair->one, &tree->oid, 1,
459 tree->ce_mode);
460 return;
464 * Something added to the tree?
466 if (!tree) {
467 show_new_file(revs, idx, cached, match_missing);
468 return;
472 * Something removed from the tree?
474 if (!idx) {
475 if (S_ISSPARSEDIR(tree->ce_mode)) {
476 diff_tree_oid(&tree->oid, NULL, tree->name, &revs->diffopt);
477 return;
480 diff_index_show_file(revs, "-", tree, &tree->oid, 1,
481 tree->ce_mode, 0);
482 return;
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
496 * single tree.
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)
518 tree = NULL;
520 if (ce_path_match(revs->diffopt.repo->index,
521 idx ? idx : tree,
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;
526 return -1;
530 return 0;
533 static int diff_cache(struct rev_info *revs,
534 const struct object_id *tree_oid,
535 const char *tree_name,
536 int cached)
538 struct tree *tree;
539 struct tree_desc t;
540 struct unpack_trees_options opts;
542 tree = parse_tree_indirect(tree_oid);
543 if (!tree)
544 return error("bad tree object %s",
545 tree_name ? tree_name : oid_to_hex(tree_oid));
546 memset(&opts, 0, sizeof(opts));
547 opts.head_idx = 1;
548 opts.index_only = cached;
549 opts.diff_index_cached = (cached &&
550 !revs->diffopt.flags.find_copies_harder);
551 opts.merge = 1;
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)
565 int i;
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;
571 if (obj->flags)
572 die(_("--merge-base does not work with ranges"));
576 * This check must go after the for loop above because A...B
577 * ranges produce three pending commits, resulting in a
578 * misleading error message.
580 if (revs->pending.nr < 1 || revs->pending.nr > 2)
581 BUG("unexpected revs->pending.nr: %d", revs->pending.nr);
583 for (i = 0; i < revs->pending.nr; i++)
584 mb_child[i] = lookup_commit_reference(the_repository, &revs->pending.objects[i].item->oid);
585 if (revs->pending.nr == 1) {
586 struct object_id oid;
588 if (repo_get_oid(the_repository, "HEAD", &oid))
589 die(_("unable to get HEAD"));
591 mb_child[1] = lookup_commit_reference(the_repository, &oid);
594 merge_bases = repo_get_merge_bases(the_repository, mb_child[0], mb_child[1]);
595 if (!merge_bases)
596 die(_("no merge base found"));
597 if (merge_bases->next)
598 die(_("multiple merge bases found"));
600 oidcpy(mb, &merge_bases->item->object.oid);
602 free_commit_list(merge_bases);
605 void run_diff_index(struct rev_info *revs, unsigned int option)
607 struct object_array_entry *ent;
608 int cached = !!(option & DIFF_INDEX_CACHED);
609 int merge_base = !!(option & DIFF_INDEX_MERGE_BASE);
610 struct object_id oid;
611 const char *name;
612 char merge_base_hex[GIT_MAX_HEXSZ + 1];
613 struct index_state *istate = revs->diffopt.repo->index;
615 if (revs->pending.nr != 1)
616 BUG("run_diff_index must be passed exactly one tree");
618 trace_performance_enter();
619 ent = revs->pending.objects;
621 refresh_fsmonitor(istate);
623 if (merge_base) {
624 diff_get_merge_base(revs, &oid);
625 name = oid_to_hex_r(merge_base_hex, &oid);
626 } else {
627 oidcpy(&oid, &ent->item->oid);
628 name = ent->name;
631 if (diff_cache(revs, &oid, name, cached))
632 exit(128);
634 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
635 diffcore_fix_diff_index();
636 diffcore_std(&revs->diffopt);
637 diff_flush(&revs->diffopt);
638 trace_performance_leave("diff-index");
641 int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)
643 struct rev_info revs;
645 repo_init_revisions(opt->repo, &revs, NULL);
646 copy_pathspec(&revs.prune_data, &opt->pathspec);
647 diff_setup_done(&revs.diffopt);
648 revs.diffopt = *opt;
650 if (diff_cache(&revs, tree_oid, NULL, 1))
651 exit(128);
652 release_revisions(&revs);
653 return 0;
656 int index_differs_from(struct repository *r,
657 const char *def, const struct diff_flags *flags,
658 int ita_invisible_in_index)
660 struct rev_info rev;
661 struct setup_revision_opt opt;
662 unsigned has_changes;
664 repo_init_revisions(r, &rev, NULL);
665 memset(&opt, 0, sizeof(opt));
666 opt.def = def;
667 setup_revisions(0, NULL, &rev, &opt);
668 rev.diffopt.flags.quick = 1;
669 rev.diffopt.flags.exit_with_status = 1;
670 if (flags) {
671 diff_flags_or(&rev.diffopt.flags, flags);
673 * Now that flags are merged, honor override_submodule_config
674 * and ignore_submodules from passed flags.
676 if (flags->override_submodule_config)
677 rev.diffopt.flags.ignore_submodules = flags->ignore_submodules;
679 rev.diffopt.ita_invisible_in_index = ita_invisible_in_index;
680 run_diff_index(&rev, DIFF_INDEX_CACHED);
681 has_changes = rev.diffopt.flags.has_changes;
682 release_revisions(&rev);
683 return (has_changes != 0);
686 static struct strbuf *idiff_prefix_cb(struct diff_options *opt UNUSED, void *data)
688 return data;
691 void show_interdiff(const struct object_id *oid1, const struct object_id *oid2,
692 int indent, struct diff_options *diffopt)
694 struct diff_options opts;
695 struct strbuf prefix = STRBUF_INIT;
697 memcpy(&opts, diffopt, sizeof(opts));
698 opts.output_format = DIFF_FORMAT_PATCH;
699 opts.output_prefix = idiff_prefix_cb;
700 strbuf_addchars(&prefix, ' ', indent);
701 opts.output_prefix_data = &prefix;
702 diff_setup_done(&opts);
704 diff_tree_oid(oid1, oid2, "", &opts);
705 diffcore_std(&opts);
706 diff_flush(&opts);
708 strbuf_release(&prefix);