5 #include "cache-tree.h"
6 #include "unpack-trees.h"
11 struct tree_entry_list {
12 struct tree_entry_list *next;
13 unsigned directory : 1;
14 unsigned executable : 1;
18 const unsigned char *sha1;
21 static struct tree_entry_list *create_tree_entry_list(struct tree *tree)
23 struct tree_desc desc;
24 struct name_entry one;
25 struct tree_entry_list *ret = NULL;
26 struct tree_entry_list **list_p = &ret;
28 if (!tree->object.parsed)
31 init_tree_desc(&desc, tree->buffer, tree->size);
33 while (tree_entry(&desc, &one)) {
34 struct tree_entry_list *entry;
36 entry = xmalloc(sizeof(struct tree_entry_list));
37 entry->name = one.path;
38 entry->sha1 = one.sha1;
39 entry->mode = one.mode;
40 entry->directory = S_ISDIR(one.mode) != 0;
41 entry->executable = (one.mode & S_IXUSR) != 0;
42 entry->symlink = S_ISLNK(one.mode) != 0;
46 list_p = &entry->next;
51 static int entcmp(const char *name1, int dir1, const char *name2, int dir2)
53 int len1 = strlen(name1);
54 int len2 = strlen(name2);
55 int len = len1 < len2 ? len1 : len2;
56 int ret = memcmp(name1, name2, len);
66 ret = (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
72 static int unpack_trees_rec(struct tree_entry_list **posns, int len,
73 const char *base, struct unpack_trees_options *o,
74 struct tree_entry_list *df_conflict_list)
76 int baselen = strlen(base);
77 int src_size = len + 1;
82 i_stk = push_exclude_per_directory(o->dir, base, strlen(base));
90 struct tree_entry_list **subposns;
91 struct cache_entry **src;
97 /* Find the first name in the input. */
102 /* Check the cache */
103 if (o->merge && o->pos < active_nr) {
104 /* This is a bit tricky: */
105 /* If the index has a subdirectory (with
106 * contents) as the first name, it'll get a
107 * filename like "foo/bar". But that's after
108 * "foo", so the entry in trees will get
109 * handled first, at which point we'll go into
110 * "foo", and deal with "bar" from the index,
111 * because the base will be "foo/". The only
112 * way we can actually have "foo/bar" first of
113 * all the things is if the trees don't
114 * contain "foo" at all, in which case we'll
115 * handle "foo/bar" without going into the
116 * directory, but that's fine (and will return
117 * an error anyway, with the added unknown
121 cache_name = active_cache[o->pos]->name;
122 if (strlen(cache_name) > baselen &&
123 !memcmp(cache_name, base, baselen)) {
124 cache_name += baselen;
133 printf("index %s\n", first);
135 for (i = 0; i < len; i++) {
136 if (!posns[i] || posns[i] == df_conflict_list)
139 printf("%d %s\n", i + 1, posns[i]->name);
141 if (!first || entcmp(first, firstdir,
143 posns[i]->directory) > 0) {
144 first = posns[i]->name;
145 firstdir = posns[i]->directory;
148 /* No name means we're done */
150 goto leave_directory;
152 pathlen = strlen(first);
153 ce_size = cache_entry_size(baselen + pathlen);
155 src = xcalloc(src_size, sizeof(struct cache_entry *));
157 subposns = xcalloc(len, sizeof(struct tree_list_entry *));
159 if (cache_name && !strcmp(cache_name, first)) {
161 src[0] = active_cache[o->pos];
162 remove_cache_entry_at(o->pos);
165 for (i = 0; i < len; i++) {
166 struct cache_entry *ce;
169 (posns[i] != df_conflict_list &&
170 strcmp(first, posns[i]->name))) {
174 if (posns[i] == df_conflict_list) {
175 src[i + o->merge] = o->df_conflict_entry;
179 if (posns[i]->directory) {
180 struct tree *tree = lookup_tree(posns[i]->sha1);
183 subposns[i] = create_tree_entry_list(tree);
184 posns[i] = posns[i]->next;
185 src[i + o->merge] = o->df_conflict_entry;
191 else if (i + 1 < o->head_idx)
193 else if (i + 1 > o->head_idx)
198 ce = xcalloc(1, ce_size);
199 ce->ce_mode = create_ce_mode(posns[i]->mode);
200 ce->ce_flags = create_ce_flags(baselen + pathlen,
202 memcpy(ce->name, base, baselen);
203 memcpy(ce->name + baselen, first, pathlen + 1);
207 hashcpy(ce->sha1, posns[i]->sha1);
208 src[i + o->merge] = ce;
209 subposns[i] = df_conflict_list;
210 posns[i] = posns[i]->next;
217 printf("%s:\n", first);
218 for (i = 0; i < src_size; i++) {
221 printf("%s\n", sha1_to_hex(src[i]->sha1));
229 printf("Added %d entries\n", ret);
233 for (i = 0; i < src_size; i++) {
235 add_cache_entry(src[i], ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
241 char *newbase = xmalloc(baselen + 2 + pathlen);
242 memcpy(newbase, base, baselen);
243 memcpy(newbase + baselen, first, pathlen);
244 newbase[baselen + pathlen] = '/';
245 newbase[baselen + pathlen + 1] = '\0';
246 if (unpack_trees_rec(subposns, len, newbase, o,
249 goto leave_directory;
259 pop_exclude_per_directory(o->dir, i_stk);
263 /* Unlink the last component and attempt to remove leading
264 * directories, in case this unlink is the removal of the
265 * last entry in the directory -- empty directories are removed.
267 static void unlink_entry(char *name)
276 cp = strrchr(name, '/');
283 status = rmdir(name);
292 static struct checkout state;
293 static void check_updates(struct cache_entry **src, int nr,
294 struct unpack_trees_options *o)
296 unsigned short mask = htons(CE_UPDATE);
297 unsigned cnt = 0, total = 0;
298 struct progress progress;
300 if (o->update && o->verbose_update) {
301 for (total = cnt = 0; cnt < nr; cnt++) {
302 struct cache_entry *ce = src[cnt];
303 if (!ce->ce_mode || ce->ce_flags & mask)
307 start_progress_delay(&progress, "Checking %u files out...",
313 struct cache_entry *ce = *src++;
316 if (!ce->ce_mode || ce->ce_flags & mask)
317 display_progress(&progress, ++cnt);
320 unlink_entry(ce->name);
323 if (ce->ce_flags & mask) {
324 ce->ce_flags &= ~mask;
326 checkout_entry(ce, &state, NULL);
330 stop_progress(&progress);;
333 int unpack_trees(struct object_list *trees, struct unpack_trees_options *o)
335 unsigned len = object_list_length(trees);
336 struct tree_entry_list **posns;
338 struct object_list *posn = trees;
339 struct tree_entry_list df_conflict_list;
340 static struct cache_entry *dfc;
342 memset(&df_conflict_list, 0, sizeof(df_conflict_list));
343 df_conflict_list.next = &df_conflict_list;
344 memset(&state, 0, sizeof(state));
348 state.refresh_cache = 1;
353 dfc = xcalloc(1, sizeof(struct cache_entry) + 1);
354 o->df_conflict_entry = dfc;
357 posns = xmalloc(len * sizeof(struct tree_entry_list *));
358 for (i = 0; i < len; i++) {
359 posns[i] = create_tree_entry_list((struct tree *) posn->item);
362 if (unpack_trees_rec(posns, len, o->prefix ? o->prefix : "",
363 o, &df_conflict_list))
367 if (o->trivial_merges_only && o->nontrivial_merge)
368 die("Merge requires file-level merging");
370 check_updates(active_cache, active_nr, o);
374 /* Here come the merge functions */
376 static void reject_merge(struct cache_entry *ce)
378 die("Entry '%s' would be overwritten by merge. Cannot merge.",
382 static int same(struct cache_entry *a, struct cache_entry *b)
388 return a->ce_mode == b->ce_mode &&
389 !hashcmp(a->sha1, b->sha1);
394 * When a CE gets turned into an unmerged entry, we
395 * want it to be up-to-date
397 static void verify_uptodate(struct cache_entry *ce,
398 struct unpack_trees_options *o)
402 if (o->index_only || o->reset)
405 if (!lstat(ce->name, &st)) {
406 unsigned changed = ce_match_stat(ce, &st, 1);
412 ce->ce_flags |= htons(CE_UPDATE);
417 die("Entry '%s' not uptodate. Cannot merge.", ce->name);
420 static void invalidate_ce_path(struct cache_entry *ce)
423 cache_tree_invalidate_path(active_cache_tree, ce->name);
426 static int verify_clean_subdirectory(const char *path, const char *action,
427 struct unpack_trees_options *o)
430 * we are about to extract "path"; we would not want to lose
431 * anything in the existing directory there.
440 * First let's make sure we do not have a local modification
443 namelen = strlen(path);
444 pos = cache_name_pos(path, namelen);
446 return cnt; /* we have it as nondirectory */
448 for (i = pos; i < active_nr; i++) {
449 struct cache_entry *ce = active_cache[i];
450 int len = ce_namelen(ce);
452 strncmp(path, ce->name, namelen) ||
453 ce->name[namelen] != '/')
456 * ce->name is an entry in the subdirectory.
459 verify_uptodate(ce, o);
466 * Then we need to make sure that we do not lose a locally
467 * present file that is not ignored.
469 pathbuf = xmalloc(namelen + 2);
470 memcpy(pathbuf, path, namelen);
471 strcpy(pathbuf+namelen, "/");
473 memset(&d, 0, sizeof(d));
475 d.exclude_per_dir = o->dir->exclude_per_dir;
476 i = read_directory(&d, path, pathbuf, namelen+1, NULL);
478 die("Updating '%s' would lose untracked files in it",
485 * We do not want to remove or overwrite a working tree file that
486 * is not tracked, unless it is ignored.
488 static void verify_absent(const char *path, const char *action,
489 struct unpack_trees_options *o)
493 if (o->index_only || o->reset || !o->update)
496 if (!lstat(path, &st)) {
499 if (o->dir && excluded(o->dir, path))
501 * path is explicitly excluded, so it is Ok to
505 if (S_ISDIR(st.st_mode)) {
507 * We are checking out path "foo" and
508 * found "foo/." in the working tree.
509 * This is tricky -- if we have modified
510 * files that are in "foo/" we would lose
513 cnt = verify_clean_subdirectory(path, action, o);
516 * If this removed entries from the index,
517 * what that means is:
519 * (1) the caller unpack_trees_rec() saw path/foo
520 * in the index, and it has not removed it because
521 * it thinks it is handling 'path' as blob with
523 * (2) we will return "ok, we placed a merged entry
524 * in the index" which would cause o->pos to be
525 * incremented by one;
526 * (3) however, original o->pos now has 'path/foo'
527 * marked with "to be removed".
529 * We need to increment it by the number of
530 * deleted entries here.
537 * The previous round may already have decided to
538 * delete this path, which is in a subdirectory that
539 * is being replaced with a blob.
541 cnt = cache_name_pos(path, strlen(path));
543 struct cache_entry *ce = active_cache[cnt];
544 if (!ce_stage(ce) && !ce->ce_mode)
548 die("Untracked working tree file '%s' "
549 "would be %s by merge.", path, action);
553 static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
554 struct unpack_trees_options *o)
556 merge->ce_flags |= htons(CE_UPDATE);
559 * See if we can re-use the old CE directly?
560 * That way we get the uptodate stat info.
562 * This also removes the UPDATE flag on
565 if (same(old, merge)) {
568 verify_uptodate(old, o);
569 invalidate_ce_path(old);
573 verify_absent(merge->name, "overwritten", o);
574 invalidate_ce_path(merge);
577 merge->ce_flags &= ~htons(CE_STAGEMASK);
578 add_cache_entry(merge, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
582 static int deleted_entry(struct cache_entry *ce, struct cache_entry *old,
583 struct unpack_trees_options *o)
586 verify_uptodate(old, o);
588 verify_absent(ce->name, "removed", o);
590 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
591 invalidate_ce_path(ce);
595 static int keep_entry(struct cache_entry *ce, struct unpack_trees_options *o)
597 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
602 static void show_stage_entry(FILE *o,
603 const char *label, const struct cache_entry *ce)
606 fprintf(o, "%s (missing)\n", label);
608 fprintf(o, "%s%06o %s %d\t%s\n",
611 sha1_to_hex(ce->sha1),
617 int threeway_merge(struct cache_entry **stages,
618 struct unpack_trees_options *o)
620 struct cache_entry *index;
621 struct cache_entry *head;
622 struct cache_entry *remote = stages[o->head_idx + 1];
625 int remote_match = 0;
627 int df_conflict_head = 0;
628 int df_conflict_remote = 0;
630 int any_anc_missing = 0;
631 int no_anc_exists = 1;
634 for (i = 1; i < o->head_idx; i++) {
635 if (!stages[i] || stages[i] == o->df_conflict_entry)
642 head = stages[o->head_idx];
644 if (head == o->df_conflict_entry) {
645 df_conflict_head = 1;
649 if (remote == o->df_conflict_entry) {
650 df_conflict_remote = 1;
654 /* First, if there's a #16 situation, note that to prevent #13
657 if (!same(remote, head)) {
658 for (i = 1; i < o->head_idx; i++) {
659 if (same(stages[i], head)) {
662 if (same(stages[i], remote)) {
668 /* We start with cases where the index is allowed to match
669 * something other than the head: #14(ALT) and #2ALT, where it
670 * is permitted to match the result instead.
672 /* #14, #14ALT, #2ALT */
673 if (remote && !df_conflict_head && head_match && !remote_match) {
674 if (index && !same(index, remote) && !same(index, head))
676 return merged_entry(remote, index, o);
679 * If we have an entry in the index cache, then we want to
680 * make sure that it matches head.
682 if (index && !same(index, head)) {
688 if (same(head, remote))
689 return merged_entry(head, index, o);
691 if (!df_conflict_remote && remote_match && !head_match)
692 return merged_entry(head, index, o);
696 if (!head && !remote && any_anc_missing)
699 /* Under the new "aggressive" rule, we resolve mostly trivial
700 * cases that we historically had git-merge-one-file resolve.
703 int head_deleted = !head && !df_conflict_head;
704 int remote_deleted = !remote && !df_conflict_remote;
705 const char *path = NULL;
714 for (i = 1; i < o->head_idx; i++) {
715 if (stages[i] && stages[i] != o->df_conflict_entry) {
716 path = stages[i]->name;
724 * Deleted in one and unchanged in the other.
726 if ((head_deleted && remote_deleted) ||
727 (head_deleted && remote && remote_match) ||
728 (remote_deleted && head && head_match)) {
730 return deleted_entry(index, index, o);
731 else if (path && !head_deleted)
732 verify_absent(path, "removed", o);
736 * Added in both, identically.
738 if (no_anc_exists && head && remote && same(head, remote))
739 return merged_entry(head, index, o);
743 /* Below are "no merge" cases, which require that the index be
744 * up-to-date to avoid the files getting overwritten with
745 * conflict resolution files.
748 verify_uptodate(index, o);
751 o->nontrivial_merge = 1;
753 /* #2, #3, #4, #6, #7, #9, #10, #11. */
755 if (!head_match || !remote_match) {
756 for (i = 1; i < o->head_idx; i++) {
757 if (stages[i] && stages[i] != o->df_conflict_entry) {
758 keep_entry(stages[i], o);
766 fprintf(stderr, "read-tree: warning #16 detected\n");
767 show_stage_entry(stderr, "head ", stages[head_match]);
768 show_stage_entry(stderr, "remote ", stages[remote_match]);
771 if (head) { count += keep_entry(head, o); }
772 if (remote) { count += keep_entry(remote, o); }
779 * The rule is to "carry forward" what is in the index without losing
780 * information across a "fast forward", favoring a successful merge
781 * over a merge failure when it makes sense. For details of the
782 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
785 int twoway_merge(struct cache_entry **src,
786 struct unpack_trees_options *o)
788 struct cache_entry *current = src[0];
789 struct cache_entry *oldtree = src[1];
790 struct cache_entry *newtree = src[2];
792 if (o->merge_size != 2)
793 return error("Cannot do a twoway merge of %d trees",
796 if (oldtree == o->df_conflict_entry)
798 if (newtree == o->df_conflict_entry)
802 if ((!oldtree && !newtree) || /* 4 and 5 */
803 (!oldtree && newtree &&
804 same(current, newtree)) || /* 6 and 7 */
805 (oldtree && newtree &&
806 same(oldtree, newtree)) || /* 14 and 15 */
807 (oldtree && newtree &&
808 !same(oldtree, newtree) && /* 18 and 19 */
809 same(current, newtree))) {
810 return keep_entry(current, o);
812 else if (oldtree && !newtree && same(current, oldtree)) {
814 return deleted_entry(oldtree, current, o);
816 else if (oldtree && newtree &&
817 same(current, oldtree) && !same(current, newtree)) {
819 return merged_entry(newtree, current, o);
822 /* all other failures */
824 reject_merge(oldtree);
826 reject_merge(current);
828 reject_merge(newtree);
833 return merged_entry(newtree, current, o);
835 return deleted_entry(oldtree, current, o);
841 * Keep the index entries at stage0, collapse stage1 but make sure
842 * stage0 does not have anything there.
844 int bind_merge(struct cache_entry **src,
845 struct unpack_trees_options *o)
847 struct cache_entry *old = src[0];
848 struct cache_entry *a = src[1];
850 if (o->merge_size != 1)
851 return error("Cannot do a bind merge of %d trees\n",
854 die("Entry '%s' overlaps. Cannot bind.", a->name);
856 return keep_entry(old, o);
858 return merged_entry(a, NULL, o);
865 * - take the stat information from stage0, take the data from stage1
867 int oneway_merge(struct cache_entry **src,
868 struct unpack_trees_options *o)
870 struct cache_entry *old = src[0];
871 struct cache_entry *a = src[1];
873 if (o->merge_size != 1)
874 return error("Cannot do a oneway merge of %d trees",
878 return deleted_entry(old, old, o);
879 if (old && same(old, a)) {
882 if (lstat(old->name, &st) ||
883 ce_match_stat(old, &st, 1))
884 old->ce_flags |= htons(CE_UPDATE);
886 return keep_entry(old, o);
888 return merged_entry(a, old, o);