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
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
|
# Copyright (C) 2005 by 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from cStringIO import StringIO
import os
from bzrlib.branch import Branch
from bzrlib.clone import copy_branch
import bzrlib.errors as errors
from bzrlib.diff import internal_diff
from bzrlib.inventory import Inventory, ROOT_ID
import bzrlib.inventory as inventory
from bzrlib.osutils import has_symlinks, rename
from bzrlib.selftest import TestCase, TestCaseInTempDir
class TestInventory(TestCase):
def test_is_within(self):
from bzrlib.osutils import is_inside_any
SRC_FOO_C = os.path.join('src', 'foo.c')
for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
(['src'], SRC_FOO_C),
(['src'], 'src'),
]:
self.assert_(is_inside_any(dirs, fn))
for dirs, fn in [(['src'], 'srccontrol'),
(['src'], 'srccontrol/foo')]:
self.assertFalse(is_inside_any(dirs, fn))
def test_ids(self):
"""Test detection of files within selected directories."""
inv = Inventory()
for args in [('src', 'directory', 'src-id'),
('doc', 'directory', 'doc-id'),
('src/hello.c', 'file'),
('src/bye.c', 'file', 'bye-id'),
('Makefile', 'file')]:
inv.add_path(*args)
self.assertEqual(inv.path2id('src'), 'src-id')
self.assertEqual(inv.path2id('src/bye.c'), 'bye-id')
self.assert_('src-id' in inv)
def test_version(self):
"""Inventory remembers the text's version."""
inv = Inventory()
ie = inv.add_path('foo.txt', 'file')
## XXX
class TestInventoryEntry(TestCase):
def test_file_kind_character(self):
file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
self.assertEqual(file.kind_character(), '')
def test_dir_kind_character(self):
dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
self.assertEqual(dir.kind_character(), '/')
def test_link_kind_character(self):
dir = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
self.assertEqual(dir.kind_character(), '')
def test_dir_detect_changes(self):
left = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
left.text_sha1 = 123
left.executable = True
left.symlink_target='foo'
right = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
right.text_sha1 = 321
right.symlink_target='bar'
self.assertEqual((False, False), left.detect_changes(right))
self.assertEqual((False, False), right.detect_changes(left))
def test_file_detect_changes(self):
left = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
left.text_sha1 = 123
right = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
right.text_sha1 = 123
self.assertEqual((False, False), left.detect_changes(right))
self.assertEqual((False, False), right.detect_changes(left))
left.executable = True
self.assertEqual((False, True), left.detect_changes(right))
self.assertEqual((False, True), right.detect_changes(left))
right.text_sha1 = 321
self.assertEqual((True, True), left.detect_changes(right))
self.assertEqual((True, True), right.detect_changes(left))
def test_symlink_detect_changes(self):
left = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
left.text_sha1 = 123
left.executable = True
left.symlink_target='foo'
right = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
right.text_sha1 = 321
right.symlink_target='foo'
self.assertEqual((False, False), left.detect_changes(right))
self.assertEqual((False, False), right.detect_changes(left))
left.symlink_target = 'different'
self.assertEqual((True, False), left.detect_changes(right))
self.assertEqual((True, False), right.detect_changes(left))
def test_file_has_text(self):
file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
self.failUnless(file.has_text())
def test_directory_has_text(self):
dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
self.failIf(dir.has_text())
def test_link_has_text(self):
link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
self.failIf(link.has_text())
class TestEntryDiffing(TestCaseInTempDir):
def setUp(self):
super(TestEntryDiffing, self).setUp()
self.branch = Branch.initialize('.')
print >> open('file', 'wb'), 'foo'
self.branch.add(['file'], ['fileid'])
if has_symlinks():
os.symlink('target1', 'symlink')
self.branch.add(['symlink'], ['linkid'])
self.branch.commit('message_1', rev_id = '1')
print >> open('file', 'wb'), 'bar'
if has_symlinks():
os.unlink('symlink')
os.symlink('target2', 'symlink')
self.tree_1 = self.branch.revision_tree('1')
self.inv_1 = self.branch.get_inventory('1')
self.file_1 = self.inv_1['fileid']
self.tree_2 = self.branch.working_tree()
self.inv_2 = self.tree_2.read_working_inventory()
self.file_2 = self.inv_2['fileid']
if has_symlinks():
self.link_1 = self.inv_1['linkid']
self.link_2 = self.inv_2['linkid']
def test_file_diff_deleted(self):
output = StringIO()
self.file_1.diff(internal_diff,
"old_label", self.tree_1,
"/dev/null", None, None,
output)
self.assertEqual(output.getvalue(), "--- old_label\n"
"+++ /dev/null\n"
"@@ -1,1 +0,0 @@\n"
"-foo\n"
"\n")
def test_file_diff_added(self):
output = StringIO()
self.file_1.diff(internal_diff,
"new_label", self.tree_1,
"/dev/null", None, None,
output, reverse=True)
self.assertEqual(output.getvalue(), "--- /dev/null\n"
"+++ new_label\n"
"@@ -0,0 +1,1 @@\n"
"+foo\n"
"\n")
def test_file_diff_changed(self):
output = StringIO()
self.file_1.diff(internal_diff,
"/dev/null", self.tree_1,
"new_label", self.file_2, self.tree_2,
output)
self.assertEqual(output.getvalue(), "--- /dev/null\n"
"+++ new_label\n"
"@@ -1,1 +1,1 @@\n"
"-foo\n"
"+bar\n"
"\n")
def test_link_diff_deleted(self):
if not has_symlinks():
return
output = StringIO()
self.link_1.diff(internal_diff,
"old_label", self.tree_1,
"/dev/null", None, None,
output)
self.assertEqual(output.getvalue(),
"=== target was 'target1'\n")
def test_link_diff_added(self):
if not has_symlinks():
return
output = StringIO()
self.link_1.diff(internal_diff,
"new_label", self.tree_1,
"/dev/null", None, None,
output, reverse=True)
self.assertEqual(output.getvalue(),
"=== target is 'target1'\n")
def test_link_diff_changed(self):
if not has_symlinks():
return
output = StringIO()
self.link_1.diff(internal_diff,
"/dev/null", self.tree_1,
"new_label", self.link_2, self.tree_2,
output)
self.assertEqual(output.getvalue(),
"=== target changed 'target1' => 'target2'\n")
class TestSnapshot(TestCaseInTempDir):
def setUp(self):
# for full testing we'll need a branch
# with a subdir to test parent changes.
# and a file, link and dir under that.
# but right now I only need one attribute
# to change, and then test merge patterns
# with fake parent entries.
super(TestSnapshot, self).setUp()
self.branch = Branch.initialize('.')
self.build_tree(['subdir/', 'subdir/file'])
self.branch.add(['subdir', 'subdir/file'], ['dirid', 'fileid'])
if has_symlinks():
pass
self.branch.commit('message_1', rev_id = '1')
self.tree_1 = self.branch.revision_tree('1')
self.inv_1 = self.branch.get_inventory('1')
self.file_1 = self.inv_1['fileid']
self.work_tree = self.branch.working_tree()
self.file_active = self.work_tree.inventory['fileid']
def test_snapshot_new_revision(self):
# This tests that a simple commit with no parents makes a new
# revision value in the inventory entry
self.file_active.snapshot('2', 'subdir/file', {}, self.work_tree,
self.branch.weave_store,
self.branch.get_transaction())
# expected outcome - file_1 has a revision id of '2', and we can get
# its text of 'file contents' out of the weave.
self.assertEqual(self.file_1.revision, '1')
self.assertEqual(self.file_active.revision, '2')
# this should be a separate test probably, but lets check it once..
lines = self.branch.weave_store.get_lines('fileid','2',
self.branch.get_transaction())
self.assertEqual(lines, ['contents of subdir/file\n'])
def test_snapshot_unchanged(self):
#This tests that a simple commit does not make a new entry for
# an unchanged inventory entry
self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
self.work_tree, self.branch.weave_store,
self.branch.get_transaction())
self.assertEqual(self.file_1.revision, '1')
self.assertEqual(self.file_active.revision, '1')
self.assertRaises(errors.WeaveError,
self.branch.weave_store.get_lines, 'fileid', '2',
self.branch.get_transaction())
def test_snapshot_merge_identical_different_revid(self):
# This tests that a commit with two identical parents, one of which has
# a different revision id, results in a new revision id in the entry.
# 1->other, commit a merge of other against 1, results in 2.
other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
other_ie.revision = '1'
other_ie.text_sha1 = self.file_1.text_sha1
other_ie.text_size = self.file_1.text_size
self.assertEqual(self.file_1, other_ie)
other_ie.revision = 'other'
self.assertNotEqual(self.file_1, other_ie)
self.branch.weave_store.add_identical_text('fileid', '1', 'other', ['1'],
self.branch.get_transaction())
self.file_active.snapshot('2', 'subdir/file',
{'1':self.file_1, 'other':other_ie},
self.work_tree, self.branch.weave_store,
self.branch.get_transaction())
self.assertEqual(self.file_active.revision, '2')
def test_snapshot_changed(self):
# This tests that a commit with one different parent results in a new
# revision id in the entry.
self.file_active.name='newname'
rename('subdir/file', 'subdir/newname')
self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1},
self.work_tree,
self.branch.weave_store,
self.branch.get_transaction())
# expected outcome - file_1 has a revision id of '2'
self.assertEqual(self.file_active.revision, '2')
class TestPreviousHeads(TestCaseInTempDir):
def setUp(self):
# we want several inventories, that respectively
# give use the following scenarios:
# A) fileid not in any inventory (A),
# B) fileid present in one inventory (B) and (A,B)
# C) fileid present in two inventories, and they
# are not mutual descendents (B, C)
# D) fileid present in two inventories and one is
# a descendent of the other. (B, D)
super(TestPreviousHeads, self).setUp()
self.build_tree(['file'])
self.branch = Branch.initialize('.')
self.branch.commit('new branch', allow_pointless=True, rev_id='A')
self.inv_A = self.branch.get_inventory('A')
self.branch.add(['file'], ['fileid'])
self.branch.commit('add file', rev_id='B')
self.inv_B = self.branch.get_inventory('B')
self.branch.put_controlfile('revision-history', 'A\n')
self.assertEqual(self.branch.revision_history(), ['A'])
self.branch.commit('another add of file', rev_id='C')
self.inv_C = self.branch.get_inventory('C')
self.branch.add_pending_merge('B')
self.branch.commit('merge in B', rev_id='D')
self.inv_D = self.branch.get_inventory('D')
self.file_active = self.branch.working_tree().inventory['fileid']
self.weave = self.branch.weave_store.get_weave('fileid',
self.branch.get_transaction())
def get_previous_heads(self, inventories):
return self.file_active.find_previous_heads(inventories, self.weave)
def test_fileid_in_no_inventory(self):
self.assertEqual({}, self.get_previous_heads([self.inv_A]))
def test_fileid_in_one_inventory(self):
self.assertEqual({'B':self.inv_B['fileid']},
self.get_previous_heads([self.inv_B]))
self.assertEqual({'B':self.inv_B['fileid']},
self.get_previous_heads([self.inv_A, self.inv_B]))
self.assertEqual({'B':self.inv_B['fileid']},
self.get_previous_heads([self.inv_B, self.inv_A]))
def test_fileid_in_two_inventories_gives_both_entries(self):
self.assertEqual({'B':self.inv_B['fileid'],
'C':self.inv_C['fileid']},
self.get_previous_heads([self.inv_B, self.inv_C]))
self.assertEqual({'B':self.inv_B['fileid'],
'C':self.inv_C['fileid']},
self.get_previous_heads([self.inv_C, self.inv_B]))
def test_fileid_in_two_inventories_already_merged_gives_head(self):
self.assertEqual({'D':self.inv_D['fileid']},
self.get_previous_heads([self.inv_B, self.inv_D]))
self.assertEqual({'D':self.inv_D['fileid']},
self.get_previous_heads([self.inv_D, self.inv_B]))
# TODO: test two inventories with the same file revision
|