← 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: Canonical.com Patch Queue Manager
  • Date: 2011-05-04 12:10:51 UTC
  • mfrom: (5819.1.4 777007-developer-doc)
  • Revision ID: pqm@pqm.ubuntu.com-20110504121051-aovlsmqiivjmc4fc
(jelmer) Small fixes to developer documentation. (Jonathan Riddell)

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
This contains functionality for installing bundles into repositories
18
18
"""
19
19
 
20
 
import bzrlib.ui
 
20
from bzrlib import ui
21
21
from bzrlib.progress import ProgressPhase
22
22
from bzrlib.merge import Merger
23
23
from bzrlib.repository import install_revision
25
25
 
26
26
 
27
27
def install_bundle(repository, bundle_reader):
28
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
28
    custom_install = getattr(bundle_reader, 'install', None)
 
29
    if custom_install is not None:
 
30
        return custom_install(repository)
 
31
    pb = ui.ui_factory.nested_progress_bar()
29
32
    repository.lock_write()
30
33
    try:
31
34
        real_revisions = bundle_reader.real_revisions
41
44
        pb.finished()
42
45
 
43
46
 
44
 
def merge_bundle(reader, tree, check_clean, merge_type, 
45
 
                    reprocess, show_base):
 
47
def merge_bundle(reader, tree, check_clean, merge_type,
 
48
                    reprocess, show_base, change_reporter=None):
46
49
    """Merge a revision bundle into the current tree."""
47
 
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
50
    pb = ui.ui_factory.nested_progress_bar()
48
51
    try:
49
52
        pp = ProgressPhase("Merge phase", 6, pb)
50
53
        pp.next_phase()
51
54
        install_bundle(tree.branch.repository, reader)
52
 
        merger = Merger(tree.branch, this_tree=tree, pb=pb)
 
55
        merger = Merger(tree.branch, this_tree=tree,
 
56
                        change_reporter=change_reporter)
53
57
        merger.pp = pp
54
58
        merger.pp.next_phase()
55
 
        merger.check_basis(check_clean, require_commits=False)
 
59
        if check_clean and tree.has_changes():
 
60
            raise errors.UncommittedChanges(self)
56
61
        merger.other_rev_id = reader.target
57
62
        merger.other_tree = merger.revision_tree(reader.target)
58
63
        merger.other_basis = reader.target