From 5e2d608efc0caa971f3c3360b3a938467e26d891 Mon Sep 17 00:00:00 2001 From: Idan Kamara Date: Tue, 7 Jun 2011 13:39:09 +0300 Subject: [PATCH] dispatch: write shell alias output to ui out descriptor --- mercurial/dispatch.py | 2 +- mercurial/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py index 2adc41cae6..a1a30a4513 100644 --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -276,7 +276,7 @@ class cmdalias(object): 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 diff --git a/mercurial/util.py b/mercurial/util.py index 592c5418a9..d728748065 100644 --- a/mercurial/util.py +++ b/mercurial/util.py @@ -354,7 +354,7 @@ def system(cmd, environ={}, cwd=None, onerr=None, errprefix=None, out=None): 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: