← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.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/repofmt/knitrepo.py
38
38
from bzrlib.repository import (
39
39
    InterRepository,
40
40
    IsInWriteGroupError,
41
 
    RepositoryFormat,
 
41
    RepositoryFormatMetaDir,
42
42
    )
43
43
from bzrlib.vf_repository import (
44
44
    InterSameDataRepository,
321
321
                                    than normal. I.e. during 'upgrade'.
322
322
        """
323
323
        if not _found:
324
 
            format = RepositoryFormat.find_format(a_bzrdir)
 
324
            format = RepositoryFormatMetaDir.find_format(a_bzrdir)
325
325
        if _override_transport is not None:
326
326
            repo_transport = _override_transport
327
327
        else:
367
367
    def __ne__(self, other):
368
368
        return self.__class__ is not other.__class__
369
369
 
370
 
    def get_format_string(self):
 
370
    @classmethod
 
371
    def get_format_string(cls):
371
372
        """See RepositoryFormat.get_format_string()."""
372
373
        return "Bazaar-NG Knit Repository Format 1"
373
374
 
409
410
 
410
411
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
411
412
 
412
 
    def get_format_string(self):
 
413
    @classmethod
 
414
    def get_format_string(cls):
413
415
        """See RepositoryFormat.get_format_string()."""
414
416
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
415
417
 
450
452
 
451
453
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
452
454
 
453
 
    def get_format_string(self):
 
455
    @classmethod
 
456
    def get_format_string(cls):
454
457
        """See RepositoryFormat.get_format_string()."""
455
458
        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'
456
459