changeset 15955:5a14f48d6b9a stable

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
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Fri, 20 Jan 2012 19:41:18 +0100
parents b345f851d056
children 5653f2d166ea
files mercurial/discovery.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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