Mercurial > public > mercurial-scm > hg

comparison mercurial/bundlerepo.py @ 46113:59fa3890d40a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 89a2afe31e82
children a41565bef69f
comparison
equal deleted inserted replaced
46112:d6afa9c149c3 46113:59fa3890d40a
15 15
16 import os 16 import os
17 import shutil 17 import shutil
18 18
19 from .i18n import _ 19 from .i18n import _
20 from .node import nullid, nullrev 20 from .node import (
21 hex,
22 nullid,
23 nullrev,
24 )
21 25
22 from . import ( 26 from . import (
23 bundle2, 27 bundle2,
24 changegroup, 28 changegroup,
25 changelog, 29 changelog,
30 exchange, 34 exchange,
31 filelog, 35 filelog,
32 localrepo, 36 localrepo,
33 manifest, 37 manifest,
34 mdiff, 38 mdiff,
35 node as nodemod,
36 pathutil, 39 pathutil,
37 phases, 40 phases,
38 pycompat, 41 pycompat,
39 revlog, 42 revlog,
40 util, 43 util,
435 def setparents(self, p1, p2=nullid): 438 def setparents(self, p1, p2=nullid):
436 p1rev = self.changelog.rev(p1) 439 p1rev = self.changelog.rev(p1)
437 p2rev = self.changelog.rev(p2) 440 p2rev = self.changelog.rev(p2)
438 msg = _(b"setting parent to node %s that only exists in the bundle\n") 441 msg = _(b"setting parent to node %s that only exists in the bundle\n")
439 if self.changelog.repotiprev < p1rev: 442 if self.changelog.repotiprev < p1rev:
440 self.ui.warn(msg % nodemod.hex(p1)) 443 self.ui.warn(msg % hex(p1))
441 if self.changelog.repotiprev < p2rev: 444 if self.changelog.repotiprev < p2rev:
442 self.ui.warn(msg % nodemod.hex(p2)) 445 self.ui.warn(msg % hex(p2))
443 return super(bundlerepository, self).setparents(p1, p2) 446 return super(bundlerepository, self).setparents(p1, p2)
444 447
445 448
446 def instance(ui, path, create, intents=None, createopts=None): 449 def instance(ui, path, create, intents=None, createopts=None):
447 if create: 450 if create: