Mercurial > hg
comparison mercurial/simplemerge.py @ 31238: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 |
comparison
equal
deleted
inserted
replaced
31237:1b08aca7870a | 31238:35284f933518 |
---|---|
22 | 22 |
23 from .i18n import _ | 23 from .i18n import _ |
24 from . import ( | 24 from . import ( |
25 error, | 25 error, |
26 mdiff, | 26 mdiff, |
27 scmutil, | |
28 util, | 27 util, |
28 vfs as vfsmod, | |
29 ) | 29 ) |
30 | 30 |
31 class CantReprocessAndShowBase(Exception): | 31 class CantReprocessAndShowBase(Exception): |
32 pass | 32 pass |
33 | 33 |
435 except error.Abort: | 435 except error.Abort: |
436 return 1 | 436 return 1 |
437 | 437 |
438 local = os.path.realpath(local) | 438 local = os.path.realpath(local) |
439 if not opts.get('print'): | 439 if not opts.get('print'): |
440 opener = scmutil.vfs(os.path.dirname(local)) | 440 opener = vfsmod.vfs(os.path.dirname(local)) |
441 out = opener(os.path.basename(local), "w", atomictemp=True) | 441 out = opener(os.path.basename(local), "w", atomictemp=True) |
442 else: | 442 else: |
443 out = ui.fout | 443 out = ui.fout |
444 | 444 |
445 m3 = Merge3Text(basetext, localtext, othertext) | 445 m3 = Merge3Text(basetext, localtext, othertext) |