proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revwalk: keep a single list of user inputs

Browse Source 
The old separation was due to the old merge-base finding, so it's no
longer necessary.
This commit is contained in:
Carlos Martín Nieto 2014-10-08 10:45:47 +02:00
parent 42835aa6b8
commit ad66bf88df
2 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/revwalk.c
View File

@ -116,6 +116,7 @@ static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting,
int error; int error;
git_object *obj, *oobj; git_object *obj, *oobj;
git_commit_list_node *commit; git_commit_list_node *commit;
git_commit_list *list;
if ((error = git_object_lookup(&oobj, walk->repo, oid, GIT_OBJ_ANY)) < 0) if ((error = git_object_lookup(&oobj, walk->repo, oid, GIT_OBJ_ANY)) < 0)
return error; return error;
@ -142,13 +143,14 @@ static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting,
return -1; /* error already reported by failed lookup */ return -1; /* error already reported by failed lookup */
commit->uninteresting = uninteresting; commit->uninteresting = uninteresting;
if (walk->one == NULL && !uninteresting) { list = walk->user_input;
walk->one = commit; if (git_commit_list_insert(commit, &list) == NULL) {
} else { giterr_set_oom();
if (git_vector_insert(&walk->twos, commit) < 0) return -1;
return -1;
} }
walk->user_input = list;
return 0; return 0;
} }
@ -369,25 +371,23 @@ static int revwalk_next_reverse(git_commit_list_node **object_out, git_revwalk *
static int prepare_walk(git_revwalk *walk) static int prepare_walk(git_revwalk *walk)
{ {
int error; int error, interesting = 0;
unsigned int i; git_commit_list *list;
git_commit_list_node *next, *two; git_commit_list_node *next;
/* for (list = walk->user_input; list; list = list->next) {
* If walk->one is NULL, there were no positive references, interesting += !list->item->uninteresting;
* so we know that the walk is already over. if (process_commit(walk, list->item, list->item->uninteresting) < 0)
*/ return -1;
if (walk->one == NULL) {
giterr_clear();
return GIT_ITEROVER;
} }
if (process_commit(walk, walk->one, walk->one->uninteresting) < 0)
return -1;
git_vector_foreach(&walk->twos, i, two) { /*
if (process_commit(walk, two, two->uninteresting) < 0) * If there were no pushes, we know that the walk is already over.
return -1; */
if (!interesting) {
giterr_clear();
return GIT_ITEROVER;
} }
if (walk->sorting & GIT_SORT_TOPOLOGICAL) { if (walk->sorting & GIT_SORT_TOPOLOGICAL) {
@ -440,7 +440,6 @@ int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo)
if (git_pqueue_init( if (git_pqueue_init(
&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0 || &walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0 ||
git_vector_init(&walk->twos, 4, NULL) < 0 ||
git_pool_init(&walk->commit_pool, 1, git_pool_init(&walk->commit_pool, 1,
git_pool__suggest_items_per_page(COMMIT_ALLOC) * COMMIT_ALLOC) < 0) git_pool__suggest_items_per_page(COMMIT_ALLOC) * COMMIT_ALLOC) < 0)
return -1; return -1;
@ -470,7 +469,6 @@ void git_revwalk_free(git_revwalk *walk)
git_oidmap_free(walk->commits); git_oidmap_free(walk->commits);
git_pool_clear(&walk->commit_pool); git_pool_clear(&walk->commit_pool);
git_pqueue_free(&walk->iterator_time); git_pqueue_free(&walk->iterator_time);
git_vector_free(&walk->twos);
git__free(walk); git__free(walk);
} }
@ -547,10 +545,8 @@ void git_revwalk_reset(git_revwalk *walk)
git_commit_list_free(&walk->iterator_topo); git_commit_list_free(&walk->iterator_topo);
git_commit_list_free(&walk->iterator_rand); git_commit_list_free(&walk->iterator_rand);
git_commit_list_free(&walk->iterator_reverse); git_commit_list_free(&walk->iterator_reverse);
git_commit_list_free(&walk->user_input);
walk->walking = 0; walk->walking = 0;
walk->one = NULL;
git_vector_clear(&walk->twos);
} }
int git_revwalk_add_hide_cb( int git_revwalk_add_hide_cb(

5
src/revwalk.h
View File

@ -35,9 +35,8 @@ struct git_revwalk {
first_parent: 1; first_parent: 1;
unsigned int sorting; unsigned int sorting;
/* merge base calculation */ /* the pushes and hides */
git_commit_list_node *one; git_commit_list *user_input;
git_vector twos;
/* hide callback */ /* hide callback */
git_revwalk_hide_cb hide_cb; git_revwalk_hide_cb hide_cb;