Merge backed out change
authorBryan O'Sullivan <bos@serpentine.com>
Wed, 08 Jul 2009 17:03:16 -0700
changeset 9084 9f191931c859
parent 9044 d4d4da54ab05 (current diff)
parent 9083 ec171737aaf1 (diff)
child 9085 4858f2cacb4d
child 9089 8ec39725d966
Merge backed out change
mercurial/util.py
--- a/mercurial/util.py	Tue Jul 07 01:25:44 2009 +0200
+++ b/mercurial/util.py	Wed Jul 08 17:03:16 2009 -0700
@@ -38,12 +38,14 @@
 
 import subprocess
 closefds = os.name == 'posix'
-def popen2(cmd):
-    p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
+def popen2(cmd, bufsize=-1):
+    p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
+                         close_fds=closefds,
                          stdin=subprocess.PIPE, stdout=subprocess.PIPE)
     return p.stdin, p.stdout
-def popen3(cmd):
-    p = subprocess.Popen(cmd, shell=True, close_fds=closefds,
+def popen3(cmd, bufsize=-1):
+    p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
+                         close_fds=closefds,
                          stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)
     return p.stdin, p.stdout, p.stderr