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 | |
575bbdae | 20 | from stgit.argparse import opt |
fcee87cf CM |
21 | from stgit.commands.common import * |
22 | from stgit.utils import * | |
6c8a90e1 | 23 | from stgit import argparse, stack, git, basedir |
1e075406 | 24 | from stgit.config import config, file_extensions |
f7ed76a9 | 25 | from stgit.gitmergeonefile import interactive_merge |
fcee87cf | 26 | |
575bbdae | 27 | help = 'Mark a file conflict as solved' |
33ff9cdd | 28 | kind = 'wc' |
575bbdae KH |
29 | usage = ['[options] [<files...>]'] |
30 | description = """ | |
26aab5b0 CM |
31 | Mark a merge conflict as resolved. The conflicts can be seen with the |
32 | 'status' command, the corresponding files being prefixed with a | |
785552fe | 33 | 'C'.""" |
fcee87cf | 34 | |
6c8a90e1 | 35 | args = [argparse.conflicting_files] |
575bbdae KH |
36 | options = [ |
37 | opt('-a', '--all', action = 'store_true', | |
38 | short = 'Mark all conflicts as solved'), | |
39 | opt('-r', '--reset', metavar = '(ancestor|current|patched)', | |
6c8a90e1 | 40 | args = [argparse.strings('ancestor', 'current', 'patched')], |
575bbdae KH |
41 | short = 'Reset the file(s) to the given state'), |
42 | opt('-i', '--interactive', action = 'store_true', | |
43 | short = 'Run the interactive merging tool')] | |
44 | ||
117ed129 | 45 | directory = DirectoryHasRepository(needs_current_series = False, log = False) |
fcee87cf | 46 | |
fcee87cf CM |
47 | def func(parser, options, args): |
48 | """Mark the conflict as resolved | |
49 | """ | |
7b601c9e CM |
50 | args = git.ls_files(args) |
51 | directory.cd_to_topdir() | |
52 | ||
d7fade4b CM |
53 | if options.reset \ |
54 | and options.reset not in file_extensions(): | |
7c47d096 CM |
55 | raise CmdException, 'Unknown reset state: %s' % options.reset |
56 | ||
1e075406 | 57 | if options.all and not options.interactive: |
7c47d096 | 58 | resolved_all(options.reset) |
fcee87cf CM |
59 | return |
60 | ||
1e075406 CM |
61 | conflicts = git.get_conflicts() |
62 | ||
63 | if len(args) != 0: | |
64 | files = args | |
65 | elif options.all: | |
66 | files = conflicts | |
67 | else: | |
fcee87cf CM |
68 | parser.error('incorrect number of arguments') |
69 | ||
fcee87cf CM |
70 | if not conflicts: |
71 | raise CmdException, 'No more conflicts' | |
1e075406 | 72 | |
fcee87cf | 73 | # check for arguments validity |
1e075406 CM |
74 | if not options.all: |
75 | for filename in files: | |
76 | if not filename in conflicts: | |
77 | raise CmdException, 'No conflicts for "%s"' % filename | |
fcee87cf | 78 | |
1e075406 | 79 | # resolved |
0fbf9801 KH |
80 | if options.interactive: |
81 | for filename in files: | |
c5bd7632 | 82 | interactive_merge(filename) |
29197bc0 CM |
83 | git.resolved([filename]) |
84 | else: | |
85 | git.resolved(files, options.reset) |