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
, basedir
25 from stgit
.config
import config
, file_extensions
28 help = 'mark a file conflict as solved'
29 usage
= """%prog [options] [<files...>]
31 Mark a merge conflict as resolved. The conflicts can be seen with the
32 'status' command, the corresponding files being prefixed with a
33 'C'. This command also removes any <file>.{ancestor,current,patched}
36 options
= [make_option('-a', '--all',
37 help = 'mark all conflicts as solved',
38 action
= 'store_true'),
39 make_option('-r', '--reset', metavar
= '(ancestor|current|patched)',
40 help = 'reset the file(s) to the given state'),
41 make_option('-i', '--interactive',
42 help = 'run the interactive merging tool',
43 action
= 'store_true')]
45 def interactive_merge(filename
):
46 """Run the interactive merger on the given file
49 imerger
= config
.get('stgit', 'imerger')
50 except Exception, err
:
51 raise CmdException
, 'Configuration error: %s' % err
53 extensions
= file_extensions()
55 ancestor
= filename
+ extensions
['ancestor']
56 current
= filename
+ extensions
['current']
57 patched
= filename
+ extensions
['patched']
59 # check whether we have all the files for a three-way merge
60 for fn
in [filename
, ancestor
, current
, patched
]:
61 if not os
.path
.isfile(fn
):
63 'Cannot run the interactive merger: "%s" missing' % fn
65 mtime
= os
.path
.getmtime(filename
)
67 err
= os
.system(imerger %
{'branch1': current
,
73 raise CmdException
, 'The interactive merger failed: %d' % err
74 if not os
.path
.isfile(filename
):
75 raise CmdException
, 'The "%s" file is missing' % filename
76 if mtime
== os
.path
.getmtime(filename
):
77 raise CmdException
, 'The "%s" file was not modified' % filename
79 def func(parser
, options
, args
):
80 """Mark the conflict as resolved
83 and options
.reset
not in file_extensions():
84 raise CmdException
, 'Unknown reset state: %s' % options
.reset
86 if options
.all
and not options
.interactive
:
87 resolved_all(options
.reset
)
90 conflicts
= git
.get_conflicts()
97 parser
.error('incorrect number of arguments')
100 raise CmdException
, 'No more conflicts'
102 # check for arguments validity
104 for filename
in files
:
105 if not filename
in conflicts
:
106 raise CmdException
, 'No conflicts for "%s"' % filename
110 for filename
in files
:
111 if options
.interactive
:
112 interactive_merge(filename
)
113 resolved(filename
, options
.reset
)
114 del conflicts
[conflicts
.index(filename
)]
116 # save or remove the conflicts file. Needs a finally clause to
117 # ensure that already solved conflicts are marked
119 os
.remove(os
.path
.join(basedir
.get(), 'conflicts'))
121 f
= file(os
.path
.join(basedir
.get(), 'conflicts'), 'w+')
122 f
.writelines([line
+ '\n' for line
in conflicts
])