From: Simon Hausmann <hausmann@kde.org>
Date: Tue, 15 May 2007 12:31:06 +0000 (+0200)
Subject: Use the subprocess module instead of popen2 to make it work on Windows.
X-Git-Tag: v1.5.3-rc0~65^2^2~121
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=084835805565726c825f0853626a33a0263066bf;p=git.git

Use the subprocess module instead of popen2 to make it work on Windows.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 9927fa142..a2f582f8c 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -8,7 +8,7 @@
 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
 #
 
-import optparse, sys, os, marshal, popen2, shelve
+import optparse, sys, os, marshal, popen2, subprocess, shelve
 import tempfile, getopt, sha, os.path, time
 from sets import Set;
 
@@ -926,10 +926,10 @@ class P4Sync(Command):
 
         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
 
-        importProcess = popen2.Popen3("git fast-import", capturestderr = True)
-        self.gitOutput = importProcess.fromchild
-        self.gitStream = importProcess.tochild
-        self.gitError = importProcess.childerr
+        importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
+        self.gitOutput = importProcess.stdout
+        self.gitStream = importProcess.stdin
+        self.gitError = importProcess.stderr
 
         if len(self.revision) > 0:
             print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision)