kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Make submitting work on Windows. 

Signed-off-by: Simon Hausmann <hausmann@kde.org>
maint
Simon Hausmann 2007-05-15 15:15:39 +02:00 committed by Simon Hausmann
parent caace11112
commit 25df95cce4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/fast-import/git-p4
View File

@ -9,7 +9,7 @@
# #


import optparse, sys, os, marshal, popen2, subprocess, shelve 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; from sets import Set;


gitdir = os.environ.get("GIT_DIR", "") gitdir = os.environ.get("GIT_DIR", "")
@ -299,7 +299,10 @@ class P4Submit(Command):
diff += "+" + line diff += "+" + line
f.close() 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" response = "e"
firstIteration = True firstIteration = True
@ -312,9 +315,12 @@ class P4Submit(Command):
tmpFile = os.fdopen(handle, "w+") tmpFile = os.fdopen(handle, "w+")
tmpFile.write(submitTemplate + separatorLine + diff) tmpFile.write(submitTemplate + separatorLine + diff)
tmpFile.close() 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) system(editor + " " + fileName)
tmpFile = open(fileName, "r") tmpFile = open(fileName, "rb")
message = tmpFile.read() message = tmpFile.read()
tmpFile.close() tmpFile.close()
os.remove(fileName) os.remove(fileName)
@ -325,7 +331,7 @@ class P4Submit(Command):
print submitTemplate print submitTemplate
raw_input("Press return to continue...") raw_input("Press return to continue...")
else: else:
pipe = mypopen("p4 submit -i", "w") pipe = os.popen("p4 submit -i", "wb")
pipe.write(submitTemplate) pipe.write(submitTemplate)
pipe.close() pipe.close()
else: else: