X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/7a6a45b5f1379466bd23b33a7feed47d0b8331b7..33ff9cdd840cfe2780acc41d88d33c8c3bc2761e:/stgit/commands/edit.py

diff --git a/stgit/commands/edit.py b/stgit/commands/edit.py
index a8499c6..b6ef6c7 100644
--- a/stgit/commands/edit.py
+++ b/stgit/commands/edit.py
@@ -18,16 +18,16 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-from optparse import make_option
-
-from stgit import git, utils
+from stgit.argparse import opt
+from stgit import argparse, git, utils
 from stgit.commands import common
 from stgit.lib import git as gitlib, transaction
 from stgit.out import *
 
 help = 'edit a patch description or diff'
-usage = """%prog [options] [<patch>]
-
+kind = 'patch'
+usage = ['[options] [<patch>]']
+description = """
 Edit the description and author information of the given patch (or the
 current patch if no patch name was given). With --diff, also edit the
 diff.
@@ -54,15 +54,15 @@ If the patch diff is edited but does not apply, no changes are made to
 the patch at all. The edited patch is saved to a file which you can
 feed to "stg edit --file", once you have made sure it does apply."""
 
+options = [
+    opt('-d', '--diff', action = 'store_true',
+        short = 'Edit the patch diff'),
+    opt('-e', '--edit', action = 'store_true',
+        short = 'Invoke interactive editor'),
+    ] + (argparse.sign_options() + argparse.message_options() +
+         argparse.author_committer_options() + argparse.diff_opts_option())
+
 directory = common.DirectoryHasRepositoryLib()
-options = [make_option('-d', '--diff',
-                       help = 'edit the patch diff',
-                       action = 'store_true'),
-           make_option('-e', '--edit', action = 'store_true',
-                       help = 'invoke interactive editor'),
-           ] + (utils.make_sign_options() + utils.make_message_options()
-                + utils.make_author_committer_options()
-                + utils.make_diff_opts_option())
 
 def patch_diff(repository, cd, diff, diff_flags):
     if diff:
@@ -96,7 +96,7 @@ def update_patch_description(repository, cd, text):
                                  .set_date(gitlib.Date.maybe(authdate))))
     failed_diff = None
     if diff:
-        tree = repository.apply(cd.parent.data.tree, diff)
+        tree = repository.apply(cd.parent.data.tree, diff, quiet = False)
         if tree == None:
             failed_diff = diff
         else: