diff hgext/convert/cvs.py @ 5481:003d1f174fe1

Fix Windows os.popen bug with interleaved stdout/stderr output

See python bug 1366 "popen spawned process may not write to stdout under windows" for more details.

--- a/hgext/convert/cvs.py	Tue Oct 30 16:54:25 2007 -0700
+++ b/hgext/convert/cvs.py	Thu Nov 01 12:05:14 2007 +0100
@@ -43,14 +43,13 @@
                     cmd = '%s -d "1970/01/01 00:00:01" -d "%s"' % (cmd, self.rev)
                 except util.Abort:
                     raise util.Abort('revision %s is not a patchset number or date' % self.rev)
-        cmd += " 2>&1"
 
         d = os.getcwd()
         try:
             os.chdir(self.path)
             id = None
             state = 0
-            for l in os.popen(cmd):
+            for l in util.popen(cmd):
                 if state == 0: # header
                     if l.startswith("PatchSet"):
                         id = l[9:-2]