← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:58:39 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219105839-uji05ck4rkm1mj4j
Merge bzr.dev.

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 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 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
from __future__ import absolute_import
 
18
 
16
19
"""\
17
20
This contains functionality for installing bundles into repositories
18
21
"""
19
22
 
20
 
import bzrlib.ui
 
23
from bzrlib import ui
 
24
from bzrlib.i18n import gettext
 
25
from bzrlib.merge import Merger
21
26
from bzrlib.progress import ProgressPhase
22
 
from bzrlib.merge import Merger
23
 
from bzrlib.repository import install_revision
24
27
from bzrlib.trace import note
 
28
from bzrlib.vf_repository import install_revision
25
29
 
26
30
 
27
31
def install_bundle(repository, bundle_reader):
28
32
    custom_install = getattr(bundle_reader, 'install', None)
29
33
    if custom_install is not None:
30
34
        return custom_install(repository)
31
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
35
    pb = ui.ui_factory.nested_progress_bar()
32
36
    repository.lock_write()
33
37
    try:
34
38
        real_revisions = bundle_reader.real_revisions
35
39
        for i, revision in enumerate(reversed(real_revisions)):
36
 
            pb.update("Install revisions",i, len(real_revisions))
 
40
            pb.update(gettext("Install revisions"),i, len(real_revisions))
37
41
            if repository.has_revision(revision.revision_id):
38
42
                continue
39
43
            cset_tree = bundle_reader.revision_tree(repository,
47
51
def merge_bundle(reader, tree, check_clean, merge_type,
48
52
                    reprocess, show_base, change_reporter=None):
49
53
    """Merge a revision bundle into the current tree."""
50
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
54
    pb = ui.ui_factory.nested_progress_bar()
51
55
    try:
52
56
        pp = ProgressPhase("Merge phase", 6, pb)
53
57
        pp.next_phase()
64
68
        merger.pp.next_phase()
65
69
        merger.find_base()
66
70
        if merger.base_rev_id == merger.other_rev_id:
67
 
            note("Nothing to do.")
 
71
            note(gettext("Nothing to do."))
68
72
            return 0
69
73
        merger.merge_type = merge_type
70
74
        merger.show_base = show_base