Rev 3654: Remove obsolete dev formats. in http://people.ubuntu.com/~robertc/baz2.0/misc-fixen
Robert Collins
robertc at robertcollins.net
Thu Aug 28 07:26:48 BST 2008
At http://people.ubuntu.com/~robertc/baz2.0/misc-fixen
------------------------------------------------------------
revno: 3654
revision-id: robertc at robertcollins.net-20080828062643-2rwyk6phay4dv2mu
parent: pqm at pqm.ubuntu.com-20080828030104-6a87mmhafprj1prs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2008-08-28 16:26:43 +1000
message:
Remove obsolete dev formats.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-08-21 19:06:56 +0000
+++ b/bzrlib/bzrdir.py 2008-08-28 06:26:43 +0000
@@ -3073,28 +3073,6 @@
alias=True,
)
# And the development formats which the will have aliased one of follow:
-format_registry.register_metadir('development0',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0',
- help='Trivial rename of pack-0.92 to provide a development format. '
- 'Please read '
- 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
- 'before use.',
- branch_format='bzrlib.branch.BzrBranchFormat6',
- tree_format='bzrlib.workingtree.WorkingTreeFormat4',
- hidden=True,
- experimental=True,
- )
-format_registry.register_metadir('development0-subtree',
- 'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0Subtree',
- help='Trivial rename of pack-0.92-subtree to provide a development format. '
- 'Please read '
- 'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
- 'before use.',
- branch_format='bzrlib.branch.BzrBranchFormat6',
- tree_format='bzrlib.workingtree.WorkingTreeFormat4',
- hidden=True,
- experimental=True,
- )
format_registry.register_metadir('development1',
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment1',
help='A branch and pack based repository that supports stacking. '
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py 2008-08-18 22:34:21 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2008-08-28 06:26:43 +0000
@@ -2124,82 +2124,7 @@
return "Packs 5 rich-root (adds stacking support, requires bzr 1.6)"
-class RepositoryFormatPackDevelopment0(RepositoryFormatPack):
- """A no-subtrees development repository.
-
- This format should be retained until the second release after bzr 1.0.
-
- No changes to the disk behaviour from pack-0.92.
- """
-
- repository_class = KnitPackRepository
- _commit_builder_class = PackCommitBuilder
- _serializer = xml5.serializer_v5
-
- def _get_matching_bzrdir(self):
- return bzrdir.format_registry.make_bzrdir('development0')
-
- 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 0 (needs bzr.dev from before 1.3)\n"
-
- def get_format_description(self):
- """See RepositoryFormat.get_format_description()."""
- return ("Development repository format, currently the same as "
- "pack-0.92\n")
-
- def check_conversion_target(self, target_format):
- pass
-
-
-class RepositoryFormatPackDevelopment0Subtree(RepositoryFormatPack):
- """A subtrees development repository.
-
- This format should be retained until the second release after bzr 1.0.
-
- No changes to the disk behaviour from pack-0.92-subtree.
- """
-
- repository_class = KnitPackRepository
- _commit_builder_class = PackRootCommitBuilder
- rich_root_data = True
- supports_tree_reference = True
- _serializer = xml7.serializer_v7
-
- def _get_matching_bzrdir(self):
- return bzrdir.format_registry.make_bzrdir(
- 'development0-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 0 with subtree support "
- "(needs bzr.dev from before 1.3)\n")
-
- def get_format_description(self):
- """See RepositoryFormat.get_format_description()."""
- return ("Development repository format, currently the same as "
- "pack-0.92-subtree\n")
-
-
-class RepositoryFormatPackDevelopment1(RepositoryFormatPackDevelopment0):
+class RepositoryFormatPackDevelopment1(RepositoryFormatPack):
"""A no-subtrees development repository.
This format should be retained until the second release after bzr 1.5.
@@ -2208,6 +2133,9 @@
reconcile compared to pack-0.92 formats.
"""
+ repository_class = KnitPackRepository
+ _commit_builder_class = PackCommitBuilder
+ _serializer = xml5.serializer_v5
supports_external_lookups = True
def _get_matching_bzrdir(self):
@@ -2231,7 +2159,7 @@
pass
-class RepositoryFormatPackDevelopment1Subtree(RepositoryFormatPackDevelopment0Subtree):
+class RepositoryFormatPackDevelopment1Subtree(RepositoryFormatPack):
"""A subtrees development repository.
This format should be retained until the second release after bzr 1.5.
@@ -2240,6 +2168,11 @@
reconcile compared to pack-0.92 formats.
"""
+ repository_class = KnitPackRepository
+ _commit_builder_class = PackRootCommitBuilder
+ rich_root_data = True
+ supports_tree_reference = True
+ _serializer = xml7.serializer_v7
supports_external_lookups = True
def _get_matching_bzrdir(self):
=== modified file 'bzrlib/tests/test_pack_repository.py'
--- a/bzrlib/tests/test_pack_repository.py 2008-08-18 23:11:59 +0000
+++ b/bzrlib/tests/test_pack_repository.py 2008-08-28 06:26:43 +0000
@@ -594,14 +594,6 @@
format_string="Bazaar RepositoryFormatKnitPack5RichRoot "
"(bzr 1.6)\n",
format_supports_external_lookups=True),
- dict(format_name='development0',
- format_string="Bazaar development format 0 "
- "(needs bzr.dev from before 1.3)\n",
- format_supports_external_lookups=False),
- dict(format_name='development0-subtree',
- format_string="Bazaar development format 0 "
- "with subtree support (needs bzr.dev from before 1.3)\n",
- format_supports_external_lookups=False),
dict(format_name='development',
format_string="Bazaar development format 1 "
"(needs bzr.dev from before 1.6)\n",
=== modified file 'doc/developers/development-repo.txt'
--- a/doc/developers/development-repo.txt 2008-01-02 22:30:46 +0000
+++ b/doc/developers/development-repo.txt 2008-08-28 06:26:43 +0000
@@ -189,7 +189,7 @@
1. Register two new formats with the next available sequence number.
e.g. ``development1`` and ``development1-subtree``. (You can see the
- ``development0`` format for an example.
+ current development format for an example.
These should:
* Use your new development repository/branch/tree classes
@@ -226,20 +226,17 @@
development
-----------
-Currently an alias for Development0
+Currently an alias for Development1
development-subtree
-------------------
-Currently an alias for Development0Subtree
+Currently an alias for Development1Subtree
-Development0[Subtree]
+Development1[Subtree]
---------------------
-These formats exists solely to provide an actual new format for the
-feature of 'development formats' to be introduced. They are regular
-pack-0.92 style formats with no changes to the disk storage other than
-the version marker.
+These formats were introduced during the development of branch stacking.
..
More information about the bazaar-commits
mailing list