From: Junio C Hamano <junkio@cox.net>
Date: Wed, 31 May 2006 21:23:58 +0000 (-0700)
Subject: Merge branch 'lt/tree-2' into next
X-Git-Tag: v1.4.1-rc1~51
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/422dfaf079eec92ec75ef8f766d66404433ad0b1?hp=-c

Merge branch 'lt/tree-2' into next

* lt/tree-2:
tree_entry(): new tree-walking helper function
---

422dfaf079eec92ec75ef8f766d66404433ad0b1
diff --combined builtin-read-tree.c
index d70411f2af,10afd46968..0c6ba3d8a5
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@@ -24,7 -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;
@@@ -54,28 -53,23 +54,23 @@@ typedef int (*merge_fn_t)(struct cache_
  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;
@@@ -417,8 -411,7 +412,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;
  	}
  
@@@ -767,28 -760,6 +762,28 @@@ static int twoway_merge(struct cache_en
  		return deleted_entry(oldtree, current);
  }
  
 +/*
 + * 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.
   *
@@@ -804,10 -775,8 +799,10 @@@ static int oneway_merge(struct cache_en
  		return error("Cannot do a oneway merge of %d trees",
  			     merge_size);
  
 -	if (!a)
 +	if (!a) {
 +		invalidate_ce_path(old);
  		return deleted_entry(old, old);
 +	}
  	if (old && same(old, a)) {
  		if (reset) {
  			struct stat st;
@@@ -846,27 -815,22 +841,22 @@@ static int read_cache_unmerged(void
  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;
@@@ -885,7 -849,7 +875,7 @@@ 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;
  
@@@ -930,24 -894,9 +920,24 @@@ int cmd_read_tree(int argc, const char 
  			continue;
  		}
  
 +		/* "--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 */
  		if (!strcmp(arg, "--reset")) {
 -			if (stage || merge)
 +			if (stage || merge || prefix)
  				usage(read_tree_usage);
  			reset = 1;
  			merge = 1;
@@@ -968,7 -917,7 +958,7 @@@
  
  		/* "-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");
@@@ -990,31 -939,12 +980,31 @@@
  	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;
diff --combined fetch.c
index b03c2012ef,ec2d8c3d9b..e9347bafeb
--- a/fetch.c
+++ b/fetch.c
@@@ -9,7 -9,6 +9,7 @@@
  #include "refs.h"
  
  const char *write_ref = NULL;
 +const char *write_ref_log_details = NULL;
  
  int get_tree = 0;
  int get_history = 0;
@@@ -39,25 -38,19 +39,19 @@@ static int process(struct object *obj)
  static int process_tree(struct tree *tree)
  {
  	struct tree_desc desc;
+ 	struct name_entry entry;
  
  	if (parse_tree(tree))
  		return -1;
  
  	desc.buf = tree->buffer;
  	desc.size = tree->size;
- 	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)) {
- 			struct tree *tree = lookup_tree(sha1);
+ 	while (tree_entry(&desc, &entry)) {
+ 		if (S_ISDIR(entry.mode)) {
+ 			struct tree *tree = lookup_tree(entry.sha1);
  			process_tree(tree);
  		} else {
- 			struct blob *blob = lookup_blob(sha1);
+ 			struct blob *blob = lookup_blob(entry.sha1);
  			process(&blob->object);
  		}
  	}
@@@ -215,48 -208,23 +209,48 @@@ static int mark_complete(const char *pa
  
  int pull(char *target)
  {
 +	struct ref_lock *lock;
  	unsigned char sha1[20];
 +	char *msg;
 +	int ret;
  
  	save_commit_buffer = 0;
  	track_object_refs = 0;
 +	if (write_ref) {
 +		lock = lock_ref_sha1(write_ref, NULL, 0);
 +		if (!lock) {
 +			error("Can't lock ref %s", write_ref);
 +			return -1;
 +		}
 +	}
  
  	if (!get_recover)
  		for_each_ref(mark_complete);
  
 -	if (interpret_target(target, sha1))
 -		return error("Could not interpret %s as something to pull",
 -			     target);
 -	if (process(lookup_unknown_object(sha1)))
 +	if (interpret_target(target, sha1)) {
 +		error("Could not interpret %s as something to pull", target);
 +		unlock_ref(lock);
  		return -1;
 -	if (loop())
 +	}
 +	if (process(lookup_unknown_object(sha1))) {
 +		unlock_ref(lock);
  		return -1;
 -	
 -	if (write_ref)
 -		write_ref_sha1_unlocked(write_ref, sha1);
 +	}
 +	if (loop()) {
 +		unlock_ref(lock);
 +		return -1;
 +	}
 +
 +	if (write_ref) {
 +		if (write_ref_log_details) {
 +			msg = xmalloc(strlen(write_ref_log_details) + 12);
 +			sprintf(msg, "fetch from %s", write_ref_log_details);
 +		} else
 +			msg = NULL;
 +		ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)");
 +		if (msg)
 +			free(msg);
 +		return ret;
 +	}
  	return 0;
  }