From: Simon Hausmann Date: Wed, 21 Mar 2007 20:04:12 +0000 (+0100) Subject: Don't show the submit template and the diff first in less but show it in $editor... X-Git-Tag: v1.5.3-rc0~65^2^2~161 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53150250b13e7621c8ade1d59d19c946b745dd39;p=git.git Don't show the submit template and the diff first in less but show it in $editor right away Signed-off-by: Simon Hausmann --- diff --git a/contrib/fast-import/git-p4.py b/contrib/fast-import/git-p4.py index f940e93ba..06858844e 100755 --- a/contrib/fast-import/git-p4.py +++ b/contrib/fast-import/git-p4.py @@ -235,24 +235,26 @@ class P4Sync(Command): 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: