From: Shawn Bohrer <shawn.bohrer@gmail.com>
Date: Thu, 13 Mar 2008 00:03:24 +0000 (-0500)
Subject: git-p4: Use P4EDITOR environment variable when set
X-Git-Tag: v1.5.5-rc1~2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=82cea9ffb1c4677155e3e2996d76542502611370;p=git.git

git-p4: Use P4EDITOR environment variable when set

Perforce allows you to set the P4EDITOR environment variable to your
preferred editor for use in perforce.  Since we are displaying a
perforce changelog to the user we should use it when it is defined.

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Simon Hausmann <simon@lst.de>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 28b9c3c3c..3cb0330ec 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -652,7 +652,10 @@ class P4Submit(Command):
             defaultEditor = "vi"
             if platform.system() == "Windows":
                 defaultEditor = "notepad"
-            editor = os.environ.get("EDITOR", defaultEditor);
+            if os.environ.has_key("P4EDITOR"):
+                editor = os.environ.get("P4EDITOR")
+            else:
+                editor = os.environ.get("EDITOR", defaultEditor);
             system(editor + " " + fileName)
             tmpFile = open(fileName, "rb")
             message = tmpFile.read()