rugged 0.27.10 → 0.27.10.1

data/vendor/libgit2/src/revwalk.c

@@ -15,16 +15,17 @@
 #include "merge.h"
 #include "vector.h"
 
-static int get_revision(git_commit_list_node **out, git_revwalk *walk, git_commit_list **list);
-
 git_commit_list_node *git_revwalk__commit_lookup(
 	git_revwalk *walk, const git_oid *oid)
 {
 	git_commit_list_node *commit;
+	khiter_t pos;
+	int ret;
 
 	/* lookup and reserve space if not already present */
-	if ((commit = git_oidmap_get(walk->commits, oid)) != NULL)
-		return commit;
+	pos = git_oidmap_lookup_index(walk->commits, oid);
+	if (git_oidmap_valid_index(walk->commits, pos))
+		return git_oidmap_value_at(walk->commits, pos);
 
 	commit = git_commit_list_alloc_node(walk);
 	if (commit == NULL)
@@ -32,13 +33,14 @@ git_commit_list_node *git_revwalk__commit_lookup(
 
 	git_oid_cpy(&commit->oid, oid);
 
-	if ((git_oidmap_set(walk->commits, &commit->oid, commit)) < 0)
-		return NULL;
+	pos = git_oidmap_put(walk->commits, &commit->oid, &ret);
+	assert(ret != 0);
+	git_oidmap_set_value_at(walk->commits, pos, commit);
 
 	return commit;
 }
 
-int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_revwalk__push_options *opts)
+static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting, int from_glob)
 {
 	git_oid commit_id;
 	int error;
@@ -46,18 +48,18 @@ int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_re
 	git_commit_list_node *commit;
 	git_commit_list *list;
 
-	if ((error = git_object_lookup(&oobj, walk->repo, oid, GIT_OBJECT_ANY)) < 0)
+	if ((error = git_object_lookup(&oobj, walk->repo, oid, GIT_OBJ_ANY)) < 0)
 		return error;
 
-	error = git_object_peel(&obj, oobj, GIT_OBJECT_COMMIT);
+	error = git_object_peel(&obj, oobj, GIT_OBJ_COMMIT);
 	git_object_free(oobj);
 
 	if (error == GIT_ENOTFOUND || error == GIT_EINVALIDSPEC || error == GIT_EPEEL) {
 		/* If this comes from e.g. push_glob("tags"), ignore this */
-		if (opts->from_glob)
+		if (from_glob)
 			return 0;
 
-		git_error_set(GIT_ERROR_INVALID, "object is not a committish");
+		giterr_set(GITERR_INVALID, "object is not a committish");
 		return -1;
 	}
 	if (error < 0)
@@ -74,19 +76,15 @@ int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_re
 	if (commit->uninteresting)
 		return 0;
 
-	if (opts->uninteresting) {
-		walk->limited = 1;
+	if (uninteresting)
 		walk->did_hide = 1;
-	} else {
+	else
 		walk->did_push = 1;
-	}
 
-	commit->uninteresting = opts->uninteresting;
+	commit->uninteresting = uninteresting;
 	list = walk->user_input;
-	if ((opts->insert_by_date &&
-	    git_commit_list_insert_by_date(commit, &list) == NULL) ||
-	    git_commit_list_insert(commit, &list) == NULL) {
-		git_error_set_oom();
+	if (git_commit_list_insert(commit, &list) == NULL) {
+		giterr_set_oom();
 		return -1;
 	}
 
@@ -97,36 +95,29 @@ int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_re
 
 int git_revwalk_push(git_revwalk *walk, const git_oid *oid)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
-
 	assert(walk && oid);
-
-	return git_revwalk__push_commit(walk, oid, &opts);
+	return push_commit(walk, oid, 0, false);
 }
 
 
 int git_revwalk_hide(git_revwalk *walk, const git_oid *oid)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && oid);
-
-	opts.uninteresting = 1;
-	return git_revwalk__push_commit(walk, oid, &opts);
+	return push_commit(walk, oid, 1, false);
 }
 
-int git_revwalk__push_ref(git_revwalk *walk, const char *refname, const git_revwalk__push_options *opts)
+static int push_ref(git_revwalk *walk, const char *refname, int hide, int from_glob)
 {
 	git_oid oid;
 
 	if (git_reference_name_to_id(&oid, walk->repo, refname) < 0)
 		return -1;
 
-	return git_revwalk__push_commit(walk, &oid, opts);
+	return push_commit(walk, &oid, hide, from_glob);
 }
 
-int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwalk__push_options *given_opts)
+static int push_glob(git_revwalk *walk, const char *glob, int hide)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	int error = 0;
 	git_buf buf = GIT_BUF_INIT;
 	git_reference *ref;
@@ -135,15 +126,12 @@ int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwal
 
 	assert(walk && glob);
 
-	if (given_opts)
-		memcpy(&opts, given_opts, sizeof(opts));
-
 	/* refs/ is implied if not given in the glob */
 	if (git__prefixcmp(glob, GIT_REFS_DIR) != 0)
 		git_buf_joinpath(&buf, GIT_REFS_DIR, glob);
 	else
 		git_buf_puts(&buf, glob);
-	GIT_ERROR_CHECK_ALLOC_BUF(&buf);
+	GITERR_CHECK_ALLOC_BUF(&buf);
 
 	/* If no '?', '*' or '[' exist, we append '/ *' to the glob */
 	wildcard = strcspn(glob, "?*[");
@@ -153,9 +141,8 @@ int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwal
 	if ((error = git_reference_iterator_glob_new(&iter, walk->repo, buf.ptr)) < 0)
 		goto out;
 
-	opts.from_glob = true;
 	while ((error = git_reference_next(&ref, iter)) == 0) {
-		error = git_revwalk__push_ref(walk, git_reference_name(ref), &opts);
+		error = push_ref(walk, git_reference_name(ref), hide, true);
 		git_reference_free(ref);
 		if (error < 0)
 			break;
@@ -165,80 +152,58 @@ int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwal
 	if (error == GIT_ITEROVER)
 		error = 0;
 out:
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return error;
 }
 
 int git_revwalk_push_glob(git_revwalk *walk, const char *glob)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && glob);
-
-	return git_revwalk__push_glob(walk, glob, &opts);
+	return push_glob(walk, glob, 0);
 }
 
 int git_revwalk_hide_glob(git_revwalk *walk, const char *glob)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && glob);
-
-	opts.uninteresting = 1;
-	return git_revwalk__push_glob(walk, glob, &opts);
+	return push_glob(walk, glob, 1);
 }
 
 int git_revwalk_push_head(git_revwalk *walk)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk);
-
-	return git_revwalk__push_ref(walk, GIT_HEAD_FILE, &opts);
+	return push_ref(walk, GIT_HEAD_FILE, 0, false);
 }
 
 int git_revwalk_hide_head(git_revwalk *walk)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk);
-
-	opts.uninteresting = 1;
-	return git_revwalk__push_ref(walk, GIT_HEAD_FILE, &opts);
+	return push_ref(walk, GIT_HEAD_FILE, 1, false);
 }
 
 int git_revwalk_push_ref(git_revwalk *walk, const char *refname)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && refname);
-
-	return git_revwalk__push_ref(walk, refname, &opts);
+	return push_ref(walk, refname, 0, false);
 }
 
 int git_revwalk_push_range(git_revwalk *walk, const char *range)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	git_revspec revspec;
 	int error = 0;
 
 	if ((error = git_revparse(&revspec, walk->repo, range)))
 		return error;
 
-	if (!revspec.to) {
-		git_error_set(GIT_ERROR_INVALID, "invalid revspec: range not provided");
-		error = GIT_EINVALIDSPEC;
-		goto out;
-	}
-
 	if (revspec.flags & GIT_REVPARSE_MERGE_BASE) {
 		/* TODO: support "<commit>...<commit>" */
-		git_error_set(GIT_ERROR_INVALID, "symmetric differences not implemented in revwalk");
-		error = GIT_EINVALIDSPEC;
-		goto out;
+		giterr_set(GITERR_INVALID, "symmetric differences not implemented in revwalk");
+		return GIT_EINVALIDSPEC;
 	}
 
