diff options
author | Vicent Marti <tanoku@gmail.com> | 2013-04-15 23:40:46 +0200 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2013-04-15 23:40:46 +0200 |
commit | cbda09d00bb2aa703f90251b231c74d7acc6d21c (patch) | |
tree | 1d2de3612ef3ac970575b96b59200c3725e6a44d | |
parent | 36c2dfed696f80a20ca1352f32ec8b136b800c30 (diff) | |
download | libgit2-cbda09d00bb2aa703f90251b231c74d7acc6d21c.tar.gz |
git_revision -> git_revspec
-rw-r--r-- | include/git2/revparse.h | 4 | ||||
-rw-r--r-- | src/revparse.c | 18 | ||||
-rw-r--r-- | src/revwalk.c | 14 | ||||
-rw-r--r-- | tests-clar/refs/revparse.c | 28 |
4 files changed, 32 insertions, 32 deletions
diff --git a/include/git2/revparse.h b/include/git2/revparse.h index 3e334b4bb..c0479c353 100644 --- a/include/git2/revparse.h +++ b/include/git2/revparse.h @@ -53,7 +53,7 @@ typedef struct { git_object *from; git_object *to; unsigned int flags; -} git_revision; +} git_revspec; /** * Parse a revision string for left, right, and intent. See `man gitrevisions` or @@ -72,7 +72,7 @@ typedef struct { * @return 0 on success, GIT_INVALIDSPEC, GIT_ENOTFOUND, GIT_EAMBIGUOUS or an error code */ GIT_EXTERN(int) git_revparse( - git_revision *revision, + git_revspec *revspec, git_repository *repo, const char *spec); diff --git a/src/revparse.c b/src/revparse.c index a4fedd27c..74635ed04 100644 --- a/src/revparse.c +++ b/src/revparse.c @@ -870,41 +870,41 @@ cleanup: int git_revparse( - git_revision *revision, + git_revspec *revspec, git_repository *repo, const char *spec) { const char *dotdot; int error = 0; - assert(revision && repo && spec); + assert(revspec && repo && spec); - memset(revision, 0x0, sizeof(*revision)); + memset(revspec, 0x0, sizeof(*revspec)); if ((dotdot = strstr(spec, "..")) != NULL) { char *lstr; const char *rstr; - revision->flags = GIT_REVPARSE_RANGE; + revspec->flags = GIT_REVPARSE_RANGE; lstr = git__substrdup(spec, dotdot - spec); rstr = dotdot + 2; if (dotdot[2] == '.') { - revision->flags |= GIT_REVPARSE_MERGE_BASE; + revspec->flags |= GIT_REVPARSE_MERGE_BASE; rstr++; } - if ((error = git_revparse_single(&revision->from, repo, lstr)) < 0) { + if ((error = git_revparse_single(&revspec->from, repo, lstr)) < 0) { return error; } - if ((error = git_revparse_single(&revision->to, repo, rstr)) < 0) { + if ((error = git_revparse_single(&revspec->to, repo, rstr)) < 0) { return error; } git__free((void*)lstr); } else { - revision->flags = GIT_REVPARSE_SINGLE; - error = git_revparse_single(&revision->from, repo, spec); + revspec->flags = GIT_REVPARSE_SINGLE; + error = git_revparse_single(&revspec->from, repo, spec); } return error; diff --git a/src/revwalk.c b/src/revwalk.c index 9e32198fc..16f06624d 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -231,26 +231,26 @@ int git_revwalk_push_ref(git_revwalk *walk, const char *refname) int git_revwalk_push_range(git_revwalk *walk, const char *range) { - git_revision revision; + git_revspec revspec; int error = 0; - if ((error = git_revparse(&revision, walk->repo, range))) + if ((error = git_revparse(&revspec, walk->repo, range))) return error; - if (revision.flags & GIT_REVPARSE_MERGE_BASE) { + if (revspec.flags & GIT_REVPARSE_MERGE_BASE) { /* 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(revision.from), 1))) + if ((error = push_commit(walk, git_object_id(revspec.from), 1))) goto out; - error = push_commit(walk, git_object_id(revision.to), 0); + error = push_commit(walk, git_object_id(revspec.to), 0); out: - git_object_free(revision.from); - git_object_free(revision.to); + git_object_free(revspec.from); + git_object_free(revspec.to); return error; } diff --git a/tests-clar/refs/revparse.c b/tests-clar/refs/revparse.c index ad520067b..74472b175 100644 --- a/tests-clar/refs/revparse.c +++ b/tests-clar/refs/revparse.c @@ -34,28 +34,28 @@ static void test_id_inrepo( git_revparse_mode_t expected_flags, git_repository *repo) { - git_revision revision; - int error = git_revparse(&revision, repo, spec); + git_revspec revspec; + int error = git_revparse(&revspec, repo, spec); if (expected_left) { char str[64] = {0}; cl_assert_equal_i(0, error); - git_oid_fmt(str, git_object_id(revision.from)); + git_oid_fmt(str, git_object_id(revspec.from)); cl_assert_equal_s(str, expected_left); - git_object_free(revision.from); + git_object_free(revspec.from); } else { cl_assert_equal_i(GIT_ENOTFOUND, error); } if (expected_right) { char str[64] = {0}; - git_oid_fmt(str, git_object_id(revision.to)); + git_oid_fmt(str, git_object_id(revspec.to)); cl_assert_equal_s(str, expected_right); - git_object_free(revision.to); + git_object_free(revspec.to); } if (expected_flags) - cl_assert_equal_i(expected_flags, revision.flags); + cl_assert_equal_i(expected_flags, revspec.flags); } static void test_object(const char *spec, const char *expected_oid) @@ -69,23 +69,23 @@ static void test_rangelike(const char *rangelike, git_revparse_mode_t expected_revparseflags) { char objstr[64] = {0}; - git_revision revision; + git_revspec revspec; int error; - error = git_revparse(&revision, g_repo, rangelike); + error = git_revparse(&revspec, g_repo, rangelike); if (expected_left != NULL) { cl_assert_equal_i(0, error); - cl_assert_equal_i(revision.flags, expected_revparseflags); - git_oid_fmt(objstr, git_object_id(revision.from)); + cl_assert_equal_i(revspec.flags, expected_revparseflags); + git_oid_fmt(objstr, git_object_id(revspec.from)); cl_assert_equal_s(objstr, expected_left); - git_oid_fmt(objstr, git_object_id(revision.to)); + git_oid_fmt(objstr, git_object_id(revspec.to)); cl_assert_equal_s(objstr, expected_right); } else cl_assert(error != 0); - git_object_free(revision.from); - git_object_free(revision.to); + git_object_free(revspec.from); + git_object_free(revspec.to); } |