improve "usage" strings to include optional "--"

[stgit] / stgit / commands / rename.py

diff --git a/stgit/commands/rename.py b/stgit/commands/rename.py
index 1d7c43b..db898cb 100644 (file)
--- a/stgit/commands/rename.py
+++ b/stgit/commands/rename.py
@@ -16,24 +16,26 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 import sys, os
-from optparse import OptionParser, make_option
-
+from stgit.argparse import opt
 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.out import *
-from stgit import stack, git
-
-
-help = 'rename a patch in the series'
-usage = """%prog [options] [oldpatch] <newpatch>
-
-Rename <oldpatch> into <newpatch> in a series. If <oldpatch> is not given, the
-top-most patch will be renamed. """
-
-directory = DirectoryHasRepository()
-options = [make_option('-b', '--branch',
-                       help = 'use BRANCH instead of the default one')]
-
+from stgit import argparse, stack, git
+
+help = 'Rename a patch'
+kind = 'patch'
+usage = ['[options] [--] [oldpatch] <newpatch>']
+description = """
+Rename <oldpatch> into <newpatch> in a series. If <oldpatch> is not
+given, the top-most patch will be renamed."""
+
+args = [argparse.applied_patches, argparse.unapplied_patches,
+        argparse.hidden_patches]
+options = [
+    opt('-b', '--branch', args = [argparse.stg_branches],
+        short = 'use BRANCH instead of the default one')]
+
+directory = DirectoryHasRepository(log = True)
 
 def func(parser, options, args):
     """Rename a patch in the series