summaryrefslogtreecommitdiff
path: root/t/helper/test-reach.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2018-07-20 16:33:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-20 22:38:56 (GMT)
commit1792bc125069e3e5b59f0158e259335a07aa7cf5 (patch)
tree7cba7abe78e320a43ab5caa54ae509fefb4741b6 /t/helper/test-reach.c
parent0c89f715d06082216cc312dcd39e09cb80f7aad7 (diff)
downloadgit-1792bc125069e3e5b59f0158e259335a07aa7cf5.zip
git-1792bc125069e3e5b59f0158e259335a07aa7cf5.tar.gz
git-1792bc125069e3e5b59f0158e259335a07aa7cf5.tar.bz2
test-reach: test can_all_from_reach_with_flags
The can_all_from_reach_with_flags method is used by ok_to_give_up in upload-pack.c to see if we have done enough negotiation during a fetch. This method is intentionally created to preserve state between calls to assist with stateful negotiation, such as over SSH. To make this method testable, add a new can_all_from_reach method that does the initial setup and final tear-down. We will later use this method in production code. Call the method from 'test-tool reach' for now. Since this is a many-to-many reachability query, add a new type of input to the 'test-tool reach' input format. Lines "Y:<committish>" create a list of commits to be the reachability targets from the commits in the 'X' list. In the context of fetch negotiation, the 'X' commits are the 'want' commits and the 'Y' commits are the 'have' commits. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper/test-reach.c')
-rw-r--r--t/helper/test-reach.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
index e32e193..c79729c 100644
--- a/t/helper/test-reach.c
+++ b/t/helper/test-reach.c
@@ -29,7 +29,7 @@ int cmd__reach(int ac, const char **av)
{
struct object_id oid_A, oid_B;
struct commit *A, *B;
- struct commit_list *X;
+ struct commit_list *X, *Y;
struct commit **X_array;
int X_nr, X_alloc;
struct strbuf buf = STRBUF_INIT;
@@ -41,7 +41,7 @@ int cmd__reach(int ac, const char **av)
exit(1);
A = B = NULL;
- X = NULL;
+ X = Y = NULL;
X_nr = 0;
X_alloc = 16;
ALLOC_ARRAY(X_array, X_alloc);
@@ -86,6 +86,10 @@ int cmd__reach(int ac, const char **av)
X_array[X_nr++] = c;
break;
+ case 'Y':
+ commit_list_insert(c, &Y);
+ break;
+
default:
die("unexpected start of line: %c", buf.buf[0]);
}
@@ -106,6 +110,8 @@ int cmd__reach(int ac, const char **av)
struct commit_list *list = reduce_heads(X);
printf("%s(X):\n", av[1]);
print_sorted_commit_ids(list);
+ } else if (!strcmp(av[1], "can_all_from_reach")) {
+ printf("%s(X,Y):%d\n", av[1], can_all_from_reach(X, Y, 1));
}
exit(0);