vfs: use 'vfs' module directly in 'mercurial.unionrepo'
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Thu, 02 Mar 2017 14:49:50 +0100
changeset 31242 854f9188e354
parent 31241 591fda751c6b
child 31243 816bc3b35bac
vfs: use 'vfs' module directly in 'mercurial.unionrepo' 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/unionrepo.py
--- a/mercurial/unionrepo.py	Thu Mar 02 14:49:01 2017 +0100
+++ b/mercurial/unionrepo.py	Thu Mar 02 14:49:50 2017 +0100
@@ -27,8 +27,8 @@
     pathutil,
     pycompat,
     revlog,
-    scmutil,
     util,
+    vfs as vfsmod,
 )
 
 class unionrevlog(revlog.revlog):
@@ -39,7 +39,7 @@
         #
         # To differentiate a rev in the second revlog 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.revlog2 = revlog2