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

Don't show the submit template and the diff first in less but show it in $editor right away 

Signed-off-by: Simon Hausmann <simon@lst.de>
maint
Simon Hausmann 2007-03-21 21:04:12 +01:00
parent 2061865005
commit 53150250b1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/fast-import/git-p4.py
View File

@ -235,24 +235,26 @@ class P4Sync(Command):
diff += "+" + line diff += "+" + line
f.close() f.close()


pipe = os.popen("less", "w") separatorLine = "######## everything below this line is just the diff #######\n"
pipe.write(submitTemplate + diff)
pipe.close()


response = "e" response = "e"
firstIteration = True
while response == "e": while response == "e":
response = raw_input("Do you want to submit this change (y/e/n)? ") if not firstIteration:
response = raw_input("Do you want to submit this change (y/e/n)? ")
firstIteration = False
if response == "e": if response == "e":
[handle, fileName] = tempfile.mkstemp() [handle, fileName] = tempfile.mkstemp()
tmpFile = os.fdopen(handle, "w+") tmpFile = os.fdopen(handle, "w+")
tmpFile.write(submitTemplate) tmpFile.write(submitTemplate + separatorLine + diff)
tmpFile.close() tmpFile.close()
editor = os.environ.get("EDITOR", "vi") editor = os.environ.get("EDITOR", "vi")
system(editor + " " + fileName) system(editor + " " + fileName)
tmpFile = open(fileName, "r") tmpFile = open(fileName, "r")
submitTemplate = tmpFile.read() message = tmpFile.read()
tmpFile.close() tmpFile.close()
os.remove(fileName) os.remove(fileName)
submitTemplate = message[:message.index(separatorLine)]


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