Rename "stg coalesce" to "stg squash"

[stgit] / stgit / commands / reset.py

diff --git a/stgit/commands/reset.py b/stgit/commands/reset.py
index a963d63bea2fcb57551dcfc16d410308ee407366..7dfd4a018c8fe11148204f6b2265682e22e4b41e 100644 (file)
--- a/stgit/commands/reset.py
+++ b/stgit/commands/reset.py
@@ -21,29 +21,22 @@ from stgit.argparse import opt
 from stgit.commands import common
 from stgit.lib import git, log, transaction
 from stgit.out import out
 from stgit.commands import common
 from stgit.lib import git, log, transaction
 from stgit.out import out

+from stgit import argparse

 
 help = 'Reset the patch stack to an earlier state'
 kind = 'stack'
 usage = ['[options] <state> [<patchnames>]']
 description = """
 Reset the patch stack to an earlier state. The state is specified with
 
 help = 'Reset the patch stack to an earlier state'
 kind = 'stack'
 usage = ['[options] <state> [<patchnames>]']
 description = """
 Reset the patch stack to an earlier state. The state is specified with

-a commit from a stack log; for a branch foo, StGit stores the stack
-log in foo.stgit^. So to undo the last N StGit commands (or rather,
-the last N log entries; there is not an exact one-to-one
-relationship), you would say
-
-  stg reset foo.stgit^~N
-
-or, if you are not sure how many steps to undo, you can view the log
-with "git log" or gitk
-
-  gitk foo.stgit^
-
-and then reset to any sha1 you see in the log.
+a commit id from a stack log; "stg log" lets you view this log, and
+"stg reset" lets you reset to any state you see in the log.

 
 If one or more patch names are given, reset only those patches, and
 leave the rest alone."""
 
 
 If one or more patch names are given, reset only those patches, and
 leave the rest alone."""
 

+args = [argparse.patch_range(argparse.applied_patches,
+                             argparse.unapplied_patches,
+                             argparse.hidden_patches)]

 options = [
     opt('--hard', action = 'store_true',
         short = 'Discard changes in your index/worktree')]
 options = [
     opt('--hard', action = 'store_true',
         short = 'Discard changes in your index/worktree')]