mdw@git.distorted.org.uk Git - stgit/blob - stgit/commands/uncommit.py

   1 # -*- coding: utf-8 -*-
   2
   3 __copyright__ = """
   4 Copyright (C) 2006, Karl Hasselström <kha@treskal.com>
   5
   6 This program is free software; you can redistribute it and/or modify
   7 it under the terms of the GNU General Public License version 2 as
   8 published by the Free Software Foundation.
   9
  10 This program is distributed in the hope that it will be useful,
  11 but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 GNU General Public License for more details.
  14
  15 You should have received a copy of the GNU General Public License
  16 along with this program; if not, write to the Free Software
  17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  18 """
  19
  20 from stgit.argparse import opt
  21 from stgit.commands import common
  22 from stgit.lib import transaction
  23 from stgit.out import *
  24 from stgit import argparse, utils
  25
  26 help = 'Turn regular git commits into StGit patches'
  27 kind = 'stack'
  28 usage = ['<patch-name-1> [<patch-name-2> ...]',
  29          '-n NUM [<prefix>]',
  30          '-t <committish> [-x]']
  31 description = """
  32 Take one or more git commits at the base of the current stack and turn
  33 them into StGIT patches. The new patches are created as applied patches
  34 at the bottom of the stack. This is the opposite of 'stg commit'.
  35
  36 By default, the number of patches to uncommit is determined by the
  37 number of patch names provided on the command line. First name is used
  38 for the first patch to uncommit, i.e. for the newest patch.
  39
  40 The -n/--number option specifies the number of patches to uncommit. In
  41 this case, at most one patch name may be specified. It is used as
  42 prefix to which the patch number is appended. If no patch names are
  43 provided on the command line, StGIT automatically generates them based
  44 on the first line of the patch description.
  45
  46 The -t/--to option specifies that all commits up to and including the
  47 given commit should be uncommitted.
  48
  49 Only commits with exactly one parent can be uncommitted; in other
  50 words, you can't uncommit a merge."""
  51
  52 args = []
  53 options = [
  54     opt('-n', '--number', type = 'int',
  55         short = 'Uncommit the specified number of commits'),
  56     opt('-t', '--to', args = [argparse.commit],
  57         short = 'Uncommit to the specified commit'),
  58     opt('-x', '--exclusive', action = 'store_true',
  59         short = 'Exclude the commit specified by the --to option')]
  60
  61 directory = common.DirectoryHasRepositoryLib()
  62
  63 def func(parser, options, args):
  64     """Uncommit a number of patches.
  65     """
  66     stack = directory.repository.current_stack
  67     if options.to:
  68         if options.number:
  69             parser.error('cannot give both --to and --number')
  70         if len(args) != 0:
  71             parser.error('cannot specify patch name with --to')
  72         patch_nr = patchnames = None
  73         to_commit = stack.repository.rev_parse(options.to)
  74     elif options.number:
  75         if options.number <= 0:
  76             parser.error('invalid value passed to --number')
  77         patch_nr = options.number
  78         if len(args) == 0:
  79             patchnames = None
  80         elif len(args) == 1:
  81             # prefix specified
  82             patchnames = ['%s%d' % (args[0], i)
  83                           for i in xrange(patch_nr, 0, -1)]
  84         else:
  85             parser.error('when using --number, specify at most one patch name')
  86     elif len(args) == 0:
  87         patchnames = None
  88         patch_nr = 1
  89     else:
  90         patchnames = args
  91         patch_nr = len(patchnames)
  92
  93     def get_parent(c):
  94         next = c.data.parents
  95         try:
  96             [next] = next
  97         except ValueError:
  98             raise common.CmdException(
  99                 'Trying to uncommit %s, which does not have exactly one parent'
 100                 % c.sha1)
 101         return next
 102
 103     commits = []
 104     next_commit = stack.base
 105     if patch_nr:
 106         out.start('Uncommitting %d patches' % patch_nr)
 107         for i in xrange(patch_nr):
 108             commits.append(next_commit)
 109             next_commit = get_parent(next_commit)
 110     else:
 111         if options.exclusive:
 112             out.start('Uncommitting to %s (exclusive)' % to_commit.sha1)
 113         else:
 114             out.start('Uncommitting to %s' % to_commit.sha1)
 115         while True:
 116             if next_commit == to_commit:
 117                 if not options.exclusive:
 118                     commits.append(next_commit)
 119                 break
 120             commits.append(next_commit)
 121             next_commit = get_parent(next_commit)
 122         patch_nr = len(commits)
 123
 124     taken_names = set(stack.patchorder.all)
 125     if patchnames:
 126         for pn in patchnames:
 127             if pn in taken_names:
 128                 raise common.CmdException('Patch name "%s" already taken' % pn)
 129             taken_names.add(pn)
 130     else:
 131         patchnames = []
 132         for c in reversed(commits):
 133             pn = utils.make_patch_name(c.data.message,
 134                                        lambda pn: pn in taken_names)
 135             patchnames.append(pn)
 136             taken_names.add(pn)
 137         patchnames.reverse()
 138
 139     trans = transaction.StackTransaction(stack, 'uncommit',
 140                                          allow_conflicts = True,
 141                                          allow_bad_head = True)
 142     for commit, pn in zip(commits, patchnames):
 143         trans.patches[pn] = commit
 144     trans.applied = list(reversed(patchnames)) + trans.applied
 145     trans.run(set_head = False)
 146     out.done()