Factorize editor handling.

At the same time we trap the editor error for all editor calls, not
just when called from "stg mail".  We may want to define a new
exception for this though.

Signed-off-by: Yann Dirson <ydirson@altern.org>

diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index 762829c39a0d1d62e9915e6af5c2a28c84c4d21e..151a40804c67cc9aa1620d18e037f265819c491e 100644 (file)
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -272,22 +272,7 @@ def __edit_message(msg):
     f.write(msg)
     f.close()
 
     f.write(msg)
     f.close()
 

-    # the editor
-    editor = config.get('stgit.editor')
-    if editor:
-        pass
-    elif 'EDITOR' in os.environ:
-        editor = os.environ['EDITOR']
-    else:
-        editor = 'vi'
-    editor += ' %s' % fname
-
-    print 'Invoking the editor: "%s"...' % editor,
-    sys.stdout.flush()
-    err = os.system(editor)
-    if err:
-        raise CmdException, 'editor failed, exit code: %d' % err
-    print 'done'
+    call_editor(fname)

 
     # read the message back
     f = file(fname)
 
     # read the message back
     f = file(fname)

diff --git a/stgit/stack.py b/stgit/stack.py
index 99f10e540df57463e88f455cec66ac1f76393da4..feb77e343341d3da9c03a60c60cd10e1c07ef608 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -91,19 +91,7 @@ def edit_file(series, line, comment, show_patch = True):
     print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:'
     f.close()
 
     print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:'
     f.close()
 

-    # the editor
-    editor = config.get('stgit.editor')
-    if editor:
-        pass
-    elif 'EDITOR' in os.environ:
-        editor = os.environ['EDITOR']
-    else:
-        editor = 'vi'
-    editor += ' %s' % fname
-
-    print 'Invoking the editor: "%s"...' % editor,
-    sys.stdout.flush()
-    print 'done (exit code: %d)' % os.system(editor)
+    call_editor(fname)

 
     f = file(fname, 'r+')
 
 
     f = file(fname, 'r+')
 

diff --git a/stgit/utils.py b/stgit/utils.py
index 67431ec995be7aa31f0f86d58c35a237107fb3eb..d7d4777e23c7850ec02ea8172a27a0eb0ee4973c 100644 (file)
--- a/stgit/utils.py
+++ b/stgit/utils.py
@@ -1,7 +1,8 @@
 """Common utility functions
 """
 
 """Common utility functions
 """
 

-import errno, os, os.path
+import errno, os, os.path, sys
+from stgit.config import config

 
 __copyright__ = """
 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
 
 __copyright__ = """
 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>


@@ -152,3 +153,23 @@ def rename(basedir, file1, file2):
     create_dirs(os.path.dirname(full_file2))
     os.rename(os.path.join(basedir, file1), full_file2)
     remove_dirs(basedir, os.path.dirname(file1))
     create_dirs(os.path.dirname(full_file2))
     os.rename(os.path.join(basedir, file1), full_file2)
     remove_dirs(basedir, os.path.dirname(file1))

+
+def call_editor(filename):
+    """Run the editor on the specified filename."""
+
+    # the editor
+    editor = config.get('stgit.editor')
+    if editor:
+        pass
+    elif 'EDITOR' in os.environ:
+        editor = os.environ['EDITOR']
+    else:
+        editor = 'vi'
+    editor += ' %s' % filename
+
+    print 'Invoking the editor: "%s"...' % editor,
+    sys.stdout.flush()
+    err = os.system(editor)
+    if err:
+        raise Exception, 'editor failed, exit code: %d' % err
+    print 'done'