test-setdiscovery.t
1114 lines
| 34.7 KiB
| text/troff
|
Tads3Lexer
/ tests / test-setdiscovery.t
|
r14164 | |||
Function to test discovery between two repos in both directions, using both the local shortcut | ||||
(which is currently not activated by default) and the full remotable protocol: | ||||
$ testdesc() { # revs_a, revs_b, dagdesc | ||||
|
r14736 | > if [ -d foo ]; then rm -rf foo; fi | ||
|
r14164 | > hg init foo | ||
> cd foo | ||||
> hg debugbuilddag "$3" | ||||
> hg clone . a $1 --quiet | ||||
> hg clone . b $2 --quiet | ||||
> echo | ||||
> echo "% -- a -> b tree" | ||||
> hg -R a debugdiscovery b --verbose --old | ||||
> echo | ||||
> echo "% -- a -> b set" | ||||
|
r25125 | > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true | ||
|
r14164 | > echo | ||
|
r35305 | > echo "% -- a -> b set (tip only)" | ||
> hg -R a debugdiscovery b --verbose --debug --config progress.debug=true --rev tip | ||||
> echo | ||||
|
r14164 | > echo "% -- b -> a tree" | ||
|
r35056 | > hg -R b debugdiscovery a --verbose --old | ||
|
r14164 | > echo | ||
> echo "% -- b -> a set" | ||||
|
r25125 | > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true | ||
|
r35305 | > echo | ||
> echo "% -- b -> a set (tip only)" | ||||
> hg -R b debugdiscovery a --verbose --debug --config progress.debug=true --rev tip | ||||
|
r14164 | > cd .. | ||
> } | ||||
Small superset: | ||||
$ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' ' | ||||
> +2:f +1:a1:b1 | ||||
> <f +4 :a2 | ||||
> +5 :b2 | ||||
> <f +3 :b3' | ||||
% -- a -> b tree | ||||
comparing with b | ||||
searching for changes | ||||
|
r18254 | unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0 | ||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 2 | ||||
also local heads: 2 | ||||
also remote heads: 1 | ||||
r42321 | both: 1 | |||
r42199 | local heads: 2 | |||
common: 2 | ||||
missing: 0 | ||||
remote heads: 3 | ||||
common: 1 | ||||
unknown: 2 | ||||
local changesets: 7 | ||||
common: 7 | ||||
missing: 0 | ||||
|
r18254 | common heads: 01241442b3c2 b5714e113bc0 | ||
|
r14164 | |||
% -- a -> b set | ||||
comparing with b | ||||
query 1; heads | ||||
searching for changes | ||||
|
r14624 | all local heads known remotely | ||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 2 | ||||
also local heads: 2 | ||||
also remote heads: 1 | ||||
r42321 | both: 1 | |||
r42199 | local heads: 2 | |||
common: 2 | ||||
missing: 0 | ||||
remote heads: 3 | ||||
common: 1 | ||||
unknown: 2 | ||||
local changesets: 7 | ||||
common: 7 | ||||
missing: 0 | ||||
|
r18254 | common heads: 01241442b3c2 b5714e113bc0 | ||
|
r14164 | |||
|
r35305 | % -- a -> b set (tip only) | ||
comparing with b | ||||
query 1; heads | ||||
searching for changes | ||||
all local heads known remotely | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 1 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 2 | |||
common: 1 | ||||
missing: 1 | ||||
remote heads: 3 | ||||
common: 0 | ||||
unknown: 3 | ||||
local changesets: 7 | ||||
common: 6 | ||||
missing: 1 | ||||
|
r35305 | common heads: b5714e113bc0 | ||
|
r14164 | % -- b -> a tree | ||
comparing with a | ||||
searching for changes | ||||
|
r18254 | unpruned common: 01241442b3c2 b5714e113bc0 | ||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 2 | ||||
also local heads: 1 | ||||
also remote heads: 2 | ||||
r42321 | both: 1 | |||
r42199 | local heads: 3 | |||
common: 1 | ||||
missing: 2 | ||||
remote heads: 2 | ||||
common: 2 | ||||
unknown: 0 | ||||
local changesets: 15 | ||||
common: 7 | ||||
missing: 8 | ||||
|
r18254 | common heads: 01241442b3c2 b5714e113bc0 | ||
|
r14164 | |||
% -- b -> a set | ||||
comparing with a | ||||
query 1; heads | ||||
searching for changes | ||||
all remote heads known locally | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 2 | ||||
also local heads: 1 | ||||
also remote heads: 2 | ||||
r42321 | both: 1 | |||
r42199 | local heads: 3 | |||
common: 1 | ||||
missing: 2 | ||||
remote heads: 2 | ||||
common: 2 | ||||
unknown: 0 | ||||
local changesets: 15 | ||||
common: 7 | ||||
missing: 8 | ||||
|
r18254 | common heads: 01241442b3c2 b5714e113bc0 | ||
|
r35305 | |||
% -- b -> a set (tip only) | ||||
comparing with a | ||||
query 1; heads | ||||
searching for changes | ||||
all remote heads known locally | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 2 | ||||
also local heads: 1 | ||||
also remote heads: 2 | ||||
r42321 | both: 1 | |||
r42199 | local heads: 3 | |||
common: 1 | ||||
missing: 2 | ||||
remote heads: 2 | ||||
common: 2 | ||||
unknown: 0 | ||||
local changesets: 15 | ||||
common: 7 | ||||
missing: 8 | ||||
|
r35305 | common heads: 01241442b3c2 b5714e113bc0 | ||
|
r14164 | |||
Many new: | ||||
$ testdesc '-ra1 -ra2' '-rb' ' | ||||
> +2:f +3:a1 +3:b | ||||
> <f +30 :a2' | ||||
% -- a -> b tree | ||||
comparing with b | ||||
searching for changes | ||||
unpruned common: bebd167eb94d | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 1 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 2 | |||
common: 1 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 35 | ||||
common: 5 | ||||
missing: 30 | ||||
|
r14164 | common heads: bebd167eb94d | ||
% -- a -> b set | ||||
comparing with b | ||||
query 1; heads | ||||
searching for changes | ||||
|
r14624 | taking initial sample | ||
|
r14164 | searching: 2 queries | ||
|
r14624 | query 2; still undecided: 29, sample size is: 29 | ||
r32712 | 2 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 1 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 2 | |||
common: 1 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 35 | ||||
common: 5 | ||||
missing: 30 | ||||
|
r14164 | common heads: bebd167eb94d | ||
|
r35305 | % -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 2 | |||
common: 0 | ||||
missing: 2 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 35 | ||||
common: 2 | ||||
missing: 33 | ||||
|
r35305 | common heads: 66f7d451a68b | ||
|
r14164 | % -- b -> a tree | ||
comparing with a | ||||
searching for changes | ||||
|
r18254 | unpruned common: 66f7d451a68b bebd167eb94d | ||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 1 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 2 | ||||
common: 1 | ||||
unknown: 1 | ||||
local changesets: 8 | ||||
common: 5 | ||||
missing: 3 | ||||
|
r14164 | common heads: bebd167eb94d | ||
% -- b -> a set | ||||
comparing with a | ||||
query 1; heads | ||||
searching for changes | ||||
taking initial sample | ||||
searching: 2 queries | ||||
|
r14624 | query 2; still undecided: 2, sample size is: 2 | ||
r32712 | 2 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 1 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 2 | ||||
common: 1 | ||||
unknown: 1 | ||||
local changesets: 8 | ||||
common: 5 | ||||
missing: 3 | ||||
|
r14164 | common heads: bebd167eb94d | ||
|
r35305 | |||
% -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 1 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 2 | ||||
common: 1 | ||||
unknown: 1 | ||||
local changesets: 8 | ||||
common: 5 | ||||
missing: 3 | ||||
|
r35305 | common heads: bebd167eb94d | ||
|
r14164 | |||
Both sides many new with stub: | ||||
$ testdesc '-ra1 -ra2' '-rb' ' | ||||
> +2:f +2:a1 +30 :b | ||||
> <f +30 :a2' | ||||
% -- a -> b tree | ||||
comparing with b | ||||
searching for changes | ||||
unpruned common: 2dc09a01254d | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 1 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 2 | |||
common: 1 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 34 | ||||
common: 4 | ||||
missing: 30 | ||||
|
r14164 | common heads: 2dc09a01254d | ||
% -- a -> b set | ||||
comparing with b | ||||
query 1; heads | ||||
searching for changes | ||||
|
r14624 | taking initial sample | ||
|
r14164 | searching: 2 queries | ||
|
r14624 | query 2; still undecided: 29, sample size is: 29 | ||
r32712 | 2 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 1 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 2 | |||
common: 1 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 34 | ||||
common: 4 | ||||
missing: 30 | ||||
|
r14164 | common heads: 2dc09a01254d | ||
|
r35305 | % -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 2 | |||
common: 0 | ||||
missing: 2 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 34 | ||||
common: 2 | ||||
missing: 32 | ||||
|
r35305 | common heads: 66f7d451a68b | ||
|
r14164 | % -- b -> a tree | ||
comparing with a | ||||
searching for changes | ||||
|
r18254 | unpruned common: 2dc09a01254d 66f7d451a68b | ||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 1 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 2 | ||||
common: 1 | ||||
unknown: 1 | ||||
local changesets: 34 | ||||
common: 4 | ||||
missing: 30 | ||||
|
r14164 | common heads: 2dc09a01254d | ||
% -- b -> a set | ||||
comparing with a | ||||
query 1; heads | ||||
searching for changes | ||||
taking initial sample | ||||
searching: 2 queries | ||||
|
r14624 | query 2; still undecided: 29, sample size is: 29 | ||
r32712 | 2 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 1 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 2 | ||||
common: 1 | ||||
unknown: 1 | ||||
local changesets: 34 | ||||
common: 4 | ||||
missing: 30 | ||||
|
r14164 | common heads: 2dc09a01254d | ||
|
r35305 | |||
% -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 1 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 2 | ||||
common: 1 | ||||
unknown: 1 | ||||
local changesets: 34 | ||||
common: 4 | ||||
missing: 30 | ||||
|
r35305 | common heads: 2dc09a01254d | ||
|
r14164 | |||
Both many new: | ||||
$ testdesc '-ra' '-rb' ' | ||||
> +2:f +30 :b | ||||
> <f +30 :a' | ||||
% -- a -> b tree | ||||
comparing with b | ||||
searching for changes | ||||
unpruned common: 66f7d451a68b | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 32 | ||||
common: 2 | ||||
missing: 30 | ||||
|
r14164 | common heads: 66f7d451a68b | ||
% -- a -> b set | ||||
comparing with b | ||||
query 1; heads | ||||
searching for changes | ||||
taking quick initial sample | ||||
searching: 2 queries | ||||
|
r14624 | query 2; still undecided: 31, sample size is: 31 | ||
r32712 | 2 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 32 | ||||
common: 2 | ||||
missing: 30 | ||||
|
r14164 | common heads: 66f7d451a68b | ||
|
r35305 | % -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 32 | ||||
common: 2 | ||||
missing: 30 | ||||
|
r35305 | common heads: 66f7d451a68b | ||
|
r14164 | % -- b -> a tree | ||
comparing with a | ||||
searching for changes | ||||
unpruned common: 66f7d451a68b | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 32 | ||||
common: 2 | ||||
missing: 30 | ||||
|
r14164 | common heads: 66f7d451a68b | ||
% -- b -> a set | ||||
comparing with a | ||||
query 1; heads | ||||
searching for changes | ||||
taking quick initial sample | ||||
searching: 2 queries | ||||
|
r14624 | query 2; still undecided: 31, sample size is: 31 | ||
r32712 | 2 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 32 | ||||
common: 2 | ||||
missing: 30 | ||||
|
r14164 | common heads: 66f7d451a68b | ||
|
r35305 | |||
% -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 32 | ||||
common: 2 | ||||
missing: 30 | ||||
|
r35305 | common heads: 66f7d451a68b | ||
|
r14164 | |||
Both many new skewed: | ||||
$ testdesc '-ra' '-rb' ' | ||||
> +2:f +30 :b | ||||
> <f +50 :a' | ||||
% -- a -> b tree | ||||
comparing with b | ||||
searching for changes | ||||
unpruned common: 66f7d451a68b | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 52 | ||||
common: 2 | ||||
missing: 50 | ||||
|
r14164 | common heads: 66f7d451a68b | ||
% -- a -> b set | ||||
comparing with b | ||||
query 1; heads | ||||
searching for changes | ||||
taking quick initial sample | ||||
searching: 2 queries | ||||
|
r14624 | query 2; still undecided: 51, sample size is: 51 | ||
r32712 | 2 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 52 | ||||
common: 2 | ||||
missing: 50 | ||||
|
r14164 | common heads: 66f7d451a68b | ||
|
r35305 | % -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 52 | ||||
common: 2 | ||||
missing: 50 | ||||
|
r35305 | common heads: 66f7d451a68b | ||
|
r14164 | % -- b -> a tree | ||
comparing with a | ||||
searching for changes | ||||
unpruned common: 66f7d451a68b | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 32 | ||||
common: 2 | ||||
missing: 30 | ||||
|
r14164 | common heads: 66f7d451a68b | ||
% -- b -> a set | ||||
comparing with a | ||||
query 1; heads | ||||
searching for changes | ||||
taking quick initial sample | ||||
searching: 2 queries | ||||
|
r14624 | query 2; still undecided: 31, sample size is: 31 | ||
r32712 | 2 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 32 | ||||
common: 2 | ||||
missing: 30 | ||||
|
r14164 | common heads: 66f7d451a68b | ||
|
r35305 | |||
% -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 32 | ||||
common: 2 | ||||
missing: 30 | ||||
|
r35305 | common heads: 66f7d451a68b | ||
|
r14164 | |||
Both many new on top of long history: | ||||
$ testdesc '-ra' '-rb' ' | ||||
> +1000:f +30 :b | ||||
> <f +50 :a' | ||||
% -- a -> b tree | ||||
comparing with b | ||||
searching for changes | ||||
unpruned common: 7ead0cba2838 | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 1050 | ||||
common: 1000 | ||||
missing: 50 | ||||
|
r14164 | common heads: 7ead0cba2838 | ||
% -- a -> b set | ||||
comparing with b | ||||
query 1; heads | ||||
searching for changes | ||||
taking quick initial sample | ||||
searching: 2 queries | ||||
|
r14624 | query 2; still undecided: 1049, sample size is: 11 | ||
|
r14164 | sampling from both directions | ||
searching: 3 queries | ||||
query 3; still undecided: 31, sample size is: 31 | ||||
r32712 | 3 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 1050 | ||||
common: 1000 | ||||
missing: 50 | ||||
|
r14164 | common heads: 7ead0cba2838 | ||
|
r35305 | % -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 1050 | ||||
common: 1000 | ||||
missing: 50 | ||||
|
r35305 | common heads: 7ead0cba2838 | ||
|
r14164 | % -- b -> a tree | ||
comparing with a | ||||
searching for changes | ||||
unpruned common: 7ead0cba2838 | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 1030 | ||||
common: 1000 | ||||
missing: 30 | ||||
|
r14164 | common heads: 7ead0cba2838 | ||
% -- b -> a set | ||||
comparing with a | ||||
query 1; heads | ||||
searching for changes | ||||
taking quick initial sample | ||||
searching: 2 queries | ||||
|
r14624 | query 2; still undecided: 1029, sample size is: 11 | ||
|
r14164 | sampling from both directions | ||
searching: 3 queries | ||||
|
r15052 | query 3; still undecided: 15, sample size is: 15 | ||
r32712 | 3 total queries in *.????s (glob) | |||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 1030 | ||||
common: 1000 | ||||
missing: 30 | ||||
|
r14164 | common heads: 7ead0cba2838 | ||
|
r35305 | |||
% -- 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 1 | |||
common: 0 | ||||
missing: 1 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 1030 | ||||
common: 1000 | ||||
missing: 30 | ||||
|
r35305 | common heads: 7ead0cba2838 | ||
|
r14164 | |||
r42335 | One with >200 heads. We now switch to send them all in the initial roundtrip, but still do sampling for the later request. | |||
|
r14164 | |||
|
r15063 | $ hg init manyheads | ||
$ cd manyheads | ||||
$ echo "+300:r @a" >dagdesc | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | ||||
$ echo "@b *r+3" >>dagdesc # one more head | ||||
$ hg debugbuilddag <dagdesc | ||||
reading DAG from stdin | ||||
$ hg heads -t --template . | wc -c | ||||
|
r15090 | \s*261 (re) | ||
|
r15063 | |||
$ hg clone -b a . a | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1340 changesets with 0 changes to 0 files (+259 heads) | ||||
|
r34662 | new changesets 1ea73414a91b:1c51e2c80832 | ||
|
r15063 | updating to branch a | ||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg clone -b b . b | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 304 changesets with 0 changes to 0 files | ||||
|
r34662 | new changesets 1ea73414a91b:513314ca8b3a | ||
|
r15063 | updating to branch b | ||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r42969 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --config devel.discovery.randomize=false | ||
|
r15063 | comparing with b | ||
query 1; heads | ||||
searching for changes | ||||
taking quick initial sample | ||||
searching: 2 queries | ||||
r42335 | query 2; still undecided: 1080, sample size is: 100 | |||
|
r15063 | sampling from both directions | ||
searching: 3 queries | ||||
r42335 | query 3; still undecided: 980, sample size is: 200 | |||
|
r15063 | sampling from both directions | ||
searching: 4 queries | ||||
|
r42969 | query 4; still undecided: 497, sample size is: 210 | ||
|
r15063 | sampling from both directions | ||
searching: 5 queries | ||||
|
r42969 | query 5; still undecided: 285, sample size is: 220 | ||
sampling from both directions | ||||
searching: 6 queries | ||||
query 6; still undecided: 63, sample size is: 63 | ||||
6 total queries in *.????s (glob) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 260 | |||
common: 0 | ||||
missing: 260 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 1340 | ||||
common: 300 | ||||
missing: 1040 | ||||
|
r15063 | common heads: 3ee37d65064a | ||
|
r35305 | $ 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) | ||||
r42202 | elapsed time: * seconds (glob) | |||
r42199 | heads summary: | |||
total common heads: 1 | ||||
also local heads: 0 | ||||
also remote heads: 0 | ||||
r42321 | both: 0 | |||
r42199 | local heads: 260 | |||
common: 0 | ||||
missing: 260 | ||||
remote heads: 1 | ||||
common: 0 | ||||
unknown: 1 | ||||
local changesets: 1340 | ||||
common: 300 | ||||
missing: 1040 | ||||
|
r35305 | common heads: 3ee37d65064a | ||
|
r15063 | |||
|
r22181 | Test actual protocol when pulling one new head in addition to common heads | ||
$ hg clone -U b c | ||||
$ hg -R c id -ir tip | ||||
513314ca8b3a | ||||
$ hg -R c up -qr default | ||||
$ touch c/f | ||||
$ hg -R c ci -Aqm "extra head" | ||||
$ hg -R c id -i | ||||
e64a39e7da8b | ||||
$ hg serve -R c -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
$ hg -R b incoming http://localhost:$HGPORT/ -T '{node|short}\n' | ||||
comparing with http://localhost:$HGPORT/ | ||||
searching for changes | ||||
e64a39e7da8b | ||||
|
r25474 | $ killdaemons.py | ||
|
r22181 | $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling | ||
|
r37574 | "GET /?cmd=capabilities HTTP/1.1" 200 - | ||
|
r37516 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull | ||
"GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull | ||||
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull | ||||
|
r22181 | $ cat errors.log | ||
|
r16913 | $ cd .. | ||
|
r23233 | |||
Issue 4438 - test coverage for 3ef893520a85 issues. | ||||
$ mkdir issue4438 | ||||
$ cd issue4438 | ||||
#if false | ||||
generate new bundles: | ||||
$ hg init r1 | ||||
|
r39743 | $ for i in `"$PYTHON" $TESTDIR/seq.py 101`; do hg -R r1 up -qr null && hg -R r1 branch -q b$i && hg -R r1 ci -qmb$i; done | ||
|
r23233 | $ hg clone -q r1 r2 | ||
|
r39743 | $ for i in `"$PYTHON" $TESTDIR/seq.py 10`; do hg -R r1 up -qr null && hg -R r1 branch -q c$i && hg -R r1 ci -qmc$i; done | ||
|
r23233 | $ hg -R r2 branch -q r2change && hg -R r2 ci -qmr2change | ||
$ hg -R r1 bundle -qa $TESTDIR/bundles/issue4438-r1.hg | ||||
$ hg -R r2 bundle -qa $TESTDIR/bundles/issue4438-r2.hg | ||||
#else | ||||
use existing bundles: | ||||
|
r37447 | $ hg init r1 | ||
$ hg -R r1 -q unbundle $TESTDIR/bundles/issue4438-r1.hg | ||||
$ hg -R r1 -q up | ||||
$ hg init r2 | ||||
$ hg -R r2 -q unbundle $TESTDIR/bundles/issue4438-r2.hg | ||||
$ hg -R r2 -q up | ||||
|
r23233 | #endif | ||
Set iteration order could cause wrong and unstable results - fixed in 73cfaa348650: | ||||
$ hg -R r1 outgoing r2 -T'{rev} ' | ||||
comparing with r2 | ||||
searching for changes | ||||
101 102 103 104 105 106 107 108 109 110 (no-eol) | ||||
The case where all the 'initialsamplesize' samples already were common would | ||||
give 'all remote heads known locally' without checking the remaining heads - | ||||
fixed in 86c35b7ae300: | ||||
$ cat >> r1/.hg/hgrc << EOF | ||||
|
r42969 | > [devel] | ||
> discovery.randomize = False | ||||
|
r23233 | > EOF | ||
|
r41028 | $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox= \ | ||
> --config blackbox.track='command commandfinish discovery' | ||||
|
r23233 | comparing with r2 | ||
searching for changes | ||||
101 102 103 104 105 106 107 108 109 110 (no-eol) | ||||
|
r41028 | $ hg -R r1 --config extensions.blackbox= blackbox --config blackbox.track= | ||
|
r34452 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !) | ||
|
r35063 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob) | ||
r42335 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 1 roundtrips in *.????s (glob) | |||
|
r32756 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob) | ||
|
r23233 | $ cd .. | ||