# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1247097796 25200
# Node ID 9f191931c8592711b02af4ceef9f84e056951843
# Parent  d4d4da54ab05c24596c3e98acbd7f052e443b2c1# Parent  ec171737aaf1c03f39c96eb6dd878c60242d31e5
Merge backed out change

diff -r d4d4da54ab05 -r 9f191931c859 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