← 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: Andrew Bennetts
  • Date: 2010-10-08 04:25:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5472.
  • Revision ID: andrew.bennetts@canonical.com-20101008042510-sg9vdhmnggilzxsk
Fix stray TAB in source.

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 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
"""
25
25
 
26
26
 
27
27
def install_bundle(repository, bundle_reader):
 
28
    custom_install = getattr(bundle_reader, 'install', None)
 
29
    if custom_install is not None:
 
30
        return custom_install(repository)
28
31
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
29
32
    repository.lock_write()
30
33
    try:
41
44
        pb.finished()
42
45
 
43
46
 
44
 
def merge_bundle(reader, tree, check_clean, merge_type, 
 
47
def merge_bundle(reader, tree, check_clean, merge_type,
45
48
                    reprocess, show_base, change_reporter=None):
46
49
    """Merge a revision bundle into the current tree."""
47
50
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
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,
53
56
                        change_reporter=change_reporter)
54
57
        merger.pp = pp
55
58
        merger.pp.next_phase()
56
 
        merger.check_basis(check_clean, require_commits=False)
 
59
        if check_clean and tree.has_changes():
 
60
            raise errors.UncommittedChanges(self)
57
61
        merger.other_rev_id = reader.target
58
62
        merger.other_tree = merger.revision_tree(reader.target)
59
63
        merger.other_basis = reader.target