Commit | Line | Data |
---|---|---|
fcee87cf CM |
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 * | |
170f576b | 24 | from stgit import stack, git, basedir |
d7fade4b | 25 | from stgit.config import file_extensions |
fcee87cf CM |
26 | |
27 | ||
28 | help = 'mark a file conflict as solved' | |
26aab5b0 CM |
29 | usage = """%prog [options] [<files...>] |
30 | ||
31 | Mark a merge conflict as resolved. The conflicts can be seen with the | |
32 | 'status' command, the corresponding files being prefixed with a | |
d7fade4b CM |
33 | 'C'. This command also removes any <file>.{ancestor,current,patched} |
34 | files.""" | |
fcee87cf CM |
35 | |
36 | options = [make_option('-a', '--all', | |
37 | help = 'mark all conflicts as solved', | |
7c47d096 | 38 | action = 'store_true'), |
d7fade4b | 39 | make_option('-r', '--reset', metavar = '(ancestor|current|patched)', |
7c47d096 | 40 | help = 'reset the file(s) to the given state')] |
fcee87cf CM |
41 | |
42 | ||
43 | def func(parser, options, args): | |
44 | """Mark the conflict as resolved | |
45 | """ | |
d7fade4b CM |
46 | if options.reset \ |
47 | and options.reset not in file_extensions(): | |
7c47d096 CM |
48 | raise CmdException, 'Unknown reset state: %s' % options.reset |
49 | ||
fcee87cf | 50 | if options.all: |
7c47d096 | 51 | resolved_all(options.reset) |
fcee87cf CM |
52 | return |
53 | ||
54 | if len(args) == 0: | |
55 | parser.error('incorrect number of arguments') | |
56 | ||
57 | conflicts = git.get_conflicts() | |
58 | if not conflicts: | |
59 | raise CmdException, 'No more conflicts' | |
60 | # check for arguments validity | |
61 | for filename in args: | |
62 | if not filename in conflicts: | |
63 | raise CmdException, 'No conflicts for "%s"' % filename | |
64 | # resolved | |
65 | for filename in args: | |
7c47d096 | 66 | resolved(filename, options.reset) |
fcee87cf CM |
67 | del conflicts[conflicts.index(filename)] |
68 | ||
69 | # save or remove the conflicts file | |
70 | if conflicts == []: | |
170f576b | 71 | os.remove(os.path.join(basedir.get(), 'conflicts')) |
fcee87cf | 72 | else: |
170f576b | 73 | f = file(os.path.join(basedir.get(), 'conflicts'), 'w+') |
fcee87cf CM |
74 | f.writelines([line + '\n' for line in conflicts]) |
75 | f.close() |