/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-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/apply_bundle.py
32
32
    custom_install = getattr(bundle_reader, 'install', None)
33
33
    if custom_install is not None:
34
34
        return custom_install(repository)
35
 
    pb = ui.ui_factory.nested_progress_bar()
36
 
    repository.lock_write()
37
 
    try:
 
35
    with repository.lock_write(), ui.ui_factory.nested_progress_bar() as pb:
38
36
        real_revisions = bundle_reader.real_revisions
39
37
        for i, revision in enumerate(reversed(real_revisions)):
40
38
            pb.update(gettext("Install revisions"), i, len(real_revisions))
43
41
            cset_tree = bundle_reader.revision_tree(repository,
44
42
                                                       revision.revision_id)
45
43
            install_revision(repository, revision, cset_tree)
46
 
    finally:
47
 
        repository.unlock()
48
 
        pb.finished()
49
44
 
50
45
 
51
46
def merge_bundle(reader, tree, check_clean, merge_type,