← 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: 2014-04-09 13:36:25 UTC
  • mfrom: (6592.1.2 1303879-py27-issues)
  • Revision ID: pqm@pqm.ubuntu.com-20140409133625-s24spv3kha2w2860
(vila) Fix python-2.7.6 test failures. (Vincent Ladeuil)

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