← 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: 2009-01-19 02:24:15 UTC
  • mto: This revision was merged to the branch mainline in revision 3944.
  • Revision ID: ian.clatworthy@canonical.com-20090119022415-mo0mcfeiexfktgwt
apply jam's log --short fix (Ian Clatworthy)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
1
16
"""\
2
17
This contains functionality for installing bundles into repositories
3
18
"""
10
25
 
11
26
 
12
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)
13
31
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
14
32
    repository.lock_write()
15
33
    try:
16
 
        real_revisions = bundle_reader.info.real_revisions
 
34
        real_revisions = bundle_reader.real_revisions
17
35
        for i, revision in enumerate(reversed(real_revisions)):
18
36
            pb.update("Install revisions",i, len(real_revisions))
19
37
            if repository.has_revision(revision.revision_id):
27
45
 
28
46
 
29
47
def merge_bundle(reader, tree, check_clean, merge_type, 
30
 
                    reprocess, show_base):
 
48
                    reprocess, show_base, change_reporter=None):
31
49
    """Merge a revision bundle into the current tree."""
32
50
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
33
51
    try:
34
52
        pp = ProgressPhase("Merge phase", 6, pb)
35
53
        pp.next_phase()
36
54
        install_bundle(tree.branch.repository, reader)
37
 
        merger = Merger(tree.branch, this_tree=tree, pb=pb)
 
55
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
 
56
                        change_reporter=change_reporter)
38
57
        merger.pp = pp
39
58
        merger.pp.next_phase()
40
59
        merger.check_basis(check_clean, require_commits=False)
41
 
        merger.other_rev_id = reader.info.target
42
 
        merger.other_tree = merger.revision_tree(reader.info.target)
43
 
        merger.other_basis = reader.info.target
 
60
        merger.other_rev_id = reader.target
 
61
        merger.other_tree = merger.revision_tree(reader.target)
 
62
        merger.other_basis = reader.target
44
63
        merger.pp.next_phase()
45
64
        merger.find_base()
46
65
        if merger.base_rev_id == merger.other_rev_id: