Rev 34: Merge in the dev5 formats. in http://bazaar.launchpad.net/%7Ebzr/bzr-groupcompress/trunk
John Arbash Meinel
john at arbash-meinel.com
Wed Feb 18 20:39:37 GMT 2009
At http://bazaar.launchpad.net/%7Ebzr/bzr-groupcompress/trunk
------------------------------------------------------------
revno: 34
revision-id: john at arbash-meinel.com-20090218203905-8npi7rmtgt1lup4h
parent: john at arbash-meinel.com-20090217221724-hyci8qk412m7mgyy
parent: john at arbash-meinel.com-20090217193538-ebm4wxqg10lkapyp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Wed 2009-02-18 14:39:05 -0600
message:
Merge in the dev5 formats.
modified:
__init__.py __init__.py-20080705181503-ccbxd6xuy1bdnrpu-6
repofmt.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 31.1.3
revision-id: john at arbash-meinel.com-20090217193538-ebm4wxqg10lkapyp
parent: john at arbash-meinel.com-20090213220603-5d2k6544y55dd6bi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dev5
timestamp: Tue 2009-02-17 13:35:38 -0600
message:
Start putting together a GroupCompress format that is built on dev5
modified:
__init__.py __init__.py-20080705181503-ccbxd6xuy1bdnrpu-6
repofmt.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 31.1.2
revision-id: john at arbash-meinel.com-20090213220603-5d2k6544y55dd6bi
parent: john at arbash-meinel.com-20090213215721-w7zpcnqe0zoj6fiz
parent: john at arbash-meinel.com-20090213220413-4tc60ow7v7wnh3r1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dev5
timestamp: Fri 2009-02-13 16:06:03 -0600
message:
Bring in the trunk simplifications.
modified:
repofmt.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 31.1.1
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.
modified:
__init__.py __init__.py-20080705181503-ccbxd6xuy1bdnrpu-6
repofmt.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py 2009-02-13 21:32:46 +0000
+++ b/__init__.py 2009-02-17 19:35:38 +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,47 @@
'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',
+ )
+ format_registry.register_metadir('gc-plain-chk255',
+ 'bzrlib.plugins.groupcompress.repofmt.RepositoryFormatPackGCPlainCHK255',
+ help='pack-1.9 with 255-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 - hash255chk+gc (needs bzr.dev from 1.13)\n',
+ 'bzrlib.plugins.groupcompress.repofmt',
+ 'RepositoryFormatPackGCPlainCHK255',
+ )
except ImportError:
pass
=== modified file 'repofmt.py'
--- a/repofmt.py 2009-02-13 22:04:13 +0000
+++ b/repofmt.py 2009-02-17 19:35:38 +0000
@@ -49,8 +49,9 @@
try:
from bzrlib.repofmt.pack_repo import (
CHKInventoryRepository,
- RepositoryFormatPackDevelopment4,
- RepositoryFormatPackDevelopment4Subtree,
+ RepositoryFormatPackDevelopment5,
+ RepositoryFormatPackDevelopment5Hash16,
+ RepositoryFormatPackDevelopment5Hash255,
)
chk_support = True
except ImportError:
@@ -411,21 +412,49 @@
", 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")
+
+
+ class RepositoryFormatPackGCPlainCHK255(RepositoryFormatPackDevelopment5Hash255):
+ """A hashed CHK+group compress pack repository."""
+
+ repository_class = GCCHKPackRepository
+
+ def get_format_string(self):
+ """See RepositoryFormat.get_format_string()."""
+ return ('Bazaar development format - hash255chk+gc'
+ ' (needs bzr.dev from 1.13)\n')
+
+ def get_format_description(self):
+ """See RepositoryFormat.get_format_description()."""
+ return ("Development repository format - hash255chk+groupcompress")
def pack_incompatible(source, target, orig_method=InterPackRepo.is_compatible):
@@ -433,7 +462,9 @@
formats = (RepositoryFormatPackGCPlain, RepositoryFormatPackGCRichRoot,
RepositoryFormatPackGCSubtrees)
if chk_support:
- formats = formats + (RepositoryFormatPackGCPlainCHK,)
+ formats = formats + (RepositoryFormatPackGCPlainCHK,
+ RepositoryFormatPackGCPlainCHK16,
+ RepositoryFormatPackGCPlainCHK255)
if isinstance(source._format, formats) or isinstance(target._format, formats):
return False
else:
More information about the bazaar-commits
mailing list