Rev 3676: Remove obsolete dev formats. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Sep 2 04:59:13 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3676
revision-id: pqm at pqm.ubuntu.com-20080902035907-3b81euge0gyypozk
parent: pqm at pqm.ubuntu.com-20080902030648-j9uoa5awcsjabasf
parent: robertc at robertcollins.net-20080902032110-3aifmw3k02b4dfzw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-09-02 04:59:07 +0100
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/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
------------------------------------------------------------
revno: 3653.2.3
revision-id: robertc at robertcollins.net-20080902032110-3aifmw3k02b4dfzw
parent: robertc at robertcollins.net-20080902031708-7dqsmwjiwfni9s2c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2008-09-02 13:21:10 +1000
message:
Fix last references to RepositoryFormatPackDevelopment0.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3653.2.2
revision-id: robertc at robertcollins.net-20080902031708-7dqsmwjiwfni9s2c
parent: robertc at robertcollins.net-20080828062643-2rwyk6phay4dv2mu
parent: pqm at pqm.ubuntu.com-20080901090124-w1cxlizdk4g3mstv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2008-09-02 13:17:08 +1000
message:
Merge bzr.dev to get new pack5 format.
added:
bzrlib/transport/ftp/ ftp-20080611185801-3vm145h8dmnfgh25-1
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
tools/packaging/ packaging-20080825202834-3j433iaawnt72wqa-1
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
renamed:
bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3653.2.1
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-29 19:32:00 +0000
+++ b/bzrlib/bzrdir.py 2008-09-02 03:17:08 +0000
@@ -3067,28 +3067,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-29 02:51:02 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2008-09-02 03:17:08 +0000
@@ -2174,82 +2174,7 @@
" (deprecated)")
-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.
@@ -2258,6 +2183,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):
@@ -2281,7 +2209,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.
@@ -2290,6 +2218,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/repository.py'
--- a/bzrlib/repository.py 2008-08-29 19:32:00 +0000
+++ b/bzrlib/repository.py 2008-09-02 03:21:10 +0000
@@ -2317,19 +2317,7 @@
)
# Development formats.
-# 1.2->1.3
-# development 0 - stub to introduce development versioning scheme.
-format_registry.register_lazy(
- "Bazaar development format 0 (needs bzr.dev from before 1.3)\n",
- 'bzrlib.repofmt.pack_repo',
- 'RepositoryFormatPackDevelopment0',
- )
-format_registry.register_lazy(
- ("Bazaar development format 0 with subtree support "
- "(needs bzr.dev from before 1.3)\n"),
- 'bzrlib.repofmt.pack_repo',
- 'RepositoryFormatPackDevelopment0Subtree',
- )
+# 1.5->1.6
format_registry.register_lazy(
"Bazaar development format 1 (needs bzr.dev from before 1.6)\n",
'bzrlib.repofmt.pack_repo',
@@ -2341,7 +2329,7 @@
'bzrlib.repofmt.pack_repo',
'RepositoryFormatPackDevelopment1Subtree',
)
-# 1.3->1.4 go below here
+# 1.6->1.7 go below here
class InterRepository(InterObject):
@@ -2925,13 +2913,13 @@
RepositoryFormatKnitPack4,
RepositoryFormatKnitPack5,
RepositoryFormatKnitPack5RichRoot,
- RepositoryFormatPackDevelopment0,
- RepositoryFormatPackDevelopment0Subtree,
+ RepositoryFormatPackDevelopment1,
+ RepositoryFormatPackDevelopment1Subtree,
)
nosubtrees = (
RepositoryFormatKnit1,
RepositoryFormatKnitPack1,
- RepositoryFormatPackDevelopment0,
+ RepositoryFormatPackDevelopment1,
RepositoryFormatKnitPack4,
RepositoryFormatKnitPack5,
RepositoryFormatKnitPack5RichRoot,
@@ -2939,7 +2927,7 @@
subtrees = (
RepositoryFormatKnit3,
RepositoryFormatKnitPack3,
- RepositoryFormatPackDevelopment0Subtree,
+ RepositoryFormatPackDevelopment1Subtree,
)
return (isinstance(source._format, nosubtrees) and
isinstance(target._format, subtrees))
=== modified file 'bzrlib/tests/test_pack_repository.py'
--- a/bzrlib/tests/test_pack_repository.py 2008-08-29 19:32:00 +0000
+++ b/bzrlib/tests/test_pack_repository.py 2008-09-02 03:17:08 +0000
@@ -625,14 +625,6 @@
format_string="Bazaar RepositoryFormatKnitPack5RichRoot "
"(bzr 1.6.1)\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