kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/unavailable-can-be-missing' 

Code clean-up to turn history traversal more robust in a
semi-corrupt repository.

* jk/unavailable-can-be-missing:
  mark_parents_uninteresting(): avoid most allocation
  mark_parents_uninteresting(): replace list with stack
  mark_parents_uninteresting(): drop missing object check
  mark_tree_contents_uninteresting(): drop missing object check
maint
Junio C Hamano 2018-05-30 14:04:07 +09:00
parent 5da4847dcc 8702b30fd7
commit cf315793c1
1 changed files with 52 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
revision.c
View File

@ -52,12 +52,9 @@ static void mark_tree_contents_uninteresting(struct tree *tree)
{ {
struct tree_desc desc; struct tree_desc desc;
struct name_entry entry; struct name_entry entry;
struct object *obj = &tree->object;


if (!has_object_file(&obj->oid)) if (parse_tree_gently(tree, 1) < 0)
return; return;
if (parse_tree(tree) < 0)
die("bad tree %s", oid_to_hex(&obj->oid));


init_tree_desc(&desc, tree->buffer, tree->size); init_tree_desc(&desc, tree->buffer, tree->size);
while (tree_entry(&desc, &entry)) { while (tree_entry(&desc, &entry)) {
@ -95,32 +92,36 @@ void mark_tree_uninteresting(struct tree *tree)
mark_tree_contents_uninteresting(tree); mark_tree_contents_uninteresting(tree);
} }


void mark_parents_uninteresting(struct commit *commit) struct commit_stack {
struct commit **items;
size_t nr, alloc;
};
#define COMMIT_STACK_INIT { NULL, 0, 0 }

static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
{ {
struct commit_list *parents = NULL, *l; ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc);
stack->items[stack->nr++] = commit;
}


for (l = commit->parents; l; l = l->next) static struct commit *commit_stack_pop(struct commit_stack *stack)
commit_list_insert(l->item, &parents); {
return stack->nr ? stack->items[--stack->nr] : NULL;
}


while (parents) { static void commit_stack_clear(struct commit_stack *stack)
struct commit *commit = pop_commit(&parents); {
FREE_AND_NULL(stack->items);
stack->nr = stack->alloc = 0;
}


while (commit) { static void mark_one_parent_uninteresting(struct commit *commit,
/* struct commit_stack *pending)
* A missing commit is ok iff its parent is marked {
* uninteresting. struct commit_list *l;
*
* We just mark such a thing parsed, so that when
* it is popped next time around, we won't be trying
* to parse it and get an error.
*/
if (!commit->object.parsed &&
!has_object_file(&commit->object.oid))
commit->object.parsed = 1;


if (commit->object.flags & UNINTERESTING) if (commit->object.flags & UNINTERESTING)
break; return;

commit->object.flags |= UNINTERESTING; commit->object.flags |= UNINTERESTING;


/* /*
@ -131,14 +132,23 @@ void mark_parents_uninteresting(struct commit *commit)
* wasn't uninteresting), in which case we need * wasn't uninteresting), in which case we need
* to mark its parents recursively too.. * to mark its parents recursively too..
*/ */
if (!commit->parents) for (l = commit->parents; l; l = l->next)
break; commit_stack_push(pending, l->item);
}


for (l = commit->parents->next; l; l = l->next) void mark_parents_uninteresting(struct commit *commit)
commit_list_insert(l->item, &parents); {
commit = commit->parents->item; struct commit_stack pending = COMMIT_STACK_INIT;
} struct commit_list *l;
}
for (l = commit->parents; l; l = l->next)
mark_one_parent_uninteresting(l->item, &pending);

while (pending.nr > 0)
mark_one_parent_uninteresting(commit_stack_pop(&pending),
&pending);

commit_stack_clear(&pending);
} }


static void add_pending_object_with_path(struct rev_info *revs, static void add_pending_object_with_path(struct rev_info *revs,