← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-12 13:44:20 UTC
  • mfrom: (6358 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6362.
  • Revision ID: jelmer@samba.org-20111212134420-20130h4aa5ewp2m7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/repository.py
52
52
from bzrlib.decorators import needs_read_lock, needs_write_lock
53
53
from bzrlib.repository import (
54
54
    InterRepository,
55
 
    RepositoryFormat,
 
55
    RepositoryFormatMetaDir,
56
56
    )
57
57
from bzrlib.store.text import TextStore
58
58
from bzrlib.versionedfile import (
504
504
    def _serializer(self):
505
505
        return xml5.serializer_v5
506
506
 
507
 
    def get_format_string(self):
 
507
    @classmethod
 
508
    def get_format_string(cls):
508
509
        """See RepositoryFormat.get_format_string()."""
509
510
        return "Bazaar-NG Repository format 7"
510
511
 
561
562
                                    than normal. I.e. during 'upgrade'.
562
563
        """
563
564
        if not _found:
564
 
            format = RepositoryFormat.find_format(a_bzrdir)
 
565
            format = RepositoryFormatMetaDir.find_format(a_bzrdir)
565
566
        if _override_transport is not None:
566
567
            repo_transport = _override_transport
567
568
        else: