2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
12 #include "cache-tree.h"
17 static int update = 0;
18 static int index_only = 0;
19 static int nontrivial_merge = 0;
20 static int trivial_merges_only = 0;
21 static int aggressive = 0;
22 static int verbose_update = 0;
23 static volatile int progress_update = 0;
25 static int head_idx = -1;
26 static int merge_size = 0;
28 static struct object_list *trees = NULL;
30 static struct cache_entry df_conflict_entry = {
33 static struct tree_entry_list df_conflict_list = {
35 .next = &df_conflict_list
38 typedef int (*merge_fn_t)(struct cache_entry **src);
40 static int entcmp(char *name1, int dir1, char *name2, int dir2)
42 int len1 = strlen(name1);
43 int len2 = strlen(name2);
44 int len = len1 < len2 ? len1 : len2;
45 int ret = memcmp(name1, name2, len);
55 ret = (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
61 static int unpack_trees_rec(struct tree_entry_list **posns, int len,
62 const char *base, merge_fn_t fn, int *indpos)
64 int baselen = strlen(base);
65 int src_size = len + 1;
72 struct tree_entry_list **subposns;
73 struct cache_entry **src;
79 /* Find the first name in the input. */
85 if (merge && *indpos < active_nr) {
86 /* This is a bit tricky: */
87 /* If the index has a subdirectory (with
88 * contents) as the first name, it'll get a
89 * filename like "foo/bar". But that's after
90 * "foo", so the entry in trees will get
91 * handled first, at which point we'll go into
92 * "foo", and deal with "bar" from the index,
93 * because the base will be "foo/". The only
94 * way we can actually have "foo/bar" first of
95 * all the things is if the trees don't
96 * contain "foo" at all, in which case we'll
97 * handle "foo/bar" without going into the
98 * directory, but that's fine (and will return
99 * an error anyway, with the added unknown
103 cache_name = active_cache[*indpos]->name;
104 if (strlen(cache_name) > baselen &&
105 !memcmp(cache_name, base, baselen)) {
106 cache_name += baselen;
115 printf("index %s\n", first);
117 for (i = 0; i < len; i++) {
118 if (!posns[i] || posns[i] == &df_conflict_list)
121 printf("%d %s\n", i + 1, posns[i]->name);
123 if (!first || entcmp(first, firstdir,
125 posns[i]->directory) > 0) {
126 first = posns[i]->name;
127 firstdir = posns[i]->directory;
130 /* No name means we're done */
134 pathlen = strlen(first);
135 ce_size = cache_entry_size(baselen + pathlen);
137 src = xcalloc(src_size, sizeof(struct cache_entry *));
139 subposns = xcalloc(len, sizeof(struct tree_list_entry *));
141 if (cache_name && !strcmp(cache_name, first)) {
143 src[0] = active_cache[*indpos];
144 remove_cache_entry_at(*indpos);
147 for (i = 0; i < len; i++) {
148 struct cache_entry *ce;
151 (posns[i] != &df_conflict_list &&
152 strcmp(first, posns[i]->name))) {
156 if (posns[i] == &df_conflict_list) {
157 src[i + merge] = &df_conflict_entry;
161 if (posns[i]->directory) {
163 parse_tree(posns[i]->item.tree);
164 subposns[i] = posns[i]->item.tree->entries;
165 posns[i] = posns[i]->next;
166 src[i + merge] = &df_conflict_entry;
172 else if (i + 1 < head_idx)
174 else if (i + 1 > head_idx)
179 ce = xcalloc(1, ce_size);
180 ce->ce_mode = create_ce_mode(posns[i]->mode);
181 ce->ce_flags = create_ce_flags(baselen + pathlen,
183 memcpy(ce->name, base, baselen);
184 memcpy(ce->name + baselen, first, pathlen + 1);
188 memcpy(ce->sha1, posns[i]->item.any->sha1, 20);
190 subposns[i] = &df_conflict_list;
191 posns[i] = posns[i]->next;
198 printf("%s:\n", first);
199 for (i = 0; i < src_size; i++) {
202 printf("%s\n", sha1_to_hex(src[i]->sha1));
210 printf("Added %d entries\n", ret);
214 for (i = 0; i < src_size; i++) {
216 add_cache_entry(src[i], ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
222 char *newbase = xmalloc(baselen + 2 + pathlen);
223 memcpy(newbase, base, baselen);
224 memcpy(newbase + baselen, first, pathlen);
225 newbase[baselen + pathlen] = '/';
226 newbase[baselen + pathlen + 1] = '\0';
227 if (unpack_trees_rec(subposns, len, newbase, fn,
237 static void reject_merge(struct cache_entry *ce)
239 die("Entry '%s' would be overwritten by merge. Cannot merge.",
243 /* Unlink the last component and attempt to remove leading
244 * directories, in case this unlink is the removal of the
245 * last entry in the directory -- empty directories are removed.
247 static void unlink_entry(char *name)
256 cp = strrchr(name, '/');
263 status = rmdir(name);
272 static void progress_interval(int signum)
277 static void setup_progress_signal(void)
282 memset(&sa, 0, sizeof(sa));
283 sa.sa_handler = progress_interval;
284 sigemptyset(&sa.sa_mask);
285 sa.sa_flags = SA_RESTART;
286 sigaction(SIGALRM, &sa, NULL);
288 v.it_interval.tv_sec = 1;
289 v.it_interval.tv_usec = 0;
290 v.it_value = v.it_interval;
291 setitimer(ITIMER_REAL, &v, NULL);
294 static void check_updates(struct cache_entry **src, int nr)
296 static struct checkout state = {
302 unsigned short mask = htons(CE_UPDATE);
303 unsigned last_percent = 200, cnt = 0, total = 0;
305 if (update && verbose_update) {
306 for (total = cnt = 0; cnt < nr; cnt++) {
307 struct cache_entry *ce = src[cnt];
308 if (!ce->ce_mode || ce->ce_flags & mask)
312 /* Don't bother doing this for very small updates */
317 fprintf(stderr, "Checking files out...\n");
318 setup_progress_signal();
325 struct cache_entry *ce = *src++;
328 if (!ce->ce_mode || ce->ce_flags & mask) {
331 percent = (cnt * 100) / total;
332 if (percent != last_percent ||
334 fprintf(stderr, "%4u%% (%u/%u) done\r",
335 percent, cnt, total);
336 last_percent = percent;
342 unlink_entry(ce->name);
345 if (ce->ce_flags & mask) {
346 ce->ce_flags &= ~mask;
348 checkout_entry(ce, &state, NULL);
352 signal(SIGALRM, SIG_IGN);
357 static int unpack_trees(merge_fn_t fn)
360 unsigned len = object_list_length(trees);
361 struct tree_entry_list **posns;
363 struct object_list *posn = trees;
367 posns = xmalloc(len * sizeof(struct tree_entry_list *));
368 for (i = 0; i < len; i++) {
369 posns[i] = ((struct tree *) posn->item)->entries;
372 if (unpack_trees_rec(posns, len, "", fn, &indpos))
376 if (trivial_merges_only && nontrivial_merge)
377 die("Merge requires file-level merging");
379 check_updates(active_cache, active_nr);
383 static int list_tree(unsigned char *sha1)
385 struct tree *tree = parse_tree_indirect(sha1);
388 object_list_append(&tree->object, &trees);
392 static int same(struct cache_entry *a, struct cache_entry *b)
398 return a->ce_mode == b->ce_mode &&
399 !memcmp(a->sha1, b->sha1, 20);
404 * When a CE gets turned into an unmerged entry, we
405 * want it to be up-to-date
407 static void verify_uptodate(struct cache_entry *ce)
414 if (!lstat(ce->name, &st)) {
415 unsigned changed = ce_match_stat(ce, &st, 1);
422 die("Entry '%s' not uptodate. Cannot merge.", ce->name);
425 static int merged_entry(struct cache_entry *merge, struct cache_entry *old)
427 merge->ce_flags |= htons(CE_UPDATE);
430 * See if we can re-use the old CE directly?
431 * That way we get the uptodate stat info.
433 * This also removes the UPDATE flag on
436 if (same(old, merge)) {
439 verify_uptodate(old);
442 merge->ce_flags &= ~htons(CE_STAGEMASK);
443 add_cache_entry(merge, ADD_CACHE_OK_TO_ADD);
447 static int deleted_entry(struct cache_entry *ce, struct cache_entry *old)
450 verify_uptodate(old);
452 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
456 static int keep_entry(struct cache_entry *ce)
458 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
463 static void show_stage_entry(FILE *o,
464 const char *label, const struct cache_entry *ce)
467 fprintf(o, "%s (missing)\n", label);
469 fprintf(o, "%s%06o %s %d\t%s\n",
472 sha1_to_hex(ce->sha1),
478 static int threeway_merge(struct cache_entry **stages)
480 struct cache_entry *index;
481 struct cache_entry *head;
482 struct cache_entry *remote = stages[head_idx + 1];
485 int remote_match = 0;
487 int df_conflict_head = 0;
488 int df_conflict_remote = 0;
490 int any_anc_missing = 0;
491 int no_anc_exists = 1;
494 for (i = 1; i < head_idx; i++) {
502 head = stages[head_idx];
504 if (head == &df_conflict_entry) {
505 df_conflict_head = 1;
509 if (remote == &df_conflict_entry) {
510 df_conflict_remote = 1;
514 /* First, if there's a #16 situation, note that to prevent #13
517 if (!same(remote, head)) {
518 for (i = 1; i < head_idx; i++) {
519 if (same(stages[i], head)) {
522 if (same(stages[i], remote)) {
528 /* We start with cases where the index is allowed to match
529 * something other than the head: #14(ALT) and #2ALT, where it
530 * is permitted to match the result instead.
532 /* #14, #14ALT, #2ALT */
533 if (remote && !df_conflict_head && head_match && !remote_match) {
534 if (index && !same(index, remote) && !same(index, head))
536 return merged_entry(remote, index);
539 * If we have an entry in the index cache, then we want to
540 * make sure that it matches head.
542 if (index && !same(index, head)) {
548 if (same(head, remote))
549 return merged_entry(head, index);
551 if (!df_conflict_remote && remote_match && !head_match)
552 return merged_entry(head, index);
556 if (!head && !remote && any_anc_missing)
559 /* Under the new "aggressive" rule, we resolve mostly trivial
560 * cases that we historically had git-merge-one-file resolve.
563 int head_deleted = !head && !df_conflict_head;
564 int remote_deleted = !remote && !df_conflict_remote;
567 * Deleted in one and unchanged in the other.
569 if ((head_deleted && remote_deleted) ||
570 (head_deleted && remote && remote_match) ||
571 (remote_deleted && head && head_match)) {
573 return deleted_entry(index, index);
577 * Added in both, identically.
579 if (no_anc_exists && head && remote && same(head, remote))
580 return merged_entry(head, index);
584 /* Below are "no merge" cases, which require that the index be
585 * up-to-date to avoid the files getting overwritten with
586 * conflict resolution files.
589 verify_uptodate(index);
592 nontrivial_merge = 1;
594 /* #2, #3, #4, #6, #7, #9, #11. */
596 if (!head_match || !remote_match) {
597 for (i = 1; i < head_idx; i++) {
599 keep_entry(stages[i]);
607 fprintf(stderr, "read-tree: warning #16 detected\n");
608 show_stage_entry(stderr, "head ", stages[head_match]);
609 show_stage_entry(stderr, "remote ", stages[remote_match]);
612 if (head) { count += keep_entry(head); }
613 if (remote) { count += keep_entry(remote); }
620 * The rule is to "carry forward" what is in the index without losing
621 * information across a "fast forward", favoring a successful merge
622 * over a merge failure when it makes sense. For details of the
623 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
626 static int twoway_merge(struct cache_entry **src)
628 struct cache_entry *current = src[0];
629 struct cache_entry *oldtree = src[1], *newtree = src[2];
632 return error("Cannot do a twoway merge of %d trees",
636 if ((!oldtree && !newtree) || /* 4 and 5 */
637 (!oldtree && newtree &&
638 same(current, newtree)) || /* 6 and 7 */
639 (oldtree && newtree &&
640 same(oldtree, newtree)) || /* 14 and 15 */
641 (oldtree && newtree &&
642 !same(oldtree, newtree) && /* 18 and 19*/
643 same(current, newtree))) {
644 return keep_entry(current);
646 else if (oldtree && !newtree && same(current, oldtree)) {
648 return deleted_entry(oldtree, current);
650 else if (oldtree && newtree &&
651 same(current, oldtree) && !same(current, newtree)) {
653 return merged_entry(newtree, current);
656 /* all other failures */
658 reject_merge(oldtree);
660 reject_merge(current);
662 reject_merge(newtree);
667 return merged_entry(newtree, current);
669 return deleted_entry(oldtree, current);
676 * - take the stat information from stage0, take the data from stage1
678 static int oneway_merge(struct cache_entry **src)
680 struct cache_entry *old = src[0];
681 struct cache_entry *a = src[1];
684 return error("Cannot do a oneway merge of %d trees",
689 if (old && same(old, a)) {
690 return keep_entry(old);
692 return merged_entry(a, NULL);
695 static int read_cache_unmerged(void)
698 struct cache_entry **dst;
703 for (i = 0; i < active_nr; i++) {
704 struct cache_entry *ce = active_cache[i];
713 active_nr -= deleted;
717 static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";
719 static struct cache_file cache_file;
721 int main(int argc, char **argv)
723 int i, newfd, reset, stage = 0;
724 unsigned char sha1[20];
725 merge_fn_t fn = NULL;
727 setup_git_directory();
728 git_config(git_default_config);
730 newfd = hold_index_file_for_update(&cache_file, get_index_file());
732 die("unable to create new cachefile");
734 git_config(git_default_config);
738 for (i = 1; i < argc; i++) {
739 const char *arg = argv[i];
741 /* "-u" means "update", meaning that a merge will update
744 if (!strcmp(arg, "-u")) {
749 if (!strcmp(arg, "-v")) {
754 /* "-i" means "index only", meaning that a merge will
755 * not even look at the working tree.
757 if (!strcmp(arg, "-i")) {
762 /* This differs from "-m" in that we'll silently ignore unmerged entries */
763 if (!strcmp(arg, "--reset")) {
765 usage(read_tree_usage);
769 read_cache_unmerged();
773 if (!strcmp(arg, "--trivial")) {
774 trivial_merges_only = 1;
778 if (!strcmp(arg, "--aggressive")) {
783 /* "-m" stands for "merge", meaning we start in stage 1 */
784 if (!strcmp(arg, "-m")) {
786 usage(read_tree_usage);
787 if (read_cache_unmerged())
788 die("you need to resolve your current index first");
794 /* using -u and -i at the same time makes no sense */
795 if (1 < index_only + update)
796 usage(read_tree_usage);
798 if (get_sha1(arg, sha1) < 0)
799 usage(read_tree_usage);
800 if (list_tree(sha1) < 0)
801 die("failed to unpack tree object %s", arg);
804 if ((update||index_only) && !merge)
805 usage(read_tree_usage);
809 die("just how do you expect me to merge %d trees?", stage-1);
826 head_idx = stage - 2;
832 cache_tree_free(&active_cache_tree);
833 if (write_cache(newfd, active_cache, active_nr) ||
834 commit_index_file(&cache_file))
835 die("unable to write new index file");