Documentation: Rename link macros

[stgit] / stgit / commands / new.py

diff --git a/stgit/commands/new.py b/stgit/commands/new.py
index 15bb2e0f426b366e8a042d236d04dc98ef8b0357..2c984310ab73022e08212867b33a6260b444b06e 100644 (file)
--- a/stgit/commands/new.py
+++ b/stgit/commands/new.py
@@ -16,29 +16,35 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 

-from optparse import make_option
-
-from stgit import utils
+from stgit import argparse, utils

 from stgit.commands import common
 from stgit.lib import git as gitlib, transaction
 from stgit.commands import common
 from stgit.lib import git as gitlib, transaction

-
-help = 'create a new patch and make it the topmost one'
-usage = """%prog [options] [name]
-
-Create a new, empty patch and make it the topmost one. If the
-'--message' option is not passed, an editor is invoked with the
-.git/patchdescr.tmpl, ~/.stgit/templates/patchdescr.tmpl or
-/usr/share/stgit/templates/patchdescr.tmpl file used a as template,
-together with generated lines. The local changes in the working tree
-are not included in the patch; an "stg refresh" command is needed for
-this.
-
-If no name is given for the new patch, one is generated from the first
-line of the commit message."""
+from stgit.config import config
+
+help = 'Create a new, empty patch'
+kind = 'patch'
+usage = ['[options] [<name>]']
+description = """
+Create a new, empty patch on the current stack. The new patch is
+created on top of the currently applied patches, and is made the new
+top of the stack. Uncommitted changes in the work tree are not
+included in the patch -- that is handled by linkstg:refresh[].
+
+The given name must be unique in the stack, and may only contain
+alphanumeric characters, dashes and underscores. If no name is given,
+one is generated from the first line of the patch's commit message.
+
+An editor will be launched to edit the commit message to be used for
+the patch, unless the '--message' flag already specified one. The
+'patchdescr.tmpl' template file (if available) is used to pre-fill the
+editor."""
+
+args = []
+options = (argparse.author_options()
+           + argparse.message_options(save_template = True)
+           + argparse.sign_options())

 
 directory = common.DirectoryHasRepositoryLib()
 
 directory = common.DirectoryHasRepositoryLib()

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


@@ -58,23 +64,26 @@ def func(parser, options, args):
     else:
         parser.error('incorrect number of arguments')
 
     else:
         parser.error('incorrect number of arguments')
 

-    head = directory.repository.refs.get(directory.repository.head)

     cd = gitlib.CommitData(
     cd = gitlib.CommitData(

-        tree = head.data.tree, parents = [head], message = '',
+        tree = stack.head.data.tree, parents = [stack.head], message = '',

         author = gitlib.Person.author(), committer = gitlib.Person.committer())
 
     # Set patch commit message from commandline.
     if options.message != None:
         cd = cd.set_message(options.message)
 
         author = gitlib.Person.author(), committer = gitlib.Person.committer())
 
     # Set patch commit message from commandline.
     if options.message != None:
         cd = cd.set_message(options.message)
 

-    # Modify author and committer data.
-    cd = (cd.set_author(options.author(cd.author))
-            .set_committer(options.committer(cd.committer)))
+    # Modify author data.
+    cd = cd.set_author(options.author(cd.author))

 
     # Add Signed-off-by: or similar.
     if options.sign_str != None:
 
     # Add Signed-off-by: or similar.
     if options.sign_str != None:

+        sign_str = options.sign_str
+    else:
+        sign_str = config.get("stgit.autosign")
+
+    if sign_str != None:

         cd = cd.set_message(
         cd = cd.set_message(

-            utils.add_sign_line(cd.message, options.sign_str,
+            utils.add_sign_line(cd.message, sign_str,

                                 cd.committer.name, cd.committer.email))
 
     if options.save_template:
                                 cd.committer.name, cd.committer.email))
 
     if options.save_template: