← 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: 2007-01-24 17:06:02 UTC
  • mfrom: (2193.4.3 miss.last-file-location)
  • Revision ID: pqm@pqm.ubuntu.com-20070124170602-5f008e922b3dd800
(bialix) 'bzr missing' show remembered location unescaped,and show
 file URL as filepath not a URL.

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) 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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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)
31
28
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
32
29
    repository.lock_write()
33
30
    try:
44
41
        pb.finished()
45
42
 
46
43
 
47
 
def merge_bundle(reader, tree, check_clean, merge_type,
48
 
                    reprocess, show_base, change_reporter=None):
 
44
def merge_bundle(reader, tree, check_clean, merge_type, 
 
45
                    reprocess, show_base):
49
46
    """Merge a revision bundle into the current tree."""
50
47
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
51
48
    try:
52
49
        pp = ProgressPhase("Merge phase", 6, pb)
53
50
        pp.next_phase()
54
51
        install_bundle(tree.branch.repository, reader)
55
 
        merger = Merger(tree.branch, this_tree=tree,
56
 
                        change_reporter=change_reporter)
 
52
        merger = Merger(tree.branch, this_tree=tree, pb=pb)
57
53
        merger.pp = pp
58
54
        merger.pp.next_phase()
59
 
        if check_clean and tree.has_changes():
60
 
            raise errors.UncommittedChanges(self)
 
55
        merger.check_basis(check_clean, require_commits=False)
61
56
        merger.other_rev_id = reader.target
62
57
        merger.other_tree = merger.revision_tree(reader.target)
63
58
        merger.other_basis = reader.target