Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-from optparse import OptionParser, make_option
from stgit.commands import common
from stgit.lib import transaction
+from stgit import argparse
+from stgit.argparse import opt
-help = 'push or pop patches to the given one'
-usage = """%prog [options] <name>
-
+help = 'Push or pop patches to the given one'
+kind = 'stack'
+usage = ['<patch-name>']
+description = """
Push/pop patches to/from the stack until the one given on the command
-line becomes current. There is no '--undo' option for 'goto'. Use the
-'push --undo' command for this."""
+line becomes current."""
+
+args = [argparse.other_applied_patches, argparse.unapplied_patches]
+options = argparse.keep_option() + argparse.merged_option()
directory = common.DirectoryHasRepositoryLib()
-options = []
def func(parser, options, args):
if len(args) != 1:
stack = directory.repository.current_stack
iw = stack.repository.default_iw
- trans = transaction.StackTransaction(stack, 'stg goto')
+ clean_iw = (not options.keep and iw) or None
+ trans = transaction.StackTransaction(stack, 'goto',
+ check_clean_iw = clean_iw)
if patch in trans.applied:
to_pop = set(trans.applied[trans.applied.index(patch)+1:])
assert not trans.pop_patches(lambda pn: pn in to_pop)
elif patch in trans.unapplied:
try:
- for pn in trans.unapplied[:trans.unapplied.index(patch)+1]:
- trans.push_patch(pn, iw)
+ to_push = trans.unapplied[:trans.unapplied.index(patch)+1]
+ if options.merged:
+ merged = set(trans.check_merged(to_push))
+ else:
+ merged = set()
+ for pn in to_push:
+ trans.push_patch(pn, iw, allow_interactive = True,
+ already_merged = pn in merged)
except transaction.TransactionHalted:
pass
+ elif patch in trans.hidden:
+ raise common.CmdException('Cannot goto a hidden patch')
else:
raise common.CmdException('Patch "%s" does not exist' % patch)
return trans.run(iw)