--- a/tests/test-revlog-raw.py Sun Dec 13 18:29:22 2020 -0800
+++ b/tests/test-revlog-raw.py Tue Dec 01 21:54:46 2020 +0100
@@ -6,9 +6,9 @@
import hashlib
import sys
+from mercurial.node import nullid
from mercurial import (
encoding,
- node,
revlog,
transaction,
vfs,
@@ -93,7 +93,7 @@
"""
nextrev = len(rlog)
p1 = rlog.node(nextrev - 1)
- p2 = node.nullid
+ p2 = nullid
if isext:
flags = revlog.REVIDX_EXTSTORED
else:
@@ -127,7 +127,7 @@
class dummychangegroup(object):
@staticmethod
def deltachunk(pnode):
- pnode = pnode or node.nullid
+ pnode = pnode or nullid
parentrev = rlog.rev(pnode)
r = parentrev + 1
if r >= len(rlog):
@@ -142,7 +142,7 @@
return {
b'node': rlog.node(r),
b'p1': pnode,
- b'p2': node.nullid,
+ b'p2': nullid,
b'cs': rlog.node(rlog.linkrev(r)),
b'flags': rlog.flags(r),
b'deltabase': rlog.node(deltaparent),
@@ -181,7 +181,7 @@
dlog = newrevlog(destname, recreate=True)
for r in rlog:
p1 = rlog.node(r - 1)
- p2 = node.nullid
+ p2 = nullid
if r == 0 or (rlog.flags(r) & revlog.REVIDX_EXTSTORED):
text = rlog.rawdata(r)
cachedelta = None