← 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: Patch Queue Manager
  • Date: 2013-05-23 10:35:23 UTC
  • mfrom: (6574.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20130523103523-2wt6jmauja1n1vdt
(jameinel) Merge bzr/2.5 into trunk. (John A Meinel)

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