 47957485b3
			
		
	
	47957485b3
	
	
	
		
			
			Simplify the signature of read_tree_recursive() to omit the "base",
"baselen" and "stage" arguments. No callers of it use these parameters
for anything anymore.
The last function to call read_tree_recursive() with a non-"" path was
read_tree_recursive() itself, but that was changed in
ffd31f661d (Reimplement read_tree_recursive() using
tree_entry_interesting(), 2011-03-25).
The last user of the "stage" parameter went away in the last commit,
and even that use was mere boilerplate.
So let's remove those and rename the read_tree_recursive() function to
just read_tree(). We had another read_tree() function that I've
refactored away in preceding commits, since all in-tree users read
trees recursively with a callback we can change the name to signify
that this is the norm.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
	
		
			
				
	
	
		
			158 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			158 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "cache.h"
 | |
| #include "cache-tree.h"
 | |
| #include "tree.h"
 | |
| #include "object-store.h"
 | |
| #include "blob.h"
 | |
| #include "commit.h"
 | |
| #include "tag.h"
 | |
| #include "alloc.h"
 | |
| #include "tree-walk.h"
 | |
| #include "repository.h"
 | |
| 
 | |
| const char *tree_type = "tree";
 | |
| 
 | |
| int read_tree_at(struct repository *r,
 | |
| 		 struct tree *tree, struct strbuf *base,
 | |
| 		 const struct pathspec *pathspec,
 | |
| 		 read_tree_fn_t fn, void *context)
 | |
| {
 | |
| 	struct tree_desc desc;
 | |
| 	struct name_entry entry;
 | |
| 	struct object_id oid;
 | |
| 	int len, oldlen = base->len;
 | |
| 	enum interesting retval = entry_not_interesting;
 | |
| 
 | |
| 	if (parse_tree(tree))
 | |
| 		return -1;
 | |
| 
 | |
| 	init_tree_desc(&desc, tree->buffer, tree->size);
 | |
| 
 | |
| 	while (tree_entry(&desc, &entry)) {
 | |
| 		if (retval != all_entries_interesting) {
 | |
| 			retval = tree_entry_interesting(r->index, &entry,
 | |
| 							base, 0, pathspec);
 | |
| 			if (retval == all_entries_not_interesting)
 | |
| 				break;
 | |
| 			if (retval == entry_not_interesting)
 | |
| 				continue;
 | |
| 		}
 | |
| 
 | |
| 		switch (fn(&entry.oid, base,
 | |
| 			   entry.path, entry.mode, context)) {
 | |
| 		case 0:
 | |
| 			continue;
 | |
| 		case READ_TREE_RECURSIVE:
 | |
| 			break;
 | |
| 		default:
 | |
| 			return -1;
 | |
| 		}
 | |
| 
 | |
| 		if (S_ISDIR(entry.mode))
 | |
| 			oidcpy(&oid, &entry.oid);
 | |
| 		else if (S_ISGITLINK(entry.mode)) {
 | |
| 			struct commit *commit;
 | |
| 
 | |
| 			commit = lookup_commit(r, &entry.oid);
 | |
| 			if (!commit)
 | |
| 				die("Commit %s in submodule path %s%s not found",
 | |
| 				    oid_to_hex(&entry.oid),
 | |
| 				    base->buf, entry.path);
 | |
| 
 | |
| 			if (parse_commit(commit))
 | |
| 				die("Invalid commit %s in submodule path %s%s",
 | |
| 				    oid_to_hex(&entry.oid),
 | |
| 				    base->buf, entry.path);
 | |
| 
 | |
| 			oidcpy(&oid, get_commit_tree_oid(commit));
 | |
| 		}
 | |
| 		else
 | |
| 			continue;
 | |
| 
 | |
| 		len = tree_entry_len(&entry);
 | |
| 		strbuf_add(base, entry.path, len);
 | |
| 		strbuf_addch(base, '/');
 | |
| 		retval = read_tree_at(r, lookup_tree(r, &oid),
 | |
| 				      base, pathspec,
 | |
| 				      fn, context);
 | |
| 		strbuf_setlen(base, oldlen);
 | |
| 		if (retval)
 | |
| 			return -1;
 | |
| 	}
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| int read_tree(struct repository *r,
 | |
| 	      struct tree *tree,
 | |
| 	      const struct pathspec *pathspec,
 | |
| 	      read_tree_fn_t fn, void *context)
 | |
| {
 | |
| 	struct strbuf sb = STRBUF_INIT;
 | |
| 	int ret = read_tree_at(r, tree, &sb, pathspec, fn, context);
 | |
| 	strbuf_release(&sb);
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| int cmp_cache_name_compare(const void *a_, const void *b_)
 | |
| {
 | |
| 	const struct cache_entry *ce1, *ce2;
 | |
| 
 | |
| 	ce1 = *((const struct cache_entry **)a_);
 | |
| 	ce2 = *((const struct cache_entry **)b_);
 | |
| 	return cache_name_stage_compare(ce1->name, ce1->ce_namelen, ce_stage(ce1),
 | |
| 				  ce2->name, ce2->ce_namelen, ce_stage(ce2));
 | |
| }
 | |
| 
 | |
| struct tree *lookup_tree(struct repository *r, const struct object_id *oid)
 | |
| {
 | |
| 	struct object *obj = lookup_object(r, oid);
 | |
| 	if (!obj)
 | |
| 		return create_object(r, oid, alloc_tree_node(r));
 | |
| 	return object_as_type(obj, OBJ_TREE, 0);
 | |
| }
 | |
| 
 | |
| int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
 | |
| {
 | |
| 	if (item->object.parsed)
 | |
| 		return 0;
 | |
| 	item->object.parsed = 1;
 | |
| 	item->buffer = buffer;
 | |
| 	item->size = size;
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| int parse_tree_gently(struct tree *item, int quiet_on_missing)
 | |
| {
 | |
| 	 enum object_type type;
 | |
| 	 void *buffer;
 | |
| 	 unsigned long size;
 | |
| 
 | |
| 	if (item->object.parsed)
 | |
| 		return 0;
 | |
| 	buffer = read_object_file(&item->object.oid, &type, &size);
 | |
| 	if (!buffer)
 | |
| 		return quiet_on_missing ? -1 :
 | |
| 			error("Could not read %s",
 | |
| 			     oid_to_hex(&item->object.oid));
 | |
| 	if (type != OBJ_TREE) {
 | |
| 		free(buffer);
 | |
| 		return error("Object %s not a tree",
 | |
| 			     oid_to_hex(&item->object.oid));
 | |
| 	}
 | |
| 	return parse_tree_buffer(item, buffer, size);
 | |
| }
 | |
| 
 | |
| void free_tree_buffer(struct tree *tree)
 | |
| {
 | |
| 	FREE_AND_NULL(tree->buffer);
 | |
| 	tree->size = 0;
 | |
| 	tree->object.parsed = 0;
 | |
| }
 | |
| 
 | |
| struct tree *parse_tree_indirect(const struct object_id *oid)
 | |
| {
 | |
| 	struct repository *r = the_repository;
 | |
| 	struct object *obj = parse_object(r, oid);
 | |
| 	return (struct tree *)repo_peel_to_type(r, NULL, 0, obj, OBJ_TREE);
 | |
| }
 |