This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9529

debugdiscovery: add some data about the shapes of the sets
ClosedPublic

Authored by marmoute on Dec 6 2020, 8:46 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3ca9d26c5984: debugdiscovery: add some data about the shapes of the sets
Summary

We display the number of heads and roots or the common and missing set.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Dec 6 2020, 8:46 AM
pulkit accepted this revision.Dec 7 2020, 3:55 AM
This revision is now accepted and ready to land.Dec 7 2020, 3:55 AM
pulkit requested changes to this revision.Dec 7 2020, 4:34 AM

test-setdiscovery.t fails with following output change:

--- /home/pulkitg/repo/hgpush/tests/test-setdiscovery.t
+++ /home/pulkitg/repo/hgpush/tests/test-setdiscovery.t.err
@@ -57,7 +57,11 @@
       unknown:                   2
   local changesets:              7
     common:                      7
+      heads:                     2
+      roots:                     1
     missing:                     0
+      heads:                     0
+      roots:                     0
   common heads: 01241442b3c2 b5714e113bc0

   % -- a -> b set
@@ -79,7 +83,11 @@
       unknown:                   2
   local changesets:              7
     common:                      7
+      heads:                     2
+      roots:                     1
     missing:                     0
+      heads:                     0
+      roots:                     0
   common heads: 01241442b3c2 b5714e113bc0

   % -- a -> b set (tip only)
@@ -101,7 +109,11 @@
       unknown:                   3
   local changesets:              7
     common:                      6
+      heads:                     1
+      roots:                     1
     missing:                     1
+      heads:                     1
+      roots:                     1
   common heads: b5714e113bc0

   % -- b -> a tree
@@ -122,7 +134,11 @@
       unknown:                   0
   local changesets:             15
     common:                      7
+      heads:                     2
+      roots:                     1
     missing:                     8
+      heads:                     2
+      roots:                     2
   common heads: 01241442b3c2 b5714e113bc0

   % -- b -> a set
@@ -144,7 +160,11 @@
       unknown:                   0
   local changesets:             15
     common:                      7
+      heads:                     2
+      roots:                     1
     missing:                     8
+      heads:                     2
+      roots:                     2
   common heads: 01241442b3c2 b5714e113bc0

   % -- b -> a set (tip only)
@@ -166,7 +186,11 @@
       unknown:                   0
   local changesets:             15
     common:                      7
+      heads:                     2
+      roots:                     1
     missing:                     8
+      heads:                     2
+      roots:                     2
   common heads: 01241442b3c2 b5714e113bc0


@@ -194,7 +218,11 @@
       unknown:                   1
   local changesets:             35
     common:                      5
-    missing:                    30
+      heads:                     1
+      roots:                     1
+    missing:                    30
+      heads:                     1
+      roots:                     1
   common heads: bebd167eb94d

   % -- a -> b set
@@ -219,7 +247,11 @@
       unknown:                   1
   local changesets:             35
     common:                      5
-    missing:                    30
+      heads:                     1
+      roots:                     1
+    missing:                    30
+      heads:                     1
+      roots:                     1
   common heads: bebd167eb94d

   % -- a -> b set (tip only)
@@ -244,7 +276,11 @@
       unknown:                   1
   local changesets:             35
     common:                      2
+      heads:                     1
+      roots:                     1
     missing:                    33
+      heads:                     2
+      roots:                     2
   common heads: 66f7d451a68b

   % -- b -> a tree
@@ -265,7 +301,11 @@
       unknown:                   1
   local changesets:              8
     common:                      5
+      heads:                     1
+      roots:                     1
     missing:                     3
+      heads:                     1
+      roots:                     1
   common heads: bebd167eb94d

   % -- b -> a set
@@ -290,7 +330,11 @@
       unknown:                   1
   local changesets:              8
     common:                      5
+      heads:                     1
+      roots:                     1
     missing:                     3
