Add --keep option to pop
[stgit] / 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 optparse import OptionParser, make_option
21
22 from stgit.commands.common import *
23 from stgit.utils import *
24 from stgit import stack, git
25
26
27 help = 'pop one or more patches from the stack'
28 usage = """%prog [options] [<patch>]
29
30 Pop the topmost patch or a range of patches starting with the topmost
31 one from the stack. The command fails if there are local changes or
32 conflicts. If a patch name is given as argument, the command will pop
33 all the patches up to the given one."""
34
35 options = [make_option('-a', '--all',
36 help = 'pop all the applied patches',
37 action = 'store_true'),
38 make_option('-n', '--number', type = 'int',
39 help = 'pop the specified number of patches'),
40 make_option('--keep',
41 help = 'keep the current working directory',
42 action = 'store_true')]
43
44
45 def func(parser, options, args):
46 """Pop the topmost patch from the stack
47 """
48 if len(args) > 1:
49 parser.error('incorrect number of arguments')
50
51 if not options.keep:
52 check_local_changes()
53 check_conflicts()
54 check_head_top_equal()
55
56 applied = crt_series.get_applied()
57 if not applied:
58 raise CmdException, 'No patches applied'
59 # the popping is done in reverse order
60 applied.reverse()
61
62 if options.all:
63 patches = applied
64 elif options.number:
65 patches = applied[:options.number]
66 elif len(args) == 1:
67 upto_patch = args[0]
68 if upto_patch not in applied:
69 if upto_patch in crt_series.get_unapplied():
70 raise CmdException, 'Patch "%s" is not currently applied' \
71 % upto_patch
72 else:
73 raise CmdException, 'Patch "%s" does not exist' % upto_patch
74 patches = applied[:applied.index(upto_patch)]
75 else:
76 patches = [applied[0]]
77
78 if patches == []:
79 raise CmdException, 'No patches to pop'
80
81 pop_patches(patches, options.keep)
82
83 print_crt_patch()