/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/bundle/apply_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-06 01:18:08 UTC
  • mfrom: (7143 work)
  • mto: This revision was merged to the branch mainline in revision 7151.
  • Revision ID: jelmer@jelmer.uk-20181106011808-y870f4vq0ork3ahu
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/apply_bundle.py
46
46
def merge_bundle(reader, tree, check_clean, merge_type,
47
47
                    reprocess, show_base, change_reporter=None):
48
48
    """Merge a revision bundle into the current tree."""
49
 
    pb = ui.ui_factory.nested_progress_bar()
50
 
    try:
 
49
    with ui.ui_factory.nested_progress_bar() as pb:
51
50
        pp = ProgressPhase("Merge phase", 6, pb)
52
51
        pp.next_phase()
53
52
        install_bundle(tree.branch.repository, reader)
70
69
        merger.reprocess = reprocess
71
70
        conflicts = merger.do_merge()
72
71
        merger.set_pending()
73
 
    finally:
74
 
        pb.clear()
75
72
    return conflicts