Rev 3818: Bump to Development5 formats. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/inv_as_lines
John Arbash Meinel
john at arbash-meinel.com
Thu Feb 12 23:03:34 GMT 2009
At http://bzr.arbash-meinel.com/branches/bzr/brisbane/inv_as_lines
------------------------------------------------------------
revno: 3818
revision-id: john at arbash-meinel.com-20090212230307-d579lv2vfjc0px1k
parent: john at arbash-meinel.com-20090212224306-firu7x1uxwq0hoc3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inv_as_lines
timestamp: Thu 2009-02-12 17:03:07 -0600
message:
Bump to Development5 formats.
-------------- next part --------------
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2009-02-12 21:20:16 +0000
+++ b/bzrlib/bzrdir.py 2009-02-12 23:03:07 +0000
@@ -3197,69 +3197,47 @@
hidden=True,
experimental=True,
)
-format_registry.register_metadir('development3',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment3',
- help='1.9 with CHK Inventories. '
- 'Please read '
- 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
- 'before use.',
- branch_format='bzrlib.branch.BzrBranchFormat7',
- tree_format='bzrlib.workingtree.WorkingTreeFormat4',
- hidden=True,
- experimental=True,
- )
-format_registry.register_metadir('development3-subtree',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment3Subtree',
- help='1.9-subtree with CHK Inventories. '
- 'Please read '
- 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
- 'before use.',
- branch_format='bzrlib.branch.BzrBranchFormat7',
- tree_format='bzrlib.workingtree.WorkingTreeFormat4',
- hidden=True,
- experimental=True,
- )
-format_registry.register_metadir('development4',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment4',
+format_registry.register_metadir('development5',
+ 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment5',
help='1.9 with CHK inventories with parent_id index. '
'Please read '
'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=True,
experimental=True,
)
-format_registry.register_metadir('development4-subtree',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment4Subtree',
+format_registry.register_metadir('development5-subtree',
+ 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment5Subtree',
help='1.9-subtree with CHK Inventories with parent_id index. '
'Please read '
'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=True,
experimental=True,
)
-format_registry.register_metadir('development4-hash16',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment4Hash16',
+format_registry.register_metadir('development5-hash16',
+ 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment5Hash16',
help='1.9 with CHK inventories with parent_id index and 16-way hash trie. '
'Please read '
'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=True,
experimental=True,
)
-format_registry.register_metadir('development4-hash255',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment4Hash255',
+format_registry.register_metadir('development5-hash255',
+ 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment5Hash255',
help='1.9 with CHK inventories with parent_id index and 255-way hash trie. '
'Please read '
'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=True,
experimental=True,
)
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py 2009-02-12 22:43:06 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2009-02-12 23:03:07 +0000
@@ -2873,7 +2873,7 @@
"1.6.1-subtree with B+Tree indices.\n")
-class RepositoryFormatPackDevelopment4(RepositoryFormatPack):
+class RepositoryFormatPackDevelopment5(RepositoryFormatPack):
"""A no-subtrees development repository.
This format should be retained until the second release after bzr 1.13.
@@ -2892,7 +2892,7 @@
_commit_inv_deltas = True
def _get_matching_bzrdir(self):
- return bzrdir.format_registry.make_bzrdir('development4')
+ return bzrdir.format_registry.make_bzrdir('development5')
def _ignore_setting_bzrdir(self, format):
pass
@@ -2901,7 +2901,7 @@
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
- return "Bazaar development format 4 (needs bzr.dev from before 1.13)\n"
+ return "Bazaar development format 5 (needs bzr.dev from before 1.13)\n"
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
@@ -2912,7 +2912,7 @@
pass
-class RepositoryFormatPackDevelopment4Subtree(RepositoryFormatPack):
+class RepositoryFormatPackDevelopment5Subtree(RepositoryFormatPack):
"""A subtrees development repository.
This format should be retained until the second release after bzr 1.13.
@@ -2934,7 +2934,7 @@
def _get_matching_bzrdir(self):
return bzrdir.format_registry.make_bzrdir(
- 'development4-subtree')
+ 'development5-subtree')
def _ignore_setting_bzrdir(self, format):
pass
@@ -2951,7 +2951,7 @@
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
- return ("Bazaar development format 4 with subtree support"
+ return ("Bazaar development format 5 with subtree support"
" (needs bzr.dev from before 1.11)\n")
def get_format_description(self):
@@ -2960,7 +2960,7 @@
" 1.9-subtree with B+Tree and chk support.\n")
-class RepositoryFormatPackDevelopment4Hash16(RepositoryFormatPack):
+class RepositoryFormatPackDevelopment5Hash16(RepositoryFormatPack):
"""A no-subtrees development repository.
This format should be retained until the second release after bzr 1.13.
@@ -2979,7 +2979,7 @@
_commit_inv_deltas = True
def _get_matching_bzrdir(self):
- return bzrdir.format_registry.make_bzrdir('development4-hash16')
+ return bzrdir.format_registry.make_bzrdir('development5-hash16')
def _ignore_setting_bzrdir(self, format):
pass
@@ -2988,7 +2988,7 @@
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
- return ("Bazaar development format 4 hash 16"
+ return ("Bazaar development format 5 hash 16"
" (needs bzr.dev from before 1.13)\n")
def get_format_description(self):
@@ -3000,7 +3000,7 @@
pass
-class RepositoryFormatPackDevelopment4Hash255(RepositoryFormatPack):
+class RepositoryFormatPackDevelopment5Hash255(RepositoryFormatPack):
"""A no-subtrees development repository.
This format should be retained until the second release after bzr 1.13.
@@ -3019,7 +3019,7 @@
_commit_inv_deltas = True
def _get_matching_bzrdir(self):
- return bzrdir.format_registry.make_bzrdir('development4-hash255')
+ return bzrdir.format_registry.make_bzrdir('development5-hash255')
def _ignore_setting_bzrdir(self, format):
pass
@@ -3028,7 +3028,7 @@
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
- return ("Bazaar development format 4 hash 255"
+ return ("Bazaar development format 5 hash 255"
" (needs bzr.dev from before 1.13)\n")
def get_format_description(self):
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2009-02-12 21:20:16 +0000
+++ b/bzrlib/repository.py 2009-02-12 23:03:07 +0000
@@ -2563,27 +2563,27 @@
'RepositoryFormatPackDevelopment3Subtree',
)
format_registry.register_lazy(
- "Bazaar development format 4 (needs bzr.dev from before 1.11)\n",
- 'bzrlib.repofmt.pack_repo',
- 'RepositoryFormatPackDevelopment4',
- )
-format_registry.register_lazy(
- ("Bazaar development format 4 with subtree support "
- "(needs bzr.dev from before 1.11)\n"),
- 'bzrlib.repofmt.pack_repo',
- 'RepositoryFormatPackDevelopment4Subtree',
- )
-format_registry.register_lazy(
- ('Bazaar development format 4 hash 16'
- ' (needs bzr.dev from before 1.13)\n'),
- 'bzrlib.repofmt.pack_repo',
- 'RepositoryFormatPackDevelopment4Hash16',
- )
-format_registry.register_lazy(
- ('Bazaar development format 4 hash 255'
- ' (needs bzr.dev from before 1.13)\n'),
- 'bzrlib.repofmt.pack_repo',
- 'RepositoryFormatPackDevelopment4Hash255',
+ "Bazaar development format 5 (needs bzr.dev from before 1.13)\n",
+ 'bzrlib.repofmt.pack_repo',
+ 'RepositoryFormatPackDevelopment5',
+ )
+format_registry.register_lazy(
+ ("Bazaar development format 5 with subtree support"
+ " (needs bzr.dev from before 1.13)\n"),
+ 'bzrlib.repofmt.pack_repo',
+ 'RepositoryFormatPackDevelopment5Subtree',
+ )
+format_registry.register_lazy(
+ ('Bazaar development format 5 hash 16'
+ ' (needs bzr.dev from before 1.13)\n'),
+ 'bzrlib.repofmt.pack_repo',
+ 'RepositoryFormatPackDevelopment5Hash16',
+ )
+format_registry.register_lazy(
+ ('Bazaar development format 5 hash 255'
+ ' (needs bzr.dev from before 1.13)\n'),
+ 'bzrlib.repofmt.pack_repo',
+ 'RepositoryFormatPackDevelopment5Hash255',
)
More information about the bazaar-commits
mailing list