+      heads:                     1
+      roots:                     1
   common heads: bebd167eb94d

   % -- b -> a set (tip only)
@@ -315,7 +359,11 @@
       unknown:                   1
   local changesets:              8
     common:                      5
+      heads:                     1
+      roots:                     1
     missing:                     3
+      heads:                     1
+      roots:                     1
   common heads: bebd167eb94d

 Both sides many new with stub:
@@ -342,7 +390,11 @@
       unknown:                   1
   local changesets:             34
     common:                      4
-    missing:                    30
+      heads:                     1
+      roots:                     1
+    missing:                    30
+      heads:                     1
+      roots:                     1
   common heads: 2dc09a01254d

   % -- a -> b set
@@ -367,7 +419,11 @@
       unknown:                   1
   local changesets:             34
     common:                      4
-    missing:                    30
+      heads:                     1
+      roots:                     1
+    missing:                    30
+      heads:                     1
+      roots:                     1
   common heads: 2dc09a01254d

   % -- a -> b set (tip only)
@@ -392,7 +448,11 @@
       unknown:                   1
   local changesets:             34
     common:                      2
+      heads:                     1
+      roots:                     1
     missing:                    32
+      heads:                     2
+      roots:                     2
   common heads: 66f7d451a68b

   % -- b -> a tree
@@ -413,7 +473,11 @@
       unknown:                   1
   local changesets:             34
     common:                      4
-    missing:                    30
+      heads:                     1
+      roots:                     1
+    missing:                    30
+      heads:                     1
+      roots:                     1
   common heads: 2dc09a01254d

   % -- b -> a set
@@ -438,7 +502,11 @@
       unknown:                   1
   local changesets:             34
     common:                      4
-    missing:                    30
+      heads:                     1
+      roots:                     1
+    missing:                    30
+      heads:                     1
+      roots:                     1
   common heads: 2dc09a01254d

   % -- b -> a set (tip only)
This revision now requires changes to proceed.Dec 7 2020, 4:34 AM
marmoute added a comment.Dec 7 2020, 8:39 AM

Looks like I forgot to amend… new version coming shortly

baymax updated this revision to Diff 24078.Dec 7 2020, 9:11 AM
baymax updated this revision to Diff 24092.Dec 7 2020, 4:50 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Dec 8 2020, 2:08 AM
This revision is now accepted and ready to land.Dec 8 2020, 2:08 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (10 lines)
Mtests/test-setdiscovery.t (156 lines)

Diff 24113

mercurial/debugcommands.py

