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 stgit
.argparse
import opt
21 from stgit
.commands
.common
import *
22 from stgit
.utils
import *
23 from stgit
import stack
, git
, basedir
24 from stgit
.config
import config
, file_extensions
25 from stgit
.gitmergeonefile
import interactive_merge
27 help = 'Mark a file conflict as solved'
28 usage
= ['[options] [<files...>]']
30 Mark a merge conflict as resolved. The conflicts can be seen with the
31 'status' command, the corresponding files being prefixed with a
35 opt('-a', '--all', action
= 'store_true',
36 short
= 'Mark all conflicts as solved'),
37 opt('-r', '--reset', metavar
= '(ancestor|current|patched)',
38 short
= 'Reset the file(s) to the given state'),
39 opt('-i', '--interactive', action
= 'store_true',
40 short
= 'Run the interactive merging tool')]
42 directory
= DirectoryHasRepository(needs_current_series
= False)
44 def func(parser
, options
, args
):
45 """Mark the conflict as resolved
47 args
= git
.ls_files(args
)
48 directory
.cd_to_topdir()
51 and options
.reset
not in file_extensions():
52 raise CmdException
, 'Unknown reset state: %s' % options
.reset
54 if options
.all
and not options
.interactive
:
55 resolved_all(options
.reset
)
58 conflicts
= git
.get_conflicts()
65 parser
.error('incorrect number of arguments')
68 raise CmdException
, 'No more conflicts'
70 # check for arguments validity
72 for filename
in files
:
73 if not filename
in conflicts
:
74 raise CmdException
, 'No conflicts for "%s"' % filename
77 if options
.interactive
:
78 for filename
in files
:
79 interactive_merge(filename
)
80 git
.resolved([filename
])
82 git
.resolved(files
, options
.reset
)