/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/__init__.py

[merge] bzr.dev 2255, resolve conflicts, update copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
38
38
                          TestSuite,
39
39
                          )
40
40
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
41
 
from bzrlib.tree import RevisionTree
 
41
from bzrlib.revisiontree import RevisionTree
42
42
from bzrlib.workingtree import (WorkingTreeFormat,
43
43
                                WorkingTreeTestProviderAdapter,
44
44
                                _legacy_formats,
86
86
        :param empty_tree: A working tree with no content and no parents to
87
87
            modify.
88
88
        """
 
89
        empty_tree.set_root_id('empty-root-id')
89
90
        return self._convert_tree(empty_tree, converter)
90
91
 
91
92
    def _make_abc_tree(self, tree):
92
93
        """setup an abc content tree."""
93
94
        files = ['a', 'b/', 'b/c']
94
 
        self.build_tree(files, line_endings='binary',
 
95
        self.build_tree(files, line_endings='binary', 
95
96
                        transport=tree.bzrdir.root_transport)
 
97
        tree.set_root_id('root-id')
96
98
        tree.add(files, ['a-id', 'b-id', 'c-id'])
97
99
 
98
100
    def get_tree_no_parents_abc_content(self, tree, converter=None):
230
232
    test_tree_implementations = [
231
233
        'bzrlib.tests.tree_implementations.test_revision_tree',
232
234
        'bzrlib.tests.tree_implementations.test_test_trees',
 
235
        'bzrlib.tests.tree_implementations.test_tree',
233
236
        'bzrlib.tests.tree_implementations.test_walkdirs',
234
237
        ]
235
238
    adapter = TreeTestProviderAdapter(