--- a/mercurial/bundlerepo.py Sun Dec 13 18:29:22 2020 -0800
+++ b/mercurial/bundlerepo.py Tue Dec 01 21:54:46 2020 +0100
@@ -17,7 +17,11 @@
import shutil
from .i18n import _
-from .node import nullid, nullrev
+from .node import (
+ hex,
+ nullid,
+ nullrev,
+)
from . import (
bundle2,
@@ -32,7 +36,6 @@
localrepo,
manifest,
mdiff,
- node as nodemod,
pathutil,
phases,
pycompat,
@@ -437,9 +440,9 @@
p2rev = self.changelog.rev(p2)
msg = _(b"setting parent to node %s that only exists in the bundle\n")
if self.changelog.repotiprev < p1rev:
- self.ui.warn(msg % nodemod.hex(p1))
+ self.ui.warn(msg % hex(p1))
if self.changelog.repotiprev < p2rev:
- self.ui.warn(msg % nodemod.hex(p2))
+ self.ui.warn(msg % hex(p2))
return super(bundlerepository, self).setparents(p1, p2)