Rev 2463: Remove more references to 'experimental' formats. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2463
revision-id: robertc at robertcollins.net-20070306042050-as7r5l839l2yiks0
parent: robertc at robertcollins.net-20070306040616-0m74enszgwqd5iid
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 15:20:50 +1100
message:
  Remove more references to 'experimental' formats.
modified:
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
  bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
=== modified file 'bzrlib/tests/blackbox/test_bound_branches.py'
--- a/bzrlib/tests/blackbox/test_bound_branches.py	2007-02-14 14:57:43 +0000
+++ b/bzrlib/tests/blackbox/test_bound_branches.py	2007-03-06 04:20:50 +0000
@@ -103,7 +103,7 @@
         self.run_bzr('unbind', retcode=3)
 
     def test_bind_branch6(self):
-        branch1 = self.make_branch('branch1', format='experimental-branch6')
+        branch1 = self.make_branch('branch1', format='dirstate-with-subtree')
         os.chdir('branch1')
         error = self.run_bzr('bind', retcode=3)[1]
         self.assertContainsRe(error, 'no previous location known')
@@ -115,7 +115,7 @@
         branch2.unbind()
 
     def test_rebind_branch6(self):
-        self.setup_rebind('experimental-branch6')
+        self.setup_rebind('dirstate-with-subtree')
         os.chdir('branch2')
         self.run_bzr('bind')
         b = Branch.open('.')

=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- a/bzrlib/tests/blackbox/test_init.py	2007-02-17 07:11:47 +0000
+++ b/bzrlib/tests/blackbox/test_init.py	2007-03-06 04:20:50 +0000
@@ -148,11 +148,11 @@
         self.run_bzr_error(['Already a branch'], 'init', self.get_url())
 
     def test_init_append_revisions_only(self):
-        self.run_bzr('init', '--experimental-branch6', 'normal_branch6')
+        self.run_bzr('init', '--dirstate-with-subtree', 'normal_branch6')
         branch = _mod_branch.Branch.open('normal_branch6')
         self.assertEqual(False, branch._get_append_revisions_only())
         self.run_bzr('init', '--append-revisions-only',
-                     '--experimental-branch6', 'branch6')
+                     '--dirstate-with-subtree', 'branch6')
         branch = _mod_branch.Branch.open('branch6')
         self.assertEqual(True, branch._get_append_revisions_only())
         self.run_bzr_error(['cannot be set to append-revisions-only'], 'init',

=== modified file 'bzrlib/tests/blackbox/test_join.py'
--- a/bzrlib/tests/blackbox/test_join.py	2007-03-06 01:37:10 +0000
+++ b/bzrlib/tests/blackbox/test_join.py	2007-03-06 04:20:50 +0000
@@ -24,7 +24,7 @@
 
     def make_trees(self):
         base_tree = self.make_branch_and_tree('tree',
-                                              format='experimental-reference-dirstate')
+            format='dirstate-with-subtree')
         base_tree.commit('empty commit')
         self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
         sub_tree = self.make_branch_and_tree('tree/subtree')

=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2007-03-05 04:55:34 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2007-03-06 04:20:50 +0000
@@ -191,7 +191,7 @@
         tree_a.add('foo', 'file1')
         tree_a.commit('rev1', rev_id='rev1')
         # fetch with a default limit (grab everything)
-        f = bzrdir.format_registry.make_bzrdir('experimental-knit2')
+        f = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
         try:
             format = tree_a.branch.repository._format
             format.check_conversion_target(f.repository_format)
@@ -279,7 +279,7 @@
             old_format = bzrdir.BzrDirFormat.get_default_format()
             # This gives metadir branches something they can convert to.
             # it would be nice to have a 'latest' vs 'default' concept.
-            format = bzrdir.format_registry.make_bzrdir('experimental-knit2')
+            format = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
             upgrade(wt.basedir, format=format)
         except errors.UpToDateFormat:
             # this is in the most current format already.

=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py	2007-03-06 00:28:36 +0000
+++ b/bzrlib/tests/test_bzrdir.py	2007-03-06 04:20:50 +0000
@@ -77,11 +77,6 @@
             )
         my_format_registry.set_default('knit')
         my_format_registry.register_metadir(
-            'experimental-knit2',
-            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit2',
-            'Experimental successor to knit.  Use at your own risk.',
-            )
-        my_format_registry.register_metadir(
             'branch6',
             'bzrlib.repofmt.knitrepo.RepositoryFormatKnit2',
             'Experimental successor to knit.  Use at your own risk.',