601
587
self.base_rev_id = self.revision_graph.find_unique_lca(
603
sorted_lca_keys = self.revision_graph.find_merge_order(
605
if self.base_rev_id == _mod_revision.NULL_REVISION:
606
self.base_rev_id = sorted_lca_keys[0]
589
self._is_criss_cross = True
608
590
if self.base_rev_id == _mod_revision.NULL_REVISION:
609
591
raise errors.UnrelatedBranches()
610
592
if self._is_criss_cross:
611
593
trace.warning('Warning: criss-cross merge encountered. See bzr'
612
594
' help criss-cross.')
613
595
trace.mutter('Criss-cross lcas: %r' % lcas)
614
if self.base_rev_id in lcas:
615
trace.mutter('Unable to find unique lca. '
616
'Fallback %r as best option.' % self.base_rev_id)
617
interesting_revision_ids = set(lcas)
618
interesting_revision_ids.add(self.base_rev_id)
596
interesting_revision_ids = [self.base_rev_id]
597
interesting_revision_ids.extend(lcas)
619
598
interesting_trees = dict((t.get_revision_id(), t)
620
599
for t in self.this_branch.repository.revision_trees(
621
600
interesting_revision_ids))
622
601
self._cached_trees.update(interesting_trees)
623
if self.base_rev_id in lcas:
624
self.base_tree = interesting_trees[self.base_rev_id]
626
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(
627
605
self._lca_trees = [interesting_trees[key]
628
606
for key in sorted_lca_keys]
1764
1750
osutils.rmtree(temp_dir)
1767
class PathNotInTree(errors.BzrError):
1769
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1771
def __init__(self, path, tree):
1772
errors.BzrError.__init__(self, path=path, tree=tree)
1775
class MergeIntoMerger(Merger):
1776
"""Merger that understands other_tree will be merged into a subdir.
1778
This also changes the Merger api so that it uses real Branch, revision_id,
1779
and RevisonTree objects, rather than using revision specs.
1782
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1783
source_subpath, other_rev_id=None):
1784
"""Create a new MergeIntoMerger object.
1786
source_subpath in other_tree will be effectively copied to
1787
target_subdir in this_tree.
1789
:param this_tree: The tree that we will be merging into.
1790
:param other_branch: The Branch we will be merging from.
1791
:param other_tree: The RevisionTree object we want to merge.
1792
:param target_subdir: The relative path where we want to merge
1793
other_tree into this_tree
1794
:param source_subpath: The relative path specifying the subtree of
1795
other_tree to merge into this_tree.
1797
# It is assumed that we are merging a tree that is not in our current
1798
# ancestry, which means we are using the "EmptyTree" as our basis.
1799
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1800
_mod_revision.NULL_REVISION)
1801
super(MergeIntoMerger, self).__init__(
1802
this_branch=this_tree.branch,
1803
this_tree=this_tree,
1804
other_tree=other_tree,
1805
base_tree=null_ancestor_tree,
1807
self._target_subdir = target_subdir
1808
self._source_subpath = source_subpath
1809
self.other_branch = other_branch
1810
if other_rev_id is None:
1811
other_rev_id = other_tree.get_revision_id()
1812
self.other_rev_id = self.other_basis = other_rev_id
1813
self.base_is_ancestor = True
1814
self.backup_files = True
1815
self.merge_type = Merge3Merger
1816
self.show_base = False
1817
self.reprocess = False
1818
self.interesting_ids = None
1819
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1820
target_subdir=self._target_subdir,
1821
source_subpath=self._source_subpath)
1822
if self._source_subpath != '':
1823
# If this isn't a partial merge make sure the revisions will be
1825
self._maybe_fetch(self.other_branch, self.this_branch,
1828
def set_pending(self):
1829
if self._source_subpath != '':
1831
Merger.set_pending(self)
1834
class _MergeTypeParameterizer(object):
1835
"""Wrap a merge-type class to provide extra parameters.
1837
This is hack used by MergeIntoMerger to pass some extra parameters to its
1838
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1839
the 'merge_type' member. It is difficult override do_merge without
1840
re-writing the whole thing, so instead we create a wrapper which will pass
1841
the extra parameters.
1844
def __init__(self, merge_type, **kwargs):
1845
self._extra_kwargs = kwargs
1846
self._merge_type = merge_type
1848
def __call__(self, *args, **kwargs):
1849
kwargs.update(self._extra_kwargs)
1850
return self._merge_type(*args, **kwargs)
1852
def __getattr__(self, name):
1853
return getattr(self._merge_type, name)
1856
class MergeIntoMergeType(Merge3Merger):
1857
"""Merger that incorporates a tree (or part of a tree) into another."""
1859
def __init__(self, *args, **kwargs):
1860
"""Initialize the merger object.
1862
:param args: See Merge3Merger.__init__'s args.
1863
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1864
source_subpath and target_subdir.
1865
:keyword source_subpath: The relative path specifying the subtree of
1866
other_tree to merge into this_tree.
1867
:keyword target_subdir: The relative path where we want to merge
1868
other_tree into this_tree
1870
# All of the interesting work happens during Merge3Merger.__init__(),
1871
# so we have have to hack in to get our extra parameters set.
1872
self._source_subpath = kwargs.pop('source_subpath')
1873
self._target_subdir = kwargs.pop('target_subdir')
1874
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1876
def _compute_transform(self):
1877
child_pb = ui.ui_factory.nested_progress_bar()
1879
entries = self._entries_to_incorporate()
1880
entries = list(entries)
1881
for num, (entry, parent_id) in enumerate(entries):
1882
child_pb.update('Preparing file merge', num, len(entries))
1883
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1884
trans_id = transform.new_by_entry(self.tt, entry,
1885
parent_trans_id, self.other_tree)
1888
self._finish_computing_transform()
1890
def _entries_to_incorporate(self):
1891
"""Yields pairs of (inventory_entry, new_parent)."""
1892
other_inv = self.other_tree.inventory
1893
subdir_id = other_inv.path2id(self._source_subpath)
1894
if subdir_id is None:
1895
# XXX: The error would be clearer if it gave the URL of the source
1896
# branch, but we don't have a reference to that here.
1897
raise PathNotInTree(self._source_subpath, "Source tree")
1898
subdir = other_inv[subdir_id]
1899
parent_in_target = osutils.dirname(self._target_subdir)
1900
target_id = self.this_tree.inventory.path2id(parent_in_target)
1901
if target_id is None:
1902
raise PathNotInTree(self._target_subdir, "Target tree")
1903
name_in_target = osutils.basename(self._target_subdir)
1904
merge_into_root = subdir.copy()
1905
merge_into_root.name = name_in_target
1906
if merge_into_root.file_id in self.this_tree.inventory:
1907
# Give the root a new file-id.
1908
# This can happen fairly easily if the directory we are
1909
# incorporating is the root, and both trees have 'TREE_ROOT' as
1910
# their root_id. Users will expect this to Just Work, so we
1911
# change the file-id here.
1912
# Non-root file-ids could potentially conflict too. That's really
1913
# an edge case, so we don't do anything special for those. We let
1914
# them cause conflicts.
1915
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1916
yield (merge_into_root, target_id)
1917
if subdir.kind != 'directory':
1918
# No children, so we are done.
1920
for ignored_path, entry in other_inv.iter_entries_by_dir(subdir_id):
1921
parent_id = entry.parent_id
1922
if parent_id == subdir.file_id:
1923
# The root's parent ID has changed, so make sure children of
1924
# the root refer to the new ID.
1925
parent_id = merge_into_root.file_id
1926
yield (entry, parent_id)
1929
1753
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1930
1754
backup_files=False,
1931
1755
merge_type=Merge3Merger,
added
removed
bzrlib/merge.py
