14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
19
21
from bzrlib.lazy_import import lazy_import
20
22
lazy_import(globals(), """
21
23
from bzrlib import (
22
24
branch as _mod_branch,
23
26
conflicts as _mod_conflicts,
54
58
def transform_tree(from_tree, to_tree, interesting_ids=None):
55
59
from_tree.lock_tree_write()
56
operation = OperationWithCleanups(merge_inner)
60
operation = cleanup.OperationWithCleanups(merge_inner)
57
61
operation.add_cleanup(from_tree.unlock)
58
62
operation.run_simple(from_tree.branch, to_tree, from_tree,
59
63
ignore_zero=True, interesting_ids=interesting_ids, this_tree=from_tree)
62
66
class MergeHooks(hooks.Hooks):
64
68
def __init__(self):
65
hooks.Hooks.__init__(self)
66
self.create_hook(hooks.HookPoint('merge_file_content',
69
hooks.Hooks.__init__(self, "bzrlib.merge", "Merger.hooks")
70
self.add_hook('merge_file_content',
67
71
"Called with a bzrlib.merge.Merger object to create a per file "
68
72
"merge object when starting a merge. "
69
73
"Should return either None or a subclass of "
73
77
"side has deleted the file and the other has changed it). "
74
78
"See the AbstractPerFileMerger API docs for details on how it is "
81
self.add_hook('pre_merge',
82
'Called before a merge. '
83
'Receives a Merger object as the single argument.',
85
self.add_hook('post_merge',
86
'Called after a merge. '
87
'Receives a Merger object as the single argument. '
88
'The return value is ignored.',
79
92
class AbstractPerFileMerger(object):
91
104
def merge_contents(self, merge_params):
92
105
"""Attempt to merge the contents of a single file.
94
:param merge_params: A bzrlib.merge.MergeHookParams
95
:return : A tuple of (status, chunks), where status is one of
107
:param merge_params: A bzrlib.merge.MergeFileHookParams
108
:return: A tuple of (status, chunks), where status is one of
96
109
'not_applicable', 'success', 'conflicted', or 'delete'. If status
97
110
is 'success' or 'conflicted', then chunks should be an iterable of
98
111
strings for the new file contents.
119
132
def get_filename(self, params, tree):
120
133
"""Lookup the filename (i.e. basename, not path), given a Tree (e.g.
121
self.merger.this_tree) and a MergeHookParams.
134
self.merger.this_tree) and a MergeFileHookParams.
123
136
return osutils.basename(tree.id2path(params.file_id))
125
138
def get_filepath(self, params, tree):
126
139
"""Calculate the path to the file in a tree.
128
:param params: A MergeHookParams describing the file to merge
141
:param params: A MergeFileHookParams describing the file to merge
129
142
:param tree: a Tree, e.g. self.merger.this_tree.
131
144
return tree.id2path(params.file_id)
138
151
params.winner == 'other' or
139
152
# THIS and OTHER aren't both files.
140
153
not params.is_file_merge() or
141
# The filename doesn't match *.xml
154
# The filename doesn't match
142
155
not self.file_matches(params)):
143
156
return 'not_applicable', None
144
157
return self.merge_matching(params)
441
454
revision_id = _mod_revision.ensure_null(revision_id)
442
455
return branch, self.revision_tree(revision_id, branch)
444
@deprecated_method(deprecated_in((2, 1, 0)))
445
def ensure_revision_trees(self):
446
if self.this_revision_tree is None:
447
self.this_basis_tree = self.revision_tree(self.this_basis)
448
if self.this_basis == self.this_rev_id:
449
self.this_revision_tree = self.this_basis_tree
451
if self.other_rev_id is None:
452
other_basis_tree = self.revision_tree(self.other_basis)
453
if other_basis_tree.has_changes(self.other_tree):
454
raise errors.WorkingTreeNotRevision(self.this_tree)
455
other_rev_id = self.other_basis
456
self.other_tree = other_basis_tree
458
@deprecated_method(deprecated_in((2, 1, 0)))
459
def file_revisions(self, file_id):
460
self.ensure_revision_trees()
461
def get_id(tree, file_id):
462
revision_id = tree.inventory[file_id].revision
464
if self.this_rev_id is None:
465
if self.this_basis_tree.get_file_sha1(file_id) != \
466
self.this_tree.get_file_sha1(file_id):
467
raise errors.WorkingTreeNotRevision(self.this_tree)
469
trees = (self.this_basis_tree, self.other_tree)
470
return [get_id(tree, file_id) for tree in trees]
472
@deprecated_method(deprecated_in((2, 1, 0)))
473
def check_basis(self, check_clean, require_commits=True):
474
if self.this_basis is None and require_commits is True:
475
raise errors.BzrCommandError(
476
"This branch has no commits."
477
" (perhaps you would prefer 'bzr pull')")
480
if self.this_basis != self.this_rev_id:
481
raise errors.UncommittedChanges(self.this_tree)
483
@deprecated_method(deprecated_in((2, 1, 0)))
484
def compare_basis(self):
486
basis_tree = self.revision_tree(self.this_tree.last_revision())
487
except errors.NoSuchRevision:
488
basis_tree = self.this_tree.basis_tree()
489
if not self.this_tree.has_changes(basis_tree):
490
self.this_rev_id = self.this_basis
492
457
def set_interesting_files(self, file_list):
493
458
self.interesting_files = file_list
538
504
raise errors.NoCommits(self.other_branch)
539
505
if self.other_rev_id is not None:
540
506
self._cached_trees[self.other_rev_id] = self.other_tree
541
self._maybe_fetch(self.other_branch,self.this_branch, self.other_basis)
507
self._maybe_fetch(self.other_branch, self.this_branch, self.other_basis)
543
509
def set_other_revision(self, revision_id, other_branch):
544
510
"""Set 'other' based on a branch and revision id
593
560
self.base_rev_id = self.revision_graph.find_unique_lca(
595
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]
596
567
if self.base_rev_id == _mod_revision.NULL_REVISION:
597
568
raise errors.UnrelatedBranches()
598
569
if self._is_criss_cross:
599
570
trace.warning('Warning: criss-cross merge encountered. See bzr'
600
571
' help criss-cross.')
601
572
trace.mutter('Criss-cross lcas: %r' % lcas)
602
interesting_revision_ids = [self.base_rev_id]
603
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)
604
579
interesting_trees = dict((t.get_revision_id(), t)
605
580
for t in self.this_branch.repository.revision_trees(
606
581
interesting_revision_ids))
607
582
self._cached_trees.update(interesting_trees)
608
self.base_tree = interesting_trees.pop(self.base_rev_id)
609
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)
611
587
self._lca_trees = [interesting_trees[key]
612
588
for key in sorted_lca_keys]
636
612
self._maybe_fetch(base_branch, self.this_branch, self.base_rev_id)
638
614
def make_merger(self):
639
kwargs = {'working_tree':self.this_tree, 'this_tree': self.this_tree,
615
kwargs = {'working_tree': self.this_tree, 'this_tree': self.this_tree,
640
616
'other_tree': self.other_tree,
641
617
'interesting_ids': self.interesting_ids,
642
618
'interesting_files': self.interesting_files,
643
619
'this_branch': self.this_branch,
620
'other_branch': self.other_branch,
644
621
'do_merge': False}
645
622
if self.merge_type.requires_base:
646
623
kwargs['base_tree'] = self.base_tree
672
649
merge = self.make_merger()
673
650
if self.other_branch is not None:
674
651
self.other_branch.update_references(self.this_branch)
652
for hook in Merger.hooks['pre_merge']:
655
for hook in Merger.hooks['post_merge']:
676
657
if self.recurse == 'down':
677
658
for relpath, file_id in self.this_tree.iter_references():
678
659
sub_tree = self.this_tree.get_nested_tree(file_id, relpath)
704
686
merge = operation.run_simple()
705
687
if len(merge.cooked_conflicts) == 0:
706
688
if not self.ignore_zero and not trace.is_quiet():
707
trace.note("All changes applied successfully.")
689
trace.note(gettext("All changes applied successfully."))
709
trace.note("%d conflicts encountered."
691
trace.note(gettext("%d conflicts encountered.")
710
692
% len(merge.cooked_conflicts))
712
694
return len(merge.cooked_conflicts)
744
726
interesting_ids=None, reprocess=False, show_base=False,
745
727
pb=None, pp=None, change_reporter=None,
746
728
interesting_files=None, do_merge=True,
747
cherrypick=False, lca_trees=None, this_branch=None):
729
cherrypick=False, lca_trees=None, this_branch=None,
748
731
"""Initialize the merger object and perform the merge.
750
733
:param working_tree: The working tree to apply the merge to
780
764
this_branch = this_tree.branch
781
765
self.interesting_ids = interesting_ids
782
766
self.interesting_files = interesting_files
783
self.this_tree = working_tree
767
self.working_tree = working_tree
768
self.this_tree = this_tree
784
769
self.base_tree = base_tree
785
770
self.other_tree = other_tree
786
771
self.this_branch = this_branch
772
self.other_branch = other_branch
787
773
self._raw_conflicts = []
788
774
self.cooked_conflicts = []
789
775
self.reprocess = reprocess
804
790
warnings.warn("pb argument to Merge3Merger is deprecated")
806
792
def do_merge(self):
807
operation = OperationWithCleanups(self._do_merge)
808
self.this_tree.lock_tree_write()
793
operation = cleanup.OperationWithCleanups(self._do_merge)
794
self.working_tree.lock_tree_write()
795
operation.add_cleanup(self.working_tree.unlock)
796
self.this_tree.lock_read()
809
797
operation.add_cleanup(self.this_tree.unlock)
810
798
self.base_tree.lock_read()
811
799
operation.add_cleanup(self.base_tree.unlock)
816
804
def _do_merge(self, operation):
817
self.tt = transform.TreeTransform(self.this_tree, None)
805
self.tt = transform.TreeTransform(self.working_tree, None)
818
806
operation.add_cleanup(self.tt.finalize)
819
807
self._compute_transform()
820
808
results = self.tt.apply(no_conflicts=True)
821
809
self.write_modified(results)
823
self.this_tree.add_conflicts(self.cooked_conflicts)
811
self.working_tree.add_conflicts(self.cooked_conflicts)
824
812
except errors.UnsupportedOperation:
827
815
def make_preview_transform(self):
828
operation = OperationWithCleanups(self._make_preview_transform)
816
operation = cleanup.OperationWithCleanups(self._make_preview_transform)
829
817
self.base_tree.lock_read()
830
818
operation.add_cleanup(self.base_tree.unlock)
831
819
self.other_tree.lock_read()
845
833
entries = self._entries_lca()
846
834
resolver = self._lca_multi_way
835
# Prepare merge hooks
836
factories = Merger.hooks['merge_file_content']
837
# One hook for each registered one plus our default merger
838
hooks = [factory(self) for factory in factories] + [self]
839
self.active_hooks = [hook for hook in hooks if hook is not None]
847
840
child_pb = ui.ui_factory.nested_progress_bar()
849
factories = Merger.hooks['merge_file_content']
850
hooks = [factory(self) for factory in factories] + [self]
851
self.active_hooks = [hook for hook in hooks if hook is not None]
852
842
for num, (file_id, changed, parents3, names3,
853
843
executable3) in enumerate(entries):
854
child_pb.update('Preparing file merge', num, len(entries))
844
# Try merging each entry
845
child_pb.update(gettext('Preparing file merge'),
855
847
self._merge_names(file_id, parents3, names3, resolver=resolver)
857
849
file_status = self._do_merge_contents(file_id)
896
888
iterator = self.other_tree.iter_changes(self.base_tree,
897
include_unchanged=True, specific_files=self.interesting_files,
889
specific_files=self.interesting_files,
898
890
extra_trees=[self.this_tree])
899
891
this_entries = dict((e.file_id, e) for p, e in
900
892
self.this_tree.iter_entries_by_dir(
926
918
it then compares with THIS and BASE.
928
920
For the multi-valued entries, the format will be (BASE, [lca1, lca2])
929
:return: [(file_id, changed, parents, names, executable)]
930
file_id Simple file_id of the entry
931
changed Boolean, True if the kind or contents changed
933
parents ((base, [parent_id, in, lcas]), parent_id_other,
935
names ((base, [name, in, lcas]), name_in_other, name_in_this)
936
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,
938
932
if self.interesting_files is not None:
939
933
lookup_trees = [self.this_tree, self.base_tree]
1081
@deprecated_method(deprecated_in((2, 4, 0)))
1087
1082
def fix_root(self):
1089
self.tt.final_kind(self.tt.root)
1090
except errors.NoSuchFile:
1083
if self.tt.final_kind(self.tt.root) is None:
1091
1084
self.tt.cancel_deletion(self.tt.root)
1092
1085
if self.tt.final_file_id(self.tt.root) is None:
1093
1086
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
1098
1091
other_root = self.tt.trans_id_file_id(other_root_file_id)
1099
1092
if other_root == self.tt.root:
1101
if self.other_tree.inventory.root.file_id in self.this_tree.inventory:
1102
# the other tree's root is a non-root in the current tree (as when
1103
# a previously unrelated branch is merged into another)
1094
if self.this_tree.inventory.has_id(
1095
self.other_tree.inventory.root.file_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)
1106
self.tt.final_kind(other_root)
1099
if self.tt.final_kind(other_root) is not None:
1107
1100
other_root_is_present = True
1108
except errors.NoSuchFile:
1109
1102
# other_root doesn't have a physical representation. We still need
1110
1103
# to move any references to the actual root of the tree.
1111
1104
other_root_is_present = False
1112
1105
# 'other_tree.inventory.root' is not present in this tree. We are
1113
1106
# calling adjust_path for children which *want* to be present with a
1114
1107
# correct place to go.
1115
for thing, child in self.other_tree.inventory.root.children.iteritems():
1108
for _, child in self.other_tree.inventory.root.children.iteritems():
1116
1109
trans_id = self.tt.trans_id_file_id(child.file_id)
1117
1110
if not other_root_is_present:
1118
# FIXME: Make final_kind returns None instead of raising
1119
# NoSuchFile to avoid the ugly construct below -- vila 20100402
1121
self.tt.final_kind(trans_id)
1111
if self.tt.final_kind(trans_id) is not None:
1122
1112
# The item exist in the final tree and has a defined place
1123
1113
# to go already.
1125
except errors.NoSuchFile, e:
1127
1115
# Move the item into the root
1128
self.tt.adjust_path(self.tt.final_name(trans_id),
1129
self.tt.root, trans_id)
1117
final_name = self.tt.final_name(trans_id)
1118
except errors.NoFinalPath:
1119
# This file is not present anymore, ignore it.
1121
self.tt.adjust_path(final_name, self.tt.root, trans_id)
1130
1122
if other_root_is_present:
1131
1123
self.tt.cancel_creation(other_root)
1132
1124
self.tt.cancel_versioning(other_root)
1134
1126
def write_modified(self, results):
1135
1127
modified_hashes = {}
1136
1128
for path in results.modified_paths:
1137
file_id = self.this_tree.path2id(self.this_tree.relpath(path))
1129
file_id = self.working_tree.path2id(self.working_tree.relpath(path))
1138
1130
if file_id is None:
1140
hash = self.this_tree.get_file_sha1(file_id)
1132
hash = self.working_tree.get_file_sha1(file_id)
1141
1133
if hash is None:
1143
1135
modified_hashes[file_id] = hash
1144
self.this_tree.set_merge_modified(modified_hashes)
1136
self.working_tree.set_merge_modified(modified_hashes)
1147
1139
def parent(entry, file_id):
1311
1303
self._raw_conflicts.append(('path conflict', trans_id, file_id,
1312
1304
this_parent, this_name,
1313
1305
other_parent, other_name))
1314
if other_name is None:
1306
if not self.other_tree.has_id(file_id):
1315
1307
# it doesn't matter whether the result was 'other' or
1316
# 'conflict'-- if there's no 'other', we leave it alone.
1308
# 'conflict'-- if it has no file id, we leave it alone.
1318
1310
parent_id = parents[self.winner_idx[parent_id_winner]]
1319
if parent_id is not None:
1311
name = names[self.winner_idx[name_winner]]
1312
if parent_id is not None or name is not None:
1320
1313
# if we get here, name_winner and parent_winner are set to safe
1322
self.tt.adjust_path(names[self.winner_idx[name_winner]],
1323
self.tt.trans_id_file_id(parent_id),
1315
if parent_id is None and name is not None:
1316
# if parent_id is None and name is non-None, current file is
1318
if names[self.winner_idx[parent_id_winner]] != '':
1319
raise AssertionError(
1320
'File looks like a root, but named %s' %
1321
names[self.winner_idx[parent_id_winner]])
1322
parent_trans_id = transform.ROOT_PARENT
1324
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1325
self.tt.adjust_path(name, parent_trans_id,
1324
1326
self.tt.trans_id_file_id(file_id))
1326
1328
def _do_merge_contents(self, file_id):
1327
1329
"""Performs a merge on file_id contents."""
1328
1330
def contents_pair(tree):
1329
if file_id not in tree:
1331
if not tree.has_id(file_id):
1330
1332
return (None, None)
1331
1333
kind = tree.kind(file_id)
1332
1334
if kind == "file":
1361
1363
# We have a hypothetical conflict, but if we have files, then we
1362
1364
# can try to merge the content
1363
1365
trans_id = self.tt.trans_id_file_id(file_id)
1364
params = MergeHookParams(self, file_id, trans_id, this_pair[0],
1366
params = MergeFileHookParams(self, file_id, trans_id, this_pair[0],
1365
1367
other_pair[0], winner)
1366
1368
hooks = self.active_hooks
1367
1369
hook_status = 'not_applicable'
1370
1372
if hook_status != 'not_applicable':
1371
1373
# Don't try any more hooks, this one applies.
1375
# If the merge ends up replacing the content of the file, we get rid of
1376
# it at the end of this method (this variable is used to track the
1377
# exceptions to this rule).
1373
1379
result = "modified"
1374
1380
if hook_status == 'not_applicable':
1375
# This is a contents conflict, because none of the available
1376
# functions could merge it.
1381
# No merge hook was able to resolve the situation. Two cases exist:
1382
# a content conflict or a duplicate one.
1378
1384
name = self.tt.final_name(trans_id)
1379
1385
parent_id = self.tt.final_parent(trans_id)
1380
if self.this_tree.has_id(file_id):
1381
self.tt.unversion_file(trans_id)
1382
file_group = self._dump_conflicts(name, parent_id, file_id,
1384
self._raw_conflicts.append(('contents conflict', file_group))
1387
inhibit_content_conflict = False
1388
if params.this_kind is None: # file_id is not in THIS
1389
# Is the name used for a different file_id ?
1390
dupe_path = self.other_tree.id2path(file_id)
1391
this_id = self.this_tree.path2id(dupe_path)
1392
if this_id is not None:
1393
# Two entries for the same path
1395
# versioning the merged file will trigger a duplicate
1397
self.tt.version_file(file_id, trans_id)
1398
transform.create_from_tree(
1399
self.tt, trans_id, self.other_tree, file_id,
1400
filter_tree_path=self._get_filter_tree_path(file_id))
1401
inhibit_content_conflict = True
1402
elif params.other_kind is None: # file_id is not in OTHER
1403
# Is the name used for a different file_id ?
1404
dupe_path = self.this_tree.id2path(file_id)
1405
other_id = self.other_tree.path2id(dupe_path)
1406
if other_id is not None:
1407
# Two entries for the same path again, but here, the other
1408
# entry will also be merged. We simply inhibit the
1409
# 'content' conflict creation because we know OTHER will
1410
# create (or has already created depending on ordering) an
1411
# entry at the same path. This will trigger a 'duplicate'
1414
inhibit_content_conflict = True
1415
if not inhibit_content_conflict:
1416
if params.this_kind is not None:
1417
self.tt.unversion_file(trans_id)
1418
# This is a contents conflict, because none of the available
1419
# functions could merge it.
1420
file_group = self._dump_conflicts(name, parent_id, file_id,
1422
self._raw_conflicts.append(('contents conflict', file_group))
1385
1423
elif hook_status == 'success':
1386
1424
self.tt.create_file(lines, trans_id)
1387
1425
elif hook_status == 'conflicted':
1403
1441
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1404
1442
if not self.this_tree.has_id(file_id) and result == "modified":
1405
1443
self.tt.version_file(file_id, trans_id)
1406
# The merge has been performed, so the old contents should not be
1445
# The merge has been performed and produced a new content, so the
1446
# old contents should not be retained.
1409
1447
self.tt.delete_contents(trans_id)
1410
except errors.NoSuchFile:
1414
1450
def _default_other_winner_merge(self, merge_hook_params):
1415
1451
"""Replace this contents with other."""
1416
1452
file_id = merge_hook_params.file_id
1417
1453
trans_id = merge_hook_params.trans_id
1418
file_in_this = self.this_tree.has_id(file_id)
1419
1454
if self.other_tree.has_id(file_id):
1420
1455
# OTHER changed the file
1422
if wt.supports_content_filtering():
1423
# We get the path from the working tree if it exists.
1424
# That fails though when OTHER is adding a file, so
1425
# we fall back to the other tree to find the path if
1426
# it doesn't exist locally.
1428
filter_tree_path = wt.id2path(file_id)
1429
except errors.NoSuchId:
1430
filter_tree_path = self.other_tree.id2path(file_id)
1432
# Skip the id2path lookup for older formats
1433
filter_tree_path = None
1434
transform.create_from_tree(self.tt, trans_id,
1435
self.other_tree, file_id,
1436
filter_tree_path=filter_tree_path)
1456
transform.create_from_tree(
1457
self.tt, trans_id, self.other_tree, file_id,
1458
filter_tree_path=self._get_filter_tree_path(file_id))
1437
1459
return 'done', None
1460
elif self.this_tree.has_id(file_id):
1439
1461
# OTHER deleted the file
1440
1462
return 'delete', None
1516
1538
file_group.append(trans_id)
1541
def _get_filter_tree_path(self, file_id):
1542
if self.this_tree.supports_content_filtering():
1543
# We get the path from the working tree if it exists.
1544
# That fails though when OTHER is adding a file, so
1545
# we fall back to the other tree to find the path if
1546
# it doesn't exist locally.
1548
return self.this_tree.id2path(file_id)
1549
except errors.NoSuchId:
1550
return self.other_tree.id2path(file_id)
1551
# Skip the id2path lookup for older formats
1518
1554
def _dump_conflicts(self, name, parent_id, file_id, this_lines=None,
1519
1555
base_lines=None, other_lines=None, set_version=False,
1520
1556
no_base=False):
1607
1640
def cook_conflicts(self, fs_conflicts):
1608
1641
"""Convert all conflicts into a form that doesn't depend on trans_id"""
1609
self.cooked_conflicts.extend(transform.cook_conflicts(
1610
fs_conflicts, self.tt))
1642
content_conflict_file_ids = set()
1643
cooked_conflicts = transform.cook_conflicts(fs_conflicts, self.tt)
1611
1644
fp = transform.FinalPaths(self.tt)
1612
1645
for conflict in self._raw_conflicts:
1613
1646
conflict_type = conflict[0]
1624
1657
if other_parent is None or other_name is None:
1625
1658
other_path = '<deleted>'
1627
parent_path = fp.get_path(
1628
self.tt.trans_id_file_id(other_parent))
1660
if other_parent == self.other_tree.get_root_id():
1661
# The tree transform doesn't know about the other root,
1662
# so we special case here to avoid a NoFinalPath
1666
parent_path = fp.get_path(
1667
self.tt.trans_id_file_id(other_parent))
1629
1668
other_path = osutils.pathjoin(parent_path, other_name)
1630
1669
c = _mod_conflicts.Conflict.factory(
1631
1670
'path conflict', path=this_path,
1635
1674
for trans_id in conflict[1]:
1636
1675
file_id = self.tt.final_file_id(trans_id)
1637
1676
if file_id is not None:
1677
# Ok we found the relevant file-id
1639
1679
path = fp.get_path(trans_id)
1640
1680
for suffix in ('.BASE', '.THIS', '.OTHER'):
1641
1681
if path.endswith(suffix):
1682
# Here is the raw path
1642
1683
path = path[:-len(suffix)]
1644
1685
c = _mod_conflicts.Conflict.factory(conflict_type,
1645
1686
path=path, file_id=file_id)
1687
content_conflict_file_ids.add(file_id)
1646
1688
elif conflict_type == 'text conflict':
1647
1689
trans_id = conflict[1]
1648
1690
path = fp.get_path(trans_id)
1651
1693
path=path, file_id=file_id)
1653
1695
raise AssertionError('bad conflict type: %r' % (conflict,))
1696
cooked_conflicts.append(c)
1698
self.cooked_conflicts = []
1699
# We want to get rid of path conflicts when a corresponding contents
1700
# conflict exists. This can occur when one branch deletes a file while
1701
# the other renames *and* modifies it. In this case, the content
1702
# conflict is enough.
1703
for c in cooked_conflicts:
1704
if (c.typestring == 'path conflict'
1705
and c.file_id in content_conflict_file_ids):
1654
1707
self.cooked_conflicts.append(c)
1655
1708
self.cooked_conflicts.sort(key=_mod_conflicts.Conflict.sort_key)
1877
1930
entries = self._entries_to_incorporate()
1878
1931
entries = list(entries)
1879
1932
for num, (entry, parent_id) in enumerate(entries):
1880
child_pb.update('Preparing file merge', num, len(entries))
1933
child_pb.update(gettext('Preparing file merge'), num, len(entries))
1881
1934
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1882
1935
trans_id = transform.new_by_entry(self.tt, entry,
1883
1936
parent_trans_id, self.other_tree)
1901
1954
name_in_target = osutils.basename(self._target_subdir)
1902
1955
merge_into_root = subdir.copy()
1903
1956
merge_into_root.name = name_in_target
1904
if merge_into_root.file_id in self.this_tree.inventory:
1957
if self.this_tree.inventory.has_id(merge_into_root.file_id):
1905
1958
# Give the root a new file-id.
1906
1959
# This can happen fairly easily if the directory we are
1907
1960
# incorporating is the root, and both trees have 'TREE_ROOT' as
1967
2020
merger.set_base_revision(get_revision_id(), this_branch)
1968
2021
return merger.do_merge()
2024
merge_type_registry = registry.Registry()
2025
merge_type_registry.register('diff3', Diff3Merger,
2026
"Merge using external diff3.")
2027
merge_type_registry.register('lca', LCAMerger,
2028
"LCA-newness merge.")
2029
merge_type_registry.register('merge3', Merge3Merger,
2030
"Native diff3-style merge.")
2031
merge_type_registry.register('weave', WeaveMerger,
2032
"Weave-based merge.")
1970
2035
def get_merge_type_registry():
1971
"""Merge type registry is in bzrlib.option to avoid circular imports.
2036
"""Merge type registry was previously in bzrlib.option
1973
This method provides a sanctioned way to retrieve it.
2038
This method provides a backwards compatible way to retrieve it.
1975
from bzrlib import option
1976
return option._merge_type_registry
2040
return merge_type_registry
1979
2043
def _plan_annotate_merge(annotated_a, annotated_b, ancestors_a, ancestors_b):
added
removed
bzrlib/merge.py
