Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-import sys, os
-from optparse import OptionParser, make_option
-
-from stgit.commands.common import *
-from stgit.utils import *
-from stgit import stack, git
+from optparse import make_option
+from stgit.commands import common
+from stgit.lib import transaction
+from stgit.out import *
+from stgit import utils
help = 'turn regular GIT commits into StGIT patches'
-usage = """%prog [<patchname1> [<patchname2> ... ] | -n [<prefix>]]
+usage = """%prog [<patchnames>] | -n NUM [<prefix>]] | -t <committish> [-x]
Take one or more git commits at the base of the current stack and turn
them into StGIT patches. The new patches are created as applied patches
-at the bottom of the stack. This is the exact opposite of 'stg commit'.
+at the bottom of the stack. This is the opposite of 'stg commit'.
By default, the number of patches to uncommit is determined by the
number of patch names provided on the command line. First name is used
for the first patch to uncommit, i.e. for the newest patch.
-The --number option specifies the number of patches to uncommit. In
+The -n/--number option specifies the number of patches to uncommit. In
this case, at most one patch name may be specified. It is used as
-prefix to which the patch number is appended.
+prefix to which the patch number is appended. If no patch names are
+provided on the command line, StGIT automatically generates them based
+on the first line of the patch description.
-If no patch names are provided on the command line, StGIT
-automatically generates them based on the first line of the patch
-description.
+The -t/--to option specifies that all commits up to and including the
+given commit should be uncommitted.
Only commits with exactly one parent can be uncommitted; in other
words, you can't uncommit a merge."""
+directory = common.DirectoryHasRepositoryLib()
options = [make_option('-n', '--number', type = 'int',
- help = 'uncommit the specified number of commits')]
+ help = 'uncommit the specified number of commits'),
+ make_option('-t', '--to',
+ help = 'uncommit to the specified commit'),
+ make_option('-x', '--exclusive',
+ help = 'exclude the commit specified by the --to option',
+ action = 'store_true')]
def func(parser, options, args):
"""Uncommit a number of patches.
"""
- if options.number:
+ stack = directory.repository.current_stack
+ if options.to:
+ if options.number:
+ parser.error('cannot give both --to and --number')
+ if len(args) != 0:
+ parser.error('cannot specify patch name with --to')
+ patch_nr = patchnames = None
+ to_commit = stack.repository.rev_parse(options.to)
+ elif options.number:
if options.number <= 0:
parser.error('invalid value passed to --number')
-
patch_nr = options.number
-
if len(args) == 0:
patchnames = None
elif len(args) == 1:
patchnames = args
patch_nr = len(patchnames)
- if crt_series.get_protected():
- raise CmdException, \
- 'This branch is protected. Uncommit is not permitted'
-
- print 'Uncommitting %d patches...' % patch_nr,
- sys.stdout.flush()
-
- for n in xrange(0, patch_nr):
- # retrieve the commit (only commits with a single parent are allowed)
- commit_id = crt_series.get_base()
- commit = git.Commit(commit_id)
+ def get_parent(c):
+ next = c.data.parents
try:
- parent, = commit.get_parents()
+ [next] = next
except ValueError:
- raise CmdException, 'Commit %s does not have exactly one parent' \
- % commit_id
- author_name, author_email, author_date = \
- name_email_date(commit.get_author())
-
- if patchnames:
- patchname = patchnames[n]
+ raise common.CmdException(
+ 'Trying to uncommit %s, which does not have exactly one parent'
+ % c.sha1)
+ return next
+
+ commits = []
+ next_commit = stack.base
+ if patch_nr:
+ out.start('Uncommitting %d patches' % patch_nr)
+ for i in xrange(patch_nr):
+ commits.append(next_commit)
+ next_commit = get_parent(next_commit)
+ else:
+ if options.exclusive:
+ out.start('Uncommitting to %s (exclusive)' % to_commit)
else:
- patchname = make_patch_name(commit.get_log(),
- crt_series.patch_exists)
-
- crt_series.new_patch(patchname,
- can_edit = False, before_existing = True,
- top = commit_id, bottom = parent,
- message = commit.get_log(),
- author_name = author_name,
- author_email = author_email,
- author_date = author_date)
-
- print 'done'
+ out.start('Uncommitting to %s' % to_commit)
+ while True:
+ if next_commit == to_commit:
+ if not options.exclusive:
+ commits.append(next_commit)
+ break
+ commits.append(next_commit)
+ next_commit = get_parent(next_commit)
+ patch_nr = len(commits)
+
+ taken_names = set(stack.patchorder.all)
+ if patchnames:
+ for pn in patchnames:
+ if pn in taken_names:
+ raise common.CmdException('Patch name "%s" already taken' % pn)
+ taken_names.add(pn)
+ else:
+ patchnames = []
+ for c in reversed(commits):
+ pn = utils.make_patch_name(c.data.message,
+ lambda pn: pn in taken_names)
+ patchnames.append(pn)
+ taken_names.add(pn)
+ patchnames.reverse()
+
+ trans = transaction.StackTransaction(stack, 'uncommit',
+ allow_conflicts = True)
+ for commit, pn in zip(commits, patchnames):
+ trans.patches[pn] = commit
+ trans.applied = list(reversed(patchnames)) + trans.applied
+ trans.run()
+ out.done()
~mdw / stgit / blobdiff