/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-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/apply_bundle.py
20
20
 
21
21
from __future__ import absolute_import
22
22
 
23
 
from ... import ui
24
 
from ...i18n import gettext
25
 
from ...merge import Merger
26
 
from ...progress import ProgressPhase
27
 
from ...trace import note
28
 
from ..vf_repository import install_revision
 
23
from .. import ui
 
24
from ..i18n import gettext
 
25
from ..merge import Merger
 
26
from ..progress import ProgressPhase
 
27
from ..trace import note
 
28
from ..bzr.vf_repository import install_revision
29
29
 
30
30
 
31
31
def install_bundle(repository, bundle_reader):
39
39
            if repository.has_revision(revision.revision_id):
40
40
                continue
41
41
            cset_tree = bundle_reader.revision_tree(repository,
42
 
                                                    revision.revision_id)
 
42
                                                       revision.revision_id)
43
43
            install_revision(repository, revision, cset_tree)
44
44
 
45
45
 
46
46
def merge_bundle(reader, tree, check_clean, merge_type,
47
 
                 reprocess, show_base, change_reporter=None):
 
47
                    reprocess, show_base, change_reporter=None):
48
48
    """Merge a revision bundle into the current tree."""
49
 
    with ui.ui_factory.nested_progress_bar() as pb:
 
49
    pb = ui.ui_factory.nested_progress_bar()
 
50
    try:
50
51
        pp = ProgressPhase("Merge phase", 6, pb)
51
52
        pp.next_phase()
52
53
        install_bundle(tree.branch.repository, reader)
69
70
        merger.reprocess = reprocess
70
71
        conflicts = merger.do_merge()
71
72
        merger.set_pending()
 
73
    finally:
 
74
        pb.clear()
72
75
    return conflicts