Merge pull request #2181 from anuraggup/hide_cb

Callback function to hide commit and its parents in revision walker

2 files changed, 29 insertions, 5 deletions

diff --git a/src/revwalk.c b/src/revwalk.c
index f037ee692..f0109360b 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -81,6 +81,9 @@ static int process_commit(git_revwalk *walk, git_commit_list_node *commit, int h
 {
 	int error;
 
+	if (!hide && walk->hide_cb)
+		hide = walk->hide_cb(&commit->oid, walk->hide_cb_payload);
+
 	if (hide && mark_uninteresting(commit) < 0)
 		return -1;
 
@@ -178,11 +181,6 @@ static int push_ref(git_revwalk *walk, const char *refname, int hide, int from_g
 	return push_commit(walk, &oid, hide, from_glob);
 }
 
-struct push_cb_data {
-	git_revwalk *walk;
-	int hide;
-};
-
 static int push_glob(git_revwalk *walk, const char *glob, int hide)
 {
 	int error = 0;
@@ -575,3 +573,25 @@ void git_revwalk_reset(git_revwalk *walk)
 	git_vector_clear(&walk->twos);
 }
 
+int git_revwalk_add_hide_cb(
+	git_revwalk *walk,
+	git_revwalk_hide_cb hide_cb,
+	void *payload)
+{
+	assert(walk);
+
+	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 revision walker.");
+		return -1;
+	}
+
+	walk->hide_cb = hide_cb;
+	walk->hide_cb_payload = payload;
+
+	return 0;
+}
+
diff --git a/src/revwalk.h b/src/revwalk.h
index a0ce1ae86..a0654f3e5 100644
--- a/src/revwalk.h
+++ b/src/revwalk.h
@@ -39,6 +39,10 @@ struct git_revwalk {
 	/* merge base calculation */
 	git_commit_list_node *one;
 	git_vector twos;
+
+	/* hide callback */
+	git_revwalk_hide_cb hide_cb;
+	void *hide_cb_payload;
 };
 
 git_commit_list_node *git_revwalk__commit_lookup(git_revwalk *walk, const git_oid *oid);