← 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: John Arbash Meinel
  • Date: 2009-03-02 22:38:28 UTC
  • mto: (0.17.31 trunk)
  • mto: This revision was merged to the branch mainline in revision 4280.
  • Revision ID: john@arbash-meinel.com-20090302223828-hyb4crn4w28sgvmc
Fix a bug when handling multiple large-range copies.

We were adjusting moff multiple times, without adjusting it back.

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