proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 22:39:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revwalk: remove a useless enqueueing phase for topological and default sorting

Browse Source 
After `limit_list()` we already have the list in time-sorted order, which is
what we want in the "default" case. Enqueueing into the "unsorted" list would
just reverse it, and the topological sort will do its own sorting if it needs
to.
This commit is contained in:
Carlos Martín Nieto 2016-10-05 12:23:26 +02:00
parent 4aed1b9a69
commit ea1ceb7f55
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/revwalk.c
View File

@ -443,9 +443,9 @@ static int limit_list(git_commit_list **out, git_revwalk *walk, git_commit_list
return 0; return 0;
} }
static int sort_in_topological_order(git_commit_list **out, git_revwalk *walk) static int sort_in_topological_order(git_commit_list **out, git_revwalk *walk, git_commit_list *list)
{ {
git_commit_list *list = NULL, *ll = NULL, *newlist, **pptr; git_commit_list *ll = NULL, *newlist, **pptr;
git_commit_list_node *next; git_commit_list_node *next;
git_pqueue queue; git_pqueue queue;
git_vector_cmp queue_cmp = NULL; git_vector_cmp queue_cmp = NULL;
@ -464,16 +464,10 @@ static int sort_in_topological_order(git_commit_list **out, git_revwalk *walk)
* store it in the commit list as we extract it from the lower * store it in the commit list as we extract it from the lower
* machinery. * machinery.
*/ */
while ((error = walk->get_next(&next, walk)) == 0) { for (ll = list; ll; ll = ll->next) {
next->in_degree = 1; ll->item->in_degree = 1;
git_commit_list_insert(next, &list);
} }
if (error != GIT_ITEROVER)
goto cleanup;
error = 0;
/* /*
* Count up how many children each commit has. We limit * Count up how many children each commit has. We limit
* ourselves to those commits in the original list (in-degree * ourselves to those commits in the original list (in-degree
@ -531,7 +525,6 @@ static int sort_in_topological_order(git_commit_list **out, git_revwalk *walk)
error = 0; error = 0;
cleanup: cleanup:
git_commit_list_free(&list);
git_pqueue_free(&queue); git_pqueue_free(&queue);
return error; return error;
} }
@ -562,26 +555,32 @@ static int prepare_walk(git_revwalk *walk)
} }
} }
for (list = commits; list; list = list->next) {
printf("%s: commit %s\n", __func__, git_oid_tostr_s(&list->item->oid));
}
if ((error = limit_list(&commits, walk, commits)) < 0) if ((error = limit_list(&commits, walk, commits)) < 0)
return error; return error;
for (list = commits; list; list = list->next) {
if (list->item->uninteresting)
continue;
if ((error = walk->enqueue(walk, list->item)) < 0) {
git_commit_list_free(&commits);
return error;
}
}
git_commit_list_free(&commits);
if (walk->sorting & GIT_SORT_TOPOLOGICAL) { if (walk->sorting & GIT_SORT_TOPOLOGICAL) {
if ((error = sort_in_topological_order(&walk->iterator_topo, walk))) error = sort_in_topological_order(&walk->iterator_topo, walk, commits);
git_commit_list_free(&commits);
if (error < 0)
return error; return error;
walk->get_next = &revwalk_next_toposort; walk->get_next = &revwalk_next_toposort;
} else if (walk->sorting & GIT_SORT_TIME) {
for (list = commits; list && !error; list = list->next)
error = walk->enqueue(walk, list->item);
git_commit_list_free(&commits);
if (error < 0)
return error;
} else {
walk->iterator_rand = commits;
walk->get_next = revwalk_next_unsorted;
} }
if (walk->sorting & GIT_SORT_REVERSE) { if (walk->sorting & GIT_SORT_REVERSE) {