← 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: Canonical.com Patch Queue Manager
  • Date: 2006-07-06 03:15:29 UTC
  • mfrom: (1711.2.78 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060706031529-e189d8c3f42076be
(jam) allow plugins to include benchmarks

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
1
"""\
17
2
This contains functionality for installing bundles into repositories
18
3
"""
42
27
 
43
28
 
44
29
def merge_bundle(reader, tree, check_clean, merge_type, 
45
 
                    reprocess, show_base, change_reporter=None):
 
30
                    reprocess, show_base):
46
31
    """Merge a revision bundle into the current tree."""
47
32
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
48
33
    try:
49
34
        pp = ProgressPhase("Merge phase", 6, pb)
50
35
        pp.next_phase()
51
36
        install_bundle(tree.branch.repository, reader)
52
 
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
53
 
                        change_reporter=change_reporter)
 
37
        merger = Merger(tree.branch, this_tree=tree, pb=pb)
54
38
        merger.pp = pp
55
39
        merger.pp.next_phase()
56
40
        merger.check_basis(check_clean, require_commits=False)