From c8445658f5ca554f1efe49653e768eb11e86d9d4 Mon Sep 17 00:00:00 2001 From: Pierre-Yves David Date: Thu, 2 Mar 2017 14:47:03 +0100 Subject: [PATCH] vfs: use 'vfs' module directly in 'mercurial.bundlerepo' Now that the 'vfs' classes moved in their own module, lets use the new module directly. We update code iteratively to help with possible bisect needs in the future. --- mercurial/bundlerepo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py index 7405dc4e67..4ec982de7f 100644 --- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -37,8 +37,8 @@ from . import ( phases, pycompat, revlog, - scmutil, util, + vfs as vfsmod, ) class bundlerevlog(revlog.revlog): @@ -50,7 +50,7 @@ class bundlerevlog(revlog.revlog): # # To differentiate a rev in the bundle from a rev in the revlog, we # check revision against repotiprev. - opener = scmutil.readonlyvfs(opener) + opener = vfsmod.readonlyvfs(opener) revlog.revlog.__init__(self, opener, indexfile) self.bundle = bundle n = len(self) @@ -239,7 +239,7 @@ class bundlephasecache(phases.phasecache): def __init__(self, *args, **kwargs): super(bundlephasecache, self).__init__(*args, **kwargs) if util.safehasattr(self, 'opener'): - self.opener = scmutil.readonlyvfs(self.opener) + self.opener = vfsmod.readonlyvfs(self.opener) def write(self): raise NotImplementedError