Mercurial > public > mercurial-scm > hg
comparison mercurial/filemerge.py @ 14749:e3be7dc9a5e1 stable
filemerge: use ui out descriptor when calling util.system
| author | Idan Kamara <idankk86@gmail.com> |
|---|---|
| date | Fri, 24 Jun 2011 17:04:37 +0300 |
| parents | 4030630fb59c |
| children | 157d93c41c10 |
comparison
equal
deleted
inserted
replaced
| 14748:1b8c70c9f47c | 14749:e3be7dc9a5e1 |
|---|---|
| 231 if "$output" in args: | 231 if "$output" in args: |
| 232 out, a = a, back # read input from backup, write to original | 232 out, a = a, back # read input from backup, write to original |
| 233 replace = dict(local=a, base=b, other=c, output=out) | 233 replace = dict(local=a, base=b, other=c, output=out) |
| 234 args = util.interpolate(r'\$', replace, args, | 234 args = util.interpolate(r'\$', replace, args, |
| 235 lambda s: '"%s"' % util.localpath(s)) | 235 lambda s: '"%s"' % util.localpath(s)) |
| 236 r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env) | 236 r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env, |
| 237 out=ui.fout) | |
| 237 | 238 |
| 238 if not r and (_toolbool(ui, tool, "checkconflicts") or | 239 if not r and (_toolbool(ui, tool, "checkconflicts") or |
| 239 'conflicts' in _toollist(ui, tool, "check")): | 240 'conflicts' in _toollist(ui, tool, "check")): |
| 240 if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), | 241 if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), |
| 241 re.MULTILINE): | 242 re.MULTILINE): |