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