← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-08 11:01:15 UTC
  • mfrom: (6123.1.16 gpg-typo)
  • Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

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
39
38
""")
40
39
 
41
40
from bzrlib import (
281
280
                raise
282
281
            mutter('abort_write_group failed')
283
282
            log_exception_quietly()
284
 
            note(gettext('bzr: ERROR (ignored): %s'), exc)
 
283
            note('bzr: ERROR (ignored): %s', exc)
285
284
        self._write_group = None
286
285
 
287
286
    def _abort_write_group(self):
361
360
        # the following are part of the public API for Repository:
362
361
        self.bzrdir = a_bzrdir
363
362
        self.control_files = control_files
 
363
        self._transport = control_files._transport
 
364
        self.base = self._transport.base
364
365
        # for tests
365
366
        self._write_group = None
366
367
        # Additional places to query for data.
404
405
        """
405
406
        if self.__class__ is not other.__class__:
406
407
            return False
407
 
        return (self.control_url == other.control_url)
 
408
        return (self._transport.base == other._transport.base)
408
409
 
409
410
    def is_in_write_group(self):
410
411
        """Return True if there is an open write group.
929
930
        parent_ids.discard(_mod_revision.NULL_REVISION)
930
931
        return parent_ids
931
932
 
 
933
    def fileids_altered_by_revision_ids(self, revision_ids):
 
934
        """Find the file ids and versions affected by revisions.
 
935
 
 
936
        :param revisions: an iterable containing revision ids.
 
937
        :return: a dictionary mapping altered file-ids to an iterable of
 
938
            revision_ids. Each altered file-ids has the exact revision_ids
 
939
            that altered it listed explicitly.
 
940
        """
 
941
        raise NotImplementedError(self.fileids_altered_by_revision_ids)
 
942
 
932
943
    def iter_files_bytes(self, desired_files):
933
944
        """Iterate through file versions.
934
945
 
1407
1418
    rich_root_data = None
1408
1419
    # Does this format support explicitly versioned directories?
1409
1420
    supports_versioned_directories = None
1410
 
    # Can other repositories be nested into one of this format?
1411
 
    supports_nesting_repositories = None
1412
1421
 
1413
1422
    def __repr__(self):
1414
1423
        return "%s()" % self.__class__.__name__
1540
1549
    supports_tree_reference = False
1541
1550
    supports_external_lookups = False
1542
1551
    supports_leaving_lock = True
1543
 
    supports_nesting_repositories = True
1544
1552
 
1545
1553
    @property
1546
1554
    def _matchingbzrdir(self):
1791
1799
        # trigger an assertion if not such
1792
1800
        repo._format.get_format_string()
1793
1801
        self.repo_dir = repo.bzrdir
1794
 
        pb.update(gettext('Moving repository to repository.backup'))
 
1802
        pb.update('Moving repository to repository.backup')
1795
1803
        self.repo_dir.transport.move('repository', 'repository.backup')
1796
1804
        backup_transport =  self.repo_dir.transport.clone('repository.backup')
1797
1805
        repo._format.check_conversion_target(self.target_format)
1798
1806
        self.source_repo = repo._format.open(self.repo_dir,
1799
1807
            _found=True,
1800
1808
            _override_transport=backup_transport)
1801
 
        pb.update(gettext('Creating new repository'))
 
1809
        pb.update('Creating new repository')
1802
1810
        converted = self.target_format.initialize(self.repo_dir,
1803
1811
                                                  self.source_repo.is_shared())
1804
1812
        converted.lock_write()
1805
1813
        try:
1806
 
            pb.update(gettext('Copying content'))
 
1814
            pb.update('Copying content')
1807
1815
            self.source_repo.copy_content_into(converted)
1808
1816
        finally:
1809
1817
            converted.unlock()
1810
 
        pb.update(gettext('Deleting old repository content'))
 
1818
        pb.update('Deleting old repository content')
1811
1819
        self.repo_dir.transport.delete_tree('repository.backup')
1812
 
        ui.ui_factory.note(gettext('repository converted'))
 
1820
        ui.ui_factory.note('repository converted')
1813
1821
        pb.finished()
1814
1822
 
1815
1823