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 import sys, os
  21 from optparse import OptionParser, make_option
  22
  23 from stgit.commands.common import *
  24 from stgit.utils import *
  25 from stgit.out import *
  26 from stgit import stack, git
  27
  28 help = 'turn regular GIT commits into StGIT patches'
  29 usage = """%prog [<patchnames>] | -n NUM [<prefix>]] | -t <committish>
  30
  31 Take one or more git commits at the base of the current stack and turn
  32 them into StGIT patches. The new patches are created as applied patches
  33 at the bottom of the stack. This is the exact opposite of 'stg commit'.
  34
  35 By default, the number of patches to uncommit is determined by the
  36 number of patch names provided on the command line. First name is used
  37 for the first patch to uncommit, i.e. for the newest patch.
  38
  39 The -n/--number option specifies the number of patches to uncommit. In
  40 this case, at most one patch name may be specified. It is used as
  41 prefix to which the patch number is appended. If no patch names are
  42 provided on the command line, StGIT automatically generates them based
  43 on the first line of the patch description.
  44
  45 The -t/--to option specifies that all commits up to and including the
  46 given commit should be uncommitted.
  47
  48 Only commits with exactly one parent can be uncommitted; in other
  49 words, you can't uncommit a merge."""
  50
  51 options = [make_option('-n', '--number', type = 'int',
  52                        help = 'uncommit the specified number of commits'),
  53            make_option('-t', '--to',
  54                        help = 'uncommit to the specified commit')]
  55
  56 def func(parser, options, args):
  57     """Uncommit a number of patches.
  58     """
  59     if options.to:
  60         if options.number:
  61             parser.error('cannot give both --to and --number')
  62         if len(args) != 0:
  63             parser.error('cannot specify patch name with --to')
  64         patch_nr = patchnames = None
  65         to_commit = git.rev_parse(options.to)
  66     elif options.number:
  67         if options.number <= 0:
  68             parser.error('invalid value passed to --number')
  69
  70         patch_nr = options.number
  71
  72         if len(args) == 0:
  73             patchnames = None
  74         elif len(args) == 1:
  75             # prefix specified
  76             patchnames = ['%s%d' % (args[0], i)
  77                           for i in xrange(patch_nr, 0, -1)]
  78         else:
  79             parser.error('when using --number, specify at most one patch name')
  80     elif len(args) == 0:
  81         patchnames = None
  82         patch_nr = 1
  83     else:
  84         patchnames = args
  85         patch_nr = len(patchnames)
  86
  87     if crt_series.get_protected():
  88         raise CmdException, \
  89               'This branch is protected. Uncommit is not permitted'
  90
  91     def get_commit(commit_id):
  92         commit = git.Commit(commit_id)
  93         try:
  94             parent, = commit.get_parents()
  95         except ValueError:
  96             raise CmdException('Commit %s does not have exactly one parent'
  97                                % commit_id)
  98         return (commit, commit_id, parent)
  99
 100     commits = []
 101     next_commit = crt_series.get_base()
 102     if patch_nr:
 103         out.start('Uncommitting %d patches' % patch_nr)
 104         for i in xrange(patch_nr):
 105             commit, commit_id, parent = get_commit(next_commit)
 106             commits.append((commit, commit_id, parent))
 107             next_commit = parent
 108     else:
 109         out.start('Uncommitting to %s' % to_commit)
 110         while True:
 111             commit, commit_id, parent = get_commit(next_commit)
 112             commits.append((commit, commit_id, parent))
 113             if commit_id == to_commit:
 114                 break
 115             next_commit = parent
 116         patch_nr = len(commits)
 117
 118     for (commit, commit_id, parent), patchname in \
 119         zip(commits, patchnames or [None for i in xrange(len(commits))]):
 120         author_name, author_email, author_date = \
 121                      name_email_date(commit.get_author())
 122         crt_series.new_patch(patchname,
 123                              can_edit = False, before_existing = True,
 124                              top = commit_id, bottom = parent,
 125                              message = commit.get_log(),
 126                              author_name = author_name,
 127                              author_email = author_email,
 128                              author_date = author_date)
 129
 130     out.done()