/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/test_tree.py

merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_tree.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib import (
18
18
    errors,
 
19
    conflicts,
 
20
    osutils,
 
21
    revisiontree,
19
22
    tests,
 
23
    workingtree_4,
20
24
    )
21
25
from bzrlib.tests import TestSkipped
22
26
from bzrlib.tests.tree_implementations import TestCaseWithTree
55
59
        tree_b.lock_read()
56
60
        self.addCleanup(tree_b.unlock)
57
61
        self.assertEqual([
 
62
            ('killed-a', 'a\n'),
58
63
            ('killed-b', 'b\n'),
59
 
            ('killed-a', 'a\n'),
60
64
            ('unchanged', 'c\n'),
61
65
            ('unchanged', 'd\n'),
62
66
            ('new-a', 'e\n'),
68
72
 
69
73
    def skip_if_no_reference(self, tree):
70
74
        if not getattr(tree, 'supports_tree_reference', lambda: False)():
71
 
            raise tests.TestSkipped('Tree references not supported')
 
75
            raise tests.TestNotApplicable('Tree references not supported')
72
76
 
73
77
    def create_nested(self):
74
78
        work_tree = self.make_branch_and_tree('wt')
87
91
 
88
92
    def test_get_reference_revision(self):
89
93
        tree = self.create_nested()
 
94
        tree.lock_read()
 
95
        self.addCleanup(tree.unlock)
90
96
        path = tree.id2path('sub-root')
91
97
        self.assertEqual('sub-1', tree.get_reference_revision('sub-root', path))
92
98
 
95
101
        tree.lock_read()
96
102
        self.addCleanup(tree.unlock)
97
103
        entry = tree.inventory['sub-root']
98
 
        self.assertEqual([(tree.abspath('subtree'), 'sub-root')],
 
104
        self.assertEqual([(u'subtree', 'sub-root')],
99
105
            list(tree.iter_references()))
100
106
 
101
107
    def test_get_root_id(self):
119
125
            self.assertRaises(errors.NoSuchId, tree.id2path, 'a')
120
126
        finally:
121
127
            tree.unlock()
 
128
 
 
129
    def test_all_file_ids(self):
 
130
        work_tree = self.make_branch_and_tree('wt')
 
131
        tree = self.get_tree_no_parents_abc_content(work_tree)
 
132
        tree.lock_read()
 
133
        self.addCleanup(tree.unlock)
 
134
        self.assertEqual(tree.all_file_ids(),
 
135
                         set(['b-id', 'root-id', 'c-id', 'a-id']))
 
136
 
 
137
 
 
138
class TestStoredKind(TestCaseWithTree):
 
139
 
 
140
    def test_stored_kind(self):
 
141
        tree = self.make_branch_and_tree('tree')
 
142
        work_tree = self.make_branch_and_tree('wt')
 
143
        tree = self.get_tree_no_parents_abc_content(work_tree)
 
144
        tree.lock_read()
 
145
        self.addCleanup(tree.unlock)
 
146
        self.assertEqual('file', tree.stored_kind('a-id'))
 
147
        self.assertEqual('directory', tree.stored_kind('b-id'))
 
148
 
 
149
 
 
150
class TestFileContent(TestCaseWithTree):
 
151
 
 
152
    def test_get_file(self):
 
153
        work_tree = self.make_branch_and_tree('wt')
 
154
        tree = self.get_tree_no_parents_abc_content_2(work_tree)
 
155
        tree.lock_read()
 
156
        try:
 
157
            # Test lookup without path works
 
158
            lines = tree.get_file('a-id').readlines()
 
159
            self.assertEqual(['foobar\n'], lines)
 
160
            # Test lookup with path works
 
161
            lines = tree.get_file('a-id', path='a').readlines()
 
162
            self.assertEqual(['foobar\n'], lines)
 
163
        finally:
 
164
            tree.unlock()
 
165
 
 
166
    def test_get_file_text(self):
 
167
        work_tree = self.make_branch_and_tree('wt')
 
168
        tree = self.get_tree_no_parents_abc_content_2(work_tree)
 
169
        tree.lock_read()
 
170
        self.addCleanup(tree.unlock)
 
171
        # test read by file-id
 
172
        self.assertEqual('foobar\n', tree.get_file_text('a-id'))
 
173
        # test read by path
 
174
        self.assertEqual('foobar\n', tree.get_file_text('a-id', path='a'))
 
175
 
 
176
    def test_get_file_lines(self):
 
177
        work_tree = self.make_branch_and_tree('wt')
 
178
        tree = self.get_tree_no_parents_abc_content_2(work_tree)
 
179
        tree.lock_read()
 
180
        self.addCleanup(tree.unlock)
 
181
        # test read by file-id
 
182
        self.assertEqual(['foobar\n'], tree.get_file_lines('a-id'))
 
183
        # test read by path
 
184
        self.assertEqual(['foobar\n'], tree.get_file_lines('a-id', path='a'))
 
185
 
 
186
    def test_get_file_lines_multi_line_breaks(self):
 
187
        work_tree = self.make_branch_and_tree('wt')
 
188
        self.build_tree_contents([('wt/foobar', 'a\rb\nc\r\nd')])
 
189
        work_tree.add('foobar', 'foobar-id')
 
190
        tree = self._convert_tree(work_tree)
 
191
        tree.lock_read()
 
192
        self.addCleanup(tree.unlock)
 
193
        self.assertEqual(['a\rb\n', 'c\r\n', 'd'],
 
194
                         tree.get_file_lines('foobar-id'))
 
195
 
 
196
 
 
197
class TestExtractFilesBytes(TestCaseWithTree):
 
198
 
 
199
    def test_iter_files_bytes(self):
 
200
        work_tree = self.make_branch_and_tree('wt')
 
201
        self.build_tree_contents([('wt/foo', 'foo'),
 
202
                                  ('wt/bar', 'bar'),
 
203
                                  ('wt/baz', 'baz')])
 
204
        work_tree.add(['foo', 'bar', 'baz'], ['foo-id', 'bar-id', 'baz-id'])
 
205
        tree = self._convert_tree(work_tree)
 
206
        tree.lock_read()
 
207
        self.addCleanup(tree.unlock)
 
208
        extracted = dict((i, ''.join(b)) for i, b in
 
209
                         tree.iter_files_bytes([('foo-id', 'id1'),
 
210
                                                ('bar-id', 'id2'),
 
211
                                                ('baz-id', 'id3')]))
 
212
        self.assertEqual('foo', extracted['id1'])
 
213
        self.assertEqual('bar', extracted['id2'])
 
214
        self.assertEqual('baz', extracted['id3'])
 
215
        self.assertRaises(errors.NoSuchId, lambda: list(
 
216
                          tree.iter_files_bytes(
 
217
                          [('qux-id', 'file1-notpresent')])))
 
218
 
 
219
 
 
220
class TestConflicts(TestCaseWithTree):
 
221
 
 
222
    def test_conflicts(self):
 
223
        """Tree.conflicts() should return a ConflictList instance."""
 
224
        work_tree = self.make_branch_and_tree('wt')
 
225
        tree = self._convert_tree(work_tree)
 
226
        self.assertIsInstance(tree.conflicts(), conflicts.ConflictList)
 
227
 
 
228
 
 
229
class TestIterEntriesByDir(TestCaseWithTree):
 
230
 
 
231
    def test_iteration_order(self):
 
232
        work_tree = self.make_branch_and_tree('.')
 
233
        self.build_tree(['a/', 'a/b/', 'a/b/c', 'a/d/', 'a/d/e', 'f/', 'f/g'])
 
234
        work_tree.add(['a', 'a/b', 'a/b/c', 'a/d', 'a/d/e', 'f', 'f/g'])
 
235
        tree = self._convert_tree(work_tree)
 
236
        output_order = [p for p, e in tree.iter_entries_by_dir()]
 
237
        self.assertEqual(['', 'a', 'f', 'a/b', 'a/d', 'a/b/c', 'a/d/e', 'f/g'],
 
238
                         output_order)
 
239
 
 
240
 
 
241
class TestHasId(TestCaseWithTree):
 
242
 
 
243
    def test_has_id(self):
 
244
        work_tree = self.make_branch_and_tree('tree')
 
245
        self.build_tree(['tree/file'])
 
246
        work_tree.add('file', 'file-id')
 
247
        tree = self._convert_tree(work_tree)
 
248
        tree.lock_read()
 
249
        self.addCleanup(tree.unlock)
 
250
        self.assertTrue(tree.has_id('file-id'))
 
251
        self.assertFalse(tree.has_id('dir-id'))
 
252
 
 
253
    def test___contains__(self):
 
254
        work_tree = self.make_branch_and_tree('tree')
 
255
        self.build_tree(['tree/file'])
 
256
        work_tree.add('file', 'file-id')
 
257
        tree = self._convert_tree(work_tree)
 
258
        tree.lock_read()
 
259
        self.addCleanup(tree.unlock)
 
260
        self.assertTrue('file-id' in tree)
 
261
        self.assertFalse('dir-id' in tree)
 
262
 
 
263
 
 
264
class TestExtras(TestCaseWithTree):
 
265
 
 
266
    def test_extras(self):
 
267
        work_tree = self.make_branch_and_tree('tree')
 
268
        self.build_tree(['tree/file', 'tree/versioned-file'])
 
269
        work_tree.add(['file', 'versioned-file'])
 
270
        work_tree.commit('add files')
 
271
        work_tree.remove('file')
 
272
        tree = self._convert_tree(work_tree)
 
273
        if isinstance(tree,
 
274
                      (revisiontree.RevisionTree,
 
275
                       workingtree_4.DirStateRevisionTree)):
 
276
            expected = []
 
277
        else:
 
278
            expected = ['file']
 
279
        tree.lock_read()
 
280
        self.addCleanup(tree.unlock)
 
281
        self.assertEqual(expected, list(tree.extras()))
 
282
 
 
283
 
 
284
class TestGetFileSha1(TestCaseWithTree):
 
285
 
 
286
    def test_get_file_sha1(self):
 
287
        work_tree = self.make_branch_and_tree('tree')
 
288
        self.build_tree_contents([('tree/file', 'file content')])
 
289
        work_tree.add('file', 'file-id')
 
290
        tree = self._convert_tree(work_tree)
 
291
        tree.lock_read()
 
292
        self.addCleanup(tree.unlock)
 
293
        expected = osutils.sha_strings('file content')
 
294
        self.assertEqual(expected, tree.get_file_sha1('file-id'))