# HG changeset patch # User Pierre-Yves David # Date 1488462590 -3600 # Node ID 854f9188e3542772c05365412c345ba9734316c1 # Parent 591fda751c6bd7c73ae4e5f1ffcb3fcfd5f70dca 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. diff -r 591fda751c6b -r 854f9188e354 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