mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
dispatch: write shell alias output to ui out descriptor
This commit is contained in:
parent
71b4a06c3c
commit
5e2d608efc
@ -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
|
||||
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user