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

   1
   2 __copyright__ = """
   3 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
   4
   5 This program is free software; you can redistribute it and/or modify
   6 it under the terms of the GNU General Public License version 2 as
   7 published by the Free Software Foundation.
   8
   9 This program is distributed in the hope that it will be useful,
  10 but WITHOUT ANY WARRANTY; without even the implied warranty of
  11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  12 GNU General Public License for more details.
  13
  14 You should have received a copy of the GNU General Public License
  15 along with this program; if not, write to the Free Software
  16 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  17 """
  18
  19 import sys, os
  20 from stgit.argparse import opt
  21 from stgit.commands.common import *
  22 from stgit.utils import *
  23 from stgit import stack, git
  24
  25 help = 'Pop one or more patches from the stack'
  26 kind = 'stack'
  27 usage = ['[options] [<patch1>] [<patch2>] [<patch3>..<patch4>]']
  28 description = """
  29 Pop the topmost patch or a range of patches from the stack. The
  30 command fails if there are conflicts or local changes (and --keep was
  31 not specified).
  32
  33 A series of pop and push operations are performed so that only the
  34 patches passed on the command line are popped from the stack. Some of
  35 the push operations may fail because of conflicts (push --undo would
  36 revert the last push operation)."""
  37
  38 options = [
  39     opt('-a', '--all', action = 'store_true',
  40         short = 'Pop all the applied patches'),
  41     opt('-n', '--number', type = 'int',
  42         short = 'Pop the specified number of patches'),
  43     opt('-k', '--keep', action = 'store_true',
  44         short = 'Keep the local changes')]
  45
  46 directory = DirectoryGotoToplevel()
  47
  48 def func(parser, options, args):
  49     """Pop the topmost patch from the stack
  50     """
  51     check_conflicts()
  52     check_head_top_equal(crt_series)
  53
  54     if not options.keep:
  55         check_local_changes()
  56
  57     applied = crt_series.get_applied()
  58     if not applied:
  59         raise CmdException, 'No patches applied'
  60
  61     if options.all:
  62         patches = applied
  63     elif options.number:
  64         # reverse it twice to also work with negative or bigger than
  65         # the length numbers
  66         patches = applied[::-1][:options.number][::-1]
  67     elif len(args) == 0:
  68         patches = [applied[-1]]
  69     else:
  70         patches = parse_patches(args, applied, ordered = True)
  71
  72     if not patches:
  73         raise CmdException, 'No patches to pop'
  74
  75     # pop to the most distant popped patch
  76     topop = applied[applied.index(patches[0]):]
  77     # push those not in the popped range
  78     topush = [p for p in topop if p not in patches]
  79
  80     if options.keep and topush:
  81         raise CmdException, 'Cannot pop arbitrary patches with --keep'
  82
  83     topop.reverse()
  84     pop_patches(crt_series, topop, options.keep)
  85     if topush:
  86         push_patches(crt_series, topush)
  87
  88     print_crt_patch(crt_series)