# note: they cannot be a local or remote head that is in common and not # note: they cannot be a local or remote head that is in common and not
# itself a head of common. # itself a head of common.
heads_common_local = heads_common & heads_local heads_common_local = heads_common & heads_local
heads_common_remote = heads_common & heads_remote heads_common_remote = heads_common & heads_remote
heads_common_both = heads_common & heads_remote & heads_local heads_common_both = heads_common & heads_remote & heads_local
all = repo.revs(b'all()') all = repo.revs(b'all()')
common = repo.revs(b'::%ln', common) common = repo.revs(b'::%ln', common)
roots_common = repo.revs(b'roots(::%ld)', common)
missing = repo.revs(b'not ::%ld', common) missing = repo.revs(b'not ::%ld', common)
heads_missing = repo.revs(b'heads(%ld)', missing)
roots_missing = repo.revs(b'roots(%ld)', missing)
assert len(common) + len(missing) == len(all) assert len(common) + len(missing) == len(all)
data = {} data = {}
data[b'elapsed'] = t.elapsed data[b'elapsed'] = t.elapsed
data[b'nb-common-heads'] = len(heads_common) data[b'nb-common-heads'] = len(heads_common)
data[b'nb-common-heads-local'] = len(heads_common_local) data[b'nb-common-heads-local'] = len(heads_common_local)
data[b'nb-common-heads-remote'] = len(heads_common_remote) data[b'nb-common-heads-remote'] = len(heads_common_remote)
data[b'nb-common-heads-both'] = len(heads_common_both) data[b'nb-common-heads-both'] = len(heads_common_both)
data[b'nb-common-roots'] = len(roots_common)
data[b'nb-head-local'] = len(heads_local) data[b'nb-head-local'] = len(heads_local)
data[b'nb-head-local-missing'] = len(heads_local) - len(heads_common_local) data[b'nb-head-local-missing'] = len(heads_local) - len(heads_common_local)
data[b'nb-head-remote'] = len(heads_remote) data[b'nb-head-remote'] = len(heads_remote)
data[b'nb-head-remote-unknown'] = len(heads_remote) - len( data[b'nb-head-remote-unknown'] = len(heads_remote) - len(
heads_common_remote heads_common_remote
) )
data[b'nb-revs'] = len(all) data[b'nb-revs'] = len(all)
data[b'nb-revs-common'] = len(common) data[b'nb-revs-common'] = len(common)
data[b'nb-revs-missing'] = len(missing) data[b'nb-revs-missing'] = len(missing)
data[b'nb-missing-heads'] = len(roots_missing)
data[b'nb-missing-roots'] = len(heads_missing)
# display discovery summary # display discovery summary
ui.writenoi18n(b"elapsed time: %(elapsed)f seconds\n" % data) ui.writenoi18n(b"elapsed time: %(elapsed)f seconds\n" % data)
ui.writenoi18n(b"heads summary:\n") ui.writenoi18n(b"heads summary:\n")
ui.writenoi18n(b" total common heads: %(nb-common-heads)9d\n" % data) ui.writenoi18n(b" total common heads: %(nb-common-heads)9d\n" % data)
ui.writenoi18n( ui.writenoi18n(
b" also local heads: %(nb-common-heads-local)9d\n" % data b" also local heads: %(nb-common-heads-local)9d\n" % data
) )
ui.writenoi18n( ui.writenoi18n(
b" common: %(nb-common-heads-remote)9d\n" % data b" common: %(nb-common-heads-remote)9d\n" % data
) )
ui.writenoi18n( ui.writenoi18n(
b" unknown: %(nb-head-remote-unknown)9d\n" % data b" unknown: %(nb-head-remote-unknown)9d\n" % data
) )
ui.writenoi18n(b"local changesets: %(nb-revs)9d\n" % data) ui.writenoi18n(b"local changesets: %(nb-revs)9d\n" % data)
ui.writenoi18n(b" common: %(nb-revs-common)9d\n" % data) ui.writenoi18n(b" common: %(nb-revs-common)9d\n" % data)
ui.writenoi18n(b" heads: %(nb-common-heads)9d\n" % data)
ui.writenoi18n(b" roots: %(nb-common-roots)9d\n" % data)
ui.writenoi18n(b" missing: %(nb-revs-missing)9d\n" % data) ui.writenoi18n(b" missing: %(nb-revs-missing)9d\n" % data)
ui.writenoi18n(b" heads: %(nb-missing-heads)9d\n" % data)
ui.writenoi18n(b" roots: %(nb-missing-roots)9d\n" % data)
if ui.verbose: if ui.verbose:
ui.writenoi18n( ui.writenoi18n(
b"common heads: %s\n" b"common heads: %s\n"
% b" ".join(sorted(short(n) for n in heads_common)) % b" ".join(sorted(short(n) for n in heads_common))
) )

tests/test-setdiscovery.t

