1
# Copyright (C) 2005 Aaron Bentley, Canonical Ltd
1
# Copyright (C) 2005 by Aaron Bentley
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24
from bzrlib.lazy_import import lazy_import
25
lazy_import(globals(), """
26
from bzrlib.commands import register_command
27
from bzrlib.errors import BzrCommandError, NotConflicted, UnsupportedOperation
37
28
from bzrlib.option import Option
29
from bzrlib.osutils import rename, delete_any
30
from bzrlib.rio import Stanza
40
33
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
43
class cmd_conflicts(commands.Command):
36
class cmd_conflicts(bzrlib.commands.Command):
44
37
"""List files with conflicts.
46
39
Merge will do its best to combine the changes in two branches, but there
48
41
it will mark a conflict. A conflict means that you need to fix something,
49
42
before you should commit.
51
Conflicts normally are listed as short, human-readable messages. If --text
52
is supplied, the pathnames of files with text conflicts are listed,
53
instead. (This is useful for editing all files with text conflicts.)
55
44
Use bzr resolve when you have fixed a problem.
46
(conflicts are determined by the presence of .BASE .TREE, and .OTHER
57
49
See also bzr resolve.
61
help='List paths of files with text conflicts.'),
64
def run(self, text=False):
65
52
from bzrlib.workingtree import WorkingTree
66
53
wt = WorkingTree.open_containing(u'.')[0]
67
54
for conflict in wt.conflicts():
69
if conflict.typestring != 'text conflict':
71
self.outf.write(conflict.path + '\n')
73
self.outf.write(str(conflict) + '\n')
76
class cmd_resolve(commands.Command):
58
class cmd_resolve(bzrlib.commands.Command):
77
59
"""Mark a conflict as resolved.
79
61
Merge will do its best to combine the changes in two branches, but there
81
63
it will mark a conflict. A conflict means that you need to fix something,
82
64
before you should commit.
84
Once you have fixed a problem, use "bzr resolve" to automatically mark
85
text conflicts as fixed, resolve FILE to mark a specific conflict as
86
resolved, or "bzr resolve --all" to mark all conflicts as resolved.
66
Once you have fixed a problem, use "bzr resolve FILE.." to mark
67
individual files as fixed, or "bzr resolve --all" to mark all conflicts as
88
70
See also bzr conflicts.
90
72
aliases = ['resolved']
91
73
takes_args = ['file*']
93
Option('all', help='Resolve all conflicts in this tree.'),
74
takes_options = [Option('all', help='Resolve all conflicts in this tree')]
95
75
def run(self, file_list=None, all=False):
96
76
from bzrlib.workingtree import WorkingTree
99
raise errors.BzrCommandError("If --all is specified,"
100
" no FILE may be provided")
79
raise BzrCommandError("If --all is specified, no FILE may be provided")
101
80
tree = WorkingTree.open_containing('.')[0]
104
tree, file_list = builtins.tree_files(file_list)
105
83
if file_list is None:
106
un_resolved, resolved = tree.auto_resolve()
107
if len(un_resolved) > 0:
108
trace.note('%d conflict(s) auto-resolved.', len(resolved))
109
trace.note('Remaining conflicts:')
110
for conflict in un_resolved:
114
trace.note('All conflicts resolved.')
117
resolve(tree, file_list)
84
raise BzrCommandError("command 'resolve' needs one or more FILE, or --all")
85
tree = WorkingTree.open_containing(file_list[0])[0]
86
to_resolve = [tree.relpath(p) for p in file_list]
87
resolve(tree, to_resolve)
120
90
def resolve(tree, paths=None, ignore_misses=False):
121
tree.lock_tree_write()
123
93
tree_conflicts = tree.conflicts()
129
99
tree_conflicts.select_conflicts(tree, paths, ignore_misses)
131
101
tree.set_conflicts(new_conflicts)
132
except errors.UnsupportedOperation:
102
except UnsupportedOperation:
134
104
selected_conflicts.remove_files(tree)
229
199
for suffix in CONFLICT_SUFFIXES:
231
osutils.delete_any(tree.abspath(conflict.path+suffix))
201
delete_any(tree.abspath(conflict.path+suffix))
232
202
except OSError, e:
233
203
if e.errno != errno.ENOENT:
236
def select_conflicts(self, tree, paths, ignore_misses=False,
206
def select_conflicts(self, tree, paths, ignore_misses=False):
238
207
"""Select the conflicts associated with paths in a tree.
240
209
File-ids are also used for this.
241
:return: a pair of ConflictLists: (not_selected, selected)
243
211
path_set = set(paths)
259
227
if cpath in path_set:
261
229
selected_paths.add(cpath)
263
if osutils.is_inside_any(path_set, cpath):
265
selected_paths.add(cpath)
267
230
for key in ('file_id', 'conflict_file_id'):
268
231
cfile_id = getattr(conflict, key, None)
269
232
if cfile_id is None:
295
258
def __init__(self, path, file_id=None):
297
# warn turned off, because the factory blindly transfers the Stanza
298
# values to __init__ and Stanza is purely a Unicode api.
299
self.file_id = osutils.safe_file_id(file_id, warn=False)
260
self.file_id = file_id
301
262
def as_stanza(self):
302
s = rio.Stanza(type=self.typestring, path=self.path)
263
s = Stanza(type=self.typestring, path=self.path)
303
264
if self.file_id is not None:
304
# Stanza requires Unicode apis
305
s.add('file_id', self.file_id.decode('utf8'))
265
s.add('file_id', self.file_id)
308
268
def _cmp_list(self):
314
274
return cmp(self._cmp_list(), other._cmp_list())
317
return hash((type(self), self.path, self.file_id))
319
276
def __eq__(self, other):
320
277
return self.__cmp__(other) == 0
416
373
conflict_file_id=None):
417
374
HandledConflict.__init__(self, action, path, file_id)
418
375
self.conflict_path = conflict_path
419
# warn turned off, because the factory blindly transfers the Stanza
420
# values to __init__.
421
self.conflict_file_id = osutils.safe_file_id(conflict_file_id,
376
self.conflict_file_id = conflict_file_id
424
378
def _cmp_list(self):
425
379
return HandledConflict._cmp_list(self) + [self.conflict_path,
429
383
s = HandledConflict.as_stanza(self)
430
384
s.add('conflict_path', self.conflict_path)
431
385
if self.conflict_file_id is not None:
432
s.add('conflict_file_id', self.conflict_file_id.decode('utf8'))
386
s.add('conflict_file_id', self.conflict_file_id)
475
429
typestring = 'unversioned parent'
477
format = 'Conflict because %(path)s is not versioned, but has versioned'\
478
' children. %(action)s.'
431
format = 'Conflict adding versioned files to %(path)s. %(action)s.'
481
434
class MissingParent(HandledConflict):
482
435
"""An attempt to add files to a directory that is not present.
483
Typically, the result of a merge where THIS deleted the directory and
484
the OTHER added a file to it.
485
See also: DeletingParent (same situation, reversed THIS and OTHER)
436
Typically, the result of a merge where one tree deleted the directory and
437
the other added a file to it.
488
440
typestring = 'missing parent'
490
442
format = 'Conflict adding files to %(path)s. %(action)s.'
493
class DeletingParent(HandledConflict):
494
"""An attempt to add files to a directory that is not present.
495
Typically, the result of a merge where one OTHER deleted the directory and
496
the THIS added a file to it.
499
typestring = 'deleting parent'
501
format = "Conflict: can't delete %(path)s because it is not empty. "\
515
456
register_types(ContentsConflict, TextConflict, PathConflict, DuplicateID,
516
DuplicateEntry, ParentLoop, UnversionedParent, MissingParent,
457
DuplicateEntry, ParentLoop, UnversionedParent, MissingParent,)
added
removed
bzrlib/conflicts.py
