← 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: Ian Clatworthy
  • Date: 2007-11-30 04:28:32 UTC
  • mto: (3054.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3055.
  • Revision ID: ian.clatworthy@internode.on.net-20071130042832-6prruj0kzg3fodm8
chapter 2 tweaks

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) 2006 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
12
12
#
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
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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 bzrlib import ui
24
 
from bzrlib.i18n import gettext
 
20
import bzrlib.ui
 
21
from bzrlib.progress import ProgressPhase
25
22
from bzrlib.merge import Merger
26
 
from bzrlib.progress import ProgressPhase
 
23
from bzrlib.repository import install_revision
27
24
from bzrlib.trace import note
28
 
from bzrlib.vf_repository import install_revision
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
 
    pb = ui.ui_factory.nested_progress_bar()
 
31
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
36
32
    repository.lock_write()
37
33
    try:
38
34
        real_revisions = bundle_reader.real_revisions
39
35
        for i, revision in enumerate(reversed(real_revisions)):
40
 
            pb.update(gettext("Install revisions"),i, len(real_revisions))
 
36
            pb.update("Install revisions",i, len(real_revisions))
41
37
            if repository.has_revision(revision.revision_id):
42
38
                continue
43
39
            cset_tree = bundle_reader.revision_tree(repository,
48
44
        pb.finished()
49
45
 
50
46
 
51
 
def merge_bundle(reader, tree, check_clean, merge_type,
 
47
def merge_bundle(reader, tree, check_clean, merge_type, 
52
48
                    reprocess, show_base, change_reporter=None):
53
49
    """Merge a revision bundle into the current tree."""
54
 
    pb = ui.ui_factory.nested_progress_bar()
 
50
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
55
51
    try:
56
52
        pp = ProgressPhase("Merge phase", 6, pb)
57
53
        pp.next_phase()
58
54
        install_bundle(tree.branch.repository, reader)
59
 
        merger = Merger(tree.branch, this_tree=tree,
 
55
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
60
56
                        change_reporter=change_reporter)
61
57
        merger.pp = pp
62
58
        merger.pp.next_phase()
63
 
        if check_clean and tree.has_changes():
64
 
            raise errors.UncommittedChanges(self)
 
59
        merger.check_basis(check_clean, require_commits=False)
65
60
        merger.other_rev_id = reader.target
66
61
        merger.other_tree = merger.revision_tree(reader.target)
67
62
        merger.other_basis = reader.target
68
63
        merger.pp.next_phase()
69
64
        merger.find_base()
70
65
        if merger.base_rev_id == merger.other_rev_id:
71
 
            note(gettext("Nothing to do."))
 
66
            note("Nothing to do.")
72
67
            return 0
73
68
        merger.merge_type = merge_type
74
69
        merger.show_base = show_base