← 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: Ian Clatworthy
  • Date: 2007-06-06 14:06:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2520.
  • Revision ID: ian.clatworthy@internode.on.net-20070606140614-yp66v5i1gm5kruqp
https://launchpad.net/bugs/115491
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
 
1
# Copyright (C) 2006 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
29
    repository.lock_write()
 
30
    try:
 
31
        real_revisions = bundle_reader.real_revisions
 
32
        for i, revision in enumerate(reversed(real_revisions)):
 
33
            pb.update("Install revisions",i, len(real_revisions))
 
34
            if repository.has_revision(revision.revision_id):
 
35
                continue
 
36
            cset_tree = bundle_reader.revision_tree(repository,
 
37
                                                       revision.revision_id)
 
38
            install_revision(repository, revision, cset_tree)
 
39
    finally:
 
40
        repository.unlock()
 
41
        pb.finished()
 
42
 
 
43
 
 
44
def merge_bundle(reader, tree, check_clean, merge_type, 
 
45
                    reprocess, show_base, change_reporter=None):
 
46
    """Merge a revision bundle into the current tree."""
 
47
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
48
    try:
 
49
        pp = ProgressPhase("Merge phase", 6, pb)
 
50
        pp.next_phase()
 
51
        install_bundle(tree.branch.repository, reader)
 
52
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
 
53
                        change_reporter=change_reporter)
 
54
        merger.pp = pp
 
55
        merger.pp.next_phase()
 
56
        merger.check_basis(check_clean, require_commits=False)
 
57
        merger.other_rev_id = reader.target
 
58
        merger.other_tree = merger.revision_tree(reader.target)
 
59
        merger.other_basis = reader.target
 
60
        merger.pp.next_phase()
 
61
        merger.find_base()
 
62
        if merger.base_rev_id == merger.other_rev_id:
 
63
            note("Nothing to do.")
 
64
            return 0
 
65
        merger.merge_type = merge_type
 
66
        merger.show_base = show_base
 
67
        merger.reprocess = reprocess
 
68
        conflicts = merger.do_merge()
 
69
        merger.set_pending()
 
70
    finally:
 
71
        pb.clear()
 
72
    return conflicts