Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 24727:5668202cfaaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: better debug messages before/after invoking external merge tool
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 19 Mar 2015 22:22:50 +0100
parents be83fd9d46d5
children fd7287f0b43c
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sat Apr 11 23:00:04 2015 +0900
+++ b/mercurial/filemerge.py	Thu Mar 19 22:22:50 2015 +0100
@@ -304,7 +304,10 @@
         replace = {'local': a, 'base': b, 'other': c, 'output': out}
         args = util.interpolate(r'\$', replace, args,
                                 lambda s: util.shellquote(util.localpath(s)))
-        r = ui.system(toolpath + ' ' + args, cwd=repo.root, environ=env)
+        cmd = toolpath + ' ' + args
+        repo.ui.debug('launching merge tool: %s\n' % cmd)
+        r = ui.system(cmd, cwd=repo.root, environ=env)
+        repo.ui.debug('merge tool returned: %s\n' % r)
         return True, r
     return False, 0