← 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: Vincent Ladeuil
  • Date: 2012-07-31 09:22:02 UTC
  • mto: This revision was merged to the branch mainline in revision 6554.
  • Revision ID: v.ladeuil+lp@free.fr-20120731092202-qh9fs6q4p7y4qqmy
Stop using _CompatibleStack now that local config files can be
shared. Save changes when library state goes out of scope or, as a
fallback, when the process ends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
1
 
# Copyright (C) 2006 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
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
16
17
"""\
17
18
This contains functionality for installing bundles into repositories
18
19
"""
19
20
 
20
 
import bzrlib.ui
 
21
from __future__ import absolute_import
 
22
 
 
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
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
32
    custom_install = getattr(bundle_reader, 'install', None)
 
33
    if custom_install is not None:
 
34
        return custom_install(repository)
 
35
    pb = ui.ui_factory.nested_progress_bar()
29
36
    repository.lock_write()
30
37
    try:
31
38
        real_revisions = bundle_reader.real_revisions
32
39
        for i, revision in enumerate(reversed(real_revisions)):
33
 
            pb.update("Install revisions",i, len(real_revisions))
 
40
            pb.update(gettext("Install revisions"),i, len(real_revisions))
34
41
            if repository.has_revision(revision.revision_id):
35
42
                continue
36
43
            cset_tree = bundle_reader.revision_tree(repository,
41
48
        pb.finished()
42
49
 
43
50
 
44
 
def merge_bundle(reader, tree, check_clean, merge_type, 
 
51
def merge_bundle(reader, tree, check_clean, merge_type,
45
52
                    reprocess, show_base, change_reporter=None):
46
53
    """Merge a revision bundle into the current tree."""
47
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
54
    pb = ui.ui_factory.nested_progress_bar()
48
55
    try:
49
56
        pp = ProgressPhase("Merge phase", 6, pb)
50
57
        pp.next_phase()
51
58
        install_bundle(tree.branch.repository, reader)
52
 
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
 
59
        merger = Merger(tree.branch, this_tree=tree,
53
60
                        change_reporter=change_reporter)
54
61
        merger.pp = pp
55
62
        merger.pp.next_phase()
56
 
        merger.check_basis(check_clean, require_commits=False)
 
63
        if check_clean and tree.has_changes():
 
64
            raise errors.UncommittedChanges(self)
57
65
        merger.other_rev_id = reader.target
58
66
        merger.other_tree = merger.revision_tree(reader.target)
59
67
        merger.other_basis = reader.target
60
68
        merger.pp.next_phase()
61
69
        merger.find_base()
62
70
        if merger.base_rev_id == merger.other_rev_id:
63
 
            note("Nothing to do.")
 
71
            note(gettext("Nothing to do."))
64
72
            return 0
65
73
        merger.merge_type = merge_type
66
74
        merger.show_base = show_base