← 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: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

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