setdiscovery: stop limiting the number of local head we initially send

In our testing this limitation provides now real gain and instead triggers
pathological discovery timing for some repository with many heads.

See inline documentation for details.

Some timing below:

Mozilla try repository, (~1M revs, ~35K heads), discovery between 2 clones with
100 head missing on each side

before:
! wall 1.492111 comb 1.490000 user 1.450000 sys 0.040000 (best of 20)
! wall 1.813992 comb 1.820000 user 1.700000 sys 0.120000 (max of 20)
! wall 1.574326 comb 1.573500 user 1.522000 sys 0.051500 (avg of 20)
! wall 1.572583 comb 1.570000 user 1.520000 sys 0.050000 (median of 20)

after:
! wall 1.147834 comb 1.150000 user 1.090000 sys 0.060000 (best of 20)
! wall 1.449144 comb 1.450000 user 1.330000 sys 0.120000 (max of 20)
! wall 1.204618 comb 1.202500 user 1.146500 sys 0.056000 (avg of 20)
! wall 1.194407 comb 1.190000 user 1.140000 sys 0.050000 (median of 20)


pypy (~100 heads, 317 heads) discovery between clones with only 42 common heads

before:
! wall 0.031653 comb 0.030000 user 0.030000 sys 0.000000 (best of 25)
! wall 0.055719 comb 0.050000 user 0.040000 sys 0.010000 (max of 25)
! wall 0.038939 comb 0.039600 user 0.038400 sys 0.001200 (avg of 25)
! wall 0.038660 comb 0.050000 user 0.040000 sys 0.010000 (median of 25)

after:
! wall 0.018754 comb 0.020000 user 0.020000 sys 0.000000 (best of 49)
! wall 0.034505 comb 0.040000 user 0.030000 sys 0.010000 (max of 49)
! wall 0.019631 comb 0.019796 user 0.018367 sys 0.001429 (avg of 49)
! wall 0.019132 comb 0.020000 user 0.020000 sys 0.000000 (median of 49)


Private repository (~1M revs, ~3K heads), discovery from a strip subset, about
100 changesets to be pulled.

before:
! wall 1.837729 comb 1.840000 user 1.790000 sys 0.050000 (best of 20)
! wall 2.203468 comb 2.200000 user 2.100000 sys 0.100000 (max of 20)
! wall 2.049355 comb 2.048500 user 2.002500 sys 0.046000 (avg of 20)
! wall 2.035315 comb 2.040000 user 2.000000 sys 0.040000 (median of 20)

after:
! wall 0.136598 comb 0.130000 user 0.110000 sys 0.020000 (best of 20)
! wall 0.330519 comb 0.330000 user 0.260000 sys 0.070000 (max of 20)
! wall 0.157254 comb 0.155500 user 0.123000 sys 0.032500 (avg of 20)
! wall 0.149870 comb 0.140000 user 0.110000 sys 0.030000 (median of 20)


Same private repo, discovery between two clone with 500 different heads on each
side:

before:
! wall 2.372919 comb 2.370000 user 2.320000 sys 0.050000 (best of 20)
! wall 2.622422 comb 2.610000 user 2.510000 sys 0.100000 (max of 20)
! wall 2.450135 comb 2.450000 user 2.402000 sys 0.048000 (avg of 20)
! wall 2.443896 comb 2.450000 user 2.410000 sys 0.040000 (median of 20)

after:
! wall 0.625497 comb 0.620000 user 0.570000 sys 0.050000 (best of 20)
! wall 0.834723 comb 0.820000 user 0.730000 sys 0.090000 (max of 20)
! wall 0.675725 comb 0.675500 user 0.628000 sys 0.047500 (avg of 20)
! wall 0.671614 comb 0.680000 user 0.640000 sys 0.040000 (median of 20)

mercurial/setdiscovery.py

