development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
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 @@ def apply(self, id):
diff += "+" + line
f.close()
pipe = os.popen("less", "w")
pipe.write(submitTemplate + diff)
pipe.close()
separatorLine = "######## everything below this line is just the diff #######\n"
response = "e"
firstIteration = True
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":
[handle, fileName] = tempfile.mkstemp()
tmpFile = os.fdopen(handle, "w+")
tmpFile.write(submitTemplate)
tmpFile.write(submitTemplate + separatorLine + diff)
tmpFile.close()
editor = os.environ.get("EDITOR", "vi")
system(editor + " " + fileName)
tmpFile = open(fileName, "r")
submitTemplate = tmpFile.read()
message = tmpFile.read()
tmpFile.close()
os.remove(fileName)
submitTemplate = message[:message.index(separatorLine)]
if response == "y" or response == "yes":
if self.dryRun: