--- a/tests/test-setdiscovery.t Thu Dec 07 01:53:14 2017 +0100
+++ b/tests/test-setdiscovery.t Wed Dec 06 22:44:51 2017 +0100
@@ -16,11 +16,17 @@
> echo "% -- a -> b set"
> hg -R a debugdiscovery b --verbose --debug --config progress.debug=true
> echo
+ > echo "% -- a -> b set (tip only)"
+ > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true --rev tip
+ > echo
> echo "% -- b -> a tree"
> hg -R b debugdiscovery a --verbose --old
> echo
> echo "% -- b -> a set"
> hg -R b debugdiscovery a --verbose --debug --config progress.debug=true
+ > echo
+ > echo "% -- b -> a set (tip only)"
+ > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true --rev tip
> cd ..
> }
@@ -48,6 +54,13 @@
common heads: 01241442b3c2 b5714e113bc0
local is subset
+ % -- a -> b set (tip only)
+ comparing with b
+ query 1; heads
+ searching for changes
+ all local heads known remotely
+ common heads: b5714e113bc0
+
% -- b -> a tree
comparing with a
searching for changes
@@ -62,6 +75,14 @@
all remote heads known locally
common heads: 01241442b3c2 b5714e113bc0
remote is subset
+
+ % -- b -> a set (tip only)
+ comparing with a
+ query 1; heads
+ searching for changes
+ all remote heads known locally
+ common heads: 01241442b3c2 b5714e113bc0
+ remote is subset
Many new:
@@ -86,6 +107,16 @@
2 total queries in *.????s (glob)
common heads: bebd167eb94d
+ % -- a -> b set (tip only)
+ comparing with b
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ query 2; still undecided: 31, sample size is: 31
+ 2 total queries in *.????s (glob)
+ common heads: 66f7d451a68b
+
% -- b -> a tree
comparing with a
searching for changes
@@ -101,6 +132,16 @@
query 2; still undecided: 2, sample size is: 2
2 total queries in *.????s (glob)
common heads: bebd167eb94d
+
+ % -- b -> a set (tip only)
+ comparing with a
+ query 1; heads
+ searching for changes
+ taking initial sample
+ searching: 2 queries
+ query 2; still undecided: 2, sample size is: 2
+ 2 total queries in *.????s (glob)
+ common heads: bebd167eb94d
Both sides many new with stub:
@@ -124,6 +165,16 @@
2 total queries in *.????s (glob)
common heads: 2dc09a01254d
+ % -- a -> b set (tip only)
+ comparing with b
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ query 2; still undecided: 31, sample size is: 31
+ 2 total queries in *.????s (glob)
+ common heads: 66f7d451a68b
+
% -- b -> a tree
comparing with a
searching for changes
@@ -139,6 +190,16 @@
query 2; still undecided: 29, sample size is: 29
2 total queries in *.????s (glob)
common heads: 2dc09a01254d
+
+ % -- b -> a set (tip only)
+ comparing with a
+ query 1; heads
+ searching for changes
+ taking initial sample
+ searching: 2 queries
+ query 2; still undecided: 29, sample size is: 29
+ 2 total queries in *.????s (glob)
+ common heads: 2dc09a01254d
Both many new:
@@ -163,6 +224,16 @@
2 total queries in *.????s (glob)
common heads: 66f7d451a68b
+ % -- a -> b set (tip only)
+ comparing with b
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ query 2; still undecided: 31, sample size is: 31
+ 2 total queries in *.????s (glob)
+ common heads: 66f7d451a68b
+
% -- b -> a tree
comparing with a
searching for changes
@@ -178,6 +249,16 @@
query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob)
common heads: 66f7d451a68b
+
+ % -- b -> a set (tip only)
+ comparing with a
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ query 2; still undecided: 31, sample size is: 31
+ 2 total queries in *.????s (glob)
+ common heads: 66f7d451a68b
Both many new skewed:
@@ -202,6 +283,16 @@
2 total queries in *.????s (glob)
common heads: 66f7d451a68b
+ % -- a -> b set (tip only)
+ comparing with b
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ query 2; still undecided: 51, sample size is: 51
+ 2 total queries in *.????s (glob)
+ common heads: 66f7d451a68b
+
% -- b -> a tree
comparing with a
searching for changes
@@ -217,6 +308,16 @@
query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob)
common heads: 66f7d451a68b
+
+ % -- b -> a set (tip only)
+ comparing with a
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ query 2; still undecided: 31, sample size is: 31
+ 2 total queries in *.????s (glob)
+ common heads: 66f7d451a68b
Both many new on top of long history:
@@ -244,6 +345,19 @@
3 total queries in *.????s (glob)
common heads: 7ead0cba2838
+ % -- a -> b set (tip only)
+ comparing with b
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ query 2; still undecided: 1049, sample size is: 11
+ sampling from both directions
+ searching: 3 queries
+ query 3; still undecided: 31, sample size is: 31
+ 3 total queries in *.????s (glob)
+ common heads: 7ead0cba2838
+
% -- b -> a tree
comparing with a
searching for changes
@@ -262,6 +376,19 @@
query 3; still undecided: 15, sample size is: 15
3 total queries in *.????s (glob)
common heads: 7ead0cba2838
+
+ % -- b -> a set (tip only)
+ comparing with a
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ query 2; still undecided: 1029, sample size is: 11
+ sampling from both directions
+ searching: 3 queries
+ query 3; still undecided: 15, sample size is: 15
+ 3 total queries in *.????s (glob)
+ common heads: 7ead0cba2838
One with >200 heads, which used to use up all of the sample:
@@ -327,6 +454,18 @@
query 6; still undecided: \d+, sample size is: \d+ (re)
6 total queries in *.????s (glob)
common heads: 3ee37d65064a
+ $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip
+ comparing with b
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ query 2; still undecided: 303, sample size is: 9
+ sampling from both directions
+ searching: 3 queries
+ query 3; still undecided: 3, sample size is: 3
+ 3 total queries in *.????s (glob)
+ common heads: 3ee37d65064a
Test actual protocol when pulling one new head in addition to common heads