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

   1 __copyright__ = """
   2 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
   3
   4 This program is free software; you can redistribute it and/or modify
   5 it under the terms of the GNU General Public License version 2 as
   6 published by the Free Software Foundation.
   7
   8 This program is distributed in the hope that it will be useful,
   9 but WITHOUT ANY WARRANTY; without even the implied warranty of
  10 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  11 GNU General Public License for more details.
  12
  13 You should have received a copy of the GNU General Public License
  14 along with this program; if not, write to the Free Software
  15 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  16 """
  17
  18 import sys, os
  19 from optparse import OptionParser, make_option
  20
  21 from stgit.commands.common import *
  22 from stgit.utils import *
  23 from stgit import stack, git
  24
  25 help = 'permanently store the applied patches into stack base'
  26 usage = """%prog [options]
  27
  28 Merge the applied patches into the base of the current stack and
  29 remove them from the series while advancing the base.
  30
  31 Use this command only if you want to permanently store the applied
  32 patches and no longer manage them with StGIT."""
  33
  34 options = []
  35
  36
  37 def func(parser, options, args):
  38     """Merge the applied patches into the base of the current stack
  39        and remove them from the series while advancing the base
  40     """
  41     if len(args) != 0:
  42         parser.error('incorrect number of arguments')
  43
  44     check_local_changes()
  45     check_conflicts()
  46     check_head_top_equal()
  47
  48     applied = crt_series.get_applied()
  49     if not applied:
  50         raise CmdException, 'No patches applied'
  51
  52     if crt_series.get_protected():
  53         raise CmdException, 'This branch is protected.  Commit is not permitted'
  54
  55     crt_head = git.get_head()
  56
  57     print 'Committing %d patches...' % len(applied),
  58
  59     crt_series.pop_patch(applied[0])
  60     git.switch(crt_head)
  61
  62     for patch in applied:
  63         crt_series.delete_patch(patch)
  64
  65     print 'done'