Mercurial > hg
changeset 31233:067f2a95e32c
vfs: use 'vfs' module directly in 'mercurial.patch'
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.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Thu, 02 Mar 2017 13:29:59 +0100 |
| parents | 254f98326eef |
| children | 9b7a2ef4f27c |
| files | mercurial/patch.py |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/patch.py Thu Mar 02 13:29:43 2017 +0100 +++ b/mercurial/patch.py Thu Mar 02 13:29:59 2017 +0100 @@ -38,6 +38,7 @@ scmutil, similar, util, + vfs as vfsmod, ) stringio = util.stringio @@ -449,7 +450,7 @@ class fsbackend(abstractbackend): def __init__(self, ui, basedir): super(fsbackend, self).__init__(ui) - self.opener = scmutil.vfs(basedir) + self.opener = vfsmod.vfs(basedir) def _join(self, f): return os.path.join(self.opener.base, f) @@ -560,7 +561,7 @@ else: if self.opener is None: root = tempfile.mkdtemp(prefix='hg-patch-') - self.opener = scmutil.vfs(root) + self.opener = vfsmod.vfs(root) # Avoid filename issues with these simple names fn = str(self.created) self.opener.write(fn, data)