Mercurial > hg

diff mercurial/filemerge.py @ 23270:41c03b7592ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sat Nov 08 12:57:42 2014 +0900
+++ b/mercurial/filemerge.py	Sat Nov 08 13:06:22 2014 +0900
@@ -301,8 +301,7 @@
         replace = {'local': a, 'base': b, 'other': c, 'output': out}
         args = util.interpolate(r'\$', replace, args,
                                 lambda s: util.shellquote(util.localpath(s)))
-        r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env,
-                        out=ui.fout)
+        r = ui.system(toolpath + ' ' + args, cwd=repo.root, environ=env)
         return True, r
     return False, 0