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