Let "stg new" support more message options

Let "stg new" support --file and --save-template in addition to
--message. This is useful for scripting.

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

diff --git a/stgit/commands/new.py b/stgit/commands/new.py
index fcde143255e4e5a3a9b54a9c60b2d3a39b3fc3eb..bfa7b6cd693b1eb52c019053e1d8b6485fbd1887 100644 (file)
--- a/stgit/commands/new.py
+++ b/stgit/commands/new.py
@@ -37,10 +37,8 @@ If no name is given for the new patch, one is generated from the first
 line of the commit message."""
 
 directory = common.DirectoryHasRepositoryLib()
 line of the commit message."""
 
 directory = common.DirectoryHasRepositoryLib()

-options = [make_option('-m', '--message',
-                       help = 'use MESSAGE as the patch description'),
-           ] + (utils.make_author_committer_options()
-                + utils.make_sign_options())
+options = (utils.make_author_committer_options()
+           + utils.make_message_options() + utils.make_sign_options())

 
 def func(parser, options, args):
     """Create a new patch."""
 
 def func(parser, options, args):
     """Create a new patch."""


@@ -79,6 +77,10 @@ def func(parser, options, args):
             utils.add_sign_line(cd.message, options.sign_str,
                                 cd.committer.name, cd.committer.email))
 
             utils.add_sign_line(cd.message, options.sign_str,
                                 cd.committer.name, cd.committer.email))
 

+    if options.save_template:
+        options.save_template(cd.message)
+        return utils.STGIT_SUCCESS
+

     # Let user edit the commit message manually.
     if not options.message:
         cd = cd.set_message(utils.edit_string(cd.message, '.stgit-new.txt'))
     # Let user edit the commit message manually.
     if not options.message:
         cd = cd.set_message(utils.edit_string(cd.message, '.stgit-new.txt'))