From patchwork Fri Jan  4 17:29:29 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [08, of, 10,
 V2] discovery: move missing tracking inside the partialdiscovery
 object
From: Boris Feld <boris.feld@octobus.net>
X-Patchwork-Id: 37461
Message-Id: <74f4f24984cb571741be.1546622969@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Fri, 04 Jan 2019 18:29:29 +0100

# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1545965280 -3600
#      Fri Dec 28 03:48:00 2018 +0100
# Node ID 74f4f24984cb571741be240963fed116bfb3141b
# Parent  d898ad0f5ce47369d84dace19edf4024edce52ff
# EXP-Topic discovery-refactor
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 74f4f24984cb
discovery: move missing tracking inside the partialdiscovery object

This is the final set that we need to track to have a fully up to date
information within the object.

diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
--- a/mercurial/setdiscovery.py
+++ b/mercurial/setdiscovery.py
@@ -169,6 +169,7 @@ class partialdiscovery(object):
 
     - common:    own nodes I know we both know
     - undecided: own nodes where I don't know if remote knows them
+    - missing:   own nodes I know remote lacks
     """
 
     def __init__(self, repo, targetheads):
@@ -176,12 +177,24 @@ class partialdiscovery(object):
         self._targetheads = targetheads
         self._common = repo.changelog.incrementalmissingrevs()
         self._undecided = None
+        self.missing = set()
 
     def addcommons(self, commons):
         """registrer nodes known as common"""
         self._common.addbases(commons)
         self._common.removeancestorsfrom(self.undecided)
 
+    def addmissings(self, missings):
+        """registrer some nodes as missing"""
+        if self.missing:
+            new = self._repo.revs('descendants(%ld) - descendants(%ld)',
+                                  missings, self.missing)
+            self.missing.update(new)
+        else:
+            self.missing.update(self._repo.revs('descendants(%ld)', missings))
+
+        self.undecided.difference_update(self.missing)
+
     def hasinfo(self):
         """return True is we have any clue about the remote state"""
         return self._common.hasbases()
@@ -274,8 +287,6 @@ def findcommonheads(ui, local, remote,
     disco.addcommons(srvheads)
     commoninsample = set(n for i, n in enumerate(sample) if yesno[i])
     disco.addcommons(commoninsample)
-    # own nodes I know remote lacks
-    missing = set()
 
     full = False
     progress = ui.makeprogress(_('searching'), unit=_('queries'))
@@ -283,14 +294,8 @@ def findcommonheads(ui, local, remote,
 
         if sample:
             missinginsample = [n for i, n in enumerate(sample) if not yesno[i]]
+            disco.addmissings(missinginsample)
 
-            if missing:
-                missing.update(local.revs('descendants(%ld) - descendants(%ld)',
-                                          missinginsample, missing))
-            else:
-                missing.update(local.revs('descendants(%ld)', missinginsample))
-
-            disco.undecided.difference_update(missing)
 
         if disco.iscomplete():
             break