1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
"""\
This contains functionality for installing bundles into repositories
"""
import bzrlib.ui
from bzrlib.progress import ProgressPhase
from bzrlib.merge import Merger
from bzrlib.repository import install_revision
from bzrlib.trace import note
def install_bundle(repository, bundle_reader):
pb = bzrlib.ui.ui_factory.nested_progress_bar()
repository.lock_write()
try:
real_revisions = bundle_reader.real_revisions
for i, revision in enumerate(reversed(real_revisions)):
pb.update("Install revisions",i, len(real_revisions))
if repository.has_revision(revision.revision_id):
continue
cset_tree = bundle_reader.revision_tree(repository,
revision.revision_id)
install_revision(repository, revision, cset_tree)
finally:
repository.unlock()
pb.finished()
def merge_bundle(reader, tree, check_clean, merge_type,
reprocess, show_base):
"""Merge a revision bundle into the current tree."""
pb = bzrlib.ui.ui_factory.nested_progress_bar()
try:
pp = ProgressPhase("Merge phase", 6, pb)
pp.next_phase()
install_bundle(tree.branch.repository, reader)
merger = Merger(tree.branch, this_tree=tree, pb=pb)
merger.pp = pp
merger.pp.next_phase()
merger.check_basis(check_clean, require_commits=False)
merger.other_rev_id = reader.target
merger.other_tree = merger.revision_tree(reader.target)
merger.other_basis = reader.target
merger.pp.next_phase()
merger.find_base()
if merger.base_rev_id == merger.other_rev_id:
note("Nothing to do.")
return 0
merger.merge_type = merge_type
merger.show_base = show_base
merger.reprocess = reprocess
conflicts = merger.do_merge()
merger.set_pending()
finally:
pb.clear()
return conflicts
|