← 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: Jelmer Vernooij
  • Date: 2011-11-30 20:02:16 UTC
  • mto: This revision was merged to the branch mainline in revision 6333.
  • Revision ID: jelmer@samba.org-20111130200216-aoju21pdl20d1gkd
Consistently pass tree path when exporting.

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, 2011 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
"""\
 
17
This contains functionality for installing bundles into repositories
 
18
"""
 
19
 
 
20
from bzrlib import ui
 
21
from bzrlib.i18n import gettext
 
22
from bzrlib.merge import Merger
 
23
from bzrlib.progress import ProgressPhase
 
24
from bzrlib.trace import note
 
25
from bzrlib.vf_repository import install_revision
 
26
 
 
27
 
 
28
def install_bundle(repository, bundle_reader):
 
29
    custom_install = getattr(bundle_reader, 'install', None)
 
30
    if custom_install is not None:
 
31
        return custom_install(repository)
 
32
    pb = ui.ui_factory.nested_progress_bar()
 
33
    repository.lock_write()
 
34
    try:
 
35
        real_revisions = bundle_reader.real_revisions
 
36
        for i, revision in enumerate(reversed(real_revisions)):
 
37
            pb.update(gettext("Install revisions"),i, len(real_revisions))
 
38
            if repository.has_revision(revision.revision_id):
 
39
                continue
 
40
            cset_tree = bundle_reader.revision_tree(repository,
 
41
                                                       revision.revision_id)
 
42
            install_revision(repository, revision, cset_tree)
 
43
    finally:
 
44
        repository.unlock()
 
45
        pb.finished()
 
46
 
 
47
 
 
48
def merge_bundle(reader, tree, check_clean, merge_type,
 
49
                    reprocess, show_base, change_reporter=None):
 
50
    """Merge a revision bundle into the current tree."""
 
51
    pb = ui.ui_factory.nested_progress_bar()
 
52
    try:
 
53
        pp = ProgressPhase("Merge phase", 6, pb)
 
54
        pp.next_phase()
 
55
        install_bundle(tree.branch.repository, reader)
 
56
        merger = Merger(tree.branch, this_tree=tree,
 
57
                        change_reporter=change_reporter)
 
58
        merger.pp = pp
 
59
        merger.pp.next_phase()
 
60
        if check_clean and tree.has_changes():
 
61
            raise errors.UncommittedChanges(self)
 
62
        merger.other_rev_id = reader.target
 
63
        merger.other_tree = merger.revision_tree(reader.target)
 
64
        merger.other_basis = reader.target
 
65
        merger.pp.next_phase()
 
66
        merger.find_base()
 
67
        if merger.base_rev_id == merger.other_rev_id:
 
68
            note(gettext("Nothing to do."))
 
69
            return 0
 
70
        merger.merge_type = merge_type
 
71
        merger.show_base = show_base
 
72
        merger.reprocess = reprocess
 
73
        conflicts = merger.do_merge()
 
74
        merger.set_pending()
 
75
    finally:
 
76
        pb.clear()
 
77
    return conflicts