Mercurial > public > mercurial-scm > hg-stable
diff mercurial/simplemerge.py @ 31248:35284f933518
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.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Thu, 02 Mar 2017 13:30:58 +0100 |
| parents | 21fa3d3688f3 |
| children | c31d45623304 |
line wrap: on
line diff
--- 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