mercurial/context.py
changeset 46843 728d89f6f9b1
parent 46842 ad878e3f282b
child 47012 d55b71393907
--- a/mercurial/context.py	Tue Mar 30 02:33:12 2021 +0200
+++ b/mercurial/context.py	Tue Mar 30 02:32:30 2021 +0200
@@ -2885,7 +2885,7 @@
         # "1 < len(self._parents)" can't be used for checking
         # existence of the 2nd parent, because "memctx._parents" is
         # explicitly initialized by the list, of which length is 2.
-        if p2.node() != nullid:
+        if p2.rev() != nullrev:
             man2 = p2.manifest()
             managing = lambda f: f in man1 or f in man2
         else:
@@ -2903,7 +2903,7 @@
         return scmutil.status(modified, added, removed, [], [], [], [])
 
     def parents(self):
-        if self._parents[1].node() == nullid:
+        if self._parents[1].rev() == nullrev:
             return [self._parents[0]]
         return self._parents
 
@@ -3052,7 +3052,7 @@
         # "1 < len(self._parents)" can't be used for checking
         # existence of the 2nd parent, because "metadataonlyctx._parents" is
         # explicitly initialized by the list, of which length is 2.
-        if p2.node() != nullid:
+        if p2.rev() != nullrev:
             man2 = p2.manifest()
             managing = lambda f: f in man1 or f in man2
         else: