1
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 Canonical Ltd
1
# Copyright (C) 2005, 2006, 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
118
117
ResolveActionOption(),
120
119
_see_also = ['conflicts']
121
def run(self, file_list=None, all=False, action=None, directory=None):
120
def run(self, file_list=None, all=False, action=None, directory=u'.'):
124
raise errors.BzrCommandError(gettext("If --all is specified,"
125
" no FILE may be provided"))
126
if directory is None:
123
raise errors.BzrCommandError("If --all is specified,"
124
" no FILE may be provided")
128
125
tree = workingtree.WorkingTree.open_containing(directory)[0]
129
126
if action is None:
132
129
tree, file_list = workingtree.WorkingTree.open_containing_paths(
133
file_list, directory)
134
131
if file_list is None:
135
132
if action is None:
136
133
# FIXME: There is a special case here related to the option
146
143
if file_list is None:
147
144
un_resolved, resolved = tree.auto_resolve()
148
145
if len(un_resolved) > 0:
149
trace.note(ngettext('%d conflict auto-resolved.',
150
'%d conflicts auto-resolved.', len(resolved)),
152
trace.note(gettext('Remaining conflicts:'))
146
trace.note('%d conflict(s) auto-resolved.', len(resolved))
147
trace.note('Remaining conflicts:')
153
148
for conflict in un_resolved:
154
trace.note(unicode(conflict))
157
trace.note(gettext('All conflicts resolved.'))
152
trace.note('All conflicts resolved.')
160
155
# FIXME: This can never occur but the block above needs some
162
157
# conflict.auto(tree) --vila 091242
165
before, after = resolve(tree, file_list, action=action)
166
trace.note(ngettext('{0} conflict resolved, {1} remaining',
167
'{0} conflicts resolved, {1} remaining',
168
before-after).format(before - after, after))
160
resolve(tree, file_list, action=action)
171
163
def resolve(tree, paths=None, ignore_misses=False, recursive=False,
184
176
:param action: How the conflict should be resolved,
186
178
tree.lock_tree_write()
187
nb_conflicts_after = None
189
180
tree_conflicts = tree.conflicts()
190
nb_conflicts_before = len(tree_conflicts)
191
181
if paths is None:
192
182
new_conflicts = ConflictList()
193
183
to_process = tree_conflicts
201
191
except NotImplementedError:
202
192
new_conflicts.append(conflict)
204
nb_conflicts_after = len(new_conflicts)
205
194
tree.set_conflicts(new_conflicts)
206
195
except errors.UnsupportedOperation:
210
if nb_conflicts_after is None:
211
nb_conflicts_after = nb_conflicts_before
212
return nb_conflicts_before, nb_conflicts_after
215
201
def restore(filename):
511
497
if path_to_create is not None:
512
498
tid = tt.trans_id_tree_path(path_to_create)
513
499
transform.create_from_tree(
514
tt, tid, self._revision_tree(tt._tree, revid), file_id)
500
tt, tt.trans_id_tree_path(path_to_create),
501
self._revision_tree(tt._tree, revid), file_id)
515
502
tt.version_file(file_id, tid)
517
tid = tt.trans_id_file_id(file_id)
518
504
# Adjust the path for the retained file id
505
tid = tt.trans_id_file_id(file_id)
519
506
parent_tid = tt.get_tree_parent(tid)
520
tt.adjust_path(osutils.basename(path), parent_tid, tid)
507
tt.adjust_path(path, parent_tid, tid)
523
510
def _revision_tree(self, tree, revid):
586
573
:param tt: The TreeTransform where the conflict is resolved.
587
574
:param suffix_to_remove: Either 'THIS' or 'OTHER'
589
The resolution is symmetric: when taking THIS, OTHER is deleted and
576
The resolution is symmetric, when taking THIS, OTHER is deleted and
590
577
item.THIS is renamed into item and vice-versa.
599
586
# never existed or was already deleted (including the case
600
587
# where the user deleted it)
603
this_path = tt._tree.id2path(self.file_id)
604
except errors.NoSuchId:
605
# The file is not present anymore. This may happen if the user
606
# deleted the file either manually or when resolving a conflict on
607
# the parent. We may raise some exception to indicate that the
608
# conflict doesn't exist anymore and as such doesn't need to be
609
# resolved ? -- vila 20110615
612
this_tid = tt.trans_id_tree_path(this_path)
613
if this_tid is not None:
614
# Rename 'item.suffix_to_remove' (note that if
615
# 'item.suffix_to_remove' has been deleted, this is a no-op)
616
parent_tid = tt.get_tree_parent(this_tid)
617
tt.adjust_path(osutils.basename(self.path), parent_tid, this_tid)
589
# Rename 'item.suffix_to_remove' (note that if
590
# 'item.suffix_to_remove' has been deleted, this is a no-op)
591
this_tid = tt.trans_id_file_id(self.file_id)
592
parent_tid = tt.get_tree_parent(this_tid)
593
tt.adjust_path(self.path, parent_tid, this_tid)
620
596
def action_take_this(self, tree):
621
597
self._resolve_with_cleanups(tree, 'OTHER')
624
600
self._resolve_with_cleanups(tree, 'THIS')
603
# FIXME: TextConflict is about a single file-id, there never is a conflict_path
604
# attribute so we shouldn't inherit from PathConflict but simply from Conflict
627
606
# TODO: There should be a base revid attribute to better inform the user about
628
607
# how the conflicts were generated.
629
class TextConflict(Conflict):
608
class TextConflict(PathConflict):
630
609
"""The merge algorithm could not resolve all differences encountered."""
636
615
format = 'Text conflict in %(path)s'
638
rformat = '%(class)s(%(path)r, %(file_id)r)'
640
617
def associated_filenames(self):
641
618
return [self.path + suffix for suffix in CONFLICT_SUFFIXES]
643
def _resolve(self, tt, winner_suffix):
644
"""Resolve the conflict by copying one of .THIS or .OTHER into file.
646
:param tt: The TreeTransform where the conflict is resolved.
647
:param winner_suffix: Either 'THIS' or 'OTHER'
649
The resolution is symmetric, when taking THIS, item.THIS is renamed
650
into item and vice-versa. This takes one of the files as a whole
651
ignoring every difference that could have been merged cleanly.
653
# To avoid useless copies, we switch item and item.winner_suffix, only
654
# item will exist after the conflict has been resolved anyway.
655
item_tid = tt.trans_id_file_id(self.file_id)
656
item_parent_tid = tt.get_tree_parent(item_tid)
657
winner_path = self.path + '.' + winner_suffix
658
winner_tid = tt.trans_id_tree_path(winner_path)
659
winner_parent_tid = tt.get_tree_parent(winner_tid)
660
# Switch the paths to preserve the content
661
tt.adjust_path(osutils.basename(self.path),
662
winner_parent_tid, winner_tid)
663
tt.adjust_path(osutils.basename(winner_path), item_parent_tid, item_tid)
664
# Associate the file_id to the right content
665
tt.unversion_file(item_tid)
666
tt.version_file(self.file_id, winner_tid)
669
def action_take_this(self, tree):
670
self._resolve_with_cleanups(tree, 'THIS')
672
def action_take_other(self, tree):
673
self._resolve_with_cleanups(tree, 'OTHER')
676
621
class HandledConflict(Conflict):
677
622
"""A path problem that has been provisionally resolved.
772
717
def action_take_other(self, tree):
718
# FIXME: We shouldn't have to manipulate so many paths here (and there
719
# is probably a bug or two...)
720
base_path = osutils.basename(self.path)
721
conflict_base_path = osutils.basename(self.conflict_path)
773
722
tt = transform.TreeTransform(tree)
775
724
p_tid = tt.trans_id_file_id(self.file_id)
776
725
parent_tid = tt.get_tree_parent(p_tid)
777
726
cp_tid = tt.trans_id_file_id(self.conflict_file_id)
778
727
cparent_tid = tt.get_tree_parent(cp_tid)
779
tt.adjust_path(osutils.basename(self.path), cparent_tid, cp_tid)
780
tt.adjust_path(osutils.basename(self.conflict_path),
728
tt.adjust_path(base_path, cparent_tid, cp_tid)
729
tt.adjust_path(conflict_base_path, parent_tid, p_tid)