comparison hgext/rebase.py @ 46113:59fa3890d40a

node: import symbols explicitly There is no point in lazy importing mercurial.node, it is used all over the place anyway. So consistently import the used symbols directly. Fix one file using symbols indirectly via mercurial.revlog. Differential Revision: https://phab.mercurial-scm.org/D9480
author Joerg Sonnenberger <joerg@bec.de>
date Tue, 01 Dec 2020 21:54:46 +0100
parents 2cf61e66c6d0
children b7ccdb52e0f9
comparison
equal deleted inserted replaced
46112:d6afa9c149c3 46113:59fa3890d40a
21 21
22 from mercurial.i18n import _ 22 from mercurial.i18n import _
23 from mercurial.node import ( 23 from mercurial.node import (
24 nullrev, 24 nullrev,
25 short, 25 short,
26 wdirrev,
26 ) 27 )
27 from mercurial.pycompat import open 28 from mercurial.pycompat import open
28 from mercurial import ( 29 from mercurial import (
29 bookmarks, 30 bookmarks,
30 cmdutil, 31 cmdutil,
35 error, 36 error,
36 extensions, 37 extensions,
37 merge as mergemod, 38 merge as mergemod,
38 mergestate as mergestatemod, 39 mergestate as mergestatemod,
39 mergeutil, 40 mergeutil,
40 node as nodemod,
41 obsolete, 41 obsolete,
42 obsutil, 42 obsutil,
43 patch, 43 patch,
44 phases, 44 phases,
45 pycompat, 45 pycompat,
1372 _(b'nothing to rebase from %s to %s\n') 1372 _(b'nothing to rebase from %s to %s\n')
1373 % (b'+'.join(bytes(repo[r]) for r in base), dest) 1373 % (b'+'.join(bytes(repo[r]) for r in base), dest)
1374 ) 1374 )
1375 return None 1375 return None
1376 1376
1377 if nodemod.wdirrev in rebaseset: 1377 if wdirrev in rebaseset:
1378 raise error.Abort(_(b'cannot rebase the working copy')) 1378 raise error.Abort(_(b'cannot rebase the working copy'))
1379 rebasingwcp = repo[b'.'].rev() in rebaseset 1379 rebasingwcp = repo[b'.'].rev() in rebaseset
1380 ui.log( 1380 ui.log(
1381 b"rebase", 1381 b"rebase",
1382 b"rebasing working copy parent: %r\n", 1382 b"rebasing working copy parent: %r\n",