Rev 2429: remove AB1 WorkingTree and experimental-knit3 in http://sourcefrog.net/bzr/dirstate-plus-subtree
Martin Pool
mbp at sourcefrog.net
Fri Mar 2 09:44:43 GMT 2007
At http://sourcefrog.net/bzr/dirstate-plus-subtree
------------------------------------------------------------
revno: 2429
revision-id: mbp at sourcefrog.net-20070302094441-8gupjnz50wivvmj8
parent: mbp at sourcefrog.net-20070302092757-gjmoq58z9setp7kp
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-plus-subtree
timestamp: Fri 2007-03-02 20:44:41 +1100
message:
remove AB1 WorkingTree and experimental-knit3
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2007-03-01 05:28:19 +0000
+++ b/bzrlib/bzrdir.py 2007-03-02 09:44:41 +0000
@@ -2234,13 +2234,6 @@
branch_format='bzrlib.branch.BzrBranchFormat5',
tree_format='bzrlib.workingtree.WorkingTreeFormat3'
)
-
-format_registry.register_metadir('experimental-knit3',
- 'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
- 'Experimental successor to knit2. Use at your own risk.',
- branch_format='bzrlib.branch.BzrBranchFormat5',
- tree_format='bzrlib.workingtree.WorkingTreeFormatAB1')
-
format_registry.register_metadir('experimental-branch6',
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
'Experimental successor to knit. Use at your own risk.',
=== modified file 'bzrlib/repofmt/knitrepo.py'
--- a/bzrlib/repofmt/knitrepo.py 2007-02-22 05:51:57 +0000
+++ b/bzrlib/repofmt/knitrepo.py 2007-03-02 09:44:41 +0000
@@ -481,7 +481,7 @@
support_tree_reference = True
def _get_matching_bzrdir(self):
- return bzrdir.format_registry.make_bzrdir('experimental-knit3')
+ return bzrdir.format_registry.make_bzrdir('experimental-reference-dirstate')
def _ignore_setting_bzrdir(self, format):
pass
=== modified file 'bzrlib/tests/blackbox/test_join.py'
--- a/bzrlib/tests/blackbox/test_join.py 2007-01-11 03:46:53 +0000
+++ b/bzrlib/tests/blackbox/test_join.py 2007-03-02 09:44:41 +0000
@@ -24,7 +24,7 @@
def make_trees(self):
base_tree = self.make_branch_and_tree('tree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
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/intertree_implementations/__init__.py'
--- a/bzrlib/tests/intertree_implementations/__init__.py 2007-03-01 05:28:19 +0000
+++ b/bzrlib/tests/intertree_implementations/__init__.py 2007-03-02 09:44:41 +0000
@@ -38,7 +38,6 @@
from bzrlib.tree import InterTree
from bzrlib.workingtree import (
WorkingTreeFormat3,
- WorkingTreeFormatAB1,
WorkingTreeTestProviderAdapter,
)
=== modified file 'bzrlib/tests/test_branch.py'
--- a/bzrlib/tests/test_branch.py 2007-02-16 07:02:19 +0000
+++ b/bzrlib/tests/test_branch.py 2007-03-02 09:44:41 +0000
@@ -251,11 +251,11 @@
tree.unlock()
def do_checkout_test(self, lightweight=False):
- tree = self.make_branch_and_tree('source', format='experimental-knit3')
+ tree = self.make_branch_and_tree('source', format='experimental-reference-dirstate')
subtree = self.make_branch_and_tree('source/subtree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
self.build_tree(['source/subtree/file',
'source/subtree/subsubtree/file'])
subsubtree.add('file')
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2007-02-26 14:24:46 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2007-03-02 09:44:41 +0000
@@ -75,10 +75,6 @@
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
'Format using knits',
)
- my_format_registry.register_metadir('experimental-knit3',
- 'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
- 'Format using knits',
- tree_format='bzrlib.workingtree.WorkingTreeFormatAB1')
my_format_registry.set_default('knit')
my_format_registry.register_metadir(
'experimental-knit2',
@@ -104,11 +100,6 @@
my_bzrdir = my_format_registry.make_bzrdir('knit')
self.assertIsInstance(my_bzrdir.repository_format,
knitrepo.RepositoryFormatKnit1)
- my_bzrdir = my_format_registry.make_bzrdir('experimental-knit3')
- self.assertIsInstance(my_bzrdir.repository_format,
- knitrepo.RepositoryFormatKnit3)
- self.assertIsInstance(my_bzrdir.workingtree_format,
- workingtree.WorkingTreeFormatAB1)
my_bzrdir = my_format_registry.make_bzrdir('branch6')
self.assertIsInstance(my_bzrdir.get_branch_format(),
bzrlib.branch.BzrBranchFormat6)
@@ -486,9 +477,9 @@
transport)
def test_sprout_recursive(self):
- tree = self.make_branch_and_tree('tree1', format='experimental-knit3')
+ tree = self.make_branch_and_tree('tree1', format='experimental-reference-dirstate')
sub_tree = self.make_branch_and_tree('tree1/subtree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
tree.add_reference(sub_tree)
self.build_tree(['tree1/subtree/file'])
sub_tree.add('file')
@@ -503,23 +494,19 @@
branch = self.make_branch('branch', format='knit')
format = branch.bzrdir.cloning_metadir()
self.assertIsInstance(format.workingtree_format,
- workingtree.WorkingTreeFormat3)
- branch2 = self.make_branch('branch2', format='experimental-knit3')
- format2 = branch2.bzrdir.cloning_metadir()
- self.assertIsInstance(format2.workingtree_format,
- workingtree.WorkingTreeFormatAB1)
+ workingtree.WorkingTreeFormat3)
def test_sprout_recursive_treeless(self):
- tree = self.make_branch_and_tree('tree1', format='experimental-knit3')
+ tree = self.make_branch_and_tree('tree1', format='experimental-reference-dirstate')
sub_tree = self.make_branch_and_tree('tree1/subtree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
tree.add_reference(sub_tree)
self.build_tree(['tree1/subtree/file'])
sub_tree.add('file')
tree.commit('Initial commit')
tree.bzrdir.destroy_workingtree()
repo = self.make_repository('repo', shared=True,
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
repo.set_make_working_trees(False)
tree.bzrdir.sprout('repo/tree2')
self.failUnlessExists('repo/tree2/subtree')
@@ -745,12 +732,6 @@
def test_checkout_metadir(self):
# checkout_metadir has reasonable working tree format even when no
# working tree is present
- self.make_branch('branch-knit3', format='experimental-knit3')
- my_bzrdir = bzrdir.BzrDir.open(self.get_url('branch-knit3'))
- checkout_format = my_bzrdir.checkout_metadir()
- self.assertIsInstance(checkout_format.workingtree_format,
- workingtree.WorkingTreeFormatAB1)
-
self.make_branch('branch-knit2', format='experimental-knit2')
my_bzrdir = bzrdir.BzrDir.open(self.get_url('branch-knit2'))
checkout_format = my_bzrdir.checkout_metadir()
=== modified file 'bzrlib/tests/test_commit.py'
--- a/bzrlib/tests/test_commit.py 2007-02-26 02:56:24 +0000
+++ b/bzrlib/tests/test_commit.py 2007-03-02 09:44:41 +0000
@@ -682,11 +682,11 @@
def test_nested_commit(self):
"""Commit in multiply-nested trees"""
- tree = self.make_branch_and_tree('.', format='experimental-knit3')
+ tree = self.make_branch_and_tree('.', format='experimental-reference-dirstate')
subtree = self.make_branch_and_tree('subtree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
subsubtree = self.make_branch_and_tree('subtree/subtree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
subtree.add_reference(subsubtree)
tree.add_reference(subtree)
tree.commit('added reference', allow_pointless=False)
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py 2007-02-27 05:51:36 +0000
+++ b/bzrlib/tests/test_merge.py 2007-03-02 09:44:41 +0000
@@ -182,9 +182,9 @@
tree_a.conflicts())
def test_nested_merge(self):
- tree = self.make_branch_and_tree('tree', format='experimental-knit3')
+ tree = self.make_branch_and_tree('tree', format='experimental-reference-dirstate')
sub_tree = self.make_branch_and_tree('tree/sub-tree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
sub_tree.set_root_id('sub-tree-root')
self.build_tree_contents([('tree/sub-tree/file', 'text1')])
sub_tree.add('file')
=== modified file 'bzrlib/tests/test_subsume.py'
--- a/bzrlib/tests/test_subsume.py 2007-01-11 03:46:53 +0000
+++ b/bzrlib/tests/test_subsume.py 2007-03-02 09:44:41 +0000
@@ -21,7 +21,7 @@
def make_branch_and_tree(self, relpath, format=None):
if format is None:
- format = 'experimental-knit3'
+ format = 'experimental-reference-dirstate'
return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath,
format)
@@ -34,7 +34,7 @@
base_tree.add('file', 'file-id')
base_tree.commit('first commit', rev_id='tree-1')
sub_tree = self.make_branch_and_tree('tree/subtree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
if same_root is True:
sub_tree.set_root_id(base_tree.get_root_id())
sub_tree.add('file2', 'file2-id')
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2007-03-01 10:14:03 +0000
+++ b/bzrlib/tests/test_transform.py 2007-03-02 09:44:41 +0000
@@ -44,7 +44,7 @@
def setUp(self):
super(TestTreeTransform, self).setUp()
- self.wt = self.make_branch_and_tree('.', format='experimental-knit3')
+ self.wt = self.make_branch_and_tree('.', format='experimental-reference-dirstate')
os.chdir('..')
def get_transform(self):
@@ -972,9 +972,9 @@
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
def test_build_with_references(self):
- tree = self.make_branch_and_tree('source', format='experimental-knit3')
+ tree = self.make_branch_and_tree('source', format='experimental-reference-dirstate')
subtree = self.make_branch_and_tree('source/subtree',
- format='experimental-knit3')
+ format='experimental-reference-dirstate')
tree.add_reference(subtree)
tree.commit('a revision')
tree.branch.create_checkout('target')
=== modified file 'bzrlib/tests/test_workingtree.py'
--- a/bzrlib/tests/test_workingtree.py 2007-03-01 05:57:33 +0000
+++ b/bzrlib/tests/test_workingtree.py 2007-03-02 09:44:41 +0000
@@ -220,63 +220,6 @@
self.assertEqual([], tree.get_parent_ids())
-class TestWorkingTreeFormatAB1(TestCaseWithTransport):
- """Tests specific to WorkingTreeFormat3."""
-
- def test_disk_layout(self):
- tree = self.make_branch_and_tree('.', format='experimental-knit3')
- control = tree.bzrdir
- # we want:
- # format 'Bazaar-NG Working Tree format AB1'
- # inventory = 1 entry for root
- # pending-merges = ''
- # no inventory.basis yet
- t = control.get_workingtree_transport(None)
- self.assertEqualDiff('Bazaar-NG Working Tree format AB1',
- t.get('format').read())
- self.assertContainsRe(t.get('inventory').read(),
- '<inventory format="7">\n'
- '<directory file_id="[^"]*" name="" />\n'
- '</inventory>\n',
- )
- self.assertEqualDiff('### bzr hashcache v5\n',
- t.get('stat-cache').read())
- self.assertFalse(t.has('basis-inventory-cache'))
- # no last-revision file means 'None' or 'NULLREVISION'
- self.assertFalse(t.has('last-revision'))
- tree.set_root_id('my-root-id')
- tree.commit('test', rev_id='revision-1')
- self.assertTrue(t.has('basis-inventory-cache'))
- self.assertTrue(t.has('last-revision'))
- self.assertEqualDiff(t.get('basis-inventory-cache').read(),
- '<inventory format="7" revision_id="revision-1">\n'
- '<directory file_id="my-root-id" name="" revision="revision-1" />\n'
- '</inventory>\n')
-
- def test_incompatible_repo(self):
- control = bzrdir.format_registry.make_bzrdir('knit')
- control.workingtree_format = workingtree.WorkingTreeFormatAB1()
- tree = self.make_branch_and_tree('.', format=control)
- self.assertRaises(errors.RootNotRich, tree.commit)
-
- def test_compatible_repo(self):
- tree = self.make_branch_and_tree('.', format='experimental-knit3')
- tree.set_root_id('my-root-id')
- tree.commit('test', rev_id='revision-1')
- tree.commit('test', rev_id='revision-2')
- revision_tree = tree.branch.repository.revision_tree('revision-2')
- self.assertEqual('revision-1',
- revision_tree.inventory['my-root-id'].revision)
-
- def test_unique_root_id_per_tree(self):
- # each time you initialize a new tree, it gets a different root id
- tree1 = self.make_branch_and_tree('tree1',
- format='experimental-knit3')
- tree2 = self.make_branch_and_tree('tree2',
- format='experimental-knit3')
- self.assertNotEqual(tree1.get_root_id(), tree2.get_root_id())
-
-
class TestFormat2WorkingTree(TestCaseWithTransport):
"""Tests that are specific to format 2 trees."""
=== modified file 'bzrlib/tests/tree_implementations/__init__.py'
--- a/bzrlib/tests/tree_implementations/__init__.py 2007-03-01 05:28:19 +0000
+++ b/bzrlib/tests/tree_implementations/__init__.py 2007-03-02 09:44:41 +0000
@@ -43,7 +43,6 @@
from bzrlib.workingtree import (
WorkingTreeFormat,
WorkingTreeFormat3,
- WorkingTreeFormatAB1,
WorkingTreeTestProviderAdapter,
_legacy_formats,
)
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2007-03-02 09:27:57 +0000
+++ b/bzrlib/workingtree.py 2007-03-02 09:44:41 +0000
@@ -2342,41 +2342,6 @@
self.branch.unlock()
-class WorkingTreeAB1(WorkingTree3):
-
- def _serialize(self, inventory, out_file):
- xml7.serializer_v7.write_inventory(self._inventory, out_file)
-
- def _deserialize(selt, in_file):
- return xml7.serializer_v7.read_inventory(in_file)
-
- def _comparison_data(self, entry, path):
- kind, executable, stat_value = \
- WorkingTree3._comparison_data(self, entry, path)
- if kind == 'directory' and entry.kind == 'tree-reference':
- kind = 'tree-reference'
- return kind, executable, stat_value
-
- def kind(self, file_id):
- kind = WorkingTree3.kind(self, file_id)
- if kind == 'directory':
- entry = self.inventory[file_id]
- if entry.kind == 'tree-reference':
- kind = 'tree-reference'
- return kind
-
- def add_reference(self, sub_tree):
- return self._add_reference(sub_tree)
-
- def get_nested_tree(self, entry, path=None):
- if path is None:
- path = self.id2path(entry.file_id)
- return WorkingTree.open(self.abspath(path))
-
- def get_reference_revision(self, entry, path=None):
- return self.get_nested_tree(entry, path).last_revision()
-
-
def get_conflicted_stem(path):
for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
if path.endswith(suffix):
@@ -2679,38 +2644,9 @@
return self.get_format_string()
-class WorkingTreeFormatAB1(WorkingTreeFormat3):
- """Working tree format that supports unique roots and nested trees"""
-
- _tree_class = WorkingTreeAB1
-
- requires_rich_root = True
-
- supports_tree_reference = True
-
- def __init__(self):
- WorkingTreeFormat3.__init__(self)
-
- def __get_matchingbzrdir(self):
- return bzrdir.format_registry.make_bzrdir('experimental-knit3')
-
- _matchingbzrdir = property(__get_matchingbzrdir)
-
- def get_format_string(self):
- """See WorkingTreeFormat.get_format_string()."""
- return "Bazaar-NG Working Tree format AB1"
-
- def get_format_description(self):
- """See WorkingTreeFormat.get_format_description()."""
- return "Working tree format 4"
-
- def _initial_inventory(self):
- return Inventory(root_id=generate_ids.gen_root_id())
-
__default_format = WorkingTreeFormat4()
WorkingTreeFormat.register_format(__default_format)
WorkingTreeFormat.register_format(WorkingTreeFormat3())
-WorkingTreeFormat.register_format(WorkingTreeFormatAB1())
WorkingTreeFormat.set_default_format(__default_format)
# formats which have no format string are not discoverable
# and not independently creatable, so are not registered.
More information about the bazaar-commits
mailing list