Rev 3991: rename 1.12-preview formats as development-wt5 (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Feb 9 23:26:00 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3991
revision-id: pqm at pqm.ubuntu.com-20090209232557-ll08rw7c9xe43dpe
parent: pqm at pqm.ubuntu.com-20090209210810-cq9lgqy519b7wfyi
parent: ian.clatworthy at canonical.com-20090209223906-qb8p765bqtg61b2a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-02-09 23:25:57 +0000
message:
rename 1.12-preview formats as development-wt5 (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3990.1.1
revision-id: ian.clatworthy at canonical.com-20090209223906-qb8p765bqtg61b2a
parent: pqm at pqm.ubuntu.com-20090209210810-cq9lgqy519b7wfyi
parent: ian.clatworthy at canonical.com-20090209063829-bv28wy5amxko8l1r
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-02-10 08:39:06 +1000
message:
rename 1.12-preview formats as development-wt5 (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3986.2.1
revision-id: ian.clatworthy at canonical.com-20090209063829-bv28wy5amxko8l1r
parent: pqm at pqm.ubuntu.com-20090209014051-5mj66o1vx58glvs9
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.dev-wt5
timestamp: Mon 2009-02-09 16:38:29 +1000
message:
rename 1.12-preview formats as development-wt5 formats
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
=== modified file 'NEWS'
--- a/NEWS 2009-02-09 20:26:37 +0000
+++ b/NEWS 2009-02-09 22:39:06 +0000
@@ -24,6 +24,11 @@
output of the log command in this situation may need to adjust.
(Neil Martinsen-Burrell)
+ * The experimental formats ``1.12-preview`` and ``1.12-preview-rich-root``
+ have been renamed ``development-wt5`` and ``development-wt5-rich-root``
+ respectively, given they are not ready for release in 1.12.
+ (Ian Clatworthy)
+
NEW FEATURES:
* Add support for filtering `bzr missing` on revisions. Remote revisions
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2009-01-16 07:50:48 +0000
+++ b/bzrlib/bzrdir.py 2009-02-09 06:38:29 +0000
@@ -3125,16 +3125,16 @@
branch_format='bzrlib.branch.BzrBranchFormat7',
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
)
-format_registry.register_metadir('1.12-preview',
+format_registry.register_metadir('development-wt5',
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
help='A working-tree format that supports views and content filtering.',
branch_format='bzrlib.branch.BzrBranchFormat7',
tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
experimental=True,
)
-format_registry.register_metadir('1.12-preview-rich-root',
+format_registry.register_metadir('development-wt5-rich-root',
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
- help='A variant of 1.12-preview that supports rich-root data '
+ help='A variant of development-wt5 that supports rich-root data '
'(needed for bzr-svn).',
branch_format='bzrlib.branch.BzrBranchFormat7',
tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
=== modified file 'bzrlib/tests/test_info.py'
--- a/bzrlib/tests/test_info.py 2008-12-16 06:31:33 +0000
+++ b/bzrlib/tests/test_info.py 2009-02-09 06:38:29 +0000
@@ -154,8 +154,8 @@
' rich-root or rich-root-pack'
elif key in ('knit', 'metaweave'):
expected = 'knit or metaweave'
- elif key in ('1.12-preview', '1.12-preview-rich-root'):
- expected = '1.12-preview or 1.12-preview-rich-root'
+ elif key in ('development-wt5', 'development-wt5-rich-root'):
+ expected = 'development-wt5 or development-wt5-rich-root'
self.assertCheckoutDescription(key, expected)
def test_describe_branch_format(self):
@@ -165,10 +165,10 @@
expected = None
if key in ('dirstate', 'knit'):
expected = 'dirstate or knit'
- elif key in ('1.9', '1.12-preview'):
- expected = '1.12-preview or 1.9'
- elif key in ('1.9-rich-root', '1.12-preview-rich-root'):
- expected = '1.12-preview-rich-root or 1.9-rich-root'
+ elif key in ('1.9', 'development-wt5'):
+ expected = '1.9 or development-wt5'
+ elif key in ('1.9-rich-root', 'development-wt5-rich-root'):
+ expected = '1.9-rich-root or development-wt5-rich-root'
self.assertBranchDescription(key, expected)
def test_describe_repo_format(self):
@@ -178,10 +178,10 @@
expected = None
if key in ('dirstate', 'knit', 'dirstate-tags'):
expected = 'dirstate or dirstate-tags or knit'
- elif key in ('1.9', '1.12-preview'):
- expected = '1.12-preview or 1.9'
- elif key in ('1.9-rich-root', '1.12-preview-rich-root'):
- expected = '1.12-preview-rich-root or 1.9-rich-root'
+ elif key in ('1.9', 'development-wt5'):
+ expected = '1.9 or development-wt5'
+ elif key in ('1.9-rich-root', 'development-wt5-rich-root'):
+ expected = '1.9-rich-root or development-wt5-rich-root'
self.assertRepoDescription(key, expected)
format = bzrdir.format_registry.make_bzrdir('metaweave')
More information about the bazaar-commits
mailing list