Prevent most commands from running when there are conflicts
[stgit] / stgit / commands / clean.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 from optparse import make_option
19 from stgit.out import *
20 from stgit.commands import common
21 from stgit.lib import transaction
22
23 help = 'delete the empty patches in the series'
24 usage = """%prog [options]
25
26 Delete the empty patches in the whole series or only those applied or
27 unapplied. A patch is considered empty if the two commit objects
28 representing its boundaries refer to the same tree object."""
29
30 directory = common.DirectoryHasRepositoryLib()
31 options = [make_option('-a', '--applied',
32 help = 'delete the empty applied patches',
33 action = 'store_true'),
34 make_option('-u', '--unapplied',
35 help = 'delete the empty unapplied patches',
36 action = 'store_true')]
37
38
39 def _clean(stack, clean_applied, clean_unapplied):
40 trans = transaction.StackTransaction(stack, 'clean', allow_conflicts = True)
41 def del_patch(pn):
42 if pn in stack.patchorder.applied:
43 if pn == stack.patchorder.applied[-1]:
44 # We're about to clean away the topmost patch. Don't
45 # do that if we have conflicts, since that means the
46 # patch is only empty because the conflicts have made
47 # us dump its contents into the index and worktree.
48 if stack.repository.default_index.conflicts():
49 return False
50 return clean_applied and trans.patches[pn].data.is_nochange()
51 elif pn in stack.patchorder.unapplied:
52 return clean_unapplied and trans.patches[pn].data.is_nochange()
53 for pn in trans.delete_patches(del_patch):
54 trans.push_patch(pn)
55 trans.run()
56
57 def func(parser, options, args):
58 """Delete the empty patches in the series
59 """
60 if len(args) != 0:
61 parser.error('incorrect number of arguments')
62
63 if not (options.applied or options.unapplied):
64 options.applied = options.unapplied = True
65
66 _clean(directory.repository.current_stack,
67 options.applied, options.unapplied)