Convert "mark_tree_uninteresting()" to raw tree walker
Not very many users to go.. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
3bc1eca91e
commit
f75e53edb3
31
revision.c
31
revision.c
@ -53,8 +53,8 @@ static void mark_blob_uninteresting(struct blob *blob)
|
|||||||
|
|
||||||
void mark_tree_uninteresting(struct tree *tree)
|
void mark_tree_uninteresting(struct tree *tree)
|
||||||
{
|
{
|
||||||
|
struct tree_desc desc;
|
||||||
struct object *obj = &tree->object;
|
struct object *obj = &tree->object;
|
||||||
struct tree_entry_list *entry;
|
|
||||||
|
|
||||||
if (obj->flags & UNINTERESTING)
|
if (obj->flags & UNINTERESTING)
|
||||||
return;
|
return;
|
||||||
@ -63,16 +63,29 @@ void mark_tree_uninteresting(struct tree *tree)
|
|||||||
return;
|
return;
|
||||||
if (parse_tree(tree) < 0)
|
if (parse_tree(tree) < 0)
|
||||||
die("bad tree %s", sha1_to_hex(obj->sha1));
|
die("bad tree %s", sha1_to_hex(obj->sha1));
|
||||||
entry = create_tree_entry_list(tree);
|
|
||||||
while (entry) {
|
desc.buf = tree->buffer;
|
||||||
struct tree_entry_list *next = entry->next;
|
desc.size = tree->size;
|
||||||
if (entry->directory)
|
while (desc.size) {
|
||||||
mark_tree_uninteresting(lookup_tree(entry->sha1));
|
unsigned mode;
|
||||||
|
const char *name;
|
||||||
|
const unsigned char *sha1;
|
||||||
|
|
||||||
|
sha1 = tree_entry_extract(&desc, &name, &mode);
|
||||||
|
update_tree_entry(&desc);
|
||||||
|
|
||||||
|
if (S_ISDIR(mode))
|
||||||
|
mark_tree_uninteresting(lookup_tree(sha1));
|
||||||
else
|
else
|
||||||
mark_blob_uninteresting(lookup_blob(entry->sha1));
|
mark_blob_uninteresting(lookup_blob(sha1));
|
||||||
free(entry);
|
|
||||||
entry = next;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We don't care about the tree any more
|
||||||
|
* after it has been marked uninteresting.
|
||||||
|
*/
|
||||||
|
free(tree->buffer);
|
||||||
|
tree->buffer = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void mark_parents_uninteresting(struct commit *commit)
|
void mark_parents_uninteresting(struct commit *commit)
|
||||||
|
Reference in New Issue
Block a user