changeset 39199:d8ac2ad55d9c stable

phases: fix `nullid` reference in newheads Spotted by Yuya Nishihara.
author Boris Feld <boris.feld@octobus.net>
date Sat, 18 Aug 2018 10:24:16 +0200
parents 362cb82385ea
children bd63ada7e1f8
files mercurial/phases.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)