/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
1
# Copyright (C) 2006-2009, 2011, 2012, 2016 Canonical Ltd
1551.9.21 by Aaron Bentley
Fix copyright statements
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1551.9.21 by Aaron Bentley
Fix copyright statements
16
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
17
from breezy import (
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
18
    errors,
3363.13.1 by Aaron Bentley
Implement PreviewTree.extras
19
    conflicts,
3363.15.4 by Aaron Bentley
Implement PreviewTree.get_file_sha1 properly
20
    osutils,
3363.13.1 by Aaron Bentley
Implement PreviewTree.extras
21
    revisiontree,
2255.2.180 by Martin Pool
merge dirstate
22
    tests,
6670.4.3 by Jelmer Vernooij
Fix more imports.
23
    )
24
from breezy.bzr import (
3363.13.1 by Aaron Bentley
Implement PreviewTree.extras
25
    workingtree_4,
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
26
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
27
from breezy.tests import TestSkipped
28
from breezy.tests.per_tree import TestCaseWithTree
5967.7.1 by Martin Pool
Deprecate __contains__ on Tree and Inventory
29
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
30
31
class TestAnnotate(TestCaseWithTree):
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
32
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
33
    def test_annotate(self):
34
        work_tree = self.make_branch_and_tree('wt')
35
        tree = self.get_tree_no_parents_abc_content(work_tree)
36
        tree_revision = getattr(tree, 'get_revision_id', lambda: 'current:')()
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
37
        tree.lock_read()
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
38
        self.addCleanup(tree.unlock)
6809.4.2 by Jelmer Vernooij
Swap arguments for annotate_iter.
39
        for revision, line in tree.annotate_iter('a'):
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
40
            self.assertEqual('contents of a\n', line)
41
            self.assertEqual(tree_revision, revision)
42
        tree_revision = getattr(tree, 'get_revision_id', lambda: 'random:')()
6809.4.3 by Jelmer Vernooij
Fix annotate tests.
43
        for revision, line in tree.annotate_iter('a', default_revision='random:'):
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
44
            self.assertEqual('contents of a\n', line)
45
            self.assertEqual(tree_revision, revision)
46
47
1551.15.52 by Aaron Bentley
Tweak from review comments
48
class TestPlanFileMerge(TestCaseWithTree):
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
49
1551.15.52 by Aaron Bentley
Tweak from review comments
50
    def test_plan_file_merge(self):
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
51
        work_a = self.make_branch_and_tree('wta')
52
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
53
        work_a.add('file')
54
        file_id = work_a.path2id('file')
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
55
        work_a.commit('base version')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
56
        work_b = work_a.controldir.sprout('wtb').open_workingtree()
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
57
        self.build_tree_contents([('wta/file', 'b\nc\nd\ne\n')])
58
        tree_a = self.workingtree_to_test_tree(work_a)
59
        tree_a.lock_read()
60
        self.addCleanup(tree_a.unlock)
61
        self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
62
        tree_b = self.workingtree_to_test_tree(work_b)
63
        tree_b.lock_read()
64
        self.addCleanup(tree_b.unlock)
65
        self.assertEqual([
3514.2.3 by John Arbash Meinel
Fix a failing test in tree_implementations
66
            ('killed-a', 'a\n'),
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
67
            ('killed-b', 'b\n'),
68
            ('unchanged', 'c\n'),
69
            ('unchanged', 'd\n'),
70
            ('new-a', 'e\n'),
71
            ('new-b', 'f\n'),
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
72
        ], list(tree_a.plan_file_merge(file_id, tree_b)))
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
73
74
75
class TestReference(TestCaseWithTree):
76
77
    def skip_if_no_reference(self, tree):
78
        if not getattr(tree, 'supports_tree_reference', lambda: False)():
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
79
            raise tests.TestNotApplicable('Tree references not supported')
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
80
2100.3.27 by Aaron Bentley
Enable nested commits
81
    def create_nested(self):
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
82
        work_tree = self.make_branch_and_tree('wt')
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
83
        work_tree.lock_write()
84
        try:
85
            self.skip_if_no_reference(work_tree)
86
            subtree = self.make_branch_and_tree('wt/subtree')
87
            subtree.set_root_id('sub-root')
88
            subtree.commit('foo', rev_id='sub-1')
89
            work_tree.add_reference(subtree)
90
        finally:
91
            work_tree.unlock()
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
92
        tree = self._convert_tree(work_tree)
93
        self.skip_if_no_reference(tree)
2100.3.27 by Aaron Bentley
Enable nested commits
94
        return tree
95
96
    def test_get_reference_revision(self):
97
        tree = self.create_nested()
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
98
        tree.lock_read()
99
        self.addCleanup(tree.unlock)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
100
        path = tree.id2path('sub-root')
5967.7.1 by Martin Pool
Deprecate __contains__ on Tree and Inventory
101
        self.assertEqual('sub-1',
6809.4.1 by Jelmer Vernooij
Swap file_id and path arguments for get_reference_revision and get_nested_tree.
102
            tree.get_reference_revision(path, 'sub-root'))
2100.3.27 by Aaron Bentley
Enable nested commits
103
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
104
    def test_iter_references(self):
2100.3.27 by Aaron Bentley
Enable nested commits
105
        tree = self.create_nested()
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
106
        tree.lock_read()
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
107
        self.addCleanup(tree.unlock)
6405.2.9 by Jelmer Vernooij
More test fixes.
108
        entry = tree.root_inventory['sub-root']
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
109
        self.assertEqual([(u'subtree', 'sub-root')],
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
110
            list(tree.iter_references()))
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
111
112
    def test_get_root_id(self):
113
        # trees should return some kind of root id; it can be none
114
        tree = self.make_branch_and_tree('tree')
115
        root_id = tree.get_root_id()
116
        if root_id is not None:
117
            self.assertIsInstance(root_id, str)
2255.2.180 by Martin Pool
merge dirstate
118
119
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
120
class TestFileIds(TestCaseWithTree):
121
122
    def test_id2path(self):
123
        # translate from file-id back to path
124
        work_tree = self.make_branch_and_tree('wt')
125
        tree = self.get_tree_no_parents_abc_content(work_tree)
6793.5.1 by Jelmer Vernooij
Hardcode fileids in fewer places.
126
        a_id = tree.path2id('a')
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
127
        tree.lock_read()
128
        try:
6793.5.1 by Jelmer Vernooij
Hardcode fileids in fewer places.
129
            self.assertEqual(u'a', tree.id2path(a_id))
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
130
            # other ids give an error- don't return None for this case
131
            self.assertRaises(errors.NoSuchId, tree.id2path, 'a')
132
        finally:
133
            tree.unlock()
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
134
3146.8.16 by Aaron Bentley
Updates from review
135
    def test_all_file_ids(self):
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
136
        work_tree = self.make_branch_and_tree('wt')
137
        tree = self.get_tree_no_parents_abc_content(work_tree)
138
        tree.lock_read()
139
        self.addCleanup(tree.unlock)
3146.8.16 by Aaron Bentley
Updates from review
140
        self.assertEqual(tree.all_file_ids(),
6793.5.1 by Jelmer Vernooij
Hardcode fileids in fewer places.
141
                         {tree.path2id('a'), tree.path2id(''),
142
                          tree.path2id('b'), tree.path2id('b/c')})
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
143
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
144
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
145
class TestStoredKind(TestCaseWithTree):
146
147
    def test_stored_kind(self):
148
        tree = self.make_branch_and_tree('tree')
149
        work_tree = self.make_branch_and_tree('wt')
150
        tree = self.get_tree_no_parents_abc_content(work_tree)
151
        tree.lock_read()
152
        self.addCleanup(tree.unlock)
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
153
        self.assertEqual('file', tree.stored_kind('a'))
154
        self.assertEqual('directory', tree.stored_kind('b'))
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
155
156
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
157
class TestFileContent(TestCaseWithTree):
158
159
    def test_get_file(self):
160
        work_tree = self.make_branch_and_tree('wt')
161
        tree = self.get_tree_no_parents_abc_content_2(work_tree)
6793.5.1 by Jelmer Vernooij
Hardcode fileids in fewer places.
162
        a_id = tree.path2id('a')
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
163
        tree.lock_read()
6437.20.6 by Martin Packman
Poke test_get_file in bt.per_tree.test_tree to be more careful about cleanup
164
        self.addCleanup(tree.unlock)
165
        # Test lookup without path works
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
166
        file_without_path = tree.get_file('a')
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
167
        try:
6437.20.2 by Wouter van Heyst
close files returned by transport.get
168
            lines = file_without_path.readlines()
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
169
            self.assertEqual(['foobar\n'], lines)
6437.20.6 by Martin Packman
Poke test_get_file in bt.per_tree.test_tree to be more careful about cleanup
170
        finally:
171
            file_without_path.close()
172
        # Test lookup with path works
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
173
        file_with_path = tree.get_file('a', a_id)
6437.20.6 by Martin Packman
Poke test_get_file in bt.per_tree.test_tree to be more careful about cleanup
174
        try:
6437.20.2 by Wouter van Heyst
close files returned by transport.get
175
            lines = file_with_path.readlines()
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
176
            self.assertEqual(['foobar\n'], lines)
177
        finally:
6437.20.2 by Wouter van Heyst
close files returned by transport.get
178
            file_with_path.close()
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
179
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
180
    def test_get_file_text(self):
181
        work_tree = self.make_branch_and_tree('wt')
182
        tree = self.get_tree_no_parents_abc_content_2(work_tree)
6793.5.1 by Jelmer Vernooij
Hardcode fileids in fewer places.
183
        a_id = tree.path2id('a')
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
184
        tree.lock_read()
185
        self.addCleanup(tree.unlock)
186
        # test read by file-id
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
187
        self.assertEqual('foobar\n', tree.get_file_text('a', a_id))
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
188
        # test read by path
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
189
        self.assertEqual('foobar\n', tree.get_file_text('a'))
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
190
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
191
    def test_get_file_lines(self):
192
        work_tree = self.make_branch_and_tree('wt')
193
        tree = self.get_tree_no_parents_abc_content_2(work_tree)
6793.5.1 by Jelmer Vernooij
Hardcode fileids in fewer places.
194
        a_id = tree.path2id('a')
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
195
        tree.lock_read()
196
        self.addCleanup(tree.unlock)
197
        # test read by file-id
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
198
        self.assertEqual(['foobar\n'], tree.get_file_lines('a', a_id))
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
199
        # test read by path
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
200
        self.assertEqual(['foobar\n'], tree.get_file_lines('a'))
2743.3.5 by Ian Clatworthy
Incorporate feedback from abentley
201
3774.1.4 by Aaron Bentley
Use file.readlines on working trees.
202
    def test_get_file_lines_multi_line_breaks(self):
203
        work_tree = self.make_branch_and_tree('wt')
204
        self.build_tree_contents([('wt/foobar', 'a\rb\nc\r\nd')])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
205
        work_tree.add('foobar')
3774.1.4 by Aaron Bentley
Use file.readlines on working trees.
206
        tree = self._convert_tree(work_tree)
207
        tree.lock_read()
208
        self.addCleanup(tree.unlock)
209
        self.assertEqual(['a\rb\n', 'c\r\n', 'd'],
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
210
                         tree.get_file_lines('foobar'))
3774.1.4 by Aaron Bentley
Use file.readlines on working trees.
211
212
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
213
class TestExtractFilesBytes(TestCaseWithTree):
214
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
215
    def test_iter_files_bytes(self):
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
216
        work_tree = self.make_branch_and_tree('wt')
217
        self.build_tree_contents([('wt/foo', 'foo'),
218
                                  ('wt/bar', 'bar'),
219
                                  ('wt/baz', 'baz')])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
220
        work_tree.add(['foo', 'bar', 'baz'])
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
221
        tree = self._convert_tree(work_tree)
222
        tree.lock_read()
223
        self.addCleanup(tree.unlock)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
224
        extracted = dict((i, ''.join(b)) for i, b in
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
225
                         tree.iter_files_bytes([(tree.path2id('foo'), 'id1'),
226
                                                (tree.path2id('bar'), 'id2'),
227
                                                (tree.path2id('baz'), 'id3')]))
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
228
        self.assertEqual('foo', extracted['id1'])
229
        self.assertEqual('bar', extracted['id2'])
230
        self.assertEqual('baz', extracted['id3'])
2708.1.11 by Aaron Bentley
Test and tweak error handling
231
        self.assertRaises(errors.NoSuchId, lambda: list(
232
                          tree.iter_files_bytes(
233
                          [('qux-id', 'file1-notpresent')])))
2748.2.2 by Lukáš Lalinsky
Add TestConflicts to tests.tree_implementations.test_tree. Update NEWS.
234
235
236
class TestConflicts(TestCaseWithTree):
237
238
    def test_conflicts(self):
239
        """Tree.conflicts() should return a ConflictList instance."""
240
        work_tree = self.make_branch_and_tree('wt')
241
        tree = self._convert_tree(work_tree)
2761.1.3 by Aaron Bentley
Update test to use assertIsInstance
242
        self.assertIsInstance(tree.conflicts(), conflicts.ConflictList)
3363.5.4 by Aaron Bentley
Fix iteration order of iter_entries_by_dir
243
244
245
class TestIterEntriesByDir(TestCaseWithTree):
246
247
    def test_iteration_order(self):
248
        work_tree = self.make_branch_and_tree('.')
249
        self.build_tree(['a/', 'a/b/', 'a/b/c', 'a/d/', 'a/d/e', 'f/', 'f/g'])
250
        work_tree.add(['a', 'a/b', 'a/b/c', 'a/d', 'a/d/e', 'f', 'f/g'])
251
        tree = self._convert_tree(work_tree)
252
        output_order = [p for p, e in tree.iter_entries_by_dir()]
253
        self.assertEqual(['', 'a', 'f', 'a/b', 'a/d', 'a/b/c', 'a/d/e', 'f/g'],
254
                         output_order)
3363.13.1 by Aaron Bentley
Implement PreviewTree.extras
255
256
6471.1.3 by Jelmer Vernooij
Add Tree.iter_child_entries.
257
class TestIterChildEntries(TestCaseWithTree):
258
259
    def test_iteration_order(self):
260
        work_tree = self.make_branch_and_tree('.')
261
        self.build_tree(['a/', 'a/b/', 'a/b/c', 'a/d/', 'a/d/e', 'f/', 'f/g'])
262
        work_tree.add(['a', 'a/b', 'a/b/c', 'a/d', 'a/d/e', 'f', 'f/g'])
263
        tree = self._convert_tree(work_tree)
264
        output = [e.name for e in
265
            tree.iter_child_entries(tree.get_root_id())]
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
266
        self.assertEqual({'a', 'f'}, set(output))
6471.1.3 by Jelmer Vernooij
Add Tree.iter_child_entries.
267
        output = [e.name for e in
268
            tree.iter_child_entries(tree.path2id('a'))]
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
269
        self.assertEqual({'b', 'd'}, set(output))
6471.1.3 by Jelmer Vernooij
Add Tree.iter_child_entries.
270
271
    def test_does_not_exist(self):
272
        work_tree = self.make_branch_and_tree('.')
273
        self.build_tree(['a/'])
274
        work_tree.add(['a'])
275
        tree = self._convert_tree(work_tree)
276
        self.assertRaises(errors.NoSuchId, lambda:
277
            list(tree.iter_child_entries('unknown')))
278
279
3363.12.7 by Aaron Bentley
Add HasId test
280
class TestHasId(TestCaseWithTree):
281
282
    def test_has_id(self):
283
        work_tree = self.make_branch_and_tree('tree')
284
        self.build_tree(['tree/file'])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
285
        work_tree.add('file')
286
        file_id = work_tree.path2id('file')
3363.12.7 by Aaron Bentley
Add HasId test
287
        tree = self._convert_tree(work_tree)
288
        tree.lock_read()
289
        self.addCleanup(tree.unlock)
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
290
        self.assertTrue(tree.has_id(file_id))
3363.12.7 by Aaron Bentley
Add HasId test
291
        self.assertFalse(tree.has_id('dir-id'))
3363.13.5 by Aaron Bentley
Merge with paths2ids
292
293
3363.13.1 by Aaron Bentley
Implement PreviewTree.extras
294
class TestExtras(TestCaseWithTree):
295
296
    def test_extras(self):
297
        work_tree = self.make_branch_and_tree('tree')
3363.13.4 by Aaron Bentley
Ensure versioned files are not listed by extras
298
        self.build_tree(['tree/file', 'tree/versioned-file'])
299
        work_tree.add(['file', 'versioned-file'])
300
        work_tree.commit('add files')
3363.13.1 by Aaron Bentley
Implement PreviewTree.extras
301
        work_tree.remove('file')
302
        tree = self._convert_tree(work_tree)
303
        if isinstance(tree,
304
                      (revisiontree.RevisionTree,
305
                       workingtree_4.DirStateRevisionTree)):
306
            expected = []
307
        else:
308
            expected = ['file']
309
        tree.lock_read()
310
        self.addCleanup(tree.unlock)
311
        self.assertEqual(expected, list(tree.extras()))
3363.15.1 by Aaron Bentley
Add test for has_id
312
3363.17.3 by Aaron Bentley
Merge with has_id
313
3363.15.4 by Aaron Bentley
Implement PreviewTree.get_file_sha1 properly
314
class TestGetFileSha1(TestCaseWithTree):
315
316
    def test_get_file_sha1(self):
317
        work_tree = self.make_branch_and_tree('tree')
318
        self.build_tree_contents([('tree/file', 'file content')])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
319
        work_tree.add('file')
3363.15.4 by Aaron Bentley
Implement PreviewTree.get_file_sha1 properly
320
        tree = self._convert_tree(work_tree)
321
        tree.lock_read()
322
        self.addCleanup(tree.unlock)
323
        expected = osutils.sha_strings('file content')
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
324
        self.assertEqual(expected, tree.get_file_sha1('file'))
5906.1.8 by Jelmer Vernooij
Tests.
325
326
327
class TestGetFileVerifier(TestCaseWithTree):
328
329
    def test_get_file_verifier(self):
330
        work_tree = self.make_branch_and_tree('tree')
331
        self.build_tree_contents([
332
            ('tree/file1', 'file content'),
333
            ('tree/file2', 'file content')])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
334
        work_tree.add(['file1', 'file2'])
5906.1.8 by Jelmer Vernooij
Tests.
335
        tree = self._convert_tree(work_tree)
336
        tree.lock_read()
337
        self.addCleanup(tree.unlock)
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
338
        (kind, data) = tree.get_file_verifier('file1')
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
339
        self.assertEqual(
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
340
            tree.get_file_verifier('file1'),
341
            tree.get_file_verifier('file2'))
5906.1.10 by Jelmer Vernooij
sha1 -> SHA1
342
        if kind == "SHA1":
5906.1.8 by Jelmer Vernooij
Tests.
343
            expected = osutils.sha_strings('file content')
344
            self.assertEqual(expected, data)
6110.6.1 by Jelmer Vernooij
Add Tree.has_versioned_directories.
345
346
347
class TestHasVersionedDirectories(TestCaseWithTree):
348
349
    def test_has_versioned_directories(self):
350
        work_tree = self.make_branch_and_tree('tree')
351
        tree = self._convert_tree(work_tree)
352
        self.assertSubset([tree.has_versioned_directories()], (True, False))