@@ -1,382 +1,436 b''
 # setdiscovery.py - improved discovery of common nodeset for mercurial
 #
 # Copyright 2010 Benoit Boissinot <[e-mail]>
 # and Peter Arrenbrecht <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 """
 Algorithm works in the following way. You have two repository: local and
 remote. They both contains a DAG of changelists.
 
 The goal of the discovery protocol is to find one set of node *common*,
 the set of nodes shared by local and remote.
 
 One of the issue with the original protocol was latency, it could
 potentially require lots of roundtrips to discover that the local repo was a
 subset of remote (which is a very common case, you usually have few changes
 compared to upstream, while upstream probably had lots of development).
 
 The new protocol only requires one interface for the remote repo: `known()`,
 which given a set of changelists tells you if they are present in the DAG.
 
 The algorithm then works as follow:
 
  - We will be using three sets, `common`, `missing`, `unknown`. Originally
  all nodes are in `unknown`.
  - Take a sample from `unknown`, call `remote.known(sample)`
    - For each node that remote knows, move it and all its ancestors to `common`
    - For each node that remote doesn't know, move it and all its descendants
    to `missing`
  - Iterate until `unknown` is empty
 
 There are a couple optimizations, first is instead of starting with a random
 sample of missing, start by sending all heads, in the case where the local
 repo is a subset, you computed the answer in one round trip.
 
 Then you can do something similar to the bisecting strategy used when
 finding faulty changesets. Instead of random samples, you can try picking
 nodes that will maximize the number of nodes that will be
 classified with it (since all ancestors or descendants will be marked as well).
 """
 
 from __future__ import absolute_import
 
 import collections
 import random
 
 from .i18n import _
 from .node import (
     nullid,
     nullrev,
 )
 from . import (
     error,
     util,
 )
 
 def _updatesample(revs, heads, sample, parentfn, quicksamplesize=0):
     """update an existing sample to match the expected size
 
     The sample is updated with revs exponentially distant from each head of the
     <revs> set. (H~1, H~2, H~4, H~8, etc).
 
     If a target size is specified, the sampling will stop once this size is
     reached. Otherwise sampling will happen until roots of the <revs> set are
     reached.
 
     :revs:  set of revs we want to discover (if None, assume the whole dag)
     :heads: set of DAG head revs
     :sample: a sample to update
     :parentfn: a callable to resolve parents for a revision
     :quicksamplesize: optional target size of the sample"""
     dist = {}
     visit = collections.deque(heads)
     seen = set()
     factor = 1
     while visit:
         curr = visit.popleft()
         if curr in seen:
             continue
         d = dist.setdefault(curr, 1)
         if d > factor:
             factor *= 2
         if d == factor:
             sample.add(curr)
             if quicksamplesize and (len(sample) >= quicksamplesize):
                 return
         seen.add(curr)
 
         for p in parentfn(curr):
             if p != nullrev and (not revs or p in revs):
                 dist.setdefault(p, d + 1)
                 visit.append(p)
 
 def _limitsample(sample, desiredlen):
     """return a random subset of sample of at most desiredlen item"""
     if len(sample) > desiredlen:
         sample = set(random.sample(sample, desiredlen))
     return sample
 
 class partialdiscovery(object):
     """an object representing ongoing discovery
 
     Feed with data from the remote repository, this object keep track of the
     current set of changeset in various states:
 
     - common:    revs also known remotely
     - undecided: revs we don't have information on yet
     - missing:   revs missing remotely
     (all tracked revisions are known locally)
     """
 
     def __init__(self, repo, targetheads):
         self._repo = repo
         self._targetheads = targetheads
         self._common = repo.changelog.incrementalmissingrevs()
         self._undecided = None
         self.missing = set()
         self._childrenmap = None
 
     def addcommons(self, commons):
         """registrer nodes known as common"""
         self._common.addbases(commons)
         if self._undecided is not None:
             self._common.removeancestorsfrom(self._undecided)
 
     def addmissings(self, missings):
         """registrer some nodes as missing"""
         newmissing = self._repo.revs('%ld::%ld', missings, self.undecided)
         if newmissing:
             self.missing.update(newmissing)
             self.undecided.difference_update(newmissing)
 
     def addinfo(self, sample):
         """consume an iterable of (rev, known) tuples"""
         common = set()
         missing = set()
         for rev, known in sample:
             if known:
                 common.add(rev)
             else:
                 missing.add(rev)
         if common:
             self.addcommons(common)
         if missing:
             self.addmissings(missing)
 
     def hasinfo(self):
         """return True is we have any clue about the remote state"""
         return self._common.hasbases()
 
     def iscomplete(self):
         """True if all the necessary data have been gathered"""
         return self._undecided is not None and not self._undecided
 
     @property
     def undecided(self):
         if self._undecided is not None:
             return self._undecided
         self._undecided = set(self._common.missingancestors(self._targetheads))
         return self._undecided
 
     def stats(self):
         return {
             'undecided': len(self.undecided),
         }
 
     def commonheads(self):
         """the heads of the known common set"""
         # heads(common) == heads(common.bases) since common represents
         # common.bases and all its ancestors
         return self._common.basesheads()
 
     def _parentsgetter(self):
         getrev = self._repo.changelog.index.__getitem__
         def getparents(r):
             return getrev(r)[5:7]
         return getparents
 
     def _childrengetter(self):
 
         if self._childrenmap is not None:
             # During discovery, the `undecided` set keep shrinking.
             # Therefore, the map computed for an iteration N will be
             # valid for iteration N+1. Instead of computing the same
             # data over and over we cached it the first time.
             return self._childrenmap.__getitem__
 
         # _updatesample() essentially does interaction over revisions to look
         # up their children. This lookup is expensive and doing it in a loop is
         # quadratic. We precompute the children for all relevant revisions and
         # make the lookup in _updatesample() a simple dict lookup.
         self._childrenmap = children = {}
 
         parentrevs = self._parentsgetter()
         revs = self.undecided
 
         for rev in sorted(revs):
             # Always ensure revision has an entry so we don't need to worry
             # about missing keys.
             children[rev] = []
             for prev in parentrevs(rev):
                 if prev == nullrev:
                     continue
                 c = children.get(prev)
                 if c is not None:
                     c.append(rev)
         return children.__getitem__
 
     def takequicksample(self, headrevs, size):
         """takes a quick sample of size <size>
 
         It is meant for initial sampling and focuses on querying heads and close
         ancestors of heads.
 
         :headrevs: set of head revisions in local DAG to consider
         :size: the maximum size of the sample"""
         revs = self.undecided
         if len(revs) <= size:
             return list(revs)
         sample = set(self._repo.revs('heads(%ld)', revs))
 
         if len(sample) >= size:
             return _limitsample(sample, size)
 
         _updatesample(None, headrevs, sample, self._parentsgetter(),
                       quicksamplesize=size)
         return sample
 
     def takefullsample(self, headrevs, size):
         revs = self.undecided
         if len(revs) <= size:
             return list(revs)
         repo = self._repo
         sample = set(repo.revs('heads(%ld)', revs))
         parentrevs = self._parentsgetter()
 
         # update from heads
         revsheads = sample.copy()
         _updatesample(revs, revsheads, sample, parentrevs)
 
         # update from roots
         revsroots = set(repo.revs('roots(%ld)', revs))
 
         childrenrevs = self._childrengetter()
 
         _updatesample(revs, revsroots, sample, childrenrevs)
         assert sample
         sample = _limitsample(sample, size)
         if len(sample) < size:
             more = size - len(sample)
             sample.update(random.sample(list(revs - sample), more))
         return sample
 
 def findcommonheads(ui, local, remote,
                     initialsamplesize=100,
                     fullsamplesize=200,
                     abortwhenunrelated=True,
                     ancestorsof=None):
     '''Return a tuple (common, anyincoming, remoteheads) used to identify
     missing nodes from or in remote.
     '''
     start = util.timer()
 
     roundtrips = 0
     cl = local.changelog
     clnode = cl.node
     clrev = cl.rev
 
     if ancestorsof is not None:
         ownheads = [clrev(n) for n in ancestorsof]
     else:
         ownheads = [rev for rev in cl.headrevs() if rev != nullrev]
 
     # early exit if we know all the specified remote heads already
     ui.debug("query 1; heads\n")
     roundtrips += 1
-    sample = _limitsample(ownheads, initialsamplesize)
-    # indices between sample and externalized version must match
-    sample = list(sample)
+    # We also ask remote about all the local heads. That set can be arbitrarily
+    # large, so we used to limit it size to `initialsamplesize`. We no longer
+    # do as it proved counter productive. The skipped heads could lead to a
+    # large "undecided" set, slower to be clarified than if we asked the
+    # question for all heads right away.
+    #
+    # We are already fetching all server heads using the `heads` commands,
+    # sending a equivalent number of heads the other way should not have a
+    # significant impact.  In addition, it is very likely that we are going to
+    # have to issue "known" request for an equivalent amount of revisions in
+    # order to decide if theses heads are common or missing.
+    #
+    # find a detailled analysis below.
+    #
+    # Case A: local and server both has few heads
+    #
+    #     Ownheads is below initialsamplesize, limit would not have any effect.
+    #
+    # Case B: local has few heads and server has many
+    #
+    #     Ownheads is below initialsamplesize, limit would not have any effect.
+    #
+    # Case C: local and server both has many heads
+    #
+    #     We now transfert some more data, but not significantly more than is
+    #     already transfered to carry the server heads.
+    #
+    # Case D: local has many heads, server has few
+    #
+    #   D.1 local heads are mostly known remotely
+    #
+    #     All the known head will have be part of a `known` request at some
+    #     point for the discovery to finish. Sending them all earlier is
+    #     actually helping.
+    #
+    #     (This case is fairly unlikely, it requires the numerous heads to all
+    #     be merged server side in only a few heads)
+    #
+    #   D.2 local heads are mostly missing remotely
+    #
+    #     To determine that the heads are missing, we'll have to issue `known`
+    #     request for them or one of their ancestors. This amount of `known`
+    #     request will likely be in the same order of magnitude than the amount
+    #     of local heads.
+    #
+    #     The only case where we can be more efficient using `known` request on
+    #     ancestors are case were all the "missing" local heads are based on a
+    #     few changeset, also "missing".  This means we would have a "complex"
+    #     graph (with many heads) attached to, but very independant to a the
+    #     "simple" graph on the server. This is a fairly usual case and have
+    #     not been met in the wild so far.
+    if remote.limitedarguments:
+        sample = _limitsample(ownheads, initialsamplesize)
+        # indices between sample and externalized version must match
+        sample = list(sample)
+    else:
+        sample = ownheads
 
     with remote.commandexecutor() as e:
         fheads = e.callcommand('heads', {})
         fknown = e.callcommand('known', {
             'nodes': [clnode(r) for r in sample],
         })
 
     srvheadhashes, yesno = fheads.result(), fknown.result()
 
     if cl.tip() == nullid:
         if srvheadhashes != [nullid]:
             return [nullid], True, srvheadhashes
         return [nullid], False, []
 
     # start actual discovery (we note this before the next "if" for
     # compatibility reasons)
     ui.status(_("searching for changes\n"))
 
     knownsrvheads = []  # revnos of remote heads that are known locally
     for node in srvheadhashes:
         if node == nullid:
             continue
 
         try:
             knownsrvheads.append(clrev(node))
         # Catches unknown and filtered nodes.
         except error.LookupError:
             continue
 
     if len(knownsrvheads) == len(srvheadhashes):
         ui.debug("all remote heads known locally\n")
         return srvheadhashes, False, srvheadhashes
 
     if len(sample) == len(ownheads) and all(yesno):
         ui.note(_("all local heads known remotely\n"))
         ownheadhashes = [clnode(r) for r in ownheads]
         return ownheadhashes, True, srvheadhashes
 
     # full blown discovery
 
     disco = partialdiscovery(local, ownheads)
     # treat remote heads (and maybe own heads) as a first implicit sample
     # response
     disco.addcommons(knownsrvheads)
     disco.addinfo(zip(sample, yesno))
 
     full = False
     progress = ui.makeprogress(_('searching'), unit=_('queries'))
     while not disco.iscomplete():
 
         if full or disco.hasinfo():
             if full:
                 ui.note(_("sampling from both directions\n"))
             else:
                 ui.debug("taking initial sample\n")
             samplefunc = disco.takefullsample
             targetsize = fullsamplesize
         else:
             # use even cheaper initial sample
             ui.debug("taking quick initial sample\n")
             samplefunc = disco.takequicksample
             targetsize = initialsamplesize
         sample = samplefunc(ownheads, targetsize)
 
         roundtrips += 1
         progress.update(roundtrips)
         stats = disco.stats()
         ui.debug("query %i; still undecided: %i, sample size is: %i\n"
                  % (roundtrips, stats['undecided'], len(sample)))
 
         # indices between sample and externalized version must match
         sample = list(sample)
 
         with remote.commandexecutor() as e:
             yesno = e.callcommand('known', {
                 'nodes': [clnode(r) for r in sample],
             }).result()
 
         full = True
 
         disco.addinfo(zip(sample, yesno))
 
     result = disco.commonheads()
     elapsed = util.timer() - start
     progress.complete()
     ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed))
     msg = ('found %d common and %d unknown server heads,'
            ' %d roundtrips in %.4fs\n')
     missing = set(result) - set(knownsrvheads)
     ui.log('discovery', msg, len(result), len(missing), roundtrips,
            elapsed)
 
     if not result and srvheadhashes != [nullid]:
         if abortwhenunrelated:
             raise error.Abort(_("repository is unrelated"))
         else:
             ui.warn(_("warning: repository is unrelated\n"))
         return ({nullid}, True, srvheadhashes,)
 
     anyincoming = (srvheadhashes != [nullid])
     result = {clnode(r) for r in result}
     return result, anyincoming, srvheadhashes

tests/test-setdiscovery.t

@@ -1,1121 +1,1118 b''
 
 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
   >     if [ -d foo ]; then rm -rf foo; fi
   >     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"
   >     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 ..
   > }
 
 
 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
   unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          2
       also local heads:          2
       also remote heads:         1
       both:                      1
     local heads:                 2
       common:                    2
       missing:                   0
     remote heads:                3
       common:                    1
       unknown:                   2
   local changesets:              7
     common:                      7
     missing:                     0
   common heads: 01241442b3c2 b5714e113bc0
   
   % -- a -> b set
   comparing with b
   query 1; heads
   searching for changes
   all local heads known remotely
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          2
       also local heads:          2
       also remote heads:         1
       both:                      1
     local heads:                 2
       common:                    2
       missing:                   0
     remote heads:                3
       common:                    1
       unknown:                   2
   local changesets:              7
     common:                      7
     missing:                     0
   common heads: 01241442b3c2 b5714e113bc0
   
   % -- a -> b set (tip only)
   comparing with b
   query 1; heads
   searching for changes
   all local heads known remotely
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          1
       also remote heads:         0
       both:                      0
     local heads:                 2
       common:                    1
       missing:                   1
     remote heads:                3
       common:                    0
       unknown:                   3
   local changesets:              7
     common:                      6
     missing:                     1
   common heads: b5714e113bc0
   
   % -- b -> a tree
   comparing with a
   searching for changes
   unpruned common: 01241442b3c2 b5714e113bc0
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          2
       also local heads:          1
       also remote heads:         2
       both:                      1
     local heads:                 3
       common:                    1
       missing:                   2
     remote heads:                2
       common:                    2
       unknown:                   0
   local changesets:             15
     common:                      7
     missing:                     8
   common heads: 01241442b3c2 b5714e113bc0
   
   % -- b -> a set
   comparing with a
   query 1; heads
   searching for changes
   all remote heads known locally
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          2
       also local heads:          1
       also remote heads:         2
       both:                      1
     local heads:                 3
       common:                    1
       missing:                   2
     remote heads:                2
       common:                    2
       unknown:                   0
   local changesets:             15
     common:                      7
     missing:                     8
   common heads: 01241442b3c2 b5714e113bc0
   
   % -- b -> a set (tip only)
   comparing with a
   query 1; heads
   searching for changes
   all remote heads known locally
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          2
       also local heads:          1
       also remote heads:         2
       both:                      1
     local heads:                 3
       common:                    1
       missing:                   2
     remote heads:                2
       common:                    2
       unknown:                   0
   local changesets:             15
     common:                      7
     missing:                     8
   common heads: 01241442b3c2 b5714e113bc0
 
 
 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
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          1
       also remote heads:         0
       both:                      0
     local heads:                 2
       common:                    1
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             35
     common:                      5
     missing:                    30
   common heads: bebd167eb94d
   
   % -- a -> b set
   comparing with b
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          1
       also remote heads:         0
       both:                      0
     local heads:                 2
       common:                    1
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             35
     common:                      5
     missing:                    30
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 2
       common:                    0
       missing:                   2
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             35
     common:                      2
     missing:                    33
   common heads: 66f7d451a68b
   
   % -- b -> a tree
   comparing with a
   searching for changes
   unpruned common: 66f7d451a68b bebd167eb94d
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         1
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                2
       common:                    1
       unknown:                   1
   local changesets:              8
     common:                      5
     missing:                     3
   common heads: bebd167eb94d
   
   % -- b -> a set
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         1
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                2
       common:                    1
       unknown:                   1
   local changesets:              8
     common:                      5
     missing:                     3
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         1
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                2
       common:                    1
       unknown:                   1
   local changesets:              8
     common:                      5
     missing:                     3
   common heads: bebd167eb94d
 
 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
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          1
       also remote heads:         0
       both:                      0
     local heads:                 2
       common:                    1
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             34
     common:                      4
     missing:                    30
   common heads: 2dc09a01254d
   
   % -- a -> b set
   comparing with b
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          1
       also remote heads:         0
       both:                      0
     local heads:                 2
       common:                    1
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             34
     common:                      4
     missing:                    30
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 2
       common:                    0
       missing:                   2
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             34
     common:                      2
     missing:                    32
   common heads: 66f7d451a68b
   
   % -- b -> a tree
   comparing with a
   searching for changes
   unpruned common: 2dc09a01254d 66f7d451a68b
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         1
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                2
       common:                    1
       unknown:                   1
   local changesets:             34
     common:                      4
     missing:                    30
   common heads: 2dc09a01254d
   
   % -- b -> a set
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         1
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                2
       common:                    1
       unknown:                   1
   local changesets:             34
     common:                      4
     missing:                    30
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         1
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                2
       common:                    1
       unknown:                   1
   local changesets:             34
     common:                      4
     missing:                    30
   common heads: 2dc09a01254d
 
 
 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
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             32
     common:                      2
     missing:                    30
   common heads: 66f7d451a68b
   
   % -- a -> b set
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             32
     common:                      2
     missing:                    30
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             32
     common:                      2
     missing:                    30
   common heads: 66f7d451a68b
   
   % -- b -> a tree
   comparing with a
   searching for changes
   unpruned common: 66f7d451a68b
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             32
     common:                      2
     missing:                    30
   common heads: 66f7d451a68b
   
   % -- b -> a set
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             32
     common:                      2
     missing:                    30
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             32
     common:                      2
     missing:                    30
   common heads: 66f7d451a68b
 
 
 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
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             52
     common:                      2
     missing:                    50
   common heads: 66f7d451a68b
   
   % -- a -> b set
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             52
     common:                      2
     missing:                    50
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             52
     common:                      2
     missing:                    50
   common heads: 66f7d451a68b
   
   % -- b -> a tree
   comparing with a
   searching for changes
   unpruned common: 66f7d451a68b
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             32
     common:                      2
     missing:                    30
   common heads: 66f7d451a68b
   
   % -- b -> a set
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             32
     common:                      2
     missing:                    30
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:             32
     common:                      2
     missing:                    30
   common heads: 66f7d451a68b
 
 
 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
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:           1050
     common:                   1000
     missing:                    50
   common heads: 7ead0cba2838
   
   % -- a -> b set
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:           1050
     common:                   1000
     missing:                    50
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:           1050
     common:                   1000
     missing:                    50
   common heads: 7ead0cba2838
   
   % -- b -> a tree
   comparing with a
   searching for changes
   unpruned common: 7ead0cba2838
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:           1030
     common:                   1000
     missing:                    30
   common heads: 7ead0cba2838
   
   % -- b -> a set
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:           1030
     common:                   1000
     missing:                    30
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:                 1
       common:                    0
       missing:                   1
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:           1030
     common:                   1000
     missing:                    30
   common heads: 7ead0cba2838
 
 
-One with >200 heads, which used to use up all of the sample:
+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
   $ 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
   \s*261 (re)
 
   $ hg clone -b a . a
   adding changesets
   adding manifests
   adding file changes
   added 1340 changesets with 0 changes to 0 files (+259 heads)
   new changesets 1ea73414a91b:1c51e2c80832
   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
   new changesets 1ea73414a91b:513314ca8b3a
   updating to branch b
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true
   comparing with b
   query 1; heads
   searching for changes
   taking quick initial sample
   searching: 2 queries
-  query 2; still undecided: 1240, sample size is: 100
+  query 2; still undecided: 1080, sample size is: 100
   sampling from both directions
   searching: 3 queries
-  query 3; still undecided: 1140, sample size is: 200
+  query 3; still undecided: 980, sample size is: 200
   sampling from both directions
   searching: 4 queries
   query 4; still undecided: \d+, sample size is: 200 (re)
   sampling from both directions
   searching: 5 queries
-  query 5; still undecided: \d+, sample size is: 200 (re)
-  sampling from both directions
-  searching: 6 queries
-  query 6; still undecided: \d+, sample size is: \d+ (re)
-  6 total queries in *.????s (glob)
+  query 5; still undecided: 195, sample size is: 195
+  5 total queries in *.????s (glob)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:               260
       common:                    0
       missing:                 260
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:           1340
     common:                    300
     missing:                  1040
   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)
   elapsed time:  * seconds (glob)
   heads summary:
     total common heads:          1
       also local heads:          0
       also remote heads:         0
       both:                      0
     local heads:               260
       common:                    0
       missing:                 260
     remote heads:                1
       common:                    0
       unknown:                   1
   local changesets:           1340
     common:                    300
     missing:                  1040
   common heads: 3ee37d65064a
 
 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
 
   $ killdaemons.py
   $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "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
   $ cat errors.log
 
   $ cd ..
 
 
 Issue 4438 - test coverage for 3ef893520a85 issues.
 
   $ mkdir issue4438
   $ cd issue4438
 #if false
 generate new bundles:
   $ hg init r1
   $ 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
   $ hg clone -q r1 r2
   $ 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
   $ 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:
   $ 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
 #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 >> $TESTTMP/unrandomsample.py << EOF
   > import random
   > def sample(population, k):
   >     return sorted(population)[:k]
   > random.sample = sample
   > EOF
 
   $ cat >> r1/.hg/hgrc << EOF
   > [extensions]
   > unrandomsample = $TESTTMP/unrandomsample.py
   > EOF
 
   $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox= \
   > --config blackbox.track='command commandfinish discovery'
   comparing with r2
   searching for changes
   101 102 103 104 105 106 107 108 109 110  (no-eol)
   $ hg -R r1 --config extensions.blackbox= blackbox --config blackbox.track=
   * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !)
   * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob)
-  * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 2 roundtrips in *.????s (glob)
+  * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 1 roundtrips in *.????s (glob)
   * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob)
   $ cd ..