Commit 06b9d915901b3dd9dc85016bb000e631eb1da1d7
2012-02-28T02:19:57
revwalk: allow pushing/hiding a reference by name The code was already there, so factor it out and let users push an OID by giving it a reference name. Only refs to commits are supported. Annotated tags will throw an error.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158
diff --git a/include/git2/revwalk.h b/include/git2/revwalk.h
index e7ec2ab..632c675 100644
--- a/include/git2/revwalk.h
+++ b/include/git2/revwalk.h
@@ -164,6 +164,28 @@ GIT_EXTERN(int) git_revwalk_hide_glob(git_revwalk *walk, const char *glob);
GIT_EXTERN(int) git_revwalk_hide_head(git_revwalk *walk);
/**
+ * Push the OID pointed to by a reference
+ *
+ * The reference must point to a commit.
+ *
+ * @param walk the walker being used for the traversal
+ * @param refname the referece to push
+ * @return GIT_SUCCESS or an error code
+ */
+GIT_EXTERN(int) git_revwalk_push_ref(git_revwalk *walk, const char *refname);
+
+/**
+ * Hide the OID pointed to by a reference
+ *
+ * The reference must point to a commit.
+ *
+ * @param walk the walker being used for the traversal
+ * @param refname the referece to hide
+ * @return GIT_SUCCESS or an error code
+ */
+GIT_EXTERN(int) git_revwalk_hide_ref(git_revwalk *walk, const char *refname);
+
+/**
* Get the next commit from the revision walk.
*
* The initial call to this method is *not* blocking when
diff --git a/src/revwalk.c b/src/revwalk.c
index ffa0be6..1a398ce 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -310,6 +310,23 @@ int git_revwalk_hide(git_revwalk *walk, const git_oid *oid)
return push_commit(walk, oid, 1);
}
+static int push_ref(git_revwalk *walk, const char *refname, int hide)
+{
+ git_reference *ref, *resolved;
+ int error;
+
+ error = git_reference_lookup(&ref, walk->repo, refname);
+ if (error < GIT_SUCCESS)
+ return error;
+ error = git_reference_resolve(&resolved, ref);
+ git_reference_free(ref);
+ if (error < GIT_SUCCESS)
+ return error;
+ error = push_commit(walk, git_reference_oid(resolved), hide);
+ git_reference_free(resolved);
+ return error;
+}
+
struct push_cb_data {
git_revwalk *walk;
const char *glob;
@@ -320,21 +337,8 @@ static int push_glob_cb(const char *refname, void *data_)
{
struct push_cb_data *data = (struct push_cb_data *)data_;
- if (!git__fnmatch(data->glob, refname, 0)) {
- git_reference *ref, *resolved;
- int error;
-
- error = git_reference_lookup(&ref, data->walk->repo, refname);
- if (error < GIT_SUCCESS)
- return error;
- error = git_reference_resolve(&resolved, ref);
- git_reference_free(ref);
- if (error < GIT_SUCCESS)
- return error;
- error = push_commit(data->walk, git_reference_oid(resolved), data->hide);
- git_reference_free(resolved);
- return error;
- }
+ if (!git__fnmatch(data->glob, refname, 0))
+ return push_ref(data->walk, refname, data->hide);
return GIT_SUCCESS;
}
@@ -394,37 +398,28 @@ int git_revwalk_hide_glob(git_revwalk *walk, const char *glob)
return push_glob(walk, glob, 1);
}
-static int push_head(git_revwalk *walk, int hide)
-{
- git_reference *ref, *resolved;
- int error;
-
- error = git_reference_lookup(&ref, walk->repo, "HEAD");
- if (error < GIT_SUCCESS) {
- return error;
- }
- error = git_reference_resolve(&resolved, ref);
- if (error < GIT_SUCCESS) {
- return error;
- }
- git_reference_free(ref);
-
- error = push_commit(walk, git_reference_oid(resolved), hide);
-
- git_reference_free(resolved);
- return error;
-}
-
int git_revwalk_push_head(git_revwalk *walk)
{
assert(walk);
- return push_head(walk, 0);
+ return push_ref(walk, GIT_HEAD_FILE, 0);
}
int git_revwalk_hide_head(git_revwalk *walk)
{
assert(walk);
- return push_head(walk, 1);
+ return push_ref(walk, GIT_HEAD_FILE, 1);
+}
+
+int git_revwalk_push_ref(git_revwalk *walk, const char *refname)
+{
+ assert(walk && refname);
+ return push_ref(walk, refname, 0);
+}
+
+int git_revwalk_hide_ref(git_revwalk *walk, const char *refname)
+{
+ assert(walk && refname);
+ return push_ref(walk, refname, 1);
}
static int revwalk_enqueue_timesort(git_revwalk *walk, commit_object *commit)
diff --git a/tests-clar/revwalk/basic.c b/tests-clar/revwalk/basic.c
index cc88ec6..a364d82 100644
--- a/tests-clar/revwalk/basic.c
+++ b/tests-clar/revwalk/basic.c
@@ -148,14 +148,13 @@ void test_revwalk_basic__push_head(void)
cl_assert(i == 7);
}
-void test_revwalk_basic__push_head_hide_glob(void)
+void test_revwalk_basic__push_head_hide_ref(void)
{
int i = 0;
git_oid oid;
cl_git_pass(git_revwalk_push_head(_walk));
- /* This is a hack, as we know this will only match the packed-test branch */
- cl_git_pass(git_revwalk_hide_glob(_walk, "heads/packed-test*"));
+ cl_git_pass(git_revwalk_hide_ref(_walk, "refs/heads/packed-test"));
while (git_revwalk_next(&oid, _walk) == GIT_SUCCESS) {
i++;