Patchwork [16,of,22] vfs: use 'vfs' module directly in 'hgext.convert'

login
register
mail settings
Submitter Pierre-Yves David
Date March 8, 2017, 9:18 p.m.
Message ID <34deee8fb3f8b7298654.1489007907@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/19014/
State Accepted
Headers show

Comments

Pierre-Yves David - March 8, 2017, 9:18 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1488457934 -3600
#      Thu Mar 02 13:32:14 2017 +0100
# Node ID 34deee8fb3f8b7298654223e87bcb46cfc6ca38d
# Parent  08dbe59418ce0df83a5d32a860935c749a8af880
# EXP-Topic vfs.cleanup
# Available At https://www.mercurial-scm.org/repo/users/marmoute/mercurial/
#              hg pull https://www.mercurial-scm.org/repo/users/marmoute/mercurial/ -r 34deee8fb3f8
vfs: use 'vfs' module directly in 'hgext.convert'

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.

Patch

diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -13,8 +13,8 @@  from mercurial import (
     encoding,
     error,
     pycompat,
-    scmutil,
     util,
+    vfs as vfsmod,
 )
 
 from . import common
@@ -1146,8 +1146,8 @@  class svn_sink(converter_sink, commandli
             self.run0('checkout', path, wcpath)
 
             self.wc = wcpath
-        self.opener = scmutil.vfs(self.wc)
-        self.wopener = scmutil.vfs(self.wc)
+        self.opener = vfsmod.vfs(self.wc)
+        self.wopener = vfsmod.vfs(self.wc)
         self.childmap = mapfile(ui, self.join('hg-childmap'))
         if util.checkexec(self.wc):
             self.is_exec = util.isexec