diff options
author | W. Trevor King <wking@drexel.edu> | 2011-09-07 22:33:51 -0400 |
---|---|---|
committer | W. Trevor King <wking@drexel.edu> | 2011-09-07 22:33:51 -0400 |
commit | b004702a025814290d10403e0de0c296617ebf68 (patch) | |
tree | 260d919136e16f0d58e37e7205dcf39092317ae7 | |
parent | 692c0095a83a5efac508b844f416252fe1856089 (diff) | |
parent | 3f365422e59403e08a96768c21d09190a7aea2a9 (diff) | |
download | bugseverywhere-b004702a025814290d10403e0de0c296617ebf68.tar.gz |
Merge remote branch 'pschumms/master'
-rw-r--r-- | libbe/storage/vcs/hg.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libbe/storage/vcs/hg.py b/libbe/storage/vcs/hg.py index d2274ee..acf391d 100644 --- a/libbe/storage/vcs/hg.py +++ b/libbe/storage/vcs/hg.py @@ -83,14 +83,12 @@ class Hg(base.VCS): assert len(kwargs) == 1, kwargs fullargs = ['--cwd', kwargs['cwd']] fullargs.extend(args) - stdout = sys.stdout - tmp_stdout = StringIO.StringIO() - sys.stdout = tmp_stdout + output = StringIO.StringIO() cwd = os.getcwd() - mercurial.dispatch.dispatch(fullargs) + req = mercurial.dispatch.request(fullargs, fout=output) + mercurial.dispatch.dispatch(req) os.chdir(cwd) - sys.stdout = stdout - return tmp_stdout.getvalue().rstrip('\n') + return output.getvalue().rstrip('\n') def _vcs_get_user_id(self): output = self._u_invoke_client( |