Merge remote-tracking branch 'gnprice/revwalk' into development

2 files changed, 50 insertions, 0 deletions

diff --git a/src/revparse.c b/src/revparse.c
index 1518a7c3c..2ba29383e 100644
--- a/src/revparse.c
+++ b/src/revparse.c
@@ -867,3 +867,28 @@ cleanup:
 	git_buf_free(&buf);
 	return error;
 }
+
+int git_revparse_rangelike(git_object **left, git_object **right, int *threedots, git_repository *repo, const char *rangelike)
+{
+	int error = 0;
+	const char *p, *q;
+	char *revspec;
+
+	p = strstr(rangelike, "..");
+	if (!p) {
+		giterr_set(GITERR_INVALID, "Malformed range (or rangelike syntax): %s", rangelike);
+		return GIT_EINVALIDSPEC;
+	} else if (p[2] == '.') {
+		*threedots = 1;
+		q = p + 3;
+	} else {
+		*threedots = 0;
+		q = p + 2;
+	}
+
+	revspec = git__substrdup(rangelike, p - rangelike);
+	error = (git_revparse_single(left, repo, revspec)
+	      || git_revparse_single(right, repo, q));
+	git__free(revspec);
+	return error;
+}
diff --git a/src/revwalk.c b/src/revwalk.c
index 02834ab36..c1071843b 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -11,6 +11,7 @@
 #include "pool.h"
 
 #include "revwalk.h"
+#include "git2/revparse.h"
 #include "merge.h"
 
 #include <regex.h>
@@ -228,6 +229,30 @@ int git_revwalk_push_ref(git_revwalk *walk, const char *refname)
 	return push_ref(walk, refname, 0);
 }
 
+int git_revwalk_push_range(git_revwalk *walk, const char *range)
+{
+	git_object *left, *right;
+	int threedots;
+	int error = 0;
+
+	if ((error = git_revparse_rangelike(&left, &right, &threedots, walk->repo, range)))
+		return error;
+	if (threedots) {
+		/* TODO: support "<commit>...<commit>" */
+		giterr_set(GITERR_INVALID, "Symmetric differences not implemented in revwalk");
+		return GIT_EINVALIDSPEC;
+	}
+
+	if ((error = push_commit(walk, git_object_id(left), 1)))
+		goto out;
+	error = push_commit(walk, git_object_id(right), 0);
+
+  out:
+	git_object_free(left);
+	git_object_free(right);
+	return error;
+}
+
 int git_revwalk_hide_ref(git_revwalk *walk, const char *refname)
 {
 	assert(walk && refname);