592
587
self.base_rev_id = self.revision_graph.find_unique_lca(
594
sorted_lca_keys = self.revision_graph.find_merge_order(
596
if self.base_rev_id == _mod_revision.NULL_REVISION:
597
self.base_rev_id = sorted_lca_keys[0]
589
self._is_criss_cross = True
599
590
if self.base_rev_id == _mod_revision.NULL_REVISION:
600
591
raise errors.UnrelatedBranches()
601
592
if self._is_criss_cross:
602
593
trace.warning('Warning: criss-cross merge encountered. See bzr'
603
594
' help criss-cross.')
604
595
trace.mutter('Criss-cross lcas: %r' % lcas)
605
if self.base_rev_id in lcas:
606
trace.mutter('Unable to find unique lca. '
607
'Fallback %r as best option.' % self.base_rev_id)
608
interesting_revision_ids = set(lcas)
609
interesting_revision_ids.add(self.base_rev_id)
596
interesting_revision_ids = [self.base_rev_id]
597
interesting_revision_ids.extend(lcas)
610
598
interesting_trees = dict((t.get_revision_id(), t)
611
599
for t in self.this_branch.repository.revision_trees(
612
600
interesting_revision_ids))
613
601
self._cached_trees.update(interesting_trees)
614
if self.base_rev_id in lcas:
615
self.base_tree = interesting_trees[self.base_rev_id]
617
self.base_tree = interesting_trees.pop(self.base_rev_id)
602
self.base_tree = interesting_trees.pop(self.base_rev_id)
603
sorted_lca_keys = self.revision_graph.find_merge_order(
618
605
self._lca_trees = [interesting_trees[key]
619
606
for key in sorted_lca_keys]
1107
1090
# the other tree's root is a non-root in the current tree (as when
1108
1091
# a previously unrelated branch is merged into another)
1110
if self.tt.final_kind(other_root) is not None:
1094
self.tt.final_kind(other_root)
1111
1095
other_root_is_present = True
1096
except errors.NoSuchFile:
1113
1097
# other_root doesn't have a physical representation. We still need
1114
1098
# to move any references to the actual root of the tree.
1115
1099
other_root_is_present = False
1116
1100
# 'other_tree.inventory.root' is not present in this tree. We are
1117
1101
# calling adjust_path for children which *want* to be present with a
1118
1102
# correct place to go.
1119
for _, child in self.other_tree.inventory.root.children.iteritems():
1103
for thing, child in self.other_tree.inventory.root.children.iteritems():
1120
1104
trans_id = self.tt.trans_id_file_id(child.file_id)
1121
1105
if not other_root_is_present:
1122
if self.tt.final_kind(trans_id) is not None:
1106
# FIXME: Make final_kind returns None instead of raising
1107
# NoSuchFile to avoid the ugly construct below -- vila 20100402
1109
self.tt.final_kind(trans_id)
1123
1110
# The item exist in the final tree and has a defined place
1124
1111
# to go already.
1113
except errors.NoSuchFile, e:
1126
1115
# Move the item into the root
1128
final_name = self.tt.final_name(trans_id)
1129
except errors.NoFinalPath:
1130
# This file is not present anymore, ignore it.
1132
self.tt.adjust_path(final_name, self.tt.root, trans_id)
1116
self.tt.adjust_path(self.tt.final_name(trans_id),
1117
self.tt.root, trans_id)
1133
1118
if other_root_is_present:
1134
1119
self.tt.cancel_creation(other_root)
1135
1120
self.tt.cancel_versioning(other_root)
1759
1750
osutils.rmtree(temp_dir)
1762
class PathNotInTree(errors.BzrError):
1764
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1766
def __init__(self, path, tree):
1767
errors.BzrError.__init__(self, path=path, tree=tree)
1770
class MergeIntoMerger(Merger):
1771
"""Merger that understands other_tree will be merged into a subdir.
1773
This also changes the Merger api so that it uses real Branch, revision_id,
1774
and RevisonTree objects, rather than using revision specs.
1777
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1778
source_subpath, other_rev_id=None):
1779
"""Create a new MergeIntoMerger object.
1781
source_subpath in other_tree will be effectively copied to
1782
target_subdir in this_tree.
1784
:param this_tree: The tree that we will be merging into.
1785
:param other_branch: The Branch we will be merging from.
1786
:param other_tree: The RevisionTree object we want to merge.
1787
:param target_subdir: The relative path where we want to merge
1788
other_tree into this_tree
1789
:param source_subpath: The relative path specifying the subtree of
1790
other_tree to merge into this_tree.
1792
# It is assumed that we are merging a tree that is not in our current
1793
# ancestry, which means we are using the "EmptyTree" as our basis.
1794
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1795
_mod_revision.NULL_REVISION)
1796
super(MergeIntoMerger, self).__init__(
1797
this_branch=this_tree.branch,
1798
this_tree=this_tree,
1799
other_tree=other_tree,
1800
base_tree=null_ancestor_tree,
1802
self._target_subdir = target_subdir
1803
self._source_subpath = source_subpath
1804
self.other_branch = other_branch
1805
if other_rev_id is None:
1806
other_rev_id = other_tree.get_revision_id()
1807
self.other_rev_id = self.other_basis = other_rev_id
1808
self.base_is_ancestor = True
1809
self.backup_files = True
1810
self.merge_type = Merge3Merger
1811
self.show_base = False
1812
self.reprocess = False
1813
self.interesting_ids = None
1814
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1815
target_subdir=self._target_subdir,
1816
source_subpath=self._source_subpath)
1817
if self._source_subpath != '':
1818
# If this isn't a partial merge make sure the revisions will be
1820
self._maybe_fetch(self.other_branch, self.this_branch,
1823
def set_pending(self):
1824
if self._source_subpath != '':
1826
Merger.set_pending(self)
1829
class _MergeTypeParameterizer(object):
1830
"""Wrap a merge-type class to provide extra parameters.
1832
This is hack used by MergeIntoMerger to pass some extra parameters to its
1833
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1834
the 'merge_type' member. It is difficult override do_merge without
1835
re-writing the whole thing, so instead we create a wrapper which will pass
1836
the extra parameters.
1839
def __init__(self, merge_type, **kwargs):
1840
self._extra_kwargs = kwargs
1841
self._merge_type = merge_type
1843
def __call__(self, *args, **kwargs):
1844
kwargs.update(self._extra_kwargs)
1845
return self._merge_type(*args, **kwargs)
1847
def __getattr__(self, name):
1848
return getattr(self._merge_type, name)
1851
class MergeIntoMergeType(Merge3Merger):
1852
"""Merger that incorporates a tree (or part of a tree) into another."""
1854
def __init__(self, *args, **kwargs):
1855
"""Initialize the merger object.
1857
:param args: See Merge3Merger.__init__'s args.
1858
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1859
source_subpath and target_subdir.
1860
:keyword source_subpath: The relative path specifying the subtree of
1861
other_tree to merge into this_tree.
1862
:keyword target_subdir: The relative path where we want to merge
1863
other_tree into this_tree
1865
# All of the interesting work happens during Merge3Merger.__init__(),
1866
# so we have have to hack in to get our extra parameters set.
1867
self._source_subpath = kwargs.pop('source_subpath')
1868
self._target_subdir = kwargs.pop('target_subdir')
1869
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1871
def _compute_transform(self):
1872
child_pb = ui.ui_factory.nested_progress_bar()
1874
entries = self._entries_to_incorporate()
1875
entries = list(entries)
1876
for num, (entry, parent_id) in enumerate(entries):
1877
child_pb.update('Preparing file merge', num, len(entries))
1878
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1879
trans_id = transform.new_by_entry(self.tt, entry,
1880
parent_trans_id, self.other_tree)
1883
self._finish_computing_transform()
1885
def _entries_to_incorporate(self):
1886
"""Yields pairs of (inventory_entry, new_parent)."""
1887
other_inv = self.other_tree.inventory
1888
subdir_id = other_inv.path2id(self._source_subpath)
1889
if subdir_id is None:
1890
# XXX: The error would be clearer if it gave the URL of the source
1891
# branch, but we don't have a reference to that here.
1892
raise PathNotInTree(self._source_subpath, "Source tree")
1893
subdir = other_inv[subdir_id]
1894
parent_in_target = osutils.dirname(self._target_subdir)
1895
target_id = self.this_tree.inventory.path2id(parent_in_target)
1896
if target_id is None:
1897
raise PathNotInTree(self._target_subdir, "Target tree")
1898
name_in_target = osutils.basename(self._target_subdir)
1899
merge_into_root = subdir.copy()
1900
merge_into_root.name = name_in_target
1901
if merge_into_root.file_id in self.this_tree.inventory:
1902
# Give the root a new file-id.
1903
# This can happen fairly easily if the directory we are
1904
# incorporating is the root, and both trees have 'TREE_ROOT' as
1905
# their root_id. Users will expect this to Just Work, so we
1906
# change the file-id here.
1907
# Non-root file-ids could potentially conflict too. That's really
1908
# an edge case, so we don't do anything special for those. We let
1909
# them cause conflicts.
1910
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1911
yield (merge_into_root, target_id)
1912
if subdir.kind != 'directory':
1913
# No children, so we are done.
1915
for ignored_path, entry in other_inv.iter_entries_by_dir(subdir_id):
1916
parent_id = entry.parent_id
1917
if parent_id == subdir.file_id:
1918
# The root's parent ID has changed, so make sure children of
1919
# the root refer to the new ID.
1920
parent_id = merge_into_root.file_id
1921
yield (entry, parent_id)
1924
1753
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1925
1754
backup_files=False,
1926
1755
merge_type=Merge3Merger,
added
removed
bzrlib/merge.py
