Patchwork D5583: discovery: using the new basesheads()

login
register
mail settings
Submitter phabricator
Date Jan. 16, 2019, 12:44 p.m.
Message ID <e1ea80a55c6cae3fb004b3b6445144f3@localhost.localdomain>
Download mbox | patch
Permalink /patch/37791/
State Not Applicable
Headers show

Comments

phabricator - Jan. 16, 2019, 12:44 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2a8782cc2e16: discovery: using the new basesheads() (authored by gracinet, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5583?vs=13217&id=13253

REVISION DETAIL
  https://phab.mercurial-scm.org/D5583

AFFECTED FILES
  mercurial/setdiscovery.py

CHANGE DETAILS




To: gracinet, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
--- a/mercurial/setdiscovery.py
+++ b/mercurial/setdiscovery.py
@@ -229,9 +229,7 @@ 
         """the heads of the known common set"""
         # heads(common) == heads(common.bases) since common represents
         # common.bases and all its ancestors
-        # The presence of nullrev will confuse heads(). So filter it out.
-        return set(self._repo.revs('heads(%ld)',
-                   self._common.bases - {nullrev}))
+        return self._common.basesheads()
 
 def findcommonheads(ui, local, remote,
                     initialsamplesize=100,