# HG changeset patch # User Boris Feld # Date 1534580656 -7200 # Node ID d8ac2ad55d9c6c0a50eb5d74ce1ddb28dcc55a2d # Parent 362cb82385ea06c5d51907072a86383ec953fc11 phases: fix `nullid` reference in newheads Spotted by Yuya Nishihara. diff -r 362cb82385ea -r d8ac2ad55d9c mercurial/phases.py --- a/mercurial/phases.py Mon Aug 20 16:33:48 2018 -0400 +++ b/mercurial/phases.py Sat Aug 18 10:24:16 2018 +0200 @@ -673,7 +673,7 @@ rev = cl.nodemap.get if not roots: return heads - if not heads or heads == [nullrev]: + if not heads or heads == [nullid]: return [] # The logic operated on revisions, convert arguments early for convenience new_heads = set(rev(n) for n in heads if n != nullid)