Invoke the correct interactive editor

The order is supposed to be GIT_EDITOR, stgit.editor, core.editor,
VISUAL, EDITOR, vi. This patch makes it so.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/utils.py b/stgit/utils.py
index 979fd3bbfa176b6c5df2d5418c7cc1bcdd954629..751cb4a1aea84c421dce8cffa857f65704cbeae5 100644 (file)
--- a/stgit/utils.py
+++ b/stgit/utils.py
@@ -170,17 +170,21 @@ def rename(basedir, file1, file2):
 class EditorException(StgException):
     pass
 
 class EditorException(StgException):
     pass
 

+def get_editor():
+    for editor in [os.environ.get('GIT_EDITOR'),
+                   config.get('stgit.editor'), # legacy
+                   config.get('core.editor'),
+                   os.environ.get('VISUAL'),
+                   os.environ.get('EDITOR'),
+                   'vi']:
+        if editor:
+            return editor
+

 def call_editor(filename):
     """Run the editor on the specified filename."""
 def call_editor(filename):
     """Run the editor on the specified filename."""

-
-    # the editor
-    editor = config.get('stgit.editor')
-    if not editor:
-        editor = os.environ.get('EDITOR', 'vi')
-    editor += ' %s' % filename
-
-    out.start('Invoking the editor: "%s"' % editor)
-    err = os.system(editor)
+    cmd = '%s %s' % (get_editor(), filename)
+    out.start('Invoking the editor: "%s"' % cmd)
+    err = os.system(cmd)

     if err:
         raise EditorException, 'editor failed, exit code: %d' % err
     out.done()
     if err:
         raise EditorException, 'editor failed, exit code: %d' % err
     out.done()

diff --git a/t/t3300-edit.sh b/t/t3300-edit.sh
index 5c2d32e0765a507ec54775ec918d1434ee6649c2..ad3b23fcf251f4b095e46aa58f3f5f226e09b461 100755 (executable)
--- a/t/t3300-edit.sh
+++ b/t/t3300-edit.sh
@@ -99,7 +99,7 @@ EOF
 }
 
 mkeditor vi
 }
 
 mkeditor vi

-test_expect_failure 'Edit commit message interactively (vi)' '
+test_expect_success 'Edit commit message interactively (vi)' '

     m=$(msg HEAD) &&
     PATH=.:$PATH stg edit p2 &&
     test "$(msg HEAD)" = "$m/vi"
     m=$(msg HEAD) &&
     PATH=.:$PATH stg edit p2 &&
     test "$(msg HEAD)" = "$m/vi"


@@ -114,14 +114,14 @@ test_expect_success 'Edit commit message interactively (EDITOR)' '
 '
 
 mkeditor e2
 '
 
 mkeditor e2

-test_expect_failure 'Edit commit message interactively (VISUAL)' '
+test_expect_success 'Edit commit message interactively (VISUAL)' '

     m=$(msg HEAD) &&
     VISUAL=./e2 EDITOR=./e1 PATH=.:$PATH stg edit p2 &&
     test "$(msg HEAD)" = "$m/e2"
 '
 
 mkeditor e3
     m=$(msg HEAD) &&
     VISUAL=./e2 EDITOR=./e1 PATH=.:$PATH stg edit p2 &&
     test "$(msg HEAD)" = "$m/e2"
 '
 
 mkeditor e3

-test_expect_failure 'Edit commit message interactively (core.editor)' '
+test_expect_success 'Edit commit message interactively (core.editor)' '

     m=$(msg HEAD) &&
     git config core.editor e3 &&
     VISUAL=./e2 EDITOR=./e1 PATH=.:$PATH stg edit p2 &&
     m=$(msg HEAD) &&
     git config core.editor e3 &&
     VISUAL=./e2 EDITOR=./e1 PATH=.:$PATH stg edit p2 &&


@@ -137,7 +137,7 @@ test_expect_success 'Edit commit message interactively (stgit.editor)' '
 '
 
 mkeditor e5
 '
 
 mkeditor e5

-test_expect_failure 'Edit commit message interactively (GIT_EDITOR)' '
+test_expect_success 'Edit commit message interactively (GIT_EDITOR)' '

     m=$(msg HEAD) &&
     GIT_EDITOR=./e5 VISUAL=./e2 EDITOR=./e1 PATH=.:$PATH stg edit p2 &&
     test "$(msg HEAD)" = "$m/e5"
     m=$(msg HEAD) &&
     GIT_EDITOR=./e5 VISUAL=./e2 EDITOR=./e1 PATH=.:$PATH stg edit p2 &&
     test "$(msg HEAD)" = "$m/e5"

diff --git a/t/test-lib.sh b/t/test-lib.sh
index ad8da684b2c924d5456f29cf906cd99bd4181202..c1fb1b376e5605bee431ee5ff72ab8bbce56e8cc 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -14,8 +14,8 @@ PAGER=cat
 TZ=UTC
 TERM=dumb
 export LANG LC_ALL PAGER TERM TZ
 TZ=UTC
 TERM=dumb
 export LANG LC_ALL PAGER TERM TZ

-EDITOR=:
-VISUAL=:
+unset EDITOR
+unset VISUAL

 unset GIT_EDITOR
 unset AUTHOR_DATE
 unset AUTHOR_EMAIL
 unset GIT_EDITOR
 unset AUTHOR_DATE
 unset AUTHOR_EMAIL


@@ -42,7 +42,6 @@ GIT_MERGE_VERBOSITY=5
 export GIT_MERGE_VERBOSITY
 export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
 export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
 export GIT_MERGE_VERBOSITY
 export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
 export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME

-export EDITOR VISUAL

 GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
 
 # Protect ourselves from common misconfiguration to export
 GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
 
 # Protect ourselves from common misconfiguration to export