git-p4: fix submit in non --prepare-p4-only mode

b4073bb3 (git-p4: Do not include diff in spec file when just
preparing p4, 2014-05-24) broke git p4 submit, here is a proper
fix, including proper handling for windows end of lines.

Signed-off-by: Maxime Coste <frrrwww@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-p4.py b/git-p4.py
index 7bb0f7313bc9d4d2ad1ae43ec68afe761334a59a..ff132b2117c5ed7529d6b1237a9f26069cb4ef8a 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1238,7 +1238,7 @@ def edit_template(self, template_file):
             if response == 'n':
                 return False
 
             if response == 'n':
                 return False
 

-    def get_diff_description(self, editedFiles):
+    def get_diff_description(self, editedFiles, filesToAdd):

         # diff
         if os.environ.has_key("P4DIFF"):
             del(os.environ["P4DIFF"])
         # diff
         if os.environ.has_key("P4DIFF"):
             del(os.environ["P4DIFF"])


@@ -1258,7 +1258,7 @@ def get_diff_description(self, editedFiles):
                 newdiff += "+" + line
             f.close()
 
                 newdiff += "+" + line
             f.close()
 

-        return diff + newdiff
+        return (diff + newdiff).replace('\r\n', '\n')

 
     def applyCommit(self, id):
         """Apply one commit, return True if it succeeded."""
 
     def applyCommit(self, id):
         """Apply one commit, return True if it succeeded."""


@@ -1422,10 +1422,10 @@ def applyCommit(self, id):
         separatorLine = "######## everything below this line is just the diff #######\n"
         if not self.prepare_p4_only:
             submitTemplate += separatorLine
         separatorLine = "######## everything below this line is just the diff #######\n"
         if not self.prepare_p4_only:
             submitTemplate += separatorLine

-            submitTemplate += self.get_diff_description(editedFiles)
+            submitTemplate += self.get_diff_description(editedFiles, filesToAdd)

 
         (handle, fileName) = tempfile.mkstemp()
 
         (handle, fileName) = tempfile.mkstemp()

-        tmpFile = os.fdopen(handle, "w+")
+        tmpFile = os.fdopen(handle, "w+b")

         if self.isWindows:
             submitTemplate = submitTemplate.replace("\n", "\r\n")
         tmpFile.write(submitTemplate)
         if self.isWindows:
             submitTemplate = submitTemplate.replace("\n", "\r\n")
         tmpFile.write(submitTemplate)


@@ -1475,9 +1475,9 @@ def applyCommit(self, id):
             tmpFile = open(fileName, "rb")
             message = tmpFile.read()
             tmpFile.close()
             tmpFile = open(fileName, "rb")
             message = tmpFile.read()
             tmpFile.close()

-            submitTemplate = message[:message.index(separatorLine)]

             if self.isWindows:
             if self.isWindows:

-                submitTemplate = submitTemplate.replace("\r\n", "\n")
+                message = message.replace("\r\n", "\n")
+            submitTemplate = message[:message.index(separatorLine)]

             p4_write_pipe(['submit', '-i'], submitTemplate)
 
             if self.preserveUser:
             p4_write_pipe(['submit', '-i'], submitTemplate)
 
             if self.preserveUser: