Added --save-template flag to edit command

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/edit.py b/stgit/commands/edit.py
index a4d8f963f2a288169ecb326a1f4b6f899c32fac3..ec2c4aec9dfe75304fa370db5e3c92f4196fb4d0 100644 (file)
--- a/stgit/commands/edit.py
+++ b/stgit/commands/edit.py
@@ -72,6 +72,8 @@ options = [make_option('-d', '--diff',
                        help = 'annotate the patch log entry'),
            make_option('-m', '--message',
                        help = 'replace the patch description with MESSAGE'),
                        help = 'annotate the patch log entry'),
            make_option('-m', '--message',
                        help = 'replace the patch description with MESSAGE'),

+           make_option('--save-template', metavar = 'FILE',
+                       help = 'save the patch to FILE in the format used by -f'),

            make_option('--author', metavar = '"NAME <EMAIL>"',
                        help = 'replae the author details with "NAME <EMAIL>"'),
            make_option('--authname',
            make_option('--author', metavar = '"NAME <EMAIL>"',
                        help = 'replae the author details with "NAME <EMAIL>"'),
            make_option('--authname',


@@ -120,8 +122,8 @@ def __update_patch(pname, fname, options):
     else:
         out.done()
 
     else:
         out.done()
 

-def __edit_update_patch(pname, options):
-    """Edit the given patch interactively.
+def __generate_file(pname, fname, options):
+    """Generate a file containing the description to edit

     """
     patch = crt_series.get_patch(pname)
 
     """
     patch = crt_series.get_patch(pname)
 


@@ -168,15 +170,20 @@ def __edit_update_patch(pname, options):
 
     text = tmpl % tmpl_dict
 
 
     text = tmpl % tmpl_dict
 

+    # write the file to be edited
+    f = open(fname, 'w+')
+    f.write(text)
+    f.close()
+
+def __edit_update_patch(pname, options):
+    """Edit the given patch interactively.
+    """

     if options.diff:
         fname = '.stgit-edit.diff'
     else:
         fname = '.stgit-edit.txt'
 
     if options.diff:
         fname = '.stgit-edit.diff'
     else:
         fname = '.stgit-edit.txt'
 

-    # write the file to be edited
-    f = open(fname, 'w+')
-    f.write(text)
-    f.close()
+    __generate_file(pname, fname, options)

 
     # invoke the editor
     call_editor(fname)
 
     # invoke the editor
     call_editor(fname)


@@ -233,6 +240,8 @@ def func(parser, options, args):
                                  log = 'edit',
                                  notes = options.annotate)
         out.done()
                                  log = 'edit',
                                  notes = options.annotate)
         out.done()

+    elif options.save_template:
+        __generate_file(pname, options.save_template, options)

     elif options.file:
         __update_patch(pname, options.file, options)
     else:
     elif options.file:
         __update_patch(pname, options.file, options)
     else: