Rev 3817: Change on-disk format strings so we don't accidentally read something with a different LeafNode serializer. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/inv_as_lines
John Arbash Meinel
john at arbash-meinel.com
Thu Feb 12 22:43:36 GMT 2009
At http://bzr.arbash-meinel.com/branches/bzr/brisbane/inv_as_lines
------------------------------------------------------------
revno: 3817
revision-id: john at arbash-meinel.com-20090212224306-firu7x1uxwq0hoc3
parent: john at arbash-meinel.com-20090212223553-i8x5whzol4eq1x5d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inv_as_lines
timestamp: Thu 2009-02-12 16:43:06 -0600
message:
Change on-disk format strings so we don't accidentally read something with a different LeafNode serializer.
-------------- next part --------------
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py 2009-02-12 20:25:55 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2009-02-12 22:43:06 +0000
@@ -2873,97 +2873,10 @@
"1.6.1-subtree with B+Tree indices.\n")
-class RepositoryFormatPackDevelopment3(RepositoryFormatPack):
- """A no-subtrees development repository.
-
- This format should be retained until the second release after bzr 1.11.
-
- This is pack-1.9 with CHKMap based inventories.
- """
-
- repository_class = CHKInventoryRepository
- _commit_builder_class = PackCommitBuilder
- _serializer = chk_serializer.chk_serializer
- supports_external_lookups = True
- # What index classes to use
- index_builder_class = BTreeBuilder
- index_class = BTreeGraphIndex
- supports_chks = True
- _commit_inv_deltas = True
-
- def _get_matching_bzrdir(self):
- return bzrdir.format_registry.make_bzrdir('development3')
-
- def _ignore_setting_bzrdir(self, format):
- pass
-
- _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
-
- def get_format_string(self):
- """See RepositoryFormat.get_format_string()."""
- return "Bazaar development format 3 (needs bzr.dev from before 1.10)\n"
-
- def get_format_description(self):
- """See RepositoryFormat.get_format_description()."""
- return ("Development repository format, currently the same as "
- "1.9 with B+Trees and chk support.\n")
-
- def check_conversion_target(self, target_format):
- pass
-
-
-class RepositoryFormatPackDevelopment3Subtree(RepositoryFormatPack):
- """A subtrees development repository.
-
- This format should be retained until the second release after bzr 1.11.
-
- 1.9-subtree[as it might have been] with CHKMap based inventories.
- """
-
- repository_class = CHKInventoryRepository
- _commit_builder_class = PackRootCommitBuilder
- rich_root_data = True
- supports_tree_reference = True
- _serializer = chk_serializer.chk_serializer_subtree
- supports_external_lookups = True
- # What index classes to use
- index_builder_class = BTreeBuilder
- index_class = BTreeGraphIndex
- supports_chks = True
- _commit_inv_deltas = True
-
- def _get_matching_bzrdir(self):
- return bzrdir.format_registry.make_bzrdir(
- 'development3-subtree')
-
- def _ignore_setting_bzrdir(self, format):
- pass
-
- _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
-
- def check_conversion_target(self, target_format):
- if not target_format.rich_root_data:
- raise errors.BadConversionTarget(
- 'Does not support rich root data.', target_format)
- if not getattr(target_format, 'supports_tree_reference', False):
- raise errors.BadConversionTarget(
- 'Does not support nested trees', target_format)
-
- def get_format_string(self):
- """See RepositoryFormat.get_format_string()."""
- return ("Bazaar development format 3 with subtree support "
- "(needs bzr.dev from before 1.10)\n")
-
- def get_format_description(self):
- """See RepositoryFormat.get_format_description()."""
- return ("Development repository format, currently the same as "
- "1.9-subtree with B+Tree and chk support.\n")
-
-
class RepositoryFormatPackDevelopment4(RepositoryFormatPack):
"""A no-subtrees development repository.
- This format should be retained until the second release after bzr 1.11.
+ This format should be retained until the second release after bzr 1.13.
This is pack-1.9 with CHKMap based inventories.
"""
@@ -2988,12 +2901,12 @@
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
- return "Bazaar development format 4 (needs bzr.dev from before 1.11)\n"
+ return "Bazaar development format 4 (needs bzr.dev from before 1.13)\n"
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
- return ("Development repository format, currently the same as "
- "1.9 with B+Trees and chk support.\n")
+ return ("Development repository format, currently the same as"
+ " 1.9 with B+Trees and chk support.\n")
def check_conversion_target(self, target_format):
pass
@@ -3002,7 +2915,7 @@
class RepositoryFormatPackDevelopment4Subtree(RepositoryFormatPack):
"""A subtrees development repository.
- This format should be retained until the second release after bzr 1.11.
+ This format should be retained until the second release after bzr 1.13.
1.9-subtree[as it might have been] with CHKMap based inventories.
"""
@@ -3038,19 +2951,19 @@
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
- return ("Bazaar development format 4 with subtree support "
- "(needs bzr.dev from before 1.11)\n")
+ return ("Bazaar development format 4 with subtree support"
+ " (needs bzr.dev from before 1.11)\n")
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
- return ("Development repository format, currently the same as "
- "1.9-subtree with B+Tree and chk support.\n")
+ return ("Development repository format, currently the same as"
+ " 1.9-subtree with B+Tree and chk support.\n")
class RepositoryFormatPackDevelopment4Hash16(RepositoryFormatPack):
"""A no-subtrees development repository.
- This format should be retained until the second release after bzr 1.12.
+ This format should be retained until the second release after bzr 1.13.
This is pack-1.9 with CHKMap based inventories with 16-way hash tries.
"""
@@ -3075,12 +2988,13 @@
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
- return "Bazaar development format 4 hash 16 (needs bzr.dev from before 1.13)\n"
+ return ("Bazaar development format 4 hash 16"
+ " (needs bzr.dev from before 1.13)\n")
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
- return ("Development repository format, currently the same as "
- "1.9 with B+Trees and chk support and 16-way hash tries\n")
+ return ("Development repository format, currently the same as"
+ " 1.9 with B+Trees and chk support and 16-way hash tries\n")
def check_conversion_target(self, target_format):
pass
@@ -3089,7 +3003,7 @@
class RepositoryFormatPackDevelopment4Hash255(RepositoryFormatPack):
"""A no-subtrees development repository.
- This format should be retained until the second release after bzr 1.12.
+ This format should be retained until the second release after bzr 1.13.
This is pack-1.9 with CHKMap based inventories with 255-way hash tries.
"""
@@ -3114,12 +3028,13 @@
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
- return "Bazaar development format 4 hash 255 (needs bzr.dev from before 1.13)\n"
+ return ("Bazaar development format 4 hash 255"
+ " (needs bzr.dev from before 1.13)\n")
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
- return ("Development repository format, currently the same as "
- "1.9 with B+Trees and chk support and 255-way hash tries\n")
+ return ("Development repository format, currently the same as"
+ " 1.9 with B+Trees and chk support and 255-way hash tries\n")
def check_conversion_target(self, target_format):
pass
More information about the bazaar-commits
mailing list