301
256
ignore_zero - If true, suppress the "zero conflicts" message when
302
257
there are no conflicts; should be set when doing something we expect
303
258
to complete perfectly.
304
file_list - If supplied, merge only changes to selected files.
306
260
All available ancestors of other_revision and base_revision are
307
261
automatically pulled into the branch.
309
The revno may be -1 to indicate the last revision on the branch, which is
312
This function is intended for use from the command line; programmatic
313
clients might prefer to call merge_inner(), which has less magic behavior.
317
this_branch = Branch.open_containing(this_dir)[0]
318
if show_base and not merge_type is ApplyMerge3:
319
raise BzrCommandError("Show-base is not supported for this merge"
320
" type. %s" % merge_type)
321
if reprocess and not merge_type is ApplyMerge3:
322
raise BzrCommandError("Reprocess is not supported for this merge"
323
" type. %s" % merge_type)
324
if reprocess and show_base:
325
raise BzrCommandError("Cannot reprocess and show base.")
326
merger = Merger(this_branch)
327
merger.check_basis(check_clean)
328
merger.set_other(other_revision)
329
merger.set_base(base_revision)
330
if merger.base_rev_id == merger.other_rev_id:
331
note('Nothing to do.')
333
merger.backup_files = backup_files
334
merger.merge_type = merge_type
335
merger.set_interesting_files(file_list)
336
merger.show_base = show_base
337
merger.reprocess = reprocess
338
merger.conflict_handler = MergeConflictHandler(merger.this_tree,
341
ignore_zero=ignore_zero)
342
conflicts = merger.do_merge()
346
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
348
merge_type=ApplyMerge3,
349
interesting_ids=None,
353
interesting_files=None):
354
"""Primary interface for merging.
356
typical use is probably
357
'merge_inner(branch, branch.get_revision_tree(other_revision),
358
branch.get_revision_tree(base_revision))'
360
merger = Merger(this_branch, other_tree, base_tree)
361
merger.backup_files = backup_files
362
merger.merge_type = merge_type
363
merger.interesting_ids = interesting_ids
364
if interesting_files:
365
assert not interesting_ids, ('Only supply interesting_ids'
366
' or interesting_files')
367
merger._set_interesting_files(interesting_files)
368
merger.show_base = show_base
369
merger.reprocess = reprocess
370
merger.conflict_handler = MergeConflictHandler(merger.this_tree, base_tree,
372
ignore_zero=ignore_zero)
373
merger.other_rev_id = other_rev_id
374
merger.other_basis = other_rev_id
375
return merger.do_merge()
378
class Merger(object):
379
def __init__(self, this_branch, other_tree=None, base_tree=None):
380
object.__init__(self)
381
self.this_branch = this_branch
382
self.this_basis = this_branch.last_revision()
383
self.this_rev_id = None
384
self.this_tree = this_branch.working_tree()
385
self.this_revision_tree = None
386
self.this_basis_tree = None
387
self.other_tree = other_tree
388
self.base_tree = base_tree
389
self.ignore_zero = False
390
self.backup_files = False
391
self.interesting_ids = None
392
self.show_base = False
393
self.reprocess = False
394
self.conflict_handler = MergeConflictHandler(self.this_tree, base_tree,
397
def revision_tree(self, revision_id):
398
return self.this_branch.revision_tree(revision_id)
400
def ensure_revision_trees(self):
401
if self.this_revision_tree is None:
402
self.this_basis_tree = self.this_branch.revision_tree(
404
if self.this_basis == self.this_rev_id:
405
self.this_revision_tree = self.this_basis_tree
408
if self.other_rev_id is None:
409
other_basis_tree = self.revision_tree(self.other_basis)
410
changes = compare_trees(self.other_tree, other_basis_tree)
411
if changes.has_changed():
412
raise WorkingTreeNotRevision(self.this_tree)
413
other_rev_id = other_basis
414
self.other_tree = other_basis_tree
417
def file_revisions(self, file_id):
418
self.ensure_revision_trees()
419
def get_id(tree, file_id):
420
revision_id = tree.inventory[file_id].revision
421
assert revision_id is not None
423
if self.this_rev_id is None:
424
if self.this_basis_tree.get_file_sha1(file_id) != \
425
self.this_tree.get_file_sha1(file_id):
426
raise WorkingTreeNotRevision(self.this_tree)
428
trees = (self.this_basis_tree, self.other_tree)
429
return [get_id(tree, file_id) for tree in trees]
432
def merge_factory(self, file_id, base, other):
433
if self.merge_type.history_based:
434
if self.show_base is True:
435
raise BzrError("Cannot show base for hisory-based merges")
436
if self.reprocess is True:
437
raise BzrError("Cannot reprocess history-based merges")
439
t_revid, o_revid = self.file_revisions(file_id)
440
weave = self.this_basis_tree.get_weave(file_id)
441
contents_change = self.merge_type(weave, t_revid, o_revid)
443
if self.show_base is True or self.reprocess is True:
444
contents_change = self.merge_type(file_id, base, other,
445
show_base=self.show_base,
446
reprocess=self.reprocess)
448
contents_change = self.merge_type(file_id, base, other)
449
if self.backup_files:
450
contents_change = BackupBeforeChange(contents_change)
451
return contents_change
453
def check_basis(self, check_clean):
454
if self.this_basis is None:
263
tempdir = tempfile.mkdtemp(prefix="bzr-")
267
this_branch = Branch.open_containing(this_dir)
268
this_rev_id = this_branch.last_revision()
269
if this_rev_id is None:
455
270
raise BzrCommandError("This branch has no commits")
458
if self.this_basis != self.this_rev_id:
272
changes = compare_trees(this_branch.working_tree(),
273
this_branch.basis_tree(), False)
274
if changes.has_changed():
459
275
raise BzrCommandError("Working tree has uncommitted changes.")
461
def compare_basis(self):
462
changes = compare_trees(self.this_branch.working_tree(),
463
self.this_branch.basis_tree(), False)
464
if not changes.has_changed():
465
self.this_rev_id = self.this_basis
467
def set_interesting_files(self, file_list):
469
self._set_interesting_files(file_list)
470
except NotVersionedError, e:
471
raise BzrCommandError("%s is not a source file in any"
474
def _set_interesting_files(self, file_list):
475
"""Set the list of interesting ids from a list of files."""
476
if file_list is None:
477
self.interesting_ids = None
480
interesting_ids = set()
481
for fname in file_list:
482
path = self.this_tree.relpath(fname)
484
for tree in (self.this_tree, self.base_tree, self.other_tree):
485
file_id = tree.inventory.path2id(path)
486
if file_id is not None:
487
interesting_ids.add(file_id)
490
raise NotVersionedError(path=fname)
491
self.interesting_ids = interesting_ids
493
def set_pending(self):
494
if not self.base_is_ancestor:
496
if self.other_rev_id is None:
498
if self.other_rev_id in self.this_branch.get_ancestry(self.this_basis):
500
self.this_branch.working_tree().add_pending_merge(self.other_rev_id)
502
def set_other(self, other_revision):
503
other_branch, self.other_tree = get_tree(other_revision,
276
other_branch, other_tree = get_tree(other_revision, this_branch)
505
277
if other_revision[1] == -1:
506
self.other_rev_id = other_branch.last_revision()
507
if self.other_rev_id is None:
278
other_rev_id = other_branch.last_revision()
279
if other_rev_id is None:
508
280
raise NoCommits(other_branch)
509
self.other_basis = self.other_rev_id
281
other_basis = other_rev_id
510
282
elif other_revision[1] is not None:
511
self.other_rev_id = other_branch.get_rev_id(other_revision[1])
512
self.other_basis = self.other_rev_id
283
other_rev_id = other_branch.get_rev_id(other_revision[1])
284
other_basis = other_rev_id
514
self.other_rev_id = None
515
self.other_basis = other_branch.last_revision()
516
if self.other_basis is None:
287
other_basis = other_branch.last_revision()
288
if other_basis is None:
517
289
raise NoCommits(other_branch)
518
fetch(from_branch=other_branch, to_branch=self.this_branch,
519
last_revision=self.other_basis)
521
def set_base(self, base_revision):
522
mutter("doing merge() with no base_revision specified")
523
290
if base_revision == [None, None]:
525
self.base_rev_id = common_ancestor(self.this_basis,
292
base_rev_id = common_ancestor(this_rev_id, other_basis,
528
294
except NoCommonAncestor:
529
295
raise UnrelatedBranches()
530
self.base_tree = get_revid_tree(self.this_branch, self.base_rev_id,
532
self.base_is_ancestor = True
296
base_tree = get_revid_tree(this_branch, base_rev_id, None)
297
base_is_ancestor = True
534
base_branch, self.base_tree = get_tree(base_revision)
299
base_branch, base_tree = get_tree(base_revision)
535
300
if base_revision[1] == -1:
536
self.base_rev_id = base_branch.last_revision()
301
base_rev_id = base_branch.last_revision()
537
302
elif base_revision[1] is None:
538
self.base_rev_id = None
540
self.base_rev_id = base_branch.get_rev_id(base_revision[1])
541
fetch(from_branch=base_branch, to_branch=self.this_branch)
542
self.base_is_ancestor = is_ancestor(self.this_basis,
547
def get_inventory(tree):
548
return tree.inventory
550
inv_changes = merge_flex(self.this_tree, self.base_tree,
552
generate_changeset, get_inventory,
553
self.conflict_handler,
554
merge_factory=self.merge_factory,
555
interesting_ids=self.interesting_ids)
558
for id, path in inv_changes.iteritems():
563
assert path.startswith('.' + '/') or path.startswith('.' + '\\'), "path is %s" % path
565
adjust_ids.append((path, id))
566
if len(adjust_ids) > 0:
567
self.this_branch.working_tree().set_inventory(self.regen_inventory(adjust_ids))
568
conflicts = self.conflict_handler.conflicts
569
self.conflict_handler.finalize()
572
def regen_inventory(self, new_entries):
573
old_entries = self.this_branch.working_tree().read_working_inventory()
577
for path, file_id in new_entries:
580
new_entries_map[file_id] = path
582
def id2path(file_id):
583
path = new_entries_map.get(file_id)
586
entry = old_entries[file_id]
587
if entry.parent_id is None:
589
return os.path.join(id2path(entry.parent_id), entry.name)
591
for file_id in old_entries:
592
entry = old_entries[file_id]
593
path = id2path(file_id)
594
new_inventory[file_id] = (path, file_id, entry.parent_id,
596
by_path[path] = file_id
601
for path, file_id in new_entries:
603
del new_inventory[file_id]
606
new_path_list.append((path, file_id))
607
if file_id not in old_entries:
609
# Ensure no file is added before its parent
611
for path, file_id in new_path_list:
615
parent = by_path[os.path.dirname(path)]
616
abspath = os.path.join(self.this_tree.basedir, path)
617
kind = bzrlib.osutils.file_kind(abspath)
618
new_inventory[file_id] = (path, file_id, parent, kind)
619
by_path[path] = file_id
621
# Get a list in insertion order
622
new_inventory_list = new_inventory.values()
623
mutter ("""Inventory regeneration:
624
old length: %i insertions: %i deletions: %i new_length: %i"""\
625
% (len(old_entries), insertions, deletions,
626
len(new_inventory_list)))
627
assert len(new_inventory_list) == len(old_entries) + insertions\
629
new_inventory_list.sort()
630
return new_inventory_list
305
base_rev_id = base_branch.get_rev_id(base_revision[1])
306
fetch(from_branch=base_branch, to_branch=this_branch)
307
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
309
if file_list is None:
310
interesting_ids = None
312
interesting_ids = set()
313
this_tree = this_branch.working_tree()
314
for fname in file_list:
315
path = this_tree.relpath(fname)
317
for tree in (this_tree, base_tree, other_tree):
318
file_id = tree.inventory.path2id(path)
319
if file_id is not None:
320
interesting_ids.add(file_id)
323
raise BzrCommandError("%s is not a source file in any"
325
merge_inner(this_branch, other_tree, base_tree, tempdir,
326
ignore_zero=ignore_zero, backup_files=backup_files,
327
merge_type=merge_type, interesting_ids=interesting_ids)
328
if base_is_ancestor and other_rev_id is not None\
329
and other_rev_id not in this_branch.revision_history():
330
this_branch.add_pending_merge(other_rev_id)
332
shutil.rmtree(tempdir)
335
def set_interesting(inventory_a, inventory_b, interesting_ids):
336
"""Mark files whose ids are in interesting_ids as interesting
338
for inventory in (inventory_a, inventory_b):
339
for path, source_file in inventory.iteritems():
340
source_file.interesting = source_file.id in interesting_ids
343
def merge_inner(this_branch, other_tree, base_tree, tempdir,
344
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
345
interesting_ids=None):
347
def merge_factory(file_id, base, other):
348
contents_change = merge_type(file_id, base, other)
350
contents_change = BackupBeforeChange(contents_change)
351
return contents_change
353
this_tree = get_tree((this_branch.base, None))[1]
355
def get_inventory(tree):
356
return tree.inventory
358
inv_changes = merge_flex(this_tree, base_tree, other_tree,
359
generate_changeset, get_inventory,
360
MergeConflictHandler(this_tree, base_tree,
361
other_tree, ignore_zero=ignore_zero),
362
merge_factory=merge_factory,
363
interesting_ids=interesting_ids)
366
for id, path in inv_changes.iteritems():
371
assert path.startswith('.' + os.sep), "path is %s" % path
373
adjust_ids.append((path, id))
374
if len(adjust_ids) > 0:
375
this_branch.set_inventory(regen_inventory(this_branch,
380
def regen_inventory(this_branch, root, new_entries):
381
old_entries = this_branch.read_working_inventory()
385
for path, file_id in new_entries:
388
new_entries_map[file_id] = path
390
def id2path(file_id):
391
path = new_entries_map.get(file_id)
394
entry = old_entries[file_id]
395
if entry.parent_id is None:
397
return os.path.join(id2path(entry.parent_id), entry.name)
399
for file_id in old_entries:
400
entry = old_entries[file_id]
401
path = id2path(file_id)
402
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
403
by_path[path] = file_id
408
for path, file_id in new_entries:
410
del new_inventory[file_id]
413
new_path_list.append((path, file_id))
414
if file_id not in old_entries:
416
# Ensure no file is added before its parent
418
for path, file_id in new_path_list:
422
parent = by_path[os.path.dirname(path)]
423
kind = bzrlib.osutils.file_kind(os.path.join(root, path))
424
new_inventory[file_id] = (path, file_id, parent, kind)
425
by_path[path] = file_id
427
# Get a list in insertion order
428
new_inventory_list = new_inventory.values()
429
mutter ("""Inventory regeneration:
430
old length: %i insertions: %i deletions: %i new_length: %i"""\
431
% (len(old_entries), insertions, deletions, len(new_inventory_list)))
432
assert len(new_inventory_list) == len(old_entries) + insertions - deletions
433
new_inventory_list.sort()
434
return new_inventory_list
632
436
merge_types = { "merge3": (ApplyMerge3, "Native diff3-style merge"),
633
"diff3": (Diff3Merge, "Merge using external diff3"),
634
'weave': (WeaveMerge, "Weave-based merge")
437
"diff3": (Diff3Merge, "Merge using external diff3")
added
removed
bzrlib/merge.py
