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
from .lazy_import import lazy_import
20
lazy_import(globals(), """
20
24
branch as _mod_branch,
21
26
conflicts as _mod_conflicts,
25
28
graph as _mod_graph,
30
31
revision as _mod_revision,
39
from bzrlib.cleanup import OperationWithCleanups
40
from bzrlib.symbol_versioning import (
39
from breezy.bzr import (
40
conflicts as _mod_bzr_conflicts,
44
from breezy.i18n import gettext
44
56
# TODO: Report back as changes are merged in
47
def transform_tree(from_tree, to_tree, interesting_ids=None):
48
from_tree.lock_tree_write()
49
operation = OperationWithCleanups(merge_inner)
50
operation.add_cleanup(from_tree.unlock)
51
operation.run_simple(from_tree.branch, to_tree, from_tree,
52
ignore_zero=True, interesting_ids=interesting_ids, this_tree=from_tree)
59
def transform_tree(from_tree, to_tree, interesting_files=None):
60
with from_tree.lock_tree_write():
61
merge_inner(from_tree.branch, to_tree, from_tree,
62
ignore_zero=True, this_tree=from_tree,
63
interesting_files=interesting_files)
55
66
class MergeHooks(hooks.Hooks):
57
68
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 "
61
"merge object when starting a merge. "
62
"Should return either None or a subclass of "
63
"``bzrlib.merge.AbstractPerFileMerger``. "
64
"Such objects will then be called per file "
65
"that needs to be merged (including when one "
66
"side has deleted the file and the other has changed it). "
67
"See the AbstractPerFileMerger API docs for details on how it is "
69
hooks.Hooks.__init__(self, "breezy.merge", "Merger.hooks")
70
self.add_hook('merge_file_content',
71
"Called with a breezy.merge.Merger object to create a per file "
72
"merge object when starting a merge. "
73
"Should return either None or a subclass of "
74
"``breezy.merge.AbstractPerFileMerger``. "
75
"Such objects will then be called per file "
76
"that needs to be merged (including when one "
77
"side has deleted the file and the other has changed it). "
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.',
72
92
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.
93
"""PerFileMerger objects are used by plugins extending merge for breezy.
95
See ``breezy.plugins.news_merge.news_merge`` for an example concrete class.
77
97
:ivar merger: The Merge3Merger performing the merge.
435
436
revision_id = _mod_revision.ensure_null(revision_id)
436
437
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
439
def set_interesting_files(self, file_list):
487
440
self.interesting_files = file_list
489
442
def set_pending(self):
490
443
if (not self.base_is_ancestor or not self.base_is_other_ancestor
491
or self.other_rev_id is None):
444
or self.other_rev_id is None):
493
446
self._add_parent()
495
448
def _add_parent(self):
496
449
new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
497
450
new_parent_trees = []
498
operation = OperationWithCleanups(self.this_tree.set_parent_trees)
499
for revision_id in new_parents:
501
tree = self.revision_tree(revision_id)
502
except errors.NoSuchRevision:
506
operation.add_cleanup(tree.unlock)
507
new_parent_trees.append((revision_id, tree))
508
operation.run_simple(new_parent_trees, allow_leftmost_as_ghost=True)
451
with cleanup.ExitStack() as stack:
452
for revision_id in new_parents:
454
tree = self.revision_tree(revision_id)
455
except errors.NoSuchRevision:
458
stack.enter_context(tree.lock_read())
459
new_parent_trees.append((revision_id, tree))
460
self.this_tree.set_parent_trees(new_parent_trees, allow_leftmost_as_ghost=True)
510
462
def set_other(self, other_revision, possible_transports=None):
511
463
"""Set the revision and tree to merge from.
792
756
self.cherrypick = cherrypick
796
warnings.warn("pp argument to Merge3Merger is deprecated")
798
warnings.warn("pb argument to Merge3Merger is deprecated")
800
760
def do_merge(self):
801
operation = OperationWithCleanups(self._do_merge)
802
self.this_tree.lock_tree_write()
803
operation.add_cleanup(self.this_tree.unlock)
804
self.base_tree.lock_read()
805
operation.add_cleanup(self.base_tree.unlock)
806
self.other_tree.lock_read()
807
operation.add_cleanup(self.other_tree.unlock)
810
def _do_merge(self, operation):
811
self.tt = transform.TreeTransform(self.this_tree, None)
812
operation.add_cleanup(self.tt.finalize)
813
self._compute_transform()
814
results = self.tt.apply(no_conflicts=True)
815
self.write_modified(results)
817
self.this_tree.add_conflicts(self.cooked_conflicts)
818
except errors.UnsupportedOperation:
761
with cleanup.ExitStack() as stack:
762
stack.enter_context(self.working_tree.lock_tree_write())
763
stack.enter_context(self.this_tree.lock_read())
764
stack.enter_context(self.base_tree.lock_read())
765
stack.enter_context(self.other_tree.lock_read())
766
self.tt = self.working_tree.transform()
767
stack.enter_context(self.tt)
768
self._compute_transform()
769
results = self.tt.apply(no_conflicts=True)
770
self.write_modified(results)
772
self.working_tree.add_conflicts(self.cooked_conflicts)
773
except errors.UnsupportedOperation:
821
776
def make_preview_transform(self):
822
operation = OperationWithCleanups(self._make_preview_transform)
823
self.base_tree.lock_read()
824
operation.add_cleanup(self.base_tree.unlock)
825
self.other_tree.lock_read()
826
operation.add_cleanup(self.other_tree.unlock)
827
return operation.run_simple()
829
def _make_preview_transform(self):
830
self.tt = transform.TransformPreview(self.this_tree)
831
self._compute_transform()
777
with self.base_tree.lock_read(), self.other_tree.lock_read():
778
self.tt = self.working_tree.preview_transform()
779
self._compute_transform()
834
782
def _compute_transform(self):
835
783
if self._lca_trees is None:
836
entries = self._entries3()
784
entries = list(self._entries3())
837
785
resolver = self._three_way
839
entries = self._entries_lca()
787
entries = list(self._entries_lca())
840
788
resolver = self._lca_multi_way
841
child_pb = ui.ui_factory.nested_progress_bar()
843
factories = Merger.hooks['merge_file_content']
844
hooks = [factory(self) for factory in factories] + [self]
845
self.active_hooks = [hook for hook in hooks if hook is not None]
846
for num, (file_id, changed, parents3, names3,
789
# Prepare merge hooks
790
factories = Merger.hooks['merge_file_content']
791
# One hook for each registered one plus our default merger
792
hooks = [factory(self) for factory in factories] + [self]
793
self.active_hooks = [hook for hook in hooks if hook is not None]
794
with ui.ui_factory.nested_progress_bar() as child_pb:
795
for num, (file_id, changed, paths3, parents3, names3,
847
796
executable3) in enumerate(entries):
848
child_pb.update('Preparing file merge', num, len(entries))
849
self._merge_names(file_id, parents3, names3, resolver=resolver)
797
trans_id = self.tt.trans_id_file_id(file_id)
798
# Try merging each entry
799
child_pb.update(gettext('Preparing file merge'),
801
self._merge_names(trans_id, file_id, paths3, parents3,
802
names3, resolver=resolver)
851
file_status = self._do_merge_contents(file_id)
804
file_status = self._do_merge_contents(paths3, trans_id, file_id)
853
806
file_status = 'unmodified'
854
self._merge_executable(file_id,
855
executable3, file_status, resolver=resolver)
859
child_pb = ui.ui_factory.nested_progress_bar()
861
fs_conflicts = transform.resolve_conflicts(self.tt, child_pb,
807
self._merge_executable(paths3, trans_id, executable3,
808
file_status, resolver=resolver)
809
self.tt.fixup_new_roots()
810
self._finish_computing_transform()
812
def _finish_computing_transform(self):
813
"""Finalize the transform and report the changes.
815
This is the second half of _compute_transform.
817
with ui.ui_factory.nested_progress_bar() as child_pb:
818
fs_conflicts = transform.resolve_conflicts(
862
820
lambda t, c: transform.conflict_pass(t, c, self.other_tree))
865
821
if self.change_reporter is not None:
866
from bzrlib import delta
822
from breezy import delta
867
823
delta.report_changes(
868
824
self.tt.iter_changes(), self.change_reporter)
869
825
self.cook_conflicts(fs_conflicts)
870
826
for conflict in self.cooked_conflicts:
871
trace.warning(conflict)
827
trace.warning('%s', conflict.describe())
873
829
def _entries3(self):
874
830
"""Gather data about files modified between three trees.
879
835
other and this. names3 is a tuple of names for base, other and this.
880
836
executable3 is a tuple of execute-bit values for base, other and this.
883
838
iterator = self.other_tree.iter_changes(self.base_tree,
884
include_unchanged=True, specific_files=self.interesting_files,
885
extra_trees=[self.this_tree])
886
this_entries = dict((e.file_id, e) for p, e in
887
self.this_tree.iter_entries_by_dir(
888
self.interesting_ids))
889
for (file_id, paths, changed, versioned, parents, names, kind,
890
executable) in iterator:
891
if (self.interesting_ids is not None and
892
file_id not in self.interesting_ids):
894
entry = this_entries.get(file_id)
895
if entry is not None:
896
this_name = entry.name
897
this_parent = entry.parent_id
898
this_executable = entry.executable
839
specific_files=self.interesting_files,
840
extra_trees=[self.this_tree])
841
this_interesting_files = self.this_tree.find_related_paths_across_trees(
842
self.interesting_files, trees=[self.other_tree])
843
this_entries = dict(self.this_tree.iter_entries_by_dir(
844
specific_files=this_interesting_files))
845
for change in iterator:
846
if change.path[0] is not None:
847
this_path = _mod_tree.find_previous_path(
848
self.base_tree, self.this_tree, change.path[0])
850
this_path = _mod_tree.find_previous_path(
851
self.other_tree, self.this_tree, change.path[1])
852
this_entry = this_entries.get(this_path)
853
if this_entry is not None:
854
this_name = this_entry.name
855
this_parent = this_entry.parent_id
856
this_executable = this_entry.executable
901
859
this_parent = None
902
860
this_executable = None
903
parents3 = parents + (this_parent,)
904
names3 = names + (this_name,)
905
executable3 = executable + (this_executable,)
906
result.append((file_id, changed, parents3, names3, executable3))
861
parents3 = change.parent_id + (this_parent,)
862
names3 = change.name + (this_name,)
863
paths3 = change.path + (this_path, )
864
executable3 = change.executable + (this_executable,)
866
(change.file_id, change.changed_content, paths3,
867
parents3, names3, executable3))
909
869
def _entries_lca(self):
910
870
"""Gather data about files modified between multiple trees.
913
873
it then compares with THIS and BASE.
915
875
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)
877
:return: [(file_id, changed, paths, parents, names, executable)], where:
879
* file_id: Simple file_id of the entry
880
* changed: Boolean, True if the kind or contents changed else False
881
* paths: ((base, [path, in, lcas]), path_other, path_this)
882
* parents: ((base, [parent_id, in, lcas]), parent_id_other,
884
* names: ((base, [name, in, lcas]), name_in_other, name_in_this)
885
* executable: ((base, [exec, in, lcas]), exec_in_other,
925
888
if self.interesting_files is not None:
926
889
lookup_trees = [self.this_tree, self.base_tree]
927
890
lookup_trees.extend(self._lca_trees)
928
891
# I think we should include the lca trees as well
929
interesting_ids = self.other_tree.paths2ids(self.interesting_files,
892
interesting_files = self.other_tree.find_related_paths_across_trees(
893
self.interesting_files, lookup_trees)
932
interesting_ids = self.interesting_ids
934
walker = _mod_tree.MultiWalker(self.other_tree, self._lca_trees)
895
interesting_files = None
896
from .multiwalker import MultiWalker
897
walker = MultiWalker(self.other_tree, self._lca_trees)
936
base_inventory = self.base_tree.inventory
937
this_inventory = self.this_tree.inventory
938
for path, file_id, other_ie, lca_values in walker.iter_all():
899
for other_path, file_id, other_ie, lca_values in walker.iter_all():
939
900
# Is this modified at all from any of the other trees?
940
901
if other_ie is None:
941
902
other_ie = _none_entry
942
if interesting_ids is not None and file_id not in interesting_ids:
904
if interesting_files is not None and other_path not in interesting_files:
945
907
# If other_revision is found in any of the lcas, that means this
1023
996
(base_ie.executable, lca_executable),
1024
997
other_ie.executable, this_ie.executable)
1025
998
if (parent_id_winner == 'this' and name_winner == 'this'
1026
and sha1_winner == 'this' and exec_winner == 'this'):
999
and sha1_winner == 'this' and exec_winner == 'this'):
1027
1000
# No kind, parent, name, exec, or content change for
1028
1001
# OTHER, so this node is not considered interesting
1030
1003
if sha1_winner == 'this':
1031
1004
content_changed = False
1032
1005
elif other_ie.kind == 'symlink':
1033
def get_target(ie, tree):
1006
def get_target(ie, tree, path):
1034
1007
if ie.kind != 'symlink':
1036
return tree.get_symlink_target(file_id)
1037
base_target = get_target(base_ie, self.base_tree)
1038
lca_targets = [get_target(ie, tree) for ie, tree
1039
in zip(lca_entries, self._lca_trees)]
1040
this_target = get_target(this_ie, self.this_tree)
1041
other_target = get_target(other_ie, self.other_tree)
1009
return tree.get_symlink_target(path)
1010
base_target = get_target(base_ie, self.base_tree, base_path)
1011
lca_targets = [get_target(ie, tree, lca_path) for ie, tree, lca_path
1012
in zip(lca_entries, self._lca_trees, lca_paths)]
1013
this_target = get_target(
1014
this_ie, self.this_tree, this_path)
1015
other_target = get_target(
1016
other_ie, self.other_tree, other_path)
1042
1017
target_winner = self._lca_multi_way(
1043
1018
(base_target, lca_targets),
1044
1019
other_target, this_target)
1045
1020
if (parent_id_winner == 'this' and name_winner == 'this'
1046
and target_winner == 'this'):
1021
and target_winner == 'this'):
1047
1022
# No kind, parent, name, or symlink target change
1048
1023
# not interesting
1061
1036
raise AssertionError('unhandled kind: %s' % other_ie.kind)
1063
1038
# If we have gotten this far, that means something has changed
1064
result.append((file_id, content_changed,
1039
yield (file_id, content_changed,
1040
((base_path, lca_paths),
1041
other_path, this_path),
1065
1042
((base_ie.parent_id, lca_parent_ids),
1066
1043
other_ie.parent_id, this_ie.parent_id),
1067
1044
((base_ie.name, lca_names),
1068
1045
other_ie.name, this_ie.name),
1069
1046
((base_ie.executable, lca_executable),
1070
1047
other_ie.executable, this_ie.executable)
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
1050
def write_modified(self, results):
1051
if not self.working_tree.supports_merge_modified():
1123
1053
modified_hashes = {}
1124
1054
for path in results.modified_paths:
1125
file_id = self.this_tree.path2id(self.this_tree.relpath(path))
1055
wt_relpath = self.working_tree.relpath(path)
1056
if not self.working_tree.is_versioned(wt_relpath):
1128
hash = self.this_tree.get_file_sha1(file_id)
1058
hash = self.working_tree.get_file_sha1(wt_relpath)
1129
1059
if hash is None:
1131
modified_hashes[file_id] = hash
1132
self.this_tree.set_merge_modified(modified_hashes)
1061
modified_hashes[wt_relpath] = hash
1062
self.working_tree.set_merge_modified(modified_hashes)
1135
def parent(entry, file_id):
1136
1066
"""Determine the parent for a file_id (used as a key method)"""
1137
1067
if entry is None:
1139
1069
return entry.parent_id
1142
def name(entry, file_id):
1143
1073
"""Determine the name for a file_id (used as a key method)"""
1144
1074
if entry is None:
1146
1076
return entry.name
1149
def contents_sha1(tree, file_id):
1079
def contents_sha1(tree, path):
1150
1080
"""Determine the sha1 of the file contents (used as a key method)."""
1151
if file_id not in tree:
1082
return tree.get_file_sha1(path)
1083
except errors.NoSuchFile:
1153
return tree.get_file_sha1(file_id)
1156
def executable(tree, file_id):
1087
def executable(tree, path):
1157
1088
"""Determine the executability of a file-id (used as a key method)."""
1158
if not tree.has_id(file_id):
1090
if tree.kind(path) != "file":
1092
except errors.NoSuchFile:
1160
if tree.kind(file_id) != "file":
1162
return tree.is_executable(file_id)
1094
return tree.is_executable(path)
1165
def kind(tree, file_id):
1097
def kind(tree, path):
1166
1098
"""Determine the kind of a file-id (used as a key method)."""
1167
if not tree.has_id(file_id):
1100
return tree.kind(path)
1101
except errors.NoSuchFile:
1169
return tree.kind(file_id)
1172
1105
def _three_way(base, other, this):
1295
1187
# Creating helpers (.OTHER or .THIS) here cause problems down the
1296
1188
# road if a ContentConflict needs to be created so we should not do
1298
trans_id = self.tt.trans_id_file_id(file_id)
1299
1190
self._raw_conflicts.append(('path conflict', trans_id, file_id,
1300
1191
this_parent, this_name,
1301
1192
other_parent, other_name))
1302
if other_name is None:
1193
if other_path is None:
1303
1194
# it doesn't matter whether the result was 'other' or
1304
# 'conflict'-- if there's no 'other', we leave it alone.
1195
# 'conflict'-- if it has no file id, we leave it alone.
1306
1197
parent_id = parents[self.winner_idx[parent_id_winner]]
1307
if parent_id is not None:
1198
name = names[self.winner_idx[name_winner]]
1199
if parent_id is not None or name is not None:
1308
1200
# 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),
1312
self.tt.trans_id_file_id(file_id))
1202
if parent_id is None and name is not None:
1203
# if parent_id is None and name is non-None, current file is
1205
if names[self.winner_idx[parent_id_winner]] != '':
1206
raise AssertionError(
1207
'File looks like a root, but named %s' %
1208
names[self.winner_idx[parent_id_winner]])
1209
parent_trans_id = transform.ROOT_PARENT
1211
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1212
self.tt.adjust_path(name, parent_trans_id, trans_id)
1314
def _do_merge_contents(self, file_id):
1214
def _do_merge_contents(self, paths, trans_id, file_id):
1315
1215
"""Performs a merge on file_id contents."""
1316
def contents_pair(tree):
1317
if file_id not in tree:
1319
kind = tree.kind(file_id)
1216
def contents_pair(tree, path):
1220
kind = tree.kind(path)
1221
except errors.NoSuchFile:
1320
1223
if kind == "file":
1321
contents = tree.get_file_sha1(file_id)
1224
contents = tree.get_file_sha1(path)
1322
1225
elif kind == "symlink":
1323
contents = tree.get_symlink_target(file_id)
1226
contents = tree.get_symlink_target(path)
1325
1228
contents = None
1326
1229
return kind, contents
1231
base_path, other_path, this_path = paths
1328
1232
# See SPOT run. run, SPOT, run.
1329
1233
# So we're not QUITE repeating ourselves; we do tricky things with
1331
base_pair = contents_pair(self.base_tree)
1332
other_pair = contents_pair(self.other_tree)
1235
other_pair = contents_pair(self.other_tree, other_path)
1236
this_pair = contents_pair(self.this_tree, this_path)
1333
1237
if self._lca_trees:
1334
this_pair = contents_pair(self.this_tree)
1335
lca_pairs = [contents_pair(tree) for tree in self._lca_trees]
1238
(base_path, lca_paths) = base_path
1239
base_pair = contents_pair(self.base_tree, base_path)
1240
lca_pairs = [contents_pair(tree, path)
1241
for tree, path in zip(self._lca_trees, lca_paths)]
1336
1242
winner = self._lca_multi_way((base_pair, lca_pairs), other_pair,
1337
1243
this_pair, allow_overriding_lca=False)
1245
base_pair = contents_pair(self.base_tree, base_path)
1339
1246
if base_pair == other_pair:
1340
1247
winner = 'this'
1342
1249
# We delayed evaluating this_pair as long as we can to avoid
1343
1250
# unnecessary sha1 calculation
1344
this_pair = contents_pair(self.this_tree)
1251
this_pair = contents_pair(self.this_tree, this_path)
1345
1252
winner = self._three_way(base_pair, other_pair, this_pair)
1346
1253
if winner == 'this':
1347
1254
# No interesting changes introduced by OTHER
1348
1255
return "unmodified"
1349
1256
# We have a hypothetical conflict, but if we have files, then we
1350
1257
# can try to merge the content
1351
trans_id = self.tt.trans_id_file_id(file_id)
1352
params = MergeHookParams(self, file_id, trans_id, this_pair[0],
1258
params = MergeFileHookParams(
1259
self, (base_path, other_path, this_path), trans_id, this_pair[0],
1353
1260
other_pair[0], winner)
1354
1261
hooks = self.active_hooks
1355
1262
hook_status = 'not_applicable'
1358
1265
if hook_status != 'not_applicable':
1359
1266
# Don't try any more hooks, this one applies.
1268
# If the merge ends up replacing the content of the file, we get rid of
1269
# it at the end of this method (this variable is used to track the
1270
# exceptions to this rule).
1361
1272
result = "modified"
1362
1273
if hook_status == 'not_applicable':
1363
# This is a contents conflict, because none of the available
1364
# functions could merge it.
1274
# No merge hook was able to resolve the situation. Two cases exist:
1275
# a content conflict or a duplicate one.
1366
1277
name = self.tt.final_name(trans_id)
1367
1278
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))
1279
inhibit_content_conflict = False
1280
if params.this_kind is None: # file_id is not in THIS
1281
# Is the name used for a different file_id ?
1282
if self.this_tree.is_versioned(other_path):
1283
# Two entries for the same path
1285
# versioning the merged file will trigger a duplicate
1287
self.tt.version_file(trans_id, file_id=file_id)
1288
transform.create_from_tree(
1289
self.tt, trans_id, self.other_tree,
1291
filter_tree_path=self._get_filter_tree_path(other_path))
1292
inhibit_content_conflict = True
1293
elif params.other_kind is None: # file_id is not in OTHER
1294
# Is the name used for a different file_id ?
1295
if self.other_tree.is_versioned(this_path):
1296
# Two entries for the same path again, but here, the other
1297
# entry will also be merged. We simply inhibit the
1298
# 'content' conflict creation because we know OTHER will
1299
# create (or has already created depending on ordering) an
1300
# entry at the same path. This will trigger a 'duplicate'
1303
inhibit_content_conflict = True
1304
if not inhibit_content_conflict:
1305
if params.this_kind is not None:
1306
self.tt.unversion_file(trans_id)
1307
# This is a contents conflict, because none of the available
1308
# functions could merge it.
1309
file_group = self._dump_conflicts(
1310
name, (base_path, other_path, this_path), parent_id)
1311
for tid in file_group:
1312
self.tt.version_file(tid, file_id=file_id)
1314
self._raw_conflicts.append(('contents conflict', file_group))
1373
1315
elif hook_status == 'success':
1374
1316
self.tt.create_file(lines, trans_id)
1375
1317
elif hook_status == 'conflicted':
1391
1334
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1392
if not self.this_tree.has_id(file_id) and result == "modified":
1393
self.tt.version_file(file_id, trans_id)
1394
# The merge has been performed, so the old contents should not be
1335
if not this_path and result == "modified":
1336
self.tt.version_file(trans_id, file_id=file_id)
1338
# The merge has been performed and produced a new content, so the
1339
# old contents should not be retained.
1397
1340
self.tt.delete_contents(trans_id)
1398
except errors.NoSuchFile:
1402
1343
def _default_other_winner_merge(self, merge_hook_params):
1403
1344
"""Replace this contents with other."""
1404
file_id = merge_hook_params.file_id
1405
1345
trans_id = merge_hook_params.trans_id
1406
file_in_this = self.this_tree.has_id(file_id)
1407
if self.other_tree.has_id(file_id):
1346
if merge_hook_params.other_path is not None:
1408
1347
# 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)
1348
transform.create_from_tree(
1349
self.tt, trans_id, self.other_tree,
1350
merge_hook_params.other_path,
1351
filter_tree_path=self._get_filter_tree_path(merge_hook_params.other_path))
1425
1352
return 'done', None
1353
elif merge_hook_params.this_path is not None:
1427
1354
# OTHER deleted the file
1428
1355
return 'delete', None
1430
1357
raise AssertionError(
1431
'winner is OTHER, but file_id %r not in THIS or OTHER tree'
1358
'winner is OTHER, but file %r not in THIS or OTHER tree'
1359
% (merge_hook_params.base_path,))
1434
1361
def merge_contents(self, merge_hook_params):
1435
1362
"""Fallback merge logic after user installed hooks."""
1436
1363
# This function is used in merge hooks as the fallback instance.
1437
# Perhaps making this function and the functions it calls be a
1364
# Perhaps making this function and the functions it calls be a
1438
1365
# a separate class would be better.
1439
1366
if merge_hook_params.winner == 'other':
1440
1367
# OTHER is a straight winner, so replace this contents with other
1444
1371
# BASE is a file, or both converted to files, so at least we
1445
1372
# have agreement that output should be a file.
1447
self.text_merge(merge_hook_params.file_id,
1448
merge_hook_params.trans_id)
1374
self.text_merge(merge_hook_params.trans_id,
1375
merge_hook_params.paths)
1449
1376
except errors.BinaryFile:
1450
1377
return 'not_applicable', None
1451
1378
return 'done', None
1453
1380
return 'not_applicable', None
1455
def get_lines(self, tree, file_id):
1382
def get_lines(self, tree, path):
1456
1383
"""Return the lines in a file, or an empty list."""
1457
if tree.has_id(file_id):
1458
return tree.get_file(file_id).readlines()
1387
kind = tree.kind(path)
1388
except errors.NoSuchFile:
1393
return tree.get_file_lines(path)
1462
def text_merge(self, file_id, trans_id):
1463
"""Perform a three-way text merge on a file_id"""
1395
def text_merge(self, trans_id, paths):
1396
"""Perform a three-way text merge on a file"""
1464
1397
# it's possible that we got here with base as a different type.
1465
1398
# if so, we just want two-way text conflicts.
1466
if self.base_tree.has_id(file_id) and \
1467
self.base_tree.kind(file_id) == "file":
1468
base_lines = self.get_lines(self.base_tree, file_id)
1471
other_lines = self.get_lines(self.other_tree, file_id)
1472
this_lines = self.get_lines(self.this_tree, file_id)
1399
base_path, other_path, this_path = paths
1400
base_lines = self.get_lines(self.base_tree, base_path)
1401
other_lines = self.get_lines(self.other_tree, other_path)
1402
this_lines = self.get_lines(self.this_tree, this_path)
1473
1403
m3 = merge3.Merge3(base_lines, this_lines, other_lines,
1474
1404
is_cherrypick=self.cherrypick)
1475
start_marker = "!START OF MERGE CONFLICT!" + "I HOPE THIS IS UNIQUE"
1405
start_marker = b"!START OF MERGE CONFLICT!" + b"I HOPE THIS IS UNIQUE"
1476
1406
if self.show_base is True:
1477
base_marker = '|' * 7
1407
base_marker = b'|' * 7
1479
1409
base_marker = None
1481
1411
def iter_merge3(retval):
1482
1412
retval["text_conflicts"] = False
1483
for line in m3.merge_lines(name_a = "TREE",
1484
name_b = "MERGE-SOURCE",
1485
name_base = "BASE-REVISION",
1413
for line in m3.merge_lines(name_a=b"TREE",
1414
name_b=b"MERGE-SOURCE",
1415
name_base=b"BASE-REVISION",
1486
1416
start_marker=start_marker,
1487
1417
base_marker=base_marker,
1488
1418
reprocess=self.reprocess):
1489
1419
if line.startswith(start_marker):
1490
1420
retval["text_conflicts"] = True
1491
yield line.replace(start_marker, '<' * 7)
1421
yield line.replace(start_marker, b'<' * 7)
1498
1428
self._raw_conflicts.append(('text conflict', trans_id))
1499
1429
name = self.tt.final_name(trans_id)
1500
1430
parent_id = self.tt.final_parent(trans_id)
1501
file_group = self._dump_conflicts(name, parent_id, file_id,
1502
this_lines, base_lines,
1431
file_group = self._dump_conflicts(
1432
name, paths, parent_id,
1433
lines=(base_lines, other_lines, this_lines))
1504
1434
file_group.append(trans_id)
1506
def _dump_conflicts(self, name, parent_id, file_id, this_lines=None,
1507
base_lines=None, other_lines=None, set_version=False,
1436
def _get_filter_tree_path(self, path):
1437
if self.this_tree.supports_content_filtering():
1438
# We get the path from the working tree if it exists.
1439
# That fails though when OTHER is adding a file, so
1440
# we fall back to the other tree to find the path if
1441
# it doesn't exist locally.
1442
filter_path = _mod_tree.find_previous_path(
1443
self.other_tree, self.working_tree, path)
1444
if filter_path is None:
1447
# Skip the lookup for older formats
1450
def _dump_conflicts(self, name, paths, parent_id, lines=None,
1508
1451
no_base=False):
1509
1452
"""Emit conflict files.
1510
1453
If this_lines, base_lines, or other_lines are omitted, they will be
1511
1454
determined automatically. If set_version is true, the .OTHER, .THIS
1512
1455
or .BASE (in that order) will be created as versioned files.
1514
data = [('OTHER', self.other_tree, other_lines),
1515
('THIS', self.this_tree, this_lines)]
1457
base_path, other_path, this_path = paths
1459
base_lines, other_lines, this_lines = lines
1461
base_lines = other_lines = this_lines = None
1462
data = [('OTHER', self.other_tree, other_path, other_lines),
1463
('THIS', self.this_tree, this_path, this_lines)]
1516
1464
if not no_base:
1517
data.append(('BASE', self.base_tree, base_lines))
1465
data.append(('BASE', self.base_tree, base_path, base_lines))
1519
1467
# We need to use the actual path in the working tree of the file here,
1520
# ignoring the conflict suffixes
1522
if wt.supports_content_filtering():
1524
filter_tree_path = wt.id2path(file_id)
1525
except errors.NoSuchId:
1526
# file has been deleted
1527
filter_tree_path = None
1468
if self.this_tree.supports_content_filtering():
1469
filter_tree_path = this_path
1529
1471
# Skip the id2path lookup for older formats
1530
1472
filter_tree_path = None
1533
1474
file_group = []
1534
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)
1475
for suffix, tree, path, lines in data:
1476
if path is not None:
1477
trans_id = self._conflict_file(
1478
name, parent_id, path, tree, suffix, lines,
1538
1480
file_group.append(trans_id)
1539
if set_version and not versioned:
1540
self.tt.version_file(file_id, trans_id)
1542
1481
return file_group
1544
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1483
def _conflict_file(self, name, parent_id, path, tree, suffix,
1545
1484
lines=None, filter_tree_path=None):
1546
1485
"""Emit a single conflict file."""
1547
1486
name = name + '.' + suffix
1548
1487
trans_id = self.tt.create_path(name, parent_id)
1549
transform.create_from_tree(self.tt, trans_id, tree, file_id, lines,
1488
transform.create_from_tree(
1489
self.tt, trans_id, tree, path,
1491
filter_tree_path=filter_tree_path)
1551
1492
return trans_id
1553
def merge_executable(self, file_id, file_status):
1554
"""Perform a merge on the execute bit."""
1555
executable = [self.executable(t, file_id) for t in (self.base_tree,
1556
self.other_tree, self.this_tree)]
1557
self._merge_executable(file_id, executable, file_status,
1558
resolver=self._three_way)
1560
def _merge_executable(self, file_id, executable, file_status,
1494
def _merge_executable(self, paths, trans_id, executable, file_status,
1562
1496
"""Perform a merge on the execute bit."""
1563
1497
base_executable, other_executable, this_executable = executable
1498
base_path, other_path, this_path = paths
1564
1499
if file_status == "deleted":
1566
1501
winner = resolver(*executable)
1567
1502
if winner == "conflict":
1568
# There must be a None in here, if we have a conflict, but we
1569
# need executability since file status was not deleted.
1570
if self.executable(self.other_tree, file_id) is None:
1503
# There must be a None in here, if we have a conflict, but we
1504
# need executability since file status was not deleted.
1505
if other_path is None:
1571
1506
winner = "this"
1573
1508
winner = "other"
1574
1509
if winner == 'this' and file_status != "modified":
1576
trans_id = self.tt.trans_id_file_id(file_id)
1578
if self.tt.final_kind(trans_id) != "file":
1580
except errors.NoSuchFile:
1511
if self.tt.final_kind(trans_id) != "file":
1582
1513
if winner == "this":
1583
1514
executability = this_executable
1585
if self.other_tree.has_id(file_id):
1516
if other_path is not None:
1586
1517
executability = other_executable
1587
elif self.this_tree.has_id(file_id):
1518
elif this_path is not None:
1588
1519
executability = this_executable
1589
elif self.base_tree_has_id(file_id):
1520
elif base_path is not None:
1590
1521
executability = base_executable
1591
1522
if executability is not None:
1592
trans_id = self.tt.trans_id_file_id(file_id)
1593
1523
self.tt.set_executability(executability, trans_id)
1595
1525
def cook_conflicts(self, fs_conflicts):
1596
1526
"""Convert all conflicts into a form that doesn't depend on trans_id"""
1597
self.cooked_conflicts.extend(transform.cook_conflicts(
1598
fs_conflicts, self.tt))
1527
content_conflict_file_ids = set()
1528
cooked_conflicts = self.tt.cook_conflicts(fs_conflicts)
1599
1529
fp = transform.FinalPaths(self.tt)
1600
1530
for conflict in self._raw_conflicts:
1601
1531
conflict_type = conflict[0]
1602
1532
if conflict_type == 'path conflict':
1603
1533
(trans_id, file_id,
1604
this_parent, this_name,
1605
other_parent, other_name) = conflict[1:]
1534
this_parent, this_name,
1535
other_parent, other_name) = conflict[1:]
1606
1536
if this_parent is None or this_name is None:
1607
1537
this_path = '<deleted>'
1609
parent_path = fp.get_path(
1539
parent_path = fp.get_path(
1610
1540
self.tt.trans_id_file_id(this_parent))
1611
1541
this_path = osutils.pathjoin(parent_path, this_name)
1612
1542
if other_parent is None or other_name is None:
1613
1543
other_path = '<deleted>'
1615
parent_path = fp.get_path(
1616
self.tt.trans_id_file_id(other_parent))
1545
if other_parent == self.other_tree.path2id(''):
1546
# The tree transform doesn't know about the other root,
1547
# so we special case here to avoid a NoFinalPath
1551
parent_path = fp.get_path(
1552
self.tt.trans_id_file_id(other_parent))
1617
1553
other_path = osutils.pathjoin(parent_path, other_name)
1618
c = _mod_conflicts.Conflict.factory(
1554
c = _mod_bzr_conflicts.Conflict.factory(
1619
1555
'path conflict', path=this_path,
1620
1556
conflict_path=other_path,
1621
1557
file_id=file_id)
1695
1647
self._raw_conflicts.append(('text conflict', trans_id))
1696
1648
name = self.tt.final_name(trans_id)
1697
1649
parent_id = self.tt.final_parent(trans_id)
1698
file_group = self._dump_conflicts(name, parent_id, file_id,
1700
base_lines=base_lines)
1650
file_group = self._dump_conflicts(name, paths, parent_id,
1651
(base_lines, None, None),
1701
1653
file_group.append(trans_id)
1704
1656
class LCAMerger(WeaveMerger):
1706
def _generate_merge_plan(self, file_id, base):
1707
return self.this_tree.plan_file_lca_merge(file_id, self.other_tree,
1658
requires_file_merge_plan = True
1660
def _generate_merge_plan(self, this_path, base):
1661
return self.this_tree.plan_file_lca_merge(this_path, self.other_tree,
1710
1665
class Diff3Merger(Merge3Merger):
1711
1666
"""Three-way merger using external diff3 for text merging"""
1713
def dump_file(self, temp_dir, name, tree, file_id):
1668
requires_file_merge_plan = False
1670
def dump_file(self, temp_dir, name, tree, path):
1714
1671
out_path = osutils.pathjoin(temp_dir, name)
1715
out_file = open(out_path, "wb")
1717
in_file = tree.get_file(file_id)
1672
with open(out_path, "wb") as out_file:
1673
in_file = tree.get_file(path)
1718
1674
for line in in_file:
1719
1675
out_file.write(line)
1722
1676
return out_path
1724
def text_merge(self, file_id, trans_id):
1678
def text_merge(self, trans_id, paths):
1725
1679
"""Perform a diff3 merge using a specified file-id and trans-id.
1726
1680
If conflicts are encountered, .BASE, .THIS. and .OTHER conflict files
1727
1681
will be dumped, and a will be conflict noted.
1684
base_path, other_path, this_path = paths
1730
1685
temp_dir = osutils.mkdtemp(prefix="bzr-")
1732
1687
new_file = osutils.pathjoin(temp_dir, "new")
1733
this = self.dump_file(temp_dir, "this", self.this_tree, file_id)
1734
base = self.dump_file(temp_dir, "base", self.base_tree, file_id)
1735
other = self.dump_file(temp_dir, "other", self.other_tree, file_id)
1736
status = bzrlib.patch.diff3(new_file, this, base, other)
1688
this = self.dump_file(
1689
temp_dir, "this", self.this_tree, this_path)
1690
base = self.dump_file(
1691
temp_dir, "base", self.base_tree, base_path)
1692
other = self.dump_file(
1693
temp_dir, "other", self.other_tree, other_path)
1694
status = breezy.patch.diff3(new_file, this, base, other)
1737
1695
if status not in (0, 1):
1738
1696
raise errors.BzrError("Unhandled diff3 exit code")
1739
f = open(new_file, 'rb')
1697
with open(new_file, 'rb') as f:
1741
1698
self.tt.create_file(f, trans_id)
1744
1699
if status == 1:
1745
1700
name = self.tt.final_name(trans_id)
1746
1701
parent_id = self.tt.final_parent(trans_id)
1747
self._dump_conflicts(name, parent_id, file_id)
1702
self._dump_conflicts(name, paths, parent_id)
1748
1703
self._raw_conflicts.append(('text conflict', trans_id))
1750
1705
osutils.rmtree(temp_dir)
1708
class PathNotInTree(errors.BzrError):
1710
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1712
def __init__(self, path, tree):
1713
errors.BzrError.__init__(self, path=path, tree=tree)
1716
class MergeIntoMerger(Merger):
1717
"""Merger that understands other_tree will be merged into a subdir.
1719
This also changes the Merger api so that it uses real Branch, revision_id,
1720
and RevisonTree objects, rather than using revision specs.
1723
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1724
source_subpath, other_rev_id=None):
1725
"""Create a new MergeIntoMerger object.
1727
source_subpath in other_tree will be effectively copied to
1728
target_subdir in this_tree.
1730
:param this_tree: The tree that we will be merging into.
1731
:param other_branch: The Branch we will be merging from.
1732
:param other_tree: The RevisionTree object we want to merge.
1733
:param target_subdir: The relative path where we want to merge
1734
other_tree into this_tree
1735
:param source_subpath: The relative path specifying the subtree of
1736
other_tree to merge into this_tree.
1738
# It is assumed that we are merging a tree that is not in our current
1739
# ancestry, which means we are using the "EmptyTree" as our basis.
1740
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1741
_mod_revision.NULL_REVISION)
1742
super(MergeIntoMerger, self).__init__(
1743
this_branch=this_tree.branch,
1744
this_tree=this_tree,
1745
other_tree=other_tree,
1746
base_tree=null_ancestor_tree,
1748
self._target_subdir = target_subdir
1749
self._source_subpath = source_subpath
1750
self.other_branch = other_branch
1751
if other_rev_id is None:
1752
other_rev_id = other_tree.get_revision_id()
1753
self.other_rev_id = self.other_basis = other_rev_id
1754
self.base_is_ancestor = True
1755
self.backup_files = True
1756
self.merge_type = Merge3Merger
1757
self.show_base = False
1758
self.reprocess = False
1759
self.interesting_files = None
1760
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1761
target_subdir=self._target_subdir,
1762
source_subpath=self._source_subpath)
1763
if self._source_subpath != '':
1764
# If this isn't a partial merge make sure the revisions will be
1766
self._maybe_fetch(self.other_branch, self.this_branch,
1769
def set_pending(self):
1770
if self._source_subpath != '':
1772
Merger.set_pending(self)
1775
class _MergeTypeParameterizer(object):
1776
"""Wrap a merge-type class to provide extra parameters.
1778
This is hack used by MergeIntoMerger to pass some extra parameters to its
1779
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1780
the 'merge_type' member. It is difficult override do_merge without
1781
re-writing the whole thing, so instead we create a wrapper which will pass
1782
the extra parameters.
1785
def __init__(self, merge_type, **kwargs):
1786
self._extra_kwargs = kwargs
1787
self._merge_type = merge_type
1789
def __call__(self, *args, **kwargs):
1790
kwargs.update(self._extra_kwargs)
1791
return self._merge_type(*args, **kwargs)
1793
def __getattr__(self, name):
1794
return getattr(self._merge_type, name)
1797
class MergeIntoMergeType(Merge3Merger):
1798
"""Merger that incorporates a tree (or part of a tree) into another."""
1800
def __init__(self, *args, **kwargs):
1801
"""Initialize the merger object.
1803
:param args: See Merge3Merger.__init__'s args.
1804
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1805
source_subpath and target_subdir.
1806
:keyword source_subpath: The relative path specifying the subtree of
1807
other_tree to merge into this_tree.
1808
:keyword target_subdir: The relative path where we want to merge
1809
other_tree into this_tree
1811
# All of the interesting work happens during Merge3Merger.__init__(),
1812
# so we have have to hack in to get our extra parameters set.
1813
self._source_subpath = kwargs.pop('source_subpath')
1814
self._target_subdir = kwargs.pop('target_subdir')
1815
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1817
def _compute_transform(self):
1818
with ui.ui_factory.nested_progress_bar() as child_pb:
1819
entries = self._entries_to_incorporate()
1820
entries = list(entries)
1821
for num, (entry, parent_id, relpath) in enumerate(entries):
1822
child_pb.update(gettext('Preparing file merge'),
1824
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1825
path = osutils.pathjoin(self._source_subpath, relpath)
1826
trans_id = transform.new_by_entry(path, self.tt, entry,
1827
parent_trans_id, self.other_tree)
1828
self._finish_computing_transform()
1830
def _entries_to_incorporate(self):
1831
"""Yields pairs of (inventory_entry, new_parent)."""
1832
subdir_id = self.other_tree.path2id(self._source_subpath)
1833
if subdir_id is None:
1834
# XXX: The error would be clearer if it gave the URL of the source
1835
# branch, but we don't have a reference to that here.
1836
raise PathNotInTree(self._source_subpath, "Source tree")
1837
subdir = next(self.other_tree.iter_entries_by_dir(
1838
specific_files=[self._source_subpath]))[1]
1839
parent_in_target = osutils.dirname(self._target_subdir)
1840
target_id = self.this_tree.path2id(parent_in_target)
1841
if target_id is None:
1842
raise PathNotInTree(self._target_subdir, "Target tree")
1843
name_in_target = osutils.basename(self._target_subdir)
1844
merge_into_root = subdir.copy()
1845
merge_into_root.name = name_in_target
1847
self.this_tree.id2path(merge_into_root.file_id)
1848
except errors.NoSuchId:
1851
# Give the root a new file-id.
1852
# This can happen fairly easily if the directory we are
1853
# incorporating is the root, and both trees have 'TREE_ROOT' as
1854
# their root_id. Users will expect this to Just Work, so we
1855
# change the file-id here.
1856
# Non-root file-ids could potentially conflict too. That's really
1857
# an edge case, so we don't do anything special for those. We let
1858
# them cause conflicts.
1859
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1860
yield (merge_into_root, target_id, '')
1861
if subdir.kind != 'directory':
1862
# No children, so we are done.
1864
for path, entry in self.other_tree.root_inventory.iter_entries_by_dir(subdir_id):
1865
parent_id = entry.parent_id
1866
if parent_id == subdir.file_id:
1867
# The root's parent ID has changed, so make sure children of
1868
# the root refer to the new ID.
1869
parent_id = merge_into_root.file_id
1870
yield (entry, parent_id, path)
1753
1873
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1754
1874
backup_files=False,
1755
1875
merge_type=Merge3Merger,
1756
interesting_ids=None,
1757
1876
show_base=False,
1758
1877
reprocess=False,
1759
1878
other_rev_id=None,
1760
1879
interesting_files=None,
1761
1880
this_tree=None,
1763
1881
change_reporter=None):
1764
1882
"""Primary interface for merging.
1766
typical use is probably
1767
'merge_inner(branch, branch.get_revision_tree(other_revision),
1768
branch.get_revision_tree(base_revision))'
1884
Typical use is probably::
1886
merge_inner(branch, branch.get_revision_tree(other_revision),
1887
branch.get_revision_tree(base_revision))
1770
1889
if this_tree is None:
1771
raise errors.BzrError("bzrlib.merge.merge_inner requires a this_tree "
1772
"parameter as of bzrlib version 0.8.")
1890
raise errors.BzrError("breezy.merge.merge_inner requires a this_tree "
1773
1892
merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
1774
pb=pb, change_reporter=change_reporter)
1893
change_reporter=change_reporter)
1775
1894
merger.backup_files = backup_files
1776
1895
merger.merge_type = merge_type
1777
merger.interesting_ids = interesting_ids
1778
1896
merger.ignore_zero = ignore_zero
1779
if interesting_files:
1781
raise ValueError('Only supply interesting_ids'
1782
' or interesting_files')
1783
merger.interesting_files = interesting_files
1897
merger.interesting_files = interesting_files
1784
1898
merger.show_base = show_base
1785
1899
merger.reprocess = reprocess
1786
1900
merger.other_rev_id = other_rev_id
added
removed
breezy/merge.py
