← 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: Martin Packman
  • Date: 2012-01-05 10:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105103758-wzftnmsip5iv9n2g
Revert addition of get_message_encoding function

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
 
22
from bzrlib.merge import Merger
21
23
from bzrlib.progress import ProgressPhase
22
 
from bzrlib.merge import Merger
 
24
from bzrlib.trace import note
23
25
from bzrlib.vf_repository import install_revision
24
 
from bzrlib.trace import note
25
26
 
26
27
 
27
28
def install_bundle(repository, bundle_reader):
33
34
    try:
34
35
        real_revisions = bundle_reader.real_revisions
35
36
        for i, revision in enumerate(reversed(real_revisions)):
36
 
            pb.update("Install revisions",i, len(real_revisions))
 
37
            pb.update(gettext("Install revisions"),i, len(real_revisions))
37
38
            if repository.has_revision(revision.revision_id):
38
39
                continue
39
40
            cset_tree = bundle_reader.revision_tree(repository,
64
65
        merger.pp.next_phase()
65
66
        merger.find_base()
66
67
        if merger.base_rev_id == merger.other_rev_id:
67
 
            note("Nothing to do.")
 
68
            note(gettext("Nothing to do."))
68
69
            return 0
69
70
        merger.merge_type = merge_type
70
71
        merger.show_base = show_base