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