← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/groupcompress_repo.py

  • Committer: Andrew Bennetts
  • Date: 2010-11-22 03:35:24 UTC
  • mto: This revision was merged to the branch mainline in revision 5547.
  • Revision ID: andrew.bennetts@canonical.com-20101122033524-ouxj0onm3gtkimx3
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
1339
1339
        yield record
1340
1340
 
1341
1341
 
1342
 
 
1343
 
 
1344
 
class RepositoryFormatCHK1(RepositoryFormatPack):
1345
 
    """A hashed CHK+group compress pack repository."""
 
1342
class RepositoryFormat2a(RepositoryFormatPack):
 
1343
    """A CHK repository that uses the bencode revision serializer."""
1346
1344
 
1347
1345
    repository_class = CHKInventoryRepository
1348
1346
    supports_external_lookups = True
1349
1347
    supports_chks = True
1350
 
    # For right now, setting this to True gives us InterModel1And2 rather
1351
 
    # than InterDifferingSerializer
1352
1348
    _commit_builder_class = PackRootCommitBuilder
1353
1349
    rich_root_data = True
1354
 
    _serializer = chk_serializer.chk_serializer_255_bigpage
 
1350
    _serializer = chk_serializer.chk_bencode_serializer
1355
1351
    _commit_inv_deltas = True
1356
1352
    # What index classes to use
1357
1353
    index_builder_class = BTreeBuilder
1368
1364
    pack_compresses = True
1369
1365
 
1370
1366
    def _get_matching_bzrdir(self):
1371
 
        return bzrdir.format_registry.make_bzrdir('development6-rich-root')
1372
 
 
1373
 
    def _ignore_setting_bzrdir(self, format):
1374
 
        pass
1375
 
 
1376
 
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1377
 
 
1378
 
    def get_format_string(self):
1379
 
        """See RepositoryFormat.get_format_string()."""
1380
 
        return ('Bazaar development format - group compression and chk inventory'
1381
 
                ' (needs bzr.dev from 1.14)\n')
1382
 
 
1383
 
    def get_format_description(self):
1384
 
        """See RepositoryFormat.get_format_description()."""
1385
 
        return ("Development repository format - rich roots, group compression"
1386
 
            " and chk inventories")
1387
 
 
1388
 
 
1389
 
class RepositoryFormatCHK2(RepositoryFormatCHK1):
1390
 
    """A CHK repository that uses the bencode revision serializer."""
1391
 
 
1392
 
    _serializer = chk_serializer.chk_bencode_serializer
1393
 
 
1394
 
    def _get_matching_bzrdir(self):
1395
 
        return bzrdir.format_registry.make_bzrdir('development7-rich-root')
1396
 
 
1397
 
    def _ignore_setting_bzrdir(self, format):
1398
 
        pass
1399
 
 
1400
 
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1401
 
 
1402
 
    def get_format_string(self):
1403
 
        """See RepositoryFormat.get_format_string()."""
1404
 
        return ('Bazaar development format - chk repository with bencode '
1405
 
                'revision serialization (needs bzr.dev from 1.16)\n')
1406
 
 
1407
 
 
1408
 
class RepositoryFormat2a(RepositoryFormatCHK2):
1409
 
    """A CHK repository that uses the bencode revision serializer.
1410
 
 
1411
 
    This is the same as RepositoryFormatCHK2 but with a public name.
1412
 
    """
1413
 
 
1414
 
    _serializer = chk_serializer.chk_bencode_serializer
1415
 
 
1416
 
    def _get_matching_bzrdir(self):
1417
1367
        return bzrdir.format_registry.make_bzrdir('2a')
1418
1368
 
1419
1369
    def _ignore_setting_bzrdir(self, format):