Mercurial > hg-stable
changeset 14640:406b6d7bdcb9
dispatch: write shell alias output to ui out descriptor
| author | Idan Kamara <idankk86@gmail.com> |
|---|---|
| date | Tue, 07 Jun 2011 13:39:09 +0300 |
| parents | e59a7b8f521a |
| children | f2789767a2c4 |
| files | mercurial/dispatch.py mercurial/util.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Wed Jun 08 14:54:52 2011 +0300 +++ b/mercurial/dispatch.py Tue Jun 07 13:39:09 2011 +0300 @@ -276,7 +276,7 @@ replace['0'] = self.name replace['@'] = ' '.join(args) cmd = util.interpolate(r'\$', replace, cmd, escape_prefix=True) - return util.system(cmd, environ=env) + return util.system(cmd, environ=env, out=ui.fout) self.fn = fn return
--- a/mercurial/util.py Wed Jun 08 14:54:52 2011 +0300 +++ b/mercurial/util.py Tue Jun 07 13:39:09 2011 +0300 @@ -354,7 +354,7 @@ env = dict(os.environ) env.update((k, py2shell(v)) for k, v in environ.iteritems()) env['HG'] = hgexecutable() - if out is None: + if out is None or out == sys.__stdout__: rc = subprocess.call(cmd, shell=True, close_fds=closefds, env=env, cwd=cwd) else: