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.
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:
.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: