Rev 3917: Bump the repository format strings since the data stream is now incompatible. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/disk_format

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/brisbane/disk_format

------------------------------------------------------------
revno: 3917
revision-id: john at arbash-meinel.com-20090327161738-l6z2yuuso0mnr1ca
parent: john at arbash-meinel.com-20090327161003-snhpx5qx7bcw7v1i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: disk_format
timestamp: Fri 2009-03-27 11:17:38 -0500
message:
  Bump the repository format strings since the data stream is now incompatible.
-------------- next part --------------
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py	2009-03-26 19:59:52 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py	2009-03-27 16:17:38 +0000
@@ -725,42 +725,6 @@
         return packer.pack(pb)
 
 
-# This format has been disabled for now. It is not expected that this will be a
-# useful next-generation format.
-#
-# class RepositoryFormatPackGCPlain(RepositoryFormatKnitPack6):
-#     """A B+Tree index using pack repository."""
-#
-#     repository_class = GCPackRepository
-#     rich_root_data = False
-#     # Note: We cannot unpack a delta that references a text we haven't
-#     # seen yet. There are 2 options, work in fulltexts, or require
-#     # topological sorting. Using fulltexts is more optimal for local
-#     # operations, because the source can be smart about extracting
-#     # multiple in-a-row (and sharing strings). Topological is better
-#     # for remote, because we access less data.
-#     _fetch_order = 'unordered'
-#     _fetch_uses_deltas = False
-#
-#     def _get_matching_bzrdir(self):
-#         return bzrdir.format_registry.make_bzrdir('gc-no-rich-root')
-#
-#     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 - btree+gc "
-#             "(needs bzr.dev from 1.13)\n")
-#
-#     def get_format_description(self):
-#         """See RepositoryFormat.get_format_description()."""
-#         return ("Development repository format - btree+groupcompress "
-#             ", interoperates with pack-0.92\n")
-#
-
 class RepositoryFormatPackGCCHK16(RepositoryFormatPackDevelopment5Hash16):
     """A hashed CHK+group compress pack repository."""
 
@@ -790,7 +754,7 @@
     def get_format_string(self):
         """See RepositoryFormat.get_format_string()."""
         return ('Bazaar development format - hash16chk+gc rich-root'
-                ' (needs bzr.dev from 1.13)\n')
+                ' (needs bzr.dev from 1.14)\n')
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -827,7 +791,7 @@
     def get_format_string(self):
         """See RepositoryFormat.get_format_string()."""
         return ('Bazaar development format - hash255chk+gc rich-root'
-                ' (needs bzr.dev from 1.13)\n')
+                ' (needs bzr.dev from 1.14)\n')
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""
@@ -872,7 +836,7 @@
     def get_format_string(self):
         """See RepositoryFormat.get_format_string()."""
         return ('Bazaar development format - hash255chk+gc rich-root bigpage'
-                ' (needs bzr.dev from 1.13)\n')
+                ' (needs bzr.dev from 1.14)\n')
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2009-03-26 16:35:00 +0000
+++ b/bzrlib/repository.py	2009-03-27 16:17:38 +0000
@@ -2983,24 +2983,18 @@
     'bzrlib.repofmt.pack_repo',
     'RepositoryFormatPackDevelopment5Hash255',
     )
-# XXX: This format is scheduled for termination
-# format_registry.register_lazy(
-#     'Bazaar development format - btree+gc (needs bzr.dev from 1.13)\n',
-#     'bzrlib.repofmt.groupcompress_repo',
-#     'RepositoryFormatPackGCPlain',
-#     )
 format_registry.register_lazy(
-    'Bazaar development format - hash16chk+gc rich-root (needs bzr.dev from 1.13)\n',
+    'Bazaar development format - hash16chk+gc rich-root (needs bzr.dev from 1.14)\n',
     'bzrlib.repofmt.groupcompress_repo',
     'RepositoryFormatPackGCCHK16',
     )
 format_registry.register_lazy(
-    'Bazaar development format - hash255chk+gc rich-root (needs bzr.dev from 1.13)\n',
+    'Bazaar development format - hash255chk+gc rich-root (needs bzr.dev from 1.14)\n',
     'bzrlib.repofmt.groupcompress_repo',
     'RepositoryFormatPackGCCHK255',
     )
 format_registry.register_lazy(
-    'Bazaar development format - hash255chk+gc rich-root bigpage (needs bzr.dev from 1.13)\n',
+    'Bazaar development format - hash255chk+gc rich-root bigpage (needs bzr.dev from 1.14)\n',
     'bzrlib.repofmt.groupcompress_repo',
     'RepositoryFormatPackGCCHK255Big',
     )