From: Simon Hausmann <hausmann@kde.org>
Date: Tue, 15 May 2007 13:15:39 +0000 (+0200)
Subject: Make submitting work on Windows.
X-Git-Tag: v1.5.3-rc0~65^2^2~118
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=25df95cce470d74cdc5e8905a298bbc36c7ec6d0;p=git.git

Make submitting 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 d83ce1ae9..d134a2818 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -9,7 +9,7 @@
 #
 
 import optparse, sys, os, marshal, popen2, subprocess, shelve
-import tempfile, getopt, sha, os.path, time
+import tempfile, getopt, sha, os.path, time, platform
 from sets import Set;
 
 gitdir = os.environ.get("GIT_DIR", "")
@@ -299,7 +299,10 @@ class P4Submit(Command):
                     diff += "+" + line
                 f.close()
 
-            separatorLine = "######## everything below this line is just the diff #######\n"
+            separatorLine = "######## everything below this line is just the diff #######"
+            if platform.system() == "Windows":
+                separatorLine += "\r"
+            separatorLine += "\n"
 
             response = "e"
             firstIteration = True
@@ -312,9 +315,12 @@ class P4Submit(Command):
                     tmpFile = os.fdopen(handle, "w+")
                     tmpFile.write(submitTemplate + separatorLine + diff)
                     tmpFile.close()
-                    editor = os.environ.get("EDITOR", "vi")
+                    defaultEditor = "vi"
+                    if platform.system() == "Windows":
+                        defaultEditor = "notepad"
+                    editor = os.environ.get("EDITOR", defaultEditor);
                     system(editor + " " + fileName)
-                    tmpFile = open(fileName, "r")
+                    tmpFile = open(fileName, "rb")
                     message = tmpFile.read()
                     tmpFile.close()
                     os.remove(fileName)
@@ -325,7 +331,7 @@ class P4Submit(Command):
                    print submitTemplate
                    raw_input("Press return to continue...")
                else:
-                    pipe = mypopen("p4 submit -i", "w")
+                    pipe = os.popen("p4 submit -i", "wb")
                     pipe.write(submitTemplate)
                     pipe.close()
             else: