← 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: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

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, 2011 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
This contains functionality for installing bundles into repositories
18
18
"""
19
19
 
20
 
from bzrlib import ui
21
 
from bzrlib.i18n import gettext
 
20
import bzrlib.ui
 
21
from bzrlib.progress import ProgressPhase
22
22
from bzrlib.merge import Merger
23
 
from bzrlib.progress import ProgressPhase
 
23
from bzrlib.repository import install_revision
24
24
from bzrlib.trace import note
25
 
from bzrlib.vf_repository import install_revision
26
25
 
27
26
 
28
27
def install_bundle(repository, bundle_reader):
29
28
    custom_install = getattr(bundle_reader, 'install', None)
30
29
    if custom_install is not None:
31
30
        return custom_install(repository)
32
 
    pb = ui.ui_factory.nested_progress_bar()
 
31
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
33
32
    repository.lock_write()
34
33
    try:
35
34
        real_revisions = bundle_reader.real_revisions
36
35
        for i, revision in enumerate(reversed(real_revisions)):
37
 
            pb.update(gettext("Install revisions"),i, len(real_revisions))
 
36
            pb.update("Install revisions",i, len(real_revisions))
38
37
            if repository.has_revision(revision.revision_id):
39
38
                continue
40
39
            cset_tree = bundle_reader.revision_tree(repository,
48
47
def merge_bundle(reader, tree, check_clean, merge_type,
49
48
                    reprocess, show_base, change_reporter=None):
50
49
    """Merge a revision bundle into the current tree."""
51
 
    pb = ui.ui_factory.nested_progress_bar()
 
50
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
52
51
    try:
53
52
        pp = ProgressPhase("Merge phase", 6, pb)
54
53
        pp.next_phase()
55
54
        install_bundle(tree.branch.repository, reader)
56
 
        merger = Merger(tree.branch, this_tree=tree,
 
55
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
57
56
                        change_reporter=change_reporter)
58
57
        merger.pp = pp
59
58
        merger.pp.next_phase()
65
64
        merger.pp.next_phase()
66
65
        merger.find_base()
67
66
        if merger.base_rev_id == merger.other_rev_id:
68
 
            note(gettext("Nothing to do."))
 
67
            note("Nothing to do.")
69
68
            return 0
70
69
        merger.merge_type = merge_type
71
70
        merger.show_base = show_base