435
454
revision_id = _mod_revision.ensure_null(revision_id)
436
455
return branch, self.revision_tree(revision_id, branch)
438
@deprecated_method(deprecated_in((2, 1, 0)))
439
def ensure_revision_trees(self):
440
if self.this_revision_tree is None:
441
self.this_basis_tree = self.revision_tree(self.this_basis)
442
if self.this_basis == self.this_rev_id:
443
self.this_revision_tree = self.this_basis_tree
445
if self.other_rev_id is None:
446
other_basis_tree = self.revision_tree(self.other_basis)
447
if other_basis_tree.has_changes(self.other_tree):
448
raise errors.WorkingTreeNotRevision(self.this_tree)
449
other_rev_id = self.other_basis
450
self.other_tree = other_basis_tree
452
@deprecated_method(deprecated_in((2, 1, 0)))
453
def file_revisions(self, file_id):
454
self.ensure_revision_trees()
455
def get_id(tree, file_id):
456
revision_id = tree.inventory[file_id].revision
458
if self.this_rev_id is None:
459
if self.this_basis_tree.get_file_sha1(file_id) != \
460
self.this_tree.get_file_sha1(file_id):
461
raise errors.WorkingTreeNotRevision(self.this_tree)
463
trees = (self.this_basis_tree, self.other_tree)
464
return [get_id(tree, file_id) for tree in trees]
466
@deprecated_method(deprecated_in((2, 1, 0)))
467
def check_basis(self, check_clean, require_commits=True):
468
if self.this_basis is None and require_commits is True:
469
raise errors.BzrCommandError(
470
"This branch has no commits."
471
" (perhaps you would prefer 'bzr pull')")
474
if self.this_basis != self.this_rev_id:
475
raise errors.UncommittedChanges(self.this_tree)
477
@deprecated_method(deprecated_in((2, 1, 0)))
478
def compare_basis(self):
480
basis_tree = self.revision_tree(self.this_tree.last_revision())
481
except errors.NoSuchRevision:
482
basis_tree = self.this_tree.basis_tree()
483
if not self.this_tree.has_changes(basis_tree):
484
self.this_rev_id = self.this_basis
486
457
def set_interesting_files(self, file_list):
487
458
self.interesting_files = file_list
587
560
self.base_rev_id = self.revision_graph.find_unique_lca(
589
self._is_criss_cross = True
562
sorted_lca_keys = self.revision_graph.find_merge_order(
564
if self.base_rev_id == _mod_revision.NULL_REVISION:
565
self.base_rev_id = sorted_lca_keys[0]
590
567
if self.base_rev_id == _mod_revision.NULL_REVISION:
591
568
raise errors.UnrelatedBranches()
592
569
if self._is_criss_cross:
593
570
trace.warning('Warning: criss-cross merge encountered. See bzr'
594
571
' help criss-cross.')
595
572
trace.mutter('Criss-cross lcas: %r' % lcas)
596
interesting_revision_ids = [self.base_rev_id]
597
interesting_revision_ids.extend(lcas)
573
if self.base_rev_id in lcas:
574
trace.mutter('Unable to find unique lca. '
575
'Fallback %r as best option.'
577
interesting_revision_ids = set(lcas)
578
interesting_revision_ids.add(self.base_rev_id)
598
579
interesting_trees = dict((t.get_revision_id(), t)
599
580
for t in self.this_branch.repository.revision_trees(
600
581
interesting_revision_ids))
601
582
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(
583
if self.base_rev_id in lcas:
584
self.base_tree = interesting_trees[self.base_rev_id]
586
self.base_tree = interesting_trees.pop(self.base_rev_id)
605
587
self._lca_trees = [interesting_trees[key]
606
588
for key in sorted_lca_keys]
913
918
it then compares with THIS and BASE.
915
920
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)
922
:return: [(file_id, changed, parents, names, executable)], where:
924
* file_id: Simple file_id of the entry
925
* changed: Boolean, True if the kind or contents changed else False
926
* parents: ((base, [parent_id, in, lcas]), parent_id_other,
928
* names: ((base, [name, in, lcas]), name_in_other, name_in_this)
929
* executable: ((base, [exec, in, lcas]), exec_in_other,
925
932
if self.interesting_files is not None:
926
933
lookup_trees = [self.this_tree, self.base_tree]
1086
1091
other_root = self.tt.trans_id_file_id(other_root_file_id)
1087
1092
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)
1094
if self.this_tree.has_id(
1095
self.other_tree.get_root_id()):
1096
# the other tree's root is a non-root in the current tree (as
1097
# when a previously unrelated branch is merged into another)
1094
self.tt.final_kind(other_root)
1099
if self.tt.final_kind(other_root) is not None:
1095
1100
other_root_is_present = True
1096
except errors.NoSuchFile:
1097
1102
# other_root doesn't have a physical representation. We still need
1098
1103
# to move any references to the actual root of the tree.
1099
1104
other_root_is_present = False
1100
# 'other_tree.inventory.root' is not present in this tree. We are
1105
# the other tree root is not present in this tree. We are
1101
1106
# calling adjust_path for children which *want* to be present with a
1102
1107
# correct place to go.
1103
for thing, child in self.other_tree.inventory.root.children.iteritems():
1104
trans_id = self.tt.trans_id_file_id(child.file_id)
1108
for child_id in self.other_tree.iter_children(
1109
self.other_tree.get_root_id()):
1110
trans_id = self.tt.trans_id_file_id(child_id)
1105
1111
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)
1112
if self.tt.final_kind(trans_id) is not None:
1110
1113
# The item exist in the final tree and has a defined place
1111
1114
# to go already.
1113
except errors.NoSuchFile, e:
1115
1116
# Move the item into the root
1116
self.tt.adjust_path(self.tt.final_name(trans_id),
1117
self.tt.root, trans_id)
1118
final_name = self.tt.final_name(trans_id)
1119
except errors.NoFinalPath:
1120
# This file is not present anymore, ignore it.
1122
self.tt.adjust_path(final_name, self.tt.root, trans_id)
1118
1123
if other_root_is_present:
1119
1124
self.tt.cancel_creation(other_root)
1120
1125
self.tt.cancel_versioning(other_root)
1299
1304
self._raw_conflicts.append(('path conflict', trans_id, file_id,
1300
1305
this_parent, this_name,
1301
1306
other_parent, other_name))
1302
if other_name is None:
1307
if not self.other_tree.has_id(file_id):
1303
1308
# it doesn't matter whether the result was 'other' or
1304
# 'conflict'-- if there's no 'other', we leave it alone.
1309
# 'conflict'-- if it has no file id, we leave it alone.
1306
1311
parent_id = parents[self.winner_idx[parent_id_winner]]
1307
if parent_id is not None:
1312
name = names[self.winner_idx[name_winner]]
1313
if parent_id is not None or name is not None:
1308
1314
# 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),
1316
if parent_id is None and name is not None:
1317
# if parent_id is None and name is non-None, current file is
1319
if names[self.winner_idx[parent_id_winner]] != '':
1320
raise AssertionError(
1321
'File looks like a root, but named %s' %
1322
names[self.winner_idx[parent_id_winner]])
1323
parent_trans_id = transform.ROOT_PARENT
1325
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1326
self.tt.adjust_path(name, parent_trans_id,
1312
1327
self.tt.trans_id_file_id(file_id))
1314
1329
def _do_merge_contents(self, file_id):
1315
1330
"""Performs a merge on file_id contents."""
1316
1331
def contents_pair(tree):
1317
if file_id not in tree:
1332
if not tree.has_id(file_id):
1318
1333
return (None, None)
1319
1334
kind = tree.kind(file_id)
1320
1335
if kind == "file":
1358
1373
if hook_status != 'not_applicable':
1359
1374
# Don't try any more hooks, this one applies.
1376
# If the merge ends up replacing the content of the file, we get rid of
1377
# it at the end of this method (this variable is used to track the
1378
# exceptions to this rule).
1361
1380
result = "modified"
1362
1381
if hook_status == 'not_applicable':
1363
# This is a contents conflict, because none of the available
1364
# functions could merge it.
1382
# No merge hook was able to resolve the situation. Two cases exist:
1383
# a content conflict or a duplicate one.
1366
1385
name = self.tt.final_name(trans_id)
1367
1386
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))
1388
inhibit_content_conflict = False
1389
if params.this_kind is None: # file_id is not in THIS
1390
# Is the name used for a different file_id ?
1391
dupe_path = self.other_tree.id2path(file_id)
1392
this_id = self.this_tree.path2id(dupe_path)
1393
if this_id is not None:
1394
# Two entries for the same path
1396
# versioning the merged file will trigger a duplicate
1398
self.tt.version_file(file_id, trans_id)
1399
transform.create_from_tree(
1400
self.tt, trans_id, self.other_tree, file_id,
1401
filter_tree_path=self._get_filter_tree_path(file_id))
1402
inhibit_content_conflict = True
1403
elif params.other_kind is None: # file_id is not in OTHER
1404
# Is the name used for a different file_id ?
1405
dupe_path = self.this_tree.id2path(file_id)
1406
other_id = self.other_tree.path2id(dupe_path)
1407
if other_id is not None:
1408
# Two entries for the same path again, but here, the other
1409
# entry will also be merged. We simply inhibit the
1410
# 'content' conflict creation because we know OTHER will
1411
# create (or has already created depending on ordering) an
1412
# entry at the same path. This will trigger a 'duplicate'
1415
inhibit_content_conflict = True
1416
if not inhibit_content_conflict:
1417
if params.this_kind is not None:
1418
self.tt.unversion_file(trans_id)
1419
# This is a contents conflict, because none of the available
1420
# functions could merge it.
1421
file_group = self._dump_conflicts(name, parent_id, file_id,
1423
self._raw_conflicts.append(('contents conflict', file_group))
1373
1424
elif hook_status == 'success':
1374
1425
self.tt.create_file(lines, trans_id)
1375
1426
elif hook_status == 'conflicted':
1391
1442
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1392
1443
if not self.this_tree.has_id(file_id) and result == "modified":
1393
1444
self.tt.version_file(file_id, trans_id)
1394
# The merge has been performed, so the old contents should not be
1446
# The merge has been performed and produced a new content, so the
1447
# old contents should not be retained.
1397
1448
self.tt.delete_contents(trans_id)
1398
except errors.NoSuchFile:
1402
1451
def _default_other_winner_merge(self, merge_hook_params):
1403
1452
"""Replace this contents with other."""
1404
1453
file_id = merge_hook_params.file_id
1405
1454
trans_id = merge_hook_params.trans_id
1406
file_in_this = self.this_tree.has_id(file_id)
1407
1455
if self.other_tree.has_id(file_id):
1408
1456
# 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)
1457
transform.create_from_tree(
1458
self.tt, trans_id, self.other_tree, file_id,
1459
filter_tree_path=self._get_filter_tree_path(file_id))
1425
1460
return 'done', None
1461
elif self.this_tree.has_id(file_id):
1427
1462
# OTHER deleted the file
1428
1463
return 'delete', None
1750
1816
osutils.rmtree(temp_dir)
1819
class PathNotInTree(errors.BzrError):
1821
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1823
def __init__(self, path, tree):
1824
errors.BzrError.__init__(self, path=path, tree=tree)
1827
class MergeIntoMerger(Merger):
1828
"""Merger that understands other_tree will be merged into a subdir.
1830
This also changes the Merger api so that it uses real Branch, revision_id,
1831
and RevisonTree objects, rather than using revision specs.
1834
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1835
source_subpath, other_rev_id=None):
1836
"""Create a new MergeIntoMerger object.
1838
source_subpath in other_tree will be effectively copied to
1839
target_subdir in this_tree.
1841
:param this_tree: The tree that we will be merging into.
1842
:param other_branch: The Branch we will be merging from.
1843
:param other_tree: The RevisionTree object we want to merge.
1844
:param target_subdir: The relative path where we want to merge
1845
other_tree into this_tree
1846
:param source_subpath: The relative path specifying the subtree of
1847
other_tree to merge into this_tree.
1849
# It is assumed that we are merging a tree that is not in our current
1850
# ancestry, which means we are using the "EmptyTree" as our basis.
1851
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1852
_mod_revision.NULL_REVISION)
1853
super(MergeIntoMerger, self).__init__(
1854
this_branch=this_tree.branch,
1855
this_tree=this_tree,
1856
other_tree=other_tree,
1857
base_tree=null_ancestor_tree,
1859
self._target_subdir = target_subdir
1860
self._source_subpath = source_subpath
1861
self.other_branch = other_branch
1862
if other_rev_id is None:
1863
other_rev_id = other_tree.get_revision_id()
1864
self.other_rev_id = self.other_basis = other_rev_id
1865
self.base_is_ancestor = True
1866
self.backup_files = True
1867
self.merge_type = Merge3Merger
1868
self.show_base = False
1869
self.reprocess = False
1870
self.interesting_ids = None
1871
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1872
target_subdir=self._target_subdir,
1873
source_subpath=self._source_subpath)
1874
if self._source_subpath != '':
1875
# If this isn't a partial merge make sure the revisions will be
1877
self._maybe_fetch(self.other_branch, self.this_branch,
1880
def set_pending(self):
1881
if self._source_subpath != '':
1883
Merger.set_pending(self)
1886
class _MergeTypeParameterizer(object):
1887
"""Wrap a merge-type class to provide extra parameters.
1889
This is hack used by MergeIntoMerger to pass some extra parameters to its
1890
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1891
the 'merge_type' member. It is difficult override do_merge without
1892
re-writing the whole thing, so instead we create a wrapper which will pass
1893
the extra parameters.
1896
def __init__(self, merge_type, **kwargs):
1897
self._extra_kwargs = kwargs
1898
self._merge_type = merge_type
1900
def __call__(self, *args, **kwargs):
1901
kwargs.update(self._extra_kwargs)
1902
return self._merge_type(*args, **kwargs)
1904
def __getattr__(self, name):
1905
return getattr(self._merge_type, name)
1908
class MergeIntoMergeType(Merge3Merger):
1909
"""Merger that incorporates a tree (or part of a tree) into another."""
1911
def __init__(self, *args, **kwargs):
1912
"""Initialize the merger object.
1914
:param args: See Merge3Merger.__init__'s args.
1915
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1916
source_subpath and target_subdir.
1917
:keyword source_subpath: The relative path specifying the subtree of
1918
other_tree to merge into this_tree.
1919
:keyword target_subdir: The relative path where we want to merge
1920
other_tree into this_tree
1922
# All of the interesting work happens during Merge3Merger.__init__(),
1923
# so we have have to hack in to get our extra parameters set.
1924
self._source_subpath = kwargs.pop('source_subpath')
1925
self._target_subdir = kwargs.pop('target_subdir')
1926
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1928
def _compute_transform(self):
1929
child_pb = ui.ui_factory.nested_progress_bar()
1931
entries = self._entries_to_incorporate()
1932
entries = list(entries)
1933
for num, (entry, parent_id) in enumerate(entries):
1934
child_pb.update(gettext('Preparing file merge'), num, len(entries))
1935
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1936
trans_id = transform.new_by_entry(self.tt, entry,
1937
parent_trans_id, self.other_tree)
1940
self._finish_computing_transform()
1942
def _entries_to_incorporate(self):
1943
"""Yields pairs of (inventory_entry, new_parent)."""
1944
other_inv = self.other_tree.root_inventory
1945
subdir_id = other_inv.path2id(self._source_subpath)
1946
if subdir_id is None:
1947
# XXX: The error would be clearer if it gave the URL of the source
1948
# branch, but we don't have a reference to that here.
1949
raise PathNotInTree(self._source_subpath, "Source tree")
1950
subdir = other_inv[subdir_id]
1951
parent_in_target = osutils.dirname(self._target_subdir)
1952
target_id = self.this_tree.path2id(parent_in_target)
1953
if target_id is None:
1954
raise PathNotInTree(self._target_subdir, "Target tree")
1955
name_in_target = osutils.basename(self._target_subdir)
1956
merge_into_root = subdir.copy()
1957
merge_into_root.name = name_in_target
1958
if self.this_tree.has_id(merge_into_root.file_id):
1959
# Give the root a new file-id.
1960
# This can happen fairly easily if the directory we are
1961
# incorporating is the root, and both trees have 'TREE_ROOT' as
1962
# their root_id. Users will expect this to Just Work, so we
1963
# change the file-id here.
1964
# Non-root file-ids could potentially conflict too. That's really
1965
# an edge case, so we don't do anything special for those. We let
1966
# them cause conflicts.
1967
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1968
yield (merge_into_root, target_id)
1969
if subdir.kind != 'directory':
1970
# No children, so we are done.
1972
for ignored_path, entry in other_inv.iter_entries_by_dir(subdir_id):
1973
parent_id = entry.parent_id
1974
if parent_id == subdir.file_id:
1975
# The root's parent ID has changed, so make sure children of
1976
# the root refer to the new ID.
1977
parent_id = merge_into_root.file_id
1978
yield (entry, parent_id)
1753
1981
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1754
1982
backup_files=False,
1755
1983
merge_type=Merge3Merger,
added
removed
bzrlib/merge.py
