Mercurial > public > mercurial-scm > hg
diff hgext/absorb.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 | f4a218331ff4 |
| children | 6266d19556ad |
line wrap: on
line diff
--- a/hgext/absorb.py Sun Dec 13 18:29:22 2020 -0800 +++ b/hgext/absorb.py Tue Dec 01 21:54:46 2020 +0100 @@ -36,6 +36,11 @@ import collections from mercurial.i18n import _ +from mercurial.node import ( + hex, + nullid, + short, +) from mercurial import ( cmdutil, commands, @@ -44,7 +49,6 @@ error, linelog, mdiff, - node, obsolete, patch, phases, @@ -102,7 +106,7 @@ return b'' def node(self): - return node.nullid + return nullid def uniq(lst): @@ -367,7 +371,7 @@ idx = (max(rev - 1, 0)) // 2 self.ui.write( _(b'%s: chunk %d:%d -> %d lines\n') - % (node.short(self.fctxs[idx].node()), a1, a2, len(blines)) + % (short(self.fctxs[idx].node()), a1, a2, len(blines)) ) self.linelog.replacelines(rev, a1, a2, b1, b2) if self.opts.get(b'edit_lines', False): @@ -486,7 +490,7 @@ editortext += _(b'HG: %s/%s %s %s\n') % ( b'|' * i, b'-' * (len(visiblefctxs) - i + 1), - node.short(f.node()), + short(f.node()), f.description().split(b'\n', 1)[0], ) editortext += _(b'HG: %s\n') % (b'|' * len(visiblefctxs)) @@ -816,7 +820,7 @@ if self.ui.debugflag: return b'%d:%s' % (ctx.rev(), ctx.hex()) else: - return b'%d:%s' % (ctx.rev(), node.short(ctx.node())) + return b'%d:%s' % (ctx.rev(), short(ctx.node())) def _getnewfilecontents(self, ctx): """(ctx) -> {path: str} @@ -849,7 +853,7 @@ changes.append((name, hsh)) if self.ui.verbose: self.ui.write( - _(b'moving bookmark %s to %s\n') % (name, node.hex(hsh)) + _(b'moving bookmark %s to %s\n') % (name, hex(hsh)) ) else: changes.append((name, None)) @@ -920,7 +924,7 @@ the commit is a clone from ctx, with a (optionally) different p1, and different file contents replaced by memworkingcopy. """ - parents = p1 and (p1, node.nullid) + parents = p1 and (p1, nullid) extra = ctx.extra() if self._useobsolete and self.ui.configbool(b'absorb', b'add-noise'): extra[b'absorb_source'] = ctx.hex()