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(), """
24
20
branch as _mod_branch,
26
21
conflicts as _mod_conflicts,
28
25
graph as _mod_graph,
31
30
revision as _mod_revision,
39
from breezy.bzr import (
40
conflicts as _mod_bzr_conflicts,
44
from breezy.i18n import gettext
46
from breezy.bzr.conflicts import Conflict as BzrConflict
39
from bzrlib.cleanup import OperationWithCleanups
40
from bzrlib.symbol_versioning import (
57
44
# TODO: Report back as changes are merged in
60
def transform_tree(from_tree, to_tree, interesting_files=None):
61
with from_tree.lock_tree_write():
62
merge_inner(from_tree.branch, to_tree, from_tree,
63
ignore_zero=True, this_tree=from_tree,
64
interesting_files=interesting_files)
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)
67
55
class MergeHooks(hooks.Hooks):
69
57
def __init__(self):
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 "
73
"merge object when starting a merge. "
74
"Should return either None or a subclass of "
75
"``breezy.merge.AbstractPerFileMerger``. "
76
"Such objects will then be called per file "
77
"that needs to be merged (including when one "
78
"side has deleted the file and the other has changed it). "
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.',
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 "
93
72
class AbstractPerFileMerger(object):
94
"""PerFileMerger objects are used by plugins extending merge for breezy.
96
See ``breezy.plugins.news_merge.news_merge`` for an example concrete class.
73
"""PerFileMerger objects are used by plugins extending merge for bzrlib.
75
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
98
77
:ivar merger: The Merge3Merger performing the merge.
437
435
revision_id = _mod_revision.ensure_null(revision_id)
438
436
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
440
486
def set_interesting_files(self, file_list):
441
487
self.interesting_files = file_list
443
489
def set_pending(self):
444
490
if (not self.base_is_ancestor or not self.base_is_other_ancestor
445
or self.other_rev_id is None):
491
or self.other_rev_id is None):
447
493
self._add_parent()
449
495
def _add_parent(self):
450
496
new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
451
497
new_parent_trees = []
452
with cleanup.ExitStack() as stack:
453
for revision_id in new_parents:
455
tree = self.revision_tree(revision_id)
456
except errors.NoSuchRevision:
459
stack.enter_context(tree.lock_read())
460
new_parent_trees.append((revision_id, tree))
461
self.this_tree.set_parent_trees(new_parent_trees, allow_leftmost_as_ghost=True)
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)
463
510
def set_other(self, other_revision, possible_transports=None):
464
511
"""Set the revision and tree to merge from.
757
792
self.cherrypick = cherrypick
796
warnings.warn("pp argument to Merge3Merger is deprecated")
798
warnings.warn("pb argument to Merge3Merger is deprecated")
761
800
def do_merge(self):
762
with cleanup.ExitStack() as stack:
763
stack.enter_context(self.working_tree.lock_tree_write())
764
stack.enter_context(self.this_tree.lock_read())
765
stack.enter_context(self.base_tree.lock_read())
766
stack.enter_context(self.other_tree.lock_read())
767
self.tt = self.working_tree.transform()
768
stack.enter_context(self.tt)
769
self._compute_transform()
770
results = self.tt.apply(no_conflicts=True)
771
self.write_modified(results)
773
self.working_tree.add_conflicts(self.cooked_conflicts)
774
except errors.UnsupportedOperation:
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:
777
821
def make_preview_transform(self):
778
with self.base_tree.lock_read(), self.other_tree.lock_read():
779
self.tt = self.working_tree.preview_transform()
780
self._compute_transform()
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()
783
834
def _compute_transform(self):
784
835
if self._lca_trees is None:
785
entries = list(self._entries3())
836
entries = self._entries3()
786
837
resolver = self._three_way
788
entries = list(self._entries_lca())
839
entries = self._entries_lca()
789
840
resolver = self._lca_multi_way
790
# Prepare merge hooks
791
factories = Merger.hooks['merge_file_content']
792
# One hook for each registered one plus our default merger
793
hooks = [factory(self) for factory in factories] + [self]
794
self.active_hooks = [hook for hook in hooks if hook is not None]
795
with ui.ui_factory.nested_progress_bar() as child_pb:
796
for num, (file_id, changed, paths3, parents3, names3,
797
executable3, copied) in enumerate(entries):
799
# Treat copies as simple adds for now
800
paths3 = (None, paths3[1], None)
801
parents3 = (None, parents3[1], None)
802
names3 = (None, names3[1], None)
803
executable3 = (None, executable3[1], None)
806
trans_id = self.tt.trans_id_file_id(file_id)
807
# Try merging each entry
808
child_pb.update(gettext('Preparing file merge'),
810
self._merge_names(trans_id, file_id, paths3, parents3,
811
names3, resolver=resolver)
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,
847
executable3) in enumerate(entries):
848
child_pb.update('Preparing file merge', num, len(entries))
849
self._merge_names(file_id, parents3, names3, resolver=resolver)
813
file_status = self._do_merge_contents(paths3, trans_id, file_id)
851
file_status = self._do_merge_contents(file_id)
815
853
file_status = 'unmodified'
816
self._merge_executable(paths3, trans_id, executable3,
817
file_status, resolver=resolver)
818
self.tt.fixup_new_roots()
819
self._finish_computing_transform()
821
def _finish_computing_transform(self):
822
"""Finalize the transform and report the changes.
824
This is the second half of _compute_transform.
826
with ui.ui_factory.nested_progress_bar() as child_pb:
827
fs_conflicts = transform.resolve_conflicts(
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,
829
862
lambda t, c: transform.conflict_pass(t, c, self.other_tree))
830
865
if self.change_reporter is not None:
831
from breezy import delta
866
from bzrlib import delta
832
867
delta.report_changes(
833
868
self.tt.iter_changes(), self.change_reporter)
834
869
self.cook_conflicts(fs_conflicts)
835
870
for conflict in self.cooked_conflicts:
836
trace.warning('%s', conflict.describe())
871
trace.warning(conflict)
838
873
def _entries3(self):
839
874
"""Gather data about files modified between three trees.
844
879
other and this. names3 is a tuple of names for base, other and this.
845
880
executable3 is a tuple of execute-bit values for base, other and this.
847
883
iterator = self.other_tree.iter_changes(self.base_tree,
848
specific_files=self.interesting_files,
849
extra_trees=[self.this_tree])
850
this_interesting_files = self.this_tree.find_related_paths_across_trees(
851
self.interesting_files, trees=[self.other_tree])
852
this_entries = dict(self.this_tree.iter_entries_by_dir(
853
specific_files=this_interesting_files))
854
for change in iterator:
855
if change.path[0] is not None:
856
this_path = _mod_tree.find_previous_path(
857
self.base_tree, self.this_tree, change.path[0])
859
this_path = _mod_tree.find_previous_path(
860
self.other_tree, self.this_tree, change.path[1])
861
this_entry = this_entries.get(this_path)
862
if this_entry is not None:
863
this_name = this_entry.name
864
this_parent = this_entry.parent_id
865
this_executable = this_entry.executable
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
868
901
this_parent = None
869
902
this_executable = None
870
parents3 = change.parent_id + (this_parent,)
871
names3 = change.name + (this_name,)
872
paths3 = change.path + (this_path, )
873
executable3 = change.executable + (this_executable,)
875
(change.file_id, change.changed_content, paths3,
876
parents3, names3, executable3, change.copied))
903
parents3 = parents + (this_parent,)
904
names3 = names + (this_name,)
905
executable3 = executable + (this_executable,)
906
result.append((file_id, changed, parents3, names3, executable3))
878
909
def _entries_lca(self):
879
910
"""Gather data about files modified between multiple trees.
882
913
it then compares with THIS and BASE.
884
915
For the multi-valued entries, the format will be (BASE, [lca1, lca2])
886
:return: [(file_id, changed, paths, parents, names, executable, copied)], where:
888
* file_id: Simple file_id of the entry
889
* changed: Boolean, True if the kind or contents changed else False
890
* paths: ((base, [path, in, lcas]), path_other, path_this)
891
* parents: ((base, [parent_id, in, lcas]), parent_id_other,
893
* names: ((base, [name, in, lcas]), name_in_other, name_in_this)
894
* executable: ((base, [exec, in, lcas]), exec_in_other,
916
:return: [(file_id, changed, parents, names, executable)]
917
file_id Simple file_id of the entry
918
changed Boolean, True if the kind or contents changed
920
parents ((base, [parent_id, in, lcas]), parent_id_other,
922
names ((base, [name, in, lcas]), name_in_other, name_in_this)
923
executable ((base, [exec, in, lcas]), exec_in_other, exec_in_this)
897
925
if self.interesting_files is not None:
898
926
lookup_trees = [self.this_tree, self.base_tree]
899
927
lookup_trees.extend(self._lca_trees)
900
928
# I think we should include the lca trees as well
901
interesting_files = self.other_tree.find_related_paths_across_trees(
902
self.interesting_files, lookup_trees)
929
interesting_ids = self.other_tree.paths2ids(self.interesting_files,
904
interesting_files = None
905
from .multiwalker import MultiWalker
906
walker = MultiWalker(self.other_tree, self._lca_trees)
932
interesting_ids = self.interesting_ids
934
walker = _mod_tree.MultiWalker(self.other_tree, self._lca_trees)
908
for other_path, file_id, other_ie, lca_values in walker.iter_all():
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():
909
939
# Is this modified at all from any of the other trees?
910
940
if other_ie is None:
911
941
other_ie = _none_entry
913
if interesting_files is not None and other_path not in interesting_files:
942
if interesting_ids is not None and file_id not in interesting_ids:
916
945
# If other_revision is found in any of the lcas, that means this
1005
1023
(base_ie.executable, lca_executable),
1006
1024
other_ie.executable, this_ie.executable)
1007
1025
if (parent_id_winner == 'this' and name_winner == 'this'
1008
and sha1_winner == 'this' and exec_winner == 'this'):
1026
and sha1_winner == 'this' and exec_winner == 'this'):
1009
1027
# No kind, parent, name, exec, or content change for
1010
1028
# OTHER, so this node is not considered interesting
1012
1030
if sha1_winner == 'this':
1013
1031
content_changed = False
1014
1032
elif other_ie.kind == 'symlink':
1015
def get_target(ie, tree, path):
1033
def get_target(ie, tree):
1016
1034
if ie.kind != 'symlink':
1018
return tree.get_symlink_target(path)
1019
base_target = get_target(base_ie, self.base_tree, base_path)
1020
lca_targets = [get_target(ie, tree, lca_path) for ie, tree, lca_path
1021
in zip(lca_entries, self._lca_trees, lca_paths)]
1022
this_target = get_target(
1023
this_ie, self.this_tree, this_path)
1024
other_target = get_target(
1025
other_ie, self.other_tree, other_path)
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)
1026
1042
target_winner = self._lca_multi_way(
1027
1043
(base_target, lca_targets),
1028
1044
other_target, this_target)
1029
1045
if (parent_id_winner == 'this' and name_winner == 'this'
1030
and target_winner == 'this'):
1046
and target_winner == 'this'):
1031
1047
# No kind, parent, name, or symlink target change
1032
1048
# not interesting
1045
1061
raise AssertionError('unhandled kind: %s' % other_ie.kind)
1047
1063
# If we have gotten this far, that means something has changed
1048
yield (file_id, content_changed,
1049
((base_path, lca_paths),
1050
other_path, this_path),
1064
result.append((file_id, content_changed,
1051
1065
((base_ie.parent_id, lca_parent_ids),
1052
1066
other_ie.parent_id, this_ie.parent_id),
1053
1067
((base_ie.name, lca_names),
1054
1068
other_ie.name, this_ie.name),
1055
1069
((base_ie.executable, lca_executable),
1056
other_ie.executable, this_ie.executable),
1057
# Copy detection is not yet supported, so nothing is
1070
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)
1062
1122
def write_modified(self, results):
1063
if not self.working_tree.supports_merge_modified():
1065
1123
modified_hashes = {}
1066
1124
for path in results.modified_paths:
1067
wt_relpath = self.working_tree.relpath(path)
1068
if not self.working_tree.is_versioned(wt_relpath):
1125
file_id = self.this_tree.path2id(self.this_tree.relpath(path))
1070
hash = self.working_tree.get_file_sha1(wt_relpath)
1128
hash = self.this_tree.get_file_sha1(file_id)
1071
1129
if hash is None:
1073
modified_hashes[wt_relpath] = hash
1074
self.working_tree.set_merge_modified(modified_hashes)
1131
modified_hashes[file_id] = hash
1132
self.this_tree.set_merge_modified(modified_hashes)
1135
def parent(entry, file_id):
1078
1136
"""Determine the parent for a file_id (used as a key method)"""
1079
1137
if entry is None:
1081
1139
return entry.parent_id
1142
def name(entry, file_id):
1085
1143
"""Determine the name for a file_id (used as a key method)"""
1086
1144
if entry is None:
1088
1146
return entry.name
1091
def contents_sha1(tree, path):
1149
def contents_sha1(tree, file_id):
1092
1150
"""Determine the sha1 of the file contents (used as a key method)."""
1094
return tree.get_file_sha1(path)
1095
except errors.NoSuchFile:
1151
if file_id not in tree:
1153
return tree.get_file_sha1(file_id)
1099
def executable(tree, path):
1156
def executable(tree, file_id):
1100
1157
"""Determine the executability of a file-id (used as a key method)."""
1102
if tree.kind(path) != "file":
1104
except errors.NoSuchFile:
1158
if not tree.has_id(file_id):
1106
return tree.is_executable(path)
1160
if tree.kind(file_id) != "file":
1162
return tree.is_executable(file_id)
1109
def kind(tree, path):
1165
def kind(tree, file_id):
1110
1166
"""Determine the kind of a file-id (used as a key method)."""
1112
return tree.kind(path)
1113
except errors.NoSuchFile:
1167
if not tree.has_id(file_id):
1169
return tree.kind(file_id)
1117
1172
def _three_way(base, other, this):
1199
1295
# Creating helpers (.OTHER or .THIS) here cause problems down the
1200
1296
# road if a ContentConflict needs to be created so we should not do
1298
trans_id = self.tt.trans_id_file_id(file_id)
1202
1299
self._raw_conflicts.append(('path conflict', trans_id, file_id,
1203
1300
this_parent, this_name,
1204
1301
other_parent, other_name))
1205
if other_path is None:
1302
if other_name is None:
1206
1303
# it doesn't matter whether the result was 'other' or
1207
# 'conflict'-- if it has no file id, we leave it alone.
1304
# 'conflict'-- if there's no 'other', we leave it alone.
1209
1306
parent_id = parents[self.winner_idx[parent_id_winner]]
1210
name = names[self.winner_idx[name_winner]]
1211
if parent_id is not None or name is not None:
1307
if parent_id is not None:
1212
1308
# if we get here, name_winner and parent_winner are set to safe
1214
if parent_id is None and name is not None:
1215
# if parent_id is None and name is non-None, current file is
1217
if names[self.winner_idx[parent_id_winner]] != '':
1218
raise AssertionError(
1219
'File looks like a root, but named %s' %
1220
names[self.winner_idx[parent_id_winner]])
1221
parent_trans_id = transform.ROOT_PARENT
1223
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1224
self.tt.adjust_path(name, parent_trans_id, trans_id)
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))
1226
def _do_merge_contents(self, paths, trans_id, file_id):
1314
def _do_merge_contents(self, file_id):
1227
1315
"""Performs a merge on file_id contents."""
1228
def contents_pair(tree, path):
1232
kind = tree.kind(path)
1233
except errors.NoSuchFile:
1316
def contents_pair(tree):
1317
if file_id not in tree:
1319
kind = tree.kind(file_id)
1235
1320
if kind == "file":
1236
contents = tree.get_file_sha1(path)
1321
contents = tree.get_file_sha1(file_id)
1237
1322
elif kind == "symlink":
1238
contents = tree.get_symlink_target(path)
1323
contents = tree.get_symlink_target(file_id)
1240
1325
contents = None
1241
1326
return kind, contents
1243
base_path, other_path, this_path = paths
1244
1328
# See SPOT run. run, SPOT, run.
1245
1329
# So we're not QUITE repeating ourselves; we do tricky things with
1247
other_pair = contents_pair(self.other_tree, other_path)
1248
this_pair = contents_pair(self.this_tree, this_path)
1331
base_pair = contents_pair(self.base_tree)
1332
other_pair = contents_pair(self.other_tree)
1249
1333
if self._lca_trees:
1250
(base_path, lca_paths) = base_path
1251
base_pair = contents_pair(self.base_tree, base_path)
1252
lca_pairs = [contents_pair(tree, path)
1253
for tree, path in zip(self._lca_trees, lca_paths)]
1334
this_pair = contents_pair(self.this_tree)
1335
lca_pairs = [contents_pair(tree) for tree in self._lca_trees]
1254
1336
winner = self._lca_multi_way((base_pair, lca_pairs), other_pair,
1255
1337
this_pair, allow_overriding_lca=False)
1257
base_pair = contents_pair(self.base_tree, base_path)
1258
1339
if base_pair == other_pair:
1259
1340
winner = 'this'
1261
1342
# We delayed evaluating this_pair as long as we can to avoid
1262
1343
# unnecessary sha1 calculation
1263
this_pair = contents_pair(self.this_tree, this_path)
1344
this_pair = contents_pair(self.this_tree)
1264
1345
winner = self._three_way(base_pair, other_pair, this_pair)
1265
1346
if winner == 'this':
1266
1347
# No interesting changes introduced by OTHER
1267
1348
return "unmodified"
1268
1349
# We have a hypothetical conflict, but if we have files, then we
1269
1350
# can try to merge the content
1270
params = MergeFileHookParams(
1271
self, (base_path, other_path, this_path), trans_id, this_pair[0],
1351
trans_id = self.tt.trans_id_file_id(file_id)
1352
params = MergeHookParams(self, file_id, trans_id, this_pair[0],
1272
1353
other_pair[0], winner)
1273
1354
hooks = self.active_hooks
1274
1355
hook_status = 'not_applicable'
1277
1358
if hook_status != 'not_applicable':
1278
1359
# Don't try any more hooks, this one applies.
1280
# If the merge ends up replacing the content of the file, we get rid of
1281
# it at the end of this method (this variable is used to track the
1282
# exceptions to this rule).
1284
1361
result = "modified"
1285
1362
if hook_status == 'not_applicable':
1286
# No merge hook was able to resolve the situation. Two cases exist:
1287
# a content conflict or a duplicate one.
1363
# This is a contents conflict, because none of the available
1364
# functions could merge it.
1289
1366
name = self.tt.final_name(trans_id)
1290
1367
parent_id = self.tt.final_parent(trans_id)
1291
inhibit_content_conflict = False
1292
if params.this_kind is None: # file_id is not in THIS
1293
# Is the name used for a different file_id ?
1294
if self.this_tree.is_versioned(other_path):
1295
# Two entries for the same path
1297
# versioning the merged file will trigger a duplicate
1299
self.tt.version_file(trans_id, file_id=file_id)
1300
transform.create_from_tree(
1301
self.tt, trans_id, self.other_tree,
1303
filter_tree_path=self._get_filter_tree_path(other_path))
1304
inhibit_content_conflict = True
1305
elif params.other_kind is None: # file_id is not in OTHER
1306
# Is the name used for a different file_id ?
1307
if self.other_tree.is_versioned(this_path):
1308
# Two entries for the same path again, but here, the other
1309
# entry will also be merged. We simply inhibit the
1310
# 'content' conflict creation because we know OTHER will
1311
# create (or has already created depending on ordering) an
1312
# entry at the same path. This will trigger a 'duplicate'
1315
inhibit_content_conflict = True
1316
if not inhibit_content_conflict:
1317
if params.this_kind is not None:
1318
self.tt.unversion_file(trans_id)
1319
# This is a contents conflict, because none of the available
1320
# functions could merge it.
1321
file_group = self._dump_conflicts(
1322
name, (base_path, other_path, this_path), parent_id)
1323
for tid in file_group:
1324
self.tt.version_file(tid, file_id=file_id)
1326
self._raw_conflicts.append(('contents conflict', file_group))
1368
if self.this_tree.has_id(file_id):
1369
self.tt.unversion_file(trans_id)
1370
file_group = self._dump_conflicts(name, parent_id, file_id,
1372
self._raw_conflicts.append(('contents conflict', file_group))
1327
1373
elif hook_status == 'success':
1328
1374
self.tt.create_file(lines, trans_id)
1329
1375
elif hook_status == 'conflicted':
1346
1391
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1347
if not this_path and result == "modified":
1348
self.tt.version_file(trans_id, file_id=file_id)
1350
# The merge has been performed and produced a new content, so the
1351
# old contents should not be retained.
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
1352
1397
self.tt.delete_contents(trans_id)
1398
except errors.NoSuchFile:
1355
1402
def _default_other_winner_merge(self, merge_hook_params):
1356
1403
"""Replace this contents with other."""
1404
file_id = merge_hook_params.file_id
1357
1405
trans_id = merge_hook_params.trans_id
1358
if merge_hook_params.other_path is not None:
1406
file_in_this = self.this_tree.has_id(file_id)
1407
if self.other_tree.has_id(file_id):
1359
1408
# OTHER changed the file
1360
transform.create_from_tree(
1361
self.tt, trans_id, self.other_tree,
1362
merge_hook_params.other_path,
1363
filter_tree_path=self._get_filter_tree_path(merge_hook_params.other_path))
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)
1364
1425
return 'done', None
1365
elif merge_hook_params.this_path is not None:
1366
1427
# OTHER deleted the file
1367
1428
return 'delete', None
1369
1430
raise AssertionError(
1370
'winner is OTHER, but file %r not in THIS or OTHER tree'
1371
% (merge_hook_params.base_path,))
1431
'winner is OTHER, but file_id %r not in THIS or OTHER tree'
1373
1434
def merge_contents(self, merge_hook_params):
1374
1435
"""Fallback merge logic after user installed hooks."""
1375
1436
# This function is used in merge hooks as the fallback instance.
1376
# Perhaps making this function and the functions it calls be a
1437
# Perhaps making this function and the functions it calls be a
1377
1438
# a separate class would be better.
1378
1439
if merge_hook_params.winner == 'other':
1379
1440
# OTHER is a straight winner, so replace this contents with other
1383
1444
# BASE is a file, or both converted to files, so at least we
1384
1445
# have agreement that output should be a file.
1386
self.text_merge(merge_hook_params.trans_id,
1387
merge_hook_params.paths)
1447
self.text_merge(merge_hook_params.file_id,
1448
merge_hook_params.trans_id)
1388
1449
except errors.BinaryFile:
1389
1450
return 'not_applicable', None
1390
1451
return 'done', None
1392
1453
return 'not_applicable', None
1394
def get_lines(self, tree, path):
1455
def get_lines(self, tree, file_id):
1395
1456
"""Return the lines in a file, or an empty list."""
1399
kind = tree.kind(path)
1400
except errors.NoSuchFile:
1457
if tree.has_id(file_id):
1458
return tree.get_file(file_id).readlines()
1405
return tree.get_file_lines(path)
1407
def text_merge(self, trans_id, paths):
1408
"""Perform a three-way text merge on a file"""
1462
def text_merge(self, file_id, trans_id):
1463
"""Perform a three-way text merge on a file_id"""
1409
1464
# it's possible that we got here with base as a different type.
1410
1465
# if so, we just want two-way text conflicts.
1411
base_path, other_path, this_path = paths
1412
base_lines = self.get_lines(self.base_tree, base_path)
1413
other_lines = self.get_lines(self.other_tree, other_path)
1414
this_lines = self.get_lines(self.this_tree, this_path)
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)
1415
1473
m3 = merge3.Merge3(base_lines, this_lines, other_lines,
1416
1474
is_cherrypick=self.cherrypick)
1417
start_marker = b"!START OF MERGE CONFLICT!" + b"I HOPE THIS IS UNIQUE"
1475
start_marker = "!START OF MERGE CONFLICT!" + "I HOPE THIS IS UNIQUE"
1418
1476
if self.show_base is True:
1419
base_marker = b'|' * 7
1477
base_marker = '|' * 7
1421
1479
base_marker = None
1423
1481
def iter_merge3(retval):
1424
1482
retval["text_conflicts"] = False
1425
for line in m3.merge_lines(name_a=b"TREE",
1426
name_b=b"MERGE-SOURCE",
1427
name_base=b"BASE-REVISION",
1483
for line in m3.merge_lines(name_a = "TREE",
1484
name_b = "MERGE-SOURCE",
1485
name_base = "BASE-REVISION",
1428
1486
start_marker=start_marker,
1429
1487
base_marker=base_marker,
1430
1488
reprocess=self.reprocess):
1431
1489
if line.startswith(start_marker):
1432
1490
retval["text_conflicts"] = True
1433
yield line.replace(start_marker, b'<' * 7)
1491
yield line.replace(start_marker, '<' * 7)
1440
1498
self._raw_conflicts.append(('text conflict', trans_id))
1441
1499
name = self.tt.final_name(trans_id)
1442
1500
parent_id = self.tt.final_parent(trans_id)
1443
file_group = self._dump_conflicts(
1444
name, paths, parent_id,
1445
lines=(base_lines, other_lines, this_lines))
1501
file_group = self._dump_conflicts(name, parent_id, file_id,
1502
this_lines, base_lines,
1446
1504
file_group.append(trans_id)
1448
def _get_filter_tree_path(self, path):
1449
if self.this_tree.supports_content_filtering():
1450
# We get the path from the working tree if it exists.
1451
# That fails though when OTHER is adding a file, so
1452
# we fall back to the other tree to find the path if
1453
# it doesn't exist locally.
1454
filter_path = _mod_tree.find_previous_path(
1455
self.other_tree, self.working_tree, path)
1456
if filter_path is None:
1459
# Skip the lookup for older formats
1462
def _dump_conflicts(self, name, paths, parent_id, lines=None,
1506
def _dump_conflicts(self, name, parent_id, file_id, this_lines=None,
1507
base_lines=None, other_lines=None, set_version=False,
1463
1508
no_base=False):
1464
1509
"""Emit conflict files.
1465
1510
If this_lines, base_lines, or other_lines are omitted, they will be
1466
1511
determined automatically. If set_version is true, the .OTHER, .THIS
1467
1512
or .BASE (in that order) will be created as versioned files.
1469
base_path, other_path, this_path = paths
1471
base_lines, other_lines, this_lines = lines
1473
base_lines = other_lines = this_lines = None
1474
data = [('OTHER', self.other_tree, other_path, other_lines),
1475
('THIS', self.this_tree, this_path, this_lines)]
1514
data = [('OTHER', self.other_tree, other_lines),
1515
('THIS', self.this_tree, this_lines)]
1476
1516
if not no_base:
1477
data.append(('BASE', self.base_tree, base_path, base_lines))
1517
data.append(('BASE', self.base_tree, base_lines))
1479
1519
# We need to use the actual path in the working tree of the file here,
1480
if self.this_tree.supports_content_filtering():
1481
filter_tree_path = this_path
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
1529
# Skip the id2path lookup for older formats
1483
1530
filter_tree_path = None
1485
1533
file_group = []
1486
for suffix, tree, path, lines in data:
1487
if path is not None:
1488
trans_id = self._conflict_file(
1489
name, parent_id, path, tree, suffix, lines,
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)
1491
1538
file_group.append(trans_id)
1539
if set_version and not versioned:
1540
self.tt.version_file(file_id, trans_id)
1492
1542
return file_group
1494
def _conflict_file(self, name, parent_id, path, tree, suffix,
1544
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1495
1545
lines=None, filter_tree_path=None):
1496
1546
"""Emit a single conflict file."""
1497
1547
name = name + '.' + suffix
1498
1548
trans_id = self.tt.create_path(name, parent_id)
1499
transform.create_from_tree(
1500
self.tt, trans_id, tree, path,
1502
filter_tree_path=filter_tree_path)
1549
transform.create_from_tree(self.tt, trans_id, tree, file_id, lines,
1503
1551
return trans_id
1505
def _merge_executable(self, paths, trans_id, executable, file_status,
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,
1507
1562
"""Perform a merge on the execute bit."""
1508
1563
base_executable, other_executable, this_executable = executable
1509
base_path, other_path, this_path = paths
1510
1564
if file_status == "deleted":
1512
1566
winner = resolver(*executable)
1513
1567
if winner == "conflict":
1514
# There must be a None in here, if we have a conflict, but we
1515
# need executability since file status was not deleted.
1516
if other_path is None:
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:
1517
1571
winner = "this"
1519
1573
winner = "other"
1520
1574
if winner == 'this' and file_status != "modified":
1522
if self.tt.final_kind(trans_id) != "file":
1576
trans_id = self.tt.trans_id_file_id(file_id)
1578
if self.tt.final_kind(trans_id) != "file":
1580
except errors.NoSuchFile:
1524
1582
if winner == "this":
1525
1583
executability = this_executable
1527
if other_path is not None:
1585
if self.other_tree.has_id(file_id):
1528
1586
executability = other_executable
1529
elif this_path is not None:
1587
elif self.this_tree.has_id(file_id):
1530
1588
executability = this_executable
1531
elif base_path is not None:
1589
elif self.base_tree_has_id(file_id):
1532
1590
executability = base_executable
1533
1591
if executability is not None:
1592
trans_id = self.tt.trans_id_file_id(file_id)
1534
1593
self.tt.set_executability(executability, trans_id)
1536
1595
def cook_conflicts(self, fs_conflicts):
1537
1596
"""Convert all conflicts into a form that doesn't depend on trans_id"""
1538
self.cooked_conflicts = list(self.tt.cook_conflicts(
1539
list(fs_conflicts) + self._raw_conflicts))
1597
self.cooked_conflicts.extend(transform.cook_conflicts(
1598
fs_conflicts, self.tt))
1599
fp = transform.FinalPaths(self.tt)
1600
for conflict in self._raw_conflicts:
1601
conflict_type = conflict[0]
1602
if conflict_type == 'path conflict':
1604
this_parent, this_name,
1605
other_parent, other_name) = conflict[1:]
1606
if this_parent is None or this_name is None:
1607
this_path = '<deleted>'
1609
parent_path = fp.get_path(
1610
self.tt.trans_id_file_id(this_parent))
1611
this_path = osutils.pathjoin(parent_path, this_name)
1612
if other_parent is None or other_name is None:
1613
other_path = '<deleted>'
1615
parent_path = fp.get_path(
1616
self.tt.trans_id_file_id(other_parent))
1617
other_path = osutils.pathjoin(parent_path, other_name)
1618
c = _mod_conflicts.Conflict.factory(
1619
'path conflict', path=this_path,
1620
conflict_path=other_path,
1622
elif conflict_type == 'contents conflict':
1623
for trans_id in conflict[1]:
1624
file_id = self.tt.final_file_id(trans_id)
1625
if file_id is not None:
1627
path = fp.get_path(trans_id)
1628
for suffix in ('.BASE', '.THIS', '.OTHER'):
1629
if path.endswith(suffix):
1630
path = path[:-len(suffix)]
1632
c = _mod_conflicts.Conflict.factory(conflict_type,
1633
path=path, file_id=file_id)
1634
elif conflict_type == 'text conflict':
1635
trans_id = conflict[1]
1636
path = fp.get_path(trans_id)
1637
file_id = self.tt.final_file_id(trans_id)
1638
c = _mod_conflicts.Conflict.factory(conflict_type,
1639
path=path, file_id=file_id)
1641
raise AssertionError('bad conflict type: %r' % (conflict,))
1642
self.cooked_conflicts.append(c)
1643
self.cooked_conflicts.sort(key=_mod_conflicts.Conflict.sort_key)
1542
1646
class WeaveMerger(Merge3Merger):
1593
1695
self._raw_conflicts.append(('text conflict', trans_id))
1594
1696
name = self.tt.final_name(trans_id)
1595
1697
parent_id = self.tt.final_parent(trans_id)
1596
file_group = self._dump_conflicts(name, paths, parent_id,
1597
(base_lines, None, None),
1698
file_group = self._dump_conflicts(name, parent_id, file_id,
1700
base_lines=base_lines)
1599
1701
file_group.append(trans_id)
1602
1704
class LCAMerger(WeaveMerger):
1604
requires_file_merge_plan = True
1606
def _generate_merge_plan(self, this_path, base):
1607
return self.this_tree.plan_file_lca_merge(this_path, self.other_tree,
1706
def _generate_merge_plan(self, file_id, base):
1707
return self.this_tree.plan_file_lca_merge(file_id, self.other_tree,
1611
1710
class Diff3Merger(Merge3Merger):
1612
1711
"""Three-way merger using external diff3 for text merging"""
1614
requires_file_merge_plan = False
1616
def dump_file(self, temp_dir, name, tree, path):
1713
def dump_file(self, temp_dir, name, tree, file_id):
1617
1714
out_path = osutils.pathjoin(temp_dir, name)
1618
with open(out_path, "wb") as out_file:
1619
in_file = tree.get_file(path)
1715
out_file = open(out_path, "wb")
1717
in_file = tree.get_file(file_id)
1620
1718
for line in in_file:
1621
1719
out_file.write(line)
1622
1722
return out_path
1624
def text_merge(self, trans_id, paths):
1724
def text_merge(self, file_id, trans_id):
1625
1725
"""Perform a diff3 merge using a specified file-id and trans-id.
1626
1726
If conflicts are encountered, .BASE, .THIS. and .OTHER conflict files
1627
1727
will be dumped, and a will be conflict noted.
1630
base_path, other_path, this_path = paths
1631
1730
temp_dir = osutils.mkdtemp(prefix="bzr-")
1633
1732
new_file = osutils.pathjoin(temp_dir, "new")
1634
this = self.dump_file(
1635
temp_dir, "this", self.this_tree, this_path)
1636
base = self.dump_file(
1637
temp_dir, "base", self.base_tree, base_path)
1638
other = self.dump_file(
1639
temp_dir, "other", self.other_tree, other_path)
1640
status = breezy.patch.diff3(new_file, this, base, other)
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)
1641
1737
if status not in (0, 1):
1642
1738
raise errors.BzrError("Unhandled diff3 exit code")
1643
with open(new_file, 'rb') as f:
1739
f = open(new_file, 'rb')
1644
1741
self.tt.create_file(f, trans_id)
1645
1744
if status == 1:
1646
1745
name = self.tt.final_name(trans_id)
1647
1746
parent_id = self.tt.final_parent(trans_id)
1648
self._dump_conflicts(name, paths, parent_id)
1747
self._dump_conflicts(name, parent_id, file_id)
1649
1748
self._raw_conflicts.append(('text conflict', trans_id))
1651
1750
osutils.rmtree(temp_dir)
1654
class PathNotInTree(errors.BzrError):
1656
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1658
def __init__(self, path, tree):
1659
errors.BzrError.__init__(self, path=path, tree=tree)
1662
class MergeIntoMerger(Merger):
1663
"""Merger that understands other_tree will be merged into a subdir.
1665
This also changes the Merger api so that it uses real Branch, revision_id,
1666
and RevisonTree objects, rather than using revision specs.
1669
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1670
source_subpath, other_rev_id=None):
1671
"""Create a new MergeIntoMerger object.
1673
source_subpath in other_tree will be effectively copied to
1674
target_subdir in this_tree.
1676
:param this_tree: The tree that we will be merging into.
1677
:param other_branch: The Branch we will be merging from.
1678
:param other_tree: The RevisionTree object we want to merge.
1679
:param target_subdir: The relative path where we want to merge
1680
other_tree into this_tree
1681
:param source_subpath: The relative path specifying the subtree of
1682
other_tree to merge into this_tree.
1684
# It is assumed that we are merging a tree that is not in our current
1685
# ancestry, which means we are using the "EmptyTree" as our basis.
1686
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1687
_mod_revision.NULL_REVISION)
1688
super(MergeIntoMerger, self).__init__(
1689
this_branch=this_tree.branch,
1690
this_tree=this_tree,
1691
other_tree=other_tree,
1692
base_tree=null_ancestor_tree,
1694
self._target_subdir = target_subdir
1695
self._source_subpath = source_subpath
1696
self.other_branch = other_branch
1697
if other_rev_id is None:
1698
other_rev_id = other_tree.get_revision_id()
1699
self.other_rev_id = self.other_basis = other_rev_id
1700
self.base_is_ancestor = True
1701
self.backup_files = True
1702
self.merge_type = Merge3Merger
1703
self.show_base = False
1704
self.reprocess = False
1705
self.interesting_files = None
1706
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1707
target_subdir=self._target_subdir,
1708
source_subpath=self._source_subpath)
1709
if self._source_subpath != '':
1710
# If this isn't a partial merge make sure the revisions will be
1712
self._maybe_fetch(self.other_branch, self.this_branch,
1715
def set_pending(self):
1716
if self._source_subpath != '':
1718
Merger.set_pending(self)
1721
class _MergeTypeParameterizer(object):
1722
"""Wrap a merge-type class to provide extra parameters.
1724
This is hack used by MergeIntoMerger to pass some extra parameters to its
1725
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1726
the 'merge_type' member. It is difficult override do_merge without
1727
re-writing the whole thing, so instead we create a wrapper which will pass
1728
the extra parameters.
1731
def __init__(self, merge_type, **kwargs):
1732
self._extra_kwargs = kwargs
1733
self._merge_type = merge_type
1735
def __call__(self, *args, **kwargs):
1736
kwargs.update(self._extra_kwargs)
1737
return self._merge_type(*args, **kwargs)
1739
def __getattr__(self, name):
1740
return getattr(self._merge_type, name)
1743
class MergeIntoMergeType(Merge3Merger):
1744
"""Merger that incorporates a tree (or part of a tree) into another."""
1746
def __init__(self, *args, **kwargs):
1747
"""Initialize the merger object.
1749
:param args: See Merge3Merger.__init__'s args.
1750
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1751
source_subpath and target_subdir.
1752
:keyword source_subpath: The relative path specifying the subtree of
1753
other_tree to merge into this_tree.
1754
:keyword target_subdir: The relative path where we want to merge
1755
other_tree into this_tree
1757
# All of the interesting work happens during Merge3Merger.__init__(),
1758
# so we have have to hack in to get our extra parameters set.
1759
self._source_subpath = kwargs.pop('source_subpath')
1760
self._target_subdir = kwargs.pop('target_subdir')
1761
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1763
def _compute_transform(self):
1764
with ui.ui_factory.nested_progress_bar() as child_pb:
1765
entries = self._entries_to_incorporate()
1766
entries = list(entries)
1767
for num, (entry, parent_id, relpath) in enumerate(entries):
1768
child_pb.update(gettext('Preparing file merge'),
1770
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1771
path = osutils.pathjoin(self._source_subpath, relpath)
1772
trans_id = transform.new_by_entry(path, self.tt, entry,
1773
parent_trans_id, self.other_tree)
1774
self._finish_computing_transform()
1776
def _entries_to_incorporate(self):
1777
"""Yields pairs of (inventory_entry, new_parent)."""
1778
subdir_id = self.other_tree.path2id(self._source_subpath)
1779
if subdir_id is None:
1780
# XXX: The error would be clearer if it gave the URL of the source
1781
# branch, but we don't have a reference to that here.
1782
raise PathNotInTree(self._source_subpath, "Source tree")
1783
subdir = next(self.other_tree.iter_entries_by_dir(
1784
specific_files=[self._source_subpath]))[1]
1785
parent_in_target = osutils.dirname(self._target_subdir)
1786
target_id = self.this_tree.path2id(parent_in_target)
1787
if target_id is None:
1788
raise PathNotInTree(self._target_subdir, "Target tree")
1789
name_in_target = osutils.basename(self._target_subdir)
1790
merge_into_root = subdir.copy()
1791
merge_into_root.name = name_in_target
1793
self.this_tree.id2path(merge_into_root.file_id)
1794
except errors.NoSuchId:
1797
# Give the root a new file-id.
1798
# This can happen fairly easily if the directory we are
1799
# incorporating is the root, and both trees have 'TREE_ROOT' as
1800
# their root_id. Users will expect this to Just Work, so we
1801
# change the file-id here.
1802
# Non-root file-ids could potentially conflict too. That's really
1803
# an edge case, so we don't do anything special for those. We let
1804
# them cause conflicts.
1805
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1806
yield (merge_into_root, target_id, '')
1807
if subdir.kind != 'directory':
1808
# No children, so we are done.
1810
for path, entry in self.other_tree.root_inventory.iter_entries_by_dir(subdir_id):
1811
parent_id = entry.parent_id
1812
if parent_id == subdir.file_id:
1813
# The root's parent ID has changed, so make sure children of
1814
# the root refer to the new ID.
1815
parent_id = merge_into_root.file_id
1816
yield (entry, parent_id, path)
1819
1753
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1820
1754
backup_files=False,
1821
1755
merge_type=Merge3Merger,
1756
interesting_ids=None,
1822
1757
show_base=False,
1823
1758
reprocess=False,
1824
1759
other_rev_id=None,
1825
1760
interesting_files=None,
1826
1761
this_tree=None,
1827
1763
change_reporter=None):
1828
1764
"""Primary interface for merging.
1830
Typical use is probably::
1832
merge_inner(branch, branch.get_revision_tree(other_revision),
1833
branch.get_revision_tree(base_revision))
1766
typical use is probably
1767
'merge_inner(branch, branch.get_revision_tree(other_revision),
1768
branch.get_revision_tree(base_revision))'
1835
1770
if this_tree is None:
1836
raise errors.BzrError("breezy.merge.merge_inner requires a this_tree "
1771
raise errors.BzrError("bzrlib.merge.merge_inner requires a this_tree "
1772
"parameter as of bzrlib version 0.8.")
1838
1773
merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
1839
change_reporter=change_reporter)
1774
pb=pb, change_reporter=change_reporter)
1840
1775
merger.backup_files = backup_files
1841
1776
merger.merge_type = merge_type
1777
merger.interesting_ids = interesting_ids
1842
1778
merger.ignore_zero = ignore_zero
1843
merger.interesting_files = interesting_files
1779
if interesting_files:
1781
raise ValueError('Only supply interesting_ids'
1782
' or interesting_files')
1783
merger.interesting_files = interesting_files
1844
1784
merger.show_base = show_base
1845
1785
merger.reprocess = reprocess
1846
1786
merger.other_rev_id = other_rev_id
added
removed
bzrlib/merge.py
