/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

  • Committer: Robert Collins
  • Date: 2007-03-08 04:06:06 UTC
  • mfrom: (2323.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070308040606-84gsniv56huiyjt4
Merge bzr.dev.

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
"""
6
21
from bzrlib.progress import ProgressPhase
7
22
from bzrlib.merge import Merger
8
23
from bzrlib.repository import install_revision
 
24
from bzrlib.trace import note
9
25
 
10
26
 
11
27
def install_bundle(repository, bundle_reader):
12
28
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
13
29
    repository.lock_write()
14
30
    try:
15
 
        real_revisions = bundle_reader.info.real_revisions
 
31
        real_revisions = bundle_reader.real_revisions
16
32
        for i, revision in enumerate(reversed(real_revisions)):
17
33
            pb.update("Install revisions",i, len(real_revisions))
18
34
            if repository.has_revision(revision.revision_id):
26
42
 
27
43
 
28
44
def merge_bundle(reader, tree, check_clean, merge_type, 
29
 
                    reprocess, show_base):
 
45
                    reprocess, show_base, change_reporter=None):
30
46
    """Merge a revision bundle into the current tree."""
31
47
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
32
48
    try:
33
49
        pp = ProgressPhase("Merge phase", 6, pb)
34
50
        pp.next_phase()
35
51
        install_bundle(tree.branch.repository, reader)
36
 
        merger = Merger(tree.branch, this_tree=tree, pb=pb)
 
52
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
 
53
                        change_reporter=change_reporter)
37
54
        merger.pp = pp
38
55
        merger.pp.next_phase()
39
56
        merger.check_basis(check_clean, require_commits=False)
40
 
        merger.other_rev_id = reader.info.target
41
 
        merger.other_tree = merger.revision_tree(reader.info.target)
42
 
        merger.other_basis = reader.info.target
 
57
        merger.other_rev_id = reader.target
 
58
        merger.other_tree = merger.revision_tree(reader.target)
 
59
        merger.other_basis = reader.target
43
60
        merger.pp.next_phase()
44
61
        merger.find_base()
45
62
        if merger.base_rev_id == merger.other_rev_id: