166
166
def merge(other_revision, base_revision,
167
167
check_clean=True, ignore_zero=False,
168
this_dir=None, backup_files=False, merge_type=ApplyMerge3):
168
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
169
170
"""Merge changes into a tree.
200
201
raise UnrelatedBranches()
201
202
base_revision = ['.', base_revno]
202
203
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
204
if file_list is None:
205
interesting_ids = None
207
interesting_ids = set()
208
this_tree = this_branch.working_tree()
209
for fname in file_list:
210
path = this_branch.relpath(fname)
212
for tree in (this_tree, base_tree.tree, other_tree.tree):
213
file_id = tree.inventory.path2id(path)
214
if file_id is not None:
215
interesting_ids.add(file_id)
218
raise BzrCommandError("%s is not a source file in any"
203
220
merge_inner(this_branch, other_tree, base_tree, tempdir,
204
221
ignore_zero=ignore_zero, backup_files=backup_files,
205
merge_type=merge_type)
222
merge_type=merge_type, interesting_ids=interesting_ids)
207
224
shutil.rmtree(tempdir)
210
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b):
211
"""Generate a changeset, using the text_id to mark really-changed files.
212
This permits blazing comparisons when text_ids are present. It also
213
disables metadata comparison for files with identical texts.
227
def set_interesting(inventory_a, inventory_b, interesting_ids):
228
"""Mark files whose ids are in interesting_ids as interesting
230
for inventory in (inventory_a, inventory_b):
231
for path, source_file in inventory.iteritems():
232
source_file.interesting = source_file.id in interesting_ids
235
def set_optimized(tree_a, tree_b, inventory_a, inventory_b):
236
"""Mark files that have changed texts as interesting
215
238
for file_id in tree_a.tree.inventory:
216
239
if file_id not in tree_b.tree.inventory:
226
249
inventory_a[abspath(tree_a.tree, file_id)].interesting = False
227
250
inventory_b[abspath(tree_b.tree, file_id)].interesting = False
253
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
254
interesting_ids=None):
255
"""Generate a changeset, with preprocessing to select interesting files.
256
using the text_id to mark really-changed files.
257
This permits blazing comparisons when text_ids are present. It also
258
disables metadata comparison for files with identical texts.
260
if interesting_ids is None:
261
set_optimized(tree_a, tree_b, inventory_a, inventory_b)
263
set_interesting(inventory_a, inventory_b, interesting_ids)
228
264
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
229
265
for entry in cset.entries.itervalues():
230
266
entry.metadata_change = None
234
270
def merge_inner(this_branch, other_tree, base_tree, tempdir,
235
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False):
271
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
272
interesting_ids=None):
237
274
def merge_factory(base_file, other_file):
238
275
contents_change = merge_type(base_file, other_file)
240
277
contents_change = BackupBeforeChange(contents_change)
241
278
return contents_change
280
def generate_cset(tree_a, tree_b, inventory_a, inventory_b):
281
return generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
243
284
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
246
287
return tree.inventory
248
289
inv_changes = merge_flex(this_tree, base_tree, other_tree,
249
generate_cset_optimized, get_inventory,
290
generate_cset, get_inventory,
250
291
MergeConflictHandler(base_tree.root,
251
292
ignore_zero=ignore_zero),
252
293
merge_factory=merge_factory)