kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Pete Wyckoff 2012-09-09 16:16:08 -04:00 committed by Junio C Hamano
parent f7fbc981a4
commit 55ac2ed6f5
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
git-p4.py
View File

@ -1202,6 +1202,9 @@ class P4Submit(Command, P4UserMap):
p4_revert(f) p4_revert(f)
return False return False


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


for f in filesToAdd: for f in filesToAdd:
@ -1215,6 +1218,10 @@ class P4Submit(Command, P4UserMap):
mode = filesToChangeExecBit[f] mode = filesToChangeExecBit[f]
setP4ExecBit(f, mode) setP4ExecBit(f, mode)


#
# Build p4 change description, starting with the contents
# of the git commit message.
#
logMessage = extractLogMessageFromGitCommit(id) logMessage = extractLogMessageFromGitCommit(id)
logMessage = logMessage.strip() logMessage = logMessage.strip()
(logMessage, jobs) = self.separate_jobs_from_description(logMessage) (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
@ -1223,8 +1230,16 @@ class P4Submit(Command, P4UserMap):
submitTemplate = self.prepareLogMessage(template, logMessage, jobs) submitTemplate = self.prepareLogMessage(template, logMessage, jobs)


if self.preserveUser: 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"): if os.environ.has_key("P4DIFF"):
del(os.environ["P4DIFF"]) del(os.environ["P4DIFF"])
diff = "" diff = ""
@ -1232,6 +1247,7 @@ class P4Submit(Command, P4UserMap):
diff += p4_read_pipe(['diff', '-du', diff += p4_read_pipe(['diff', '-du',
wildcard_encode(editedFile)]) wildcard_encode(editedFile)])


# new file diff
newdiff = "" newdiff = ""
for newFile in filesToAdd: for newFile in filesToAdd:
newdiff += "==== new file ====\n" newdiff += "==== new file ====\n"
@ -1242,13 +1258,7 @@ class P4Submit(Command, P4UserMap):
newdiff += "+" + line newdiff += "+" + line
f.close() f.close()


if self.checkAuthorship and not self.p4UserIsMe(p4User): # change description file: submitTemplate, separatorLine, diff, newdiff
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"

(handle, fileName) = tempfile.mkstemp() (handle, fileName) = tempfile.mkstemp()
tmpFile = os.fdopen(handle, "w+") tmpFile = os.fdopen(handle, "w+")
if self.isWindows: if self.isWindows:
@ -1258,6 +1268,9 @@ class P4Submit(Command, P4UserMap):
tmpFile.write(submitTemplate + separatorLine + diff + newdiff) tmpFile.write(submitTemplate + separatorLine + diff + newdiff)
tmpFile.close() tmpFile.close()


#
# Let the user edit the change description, then submit it.
#
if self.edit_template(fileName): if self.edit_template(fileName):
# read the edited message and submit # read the edited message and submit
ret = True ret = True