/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

  • Committer: mernst at mit
  • Date: 2008-10-16 10:57:16 UTC
  • mto: This revision was merged to the branch mainline in revision 3799.
  • Revision ID: mernst@csail.mit.edu-20081016105716-v8x8n5t2pf7f6uds
Improved documentation of stacked and lightweight branches

These patches improve the User Guide's documentation of stacked and
lightweight branches.

Section "1.2.6 Putting the concepts together" should mention stacked
branches and the difference between them and lightweight branches.  It
should also contain links to further details of the common scenarios.

Section "5.3.4 Getting a lightweight checkout" should mention stacked
branches as an option, and should link to all the options, not just some of
them.  It should also clarify that lightweight only applies to checkouts,
not to arbitrary branches.

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
    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, pb=pb,
 
56
                        change_reporter=change_reporter)
 
57
        merger.pp = pp
 
58
        merger.pp.next_phase()
 
59
        merger.check_basis(check_clean, require_commits=False)
 
60
        merger.other_rev_id = reader.target
 
61
        merger.other_tree = merger.revision_tree(reader.target)
 
62
        merger.other_basis = reader.target
 
63
        merger.pp.next_phase()
 
64
        merger.find_base()
 
65
        if merger.base_rev_id == merger.other_rev_id:
 
66
            note("Nothing to do.")
 
67
            return 0
 
68
        merger.merge_type = merge_type
 
69
        merger.show_base = show_base
 
70
        merger.reprocess = reprocess
 
71
        conflicts = merger.do_merge()
 
72
        merger.set_pending()
 
73
    finally:
 
74
        pb.clear()
 
75
    return conflicts