Browse Source

Ensure that the commit message is Windows formated (CRLF) before invoking the editor.

(The default editor on Windows (Notepad) doesn't handle Unix line endings)

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
maint
Marius Storm-Olsen 18 years ago committed by Simon Hausmann
parent
commit
f7baba8b09
  1. 5
      contrib/fast-import/git-p4

5
contrib/fast-import/git-p4

@ -277,6 +277,7 @@ class P4Submit(Command): @@ -277,6 +277,7 @@ class P4Submit(Command):
self.directSubmit = False
self.trustMeLikeAFool = False
self.verbose = False
self.isWindows = (platform.system() == "Windows")

self.logSubstitutions = {}
self.logSubstitutions["<enter description here>"] = "%log%"
@ -398,6 +399,8 @@ class P4Submit(Command): @@ -398,6 +399,8 @@ class P4Submit(Command):
if not self.directSubmit:
logMessage = extractLogMessageFromGitCommit(id)
logMessage = logMessage.replace("\n", "\n\t")
if self.isWindows:
logMessage = logMessage.replace("\n", "\r\n")
logMessage = logMessage.strip()

template = read_pipe("p4 change -o")
@ -444,6 +447,8 @@ class P4Submit(Command): @@ -444,6 +447,8 @@ class P4Submit(Command):
tmpFile.close()
os.remove(fileName)
submitTemplate = message[:message.index(separatorLine)]
if self.isWindows:
submitTemplate = submitTemplate.replace("\r\n", "\n")

if response == "y" or response == "yes":
if self.dryRun:

Loading…
Cancel
Save