Mercurial > public > mercurial-scm > hg

comparison mercurial/simplemerge.py @ 31216:21fa3d3688f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vfs: replace 'scmutil.opener' usage with 'scmutil.vfs' The 'vfs' class is the first class citizen for years. We remove all usages of the older API. This will let us remove the old API eventually.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 02 Mar 2017 03:52:36 +0100
parents 318a24b52eeb
children 35284f933518
comparison
equal deleted inserted replaced
31215:15c998528c36 31216:21fa3d3688f3
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.opener(os.path.dirname(local)) 440 opener = scmutil.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)