Rev 32: Start basing the groupcompress chk formats on the dev5 formats. in http://bazaar.launchpad.net/%7Ejameinel/bzr-groupcompress/dev5

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ejameinel/bzr-groupcompress/dev5

------------------------------------------------------------
revno: 32
revision-id: john at arbash-meinel.com-20090213215721-w7zpcnqe0zoj6fiz
parent: john at arbash-meinel.com-20090213215548-ht1f0gulkobqw1g9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dev5
timestamp: Fri 2009-02-13 15:57:21 -0600
message:
  Start basing the groupcompress chk formats on the dev5 formats.
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2009-02-13 21:32:46 +0000
+++ b/__init__.py	2009-02-13 21:57:21 +0000
@@ -75,7 +75,8 @@
 # info' will die horribly.
 try:
     from bzrlib.repofmt.pack_repo import (
-    RepositoryFormatPackDevelopment4,
+    RepositoryFormatPackDevelopment5,
+    RepositoryFormatPackDevelopment5Hash16,
     )
     format_registry.register_metadir('gc-plain-chk',
         'bzrlib.plugins.groupcompress.repofmt.RepositoryFormatPackGCPlainCHK',
@@ -84,15 +85,31 @@
             'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
             'before use.',
         branch_format='bzrlib.branch.BzrBranchFormat7',
-        tree_format='bzrlib.workingtree.WorkingTreeFormat4',
+        tree_format='bzrlib.workingtree.WorkingTreeFormat5',
         hidden=False,
         experimental=True,
         )
     repo_registry.register_lazy(
-        'Bazaar development format - chk+gc (needs bzr.dev from 1.12)\n',
+        'Bazaar development format - chk+gc (needs bzr.dev from 1.13)\n',
         'bzrlib.plugins.groupcompress.repofmt',
         'RepositoryFormatPackGCPlainCHK',
         )
+    format_registry.register_metadir('gc-plain-chk16',
+        'bzrlib.plugins.groupcompress.repofmt.RepositoryFormatPackGCPlainCHK16',
+        help='pack-1.9 with 16-way hashed CHK inv and group compress. '
+            'Please read '
+            'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
+            'before use.',
+        branch_format='bzrlib.branch.BzrBranchFormat7',
+        tree_format='bzrlib.workingtree.WorkingTreeFormat5',
+        hidden=False,
+        experimental=True,
+        )
+    repo_registry.register_lazy(
+        'Bazaar development format - hash16chk+gc (needs bzr.dev from 1.13)\n',
+        'bzrlib.plugins.groupcompress.repofmt',
+        'RepositoryFormatPackGCPlainCHK16',
+        )
 except ImportError:
     pass
 

=== modified file 'repofmt.py'
--- a/repofmt.py	2009-02-13 21:55:48 +0000
+++ b/repofmt.py	2009-02-13 21:57:21 +0000
@@ -49,8 +49,8 @@
 try:
     from bzrlib.repofmt.pack_repo import (
     CHKInventoryRepository,
-    RepositoryFormatPackDevelopment4,
-    RepositoryFormatPackDevelopment4Subtree,
+    RepositoryFormatPackDevelopment5,
+    RepositoryFormatPackDevelopment5Hash16,
     )
     chk_support = True
 except ImportError:
@@ -423,21 +423,33 @@
             ", interoperates with pack-0.92-subtrees\n")
 
 if chk_support:
-    'Bazaar development format - 1.9+gc (needs bzr.dev from 1.9)\n',
-    class RepositoryFormatPackGCPlainCHK(RepositoryFormatPackDevelopment4):
+    class RepositoryFormatPackGCPlainCHK(RepositoryFormatPackDevelopment5):
         """A CHK+group compress pack repository."""
 
         repository_class = GCCHKPackRepository
 
         def get_format_string(self):
             """See RepositoryFormat.get_format_string()."""
-            return ('Bazaar development format - chk+gc '
-                '(needs bzr.dev from 1.12)\n')
-
-        def get_format_description(self):
-            """See RepositoryFormat.get_format_description()."""
-            return ("Development repository format - chk+groupcompress "
-                ", interoperates with pack-0.92\n")
+            return ('Bazaar development format - chk+gc'
+                    ' (needs bzr.dev from 1.13)\n')
+
+        def get_format_description(self):
+            """See RepositoryFormat.get_format_description()."""
+            return ("Development repository format - chk+groupcompress")
+
+    class RepositoryFormatPackGCPlainCHK16(RepositoryFormatPackDevelopment5Hash16):
+        """A hashed CHK+group compress pack repository."""
+
+        repository_class = GCCHKPackRepository
+
+        def get_format_string(self):
+            """See RepositoryFormat.get_format_string()."""
+            return ('Bazaar development format - hash16chk+gc'
+                    ' (needs bzr.dev from 1.13)\n')
+
+        def get_format_description(self):
+            """See RepositoryFormat.get_format_description()."""
+            return ("Development repository format - hash16chk+groupcompress")
 
 
 
@@ -448,7 +460,8 @@
     formats = (RepositoryFormatPackGCPlain, RepositoryFormatPackGCRichRoot,
         RepositoryFormatPackGCSubtrees)
     if chk_support:
-        formats = formats + (RepositoryFormatPackGCPlainCHK,)
+        formats = formats + (RepositoryFormatPackGCPlainCHK,
+                             RepositoryFormatPackGCPlainCHK16)
     if isinstance(source._format, formats) or isinstance(target._format, formats):
         return False
     else: