3 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
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.
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.
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
20 from optparse
import OptionParser
, make_option
22 from stgit
.commands
.common
import *
23 from stgit
.utils
import *
24 from stgit
import stack
, git
27 help = 'mark a file conflict as solved'
28 usage
= '%prog [options] [<file>[ <file>]]'
30 options
= [make_option('-a', '--all',
31 help = 'mark all conflicts as solved',
32 action
= 'store_true')]
35 def func(parser
, options
, args
):
36 """Mark the conflict as resolved
43 parser
.error('incorrect number of arguments')
45 conflicts
= git
.get_conflicts()
47 raise CmdException
, 'No more conflicts'
48 # check for arguments validity
50 if not filename
in conflicts
:
51 raise CmdException
, 'No conflicts for "%s"' % filename
55 del conflicts
[conflicts
.index(filename
)]
57 # save or remove the conflicts file
59 os
.remove(os
.path
.join(git
.base_dir
, 'conflicts'))
61 f
= file(os
.path
.join(git
.base_dir
, 'conflicts'), 'w+')
62 f
.writelines([line
+ '\n' for line
in conflicts
])