Fixed problem with Hg support under version 1.9 (mercurial.dispatch.dispatch() now takes a single request object with option for capturing output stream)

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(