diff -r 65f1b97484be -r 962eb403165b mercurial/util.py --- a/mercurial/util.py Sun Apr 13 11:31:45 2008 -0500 +++ b/mercurial/util.py Mon Apr 14 14:34:38 2008 +0200 @@ -1086,12 +1086,12 @@ # through the current COMSPEC. cmd.exe suppress enclosing quotes. return '"' + cmd + '"' - def popen(command): + def popen(command, mode='r'): # Work around "popen spawned process may not write to stdout # under windows" # http://bugs.python.org/issue1366 command += " 2> %s" % nulldev - return os.popen(quotecommand(command)) + return os.popen(quotecommand(command), mode) def explain_exit(code): return _("exited with status %d") % code, code @@ -1252,8 +1252,8 @@ def quotecommand(cmd): return cmd - def popen(command): - return os.popen(command) + def popen(command, mode='r'): + return os.popen(command, mode) def testpid(pid): '''return False if pid dead, True if running or not sure'''