setdiscovery: make progress on most connected groups each roundtrip

Consider history like this:

  o
  | o
  | |
  | o
  | |
  | o
  |/
  o
  | o
  | |
  | o
  | |
  | o
  |/
  o
  | o
  | |
  | o
  | |
  | o
  |/
  o
  ~

Assume the left mainline is available in the remote repo and the other
commits are only in the local repo. Also imagine that instead of 3
local branches with 3 commits on each, there are 1000 branches (the
number of commits on each doesn't matter much here). In such a
scenario, the current setdiscovery code will pick a sample size of 200
among these branches and ask the remote which of them it has. However,
the discovery for each such branch is completely independent of the
discovery for the others -- knowing whether the remote has a commit in
one branch doesn't give us any information about the other
branches. The discovery will therefore take at least 5 roundtrips
(maybe more depending on which commit in each linear chain was
sampled). Since the discovery for each branch is independent, there is
no reason to let one branch wait for another, so this patch makes it
so we sample at least as many commits as there are branches. It may
still happen (it's very likely, even) that we get multiple samples
from one branch and none from another, but that will even out over a
few rounds and I think this is still a big improvement.

Because of http header size limits, we still use the old behavior
unless experimental.httppostargs=true.

I've timed this by running `hg debugdiscovery mozilla-unified --debug` in the
mozilla-try repo. Both repos were local. Before this patch, last part
of the output was:


  2249 total queries in 5276.4859s
  elapsed time:  5276.652634 seconds
  heads summary:
    total common heads:         13
      also local heads:          4
      also remote heads:         8
      both:                      4
    local heads:             28317
      common:                    4
      missing:               28313
    remote heads:               12
      common:                    8
      unknown:                   4
  local changesets:        2014901
    common:                 530373
    missing:               1484528
  common heads: 1dad417c28ad 4a108e94d3e2 4d7ef530fffb 5350524bb654 777e60ca8853 7d97fafba271 9cd2ab4d0029 a55ce37217da d38398e5144e dcc6d7a0dc00 e09297892ada e24ec6070d7b fd559328eaf3


After this patch, the output was (including all the samples, since
there were so few now):

  taking initial sample
  query 2; still undecided: 1599476, sample size is: 108195
  sampling from both directions
  query 3; still undecided: 810922, sample size is: 194158
  sampling from both directions
  query 4; still undecided: 325882, sample size is: 137302
  sampling from both directions
  query 5; still undecided: 111459, sample size is: 74586
  sampling from both directions
  query 6; still undecided: 26805, sample size is: 23960
  sampling from both directions
  query 7; still undecided: 2549, sample size is: 2528
  sampling from both directions
  query 8; still undecided: 21, sample size is: 21
  8 total queries in 24.5064s
  elapsed time:  24.670051 seconds
  heads summary:
    total common heads:         13
      also local heads:          4
      also remote heads:         8
      both:                      4
    local heads:             28317
      common:                    4
      missing:               28313
    remote heads:               12
      common:                    8
      unknown:                   4
  local changesets:        2014901
    common:                 530373
    missing:               1484528
  common heads: 1dad417c28ad 4a108e94d3e2 4d7ef530fffb 5350524bb654 777e60ca8853 7d97fafba271 9cd2ab4d0029 a55ce37217da d38398e5144e dcc6d7a0dc00 e09297892ada e24ec6070d7b fd559328eaf3

Differential Revision: https://phab.mercurial-scm.org/D2647

mercurial/setdiscovery.py

@@ -110,13 +110,14 b' class partialdiscovery(object):'
     (all tracked revisions are known locally)
     """
 
-    def __init__(self, repo, targetheads):
+    def __init__(self, repo, targetheads, respectsize):
         self._repo = repo
         self._targetheads = targetheads
         self._common = repo.changelog.incrementalmissingrevs()
         self._undecided = None
         self.missing = set()
         self._childrenmap = None
+        self._respectsize = respectsize
 
     def addcommons(self, commons):
         """register nodes known as common"""
@@ -241,6 +242,8 b' class partialdiscovery(object):'
 
         # update from roots
         revsroots = set(repo.revs('roots(%ld)', revs))
+        if not self._respectsize:
+            size = max(size, len(revsroots))
 
         childrenrevs = self._childrengetter()
 
@@ -373,7 +376,7 b' def findcommonheads(ui, local, remote,'
 
     # full blown discovery
 
-    disco = partialdiscovery(local, ownheads)
+    disco = partialdiscovery(local, ownheads, remote.limitedarguments)
     # treat remote heads (and maybe own heads) as a first implicit sample
     # response
     disco.addcommons(knownsrvheads)