40
from breezy.bzr import (
44
from breezy.i18n import gettext
39
from bzrlib.cleanup import OperationWithCleanups
45
from bzrlib.symbol_versioning import (
55
49
# TODO: Report back as changes are merged in
58
def transform_tree(from_tree, to_tree, interesting_files=None):
59
with from_tree.lock_tree_write():
60
merge_inner(from_tree.branch, to_tree, from_tree,
61
ignore_zero=True, this_tree=from_tree,
62
interesting_files=interesting_files)
52
def transform_tree(from_tree, to_tree, interesting_ids=None):
53
from_tree.lock_tree_write()
54
operation = OperationWithCleanups(merge_inner)
55
operation.add_cleanup(from_tree.unlock)
56
operation.run_simple(from_tree.branch, to_tree, from_tree,
57
ignore_zero=True, interesting_ids=interesting_ids, this_tree=from_tree)
65
60
class MergeHooks(hooks.Hooks):
67
62
def __init__(self):
68
hooks.Hooks.__init__(self, "breezy.merge", "Merger.hooks")
69
self.add_hook('merge_file_content',
70
"Called with a breezy.merge.Merger object to create a per file "
71
"merge object when starting a merge. "
72
"Should return either None or a subclass of "
73
"``breezy.merge.AbstractPerFileMerger``. "
74
"Such objects will then be called per file "
75
"that needs to be merged (including when one "
76
"side has deleted the file and the other has changed it). "
77
"See the AbstractPerFileMerger API docs for details on how it is "
80
self.add_hook('pre_merge',
81
'Called before a merge. '
82
'Receives a Merger object as the single argument.',
84
self.add_hook('post_merge',
85
'Called after a merge. '
86
'Receives a Merger object as the single argument. '
87
'The return value is ignored.',
63
hooks.Hooks.__init__(self)
64
self.create_hook(hooks.HookPoint('merge_file_content',
65
"Called with a bzrlib.merge.Merger object to create a per file "
66
"merge object when starting a merge. "
67
"Should return either None or a subclass of "
68
"``bzrlib.merge.AbstractPerFileMerger``. "
69
"Such objects will then be called per file "
70
"that needs to be merged (including when one "
71
"side has deleted the file and the other has changed it). "
72
"See the AbstractPerFileMerger API docs for details on how it is "
91
77
class AbstractPerFileMerger(object):
92
"""PerFileMerger objects are used by plugins extending merge for breezy.
94
See ``breezy.plugins.news_merge.news_merge`` for an example concrete class.
78
"""PerFileMerger objects are used by plugins extending merge for bzrlib.
80
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
96
82
:ivar merger: The Merge3Merger performing the merge.
435
440
revision_id = _mod_revision.ensure_null(revision_id)
436
441
return branch, self.revision_tree(revision_id, branch)
443
@deprecated_method(deprecated_in((2, 1, 0)))
444
def ensure_revision_trees(self):
445
if self.this_revision_tree is None:
446
self.this_basis_tree = self.revision_tree(self.this_basis)
447
if self.this_basis == self.this_rev_id:
448
self.this_revision_tree = self.this_basis_tree
450
if self.other_rev_id is None:
451
other_basis_tree = self.revision_tree(self.other_basis)
452
if other_basis_tree.has_changes(self.other_tree):
453
raise errors.WorkingTreeNotRevision(self.this_tree)
454
other_rev_id = self.other_basis
455
self.other_tree = other_basis_tree
457
@deprecated_method(deprecated_in((2, 1, 0)))
458
def file_revisions(self, file_id):
459
self.ensure_revision_trees()
460
def get_id(tree, file_id):
461
revision_id = tree.inventory[file_id].revision
463
if self.this_rev_id is None:
464
if self.this_basis_tree.get_file_sha1(file_id) != \
465
self.this_tree.get_file_sha1(file_id):
466
raise errors.WorkingTreeNotRevision(self.this_tree)
468
trees = (self.this_basis_tree, self.other_tree)
469
return [get_id(tree, file_id) for tree in trees]
471
@deprecated_method(deprecated_in((2, 1, 0)))
472
def check_basis(self, check_clean, require_commits=True):
473
if self.this_basis is None and require_commits is True:
474
raise errors.BzrCommandError(
475
"This branch has no commits."
476
" (perhaps you would prefer 'bzr pull')")
479
if self.this_basis != self.this_rev_id:
480
raise errors.UncommittedChanges(self.this_tree)
482
@deprecated_method(deprecated_in((2, 1, 0)))
483
def compare_basis(self):
485
basis_tree = self.revision_tree(self.this_tree.last_revision())
486
except errors.NoSuchRevision:
487
basis_tree = self.this_tree.basis_tree()
488
if not self.this_tree.has_changes(basis_tree):
489
self.this_rev_id = self.this_basis
438
491
def set_interesting_files(self, file_list):
439
492
self.interesting_files = file_list
441
494
def set_pending(self):
442
495
if (not self.base_is_ancestor or not self.base_is_other_ancestor
443
or self.other_rev_id is None):
496
or self.other_rev_id is None):
445
498
self._add_parent()
447
500
def _add_parent(self):
448
501
new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
449
502
new_parent_trees = []
450
with cleanup.ExitStack() as stack:
451
for revision_id in new_parents:
453
tree = self.revision_tree(revision_id)
454
except errors.NoSuchRevision:
457
stack.enter_context(tree.lock_read())
458
new_parent_trees.append((revision_id, tree))
459
self.this_tree.set_parent_trees(new_parent_trees, allow_leftmost_as_ghost=True)
503
operation = OperationWithCleanups(self.this_tree.set_parent_trees)
504
for revision_id in new_parents:
506
tree = self.revision_tree(revision_id)
507
except errors.NoSuchRevision:
511
operation.add_cleanup(tree.unlock)
512
new_parent_trees.append((revision_id, tree))
513
operation.run_simple(new_parent_trees, allow_leftmost_as_ghost=True)
461
515
def set_other(self, other_revision, possible_transports=None):
462
516
"""Set the revision and tree to merge from.
755
797
self.cherrypick = cherrypick
801
warnings.warn("pp argument to Merge3Merger is deprecated")
803
warnings.warn("pb argument to Merge3Merger is deprecated")
759
805
def do_merge(self):
760
with cleanup.ExitStack() as stack:
761
stack.enter_context(self.working_tree.lock_tree_write())
762
stack.enter_context(self.this_tree.lock_read())
763
stack.enter_context(self.base_tree.lock_read())
764
stack.enter_context(self.other_tree.lock_read())
765
self.tt = self.working_tree.get_transform()
766
stack.enter_context(self.tt)
767
self._compute_transform()
768
results = self.tt.apply(no_conflicts=True)
769
self.write_modified(results)
771
self.working_tree.add_conflicts(self.cooked_conflicts)
772
except errors.UnsupportedOperation:
806
operation = OperationWithCleanups(self._do_merge)
807
self.this_tree.lock_tree_write()
808
operation.add_cleanup(self.this_tree.unlock)
809
self.base_tree.lock_read()
810
operation.add_cleanup(self.base_tree.unlock)
811
self.other_tree.lock_read()
812
operation.add_cleanup(self.other_tree.unlock)
815
def _do_merge(self, operation):
816
self.tt = transform.TreeTransform(self.this_tree, None)
817
operation.add_cleanup(self.tt.finalize)
818
self._compute_transform()
819
results = self.tt.apply(no_conflicts=True)
820
self.write_modified(results)
822
self.this_tree.add_conflicts(self.cooked_conflicts)
823
except errors.UnsupportedOperation:
775
826
def make_preview_transform(self):
776
with self.base_tree.lock_read(), self.other_tree.lock_read():
777
self.tt = transform.TransformPreview(self.working_tree)
778
self._compute_transform()
827
operation = OperationWithCleanups(self._make_preview_transform)
828
self.base_tree.lock_read()
829
operation.add_cleanup(self.base_tree.unlock)
830
self.other_tree.lock_read()
831
operation.add_cleanup(self.other_tree.unlock)
832
return operation.run_simple()
834
def _make_preview_transform(self):
835
self.tt = transform.TransformPreview(self.this_tree)
836
self._compute_transform()
781
839
def _compute_transform(self):
782
840
if self._lca_trees is None:
786
844
entries = self._entries_lca()
787
845
resolver = self._lca_multi_way
788
# Prepare merge hooks
789
factories = Merger.hooks['merge_file_content']
790
# One hook for each registered one plus our default merger
791
hooks = [factory(self) for factory in factories] + [self]
792
self.active_hooks = [hook for hook in hooks if hook is not None]
793
with ui.ui_factory.nested_progress_bar() as child_pb:
794
for num, (file_id, changed, paths3, parents3, names3,
846
child_pb = ui.ui_factory.nested_progress_bar()
848
factories = Merger.hooks['merge_file_content']
849
hooks = [factory(self) for factory in factories] + [self]
850
self.active_hooks = [hook for hook in hooks if hook is not None]
851
for num, (file_id, changed, parents3, names3,
795
852
executable3) in enumerate(entries):
796
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)
853
child_pb.update('Preparing file merge', num, len(entries))
854
self._merge_names(file_id, parents3, names3, resolver=resolver)
804
file_status = self._do_merge_contents(paths3, trans_id, file_id)
856
file_status = self._do_merge_contents(file_id)
806
858
file_status = 'unmodified'
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(
859
self._merge_executable(file_id,
860
executable3, file_status, resolver=resolver)
864
child_pb = ui.ui_factory.nested_progress_bar()
866
fs_conflicts = transform.resolve_conflicts(self.tt, child_pb,
820
867
lambda t, c: transform.conflict_pass(t, c, self.other_tree))
821
870
if self.change_reporter is not None:
822
from breezy import delta
871
from bzrlib import delta
823
872
delta.report_changes(
824
873
self.tt.iter_changes(), self.change_reporter)
825
874
self.cook_conflicts(fs_conflicts)
826
875
for conflict in self.cooked_conflicts:
827
trace.warning('%s', conflict.describe())
876
trace.warning(conflict)
829
878
def _entries3(self):
830
879
"""Gather data about files modified between three trees.
839
888
iterator = self.other_tree.iter_changes(self.base_tree,
840
specific_files=self.interesting_files,
841
extra_trees=[self.this_tree])
842
this_interesting_files = self.this_tree.find_related_paths_across_trees(
843
self.interesting_files, trees=[self.other_tree])
844
this_entries = dict(self.this_tree.iter_entries_by_dir(
845
specific_files=this_interesting_files))
846
for change in iterator:
847
if change.path[0] is not None:
848
this_path = _mod_tree.find_previous_path(
849
self.base_tree, self.this_tree, change.path[0])
851
this_path = _mod_tree.find_previous_path(
852
self.other_tree, self.this_tree, change.path[1])
853
this_entry = this_entries.get(this_path)
854
if this_entry is not None:
855
this_name = this_entry.name
856
this_parent = this_entry.parent_id
857
this_executable = this_entry.executable
889
include_unchanged=True, specific_files=self.interesting_files,
890
extra_trees=[self.this_tree])
891
this_entries = dict((e.file_id, e) for p, e in
892
self.this_tree.iter_entries_by_dir(
893
self.interesting_ids))
894
for (file_id, paths, changed, versioned, parents, names, kind,
895
executable) in iterator:
896
if (self.interesting_ids is not None and
897
file_id not in self.interesting_ids):
899
entry = this_entries.get(file_id)
900
if entry is not None:
901
this_name = entry.name
902
this_parent = entry.parent_id
903
this_executable = entry.executable
860
906
this_parent = None
861
907
this_executable = None
862
parents3 = change.parent_id + (this_parent,)
863
names3 = change.name + (this_name,)
864
paths3 = change.path + (this_path, )
865
executable3 = change.executable + (this_executable,)
867
(change.file_id, change.changed_content, paths3,
868
parents3, names3, executable3))
908
parents3 = parents + (this_parent,)
909
names3 = names + (this_name,)
910
executable3 = executable + (this_executable,)
911
result.append((file_id, changed, parents3, names3, executable3))
871
914
def _entries_lca(self):
875
918
it then compares with THIS and BASE.
877
920
For the multi-valued entries, the format will be (BASE, [lca1, lca2])
879
:return: [(file_id, changed, paths, parents, names, executable)], where:
881
* file_id: Simple file_id of the entry
882
* changed: Boolean, True if the kind or contents changed else False
883
* paths: ((base, [path, in, lcas]), path_other, path_this)
884
* parents: ((base, [parent_id, in, lcas]), parent_id_other,
886
* names: ((base, [name, in, lcas]), name_in_other, name_in_this)
887
* executable: ((base, [exec, in, lcas]), exec_in_other,
921
:return: [(file_id, changed, parents, names, executable)]
922
file_id Simple file_id of the entry
923
changed Boolean, True if the kind or contents changed
925
parents ((base, [parent_id, in, lcas]), parent_id_other,
927
names ((base, [name, in, lcas]), name_in_other, name_in_this)
928
executable ((base, [exec, in, lcas]), exec_in_other, exec_in_this)
890
930
if self.interesting_files is not None:
891
931
lookup_trees = [self.this_tree, self.base_tree]
892
932
lookup_trees.extend(self._lca_trees)
893
933
# I think we should include the lca trees as well
894
interesting_files = self.other_tree.find_related_paths_across_trees(
895
self.interesting_files, lookup_trees)
934
interesting_ids = self.other_tree.paths2ids(self.interesting_files,
897
interesting_files = None
937
interesting_ids = self.interesting_ids
899
from .multiwalker import MultiWalker
900
walker = MultiWalker(self.other_tree, self._lca_trees)
939
walker = _mod_tree.MultiWalker(self.other_tree, self._lca_trees)
902
for other_path, file_id, other_ie, lca_values in walker.iter_all():
941
base_inventory = self.base_tree.inventory
942
this_inventory = self.this_tree.inventory
943
for path, file_id, other_ie, lca_values in walker.iter_all():
903
944
# Is this modified at all from any of the other trees?
904
945
if other_ie is None:
905
946
other_ie = _none_entry
907
if interesting_files is not None and other_path not in interesting_files:
947
if interesting_ids is not None and file_id not in interesting_ids:
910
950
# If other_revision is found in any of the lcas, that means this
999
1028
(base_ie.executable, lca_executable),
1000
1029
other_ie.executable, this_ie.executable)
1001
1030
if (parent_id_winner == 'this' and name_winner == 'this'
1002
and sha1_winner == 'this' and exec_winner == 'this'):
1031
and sha1_winner == 'this' and exec_winner == 'this'):
1003
1032
# No kind, parent, name, exec, or content change for
1004
1033
# OTHER, so this node is not considered interesting
1006
1035
if sha1_winner == 'this':
1007
1036
content_changed = False
1008
1037
elif other_ie.kind == 'symlink':
1009
def get_target(ie, tree, path):
1038
def get_target(ie, tree):
1010
1039
if ie.kind != 'symlink':
1012
return tree.get_symlink_target(path)
1013
base_target = get_target(base_ie, self.base_tree, base_path)
1014
lca_targets = [get_target(ie, tree, lca_path) for ie, tree, lca_path
1015
in zip(lca_entries, self._lca_trees, lca_paths)]
1016
this_target = get_target(
1017
this_ie, self.this_tree, this_path)
1018
other_target = get_target(
1019
other_ie, self.other_tree, other_path)
1041
return tree.get_symlink_target(file_id)
1042
base_target = get_target(base_ie, self.base_tree)
1043
lca_targets = [get_target(ie, tree) for ie, tree
1044
in zip(lca_entries, self._lca_trees)]
1045
this_target = get_target(this_ie, self.this_tree)
1046
other_target = get_target(other_ie, self.other_tree)
1020
1047
target_winner = self._lca_multi_way(
1021
1048
(base_target, lca_targets),
1022
1049
other_target, this_target)
1023
1050
if (parent_id_winner == 'this' and name_winner == 'this'
1024
and target_winner == 'this'):
1051
and target_winner == 'this'):
1025
1052
# No kind, parent, name, or symlink target change
1026
1053
# not interesting
1041
1068
# If we have gotten this far, that means something has changed
1042
1069
result.append((file_id, content_changed,
1043
((base_path, lca_paths),
1044
other_path, this_path),
1045
1070
((base_ie.parent_id, lca_parent_ids),
1046
1071
other_ie.parent_id, this_ie.parent_id),
1047
1072
((base_ie.name, lca_names),
1048
1073
other_ie.name, this_ie.name),
1049
1074
((base_ie.executable, lca_executable),
1050
1075
other_ie.executable, this_ie.executable)
1082
self.tt.final_kind(self.tt.root)
1083
except errors.NoSuchFile:
1084
self.tt.cancel_deletion(self.tt.root)
1085
if self.tt.final_file_id(self.tt.root) is None:
1086
self.tt.version_file(self.tt.tree_file_id(self.tt.root),
1088
other_root_file_id = self.other_tree.get_root_id()
1089
if other_root_file_id is None:
1091
other_root = self.tt.trans_id_file_id(other_root_file_id)
1092
if other_root == self.tt.root:
1094
if self.other_tree.inventory.root.file_id in self.this_tree.inventory:
1095
# the other tree's root is a non-root in the current tree (as when
1096
# a previously unrelated branch is merged into another)
1099
self.tt.final_kind(other_root)
1100
other_root_is_present = True
1101
except errors.NoSuchFile:
1102
# other_root doesn't have a physical representation. We still need
1103
# to move any references to the actual root of the tree.
1104
other_root_is_present = False
1105
# 'other_tree.inventory.root' is not present in this tree. We are
1106
# calling adjust_path for children which *want* to be present with a
1107
# correct place to go.
1108
for thing, child in self.other_tree.inventory.root.children.iteritems():
1109
trans_id = self.tt.trans_id_file_id(child.file_id)
1110
if not other_root_is_present:
1111
# FIXME: Make final_kind returns None instead of raising
1112
# NoSuchFile to avoid the ugly construct below -- vila 20100402
1114
self.tt.final_kind(trans_id)
1115
# The item exist in the final tree and has a defined place
1118
except errors.NoSuchFile, e:
1120
# Move the item into the root
1121
self.tt.adjust_path(self.tt.final_name(trans_id),
1122
self.tt.root, trans_id)
1123
if other_root_is_present:
1124
self.tt.cancel_creation(other_root)
1125
self.tt.cancel_versioning(other_root)
1054
1127
def write_modified(self, results):
1055
if not self.working_tree.supports_merge_modified():
1057
1128
modified_hashes = {}
1058
1129
for path in results.modified_paths:
1059
wt_relpath = self.working_tree.relpath(path)
1060
if not self.working_tree.is_versioned(wt_relpath):
1130
file_id = self.this_tree.path2id(self.this_tree.relpath(path))
1062
hash = self.working_tree.get_file_sha1(wt_relpath)
1133
hash = self.this_tree.get_file_sha1(file_id)
1063
1134
if hash is None:
1065
modified_hashes[wt_relpath] = hash
1066
self.working_tree.set_merge_modified(modified_hashes)
1136
modified_hashes[file_id] = hash
1137
self.this_tree.set_merge_modified(modified_hashes)
1140
def parent(entry, file_id):
1070
1141
"""Determine the parent for a file_id (used as a key method)"""
1071
1142
if entry is None:
1073
1144
return entry.parent_id
1147
def name(entry, file_id):
1077
1148
"""Determine the name for a file_id (used as a key method)"""
1078
1149
if entry is None:
1080
1151
return entry.name
1083
def contents_sha1(tree, path):
1154
def contents_sha1(tree, file_id):
1084
1155
"""Determine the sha1 of the file contents (used as a key method)."""
1086
return tree.get_file_sha1(path)
1087
except errors.NoSuchFile:
1156
if file_id not in tree:
1158
return tree.get_file_sha1(file_id)
1091
def executable(tree, path):
1161
def executable(tree, file_id):
1092
1162
"""Determine the executability of a file-id (used as a key method)."""
1094
if tree.kind(path) != "file":
1096
except errors.NoSuchFile:
1163
if not tree.has_id(file_id):
1098
return tree.is_executable(path)
1165
if tree.kind(file_id) != "file":
1167
return tree.is_executable(file_id)
1101
def kind(tree, path):
1170
def kind(tree, file_id):
1102
1171
"""Determine the kind of a file-id (used as a key method)."""
1104
return tree.kind(path)
1105
except errors.NoSuchFile:
1172
if not tree.has_id(file_id):
1174
return tree.kind(file_id)
1109
1177
def _three_way(base, other, this):
1171
1239
# At this point, the lcas disagree, and the tip disagree
1172
1240
return 'conflict'
1174
def _merge_names(self, trans_id, file_id, paths, parents, names, resolver):
1175
"""Perform a merge on file names and parents"""
1243
@deprecated_method(deprecated_in((2, 2, 0)))
1244
def scalar_three_way(this_tree, base_tree, other_tree, file_id, key):
1245
"""Do a three-way test on a scalar.
1246
Return "this", "other" or "conflict", depending whether a value wins.
1248
key_base = key(base_tree, file_id)
1249
key_other = key(other_tree, file_id)
1250
#if base == other, either they all agree, or only THIS has changed.
1251
if key_base == key_other:
1253
key_this = key(this_tree, file_id)
1254
# "Ambiguous clean merge"
1255
if key_this == key_other:
1257
elif key_this == key_base:
1262
def merge_names(self, file_id):
1263
def get_entry(tree):
1264
if tree.has_id(file_id):
1265
return tree.inventory[file_id]
1268
this_entry = get_entry(self.this_tree)
1269
other_entry = get_entry(self.other_tree)
1270
base_entry = get_entry(self.base_tree)
1271
entries = (base_entry, other_entry, this_entry)
1274
for entry in entries:
1277
parents.append(None)
1279
names.append(entry.name)
1280
parents.append(entry.parent_id)
1281
return self._merge_names(file_id, parents, names,
1282
resolver=self._three_way)
1284
def _merge_names(self, file_id, parents, names, resolver):
1285
"""Perform a merge on file_id names and parents"""
1176
1286
base_name, other_name, this_name = names
1177
1287
base_parent, other_parent, this_parent = parents
1178
unused_base_path, other_path, this_path = paths
1180
1289
name_winner = resolver(*names)
1191
1300
# Creating helpers (.OTHER or .THIS) here cause problems down the
1192
1301
# road if a ContentConflict needs to be created so we should not do
1303
trans_id = self.tt.trans_id_file_id(file_id)
1194
1304
self._raw_conflicts.append(('path conflict', trans_id, file_id,
1195
1305
this_parent, this_name,
1196
1306
other_parent, other_name))
1197
if other_path is None:
1307
if other_name is None:
1198
1308
# it doesn't matter whether the result was 'other' or
1199
# 'conflict'-- if it has no file id, we leave it alone.
1309
# 'conflict'-- if there's no 'other', we leave it alone.
1201
1311
parent_id = parents[self.winner_idx[parent_id_winner]]
1202
name = names[self.winner_idx[name_winner]]
1203
if parent_id is not None or name is not None:
1312
if parent_id is not None:
1204
1313
# if we get here, name_winner and parent_winner are set to safe
1206
if parent_id is None and name is not None:
1207
# if parent_id is None and name is non-None, current file is
1209
if names[self.winner_idx[parent_id_winner]] != '':
1210
raise AssertionError(
1211
'File looks like a root, but named %s' %
1212
names[self.winner_idx[parent_id_winner]])
1213
parent_trans_id = transform.ROOT_PARENT
1215
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1216
self.tt.adjust_path(name, parent_trans_id, trans_id)
1315
self.tt.adjust_path(names[self.winner_idx[name_winner]],
1316
self.tt.trans_id_file_id(parent_id),
1317
self.tt.trans_id_file_id(file_id))
1218
def _do_merge_contents(self, paths, trans_id, file_id):
1319
def _do_merge_contents(self, file_id):
1219
1320
"""Performs a merge on file_id contents."""
1220
def contents_pair(tree, path):
1224
kind = tree.kind(path)
1225
except errors.NoSuchFile:
1321
def contents_pair(tree):
1322
if file_id not in tree:
1324
kind = tree.kind(file_id)
1227
1325
if kind == "file":
1228
contents = tree.get_file_sha1(path)
1326
contents = tree.get_file_sha1(file_id)
1229
1327
elif kind == "symlink":
1230
contents = tree.get_symlink_target(path)
1328
contents = tree.get_symlink_target(file_id)
1232
1330
contents = None
1233
1331
return kind, contents
1235
base_path, other_path, this_path = paths
1236
1333
# See SPOT run. run, SPOT, run.
1237
1334
# So we're not QUITE repeating ourselves; we do tricky things with
1239
other_pair = contents_pair(self.other_tree, other_path)
1240
this_pair = contents_pair(self.this_tree, this_path)
1336
base_pair = contents_pair(self.base_tree)
1337
other_pair = contents_pair(self.other_tree)
1241
1338
if self._lca_trees:
1242
(base_path, lca_paths) = base_path
1243
base_pair = contents_pair(self.base_tree, base_path)
1244
lca_pairs = [contents_pair(tree, path)
1245
for tree, path in zip(self._lca_trees, lca_paths)]
1339
this_pair = contents_pair(self.this_tree)
1340
lca_pairs = [contents_pair(tree) for tree in self._lca_trees]
1246
1341
winner = self._lca_multi_way((base_pair, lca_pairs), other_pair,
1247
1342
this_pair, allow_overriding_lca=False)
1249
base_pair = contents_pair(self.base_tree, base_path)
1250
1344
if base_pair == other_pair:
1251
1345
winner = 'this'
1253
1347
# We delayed evaluating this_pair as long as we can to avoid
1254
1348
# unnecessary sha1 calculation
1255
this_pair = contents_pair(self.this_tree, this_path)
1349
this_pair = contents_pair(self.this_tree)
1256
1350
winner = self._three_way(base_pair, other_pair, this_pair)
1257
1351
if winner == 'this':
1258
1352
# No interesting changes introduced by OTHER
1259
1353
return "unmodified"
1260
1354
# We have a hypothetical conflict, but if we have files, then we
1261
1355
# can try to merge the content
1262
params = MergeFileHookParams(
1263
self, (base_path, other_path, this_path), trans_id, this_pair[0],
1356
trans_id = self.tt.trans_id_file_id(file_id)
1357
params = MergeHookParams(self, file_id, trans_id, this_pair[0],
1264
1358
other_pair[0], winner)
1265
1359
hooks = self.active_hooks
1266
1360
hook_status = 'not_applicable'
1269
1363
if hook_status != 'not_applicable':
1270
1364
# Don't try any more hooks, this one applies.
1272
# If the merge ends up replacing the content of the file, we get rid of
1273
# it at the end of this method (this variable is used to track the
1274
# exceptions to this rule).
1276
1366
result = "modified"
1277
1367
if hook_status == 'not_applicable':
1278
# No merge hook was able to resolve the situation. Two cases exist:
1279
# a content conflict or a duplicate one.
1368
# This is a contents conflict, because none of the available
1369
# functions could merge it.
1281
1371
name = self.tt.final_name(trans_id)
1282
1372
parent_id = self.tt.final_parent(trans_id)
1283
inhibit_content_conflict = False
1284
if params.this_kind is None: # file_id is not in THIS
1285
# Is the name used for a different file_id ?
1286
if self.this_tree.is_versioned(other_path):
1287
# Two entries for the same path
1289
# versioning the merged file will trigger a duplicate
1291
self.tt.version_file(file_id, trans_id)
1292
transform.create_from_tree(
1293
self.tt, trans_id, self.other_tree,
1295
filter_tree_path=self._get_filter_tree_path(other_path))
1296
inhibit_content_conflict = True
1297
elif params.other_kind is None: # file_id is not in OTHER
1298
# Is the name used for a different file_id ?
1299
if self.other_tree.is_versioned(this_path):
1300
# Two entries for the same path again, but here, the other
1301
# entry will also be merged. We simply inhibit the
1302
# 'content' conflict creation because we know OTHER will
1303
# create (or has already created depending on ordering) an
1304
# entry at the same path. This will trigger a 'duplicate'
1307
inhibit_content_conflict = True
1308
if not inhibit_content_conflict:
1309
if params.this_kind is not None:
1310
self.tt.unversion_file(trans_id)
1311
# This is a contents conflict, because none of the available
1312
# functions could merge it.
1313
file_group = self._dump_conflicts(
1314
name, (base_path, other_path, this_path), parent_id,
1315
file_id, set_version=True)
1316
self._raw_conflicts.append(('contents conflict', file_group))
1373
if self.this_tree.has_id(file_id):
1374
self.tt.unversion_file(trans_id)
1375
file_group = self._dump_conflicts(name, parent_id, file_id,
1377
self._raw_conflicts.append(('contents conflict', file_group))
1317
1378
elif hook_status == 'success':
1318
1379
self.tt.create_file(lines, trans_id)
1319
1380
elif hook_status == 'conflicted':
1336
1396
raise AssertionError('unknown hook_status: %r' % (hook_status,))
1337
if not this_path and result == "modified":
1397
if not self.this_tree.has_id(file_id) and result == "modified":
1338
1398
self.tt.version_file(file_id, trans_id)
1340
# The merge has been performed and produced a new content, so the
1341
# old contents should not be retained.
1399
# The merge has been performed, so the old contents should not be
1342
1402
self.tt.delete_contents(trans_id)
1403
except errors.NoSuchFile:
1345
1407
def _default_other_winner_merge(self, merge_hook_params):
1346
1408
"""Replace this contents with other."""
1409
file_id = merge_hook_params.file_id
1347
1410
trans_id = merge_hook_params.trans_id
1348
if merge_hook_params.other_path is not None:
1411
file_in_this = self.this_tree.has_id(file_id)
1412
if self.other_tree.has_id(file_id):
1349
1413
# OTHER changed the file
1350
transform.create_from_tree(
1351
self.tt, trans_id, self.other_tree,
1352
merge_hook_params.other_path,
1353
filter_tree_path=self._get_filter_tree_path(merge_hook_params.other_path))
1415
if wt.supports_content_filtering():
1416
# We get the path from the working tree if it exists.
1417
# That fails though when OTHER is adding a file, so
1418
# we fall back to the other tree to find the path if
1419
# it doesn't exist locally.
1421
filter_tree_path = wt.id2path(file_id)
1422
except errors.NoSuchId:
1423
filter_tree_path = self.other_tree.id2path(file_id)
1425
# Skip the id2path lookup for older formats
1426
filter_tree_path = None
1427
transform.create_from_tree(self.tt, trans_id,
1428
self.other_tree, file_id,
1429
filter_tree_path=filter_tree_path)
1354
1430
return 'done', None
1355
elif merge_hook_params.this_path is not None:
1356
1432
# OTHER deleted the file
1357
1433
return 'delete', None
1359
1435
raise AssertionError(
1360
'winner is OTHER, but file %r not in THIS or OTHER tree'
1361
% (merge_hook_params.base_path,))
1436
'winner is OTHER, but file_id %r not in THIS or OTHER tree'
1363
1439
def merge_contents(self, merge_hook_params):
1364
1440
"""Fallback merge logic after user installed hooks."""
1365
1441
# This function is used in merge hooks as the fallback instance.
1366
# Perhaps making this function and the functions it calls be a
1442
# Perhaps making this function and the functions it calls be a
1367
1443
# a separate class would be better.
1368
1444
if merge_hook_params.winner == 'other':
1369
1445
# OTHER is a straight winner, so replace this contents with other
1373
1449
# BASE is a file, or both converted to files, so at least we
1374
1450
# have agreement that output should be a file.
1376
self.text_merge(merge_hook_params.trans_id,
1377
merge_hook_params.paths)
1452
self.text_merge(merge_hook_params.file_id,
1453
merge_hook_params.trans_id)
1378
1454
except errors.BinaryFile:
1379
1455
return 'not_applicable', None
1380
1456
return 'done', None
1382
1458
return 'not_applicable', None
1384
def get_lines(self, tree, path):
1460
def get_lines(self, tree, file_id):
1385
1461
"""Return the lines in a file, or an empty list."""
1389
kind = tree.kind(path)
1390
except errors.NoSuchFile:
1462
if tree.has_id(file_id):
1463
return tree.get_file_lines(file_id)
1395
return tree.get_file_lines(path)
1397
def text_merge(self, trans_id, paths):
1398
"""Perform a three-way text merge on a file"""
1467
def text_merge(self, file_id, trans_id):
1468
"""Perform a three-way text merge on a file_id"""
1399
1469
# it's possible that we got here with base as a different type.
1400
1470
# if so, we just want two-way text conflicts.
1401
base_path, other_path, this_path = paths
1402
base_lines = self.get_lines(self.base_tree, base_path)
1403
other_lines = self.get_lines(self.other_tree, other_path)
1404
this_lines = self.get_lines(self.this_tree, this_path)
1471
if self.base_tree.has_id(file_id) and \
1472
self.base_tree.kind(file_id) == "file":
1473
base_lines = self.get_lines(self.base_tree, file_id)
1476
other_lines = self.get_lines(self.other_tree, file_id)
1477
this_lines = self.get_lines(self.this_tree, file_id)
1405
1478
m3 = merge3.Merge3(base_lines, this_lines, other_lines,
1406
1479
is_cherrypick=self.cherrypick)
1407
start_marker = b"!START OF MERGE CONFLICT!" + b"I HOPE THIS IS UNIQUE"
1480
start_marker = "!START OF MERGE CONFLICT!" + "I HOPE THIS IS UNIQUE"
1408
1481
if self.show_base is True:
1409
base_marker = b'|' * 7
1482
base_marker = '|' * 7
1411
1484
base_marker = None
1413
1486
def iter_merge3(retval):
1414
1487
retval["text_conflicts"] = False
1415
for line in m3.merge_lines(name_a=b"TREE",
1416
name_b=b"MERGE-SOURCE",
1417
name_base=b"BASE-REVISION",
1488
for line in m3.merge_lines(name_a = "TREE",
1489
name_b = "MERGE-SOURCE",
1490
name_base = "BASE-REVISION",
1418
1491
start_marker=start_marker,
1419
1492
base_marker=base_marker,
1420
1493
reprocess=self.reprocess):
1421
1494
if line.startswith(start_marker):
1422
1495
retval["text_conflicts"] = True
1423
yield line.replace(start_marker, b'<' * 7)
1496
yield line.replace(start_marker, '<' * 7)
1480
1537
versioned = False
1481
1538
file_group = []
1482
for suffix, tree, path, lines in data:
1483
if path is not None:
1484
trans_id = self._conflict_file(
1485
name, parent_id, path, tree, suffix, lines,
1539
for suffix, tree, lines in data:
1540
if tree.has_id(file_id):
1541
trans_id = self._conflict_file(name, parent_id, tree, file_id,
1542
suffix, lines, filter_tree_path)
1487
1543
file_group.append(trans_id)
1488
1544
if set_version and not versioned:
1489
1545
self.tt.version_file(file_id, trans_id)
1490
1546
versioned = True
1491
1547
return file_group
1493
def _conflict_file(self, name, parent_id, path, tree, suffix,
1549
def _conflict_file(self, name, parent_id, tree, file_id, suffix,
1494
1550
lines=None, filter_tree_path=None):
1495
1551
"""Emit a single conflict file."""
1496
1552
name = name + '.' + suffix
1497
1553
trans_id = self.tt.create_path(name, parent_id)
1498
transform.create_from_tree(
1499
self.tt, trans_id, tree, path,
1501
filter_tree_path=filter_tree_path)
1554
transform.create_from_tree(self.tt, trans_id, tree, file_id, lines,
1502
1556
return trans_id
1504
def _merge_executable(self, paths, trans_id, executable, file_status,
1558
def merge_executable(self, file_id, file_status):
1559
"""Perform a merge on the execute bit."""
1560
executable = [self.executable(t, file_id) for t in (self.base_tree,
1561
self.other_tree, self.this_tree)]
1562
self._merge_executable(file_id, executable, file_status,
1563
resolver=self._three_way)
1565
def _merge_executable(self, file_id, executable, file_status,
1506
1567
"""Perform a merge on the execute bit."""
1507
1568
base_executable, other_executable, this_executable = executable
1508
base_path, other_path, this_path = paths
1509
1569
if file_status == "deleted":
1511
1571
winner = resolver(*executable)
1512
1572
if winner == "conflict":
1513
# There must be a None in here, if we have a conflict, but we
1514
# need executability since file status was not deleted.
1515
if other_path is None:
1573
# There must be a None in here, if we have a conflict, but we
1574
# need executability since file status was not deleted.
1575
if self.executable(self.other_tree, file_id) is None:
1516
1576
winner = "this"
1518
1578
winner = "other"
1519
1579
if winner == 'this' and file_status != "modified":
1521
if self.tt.final_kind(trans_id) != "file":
1581
trans_id = self.tt.trans_id_file_id(file_id)
1583
if self.tt.final_kind(trans_id) != "file":
1585
except errors.NoSuchFile:
1523
1587
if winner == "this":
1524
1588
executability = this_executable
1526
if other_path is not None:
1590
if self.other_tree.has_id(file_id):
1527
1591
executability = other_executable
1528
elif this_path is not None:
1592
elif self.this_tree.has_id(file_id):
1529
1593
executability = this_executable
1530
elif base_path is not None:
1594
elif self.base_tree_has_id(file_id):
1531
1595
executability = base_executable
1532
1596
if executability is not None:
1597
trans_id = self.tt.trans_id_file_id(file_id)
1533
1598
self.tt.set_executability(executability, trans_id)
1535
1600
def cook_conflicts(self, fs_conflicts):
1536
1601
"""Convert all conflicts into a form that doesn't depend on trans_id"""
1537
content_conflict_file_ids = set()
1538
cooked_conflicts = transform.cook_conflicts(fs_conflicts, self.tt)
1602
self.cooked_conflicts.extend(transform.cook_conflicts(
1603
fs_conflicts, self.tt))
1539
1604
fp = transform.FinalPaths(self.tt)
1540
1605
for conflict in self._raw_conflicts:
1541
1606
conflict_type = conflict[0]
1542
1607
if conflict_type == 'path conflict':
1543
1608
(trans_id, file_id,
1544
this_parent, this_name,
1545
other_parent, other_name) = conflict[1:]
1609
this_parent, this_name,
1610
other_parent, other_name) = conflict[1:]
1546
1611
if this_parent is None or this_name is None:
1547
1612
this_path = '<deleted>'
1549
parent_path = fp.get_path(
1614
parent_path = fp.get_path(
1550
1615
self.tt.trans_id_file_id(this_parent))
1551
1616
this_path = osutils.pathjoin(parent_path, this_name)
1552
1617
if other_parent is None or other_name is None:
1553
1618
other_path = '<deleted>'
1555
if other_parent == self.other_tree.path2id(''):
1556
# The tree transform doesn't know about the other root,
1557
# so we special case here to avoid a NoFinalPath
1561
parent_path = fp.get_path(
1562
self.tt.trans_id_file_id(other_parent))
1620
parent_path = fp.get_path(
1621
self.tt.trans_id_file_id(other_parent))
1563
1622
other_path = osutils.pathjoin(parent_path, other_name)
1564
1623
c = _mod_conflicts.Conflict.factory(
1565
1624
'path conflict', path=this_path,
1667
1709
class LCAMerger(WeaveMerger):
1669
requires_file_merge_plan = True
1671
def _generate_merge_plan(self, this_path, base):
1672
return self.this_tree.plan_file_lca_merge(this_path, self.other_tree,
1711
def _generate_merge_plan(self, file_id, base):
1712
return self.this_tree.plan_file_lca_merge(file_id, self.other_tree,
1676
1715
class Diff3Merger(Merge3Merger):
1677
1716
"""Three-way merger using external diff3 for text merging"""
1679
requires_file_merge_plan = False
1681
def dump_file(self, temp_dir, name, tree, path):
1718
def dump_file(self, temp_dir, name, tree, file_id):
1682
1719
out_path = osutils.pathjoin(temp_dir, name)
1683
with open(out_path, "wb") as out_file:
1684
in_file = tree.get_file(path)
1720
out_file = open(out_path, "wb")
1722
in_file = tree.get_file(file_id)
1685
1723
for line in in_file:
1686
1724
out_file.write(line)
1687
1727
return out_path
1689
def text_merge(self, trans_id, paths):
1729
def text_merge(self, file_id, trans_id):
1690
1730
"""Perform a diff3 merge using a specified file-id and trans-id.
1691
1731
If conflicts are encountered, .BASE, .THIS. and .OTHER conflict files
1692
1732
will be dumped, and a will be conflict noted.
1695
base_path, other_path, this_path = paths
1696
1735
temp_dir = osutils.mkdtemp(prefix="bzr-")
1698
1737
new_file = osutils.pathjoin(temp_dir, "new")
1699
this = self.dump_file(
1700
temp_dir, "this", self.this_tree, this_path)
1701
base = self.dump_file(
1702
temp_dir, "base", self.base_tree, base_path)
1703
other = self.dump_file(
1704
temp_dir, "other", self.other_tree, other_path)
1705
status = breezy.patch.diff3(new_file, this, base, other)
1738
this = self.dump_file(temp_dir, "this", self.this_tree, file_id)
1739
base = self.dump_file(temp_dir, "base", self.base_tree, file_id)
1740
other = self.dump_file(temp_dir, "other", self.other_tree, file_id)
1741
status = bzrlib.patch.diff3(new_file, this, base, other)
1706
1742
if status not in (0, 1):
1707
1743
raise errors.BzrError("Unhandled diff3 exit code")
1708
with open(new_file, 'rb') as f:
1744
f = open(new_file, 'rb')
1709
1746
self.tt.create_file(f, trans_id)
1710
1749
if status == 1:
1711
1750
name = self.tt.final_name(trans_id)
1712
1751
parent_id = self.tt.final_parent(trans_id)
1713
file_id = self.tt.final_file_id(trans_id)
1714
self._dump_conflicts(name, paths, parent_id, file_id)
1752
self._dump_conflicts(name, parent_id, file_id)
1715
1753
self._raw_conflicts.append(('text conflict', trans_id))
1717
1755
osutils.rmtree(temp_dir)
1720
class PathNotInTree(errors.BzrError):
1722
_fmt = """Merge-into failed because %(tree)s does not contain %(path)s."""
1724
def __init__(self, path, tree):
1725
errors.BzrError.__init__(self, path=path, tree=tree)
1728
class MergeIntoMerger(Merger):
1729
"""Merger that understands other_tree will be merged into a subdir.
1731
This also changes the Merger api so that it uses real Branch, revision_id,
1732
and RevisonTree objects, rather than using revision specs.
1735
def __init__(self, this_tree, other_branch, other_tree, target_subdir,
1736
source_subpath, other_rev_id=None):
1737
"""Create a new MergeIntoMerger object.
1739
source_subpath in other_tree will be effectively copied to
1740
target_subdir in this_tree.
1742
:param this_tree: The tree that we will be merging into.
1743
:param other_branch: The Branch we will be merging from.
1744
:param other_tree: The RevisionTree object we want to merge.
1745
:param target_subdir: The relative path where we want to merge
1746
other_tree into this_tree
1747
:param source_subpath: The relative path specifying the subtree of
1748
other_tree to merge into this_tree.
1750
# It is assumed that we are merging a tree that is not in our current
1751
# ancestry, which means we are using the "EmptyTree" as our basis.
1752
null_ancestor_tree = this_tree.branch.repository.revision_tree(
1753
_mod_revision.NULL_REVISION)
1754
super(MergeIntoMerger, self).__init__(
1755
this_branch=this_tree.branch,
1756
this_tree=this_tree,
1757
other_tree=other_tree,
1758
base_tree=null_ancestor_tree,
1760
self._target_subdir = target_subdir
1761
self._source_subpath = source_subpath
1762
self.other_branch = other_branch
1763
if other_rev_id is None:
1764
other_rev_id = other_tree.get_revision_id()
1765
self.other_rev_id = self.other_basis = other_rev_id
1766
self.base_is_ancestor = True
1767
self.backup_files = True
1768
self.merge_type = Merge3Merger
1769
self.show_base = False
1770
self.reprocess = False
1771
self.interesting_files = None
1772
self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
1773
target_subdir=self._target_subdir,
1774
source_subpath=self._source_subpath)
1775
if self._source_subpath != '':
1776
# If this isn't a partial merge make sure the revisions will be
1778
self._maybe_fetch(self.other_branch, self.this_branch,
1781
def set_pending(self):
1782
if self._source_subpath != '':
1784
Merger.set_pending(self)
1787
class _MergeTypeParameterizer(object):
1788
"""Wrap a merge-type class to provide extra parameters.
1790
This is hack used by MergeIntoMerger to pass some extra parameters to its
1791
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
1792
the 'merge_type' member. It is difficult override do_merge without
1793
re-writing the whole thing, so instead we create a wrapper which will pass
1794
the extra parameters.
1797
def __init__(self, merge_type, **kwargs):
1798
self._extra_kwargs = kwargs
1799
self._merge_type = merge_type
1801
def __call__(self, *args, **kwargs):
1802
kwargs.update(self._extra_kwargs)
1803
return self._merge_type(*args, **kwargs)
1805
def __getattr__(self, name):
1806
return getattr(self._merge_type, name)
1809
class MergeIntoMergeType(Merge3Merger):
1810
"""Merger that incorporates a tree (or part of a tree) into another."""
1812
def __init__(self, *args, **kwargs):
1813
"""Initialize the merger object.
1815
:param args: See Merge3Merger.__init__'s args.
1816
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
1817
source_subpath and target_subdir.
1818
:keyword source_subpath: The relative path specifying the subtree of
1819
other_tree to merge into this_tree.
1820
:keyword target_subdir: The relative path where we want to merge
1821
other_tree into this_tree
1823
# All of the interesting work happens during Merge3Merger.__init__(),
1824
# so we have have to hack in to get our extra parameters set.
1825
self._source_subpath = kwargs.pop('source_subpath')
1826
self._target_subdir = kwargs.pop('target_subdir')
1827
super(MergeIntoMergeType, self).__init__(*args, **kwargs)
1829
def _compute_transform(self):
1830
with ui.ui_factory.nested_progress_bar() as child_pb:
1831
entries = self._entries_to_incorporate()
1832
entries = list(entries)
1833
for num, (entry, parent_id, relpath) in enumerate(entries):
1834
child_pb.update(gettext('Preparing file merge'),
1836
parent_trans_id = self.tt.trans_id_file_id(parent_id)
1837
path = osutils.pathjoin(self._source_subpath, relpath)
1838
trans_id = transform.new_by_entry(path, self.tt, entry,
1839
parent_trans_id, self.other_tree)
1840
self._finish_computing_transform()
1842
def _entries_to_incorporate(self):
1843
"""Yields pairs of (inventory_entry, new_parent)."""
1844
subdir_id = self.other_tree.path2id(self._source_subpath)
1845
if subdir_id is None:
1846
# XXX: The error would be clearer if it gave the URL of the source
1847
# branch, but we don't have a reference to that here.
1848
raise PathNotInTree(self._source_subpath, "Source tree")
1849
subdir = next(self.other_tree.iter_entries_by_dir(
1850
specific_files=[self._source_subpath]))[1]
1851
parent_in_target = osutils.dirname(self._target_subdir)
1852
target_id = self.this_tree.path2id(parent_in_target)
1853
if target_id is None:
1854
raise PathNotInTree(self._target_subdir, "Target tree")
1855
name_in_target = osutils.basename(self._target_subdir)
1856
merge_into_root = subdir.copy()
1857
merge_into_root.name = name_in_target
1859
self.this_tree.id2path(merge_into_root.file_id)
1860
except errors.NoSuchId:
1863
# Give the root a new file-id.
1864
# This can happen fairly easily if the directory we are
1865
# incorporating is the root, and both trees have 'TREE_ROOT' as
1866
# their root_id. Users will expect this to Just Work, so we
1867
# change the file-id here.
1868
# Non-root file-ids could potentially conflict too. That's really
1869
# an edge case, so we don't do anything special for those. We let
1870
# them cause conflicts.
1871
merge_into_root.file_id = generate_ids.gen_file_id(name_in_target)
1872
yield (merge_into_root, target_id, '')
1873
if subdir.kind != 'directory':
1874
# No children, so we are done.
1876
for path, entry in self.other_tree.root_inventory.iter_entries_by_dir(subdir_id):
1877
parent_id = entry.parent_id
1878
if parent_id == subdir.file_id:
1879
# The root's parent ID has changed, so make sure children of
1880
# the root refer to the new ID.
1881
parent_id = merge_into_root.file_id
1882
yield (entry, parent_id, path)
1885
1758
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
1886
1759
backup_files=False,
1887
1760
merge_type=Merge3Merger,
1761
interesting_ids=None,
1888
1762
show_base=False,
1889
1763
reprocess=False,
1890
1764
other_rev_id=None,
1891
1765
interesting_files=None,
1892
1766
this_tree=None,
1893
1768
change_reporter=None):
1894
1769
"""Primary interface for merging.
1896
Typical use is probably::
1898
merge_inner(branch, branch.get_revision_tree(other_revision),
1899
branch.get_revision_tree(base_revision))
1771
typical use is probably
1772
'merge_inner(branch, branch.get_revision_tree(other_revision),
1773
branch.get_revision_tree(base_revision))'
1901
1775
if this_tree is None:
1902
raise errors.BzrError("breezy.merge.merge_inner requires a this_tree "
1776
raise errors.BzrError("bzrlib.merge.merge_inner requires a this_tree "
1777
"parameter as of bzrlib version 0.8.")
1904
1778
merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
1905
change_reporter=change_reporter)
1779
pb=pb, change_reporter=change_reporter)
1906
1780
merger.backup_files = backup_files
1907
1781
merger.merge_type = merge_type
1782
merger.interesting_ids = interesting_ids
1908
1783
merger.ignore_zero = ignore_zero
1909
merger.interesting_files = interesting_files
1784
if interesting_files:
1786
raise ValueError('Only supply interesting_ids'
1787
' or interesting_files')
1788
merger.interesting_files = interesting_files
1910
1789
merger.show_base = show_base
1911
1790
merger.reprocess = reprocess
1912
1791
merger.other_rev_id = other_rev_id
added
removed
bzrlib/merge.py
