587
594
self.base_rev_id = self.revision_graph.find_unique_lca(
589
self._is_criss_cross = True
596
sorted_lca_keys = self.revision_graph.find_merge_order(
598
if self.base_rev_id == _mod_revision.NULL_REVISION:
599
self.base_rev_id = sorted_lca_keys[0]
590
601
if self.base_rev_id == _mod_revision.NULL_REVISION:
591
602
raise errors.UnrelatedBranches()
592
603
if self._is_criss_cross:
593
604
trace.warning('Warning: criss-cross merge encountered. See bzr'
594
605
' help criss-cross.')
595
606
trace.mutter('Criss-cross lcas: %r' % lcas)
596
interesting_revision_ids = [self.base_rev_id]
597
interesting_revision_ids.extend(lcas)
607
if self.base_rev_id in lcas:
608
trace.mutter('Unable to find unique lca. '
609
'Fallback %r as best option.'
611
interesting_revision_ids = set(lcas)
612
interesting_revision_ids.add(self.base_rev_id)
598
613
interesting_trees = dict((t.get_revision_id(), t)
599
614
for t in self.this_branch.repository.revision_trees(
600
615
interesting_revision_ids))
601
616
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(
617
if self.base_rev_id in lcas:
618
self.base_tree = interesting_trees[self.base_rev_id]
620
self.base_tree = interesting_trees.pop(self.base_rev_id)
605
621
self._lca_trees = [interesting_trees[key]
606
622
for key in sorted_lca_keys]
913
937
it then compares with THIS and BASE.
915
939
For the multi-valued entries, the format will be (BASE, [lca1, lca2])
916
:return: [(file_id, changed, parents, names, executable)]
917
file_id Simple file_id of the entry
918
changed Boolean, True if the kind or contents changed
920
parents ((base, [parent_id, in, lcas]), parent_id_other,
922
names ((base, [name, in, lcas]), name_in_other, name_in_this)
923
executable ((base, [exec, in, lcas]), exec_in_other, exec_in_this)
941
:return: [(file_id, changed, parents, names, executable)], where:
943
* file_id: Simple file_id of the entry
944
* changed: Boolean, True if the kind or contents changed else False
945
* parents: ((base, [parent_id, in, lcas]), parent_id_other,
947
* names: ((base, [name, in, lcas]), name_in_other, name_in_this)
948
* executable: ((base, [exec, in, lcas]), exec_in_other,
925
951
if self.interesting_files is not None:
926
952
lookup_trees = [self.this_tree, self.base_tree]
1086
1110
other_root = self.tt.trans_id_file_id(other_root_file_id)
1087
1111
if other_root == self.tt.root:
1089
if self.other_tree.inventory.root.file_id in self.this_tree.inventory:
1090
# the other tree's root is a non-root in the current tree (as when
1091
# a previously unrelated branch is merged into another)
1113
if self.this_tree.inventory.has_id(
1114
self.other_tree.inventory.root.file_id):
1115
# the other tree's root is a non-root in the current tree (as
1116
# when a previously unrelated branch is merged into another)
1094
self.tt.final_kind(other_root)
1118
if self.tt.final_kind(other_root) is not None:
1095
1119
other_root_is_present = True
1096
except errors.NoSuchFile:
1097
1121
# other_root doesn't have a physical representation. We still need
1098
1122
# to move any references to the actual root of the tree.
1099
1123
other_root_is_present = False
1100
1124
# 'other_tree.inventory.root' is not present in this tree. We are
1101
1125
# calling adjust_path for children which *want* to be present with a
1102
1126
# correct place to go.
1103
for thing, child in self.other_tree.inventory.root.children.iteritems():
1127
for _, child in self.other_tree.inventory.root.children.iteritems():
1104
1128
trans_id = self.tt.trans_id_file_id(child.file_id)
1105
1129
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)
1130
if self.tt.final_kind(trans_id) is not None:
1110
1131
# The item exist in the final tree and has a defined place
1111
1132
# to go already.
1113
except errors.NoSuchFile, e:
1115
1134
# Move the item into the root
1116
self.tt.adjust_path(self.tt.final_name(trans_id),
1117
self.tt.root, trans_id)
1136
final_name = self.tt.final_name(trans_id)
1137
except errors.NoFinalPath:
1138
# This file is not present anymore, ignore it.
1140
self.tt.adjust_path(final_name, self.tt.root, trans_id)
1118
1141
if other_root_is_present:
1119
1142
self.tt.cancel_creation(other_root)
1120
1143
self.tt.cancel_versioning(other_root)
1299
1322
self._raw_conflicts.append(('path conflict', trans_id, file_id,
1300
1323
this_parent, this_name,
1301
1324
other_parent, other_name))
1302
if other_name is None:
1325
if not self.other_tree.has_id(file_id):
1303
1326
# it doesn't matter whether the result was 'other' or
1304
# 'conflict'-- if there's no 'other', we leave it alone.
1327
# 'conflict'-- if it has no file id, we leave it alone.
1306
1329
parent_id = parents[self.winner_idx[parent_id_winner]]
1307
if parent_id is not None:
1330
name = names[self.winner_idx[name_winner]]
1331
if parent_id is not None or name is not None:
1308
1332
# if we get here, name_winner and parent_winner are set to safe
1310
self.tt.adjust_path(names[self.winner_idx[name_winner]],
1311
self.tt.trans_id_file_id(parent_id),
1334
if parent_id is None and name is not None:
1335
# if parent_id is None and name is non-None, current file is
1337
if names[self.winner_idx[parent_id_winner]] != '':
1338
raise AssertionError(
1339
'File looks like a root, but named %s' %
1340
names[self.winner_idx[parent_id_winner]])
1341
parent_trans_id = transform.ROOT_PARENT
1343
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1344
self.tt.adjust_path(name, parent_trans_id,
1312
1345
self.tt.trans_id_file_id(file_id))
1314
1347
def _do_merge_contents(self, file_id):
1315
1348
"""Performs a merge on file_id contents."""
1316
1349
def contents_pair(tree):
1317
if file_id not in tree:
1350
if not tree.has_id(file_id):
1318
1351
return (None, None)
1319
1352
kind = tree.kind(file_id)
1320
1353
if kind == "file":
1358
1391
if hook_status != 'not_applicable':
1359
1392
# Don't try any more hooks, this one applies.
1394
# If the merge ends up replacing the content of the file, we get rid of
1395
# it at the end of this method (this variable is used to track the
1396
# exceptions to this rule).
1361
1398
result = "modified"
1362
1399
if hook_status == 'not_applicable':
1363
# This is a contents conflict, because none of the available
1364
# functions could merge it.
1400
# No merge hook was able to resolve the situation. Two cases exist:
1401
# a content conflict or a duplicate one.
1366
1403
name = self.tt.final_name(trans_id)
1367
1404
parent_id = self.tt.final_parent(trans_id)
1368
if self.this_tree.has_id(file_id):
1369
self.tt.unversion_file(trans_id)
1370
file_group = self._dump_conflicts(name, parent_id, file_id,
1372
self._raw_conflicts.append(('contents conflict', file_group))
1406
inhibit_content_conflict = False
1407
if params.this_kind is None: # file_id is not in THIS
1408
# Is the name used for a different file_id ?
1409
dupe_path = self.other_tree.id2path(file_id)
1410
this_id = self.this_tree.path2id(dupe_path)
1411
if this_id is not None:
1412
# Two entries for the same path
1414
# versioning the merged file will trigger a duplicate
1416
self.tt.version_file(file_id, trans_id)
1417
transform.create_from_tree(
1418
self.tt, trans_id, self.other_tree, file_id,
1419
filter_tree_path=self._get_filter_tree_path(file_id))
1420
inhibit_content_conflict = True
1421
elif params.other_kind is None: # file_id is not in OTHER
1422
# Is the name used for a different file_id ?
1423
dupe_path = self.this_tree.id2path(file_id)
1424
other_id = self.other_tree.path2id(dupe_path)
1425
if other_id is not None:
1426
# Two entries for the same path again, but here, the other
1427
# entry will also be merged. We simply inhibit the
1428
# 'content' conflict creation because we know OTHER will
1429
# create (or has already created depending on ordering) an
1430
# entry at the same path. This will trigger a 'duplicate'
1433
inhibit_content_conflict = True
1434
if not inhibit_content_conflict:
1435
if params.this_kind is not None:
1436
self.tt.unversion_file(trans_id)
1437
# This is a contents conflict, because none of the available
1438
# functions could merge it.
1439
file_group = self._dump_conflicts(name, parent_id, file_id,
1441
self._raw_conflicts.append(('contents conflict', file_group))
1373
1442
elif hook_status == 'success':
1374
1443
self.tt.create_file(lines, trans_id)
1375
1444
elif hook_status == 'conflicted':
1391
1460
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1392
1461
if not self.this_tree.has_id(file_id) and result == "modified":
1393
1462
self.tt.version_file(file_id, trans_id)
1394
# The merge has been performed, so the old contents should not be
1464
# The merge has been performed and produced a new content, so the
1465
# old contents should not be retained.
1397
1466
self.tt.delete_contents(trans_id)
1398
except errors.NoSuchFile:
1402
1469
def _default_other_winner_merge(self, merge_hook_params):
1403
1470
"""Replace this contents with other."""
1404
1471
file_id = merge_hook_params.file_id
1405
1472
trans_id = merge_hook_params.trans_id
1406
file_in_this = self.this_tree.has_id(file_id)
1407
1473
if self.other_tree.has_id(file_id):
1408
1474
# OTHER changed the file
1410
if wt.supports_content_filtering():
1411
# We get the path from the working tree if it exists.
1412
# That fails though when OTHER is adding a file, so
1413
# we fall back to the other tree to find the path if
1414
# it doesn't exist locally.
1416
filter_tree_path = wt.id2path(file_id)
1417
except errors.NoSuchId:
1418
filter_tree_path = self.other_tree.id2path(file_id)
1420
# Skip the id2path lookup for older formats
1421
filter_tree_path = None
1422
transform.create_from_tree(self.tt, trans_id,
1423
self.other_tree, file_id,
1424
filter_tree_path=filter_tree_path)
1475
transform.create_from_tree(
1476
self.tt, trans_id, self.other_tree, file_id,
1477
filter_tree_path=self._get_filter_tree_path(file_id))
1425
1478
return 'done', None
1479
elif self.this_tree.has_id(file_id):
1427
1480
# OTHER deleted the file
1428
1481
return 'delete', None
1750
1834
osutils.rmtree(temp_dir)
1837
class PathNotInTree(errors.BzrError):
1839
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1841
def __init__(self, path, tree):
1842
errors.BzrError.__init__(self, path=path, tree=tree)
1845
class MergeIntoMerger(Merger):
1846
"""Merger that understands other_tree will be merged into a subdir.
1848
This also changes the Merger api so that it uses real Branch, revision_id,
1849
and RevisonTree objects, rather than using revision specs.
1852
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1853
source_subpath, other_rev_id=None):
1854
"""Create a new MergeIntoMerger object.
1856
source_subpath in other_tree will be effectively copied to
1857
target_subdir in this_tree.
1859
:param this_tree: The tree that we will be merging into.
1860
:param other_branch: The Branch we will be merging from.
1861
:param other_tree: The RevisionTree object we want to merge.
1862
:param target_subdir: The relative path where we want to merge
1863
other_tree into this_tree
1864
:param source_subpath: The relative path specifying the subtree of
1865
other_tree to merge into this_tree.
1867
# It is assumed that we are merging a tree that is not in our current
1868
# ancestry, which means we are using the "EmptyTree" as our basis.
1869
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1870
_mod_revision.NULL_REVISION)
1871
super(MergeIntoMerger, self).__init__(
1872
this_branch=this_tree.branch,
1873
this_tree=this_tree,
1874
other_tree=other_tree,
1875
base_tree=null_ancestor_tree,
1877
self._target_subdir = target_subdir
1878
self._source_subpath = source_subpath
1879
self.other_branch = other_branch
1880
if other_rev_id is None:
1881
other_rev_id = other_tree.get_revision_id()
1882
self.other_rev_id = self.other_basis = other_rev_id
1883
self.base_is_ancestor = True
1884
self.backup_files = True
1885
self.merge_type = Merge3Merger
1886
self.show_base = False
1887
self.reprocess = False
1888
self.interesting_ids = None
1889
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1890
target_subdir=self._target_subdir,
1891
source_subpath=self._source_subpath)
1892
if self._source_subpath != '':
1893
# If this isn't a partial merge make sure the revisions will be
1895
self._maybe_fetch(self.other_branch, self.this_branch,
1898
def set_pending(self):
1899
if self._source_subpath != '':
1901
Merger.set_pending(self)
1904
class _MergeTypeParameterizer(object):
1905
"""Wrap a merge-type class to provide extra parameters.
1907
This is hack used by MergeIntoMerger to pass some extra parameters to its
1908
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1909
the 'merge_type' member. It is difficult override do_merge without
1910
re-writing the whole thing, so instead we create a wrapper which will pass
1911
the extra parameters.
1914
def __init__(self, merge_type, **kwargs):
1915
self._extra_kwargs = kwargs
1916
self._merge_type = merge_type
1918
def __call__(self, *args, **kwargs):
1919
kwargs.update(self._extra_kwargs)
1920
return self._merge_type(*args, **kwargs)
1922
def __getattr__(self, name):
1923
return getattr(self._merge_type, name)
1926
class MergeIntoMergeType(Merge3Merger):
1927
"""Merger that incorporates a tree (or part of a tree) into another."""
1929
def __init__(self, *args, **kwargs):
1930
"""Initialize the merger object.
1932
:param args: See Merge3Merger.__init__'s args.
1933
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1934
source_subpath and target_subdir.
1935
:keyword source_subpath: The relative path specifying the subtree of
1936
other_tree to merge into this_tree.
1937
:keyword target_subdir: The relative path where we want to merge
1938
other_tree into this_tree
1940
# All of the interesting work happens during Merge3Merger.__init__(),
1941
# so we have have to hack in to get our extra parameters set.
1942
self._source_subpath = kwargs.pop('source_subpath')
1943
self._target_subdir = kwargs.pop('target_subdir')
1944
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1946
def _compute_transform(self):
1947
child_pb = ui.ui_factory.nested_progress_bar()
1949
entries = self._entries_to_incorporate()
1950
entries = list(entries)
1951
for num, (entry, parent_id) in enumerate(entries):
1952
child_pb.update(gettext('Preparing file merge'), num, len(entries))
1953
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1954
trans_id = transform.new_by_entry(self.tt, entry,
1955
parent_trans_id, self.other_tree)
1958
self._finish_computing_transform()
1960
def _entries_to_incorporate(self):
1961
"""Yields pairs of (inventory_entry, new_parent)."""
1962
other_inv = self.other_tree.inventory
1963
subdir_id = other_inv.path2id(self._source_subpath)
1964
if subdir_id is None:
1965
# XXX: The error would be clearer if it gave the URL of the source
1966
# branch, but we don't have a reference to that here.
1967
raise PathNotInTree(self._source_subpath, "Source tree")
1968
subdir = other_inv[subdir_id]
1969
parent_in_target = osutils.dirname(self._target_subdir)
1970
target_id = self.this_tree.inventory.path2id(parent_in_target)
1971
if target_id is None:
1972
raise PathNotInTree(self._target_subdir, "Target tree")
1973
name_in_target = osutils.basename(self._target_subdir)
1974
merge_into_root = subdir.copy()
1975
merge_into_root.name = name_in_target
1976
if self.this_tree.inventory.has_id(merge_into_root.file_id):
1977
# Give the root a new file-id.
1978
# This can happen fairly easily if the directory we are
1979
# incorporating is the root, and both trees have 'TREE_ROOT' as
1980
# their root_id. Users will expect this to Just Work, so we
1981
# change the file-id here.
1982
# Non-root file-ids could potentially conflict too. That's really
1983
# an edge case, so we don't do anything special for those. We let
1984
# them cause conflicts.
1985
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1986
yield (merge_into_root, target_id)
1987
if subdir.kind != 'directory':
1988
# No children, so we are done.
1990
for ignored_path, entry in other_inv.iter_entries_by_dir(subdir_id):
1991
parent_id = entry.parent_id
1992
if parent_id == subdir.file_id:
1993
# The root's parent ID has changed, so make sure children of
1994
# the root refer to the new ID.
1995
parent_id = merge_into_root.file_id
1996
yield (entry, parent_id)
1753
1999
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1754
2000
backup_files=False,
1755
2001
merge_type=Merge3Merger,
added
removed
bzrlib/merge.py
