Rev 3925: Gc/chk formats now use wt6. in file:///home/vila/src/bzr/experimental/wt6/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/wt6/

------------------------------------------------------------
revno: 3925
revision-id: v.ladeuil+lp at free.fr-20090403161816-uh2ogvjcgvt8y47v
parent: v.ladeuil+lp at free.fr-20090403132749-rsydl9nj2kk8q08l
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: wt6
timestamp: Fri 2009-04-03 18:18:16 +0200
message:
  Gc/chk formats now use wt6.
  
  * bzrlib/tests/test_info.py:
  (TestInfo.assertCheckoutDescription): Mention the format name that
  fails the test for easier debug.
  (TestInfo.test_describe_checkout_format): Fix the test again.	
  
  * bzrlib/bzrdir.py:
  Make gc/chk formats use wt6. Get rid of gc-no-rich-root.
-------------- next part --------------
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2009-04-03 00:07:49 +0000
+++ b/bzrlib/bzrdir.py	2009-04-03 16:18:16 +0000
@@ -3417,7 +3417,7 @@
         'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
         'before use.',
     branch_format='bzrlib.branch.BzrBranchFormat7',
-    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
+    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
     hidden=True,
     experimental=True,
     )
@@ -3428,7 +3428,7 @@
         'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
         'before use.',
     branch_format='bzrlib.branch.BzrBranchFormat7',
-    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
+    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
     hidden=True,
     experimental=True,
     )
@@ -3439,7 +3439,7 @@
         'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
         'before use.',
     branch_format='bzrlib.branch.BzrBranchFormat7',
-    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
+    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
     hidden=True,
     experimental=True,
     )
@@ -3450,22 +3450,10 @@
         'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
         'before use.',
     branch_format='bzrlib.branch.BzrBranchFormat7',
-    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
+    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
     hidden=True,
     experimental=True,
     )
-# XXX: This format is scheduled for termination
-# format_registry.register_metadir('gc-no-rich-root',
-#     'bzrlib.repofmt.groupcompress_repo.RepositoryFormatPackGCPlain',
-#     help='pack-1.9 with xml inv, 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,
-#     )
 format_registry.register_metadir('gc-chk16',
     'bzrlib.repofmt.groupcompress_repo.RepositoryFormatPackGCCHK16',
     help='pack-1.9 with 16-way hashed CHK inv, group compress, rich roots. '
@@ -3473,7 +3461,7 @@
         'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
         'before use.',
     branch_format='bzrlib.branch.BzrBranchFormat7',
-    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
+    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
     hidden=False,
     experimental=True,
     )
@@ -3484,7 +3472,7 @@
         'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
         'before use.',
     branch_format='bzrlib.branch.BzrBranchFormat7',
-    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
+    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
     hidden=False,
     experimental=True,
     )
@@ -3495,7 +3483,7 @@
         'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
         'before use.',
     branch_format='bzrlib.branch.BzrBranchFormat7',
-    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
+    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
     hidden=False,
     experimental=True,
     )

=== modified file 'bzrlib/tests/test_info.py'
--- a/bzrlib/tests/test_info.py	2009-04-03 01:56:39 +0000
+++ b/bzrlib/tests/test_info.py	2009-04-03 16:18:16 +0000
@@ -101,8 +101,8 @@
             format_description = info.describe_format(tree.bzrdir,
                     tree.branch.repository, tree.branch, tree)
             self.assertEqual(expected, format_description,
-                "checkout of format called %r was described as %r" %
-                (expected, format_description))
+                "checkout of format %r called %r was described as %r" %
+                (format, expected, format_description))
         finally:
             control._format.workingtree_format = old_format
 
@@ -139,7 +139,8 @@
             # legacy: weave does not support checkouts
             if key == 'weave':
                 continue
-            if bzrdir.format_registry.get_info(key).experimental:
+            experimental = bzrdir.format_registry.get_info(key).experimental
+            if experimental:
                 # We don't require that experimental formats support checkouts
                 # or describe correctly in the UI.
                 continue
@@ -155,7 +156,7 @@
             elif key in ('knit', 'metaweave'):
                 expected = 'knit or metaweave'
             elif key in ('1.14', '1.14-rich-root'):
-                expected = '1.14 or 1.14-rich-root or gc-chk16 or gc-chk255 or gc-chk255-big'
+                expected = '1.14 or 1.14-rich-root'
             self.assertCheckoutDescription(key, expected)
 
     def test_describe_branch_format(self):