local heads: 2 local heads: 2
common: 2 common: 2
missing: 0 missing: 0
remote heads: 3 remote heads: 3
common: 1 common: 1
unknown: 2 unknown: 2
local changesets: 7 local changesets: 7
common: 7 common: 7
heads: 2
roots: 1
missing: 0 missing: 0
heads: 0
roots: 0
common heads: 01241442b3c2 b5714e113bc0 common heads: 01241442b3c2 b5714e113bc0
% -- a -> b set % -- a -> b set
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
all local changesets known remotely all local changesets known remotely
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 2 total common heads: 2
also local heads: 2 also local heads: 2
also remote heads: 1 also remote heads: 1
both: 1 both: 1
local heads: 2 local heads: 2
common: 2 common: 2
missing: 0 missing: 0
remote heads: 3 remote heads: 3
common: 1 common: 1
unknown: 2 unknown: 2
local changesets: 7 local changesets: 7
common: 7 common: 7
heads: 2
roots: 1
missing: 0 missing: 0
heads: 0
roots: 0
common heads: 01241442b3c2 b5714e113bc0 common heads: 01241442b3c2 b5714e113bc0
% -- a -> b set (tip only) % -- a -> b set (tip only)
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
all local changesets known remotely all local changesets known remotely
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 1 also local heads: 1
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 2 local heads: 2
common: 1 common: 1
missing: 1 missing: 1
remote heads: 3 remote heads: 3
common: 0 common: 0
unknown: 3 unknown: 3
local changesets: 7 local changesets: 7
common: 6 common: 6
heads: 1
roots: 1
missing: 1 missing: 1
heads: 1
roots: 1
common heads: b5714e113bc0 common heads: b5714e113bc0
% -- b -> a tree % -- b -> a tree
comparing with a comparing with a
searching for changes searching for changes
unpruned common: 01241442b3c2 b5714e113bc0 unpruned common: 01241442b3c2 b5714e113bc0
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 2 total common heads: 2
also local heads: 1 also local heads: 1
also remote heads: 2 also remote heads: 2
both: 1 both: 1
local heads: 3 local heads: 3
common: 1 common: 1
missing: 2 missing: 2
remote heads: 2 remote heads: 2
common: 2 common: 2
unknown: 0 unknown: 0
local changesets: 15 local changesets: 15
common: 7 common: 7
heads: 2
roots: 1
missing: 8 missing: 8
heads: 2
roots: 2
common heads: 01241442b3c2 b5714e113bc0 common heads: 01241442b3c2 b5714e113bc0
% -- b -> a set % -- b -> a set
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
all remote heads known locally all remote heads known locally
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 2 total common heads: 2
also local heads: 1 also local heads: 1
also remote heads: 2 also remote heads: 2
both: 1 both: 1
local heads: 3 local heads: 3
common: 1 common: 1
missing: 2 missing: 2
remote heads: 2 remote heads: 2
common: 2 common: 2
unknown: 0 unknown: 0
local changesets: 15 local changesets: 15
common: 7 common: 7
heads: 2
roots: 1
missing: 8 missing: 8
heads: 2
roots: 2
common heads: 01241442b3c2 b5714e113bc0 common heads: 01241442b3c2 b5714e113bc0
% -- b -> a set (tip only) % -- b -> a set (tip only)
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
all remote heads known locally all remote heads known locally
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 2 total common heads: 2
also local heads: 1 also local heads: 1
also remote heads: 2 also remote heads: 2
both: 1 both: 1
local heads: 3 local heads: 3
common: 1 common: 1
missing: 2 missing: 2
remote heads: 2 remote heads: 2
common: 2 common: 2
unknown: 0 unknown: 0
local changesets: 15 local changesets: 15
common: 7 common: 7
heads: 2
roots: 1
missing: 8 missing: 8
heads: 2
roots: 2
common heads: 01241442b3c2 b5714e113bc0 common heads: 01241442b3c2 b5714e113bc0
Many new: Many new:
$ testdesc '-ra1 -ra2' '-rb' ' $ testdesc '-ra1 -ra2' '-rb' '
> +2:f +3:a1 +3:b > +2:f +3:a1 +3:b
> <f +30 :a2' > <f +30 :a2'
local heads: 2 local heads: 2
common: 1 common: 1
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 35 local changesets: 35
common: 5 common: 5
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: bebd167eb94d common heads: bebd167eb94d
% -- a -> b set % -- a -> b set
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking initial sample taking initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 29, sample size is: 29 query 2; still undecided: 29, sample size is: 29
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 1 also local heads: 1
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 2 local heads: 2
common: 1 common: 1
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 35 local changesets: 35
common: 5 common: 5
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: bebd167eb94d common heads: bebd167eb94d
% -- a -> b set (tip only) % -- a -> b set (tip only)
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 31, sample size is: 31 query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 2 local heads: 2
common: 0 common: 0
missing: 2 missing: 2
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 35 local changesets: 35
common: 2 common: 2
heads: 1
roots: 1
missing: 33 missing: 33
heads: 2
roots: 2
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- b -> a tree % -- b -> a tree
comparing with a comparing with a
searching for changes searching for changes
unpruned common: 66f7d451a68b bebd167eb94d unpruned common: 66f7d451a68b bebd167eb94d
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 1 also remote heads: 1
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 2 remote heads: 2
common: 1 common: 1
unknown: 1 unknown: 1
local changesets: 8 local changesets: 8
common: 5 common: 5
heads: 1
roots: 1
missing: 3 missing: 3
heads: 1
roots: 1
common heads: bebd167eb94d common heads: bebd167eb94d
% -- b -> a set % -- b -> a set
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking initial sample taking initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 2, sample size is: 2 query 2; still undecided: 2, sample size is: 2
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 1 also remote heads: 1
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 2 remote heads: 2
common: 1 common: 1
unknown: 1 unknown: 1
local changesets: 8 local changesets: 8
common: 5 common: 5
heads: 1
roots: 1
missing: 3 missing: 3
heads: 1
roots: 1
common heads: bebd167eb94d common heads: bebd167eb94d
% -- b -> a set (tip only) % -- b -> a set (tip only)
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking initial sample taking initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 2, sample size is: 2 query 2; still undecided: 2, sample size is: 2
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 1 also remote heads: 1
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 2 remote heads: 2
common: 1 common: 1
unknown: 1 unknown: 1
local changesets: 8 local changesets: 8
common: 5 common: 5
heads: 1
roots: 1
missing: 3 missing: 3
heads: 1
roots: 1
common heads: bebd167eb94d common heads: bebd167eb94d
Both sides many new with stub: Both sides many new with stub:
$ testdesc '-ra1 -ra2' '-rb' ' $ testdesc '-ra1 -ra2' '-rb' '
> +2:f +2:a1 +30 :b > +2:f +2:a1 +30 :b
> <f +30 :a2' > <f +30 :a2'
local heads: 2 local heads: 2
common: 1 common: 1
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 34 local changesets: 34
common: 4 common: 4
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 2dc09a01254d common heads: 2dc09a01254d
% -- a -> b set % -- a -> b set
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking initial sample taking initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 29, sample size is: 29 query 2; still undecided: 29, sample size is: 29
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 1 also local heads: 1
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 2 local heads: 2
common: 1 common: 1
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 34 local changesets: 34
common: 4 common: 4
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 2dc09a01254d common heads: 2dc09a01254d
% -- a -> b set (tip only) % -- a -> b set (tip only)
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 31, sample size is: 31 query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 2 local heads: 2
common: 0 common: 0
missing: 2 missing: 2
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 34 local changesets: 34
common: 2 common: 2
heads: 1
roots: 1
missing: 32 missing: 32
heads: 2
roots: 2
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- b -> a tree % -- b -> a tree
comparing with a comparing with a
searching for changes searching for changes
unpruned common: 2dc09a01254d 66f7d451a68b unpruned common: 2dc09a01254d 66f7d451a68b
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 1 also remote heads: 1
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 2 remote heads: 2
common: 1 common: 1
unknown: 1 unknown: 1
local changesets: 34 local changesets: 34
common: 4 common: 4
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 2dc09a01254d common heads: 2dc09a01254d
% -- b -> a set % -- b -> a set
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking initial sample taking initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 29, sample size is: 29 query 2; still undecided: 29, sample size is: 29
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 1 also remote heads: 1
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 2 remote heads: 2
common: 1 common: 1
unknown: 1 unknown: 1
local changesets: 34 local changesets: 34
common: 4 common: 4
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 2dc09a01254d common heads: 2dc09a01254d
% -- b -> a set (tip only) % -- b -> a set (tip only)
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking initial sample taking initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 29, sample size is: 29 query 2; still undecided: 29, sample size is: 29
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 1 also remote heads: 1
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 2 remote heads: 2
common: 1 common: 1
unknown: 1 unknown: 1
local changesets: 34 local changesets: 34
common: 4 common: 4
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 2dc09a01254d common heads: 2dc09a01254d
Both many new: Both many new:
$ testdesc '-ra' '-rb' ' $ testdesc '-ra' '-rb' '
> +2:f +30 :b > +2:f +30 :b
> <f +30 :a' > <f +30 :a'
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 32 local changesets: 32
common: 2 common: 2
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- a -> b set % -- a -> b set
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 31, sample size is: 31 query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 32 local changesets: 32
common: 2 common: 2
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- a -> b set (tip only) % -- a -> b set (tip only)
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 31, sample size is: 31 query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 32 local changesets: 32
common: 2 common: 2
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- b -> a tree % -- b -> a tree
comparing with a comparing with a
searching for changes searching for changes
unpruned common: 66f7d451a68b unpruned common: 66f7d451a68b
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 32 local changesets: 32
common: 2 common: 2
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- b -> a set % -- b -> a set
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 31, sample size is: 31 query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 32 local changesets: 32
common: 2 common: 2
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- b -> a set (tip only) % -- b -> a set (tip only)
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 31, sample size is: 31 query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 32 local changesets: 32
common: 2 common: 2
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
Both many new skewed: Both many new skewed:
$ testdesc '-ra' '-rb' ' $ testdesc '-ra' '-rb' '
> +2:f +30 :b > +2:f +30 :b
> <f +50 :a' > <f +50 :a'
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 52 local changesets: 52
common: 2 common: 2
heads: 1
roots: 1
missing: 50 missing: 50
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- a -> b set % -- a -> b set
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 51, sample size is: 51 query 2; still undecided: 51, sample size is: 51
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 52 local changesets: 52
common: 2 common: 2
heads: 1
roots: 1
missing: 50 missing: 50
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- a -> b set (tip only) % -- a -> b set (tip only)
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 51, sample size is: 51 query 2; still undecided: 51, sample size is: 51
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 52 local changesets: 52
common: 2 common: 2
heads: 1
roots: 1
missing: 50 missing: 50
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- b -> a tree % -- b -> a tree
comparing with a comparing with a
searching for changes searching for changes
unpruned common: 66f7d451a68b unpruned common: 66f7d451a68b
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 32 local changesets: 32
common: 2 common: 2
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- b -> a set % -- b -> a set
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 31, sample size is: 31 query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 32 local changesets: 32
common: 2 common: 2
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
% -- b -> a set (tip only) % -- b -> a set (tip only)
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 31, sample size is: 31 query 2; still undecided: 31, sample size is: 31
2 total queries in *.????s (glob) 2 total queries in *.????s (glob)
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 32 local changesets: 32
common: 2 common: 2
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b
Both many new on top of long history: Both many new on top of long history:
$ testdesc '-ra' '-rb' ' $ testdesc '-ra' '-rb' '
> +1000:f +30 :b > +1000:f +30 :b
> <f +50 :a' > <f +50 :a'
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 1050 local changesets: 1050
common: 1000 common: 1000
heads: 1
roots: 1
missing: 50 missing: 50
heads: 1
roots: 1
common heads: 7ead0cba2838 common heads: 7ead0cba2838
% -- a -> b set % -- a -> b set
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 1050 local changesets: 1050
common: 1000 common: 1000
heads: 1
roots: 1
missing: 50 missing: 50
heads: 1
roots: 1
common heads: 7ead0cba2838 common heads: 7ead0cba2838
% -- a -> b set (tip only) % -- a -> b set (tip only)
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 1050 local changesets: 1050
common: 1000 common: 1000
heads: 1
roots: 1
missing: 50 missing: 50
heads: 1
roots: 1
common heads: 7ead0cba2838 common heads: 7ead0cba2838
% -- b -> a tree % -- b -> a tree
comparing with a comparing with a
searching for changes searching for changes
unpruned common: 7ead0cba2838 unpruned common: 7ead0cba2838
elapsed time: * seconds (glob) elapsed time: * seconds (glob)
heads summary: heads summary:
total common heads: 1 total common heads: 1
also local heads: 0 also local heads: 0
also remote heads: 0 also remote heads: 0
both: 0 both: 0
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 1030 local changesets: 1030
common: 1000 common: 1000
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 7ead0cba2838 common heads: 7ead0cba2838
% -- b -> a set % -- b -> a set
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 1030 local changesets: 1030
common: 1000 common: 1000
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 7ead0cba2838 common heads: 7ead0cba2838
% -- b -> a set (tip only) % -- b -> a set (tip only)
comparing with a comparing with a
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
local heads: 1 local heads: 1
common: 0 common: 0
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 1030 local changesets: 1030
common: 1000 common: 1000
heads: 1
roots: 1
missing: 30 missing: 30
heads: 1
roots: 1
common heads: 7ead0cba2838 common heads: 7ead0cba2838
One with >200 heads. We now switch to send them all in the initial roundtrip, but still do sampling for the later request. One with >200 heads. We now switch to send them all in the initial roundtrip, but still do sampling for the later request.
$ hg init manyheads $ hg init manyheads
$ cd manyheads $ cd manyheads
$ echo "+300:r @a" >dagdesc $ echo "+300:r @a" >dagdesc
local heads: 260 local heads: 260
common: 0 common: 0
missing: 260 missing: 260
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 1340 local changesets: 1340
common: 300 common: 300
heads: 1
roots: 1
missing: 1040 missing: 1040
heads: 260
roots: 260
common heads: 3ee37d65064a common heads: 3ee37d65064a
$ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip
comparing with b comparing with b
query 1; heads query 1; heads
searching for changes searching for changes
taking quick initial sample taking quick initial sample
searching: 2 queries searching: 2 queries
query 2; still undecided: 303, sample size is: 9 query 2; still undecided: 303, sample size is: 9
local heads: 260 local heads: 260
common: 0 common: 0
missing: 260 missing: 260
remote heads: 1 remote heads: 1
common: 0 common: 0
unknown: 1 unknown: 1
local changesets: 1340 local changesets: 1340
common: 300 common: 300
heads: 1
roots: 1
missing: 1040 missing: 1040
heads: 260
roots: 260
common heads: 3ee37d65064a common heads: 3ee37d65064a
Test actual protocol when pulling one new head in addition to common heads Test actual protocol when pulling one new head in addition to common heads
$ hg clone -U b c $ hg clone -U b c
$ hg -R c id -ir tip $ hg -R c id -ir tip
513314ca8b3a 513314ca8b3a
$ hg -R c up -qr default $ hg -R c up -qr default
local heads: 2 local heads: 2
common: 1 common: 1
missing: 1 missing: 1
remote heads: 1 remote heads: 1
common: 1 common: 1
unknown: 0 unknown: 0
local changesets: 3 local changesets: 3
common: 2 common: 2
heads: 1
roots: 1
missing: 1 missing: 1
heads: 1
roots: 1
common heads: 66f7d451a68b common heads: 66f7d451a68b