X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-read-tree.c;h=04506da892c1bfb198c706e166efe8a2bf6cf1be;hb=HEAD;hp=00cdb5a6d9388c3a20e106c2047e7f6580b05ec6;hpb=15b5536ee47c6684806edd7725adbbdede9fb95c;p=git.git

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 00cdb5a6..04506da8 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -24,6 +24,7 @@ static int trivial_merges_only = 0;
 static int aggressive = 0;
 static int verbose_update = 0;
 static volatile int progress_update = 0;
+static const char *prefix = NULL;
 
 static int head_idx = -1;
 static int merge_size = 0;
@@ -53,28 +54,23 @@ typedef int (*merge_fn_t)(struct cache_entry **src);
 static struct tree_entry_list *create_tree_entry_list(struct tree *tree)
 {
 	struct tree_desc desc;
+	struct name_entry one;
 	struct tree_entry_list *ret = NULL;
 	struct tree_entry_list **list_p = &ret;
 
 	desc.buf = tree->buffer;
 	desc.size = tree->size;
 
-	while (desc.size) {
-		unsigned mode;
-		const char *path;
-		const unsigned char *sha1;
+	while (tree_entry(&desc, &one)) {
 		struct tree_entry_list *entry;
 
-		sha1 = tree_entry_extract(&desc, &path, &mode);
-		update_tree_entry(&desc);
-
 		entry = xmalloc(sizeof(struct tree_entry_list));
-		entry->name = path;
-		entry->sha1 = sha1;
-		entry->mode = mode;
-		entry->directory = S_ISDIR(mode) != 0;
-		entry->executable = (mode & S_IXUSR) != 0;
-		entry->symlink = S_ISLNK(mode) != 0;
+		entry->name = one.path;
+		entry->sha1 = one.sha1;
+		entry->mode = one.mode;
+		entry->directory = S_ISDIR(one.mode) != 0;
+		entry->executable = (one.mode & S_IXUSR) != 0;
+		entry->symlink = S_ISLNK(one.mode) != 0;
 		entry->next = NULL;
 
 		*list_p = entry;
@@ -381,6 +377,7 @@ static void check_updates(struct cache_entry **src, int nr)
 					fprintf(stderr, "%4u%% (%u/%u) done\r",
 						percent, cnt, total);
 					last_percent = percent;
+					progress_update = 0;
 				}
 			}
 		}
@@ -416,7 +413,8 @@ static int unpack_trees(merge_fn_t fn)
 			posns[i] = create_tree_entry_list((struct tree *) posn->item);
 			posn = posn->next;
 		}
-		if (unpack_trees_rec(posns, len, "", fn, &indpos))
+		if (unpack_trees_rec(posns, len, prefix ? prefix : "",
+				     fn, &indpos))
 			return -1;
 	}
 
