Skip to content

Consolidate reachability logic #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
derrickstolee wants to merge 18 commits into from
Closed

Consolidate reachability logic #10

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
56b7ca5
commit-reach: move walk methods from commit.c
derrickstolee Jun 25, 2018
ca88ec3
commit.h: remove method declarations
derrickstolee Jul 18, 2018
12349f5
commit-reach: move ref_newer from remote.c
derrickstolee Jun 25, 2018
f548989
commit-reach: move commit_contains from ref-filter
derrickstolee Jun 25, 2018
e822fd8
upload-pack: make reachable() more generic
derrickstolee Jun 19, 2018
08dcd4e
upload-pack: refactor ok_to_give_up()
derrickstolee Jun 19, 2018
a71ec7f
upload-pack: generalize commit date cutoff
derrickstolee Jul 12, 2018
aa96c80
commit-reach: move can_all_from_reach_with_flags
derrickstolee Jul 12, 2018
2da4fe8
test-reach: create new test tool for ref_newer
derrickstolee Jul 13, 2018
10bda49
test-reach: test in_merge_bases
derrickstolee Jul 13, 2018
9ab9511
test-reach: test is_descendant_of
derrickstolee Jul 13, 2018
d3dfbfc
test-reach: test get_merge_bases_many
derrickstolee Jul 13, 2018
91a6297
test-reach: test reduce_heads
derrickstolee Jul 13, 2018
0557fed
test-reach: test can_all_from_reach_with_flags
derrickstolee Jul 13, 2018
02d0386
test-reach: test commit_contains
derrickstolee Jul 18, 2018
3b44044
commit-reach: replace ref_newer logic
derrickstolee Jul 13, 2018
ae6fc62
commit-reach: make can_all_from_reach... linear
derrickstolee Jun 28, 2018
f40f6f4
commit-reach: use can_all_from_reach
derrickstolee Jul 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test-reach: test in_merge_bases 
Signed-off-by: Derrick Stolee <[email protected]>
  • Loading branch information
@derrickstolee
derrickstolee committed Jul 20, 2018
commit 10bda4970fc7c6f012061d8d2466266ab89866fe
6 changes: 6 additions & 0 deletions t/helper/test-reach.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
int cmd__reach(int ac, const char **av)
{
struct object_id oid_A, oid_B;
struct commit *A, *B;
struct strbuf buf = STRBUF_INIT;
struct repository *r = the_repository;

Expand All @@ -17,6 +18,7 @@ int cmd__reach(int ac, const char **av)
if (ac < 2)
exit(1);

A = B = NULL;

while (strbuf_getline(&buf, stdin) != EOF) {
struct object_id oid;
Expand Down Expand Up @@ -44,10 +46,12 @@ int cmd__reach(int ac, const char **av)
switch (buf.buf[0]) {
case 'A':
oidcpy(&oid_A, &oid);
A = c;
break;

case 'B':
oidcpy(&oid_B, &oid);
B = c;
break;

default:
Expand All @@ -58,6 +62,8 @@ int cmd__reach(int ac, const char **av)

if (!strcmp(av[1], "ref_newer"))
printf("%s(A,B):%d\n", av[1], ref_newer(&oid_A, &oid_B));
else if (!strcmp(av[1], "in_merge_bases"))
printf("%s(A,B):%d\n", av[1], in_merge_bases(A, B));

exit(0);
}
18 changes: 18 additions & 0 deletions t/t6600-test-reach.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,22 @@ test_expect_success 'ref_newer:hit' '
test_three_modes ref_newer
'

test_expect_success 'in_merge_bases:hit' '
cat >input <<-\EOF &&
A:commit-5-7
B:commit-8-8
EOF
echo "in_merge_bases(A,B):1" >expect &&
test_three_modes in_merge_bases
'

test_expect_success 'in_merge_bases:miss' '
cat >input <<-\EOF &&
A:commit-6-8
B:commit-5-9
EOF
echo "in_merge_bases(A,B):0" >expect &&
test_three_modes in_merge_bases
'

test_done