← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

(gz) Never raise KnownFailure in tests,
 use knownFailure method instead (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
18
18
"""
19
19
 
20
20
from bzrlib import ui
21
 
from bzrlib.i18n import gettext
 
21
from bzrlib.progress import ProgressPhase
22
22
from bzrlib.merge import Merger
23
 
from bzrlib.progress import ProgressPhase
 
23
from bzrlib.vf_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):
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,
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