1
# Copyright (C) 2005, 2007 Canonical Ltd
1
# Copyright (C) 2005, 2007, 2009, 2010 Canonical Ltd
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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
# TODO: Move this into builtins
19
17
# TODO: 'bzr resolve' should accept a directory name and work from that
24
23
from bzrlib.lazy_import import lazy_import
25
24
lazy_import(globals(), """
53
57
instead. (This is useful for editing all files with text conflicts.)
55
59
Use bzr resolve when you have fixed a problem.
61
help='List paths of files with text conflicts.'),
63
help='List paths of files with text conflicts.'),
65
_see_also = ['resolve', 'conflict-types']
64
67
def run(self, text=False):
65
from bzrlib.workingtree import WorkingTree
66
wt = WorkingTree.open_containing(u'.')[0]
68
wt = workingtree.WorkingTree.open_containing(u'.')[0]
67
69
for conflict in wt.conflicts():
69
71
if conflict.typestring != 'text conflict':
73
75
self.outf.write(str(conflict) + '\n')
78
resolve_action_registry = registry.Registry()
81
resolve_action_registry.register(
82
'done', 'done', 'Marks the conflict as resolved' )
83
resolve_action_registry.register(
84
'take-this', 'take_this',
85
'Resolve the conflict preserving the version in the working tree' )
86
resolve_action_registry.register(
87
'take-other', 'take_other',
88
'Resolve the conflict taking the merged version into account' )
89
resolve_action_registry.default_key = 'done'
91
class ResolveActionOption(option.RegistryOption):
94
super(ResolveActionOption, self).__init__(
95
'action', 'How to resolve the conflict.',
97
registry=resolve_action_registry)
76
100
class cmd_resolve(commands.Command):
77
101
"""Mark a conflict as resolved.
82
106
before you should commit.
84
108
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
109
text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict as
86
110
resolved, or "bzr resolve --all" to mark all conflicts as resolved.
88
See also bzr conflicts.
90
112
aliases = ['resolved']
91
113
takes_args = ['file*']
93
Option('all', help='Resolve all conflicts in this tree.'),
115
option.Option('all', help='Resolve all conflicts in this tree.'),
116
ResolveActionOption(),
95
def run(self, file_list=None, all=False):
96
from bzrlib.workingtree import WorkingTree
118
_see_also = ['conflicts']
119
def run(self, file_list=None, all=False, action=None):
99
122
raise errors.BzrCommandError("If --all is specified,"
100
123
" no FILE may be provided")
101
tree = WorkingTree.open_containing('.')[0]
124
tree = workingtree.WorkingTree.open_containing('.')[0]
104
128
tree, file_list = builtins.tree_files(file_list)
105
129
if file_list is None:
131
# FIXME: There is a special case here related to the option
132
# handling that could be clearer and easier to discover by
133
# providing an --auto action (bug #344013 and #383396) and
134
# make it mandatory instead of implicit and active only
135
# when no file_list is provided -- vila 091229
141
if file_list is None:
106
142
un_resolved, resolved = tree.auto_resolve()
107
143
if len(un_resolved) > 0:
108
144
trace.note('%d conflict(s) auto-resolved.', len(resolved))
114
150
trace.note('All conflicts resolved.')
117
resolve(tree, file_list)
120
def resolve(tree, paths=None, ignore_misses=False, recursive=False):
153
# FIXME: This can never occur but the block above needs some
154
# refactoring to transfer tree.auto_resolve() to
155
# conflict.auto(tree) --vila 091242
158
resolve(tree, file_list, action=action)
161
def resolve(tree, paths=None, ignore_misses=False, recursive=False,
121
163
"""Resolve some or all of the conflicts in a working tree.
123
165
:param paths: If None, resolve all conflicts. Otherwise, select only
127
169
recursive commands like revert, this should be True. For commands
128
170
or applications wishing finer-grained control, like the resolve
129
171
command, this should be False.
130
:ignore_misses: If False, warnings will be printed if the supplied paths
131
do not have conflicts.
172
:param ignore_misses: If False, warnings will be printed if the supplied
173
paths do not have conflicts.
174
:param action: How the conflict should be resolved,
133
176
tree.lock_tree_write()
135
178
tree_conflicts = tree.conflicts()
136
179
if paths is None:
137
180
new_conflicts = ConflictList()
138
selected_conflicts = tree_conflicts
181
to_process = tree_conflicts
140
new_conflicts, selected_conflicts = \
141
tree_conflicts.select_conflicts(tree, paths, ignore_misses,
183
new_conflicts, to_process = tree_conflicts.select_conflicts(
184
tree, paths, ignore_misses, recursive)
185
for conflict in to_process:
187
conflict._do(action, tree)
188
conflict.cleanup(tree)
189
except NotImplementedError:
190
new_conflicts.append(conflict)
144
192
tree.set_conflicts(new_conflicts)
145
193
except errors.UnsupportedOperation:
147
selected_conflicts.remove_files(tree)
152
199
def restore(filename):
154
Restore a conflicted file to the state it was in before merging.
155
Only text restoration supported at present.
200
"""Restore a conflicted file to the state it was in before merging.
202
Only text restoration is supported at present.
157
204
conflicted = False
239
286
for conflict in self:
240
287
if not conflict.has_files:
242
for suffix in CONFLICT_SUFFIXES:
244
osutils.delete_any(tree.abspath(conflict.path+suffix))
246
if e.errno != errno.ENOENT:
289
conflict.cleanup(tree)
249
291
def select_conflicts(self, tree, paths, ignore_misses=False,
358
401
return None, conflict.typestring
403
def _do(self, action, tree):
404
"""Apply the specified action to the conflict.
406
:param action: The method name to call.
408
:param tree: The tree passed as a parameter to the method.
410
meth = getattr(self, 'action_%s' % action, None)
412
raise NotImplementedError(self.__class__.__name__ + '.' + action)
415
def cleanup(self, tree):
416
raise NotImplementedError(self.cleanup)
418
def action_done(self, tree):
419
"""Mark the conflict as solved once it has been handled."""
420
# This method does nothing but simplifies the design of upper levels.
423
def action_take_this(self, tree):
424
raise NotImplementedError(self.action_take_this)
426
def action_take_other(self, tree):
427
raise NotImplementedError(self.action_take_other)
361
430
class PathConflict(Conflict):
362
431
"""A conflict was encountered merging file paths"""
366
435
format = 'Path conflict: %(path)s / %(conflict_path)s'
368
437
rformat = '%(class)s(%(path)r, %(conflict_path)r, %(file_id)r)'
369
439
def __init__(self, path, conflict_path=None, file_id=None):
370
440
Conflict.__init__(self, path, file_id)
371
441
self.conflict_path = conflict_path
376
446
s.add('conflict_path', self.conflict_path)
449
def cleanup(self, tree):
450
# No additional files have been generated here
453
def action_take_this(self, tree):
454
tree.rename_one(self.conflict_path, self.path)
456
def action_take_other(self, tree):
457
# just acccept bzr proposal
380
461
class ContentsConflict(PathConflict):
381
462
"""The files are of different types, or not present"""
387
468
format = 'Contents conflict in %(path)s'
470
def cleanup(self, tree):
471
for suffix in ('.BASE', '.OTHER'):
473
osutils.delete_any(tree.abspath(self.path + suffix))
475
if e.errno != errno.ENOENT:
478
# FIXME: I smell something weird here and it seems we should be able to be
479
# more coherent with some other conflict ? bzr *did* a choice there but
480
# neither action_take_this nor action_take_other reflect that...
482
def action_take_this(self, tree):
483
tree.remove([self.path + '.OTHER'], force=True, keep_files=False)
485
def action_take_other(self, tree):
486
tree.remove([self.path], force=True, keep_files=False)
490
# FIXME: TextConflict is about a single file-id, there never is a conflict_path
491
# attribute so we shouldn't inherit from PathConflict but simply from Conflict
493
# TODO: There should be a base revid attribute to better inform the user about
494
# how the conflicts were generated.
390
495
class TextConflict(PathConflict):
391
496
"""The merge algorithm could not resolve all differences encountered."""
397
502
format = 'Text conflict in %(path)s'
504
def cleanup(self, tree):
505
for suffix in CONFLICT_SUFFIXES:
507
osutils.delete_any(tree.abspath(self.path+suffix))
509
if e.errno != errno.ENOENT:
400
513
class HandledConflict(Conflict):
401
514
"""A path problem that has been provisionally resolved.
416
529
s.add('action', self.action)
532
def cleanup(self, tree):
533
"""Nothing to cleanup."""
420
537
class HandledPathConflict(HandledConflict):
421
538
"""A provisionally-resolved path problem involving two paths.
463
580
format = 'Conflict adding file %(conflict_path)s. %(action)s %(path)s.'
582
def action_take_this(self, tree):
583
tree.remove([self.conflict_path], force=True, keep_files=False)
584
tree.rename_one(self.path, self.conflict_path)
586
def action_take_other(self, tree):
587
tree.remove([self.path], force=True, keep_files=False)
466
590
class ParentLoop(HandledPathConflict):
467
591
"""An attempt to create an infinitely-looping directory structure.
468
592
This is rare, but can be produced like so:
479
603
format = 'Conflict moving %(conflict_path)s into %(path)s. %(action)s.'
605
def action_take_this(self, tree):
606
# just acccept bzr proposal
609
def action_take_other(self, tree):
610
# FIXME: We shouldn't have to manipulate so many paths here (and there
611
# is probably a bug or two...)
612
base_path = osutils.basename(self.path)
613
conflict_base_path = osutils.basename(self.conflict_path)
614
tt = transform.TreeTransform(tree)
616
p_tid = tt.trans_id_file_id(self.file_id)
617
parent_tid = tt.get_tree_parent(p_tid)
618
cp_tid = tt.trans_id_file_id(self.conflict_file_id)
619
cparent_tid = tt.get_tree_parent(cp_tid)
620
tt.adjust_path(base_path, cparent_tid, cp_tid)
621
tt.adjust_path(conflict_base_path, parent_tid, p_tid)
482
627
class UnversionedParent(HandledConflict):
483
"""An attempt to version an file whose parent directory is not versioned.
628
"""An attempt to version a file whose parent directory is not versioned.
484
629
Typically, the result of a merge where one tree unversioned the directory
485
630
and the other added a versioned file to it.
490
635
format = 'Conflict because %(path)s is not versioned, but has versioned'\
491
636
' children. %(action)s.'
638
# FIXME: We silently do nothing to make tests pass, but most probably the
639
# conflict shouldn't exist (the long story is that the conflict is
640
# generated with another one that can be resolved properly) -- vila 091224
641
def action_take_this(self, tree):
644
def action_take_other(self, tree):
494
648
class MissingParent(HandledConflict):
495
649
"""An attempt to add files to a directory that is not present.
496
650
Typically, the result of a merge where THIS deleted the directory and
497
651
the OTHER added a file to it.
498
See also: DeletingParent (same situation, reversed THIS and OTHER)
652
See also: DeletingParent (same situation, THIS and OTHER reversed)
501
655
typestring = 'missing parent'
503
657
format = 'Conflict adding files to %(path)s. %(action)s.'
659
def action_take_this(self, tree):
660
tree.remove([self.path], force=True, keep_files=False)
662
def action_take_other(self, tree):
663
# just acccept bzr proposal
506
667
class DeletingParent(HandledConflict):
507
668
"""An attempt to add files to a directory that is not present.
514
675
format = "Conflict: can't delete %(path)s because it is not empty. "\
678
# FIXME: It's a bit strange that the default action is not coherent with
679
# MissingParent from the *user* pov.
681
def action_take_this(self, tree):
682
# just acccept bzr proposal
685
def action_take_other(self, tree):
686
tree.remove([self.path], force=True, keep_files=False)
518
689
class NonDirectoryParent(HandledConflict):
519
"""An attempt to add files to a directory that is not a director or
690
"""An attempt to add files to a directory that is not a directory or
520
691
an attempt to change the kind of a directory with files.
525
696
format = "Conflict: %(path)s is not a directory, but has files in it."\
699
# FIXME: .OTHER should be used instead of .new when the conflict is created
701
def action_take_this(self, tree):
702
# FIXME: we should preserve that path when the conflict is generated !
703
if self.path.endswith('.new'):
704
conflict_path = self.path[:-(len('.new'))]
705
tree.remove([self.path], force=True, keep_files=False)
706
tree.add(conflict_path)
708
raise NotImplementedError(self.action_take_this)
710
def action_take_other(self, tree):
711
# FIXME: we should preserve that path when the conflict is generated !
712
if self.path.endswith('.new'):
713
conflict_path = self.path[:-(len('.new'))]
714
tree.remove([conflict_path], force=True, keep_files=False)
715
tree.rename_one(self.path, conflict_path)
717
raise NotImplementedError(self.action_take_other)
534
726
for conflict_type in conflict_types:
535
727
ctype[conflict_type.typestring] = conflict_type
538
729
register_types(ContentsConflict, TextConflict, PathConflict, DuplicateID,
539
730
DuplicateEntry, ParentLoop, UnversionedParent, MissingParent,
540
731
DeletingParent, NonDirectoryParent)
added
removed
bzrlib/conflicts.py
