discovery: ensure that missingheads are always heads of everything we tried stable
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Fri, 20 Jan 2012 19:41:18 +0100
branchstable
changeset 15955 5a14f48d6b9a
parent 15954 b345f851d056
child 15956 5653f2d166ea
discovery: ensure that missingheads are always heads of everything we tried This only alter the third block executed when: * repo have secret changeset * onlyheads is not None In other case findcommonoutgoing already had this behavior
mercurial/discovery.py
--- a/mercurial/discovery.py	Fri Jan 20 19:23:53 2012 +0100
+++ b/mercurial/discovery.py	Fri Jan 20 19:41:18 2012 +0100
@@ -124,8 +124,7 @@
                 missing.append(node)
         if excluded:
             # update missing heads
-            rset = repo.set('heads(%ln)', missing)
-            missingheads = [ctx.node() for ctx in rset]
+            missingheads = phases.newheads(repo, onlyheads, excluded)
         else:
             missingheads = onlyheads
         og.missingheads = missingheads