Mercurial > hg
comparison mercurial/filemerge.py @ 23270:41c03b7592ed
util.system: use ui.system() in place of optional ui.fout parameter
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 08 Nov 2014 13:06:22 +0900 |
parents | b405dd6c90bf |
children | be83fd9d46d5 |
comparison
equal
deleted
inserted
replaced
23269:d9d8d2e0f701 | 23270:41c03b7592ed |
---|---|
299 if "$output" in args: | 299 if "$output" in args: |
300 out, a = a, back # read input from backup, write to original | 300 out, a = a, back # read input from backup, write to original |
301 replace = {'local': a, 'base': b, 'other': c, 'output': out} | 301 replace = {'local': a, 'base': b, 'other': c, 'output': out} |
302 args = util.interpolate(r'\$', replace, args, | 302 args = util.interpolate(r'\$', replace, args, |
303 lambda s: util.shellquote(util.localpath(s))) | 303 lambda s: util.shellquote(util.localpath(s))) |
304 r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env, | 304 r = ui.system(toolpath + ' ' + args, cwd=repo.root, environ=env) |
305 out=ui.fout) | |
306 return True, r | 305 return True, r |
307 return False, 0 | 306 return False, 0 |
308 | 307 |
309 def _formatconflictmarker(repo, ctx, template, label, pad): | 308 def _formatconflictmarker(repo, ctx, template, label, pad): |
310 """Applies the given template to the ctx, prefixed by the label. | 309 """Applies the given template to the ctx, prefixed by the label. |