← 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-12-22 18:52:58 UTC
  • mfrom: (6213.1.55 feature-flags)
  • Revision ID: pqm@pqm.ubuntu.com-20111222185258-wgcba8590pbw5sf1
(jelmer) Add support for feature flags in bzr formats. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1497
1497
            hook(params)
1498
1498
 
1499
1499
 
1500
 
class RepositoryFormatMetaDir(bzrdir.BzrDirMetaComponentFormat, RepositoryFormat):
 
1500
class RepositoryFormatMetaDir(bzrdir.BzrFormat, RepositoryFormat):
1501
1501
    """Common base class for the new repositories using the metadir layout."""
1502
1502
 
1503
1503
    rich_root_data = False
1514
1514
 
1515
1515
    def __init__(self):
1516
1516
        RepositoryFormat.__init__(self)
1517
 
        bzrdir.BzrDirMetaComponentFormat.__init__(self)
 
1517
        bzrdir.BzrFormat.__init__(self)
1518
1518
 
1519
1519
    def _create_control_files(self, a_bzrdir):
1520
1520
        """Create the required files and the initial control_files object."""
1559
1559
            raise errors.NoRepositoryPresent(a_bzrdir)
1560
1560
        return klass._find_format(format_registry, 'repository', format_string)
1561
1561
 
 
1562
    def check_support_status(self, allow_unsupported, recommend_upgrade=True,
 
1563
            basedir=None):
 
1564
        RepositoryFormat.check_support_status(self,
 
1565
            allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
 
1566
            basedir=basedir)
 
1567
        bzrdir.BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
 
1568
            recommend_upgrade=recommend_upgrade, basedir=basedir)
 
1569
 
1562
1570
 
1563
1571
# formats which have no format string are not discoverable or independently
1564
1572
# creatable on disk, so are not registered in format_registry.  They're