/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 bzrlib/bundle/apply_bundle.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/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 ..bzr.vf_repository import install_revision
 
23
from bzrlib import ui
 
24
from bzrlib.i18n import gettext
 
25
from bzrlib.merge import Merger
 
26
from bzrlib.progress import ProgressPhase
 
27
from bzrlib.trace import note
 
28
from bzrlib.vf_repository import install_revision
29
29
 
30
30
 
31
31
def install_bundle(repository, bundle_reader):
32
32
    custom_install = getattr(bundle_reader, 'install', None)
33
33
    if custom_install is not None:
34
34
        return custom_install(repository)
35
 
    with repository.lock_write(), ui.ui_factory.nested_progress_bar() as pb:
 
35
    pb = ui.ui_factory.nested_progress_bar()
 
36
    repository.lock_write()
 
37
    try:
36
38
        real_revisions = bundle_reader.real_revisions
37
39
        for i, revision in enumerate(reversed(real_revisions)):
38
 
            pb.update(gettext("Install revisions"), i, len(real_revisions))
 
40
            pb.update(gettext("Install revisions"),i, len(real_revisions))
39
41
            if repository.has_revision(revision.revision_id):
40
42
                continue
41
43
            cset_tree = bundle_reader.revision_tree(repository,
42
44
                                                       revision.revision_id)
43
45
            install_revision(repository, revision, cset_tree)
 
46
    finally:
 
47
        repository.unlock()
 
48
        pb.finished()
44
49
 
45
50
 
46
51
def merge_bundle(reader, tree, check_clean, merge_type,