mirror of
https://github.com/frej/fast-export.git
synced 2026-03-06 18:20:43 +01:00
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>
This commit is contained in:
committed by
Simon Hausmann
parent
6ce8e50925
commit
b7bf365514
5
git-p4
5
git-p4
@@ -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):
|
||||
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):
|
||||
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:
|
||||
|
||||
Reference in New Issue
Block a user