1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
|
# Copyright (C) 2006, 2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
from bzrlib import (
errors,
conflicts,
osutils,
revisiontree,
tests,
workingtree_4,
)
from bzrlib.tests import TestSkipped
from bzrlib.tests.per_tree import TestCaseWithTree
from bzrlib.symbol_versioning import (
deprecated_in,
)
class TestAnnotate(TestCaseWithTree):
def test_annotate(self):
work_tree = self.make_branch_and_tree('wt')
tree = self.get_tree_no_parents_abc_content(work_tree)
tree_revision = getattr(tree, 'get_revision_id', lambda: 'current:')()
tree.lock_read()
self.addCleanup(tree.unlock)
for revision, line in tree.annotate_iter('a-id'):
self.assertEqual('contents of a\n', line)
self.assertEqual(tree_revision, revision)
tree_revision = getattr(tree, 'get_revision_id', lambda: 'random:')()
for revision, line in tree.annotate_iter('a-id', 'random:'):
self.assertEqual('contents of a\n', line)
self.assertEqual(tree_revision, revision)
class TestPlanFileMerge(TestCaseWithTree):
def test_plan_file_merge(self):
work_a = self.make_branch_and_tree('wta')
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
work_a.add('file', 'file-id')
work_a.commit('base version')
work_b = work_a.bzrdir.sprout('wtb').open_workingtree()
self.build_tree_contents([('wta/file', 'b\nc\nd\ne\n')])
tree_a = self.workingtree_to_test_tree(work_a)
tree_a.lock_read()
self.addCleanup(tree_a.unlock)
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
tree_b = self.workingtree_to_test_tree(work_b)
tree_b.lock_read()
self.addCleanup(tree_b.unlock)
self.assertEqual([
('killed-a', 'a\n'),
('killed-b', 'b\n'),
('unchanged', 'c\n'),
('unchanged', 'd\n'),
('new-a', 'e\n'),
('new-b', 'f\n'),
], list(tree_a.plan_file_merge('file-id', tree_b)))
class TestReference(TestCaseWithTree):
def skip_if_no_reference(self, tree):
if not getattr(tree, 'supports_tree_reference', lambda: False)():
raise tests.TestNotApplicable('Tree references not supported')
def create_nested(self):
work_tree = self.make_branch_and_tree('wt')
work_tree.lock_write()
try:
self.skip_if_no_reference(work_tree)
subtree = self.make_branch_and_tree('wt/subtree')
subtree.set_root_id('sub-root')
subtree.commit('foo', rev_id='sub-1')
work_tree.add_reference(subtree)
finally:
work_tree.unlock()
tree = self._convert_tree(work_tree)
self.skip_if_no_reference(tree)
return tree
def test_get_reference_revision(self):
tree = self.create_nested()
tree.lock_read()
self.addCleanup(tree.unlock)
path = tree.id2path('sub-root')
self.assertEqual('sub-1',
tree.get_reference_revision('sub-root', path))
def test_iter_references(self):
tree = self.create_nested()
tree.lock_read()
self.addCleanup(tree.unlock)
entry = tree.inventory['sub-root']
self.assertEqual([(u'subtree', 'sub-root')],
list(tree.iter_references()))
def test_get_root_id(self):
# trees should return some kind of root id; it can be none
tree = self.make_branch_and_tree('tree')
root_id = tree.get_root_id()
if root_id is not None:
self.assertIsInstance(root_id, str)
class TestFileIds(TestCaseWithTree):
def test_id2path(self):
# translate from file-id back to path
work_tree = self.make_branch_and_tree('wt')
tree = self.get_tree_no_parents_abc_content(work_tree)
tree.lock_read()
try:
self.assertEqual(u'a', tree.id2path('a-id'))
# other ids give an error- don't return None for this case
self.assertRaises(errors.NoSuchId, tree.id2path, 'a')
finally:
tree.unlock()
def test_all_file_ids(self):
work_tree = self.make_branch_and_tree('wt')
tree = self.get_tree_no_parents_abc_content(work_tree)
tree.lock_read()
self.addCleanup(tree.unlock)
self.assertEqual(tree.all_file_ids(),
set(['b-id', 'root-id', 'c-id', 'a-id']))
class TestStoredKind(TestCaseWithTree):
def test_stored_kind(self):
tree = self.make_branch_and_tree('tree')
work_tree = self.make_branch_and_tree('wt')
tree = self.get_tree_no_parents_abc_content(work_tree)
tree.lock_read()
self.addCleanup(tree.unlock)
self.assertEqual('file', tree.stored_kind('a-id'))
self.assertEqual('directory', tree.stored_kind('b-id'))
class TestFileContent(TestCaseWithTree):
def test_get_file(self):
work_tree = self.make_branch_and_tree('wt')
tree = self.get_tree_no_parents_abc_content_2(work_tree)
tree.lock_read()
try:
# Test lookup without path works
lines = tree.get_file('a-id').readlines()
self.assertEqual(['foobar\n'], lines)
# Test lookup with path works
lines = tree.get_file('a-id', path='a').readlines()
self.assertEqual(['foobar\n'], lines)
finally:
tree.unlock()
def test_get_file_text(self):
work_tree = self.make_branch_and_tree('wt')
tree = self.get_tree_no_parents_abc_content_2(work_tree)
tree.lock_read()
self.addCleanup(tree.unlock)
# test read by file-id
self.assertEqual('foobar\n', tree.get_file_text('a-id'))
# test read by path
self.assertEqual('foobar\n', tree.get_file_text('a-id', path='a'))
def test_get_file_lines(self):
work_tree = self.make_branch_and_tree('wt')
tree = self.get_tree_no_parents_abc_content_2(work_tree)
tree.lock_read()
self.addCleanup(tree.unlock)
# test read by file-id
self.assertEqual(['foobar\n'], tree.get_file_lines('a-id'))
# test read by path
self.assertEqual(['foobar\n'], tree.get_file_lines('a-id', path='a'))
def test_get_file_lines_multi_line_breaks(self):
work_tree = self.make_branch_and_tree('wt')
self.build_tree_contents([('wt/foobar', 'a\rb\nc\r\nd')])
work_tree.add('foobar', 'foobar-id')
tree = self._convert_tree(work_tree)
tree.lock_read()
self.addCleanup(tree.unlock)
self.assertEqual(['a\rb\n', 'c\r\n', 'd'],
tree.get_file_lines('foobar-id'))
class TestExtractFilesBytes(TestCaseWithTree):
def test_iter_files_bytes(self):
work_tree = self.make_branch_and_tree('wt')
self.build_tree_contents([('wt/foo', 'foo'),
('wt/bar', 'bar'),
('wt/baz', 'baz')])
work_tree.add(['foo', 'bar', 'baz'], ['foo-id', 'bar-id', 'baz-id'])
tree = self._convert_tree(work_tree)
tree.lock_read()
self.addCleanup(tree.unlock)
extracted = dict((i, ''.join(b)) for i, b in
tree.iter_files_bytes([('foo-id', 'id1'),
('bar-id', 'id2'),
('baz-id', 'id3')]))
self.assertEqual('foo', extracted['id1'])
self.assertEqual('bar', extracted['id2'])
self.assertEqual('baz', extracted['id3'])
self.assertRaises(errors.NoSuchId, lambda: list(
tree.iter_files_bytes(
[('qux-id', 'file1-notpresent')])))
class TestConflicts(TestCaseWithTree):
def test_conflicts(self):
"""Tree.conflicts() should return a ConflictList instance."""
work_tree = self.make_branch_and_tree('wt')
tree = self._convert_tree(work_tree)
self.assertIsInstance(tree.conflicts(), conflicts.ConflictList)
class TestIterEntriesByDir(TestCaseWithTree):
def test_iteration_order(self):
work_tree = self.make_branch_and_tree('.')
self.build_tree(['a/', 'a/b/', 'a/b/c', 'a/d/', 'a/d/e', 'f/', 'f/g'])
work_tree.add(['a', 'a/b', 'a/b/c', 'a/d', 'a/d/e', 'f', 'f/g'])
tree = self._convert_tree(work_tree)
output_order = [p for p, e in tree.iter_entries_by_dir()]
self.assertEqual(['', 'a', 'f', 'a/b', 'a/d', 'a/b/c', 'a/d/e', 'f/g'],
output_order)
class TestHasId(TestCaseWithTree):
def test_has_id(self):
work_tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/file'])
work_tree.add('file', 'file-id')
tree = self._convert_tree(work_tree)
tree.lock_read()
self.addCleanup(tree.unlock)
self.assertTrue(tree.has_id('file-id'))
self.assertFalse(tree.has_id('dir-id'))
def test___contains__(self):
work_tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/file'])
work_tree.add('file', 'file-id')
tree = self._convert_tree(work_tree)
tree.lock_read()
self.addCleanup(tree.unlock)
self.assertTrue(
self.applyDeprecated(
deprecated_in((2, 4, 0)),
tree.__contains__, 'file-id'))
self.assertFalse(
self.applyDeprecated(
deprecated_in((2, 4, 0)),
tree.__contains__, 'dir-id'))
class TestExtras(TestCaseWithTree):
def test_extras(self):
work_tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/file', 'tree/versioned-file'])
work_tree.add(['file', 'versioned-file'])
work_tree.commit('add files')
work_tree.remove('file')
tree = self._convert_tree(work_tree)
if isinstance(tree,
(revisiontree.RevisionTree,
workingtree_4.DirStateRevisionTree)):
expected = []
else:
expected = ['file']
tree.lock_read()
self.addCleanup(tree.unlock)
self.assertEqual(expected, list(tree.extras()))
class TestGetFileSha1(TestCaseWithTree):
def test_get_file_sha1(self):
work_tree = self.make_branch_and_tree('tree')
self.build_tree_contents([('tree/file', 'file content')])
work_tree.add('file', 'file-id')
tree = self._convert_tree(work_tree)
tree.lock_read()
self.addCleanup(tree.unlock)
expected = osutils.sha_strings('file content')
self.assertEqual(expected, tree.get_file_sha1('file-id'))
|