Patchwork [09,of,10,V2] discovery: add a simple `addinfo` method

login
register
mail settings
Submitter Boris Feld
Date Jan. 4, 2019, 5:29 p.m.
Message ID <81d3ec14b6b84ab16df6.1546622970@localhost.localdomain>
Download mbox | patch
Permalink /patch/37462/
State Accepted
Headers show

Comments

Boris Feld - Jan. 4, 2019, 5:29 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1545965978 -3600
#      Fri Dec 28 03:59:38 2018 +0100
# Node ID 81d3ec14b6b84ab16df6fd8e9de24a8c2f81e011
# Parent  74f4f24984cb571741be240963fed116bfb3141b
# EXP-Topic discovery-refactor
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 81d3ec14b6b8
discovery: add a simple `addinfo` method

The method can directly process a sample result. This makes the main code
simpler to follow.

Patch

diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
--- a/mercurial/setdiscovery.py
+++ b/mercurial/setdiscovery.py
@@ -195,6 +195,20 @@  class partialdiscovery(object):
 
         self.undecided.difference_update(self.missing)
 
+    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()
@@ -285,21 +299,12 @@  def findcommonheads(ui, local, remote,
     # treat remote heads (and maybe own heads) as a first implicit sample
     # response
     disco.addcommons(srvheads)
-    commoninsample = set(n for i, n in enumerate(sample) if yesno[i])
-    disco.addcommons(commoninsample)
+    disco.addinfo(zip(sample, yesno))
 
     full = False
     progress = ui.makeprogress(_('searching'), unit=_('queries'))
     while not disco.iscomplete():
 
-        if sample:
-            missinginsample = [n for i, n in enumerate(sample) if not yesno[i]]
-            disco.addmissings(missinginsample)
-
-
-        if disco.iscomplete():
-            break
-
         if full or disco.hasinfo():
             if full:
                 ui.note(_("sampling from both directions\n"))
@@ -328,9 +333,7 @@  def findcommonheads(ui, local, remote,
 
         full = True
 
-        if sample:
-            commoninsample = set(n for i, n in enumerate(sample) if yesno[i])
-            disco.addcommons(commoninsample)
+        disco.addinfo(zip(sample, yesno))
 
     # heads(common) == heads(common.bases) since common represents common.bases
     # and all its ancestors