← 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: 2006-06-04 10:55:31 UTC
  • mfrom: (1728.2.4 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
(mbp) several small fixes

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
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
1
"""\
17
2
This contains functionality for installing bundles into repositories
18
3
"""
21
6
from bzrlib.progress import ProgressPhase
22
7
from bzrlib.merge import Merger
23
8
from bzrlib.repository import install_revision
24
 
from bzrlib.trace import note
25
9
 
26
10
 
27
11
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
12
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
32
13
    repository.lock_write()
33
14
    try:
34
 
        real_revisions = bundle_reader.real_revisions
 
15
        real_revisions = bundle_reader.info.real_revisions
35
16
        for i, revision in enumerate(reversed(real_revisions)):
36
17
            pb.update("Install revisions",i, len(real_revisions))
37
18
            if repository.has_revision(revision.revision_id):
44
25
        pb.finished()
45
26
 
46
27
 
47
 
def merge_bundle(reader, tree, check_clean, merge_type,
48
 
                    reprocess, show_base, change_reporter=None):
 
28
def merge_bundle(reader, tree, check_clean, merge_type, 
 
29
                    reprocess, show_base):
49
30
    """Merge a revision bundle into the current tree."""
50
31
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
51
32
    try:
52
33
        pp = ProgressPhase("Merge phase", 6, pb)
53
34
        pp.next_phase()
54
35
        install_bundle(tree.branch.repository, reader)
55
 
        merger = Merger(tree.branch, this_tree=tree,
56
 
                        change_reporter=change_reporter)
 
36
        merger = Merger(tree.branch, this_tree=tree, pb=pb)
57
37
        merger.pp = pp
58
38
        merger.pp.next_phase()
59
 
        if check_clean and tree.has_changes():
60
 
            raise errors.UncommittedChanges(self)
61
 
        merger.other_rev_id = reader.target
62
 
        merger.other_tree = merger.revision_tree(reader.target)
63
 
        merger.other_basis = reader.target
 
39
        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
64
43
        merger.pp.next_phase()
65
44
        merger.find_base()
66
45
        if merger.base_rev_id == merger.other_rev_id: