Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vfs: use 'vfs' module directly in 'mercurial.simplemerge'
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Thu, 02 Mar 2017 13:30:58 +0100
changeset 31238 35284f933518
parent 31237 1b08aca7870a
child 31239 9cdba6072b97
vfs: use 'vfs' module directly in 'mercurial.simplemerge' 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/simplemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/simplemerge.py	Thu Mar 02 13:30:47 2017 +0100
+++ b/mercurial/simplemerge.py	Thu Mar 02 13:30:58 2017 +0100
@@ -24,8 +24,8 @@
 from . import (
     error,
     mdiff,
-    scmutil,
     util,
+    vfs as vfsmod,
 )
 
 class CantReprocessAndShowBase(Exception):
@@ -437,7 +437,7 @@
 
     local = os.path.realpath(local)
     if not opts.get('print'):
-        opener = scmutil.vfs(os.path.dirname(local))
+        opener = vfsmod.vfs(os.path.dirname(local))
         out = opener(os.path.basename(local), "w", atomictemp=True)
     else:
         out = ui.fout
mercurial