chiark - git - mdw - 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 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 options = [
  53     opt('-n', '--number', type = 'int',
  54         short = 'Uncommit the specified number of commits'),
  55     opt('-t', '--to', short = 'Uncommit to the specified commit'),
  56     opt('-x', '--exclusive', action = 'store_true',
  57         short = 'Exclude the commit specified by the --to option')]
  58
  59 directory = common.DirectoryHasRepositoryLib()
  60
  61 def func(parser, options, args):
  62     """Uncommit a number of patches.
  63     """
  64     stack = directory.repository.current_stack
  65     if options.to:
  66         if options.number:
  67             parser.error('cannot give both --to and --number')
  68         if len(args) != 0:
  69             parser.error('cannot specify patch name with --to')
  70         patch_nr = patchnames = None
  71         to_commit = stack.repository.rev_parse(options.to)
  72     elif options.number:
  73         if options.number <= 0:
  74             parser.error('invalid value passed to --number')
  75         patch_nr = options.number
  76         if len(args) == 0:
  77             patchnames = None
  78         elif len(args) == 1:
  79             # prefix specified
  80             patchnames = ['%s%d' % (args[0], i)
  81                           for i in xrange(patch_nr, 0, -1)]
  82         else:
  83             parser.error('when using --number, specify at most one patch name')
  84     elif len(args) == 0:
  85         patchnames = None
  86         patch_nr = 1
  87     else:
  88         patchnames = args
  89         patch_nr = len(patchnames)
  90
  91     def get_parent(c):
  92         next = c.data.parents
  93         try:
  94             [next] = next
  95         except ValueError:
  96             raise common.CmdException(
  97                 'Trying to uncommit %s, which does not have exactly one parent'
  98                 % c.sha1)
  99         return next
 100
 101     commits = []
 102     next_commit = stack.base
 103     if patch_nr:
 104         out.start('Uncommitting %d patches' % patch_nr)
 105         for i in xrange(patch_nr):
 106             commits.append(next_commit)
 107             next_commit = get_parent(next_commit)
 108     else:
 109         if options.exclusive:
 110             out.start('Uncommitting to %s (exclusive)' % to_commit.sha1)
 111         else:
 112             out.start('Uncommitting to %s' % to_commit.sha1)
 113         while True:
 114             if next_commit == to_commit:
 115                 if not options.exclusive:
 116                     commits.append(next_commit)
 117                 break
 118             commits.append(next_commit)
 119             next_commit = get_parent(next_commit)
 120         patch_nr = len(commits)
 121
 122     taken_names = set(stack.patchorder.all)
 123     if patchnames:
 124         for pn in patchnames:
 125             if pn in taken_names:
 126                 raise common.CmdException('Patch name "%s" already taken' % pn)
 127             taken_names.add(pn)
 128     else:
 129         patchnames = []
 130         for c in reversed(commits):
 131             pn = utils.make_patch_name(c.data.message,
 132                                        lambda pn: pn in taken_names)
 133             patchnames.append(pn)
 134             taken_names.add(pn)
 135         patchnames.reverse()
 136
 137     trans = transaction.StackTransaction(stack, 'uncommit',
 138                                          allow_conflicts = True,
 139                                          allow_bad_head = True)
 140     for commit, pn in zip(commits, patchnames):
 141         trans.patches[pn] = commit
 142     trans.applied = list(reversed(patchnames)) + trans.applied
 143     trans.run(set_head = False)
 144     out.done()