Infrastructure for current directory handling
[stgit] / stgit / commands / resolved.py
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 *
24 from stgit import stack, git, basedir
25 from stgit.config import config, file_extensions
26 from stgit.gitmergeonefile import interactive_merge
27
28
29 help = 'mark a file conflict as solved'
30 usage = """%prog [options] [<files...>]
31
32 Mark a merge conflict as resolved. The conflicts can be seen with the
33 'status' command, the corresponding files being prefixed with a
34 'C'. This command also removes any <file>.{ancestor,current,patched}
35 files."""
36
37 directory = DirectoryHasRepository()
38 options = [make_option('-a', '--all',
39 help = 'mark all conflicts as solved',
40 action = 'store_true'),
41 make_option('-r', '--reset', metavar = '(ancestor|current|patched)',
42 help = 'reset the file(s) to the given state'),
43 make_option('-i', '--interactive',
44 help = 'run the interactive merging tool',
45 action = 'store_true')]
46
47 def func(parser, options, args):
48 """Mark the conflict as resolved
49 """
50 if options.reset \
51 and options.reset not in file_extensions():
52 raise CmdException, 'Unknown reset state: %s' % options.reset
53
54 if options.all and not options.interactive:
55 resolved_all(options.reset)
56 return
57
58 conflicts = git.get_conflicts()
59
60 if len(args) != 0:
61 files = args
62 elif options.all:
63 files = conflicts
64 else:
65 parser.error('incorrect number of arguments')
66
67 if not conflicts:
68 raise CmdException, 'No more conflicts'
69
70 # check for arguments validity
71 if not options.all:
72 for filename in files:
73 if not filename in conflicts:
74 raise CmdException, 'No conflicts for "%s"' % filename
75
76 # resolved
77 try:
78 for filename in files:
79 if options.interactive:
80 interactive_merge(filename)
81 resolved(filename, options.reset)
82 del conflicts[conflicts.index(filename)]
83 finally:
84 # save or remove the conflicts file. Needs a finally clause to
85 # ensure that already solved conflicts are marked
86 if conflicts == []:
87 os.remove(os.path.join(basedir.get(), 'conflicts'))
88 else:
89 f = file(os.path.join(basedir.get(), 'conflicts'), 'w+')
90 f.writelines([line + '\n' for line in conflicts])
91 f.close()