git-p4: Use P4EDITOR environment variable when set

sbohrer · tronical · commit 82cea9ffb1c4 · 2008-03-13T08:57:29.000+01:00
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 &lt;shawn.bohrer@gmail.com&gt;
Signed-off-by: Simon Hausmann &lt;simon@lst.de&gt;
diff --git 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()
