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
from __future__ import absolute_import
19
21
from bzrlib.lazy_import import lazy_import
75
78
"See the AbstractPerFileMerger API docs for details on how it is "
81
self.add_hook('pre_merge',
82
'Called before a merge. '
83
'Receives a Merger object as the single argument.',
85
self.add_hook('post_merge',
86
'Called after a merge. '
87
'Receives a Merger object as the single argument. '
88
'The return value is ignored.',
80
92
class AbstractPerFileMerger(object):
92
104
def merge_contents(self, merge_params):
93
105
"""Attempt to merge the contents of a single file.
95
:param merge_params: A bzrlib.merge.MergeHookParams
107
:param merge_params: A bzrlib.merge.MergeFileHookParams
96
108
:return: A tuple of (status, chunks), where status is one of
97
109
'not_applicable', 'success', 'conflicted', or 'delete'. If status
98
110
is 'success' or 'conflicted', then chunks should be an iterable of
120
132
def get_filename(self, params, tree):
121
133
"""Lookup the filename (i.e. basename, not path), given a Tree (e.g.
122
self.merger.this_tree) and a MergeHookParams.
134
self.merger.this_tree) and a MergeFileHookParams.
124
136
return osutils.basename(tree.id2path(params.file_id))
126
138
def get_filepath(self, params, tree):
127
139
"""Calculate the path to the file in a tree.
129
:param params: A MergeHookParams describing the file to merge
141
:param params: A MergeFileHookParams describing the file to merge
130
142
:param tree: a Tree, e.g. self.merger.this_tree.
132
144
return tree.id2path(params.file_id)
139
151
params.winner == 'other' or
140
152
# THIS and OTHER aren't both files.
141
153
not params.is_file_merge() or
142
# The filename doesn't match *.xml
154
# The filename doesn't match
143
155
not self.file_matches(params)):
144
156
return 'not_applicable', None
145
157
return self.merge_matching(params)
442
454
revision_id = _mod_revision.ensure_null(revision_id)
443
455
return branch, self.revision_tree(revision_id, branch)
445
@deprecated_method(deprecated_in((2, 1, 0)))
446
def ensure_revision_trees(self):
447
if self.this_revision_tree is None:
448
self.this_basis_tree = self.revision_tree(self.this_basis)
449
if self.this_basis == self.this_rev_id:
450
self.this_revision_tree = self.this_basis_tree
452
if self.other_rev_id is None:
453
other_basis_tree = self.revision_tree(self.other_basis)
454
if other_basis_tree.has_changes(self.other_tree):
455
raise errors.WorkingTreeNotRevision(self.this_tree)
456
other_rev_id = self.other_basis
457
self.other_tree = other_basis_tree
459
@deprecated_method(deprecated_in((2, 1, 0)))
460
def file_revisions(self, file_id):
461
self.ensure_revision_trees()
462
if self.this_rev_id is None:
463
if self.this_basis_tree.get_file_sha1(file_id) != \
464
self.this_tree.get_file_sha1(file_id):
465
raise errors.WorkingTreeNotRevision(self.this_tree)
467
trees = (self.this_basis_tree, self.other_tree)
468
return [tree.get_file_revision(file_id) for tree in trees]
470
@deprecated_method(deprecated_in((2, 1, 0)))
471
def check_basis(self, check_clean, require_commits=True):
472
if self.this_basis is None and require_commits is True:
473
raise errors.BzrCommandError(
474
"This branch has no commits."
475
" (perhaps you would prefer 'bzr pull')")
478
if self.this_basis != self.this_rev_id:
479
raise errors.UncommittedChanges(self.this_tree)
481
@deprecated_method(deprecated_in((2, 1, 0)))
482
def compare_basis(self):
484
basis_tree = self.revision_tree(self.this_tree.last_revision())
485
except errors.NoSuchRevision:
486
basis_tree = self.this_tree.basis_tree()
487
if not self.this_tree.has_changes(basis_tree):
488
self.this_rev_id = self.this_basis
490
457
def set_interesting_files(self, file_list):
491
458
self.interesting_files = file_list
537
504
raise errors.NoCommits(self.other_branch)
538
505
if self.other_rev_id is not None:
539
506
self._cached_trees[self.other_rev_id] = self.other_tree
540
self._maybe_fetch(self.other_branch,self.this_branch, self.other_basis)
507
self._maybe_fetch(self.other_branch, self.this_branch, self.other_basis)
542
509
def set_other_revision(self, revision_id, other_branch):
543
510
"""Set 'other' based on a branch and revision id
645
612
self._maybe_fetch(base_branch, self.this_branch, self.base_rev_id)
647
614
def make_merger(self):
648
kwargs = {'working_tree':self.this_tree, 'this_tree': self.this_tree,
615
kwargs = {'working_tree': self.this_tree, 'this_tree': self.this_tree,
649
616
'other_tree': self.other_tree,
650
617
'interesting_ids': self.interesting_ids,
651
618
'interesting_files': self.interesting_files,
681
648
merge = self.make_merger()
682
649
if self.other_branch is not None:
683
650
self.other_branch.update_references(self.this_branch)
651
for hook in Merger.hooks['pre_merge']:
654
for hook in Merger.hooks['post_merge']:
685
656
if self.recurse == 'down':
686
657
for relpath, file_id in self.this_tree.iter_references():
687
658
sub_tree = self.this_tree.get_nested_tree(file_id, relpath)
855
826
entries = self._entries_lca()
856
827
resolver = self._lca_multi_way
828
# Prepare merge hooks
829
factories = Merger.hooks['merge_file_content']
830
# One hook for each registered one plus our default merger
831
hooks = [factory(self) for factory in factories] + [self]
832
self.active_hooks = [hook for hook in hooks if hook is not None]
857
833
child_pb = ui.ui_factory.nested_progress_bar()
859
factories = Merger.hooks['merge_file_content']
860
hooks = [factory(self) for factory in factories] + [self]
861
self.active_hooks = [hook for hook in hooks if hook is not None]
862
835
for num, (file_id, changed, parents3, names3,
863
836
executable3) in enumerate(entries):
864
child_pb.update(gettext('Preparing file merge'), num, len(entries))
837
# Try merging each entry
838
child_pb.update(gettext('Preparing file merge'),
865
840
self._merge_names(file_id, parents3, names3, resolver=resolver)
867
842
file_status = self._do_merge_contents(file_id)
1381
1356
# We have a hypothetical conflict, but if we have files, then we
1382
1357
# can try to merge the content
1383
1358
trans_id = self.tt.trans_id_file_id(file_id)
1384
params = MergeHookParams(self, file_id, trans_id, this_pair[0],
1359
params = MergeFileHookParams(self, file_id, trans_id, this_pair[0],
1385
1360
other_pair[0], winner)
1386
1361
hooks = self.active_hooks
1387
1362
hook_status = 'not_applicable'
2038
2013
merger.set_base_revision(get_revision_id(), this_branch)
2039
2014
return merger.do_merge()
2017
merge_type_registry = registry.Registry()
2018
merge_type_registry.register('diff3', Diff3Merger,
2019
"Merge using external diff3.")
2020
merge_type_registry.register('lca', LCAMerger,
2021
"LCA-newness merge.")
2022
merge_type_registry.register('merge3', Merge3Merger,
2023
"Native diff3-style merge.")
2024
merge_type_registry.register('weave', WeaveMerger,
2025
"Weave-based merge.")
2041
2028
def get_merge_type_registry():
2042
"""Merge type registry is in bzrlib.option to avoid circular imports.
2029
"""Merge type registry was previously in bzrlib.option
2044
This method provides a sanctioned way to retrieve it.
2031
This method provides a backwards compatible way to retrieve it.
2046
from bzrlib import option
2047
return option._merge_type_registry
2033
return merge_type_registry
2050
2036
def _plan_annotate_merge(annotated_a, annotated_b, ancestors_a, ancestors_b):
added
removed
bzrlib/merge.py
