git p4: rearrange submit template construction

Put all items in order as they appear, and add comments.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-p4.py b/git-p4.py
index 0481f432f2343112c0de2bc96a78aed88e4b07a7..ea14c1f633ba0433f568b86aca040bfc37f3a02a 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1202,6 +1202,9 @@ def applyCommit(self, id):
                 p4_revert(f)
             return False
 
                 p4_revert(f)
             return False
 

+        #
+        # Apply the patch for real, and do add/delete/+x handling.
+        #

         system(applyPatchCmd)
 
         for f in filesToAdd:
         system(applyPatchCmd)
 
         for f in filesToAdd:


@@ -1215,6 +1218,10 @@ def applyCommit(self, id):
             mode = filesToChangeExecBit[f]
             setP4ExecBit(f, mode)
 
             mode = filesToChangeExecBit[f]
             setP4ExecBit(f, mode)
 

+        #
+        # Build p4 change description, starting with the contents
+        # of the git commit message.
+        #

         logMessage = extractLogMessageFromGitCommit(id)
         logMessage = logMessage.strip()
         (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
         logMessage = extractLogMessageFromGitCommit(id)
         logMessage = logMessage.strip()
         (logMessage, jobs) = self.separate_jobs_from_description(logMessage)


@@ -1223,8 +1230,16 @@ def applyCommit(self, id):
         submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
 
         if self.preserveUser:
         submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
 
         if self.preserveUser:

-           submitTemplate = submitTemplate + ("\n######## Actual user %s, modified after commit\n" % p4User)
+           submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
+
+        if self.checkAuthorship and not self.p4UserIsMe(p4User):
+            submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
+            submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
+            submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
+
+        separatorLine = "######## everything below this line is just the diff #######\n"

 
 

+        # diff

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


@@ -1232,6 +1247,7 @@ def applyCommit(self, id):
             diff += p4_read_pipe(['diff', '-du',
                                   wildcard_encode(editedFile)])
 
             diff += p4_read_pipe(['diff', '-du',
                                   wildcard_encode(editedFile)])
 

+        # new file diff

         newdiff = ""
         for newFile in filesToAdd:
             newdiff += "==== new file ====\n"
         newdiff = ""
         for newFile in filesToAdd:
             newdiff += "==== new file ====\n"


@@ -1242,13 +1258,7 @@ def applyCommit(self, id):
                 newdiff += "+" + line
             f.close()
 
                 newdiff += "+" + line
             f.close()
 

-        if self.checkAuthorship and not self.p4UserIsMe(p4User):
-            submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
-            submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
-            submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
-
-        separatorLine = "######## everything below this line is just the diff #######\n"
-
+        # change description file: submitTemplate, separatorLine, diff, newdiff

         (handle, fileName) = tempfile.mkstemp()
         tmpFile = os.fdopen(handle, "w+")
         if self.isWindows:
         (handle, fileName) = tempfile.mkstemp()
         tmpFile = os.fdopen(handle, "w+")
         if self.isWindows:


@@ -1258,6 +1268,9 @@ def applyCommit(self, id):
         tmpFile.write(submitTemplate + separatorLine + diff + newdiff)
         tmpFile.close()
 
         tmpFile.write(submitTemplate + separatorLine + diff + newdiff)
         tmpFile.close()
 

+        #
+        # Let the user edit the change description, then submit it.
+        #

         if self.edit_template(fileName):
             # read the edited message and submit
             ret = True
         if self.edit_template(fileName):
             # read the edited message and submit
             ret = True