← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

  • Committer: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
25
25
 
26
26
 
27
27
def install_bundle(repository, bundle_reader):
28
 
    custom_install = getattr(bundle_reader, 'install', None)
29
 
    if custom_install is not None:
30
 
        return custom_install(repository)
31
28
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
32
29
    repository.lock_write()
33
30
    try:
45
42
 
46
43
 
47
44
def merge_bundle(reader, tree, check_clean, merge_type, 
48
 
                    reprocess, show_base, change_reporter=None):
 
45
                    reprocess, show_base):
49
46
    """Merge a revision bundle into the current tree."""
50
47
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
51
48
    try:
52
49
        pp = ProgressPhase("Merge phase", 6, pb)
53
50
        pp.next_phase()
54
51
        install_bundle(tree.branch.repository, reader)
55
 
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
56
 
                        change_reporter=change_reporter)
 
52
        merger = Merger(tree.branch, this_tree=tree, pb=pb)
57
53
        merger.pp = pp
58
54
        merger.pp.next_phase()
59
55
        merger.check_basis(check_clean, require_commits=False)