/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: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
16
"""\
18
17
This contains functionality for installing bundles into repositories
19
18
"""
20
19
 
21
 
from __future__ import absolute_import
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
 
20
import bzrlib.ui
 
21
from bzrlib.progress import ProgressPhase
 
22
from bzrlib.merge import Merger
 
23
from bzrlib.repository import install_revision
 
24
from bzrlib.trace import note
29
25
 
30
26
 
31
27
def install_bundle(repository, bundle_reader):
32
28
    custom_install = getattr(bundle_reader, 'install', None)
33
29
    if custom_install is not None:
34
30
        return custom_install(repository)
35
 
    with repository.lock_write(), ui.ui_factory.nested_progress_bar() as pb:
 
31
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
32
    repository.lock_write()
 
33
    try:
36
34
        real_revisions = bundle_reader.real_revisions
37
35
        for i, revision in enumerate(reversed(real_revisions)):
38
 
            pb.update(gettext("Install revisions"), i, len(real_revisions))
 
36
            pb.update("Install revisions",i, len(real_revisions))
39
37
            if repository.has_revision(revision.revision_id):
40
38
                continue
41
39
            cset_tree = bundle_reader.revision_tree(repository,
42
 
                                                    revision.revision_id)
 
40
                                                       revision.revision_id)
43
41
            install_revision(repository, revision, cset_tree)
 
42
    finally:
 
43
        repository.unlock()
 
44
        pb.finished()
44
45
 
45
46
 
46
47
def merge_bundle(reader, tree, check_clean, merge_type,
47
 
                 reprocess, show_base, change_reporter=None):
 
48
                    reprocess, show_base, change_reporter=None):
48
49
    """Merge a revision bundle into the current tree."""
49
 
    with ui.ui_factory.nested_progress_bar() as pb:
 
50
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
51
    try:
50
52
        pp = ProgressPhase("Merge phase", 6, pb)
51
53
        pp.next_phase()
52
54
        install_bundle(tree.branch.repository, reader)
62
64
        merger.pp.next_phase()
63
65
        merger.find_base()
64
66
        if merger.base_rev_id == merger.other_rev_id:
65
 
            note(gettext("Nothing to do."))
 
67
            note("Nothing to do.")
66
68
            return 0
67
69
        merger.merge_type = merge_type
68
70
        merger.show_base = show_base
69
71
        merger.reprocess = reprocess
70
72
        conflicts = merger.do_merge()
71
73
        merger.set_pending()
 
74
    finally:
 
75
        pb.clear()
72
76
    return conflicts