55
67
class MergeHooks(hooks.Hooks):
57
69
def __init__(self):
58
hooks.Hooks.__init__(self)
59
self.create_hook(hooks.HookPoint('merge_file_content',
60
"Called with a bzrlib.merge.Merger object to create a per file "
70
hooks.Hooks.__init__(self, "breezy.merge", "Merger.hooks")
71
self.add_hook('merge_file_content',
72
"Called with a breezy.merge.Merger object to create a per file "
61
73
"merge object when starting a merge. "
62
74
"Should return either None or a subclass of "
63
"``bzrlib.merge.AbstractPerFileMerger``. "
75
"``breezy.merge.AbstractPerFileMerger``. "
64
76
"Such objects will then be called per file "
65
77
"that needs to be merged (including when one "
66
78
"side has deleted the file and the other has changed it). "
67
79
"See the AbstractPerFileMerger API docs for details on how it is "
82
self.add_hook('pre_merge',
83
'Called before a merge. '
84
'Receives a Merger object as the single argument.',
86
self.add_hook('post_merge',
87
'Called after a merge. '
88
'Receives a Merger object as the single argument. '
89
'The return value is ignored.',
72
93
class AbstractPerFileMerger(object):
73
"""PerFileMerger objects are used by plugins extending merge for bzrlib.
75
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
94
"""PerFileMerger objects are used by plugins extending merge for breezy.
96
See ``breezy.plugins.news_merge.news_merge`` for an example concrete class.
77
98
:ivar merger: The Merge3Merger performing the merge.
333
352
_set_base_is_other_ancestor)
336
def from_uncommitted(tree, other_tree, pb=None, base_tree=None):
355
def from_uncommitted(tree, other_tree, base_tree=None):
337
356
"""Return a Merger for uncommitted changes in other_tree.
339
358
:param tree: The tree to merge into
340
359
:param other_tree: The tree to get uncommitted changes from
341
:param pb: A progress indicator
342
360
:param base_tree: The basis to use for the merge. If unspecified,
343
361
other_tree.basis_tree() will be used.
345
363
if base_tree is None:
346
364
base_tree = other_tree.basis_tree()
347
merger = Merger(tree.branch, other_tree, base_tree, tree, pb)
365
merger = Merger(tree.branch, other_tree, base_tree, tree)
348
366
merger.base_rev_id = merger.base_tree.get_revision_id()
349
367
merger.other_rev_id = None
350
368
merger.other_basis = merger.base_rev_id
354
def from_mergeable(klass, tree, mergeable, pb):
372
def from_mergeable(klass, tree, mergeable):
355
373
"""Return a Merger for a bundle or merge directive.
357
375
:param tree: The tree to merge changes into
358
376
:param mergeable: A merge directive or bundle
359
:param pb: A progress indicator
361
378
mergeable.install_revisions(tree.branch.repository)
362
379
base_revision_id, other_revision_id, verified =\
435
450
revision_id = _mod_revision.ensure_null(revision_id)
436
451
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
453
def set_interesting_files(self, file_list):
487
454
self.interesting_files = file_list
587
556
self.base_rev_id = self.revision_graph.find_unique_lca(
589
self._is_criss_cross = True
558
sorted_lca_keys = self.revision_graph.find_merge_order(
560
if self.base_rev_id == _mod_revision.NULL_REVISION:
561
self.base_rev_id = sorted_lca_keys[0]
590
563
if self.base_rev_id == _mod_revision.NULL_REVISION:
591
564
raise errors.UnrelatedBranches()
592
565
if self._is_criss_cross:
593
566
trace.warning('Warning: criss-cross merge encountered. See bzr'
594
567
' help criss-cross.')
595
568
trace.mutter('Criss-cross lcas: %r' % lcas)
596
interesting_revision_ids = [self.base_rev_id]
597
interesting_revision_ids.extend(lcas)
569
if self.base_rev_id in lcas:
570
trace.mutter('Unable to find unique lca. '
571
'Fallback %r as best option.'
573
interesting_revision_ids = set(lcas)
574
interesting_revision_ids.add(self.base_rev_id)
598
575
interesting_trees = dict((t.get_revision_id(), t)
599
576
for t in self.this_branch.repository.revision_trees(
600
577
interesting_revision_ids))
601
578
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(
579
if self.base_rev_id in lcas:
580
self.base_tree = interesting_trees[self.base_rev_id]
582
self.base_tree = interesting_trees.pop(self.base_rev_id)
605
583
self._lca_trees = [interesting_trees[key]
606
584
for key in sorted_lca_keys]
658
637
if self._is_criss_cross and getattr(self.merge_type,
659
638
'supports_lca_trees', False):
660
639
kwargs['lca_trees'] = self._lca_trees
661
return self.merge_type(pb=None,
662
change_reporter=self.change_reporter,
640
return self.merge_type(change_reporter=self.change_reporter,
665
643
def _do_merge_to(self):
666
644
merge = self.make_merger()
667
645
if self.other_branch is not None:
668
646
self.other_branch.update_references(self.this_branch)
647
for hook in Merger.hooks['pre_merge']:
650
for hook in Merger.hooks['post_merge']:
670
652
if self.recurse == 'down':
671
653
for relpath, file_id in self.this_tree.iter_references():
672
sub_tree = self.this_tree.get_nested_tree(file_id, relpath)
654
sub_tree = self.this_tree.get_nested_tree(relpath, file_id)
673
655
other_revision = self.other_tree.get_reference_revision(
675
657
if other_revision == sub_tree.last_revision():
677
659
sub_merge = Merger(sub_tree.branch, this_tree=sub_tree)
678
660
sub_merge.merge_type = self.merge_type
679
other_branch = self.other_branch.reference_parent(file_id, relpath)
661
other_branch = self.other_branch.reference_parent(file_id,
680
663
sub_merge.set_other_revision(other_revision, other_branch)
681
base_revision = self.base_tree.get_reference_revision(file_id)
664
base_tree_path = self.base_tree.id2path(file_id)
665
base_revision = self.base_tree.get_reference_revision(
666
base_tree_path, file_id)
682
667
sub_merge.base_tree = \
683
668
sub_tree.branch.repository.revision_tree(base_revision)
684
669
sub_merge.base_rev_id = base_revision
913
903
it then compares with THIS and BASE.
915
905
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)
907
:return: [(file_id, changed, parents, names, executable)], where:
909
* file_id: Simple file_id of the entry
910
* changed: Boolean, True if the kind or contents changed else False
911
* parents: ((base, [parent_id, in, lcas]), parent_id_other,
913
* names: ((base, [name, in, lcas]), name_in_other, name_in_this)
914
* executable: ((base, [exec, in, lcas]), exec_in_other,
925
917
if self.interesting_files is not None:
926
918
lookup_trees = [self.this_tree, self.base_tree]
1077
self.tt.final_kind(self.tt.root)
1078
except errors.NoSuchFile:
1079
self.tt.cancel_deletion(self.tt.root)
1080
if self.tt.final_file_id(self.tt.root) is None:
1081
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
1083
other_root_file_id = self.other_tree.get_root_id()
1084
if other_root_file_id is None:
1086
other_root = self.tt.trans_id_file_id(other_root_file_id)
1087
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
self.tt.final_kind(other_root)
1095
other_root_is_present = True
1096
except errors.NoSuchFile:
1097
# other_root doesn't have a physical representation. We still need
1098
# to move any references to the actual root of the tree.
1099
other_root_is_present = False
1100
# 'other_tree.inventory.root' is not present in this tree. We are
1101
# calling adjust_path for children which *want* to be present with a
1102
# 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)
1105
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)
1110
# The item exist in the final tree and has a defined place
1113
except errors.NoSuchFile, e:
1115
# Move the item into the root
1116
self.tt.adjust_path(self.tt.final_name(trans_id),
1117
self.tt.root, trans_id)
1118
if other_root_is_present:
1119
self.tt.cancel_creation(other_root)
1120
self.tt.cancel_versioning(other_root)
1122
1067
def write_modified(self, results):
1123
1068
modified_hashes = {}
1124
1069
for path in results.modified_paths:
1125
file_id = self.this_tree.path2id(self.this_tree.relpath(path))
1070
wt_relpath = self.working_tree.relpath(path)
1071
file_id = self.working_tree.path2id(wt_relpath)
1126
1072
if file_id is None:
1128
hash = self.this_tree.get_file_sha1(file_id)
1074
hash = self.working_tree.get_file_sha1(wt_relpath, file_id)
1129
1075
if hash is None:
1131
1077
modified_hashes[file_id] = hash
1132
self.this_tree.set_merge_modified(modified_hashes)
1078
self.working_tree.set_merge_modified(modified_hashes)
1135
1081
def parent(entry, file_id):
1299
1231
self._raw_conflicts.append(('path conflict', trans_id, file_id,
1300
1232
this_parent, this_name,
1301
1233
other_parent, other_name))
1302
if other_name is None:
1234
if not self.other_tree.has_id(file_id):
1303
1235
# it doesn't matter whether the result was 'other' or
1304
# 'conflict'-- if there's no 'other', we leave it alone.
1236
# 'conflict'-- if it has no file id, we leave it alone.
1306
1238
parent_id = parents[self.winner_idx[parent_id_winner]]
1307
if parent_id is not None:
1239
name = names[self.winner_idx[name_winner]]
1240
if parent_id is not None or name is not None:
1308
1241
# 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),
1243
if parent_id is None and name is not None:
1244
# if parent_id is None and name is non-None, current file is
1246
if names[self.winner_idx[parent_id_winner]] != '':
1247
raise AssertionError(
1248
'File looks like a root, but named %s' %
1249
names[self.winner_idx[parent_id_winner]])
1250
parent_trans_id = transform.ROOT_PARENT
1252
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1253
self.tt.adjust_path(name, parent_trans_id,
1312
1254
self.tt.trans_id_file_id(file_id))
1314
1256
def _do_merge_contents(self, file_id):
1315
1257
"""Performs a merge on file_id contents."""
1316
1258
def contents_pair(tree):
1317
if file_id not in tree:
1319
kind = tree.kind(file_id)
1260
path = tree.id2path(file_id)
1261
except errors.NoSuchId:
1264
kind = tree.kind(path, file_id)
1265
except errors.NoSuchFile:
1320
1267
if kind == "file":
1321
contents = tree.get_file_sha1(file_id)
1268
contents = tree.get_file_sha1(path, file_id)
1322
1269
elif kind == "symlink":
1323
contents = tree.get_symlink_target(file_id)
1270
contents = tree.get_symlink_target(path, file_id)
1325
1272
contents = None
1326
1273
return kind, contents
1358
1305
if hook_status != 'not_applicable':
1359
1306
# Don't try any more hooks, this one applies.
1308
# If the merge ends up replacing the content of the file, we get rid of
1309
# it at the end of this method (this variable is used to track the
1310
# exceptions to this rule).
1361
1312
result = "modified"
1362
1313
if hook_status == 'not_applicable':
1363
# This is a contents conflict, because none of the available
1364
# functions could merge it.
1314
# No merge hook was able to resolve the situation. Two cases exist:
1315
# a content conflict or a duplicate one.
1366
1317
name = self.tt.final_name(trans_id)
1367
1318
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))
1320
inhibit_content_conflict = False
1321
if params.this_kind is None: # file_id is not in THIS
1322
# Is the name used for a different file_id ?
1323
dupe_path = self.other_tree.id2path(file_id)
1324
this_id = self.this_tree.path2id(dupe_path)
1325
if this_id is not None:
1326
# Two entries for the same path
1328
# versioning the merged file will trigger a duplicate
1330
self.tt.version_file(file_id, trans_id)
1331
transform.create_from_tree(
1332
self.tt, trans_id, self.other_tree,
1333
self.other_tree.id2path(file_id), file_id=file_id,
1334
filter_tree_path=self._get_filter_tree_path(file_id))
1335
inhibit_content_conflict = True
1336
elif params.other_kind is None: # file_id is not in OTHER
1337
# Is the name used for a different file_id ?
1338
dupe_path = self.this_tree.id2path(file_id)
1339
other_id = self.other_tree.path2id(dupe_path)
1340
if other_id is not None:
1341
# Two entries for the same path again, but here, the other
1342
# entry will also be merged. We simply inhibit the
1343
# 'content' conflict creation because we know OTHER will
1344
# create (or has already created depending on ordering) an
1345
# entry at the same path. This will trigger a 'duplicate'
1348
inhibit_content_conflict = True
1349
if not inhibit_content_conflict:
1350
if params.this_kind is not None:
1351
self.tt.unversion_file(trans_id)
1352
# This is a contents conflict, because none of the available
1353
# functions could merge it.
1354
file_group = self._dump_conflicts(name, parent_id, file_id,
1356
self._raw_conflicts.append(('contents conflict', file_group))
1373
1357
elif hook_status == 'success':
1374
1358
self.tt.create_file(lines, trans_id)
1375
1359
elif hook_status == 'conflicted':
1391
1375
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1392
1376
if not self.this_tree.has_id(file_id) and result == "modified":
1393
1377
self.tt.version_file(file_id, trans_id)
1394
# The merge has been performed, so the old contents should not be
1379
# The merge has been performed and produced a new content, so the
1380
# old contents should not be retained.
1397
1381
self.tt.delete_contents(trans_id)
1398
except errors.NoSuchFile:
1402
1384
def _default_other_winner_merge(self, merge_hook_params):
1403
1385
"""Replace this contents with other."""
1404
1386
file_id = merge_hook_params.file_id
1405
1387
trans_id = merge_hook_params.trans_id
1406
file_in_this = self.this_tree.has_id(file_id)
1407
1388
if self.other_tree.has_id(file_id):
1408
1389
# 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)
1390
transform.create_from_tree(
1391
self.tt, trans_id, self.other_tree,
1392
self.other_tree.id2path(file_id), file_id=file_id,
1393
filter_tree_path=self._get_filter_tree_path(file_id))
1425
1394
return 'done', None
1395
elif self.this_tree.has_id(file_id):
1427
1396
# OTHER deleted the file
1428
1397
return 'delete', None
1532
1520
versioned = False
1533
1521
file_group = []
1534
1522
for suffix, tree, lines in data:
1535
if tree.has_id(file_id):
1536
trans_id = self._conflict_file(name, parent_id, tree, file_id,
1537
suffix, lines, filter_tree_path)
1524
path = tree.id2path(file_id)
1525
except errors.NoSuchId:
1528
trans_id = self._conflict_file(
1529
name, parent_id, path, tree, file_id, suffix, lines,
1538
1531
file_group.append(trans_id)
1539
1532
if set_version and not versioned:
1540
1533
self.tt.version_file(file_id, trans_id)
1541
1534
versioned = True
1542
1535
return file_group
1544
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1537
def _conflict_file(self, name, parent_id, path, tree, file_id, suffix,
1545
1538
lines=None, filter_tree_path=None):
1546
1539
"""Emit a single conflict file."""
1547
1540
name = name + '.' + suffix
1548
1541
trans_id = self.tt.create_path(name, parent_id)
1549
transform.create_from_tree(self.tt, trans_id, tree, file_id, lines,
1542
transform.create_from_tree(
1543
self.tt, trans_id, tree, path,
1544
file_id=file_id, bytes=lines,
1545
filter_tree_path=filter_tree_path)
1551
1546
return trans_id
1553
1548
def merge_executable(self, file_id, file_status):
1750
1761
osutils.rmtree(temp_dir)
1764
class PathNotInTree(errors.BzrError):
1766
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1768
def __init__(self, path, tree):
1769
errors.BzrError.__init__(self, path=path, tree=tree)
1772
class MergeIntoMerger(Merger):
1773
"""Merger that understands other_tree will be merged into a subdir.
1775
This also changes the Merger api so that it uses real Branch, revision_id,
1776
and RevisonTree objects, rather than using revision specs.
1779
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1780
source_subpath, other_rev_id=None):
1781
"""Create a new MergeIntoMerger object.
1783
source_subpath in other_tree will be effectively copied to
1784
target_subdir in this_tree.
1786
:param this_tree: The tree that we will be merging into.
1787
:param other_branch: The Branch we will be merging from.
1788
:param other_tree: The RevisionTree object we want to merge.
1789
:param target_subdir: The relative path where we want to merge
1790
other_tree into this_tree
1791
:param source_subpath: The relative path specifying the subtree of
1792
other_tree to merge into this_tree.
1794
# It is assumed that we are merging a tree that is not in our current
1795
# ancestry, which means we are using the "EmptyTree" as our basis.
1796
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1797
_mod_revision.NULL_REVISION)
1798
super(MergeIntoMerger, self).__init__(
1799
this_branch=this_tree.branch,
1800
this_tree=this_tree,
1801
other_tree=other_tree,
1802
base_tree=null_ancestor_tree,
1804
self._target_subdir = target_subdir
1805
self._source_subpath = source_subpath
1806
self.other_branch = other_branch
1807
if other_rev_id is None:
1808
other_rev_id = other_tree.get_revision_id()
1809
self.other_rev_id = self.other_basis = other_rev_id
1810
self.base_is_ancestor = True
1811
self.backup_files = True
1812
self.merge_type = Merge3Merger
1813
self.show_base = False
1814
self.reprocess = False
1815
self.interesting_ids = None
1816
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1817
target_subdir=self._target_subdir,
1818
source_subpath=self._source_subpath)
1819
if self._source_subpath != '':
1820
# If this isn't a partial merge make sure the revisions will be
1822
self._maybe_fetch(self.other_branch, self.this_branch,
1825
def set_pending(self):
1826
if self._source_subpath != '':
1828
Merger.set_pending(self)
1831
class _MergeTypeParameterizer(object):
1832
"""Wrap a merge-type class to provide extra parameters.
1834
This is hack used by MergeIntoMerger to pass some extra parameters to its
1835
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1836
the 'merge_type' member. It is difficult override do_merge without
1837
re-writing the whole thing, so instead we create a wrapper which will pass
1838
the extra parameters.
1841
def __init__(self, merge_type, **kwargs):
1842
self._extra_kwargs = kwargs
1843
self._merge_type = merge_type
1845
def __call__(self, *args, **kwargs):
1846
kwargs.update(self._extra_kwargs)
1847
return self._merge_type(*args, **kwargs)
1849
def __getattr__(self, name):
1850
return getattr(self._merge_type, name)
1853
class MergeIntoMergeType(Merge3Merger):
1854
"""Merger that incorporates a tree (or part of a tree) into another."""
1856
def __init__(self, *args, **kwargs):
1857
"""Initialize the merger object.
1859
:param args: See Merge3Merger.__init__'s args.
1860
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1861
source_subpath and target_subdir.
1862
:keyword source_subpath: The relative path specifying the subtree of
1863
other_tree to merge into this_tree.
1864
:keyword target_subdir: The relative path where we want to merge
1865
other_tree into this_tree
1867
# All of the interesting work happens during Merge3Merger.__init__(),
1868
# so we have have to hack in to get our extra parameters set.
1869
self._source_subpath = kwargs.pop('source_subpath')
1870
self._target_subdir = kwargs.pop('target_subdir')
1871
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1873
def _compute_transform(self):
1874
with ui.ui_factory.nested_progress_bar() as child_pb:
1875
entries = self._entries_to_incorporate()
1876
entries = list(entries)
1877
for num, (entry, parent_id, path) in enumerate(entries):
1878
child_pb.update(gettext('Preparing file merge'), num, len(entries))
1879
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1880
trans_id = transform.new_by_entry(path, self.tt, entry,
1881
parent_trans_id, self.other_tree)
1882
self._finish_computing_transform()
1884
def _entries_to_incorporate(self):
1885
"""Yields pairs of (inventory_entry, new_parent)."""
1886
other_inv = self.other_tree.root_inventory
1887
subdir_id = other_inv.path2id(self._source_subpath)
1888
if subdir_id is None:
1889
# XXX: The error would be clearer if it gave the URL of the source
1890
# branch, but we don't have a reference to that here.
1891
raise PathNotInTree(self._source_subpath, "Source tree")
1892
subdir = other_inv[subdir_id]
1893
parent_in_target = osutils.dirname(self._target_subdir)
1894
target_id = self.this_tree.path2id(parent_in_target)
1895
if target_id is None:
1896
raise PathNotInTree(self._target_subdir, "Target tree")
1897
name_in_target = osutils.basename(self._target_subdir)
1898
merge_into_root = subdir.copy()
1899
merge_into_root.name = name_in_target
1900
if self.this_tree.has_id(merge_into_root.file_id):
1901
# Give the root a new file-id.
1902
# This can happen fairly easily if the directory we are
1903
# incorporating is the root, and both trees have 'TREE_ROOT' as
1904
# their root_id. Users will expect this to Just Work, so we
1905
# change the file-id here.
1906
# Non-root file-ids could potentially conflict too. That's really
1907
# an edge case, so we don't do anything special for those. We let
1908
# them cause conflicts.
1909
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1910
yield (merge_into_root, target_id, '')
1911
if subdir.kind != 'directory':
1912
# No children, so we are done.
1914
for path, entry in other_inv.iter_entries_by_dir(subdir_id):
1915
parent_id = entry.parent_id
1916
if parent_id == subdir.file_id:
1917
# The root's parent ID has changed, so make sure children of
1918
# the root refer to the new ID.
1919
parent_id = merge_into_root.file_id
1920
yield (entry, parent_id, path)
1753
1923
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1754
1924
backup_files=False,
1755
1925
merge_type=Merge3Merger,