Implement unified git_revparse

1 files changed, 58 insertions, 6 deletions

diff --git a/src/revparse.c b/src/revparse.c
index 2ba29383e..2ba42d8e3 100644
--- a/src/revparse.c
+++ b/src/revparse.c
@@ -107,7 +107,7 @@ static int build_regex(regex_t *regex, const char *pattern)
 	error = regcomp(regex, pattern, REG_EXTENDED);
 	if (!error)
 		return 0;
-	
+
 	error = giterr_set_regex(regex, error);
 
 	regfree(regex);
@@ -125,7 +125,7 @@ static int maybe_describe(git_object**out, git_repository *repo, const char *spe
 
 	if (substr == NULL)
 		return GIT_ENOTFOUND;
-	
+
 	if (build_regex(&regex, ".+-[0-9]+-g[0-9a-fA-F]+") < 0)
 		return -1;
 
@@ -358,7 +358,7 @@ static int retrieve_remote_tracking_reference(git_reference **base_ref, const ch
 
 	if ((error = git_branch_tracking(&tracking, ref)) < 0)
 		goto cleanup;
-	
+
 	*base_ref = tracking;
 
 cleanup:
@@ -508,7 +508,7 @@ static int walk_and_search(git_object **out, git_revwalk *walk, regex_t *regex)
 	int error;
 	git_oid oid;
 	git_object *obj;
-	
+
 	while (!(error = git_revwalk_next(&oid, walk))) {
 
 		error = git_object_lookup(&obj, git_revwalk_repository(walk), &oid, GIT_OBJ_COMMIT);
@@ -537,7 +537,7 @@ static int handle_grep_syntax(git_object **out, git_repository *repo, const git_
 
 	if ((error = build_regex(&preg, pattern)) < 0)
 		return error;
-		
+
 	if ((error = git_revwalk_new(&walk, repo)) < 0)
 		goto cleanup;
 
@@ -551,7 +551,7 @@ static int handle_grep_syntax(git_object **out, git_repository *repo, const git_
 			goto cleanup;
 
 	error = walk_and_search(out, walk, &preg);
-		
+
 cleanup:
 	regfree(&preg);
 	git_revwalk_free(walk);
@@ -892,3 +892,55 @@ int git_revparse_rangelike(git_object **left, git_object **right, int *threedots
 	git__free(revspec);
 	return error;
 }
+
+
+int git_revparse(
+  git_oid *left,
+  git_oid *right,
+  unsigned int *flags,
+  git_repository *repo,
+  const char *spec)
+{
+	unsigned int lflags = 0;
+	const char *dotdot;
+	int error = 0;
+	git_object *obj = NULL;
+
+	assert(left && repo && spec);
+
+	if ((dotdot = strstr(spec, "..")) != NULL) {
+		char *lstr;
+		const char *rstr;
+		lflags = GIT_REVPARSE_RANGE;
+
+		lstr = git__substrdup(spec, dotdot-spec);
+		rstr = dotdot + 2;
+		if (dotdot[2] == '.') {
+			lflags |= GIT_REVPARSE_MERGE_BASE;
+			rstr++;
+		}
+
+		if (!(error = git_revparse_single(&obj, repo, lstr))) {
+			git_oid_cpy(left, git_object_id(obj));
+			git_object_free(obj);
+		}
+		if (right && !(error = git_revparse_single(&obj, repo, rstr))) {
+			git_oid_cpy(right, git_object_id(obj));
+			git_object_free(obj);
+		}
+
+		git__free((void*)lstr);
+	} else {
+		lflags = GIT_REVPARSE_SINGLE;
+		if (!(error = git_revparse_single(&obj, repo, spec))) {
+			git_oid_cpy(left, git_object_id(obj));
+			git_object_free(obj);
+		}
+	}
+
+	if (flags)
+		*flags = lflags;
+
+	return error;
+}
+