undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace \r\n with \n when importing from p4 on Windows

Browse Source 
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
This commit is contained in:
Marius Storm-Olsen 2007-05-24 14:07:55 +02:00 committed by Simon Hausmann
parent ebd8116870
commit c1f9197f37
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,6 +540,7 @@ class P4Sync(Command):
self.verbose = False self.verbose = False
self.importIntoRemotes = True self.importIntoRemotes = True
self.maxChanges = "" self.maxChanges = ""
self.isWindows = (platform.system() == "Windows")
def p4File(self, depotPath): def p4File(self, depotPath):
return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read() return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
@ -647,6 +648,9 @@ class P4Sync(Command):
data = self.p4File(depotPath) data = self.p4File(depotPath)
if self.isWindows and file["type"].endswith("text"):
data = data.replace("\r\n", "\n")
self.gitStream.write("M %s inline %s\n" % (mode, relPath)) self.gitStream.write("M %s inline %s\n" % (mode, relPath))
self.gitStream.write("data %s\n" % len(data)) self.gitStream.write("data %s\n" % len(data))
self.gitStream.write(data) self.gitStream.write(data)