Merge pull request #5195 from tiennou/fix/commitish-smart-push smart: use push_glob instead of manual filtering
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 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415
diff --git a/src/revwalk.c b/src/revwalk.c
index 935bd4d..6f49bf2 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -38,7 +38,7 @@ git_commit_list_node *git_revwalk__commit_lookup(
return commit;
}
-static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting, int from_glob)
+int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_revwalk__push_options *opts)
{
git_oid commit_id;
int error;
@@ -54,7 +54,7 @@ static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting,
if (error == GIT_ENOTFOUND || error == GIT_EINVALIDSPEC || error == GIT_EPEEL) {
/* If this comes from e.g. push_glob("tags"), ignore this */
- if (from_glob)
+ if (opts->from_glob)
return 0;
git_error_set(GIT_ERROR_INVALID, "object is not a committish");
@@ -74,16 +74,18 @@ static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting,
if (commit->uninteresting)
return 0;
- if (uninteresting) {
+ if (opts->uninteresting) {
walk->limited = 1;
walk->did_hide = 1;
} else {
walk->did_push = 1;
}
- commit->uninteresting = uninteresting;
+ commit->uninteresting = opts->uninteresting;
list = walk->user_input;
- if (git_commit_list_insert(commit, &list) == NULL) {
+ if ((opts->insert_by_date &&
+ git_commit_list_insert_by_date(commit, &list) == NULL) ||
+ git_commit_list_insert(commit, &list) == NULL) {
git_error_set_oom();
return -1;
}
@@ -95,29 +97,36 @@ static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting,
int git_revwalk_push(git_revwalk *walk, const git_oid *oid)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
+
assert(walk && oid);
- return push_commit(walk, oid, 0, false);
+
+ return git_revwalk__push_commit(walk, oid, &opts);
}
int git_revwalk_hide(git_revwalk *walk, const git_oid *oid)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
assert(walk && oid);
- return push_commit(walk, oid, 1, false);
+
+ opts.uninteresting = 1;
+ return git_revwalk__push_commit(walk, oid, &opts);
}
-static int push_ref(git_revwalk *walk, const char *refname, int hide, int from_glob)
+int git_revwalk__push_ref(git_revwalk *walk, const char *refname, const git_revwalk__push_options *opts)
{
git_oid oid;
if (git_reference_name_to_id(&oid, walk->repo, refname) < 0)
return -1;
- return push_commit(walk, &oid, hide, from_glob);
+ return git_revwalk__push_commit(walk, &oid, opts);
}
-static int push_glob(git_revwalk *walk, const char *glob, int hide)
+int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwalk__push_options *given_opts)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
int error = 0;
git_buf buf = GIT_BUF_INIT;
git_reference *ref;
@@ -126,6 +135,9 @@ static int push_glob(git_revwalk *walk, const char *glob, int hide)
assert(walk && glob);
+ if (given_opts)
+ memcpy(&opts, given_opts, sizeof(opts));
+
/* refs/ is implied if not given in the glob */
if (git__prefixcmp(glob, GIT_REFS_DIR) != 0)
git_buf_joinpath(&buf, GIT_REFS_DIR, glob);
@@ -141,8 +153,9 @@ static int push_glob(git_revwalk *walk, const char *glob, int hide)
if ((error = git_reference_iterator_glob_new(&iter, walk->repo, buf.ptr)) < 0)
goto out;
+ opts.from_glob = true;
while ((error = git_reference_next(&ref, iter)) == 0) {
- error = push_ref(walk, git_reference_name(ref), hide, true);
+ error = git_revwalk__push_ref(walk, git_reference_name(ref), &opts);
git_reference_free(ref);
if (error < 0)
break;
@@ -158,36 +171,49 @@ out:
int git_revwalk_push_glob(git_revwalk *walk, const char *glob)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
assert(walk && glob);
- return push_glob(walk, glob, 0);
+
+ return git_revwalk__push_glob(walk, glob, &opts);
}
int git_revwalk_hide_glob(git_revwalk *walk, const char *glob)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
assert(walk && glob);
- return push_glob(walk, glob, 1);
+
+ opts.uninteresting = 1;
+ return git_revwalk__push_glob(walk, glob, &opts);
}
int git_revwalk_push_head(git_revwalk *walk)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
assert(walk);
- return push_ref(walk, GIT_HEAD_FILE, 0, false);
+
+ return git_revwalk__push_ref(walk, GIT_HEAD_FILE, &opts);
}
int git_revwalk_hide_head(git_revwalk *walk)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
assert(walk);
- return push_ref(walk, GIT_HEAD_FILE, 1, false);
+
+ opts.uninteresting = 1;
+ return git_revwalk__push_ref(walk, GIT_HEAD_FILE, &opts);
}
int git_revwalk_push_ref(git_revwalk *walk, const char *refname)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
assert(walk && refname);
- return push_ref(walk, refname, 0, false);
+
+ return git_revwalk__push_ref(walk, refname, &opts);
}
int git_revwalk_push_range(git_revwalk *walk, const char *range)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
git_revspec revspec;
int error = 0;
@@ -207,10 +233,12 @@ int git_revwalk_push_range(git_revwalk *walk, const char *range)
goto out;
}
- if ((error = push_commit(walk, git_object_id(revspec.from), 1, false)))
+ opts.uninteresting = 1;
+ if ((error = git_revwalk__push_commit(walk, git_object_id(revspec.from), &opts)))
goto out;
- error = push_commit(walk, git_object_id(revspec.to), 0, false);
+ opts.uninteresting = 0;
+ error = git_revwalk__push_commit(walk, git_object_id(revspec.to), &opts);
out:
git_object_free(revspec.from);
@@ -220,8 +248,10 @@ out:
int git_revwalk_hide_ref(git_revwalk *walk, const char *refname)
{
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
assert(walk && refname);
- return push_ref(walk, refname, 1, false);
+ opts.uninteresting = 1;
+ return git_revwalk__push_ref(walk, refname, &opts);
}
static int revwalk_enqueue_timesort(git_revwalk *walk, git_commit_list_node *commit)
diff --git a/src/revwalk.h b/src/revwalk.h
index 923a2bc..94b8a6f 100644
--- a/src/revwalk.h
+++ b/src/revwalk.h
@@ -50,4 +50,24 @@ struct git_revwalk {
git_commit_list_node *git_revwalk__commit_lookup(git_revwalk *walk, const git_oid *oid);
+typedef struct {
+ int uninteresting;
+ int from_glob;
+ int insert_by_date;
+} git_revwalk__push_options;
+
+#define GIT_REVWALK__PUSH_OPTIONS_INIT { 0 }
+
+int git_revwalk__push_commit(git_revwalk *walk,
+ const git_oid *oid,
+ const git_revwalk__push_options *opts);
+
+int git_revwalk__push_ref(git_revwalk *walk,
+ const char *refname,
+ const git_revwalk__push_options *opts);
+
+int git_revwalk__push_glob(git_revwalk *walk,
+ const char *glob,
+ const git_revwalk__push_options *given_opts);
+
#endif
diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c
index cfbe7e4..87400bb 100644
--- a/src/transports/smart_protocol.c
+++ b/src/transports/smart_protocol.c
@@ -17,6 +17,7 @@
#include "pack-objects.h"
#include "remote.h"
#include "util.h"
+#include "revwalk.h"
#define NETWORK_XFER_THRESHOLD (100*1024)
/* The minimal interval between progress updates (in seconds). */
@@ -270,50 +271,6 @@ static int store_common(transport_smart *t)
return 0;
}
-static int fetch_setup_walk(git_revwalk **out, git_repository *repo)
-{
- git_revwalk *walk = NULL;
- git_strarray refs;
- unsigned int i;
- git_reference *ref = NULL;
- int error;
-
- if ((error = git_reference_list(&refs, repo)) < 0)
- return error;
-
- if ((error = git_revwalk_new(&walk, repo)) < 0)
- return error;
-
- git_revwalk_sorting(walk, GIT_SORT_TIME);
-
- for (i = 0; i < refs.count; ++i) {
- git_reference_free(ref);
- ref = NULL;
-
- /* No tags */
- if (!git__prefixcmp(refs.strings[i], GIT_REFS_TAGS_DIR))
- continue;
-
- if ((error = git_reference_lookup(&ref, repo, refs.strings[i])) < 0)
- goto on_error;
-
- if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC)
- continue;
-
- if ((error = git_revwalk_push(walk, git_reference_target(ref))) < 0)
- goto on_error;
- }
-
- *out = walk;
-
-on_error:
- if (error)
- git_revwalk_free(walk);
- git_reference_free(ref);
- git_strarray_free(&refs);
- return error;
-}
-
static int wait_while_ack(gitno_buffer *buf)
{
int error;
@@ -347,6 +304,7 @@ static int wait_while_ack(gitno_buffer *buf)
int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, const git_remote_head * const *wants, size_t count)
{
transport_smart *t = (transport_smart *)transport;
+ git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
gitno_buffer *buf = &t->buffer;
git_buf data = GIT_BUF_INIT;
git_revwalk *walk = NULL;
@@ -358,7 +316,11 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
if ((error = git_pkt_buffer_wants(wants, count, &t->caps, &data)) < 0)
return error;
- if ((error = fetch_setup_walk(&walk, repo)) < 0)
+ if ((error = git_revwalk_new(&walk, repo)) < 0)
+ goto on_error;
+
+ opts.insert_by_date = 1;
+ if ((error = git_revwalk__push_glob(walk, "refs/*", &opts)) < 0)
goto on_error;
/*
diff --git a/tests/network/fetchlocal.c b/tests/network/fetchlocal.c
index 6bc2826..8043080 100644
--- a/tests/network/fetchlocal.c
+++ b/tests/network/fetchlocal.c
@@ -419,7 +419,7 @@ void test_network_fetchlocal__multi_remotes(void)
cl_git_pass(git_remote_fetch(test, NULL, &options, NULL));
cl_git_pass(git_reference_list(&refnames, repo));
- cl_assert_equal_i(32, (int)refnames.count);
+ cl_assert_equal_i(33, (int)refnames.count);
git_strarray_free(&refnames);
cl_git_pass(git_remote_set_url(repo, "test_with_pushurl", cl_git_fixture_url("testrepo.git")));
@@ -427,7 +427,7 @@ void test_network_fetchlocal__multi_remotes(void)
cl_git_pass(git_remote_fetch(test2, NULL, &options, NULL));
cl_git_pass(git_reference_list(&refnames, repo));
- cl_assert_equal_i(44, (int)refnames.count);
+ cl_assert_equal_i(45, (int)refnames.count);
git_strarray_free(&refnames);
git_remote_free(test);
diff --git a/tests/network/remote/local.c b/tests/network/remote/local.c
index 99b91c5..16cce67 100644
--- a/tests/network/remote/local.c
+++ b/tests/network/remote/local.c
@@ -62,7 +62,7 @@ void test_network_remote_local__retrieve_advertised_references(void)
cl_git_pass(git_remote_ls(&refs, &refs_len, remote));
- cl_assert_equal_i(refs_len, 28);
+ cl_assert_equal_i(refs_len, 29);
}
void test_network_remote_local__retrieve_advertised_before_connect(void)
@@ -86,7 +86,7 @@ void test_network_remote_local__retrieve_advertised_references_after_disconnect(
cl_git_pass(git_remote_ls(&refs, &refs_len, remote));
- cl_assert_equal_i(refs_len, 28);
+ cl_assert_equal_i(refs_len, 29);
}
void test_network_remote_local__retrieve_advertised_references_from_spaced_repository(void)
@@ -101,7 +101,7 @@ void test_network_remote_local__retrieve_advertised_references_from_spaced_repos
cl_git_pass(git_remote_ls(&refs, &refs_len, remote));
- cl_assert_equal_i(refs_len, 28);
+ cl_assert_equal_i(refs_len, 29);
git_remote_free(remote); /* Disconnect from the "spaced repo" before the cleanup */
remote = NULL;
diff --git a/tests/refs/foreachglob.c b/tests/refs/foreachglob.c
index a135293..3ff18a2 100644
--- a/tests/refs/foreachglob.c
+++ b/tests/refs/foreachglob.c
@@ -48,8 +48,8 @@ static void assert_retrieval(const char *glob, int expected_count)
void test_refs_foreachglob__retrieve_all_refs(void)
{
- /* 12 heads (including one packed head) + 1 note + 2 remotes + 7 tags */
- assert_retrieval("*", 22);
+ /* 12 heads (including one packed head) + 1 note + 2 remotes + 7 tags + 1 blob */
+ assert_retrieval("*", 23);
}
void test_refs_foreachglob__retrieve_remote_branches(void)
diff --git a/tests/refs/iterator.c b/tests/refs/iterator.c
index 18e9d1d..8d52755 100644
--- a/tests/refs/iterator.c
+++ b/tests/refs/iterator.c
@@ -15,6 +15,7 @@ void test_refs_iterator__cleanup(void)
}
static const char *refnames[] = {
+ "refs/blobs/annotated_tag_to_blob",
"refs/heads/br2",
"refs/heads/cannot-fetch",
"refs/heads/chomped",
@@ -40,6 +41,7 @@ static const char *refnames[] = {
};
static const char *refnames_with_symlink[] = {
+ "refs/blobs/annotated_tag_to_blob",
"refs/heads/br2",
"refs/heads/cannot-fetch",
"refs/heads/chomped",
@@ -99,7 +101,7 @@ void test_refs_iterator__list(void)
git_vector output;
git_reference *ref;
- cl_git_pass(git_vector_init(&output, 32, &refcmp_cb));
+ cl_git_pass(git_vector_init(&output, 33, &refcmp_cb));
cl_git_pass(git_reference_iterator_new(&iter, repo));
while (1) {
@@ -143,7 +145,7 @@ static int refs_foreach_cb(git_reference *reference, void *payload)
void test_refs_iterator__foreach(void)
{
git_vector output;
- cl_git_pass(git_vector_init(&output, 32, &refcmp_cb));
+ cl_git_pass(git_vector_init(&output, 33, &refcmp_cb));
cl_git_pass(git_reference_foreach(repo, refs_foreach_cb, &output));
assert_all_refnames_match(refnames, &output);
}
diff --git a/tests/resources/testrepo.git/refs/blobs/annotated_tag_to_blob b/tests/resources/testrepo.git/refs/blobs/annotated_tag_to_blob
new file mode 100644
index 0000000..6c146d6
--- /dev/null
+++ b/tests/resources/testrepo.git/refs/blobs/annotated_tag_to_blob
@@ -0,0 +1 @@
+521d87c1ec3aef9824daf6d96cc0ae3710766d91