← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

(jr) Add gettext() to uses of note() (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
35
35
    gpg,
36
36
    )
37
37
from bzrlib.bundle import serializer
 
38
from bzrlib.i18n import gettext
38
39
""")
39
40
 
40
41
from bzrlib import (
280
281
                raise
281
282
            mutter('abort_write_group failed')
282
283
            log_exception_quietly()
283
 
            note('bzr: ERROR (ignored): %s', exc)
 
284
            note(gettext('bzr: ERROR (ignored): %s'), exc)
284
285
        self._write_group = None
285
286
 
286
287
    def _abort_write_group(self):
1799
1800
        # trigger an assertion if not such
1800
1801
        repo._format.get_format_string()
1801
1802
        self.repo_dir = repo.bzrdir
1802
 
        pb.update('Moving repository to repository.backup')
 
1803
        pb.update(gettext('Moving repository to repository.backup'))
1803
1804
        self.repo_dir.transport.move('repository', 'repository.backup')
1804
1805
        backup_transport =  self.repo_dir.transport.clone('repository.backup')
1805
1806
        repo._format.check_conversion_target(self.target_format)
1806
1807
        self.source_repo = repo._format.open(self.repo_dir,
1807
1808
            _found=True,
1808
1809
            _override_transport=backup_transport)
1809
 
        pb.update('Creating new repository')
 
1810
        pb.update(gettext('Creating new repository'))
1810
1811
        converted = self.target_format.initialize(self.repo_dir,
1811
1812
                                                  self.source_repo.is_shared())
1812
1813
        converted.lock_write()
1813
1814
        try:
1814
 
            pb.update('Copying content')
 
1815
            pb.update(gettext('Copying content'))
1815
1816
            self.source_repo.copy_content_into(converted)
1816
1817
        finally:
1817
1818
            converted.unlock()
1818
 
        pb.update('Deleting old repository content')
 
1819
        pb.update(gettext('Deleting old repository content'))
1819
1820
        self.repo_dir.transport.delete_tree('repository.backup')
1820
 
        ui.ui_factory.note('repository converted')
 
1821
        ui.ui_factory.note(gettext('repository converted'))
1821
1822
        pb.finished()
1822
1823
 
1823
1824