Convert fetch.c: process_tree() to raw tree walker
This leaves only the horrid code in builtin-read-tree.c using the old interface. Some day I will gather the strength to tackle that one too. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
f75e53edb3
commit
1bc995a392
24
fetch.c
24
fetch.c
@ -3,6 +3,7 @@
|
|||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
#include "commit.h"
|
#include "commit.h"
|
||||||
#include "tree.h"
|
#include "tree.h"
|
||||||
|
#include "tree-walk.h"
|
||||||
#include "tag.h"
|
#include "tag.h"
|
||||||
#include "blob.h"
|
#include "blob.h"
|
||||||
#include "refs.h"
|
#include "refs.h"
|
||||||
@ -36,27 +37,32 @@ static int process(struct object *obj);
|
|||||||
|
|
||||||
static int process_tree(struct tree *tree)
|
static int process_tree(struct tree *tree)
|
||||||
{
|
{
|
||||||
struct tree_entry_list *entry;
|
struct tree_desc desc;
|
||||||
|
|
||||||
if (parse_tree(tree))
|
if (parse_tree(tree))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
entry = create_tree_entry_list(tree);
|
desc.buf = tree->buffer;
|
||||||
while (entry) {
|
desc.size = tree->size;
|
||||||
struct tree_entry_list *next = entry->next;
|
while (desc.size) {
|
||||||
|
unsigned mode;
|
||||||
|
const char *name;
|
||||||
|
const unsigned char *sha1;
|
||||||
|
|
||||||
if (entry->directory) {
|
sha1 = tree_entry_extract(&desc, &name, &mode);
|
||||||
struct tree *tree = lookup_tree(entry->sha1);
|
update_tree_entry(&desc);
|
||||||
|
|
||||||
|
if (S_ISDIR(mode)) {
|
||||||
|
struct tree *tree = lookup_tree(sha1);
|
||||||
process_tree(tree);
|
process_tree(tree);
|
||||||
} else {
|
} else {
|
||||||
struct blob *blob = lookup_blob(entry->sha1);
|
struct blob *blob = lookup_blob(sha1);
|
||||||
process(&blob->object);
|
process(&blob->object);
|
||||||
}
|
}
|
||||||
free(entry);
|
|
||||||
entry = next;
|
|
||||||
}
|
}
|
||||||
free(tree->buffer);
|
free(tree->buffer);
|
||||||
tree->buffer = NULL;
|
tree->buffer = NULL;
|
||||||
|
tree->size = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user