# HG changeset patch # User Pierre-Yves David # Date 2012-01-20 18:41:18 # Node ID 5a14f48d6b9a5822c8d6d1be66b904cc8788a107 # Parent b345f851d05621575052a8352fc50724616f59e8 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 diff --git a/mercurial/discovery.py b/mercurial/discovery.py --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -124,8 +124,7 @@ def findcommonoutgoing(repo, other, only 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