Mercurial > hg
comparison mercurial/filemerge.py @ 24727:5668202cfaaf
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 |
comparison
equal
deleted
inserted
replaced
| 24726:747748766421 | 24727:5668202cfaaf |
|---|---|
| 302 if "$output" in args: | 302 if "$output" in args: |
| 303 out, a = a, back # read input from backup, write to original | 303 out, a = a, back # read input from backup, write to original |
| 304 replace = {'local': a, 'base': b, 'other': c, 'output': out} | 304 replace = {'local': a, 'base': b, 'other': c, 'output': out} |
| 305 args = util.interpolate(r'\$', replace, args, | 305 args = util.interpolate(r'\$', replace, args, |
| 306 lambda s: util.shellquote(util.localpath(s))) | 306 lambda s: util.shellquote(util.localpath(s))) |
| 307 r = ui.system(toolpath + ' ' + args, cwd=repo.root, environ=env) | 307 cmd = toolpath + ' ' + args |
| 308 repo.ui.debug('launching merge tool: %s\n' % cmd) | |
| 309 r = ui.system(cmd, cwd=repo.root, environ=env) | |
| 310 repo.ui.debug('merge tool returned: %s\n' % r) | |
| 308 return True, r | 311 return True, r |
| 309 return False, 0 | 312 return False, 0 |
| 310 | 313 |
| 311 def _formatconflictmarker(repo, ctx, template, label, pad): | 314 def _formatconflictmarker(repo, ctx, template, label, pad): |
| 312 """Applies the given template to the ctx, prefixed by the label. | 315 """Applies the given template to the ctx, prefixed by the label. |