hgext/rebase.py
changeset 46113 59fa3890d40a
parent 46030 2cf61e66c6d0
child 46180 b7ccdb52e0f9
--- a/hgext/rebase.py	Sun Dec 13 18:29:22 2020 -0800
+++ b/hgext/rebase.py	Tue Dec 01 21:54:46 2020 +0100
@@ -23,6 +23,7 @@
 from mercurial.node import (
     nullrev,
     short,
+    wdirrev,
 )
 from mercurial.pycompat import open
 from mercurial import (
@@ -37,7 +38,6 @@
     merge as mergemod,
     mergestate as mergestatemod,
     mergeutil,
-    node as nodemod,
     obsolete,
     obsutil,
     patch,
@@ -1374,7 +1374,7 @@
                 )
             return None
 
-    if nodemod.wdirrev in rebaseset:
+    if wdirrev in rebaseset:
         raise error.Abort(_(b'cannot rebase the working copy'))
     rebasingwcp = repo[b'.'].rev() in rebaseset
     ui.log(