← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
from bzrlib.lazy_import import lazy_import
18
20
lazy_import(globals(), """
19
21
import itertools
38
40
from bzrlib.repository import (
39
41
    InterRepository,
40
42
    IsInWriteGroupError,
41
 
    RepositoryFormat,
 
43
    RepositoryFormatMetaDir,
42
44
    )
43
45
from bzrlib.vf_repository import (
44
46
    InterSameDataRepository,
321
323
                                    than normal. I.e. during 'upgrade'.
322
324
        """
323
325
        if not _found:
324
 
            format = RepositoryFormat.find_format(a_bzrdir)
 
326
            format = RepositoryFormatMetaDir.find_format(a_bzrdir)
325
327
        if _override_transport is not None:
326
328
            repo_transport = _override_transport
327
329
        else:
367
369
    def __ne__(self, other):
368
370
        return self.__class__ is not other.__class__
369
371
 
370
 
    def get_format_string(self):
 
372
    @classmethod
 
373
    def get_format_string(cls):
371
374
        """See RepositoryFormat.get_format_string()."""
372
375
        return "Bazaar-NG Knit Repository Format 1"
373
376
 
409
412
 
410
413
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
411
414
 
412
 
    def get_format_string(self):
 
415
    @classmethod
 
416
    def get_format_string(cls):
413
417
        """See RepositoryFormat.get_format_string()."""
414
418
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
415
419
 
450
454
 
451
455
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
452
456
 
453
 
    def get_format_string(self):
 
457
    @classmethod
 
458
    def get_format_string(cls):
454
459
        """See RepositoryFormat.get_format_string()."""
455
460
        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'
456
461