1750
1755
osutils.rmtree(temp_dir)
1758
class PathNotInTree(errors.BzrError):
1760
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1762
def __init__(self, path, tree):
1763
errors.BzrError.__init__(self, path=path, tree=tree)
1766
class MergeIntoMerger(Merger):
1767
"""Merger that understands other_tree will be merged into a subdir.
1769
This also changes the Merger api so that it uses real Branch, revision_id,
1770
and RevisonTree objects, rather than using revision specs.
1773
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1774
source_subpath, other_rev_id=None):
1775
"""Create a new MergeIntoMerger object.
1777
source_subpath in other_tree will be effectively copied to
1778
target_subdir in this_tree.
1780
:param this_tree: The tree that we will be merging into.
1781
:param other_branch: The Branch we will be merging from.
1782
:param other_tree: The RevisionTree object we want to merge.
1783
:param target_subdir: The relative path where we want to merge
1784
other_tree into this_tree
1785
:param source_subpath: The relative path specifying the subtree of
1786
other_tree to merge into this_tree.
1788
# It is assumed that we are merging a tree that is not in our current
1789
# ancestry, which means we are using the "EmptyTree" as our basis.
1790
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1791
_mod_revision.NULL_REVISION)
1792
super(MergeIntoMerger, self).__init__(
1793
this_branch=this_tree.branch,
1794
this_tree=this_tree,
1795
other_tree=other_tree,
1796
base_tree=null_ancestor_tree,
1798
self._target_subdir = target_subdir
1799
self._source_subpath = source_subpath
1800
self.other_branch = other_branch
1801
if other_rev_id is None:
1802
other_rev_id = other_tree.get_revision_id()
1803
self.other_rev_id = self.other_basis = other_rev_id
1804
self.base_is_ancestor = True
1805
self.backup_files = True
1806
self.merge_type = Merge3Merger
1807
self.show_base = False
1808
self.reprocess = False
1809
self.interesting_ids = None
1810
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1811
target_subdir=self._target_subdir,
1812
source_subpath=self._source_subpath)
1813
if self._source_subpath != '':
1814
# If this isn't a partial merge make sure the revisions will be
1816
self._maybe_fetch(self.other_branch, self.this_branch,
1819
def set_pending(self):
1820
if self._source_subpath != '':
1822
Merger.set_pending(self)
1825
class _MergeTypeParameterizer(object):
1826
"""Wrap a merge-type class to provide extra parameters.
1828
This is hack used by MergeIntoMerger to pass some extra parameters to its
1829
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1830
the 'merge_type' member. It is difficult override do_merge without
1831
re-writing the whole thing, so instead we create a wrapper which will pass
1832
the extra parameters.
1835
def __init__(self, merge_type, **kwargs):
1836
self._extra_kwargs = kwargs
1837
self._merge_type = merge_type
1839
def __call__(self, *args, **kwargs):
1840
kwargs.update(self._extra_kwargs)
1841
return self._merge_type(*args, **kwargs)
1843
def __getattr__(self, name):
1844
return getattr(self._merge_type, name)
1847
class MergeIntoMergeType(Merge3Merger):
1848
"""Merger that incorporates a tree (or part of a tree) into another."""
1850
def __init__(self, *args, **kwargs):
1851
"""Initialize the merger object.
1853
:param args: See Merge3Merger.__init__'s args.
1854
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1855
source_subpath and target_subdir.
1856
:keyword source_subpath: The relative path specifying the subtree of
1857
other_tree to merge into this_tree.
1858
:keyword target_subdir: The relative path where we want to merge
1859
other_tree into this_tree
1861
# All of the interesting work happens during Merge3Merger.__init__(),
1862
# so we have have to hack in to get our extra parameters set.
1863
self._source_subpath = kwargs.pop('source_subpath')
1864
self._target_subdir = kwargs.pop('target_subdir')
1865
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1867
def _compute_transform(self):
1868
child_pb = ui.ui_factory.nested_progress_bar()
1870
entries = self._entries_to_incorporate()
1871
entries = list(entries)
1872
for num, (entry, parent_id) in enumerate(entries):
1873
child_pb.update('Preparing file merge', num, len(entries))
1874
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1875
trans_id = transform.new_by_entry(self.tt, entry,
1876
parent_trans_id, self.other_tree)
1879
self._finish_computing_transform()
1881
def _entries_to_incorporate(self):
1882
"""Yields pairs of (inventory_entry, new_parent)."""
1883
other_inv = self.other_tree.inventory
1884
subdir_id = other_inv.path2id(self._source_subpath)
1885
if subdir_id is None:
1886
# XXX: The error would be clearer if it gave the URL of the source
1887
# branch, but we don't have a reference to that here.
1888
raise PathNotInTree(self._source_subpath, "Source tree")
1889
subdir = other_inv[subdir_id]
1890
parent_in_target = osutils.dirname(self._target_subdir)
1891
target_id = self.this_tree.inventory.path2id(parent_in_target)
1892
if target_id is None:
1893
raise PathNotInTree(self._target_subdir, "Target tree")
1894
name_in_target = osutils.basename(self._target_subdir)
1895
merge_into_root = subdir.copy()
1896
merge_into_root.name = name_in_target
1897
if merge_into_root.file_id in self.this_tree.inventory:
1898
# Give the root a new file-id.
1899
# This can happen fairly easily if the directory we are
1900
# incorporating is the root, and both trees have 'TREE_ROOT' as
1901
# their root_id. Users will expect this to Just Work, so we
1902
# change the file-id here.
1903
# Non-root file-ids could potentially conflict too. That's really
1904
# an edge case, so we don't do anything special for those. We let
1905
# them cause conflicts.
1906
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1907
yield (merge_into_root, target_id)
1908
if subdir.kind != 'directory':
1909
# No children, so we are done.
1911
for ignored_path, entry in other_inv.iter_entries_by_dir(subdir_id):
1912
parent_id = entry.parent_id
1913
if parent_id == subdir.file_id:
1914
# The root's parent ID has changed, so make sure children of
1915
# the root refer to the new ID.
1916
parent_id = merge_into_root.file_id
1917
yield (entry, parent_id)
1753
1920
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1754
1921
backup_files=False,
1755
1922
merge_type=Merge3Merger,
added
removed
bzrlib/merge.py