@@ -766,6 +764,28 @@ static int twoway_merge(struct cache_entry **src)
 }
 
 /*
+ * Bind merge.
+ *
+ * Keep the index entries at stage0, collapse stage1 but make sure
+ * stage0 does not have anything there.
+ */
+static int bind_merge(struct cache_entry **src)
+{
+	struct cache_entry *old = src[0];
+	struct cache_entry *a = src[1];
+
+	if (merge_size != 1)
+		return error("Cannot do a bind merge of %d trees\n",
+			     merge_size);
+	if (a && old)
+		die("Entry '%s' overlaps.  Cannot bind.", a->name);
+	if (!a)
+		return keep_entry(old);
+	else
+		return merged_entry(a, NULL);
+}
+
+/*
  * One-way merge.
  *
  * The rule is:
@@ -796,51 +816,47 @@ static int oneway_merge(struct cache_entry **src)
 
 static int read_cache_unmerged(void)
 {
-	int i, deleted;
+	int i;
 	struct cache_entry **dst;
+	struct cache_entry *last = NULL;
 
 	read_cache();
 	dst = active_cache;
-	deleted = 0;
 	for (i = 0; i < active_nr; i++) {
 		struct cache_entry *ce = active_cache[i];
 		if (ce_stage(ce)) {
-			deleted++;
+			if (last && !strcmp(ce->name, last->name))
+				continue;
 			invalidate_ce_path(ce);
-			continue;
+			last = ce;
+			ce->ce_mode = 0;
+			ce->ce_flags &= ~htons(CE_STAGEMASK);
 		}
-		if (deleted)
-			*dst = ce;
-		dst++;
+		*dst++ = ce;
 	}
-	active_nr -= deleted;
-	return deleted;
+	active_nr = dst - active_cache;
+	return !!last;
 }
 
 static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
 {
 	struct tree_desc desc;
+	struct name_entry entry;
 	int cnt;
 
 	memcpy(it->sha1, tree->object.sha1, 20);
 	desc.buf = tree->buffer;
 	desc.size = tree->size;
 	cnt = 0;
-	while (desc.size) {
-		unsigned mode;
-		const char *name;
-		const unsigned char *sha1;
-
-		sha1 = tree_entry_extract(&desc, &name, &mode);
-		update_tree_entry(&desc);
-		if (!S_ISDIR(mode))
+	while (tree_entry(&desc, &entry)) {
+		if (!S_ISDIR(entry.mode))
 			cnt++;
 		else {
 			struct cache_tree_sub *sub;
-			struct tree *subtree = lookup_tree(sha1);
+			struct tree *subtree = lookup_tree(entry.sha1);
 			if (!subtree->object.parsed)
 				parse_tree(subtree);
-			sub = cache_tree_sub(it, name);
+			sub = cache_tree_sub(it, entry.path);
 			sub->cache_tree = cache_tree();
 			prime_cache_tree_rec(sub->cache_tree, subtree);
 			cnt += sub->cache_tree->entry_count;
@@ -859,9 +875,9 @@ static void prime_cache_tree(void)
 
 }
 
-static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";
+static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] <sha1> [<sha2> [<sha3>]])";
 
-static struct cache_file cache_file;
+static struct lock_file lock_file;
 
 int cmd_read_tree(int argc, const char **argv, char **envp)
 {
@@ -872,9 +888,9 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
 	setup_git_directory();
 	git_config(git_default_config);
 
-	newfd = hold_index_file_for_update(&cache_file, get_index_file());
+	newfd = hold_lock_file_for_update(&lock_file, get_index_file());
 	if (newfd < 0)
-		die("unable to create new cachefile");
+		die("unable to create new index file");
 
 	git_config(git_default_config);
 
@@ -904,9 +920,27 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
 			continue;
 		}
 
-		/* This differs from "-m" in that we'll silently ignore unmerged entries */
+		/* "--prefix=<subdirectory>/" means keep the current index
+		 *  entries and put the entries from the tree under the
+		 * given subdirectory.
+		 */
+		if (!strncmp(arg, "--prefix=", 9)) {
+			if (stage || merge || prefix)
+				usage(read_tree_usage);
+			prefix = arg + 9;
+			merge = 1;
+			stage = 1;
+			if (read_cache_unmerged())
+				die("you need to resolve your current index first");
+			continue;
+		}
+
+		/* This differs from "-m" in that we'll silently ignore
+		 * unmerged entries and overwrite working tree files that
+		 * correspond to them.
+		 */
 		if (!strcmp(arg, "--reset")) {
-			if (stage || merge)
+			if (stage || merge || prefix)
 				usage(read_tree_usage);
 			reset = 1;
 			merge = 1;
@@ -927,7 +961,7 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
 
 		/* "-m" stands for "merge", meaning we start in stage 1 */
 		if (!strcmp(arg, "-m")) {
-			if (stage || merge)
+			if (stage || merge || prefix)
 				usage(read_tree_usage);
 			if (read_cache_unmerged())
 				die("you need to resolve your current index first");
@@ -949,12 +983,31 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
 	if ((update||index_only) && !merge)
 		usage(read_tree_usage);
 
+	if (prefix) {
+		int pfxlen = strlen(prefix);
+		int pos;
+		if (prefix[pfxlen-1] != '/')
+			die("prefix must end with /");
+		if (stage != 2)
+			die("binding merge takes only one tree");
+		pos = cache_name_pos(prefix, pfxlen);
+		if (0 <= pos)
+			die("corrupt index file");
+		pos = -pos-1;
+		if (pos < active_nr &&
+		    !strncmp(active_cache[pos]->name, prefix, pfxlen))
+			die("subdirectory '%s' already exists.", prefix);
+		pos = cache_name_pos(prefix, pfxlen-1);
+		if (0 <= pos)
+			die("file '%.*s' already exists.", pfxlen-1, prefix);
+	}
+
 	if (merge) {
 		if (stage < 2)
 			die("just how do you expect me to merge %d trees?", stage-1);
 		switch (stage - 1) {
 		case 1:
-			fn = oneway_merge;
+			fn = prefix ? bind_merge : oneway_merge;
 			break;
 		case 2:
 			fn = twoway_merge;
@@ -980,13 +1033,13 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
 	 * valid cache-tree because the index must match exactly
 	 * what came from the tree.
 	 */
-	if (trees && trees->item && (!merge || (stage == 2))) {
+	if (trees && trees->item && !prefix && (!merge || (stage == 2))) {
 		cache_tree_free(&active_cache_tree);
 		prime_cache_tree();
 	}
 
 	if (write_cache(newfd, active_cache, active_nr) ||
-	    commit_index_file(&cache_file))
+	    commit_lock_file(&lock_file))
 		die("unable to write new index file");
 	return 0;
 }