-	opts.uninteresting = 1;
-	if ((error = git_revwalk__push_commit(walk, git_object_id(revspec.from), &opts)))
+	if ((error = push_commit(walk, git_object_id(revspec.from), 1, false)))
 		goto out;
 
-	opts.uninteresting = 0;
-	error = git_revwalk__push_commit(walk, git_object_id(revspec.to), &opts);
+	error = push_commit(walk, git_object_id(revspec.to), 0, false);
 
 out:
 	git_object_free(revspec.from);
@@ -248,10 +213,8 @@ out:
 
 int git_revwalk_hide_ref(git_revwalk *walk, const char *refname)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && refname);
-	opts.uninteresting = 1;
-	return git_revwalk__push_ref(walk, refname, &opts);
+	return push_ref(walk, refname, 1, false);
 }
 
 static int revwalk_enqueue_timesort(git_revwalk *walk, git_commit_list_node *commit)
@@ -276,16 +239,15 @@ static int revwalk_next_timesort(git_commit_list_node **object_out, git_revwalk
 		}
 	}
 
-	git_error_clear();
+	giterr_clear();
 	return GIT_ITEROVER;
 }
 
 static int revwalk_next_unsorted(git_commit_list_node **object_out, git_revwalk *walk)
 {
-	int error;
 	git_commit_list_node *next;
 
-	while (!(error = get_revision(&next, walk, &walk->iterator_rand))) {
+	while ((next = git_commit_list_pop(&walk->iterator_rand)) != NULL) {
 		/* Some commits might become uninteresting after being added to the list */
 		if (!next->uninteresting) {
 			*object_out = next;
@@ -293,15 +255,15 @@ static int revwalk_next_unsorted(git_commit_list_node **object_out, git_revwalk
 		}
 	}
 
-	return error;
+	giterr_clear();
+	return GIT_ITEROVER;
 }
 
 static int revwalk_next_toposort(git_commit_list_node **object_out, git_revwalk *walk)
 {
-	int error;
 	git_commit_list_node *next;
 
-	while (!(error = get_revision(&next, walk, &walk->iterator_topo))) {
+	while ((next = git_commit_list_pop(&walk->iterator_topo)) != NULL) {
 		/* Some commits might become uninteresting after being added to the list */
 		if (!next->uninteresting) {
 			*object_out = next;
@@ -309,7 +271,8 @@ static int revwalk_next_toposort(git_commit_list_node **object_out, git_revwalk
 		}
 	}
 
-	return error;
+	giterr_clear();
+	return GIT_ITEROVER;
 }
 
 static int revwalk_next_reverse(git_commit_list_node **object_out, git_revwalk *walk)
@@ -465,8 +428,8 @@ static int limit_list(git_commit_list **out, git_revwalk *walk, git_commit_list
 			break;
 		}
 
-		if (walk->hide_cb && walk->hide_cb(&commit->oid, walk->hide_cb_payload))
-			continue;
+		if (!commit->uninteresting && walk->hide_cb && walk->hide_cb(&commit->oid, walk->hide_cb_payload))
+				continue;
 
 		time = commit->time;
 		p = &git_commit_list_insert(commit, p)->next;
@@ -477,30 +440,6 @@ static int limit_list(git_commit_list **out, git_revwalk *walk, git_commit_list
 	return 0;
 }
 
-static int get_revision(git_commit_list_node **out, git_revwalk *walk, git_commit_list **list)
-{
-	int error;
-	git_commit_list_node *commit;
-
-	commit = git_commit_list_pop(list);
-	if (!commit) {
-		git_error_clear();
-		return GIT_ITEROVER;
-	}
-
-	/*
-	 * If we did not run limit_list and we must add parents to the
-	 * list ourselves.
-	 */
-	if (!walk->limited) {
-		if ((error = add_parents_to_list(walk, commit, list)) < 0)
-			return error;
-	}
-
-	*out = commit;
-	return 0;
-}
-
 static int sort_in_topological_order(git_commit_list **out, git_revwalk *walk, git_commit_list *list)
 {
 	git_commit_list *ll = NULL, *newlist, **pptr;
@@ -595,7 +534,7 @@ static int prepare_walk(git_revwalk *walk)
 
 	/* If there were no pushes, we know that the walk is already over */
 	if (!walk->did_push) {
-		git_error_clear();
+		giterr_clear();
 		return GIT_ITEROVER;
 	}
 
@@ -613,7 +552,7 @@ static int prepare_walk(git_revwalk *walk)
 		}
 	}
 
-	if (walk->limited && (error = limit_list(&commits, walk, commits)) < 0)
+	if ((error = limit_list(&commits, walk, commits)) < 0)
 		return error;
 
 	if (walk->sorting & GIT_SORT_TOPOLOGICAL) {
@@ -657,10 +596,10 @@ static int prepare_walk(git_revwalk *walk)
 int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo)
 {
 	git_revwalk *walk = git__calloc(1, sizeof(git_revwalk));
-	GIT_ERROR_CHECK_ALLOC(walk);
+	GITERR_CHECK_ALLOC(walk);
 
-	if (git_oidmap_new(&walk->commits) < 0)
-		return -1;
+	walk->commits = git_oidmap_alloc();
+	GITERR_CHECK_ALLOC(walk->commits);
 
 	if (git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0)
 		return -1;
@@ -716,9 +655,6 @@ void git_revwalk_sorting(git_revwalk *walk, unsigned int sort_mode)
 		walk->get_next = &revwalk_next_unsorted;
 		walk->enqueue = &revwalk_enqueue_unsorted;
 	}
-
-	if (walk->sorting != GIT_SORT_NONE)
-		walk->limited = 1;
 }
 
 void git_revwalk_simplify_first_parent(git_revwalk *walk)
@@ -742,7 +678,7 @@ int git_revwalk_next(git_oid *oid, git_revwalk *walk)
 
 	if (error == GIT_ITEROVER) {
 		git_revwalk_reset(walk);
-		git_error_clear();
+		giterr_clear();
 		return GIT_ITEROVER;
 	}
 
@@ -774,9 +710,7 @@ void git_revwalk_reset(git_revwalk *walk)
 	git_commit_list_free(&walk->user_input);
 	walk->first_parent = 0;
 	walk->walking = 0;
-	walk->limited = 0;
 	walk->did_push = walk->did_hide = 0;
-	walk->sorting = GIT_SORT_NONE;
 }
 
 int git_revwalk_add_hide_cb(
@@ -789,12 +723,15 @@ int git_revwalk_add_hide_cb(
 	if (walk->walking)
 		git_revwalk_reset(walk);
 
+	if (walk->hide_cb) {
+		/* There is already a callback added */
+		giterr_set(GITERR_INVALID, "there is already a callback added to hide commits in revwalk");
+		return -1;
+	}
+
 	walk->hide_cb = hide_cb;
 	walk->hide_cb_payload = payload;
 
-	if (hide_cb)
-		walk->limited = 1;
-
 	return 0;
 }
 

data/vendor/libgit2/src/revwalk.h

@@ -36,8 +36,7 @@ struct git_revwalk {
 	unsigned walking:1,
 		first_parent: 1,
 		did_hide: 1,
-		did_push: 1,
-		limited: 1;
+		did_push: 1;
 	unsigned int sorting;
 
 	/* the pushes and hides */
@@ -50,24 +49,4 @@ struct git_revwalk {
 
 git_commit_list_node *git_revwalk__commit_lookup(git_revwalk *walk, const git_oid *oid);
 
-typedef struct {
-	int uninteresting;
-	int from_glob;
-	int insert_by_date;
-} git_revwalk__push_options;
-
-#define GIT_REVWALK__PUSH_OPTIONS_INIT { 0 }
-
-int git_revwalk__push_commit(git_revwalk *walk,
-	const git_oid *oid,
-	const git_revwalk__push_options *opts);
-
-int git_revwalk__push_ref(git_revwalk *walk,
-	const char *refname,
-	const git_revwalk__push_options *opts);
-
-int git_revwalk__push_glob(git_revwalk *walk,
-	const char *glob,
-	const git_revwalk__push_options *given_opts);
-
 #endif