76
61
self.assert_('src-id' in inv)
78
def test_non_directory_children(self):
79
"""Test path2id when a parent directory has no children"""
80
inv = inventory.Inventory('tree_root')
81
inv.add(inventory.InventoryFile('file-id','file',
82
parent_id='tree_root'))
83
inv.add(inventory.InventoryLink('link-id','link',
84
parent_id='tree_root'))
85
self.assertIs(None, inv.path2id('file/subfile'))
86
self.assertIs(None, inv.path2id('link/subfile'))
88
def test_iter_entries(self):
91
for args in [('src', 'directory', 'src-id'),
92
('doc', 'directory', 'doc-id'),
93
('src/hello.c', 'file', 'hello-id'),
94
('src/bye.c', 'file', 'bye-id'),
95
('Makefile', 'file', 'makefile-id')]:
100
('Makefile', 'makefile-id'),
103
('src/bye.c', 'bye-id'),
104
('src/hello.c', 'hello-id'),
105
], [(path, ie.file_id) for path, ie in inv.iter_entries()])
107
def test_iter_entries_by_dir(self):
110
for args in [('src', 'directory', 'src-id'),
111
('doc', 'directory', 'doc-id'),
112
('src/hello.c', 'file', 'hello-id'),
113
('src/bye.c', 'file', 'bye-id'),
114
('zz', 'file', 'zz-id'),
115
('src/sub/', 'directory', 'sub-id'),
116
('src/zz.c', 'file', 'zzc-id'),
117
('src/sub/a', 'file', 'a-id'),
118
('Makefile', 'file', 'makefile-id')]:
123
('Makefile', 'makefile-id'),
127
('src/bye.c', 'bye-id'),
128
('src/hello.c', 'hello-id'),
129
('src/sub', 'sub-id'),
130
('src/zz.c', 'zzc-id'),
131
('src/sub/a', 'a-id'),
132
], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir()])
136
('Makefile', 'makefile-id'),
140
('src/bye.c', 'bye-id'),
141
('src/hello.c', 'hello-id'),
142
('src/sub', 'sub-id'),
143
('src/zz.c', 'zzc-id'),
144
('src/sub/a', 'a-id'),
145
], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
146
specific_file_ids=('a-id', 'zzc-id', 'doc-id', ROOT_ID,
147
'hello-id', 'bye-id', 'zz-id', 'src-id', 'makefile-id',
151
('Makefile', 'makefile-id'),
154
('src/bye.c', 'bye-id'),
155
('src/hello.c', 'hello-id'),
156
('src/zz.c', 'zzc-id'),
157
('src/sub/a', 'a-id'),
158
], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
159
specific_file_ids=('a-id', 'zzc-id', 'doc-id',
160
'hello-id', 'bye-id', 'zz-id', 'makefile-id'))])
163
('Makefile', 'makefile-id'),
164
('src/bye.c', 'bye-id'),
165
], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
166
specific_file_ids=('bye-id', 'makefile-id'))])
169
('Makefile', 'makefile-id'),
170
('src/bye.c', 'bye-id'),
171
], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
172
specific_file_ids=('bye-id', 'makefile-id'))])
175
('src/bye.c', 'bye-id'),
176
], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir(
177
specific_file_ids=('bye-id',))])
179
def test_add_recursive(self):
180
parent = InventoryDirectory('src-id', 'src', ROOT_ID)
181
child = InventoryFile('hello-id', 'hello.c', 'src-id')
182
parent.children[child.file_id] = child
185
self.assertEqual('src/hello.c', inv.id2path('hello-id'))
64
def test_version(self):
65
"""Inventory remembers the text's version."""
67
ie = inv.add_path('foo.txt', 'file')
188
71
class TestInventoryEntry(TestCase):
250
133
link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
251
134
self.failIf(link.has_text())
253
def test_make_entry(self):
254
self.assertIsInstance(inventory.make_entry("file", "name", ROOT_ID),
255
inventory.InventoryFile)
256
self.assertIsInstance(inventory.make_entry("symlink", "name", ROOT_ID),
257
inventory.InventoryLink)
258
self.assertIsInstance(inventory.make_entry("directory", "name", ROOT_ID),
259
inventory.InventoryDirectory)
261
def test_make_entry_non_normalized(self):
262
orig_normalized_filename = osutils.normalized_filename
265
osutils.normalized_filename = osutils._accessible_normalized_filename
266
entry = inventory.make_entry("file", u'a\u030a', ROOT_ID)
267
self.assertEqual(u'\xe5', entry.name)
268
self.assertIsInstance(entry, inventory.InventoryFile)
270
osutils.normalized_filename = osutils._inaccessible_normalized_filename
271
self.assertRaises(errors.InvalidNormalization,
272
inventory.make_entry, 'file', u'a\u030a', ROOT_ID)
274
osutils.normalized_filename = orig_normalized_filename
277
class TestDescribeChanges(TestCase):
279
def test_describe_change(self):
280
# we need to test the following change combinations:
286
# renamed/reparented and modified
287
# change kind (perhaps can't be done yet?)
288
# also, merged in combination with all of these?
289
old_a = InventoryFile('a-id', 'a_file', ROOT_ID)
290
old_a.text_sha1 = '123132'
292
new_a = InventoryFile('a-id', 'a_file', ROOT_ID)
293
new_a.text_sha1 = '123132'
296
self.assertChangeDescription('unchanged', old_a, new_a)
299
new_a.text_sha1 = 'abcabc'
300
self.assertChangeDescription('modified', old_a, new_a)
302
self.assertChangeDescription('added', None, new_a)
303
self.assertChangeDescription('removed', old_a, None)
304
# perhaps a bit questionable but seems like the most reasonable thing...
305
self.assertChangeDescription('unchanged', None, None)
307
# in this case it's both renamed and modified; show a rename and
309
new_a.name = 'newfilename'
310
self.assertChangeDescription('modified and renamed', old_a, new_a)
312
# reparenting is 'renaming'
313
new_a.name = old_a.name
314
new_a.parent_id = 'somedir-id'
315
self.assertChangeDescription('modified and renamed', old_a, new_a)
317
# reset the content values so its not modified
318
new_a.text_size = old_a.text_size
319
new_a.text_sha1 = old_a.text_sha1
320
new_a.name = old_a.name
322
new_a.name = 'newfilename'
323
self.assertChangeDescription('renamed', old_a, new_a)
325
# reparenting is 'renaming'
326
new_a.name = old_a.name
327
new_a.parent_id = 'somedir-id'
328
self.assertChangeDescription('renamed', old_a, new_a)
330
def assertChangeDescription(self, expected_change, old_ie, new_ie):
331
change = InventoryEntry.describe_change(old_ie, new_ie)
332
self.assertEqual(expected_change, change)
335
class TestIsRoot(TestCase):
336
"""Ensure our root-checking code is accurate."""
338
def test_is_root(self):
339
inv = Inventory('TREE_ROOT')
340
self.assertTrue(inv.is_root('TREE_ROOT'))
341
self.assertFalse(inv.is_root('booga'))
342
inv.root.file_id = 'booga'
343
self.assertFalse(inv.is_root('TREE_ROOT'))
344
self.assertTrue(inv.is_root('booga'))
345
# works properly even if no root is set
347
self.assertFalse(inv.is_root('TREE_ROOT'))
348
self.assertFalse(inv.is_root('booga'))
351
class TestTreeReference(TestCase):
353
def test_create(self):
354
inv = Inventory('tree-root-123')
355
inv.add(TreeReference('nested-id', 'nested', parent_id='tree-root-123',
356
revision='rev', reference_revision='rev2'))
359
class TestEncoding(TestCase):
361
def test_error_encoding(self):
362
inv = Inventory('tree-root')
363
inv.add(InventoryFile('a-id', u'\u1234', 'tree-root'))
365
inv.add(InventoryFile('b-id', u'\u1234', 'tree-root'))
366
except errors.BzrError, e:
367
self.assertContainsRe(str(e), u'\u1234'.encode('utf-8'))
369
self.fail('BzrError not raised')
137
class TestEntryDiffing(TestCaseWithTransport):
140
super(TestEntryDiffing, self).setUp()
141
self.wt = self.make_branch_and_tree('.')
142
self.branch = self.wt.branch
143
print >> open('file', 'wb'), 'foo'
144
print >> open('binfile', 'wb'), 'foo'
145
self.wt.add(['file'], ['fileid'])
146
self.wt.add(['binfile'], ['binfileid'])
148
os.symlink('target1', 'symlink')
149
self.wt.add(['symlink'], ['linkid'])
150
self.wt.commit('message_1', rev_id = '1')
151
print >> open('file', 'wb'), 'bar'
152
print >> open('binfile', 'wb'), 'x' * 1023 + '\x00'
155
os.symlink('target2', 'symlink')
156
self.tree_1 = self.branch.repository.revision_tree('1')
157
self.inv_1 = self.branch.repository.get_inventory('1')
158
self.file_1 = self.inv_1['fileid']
159
self.file_1b = self.inv_1['binfileid']
160
self.tree_2 = self.wt
161
self.inv_2 = self.tree_2.read_working_inventory()
162
self.file_2 = self.inv_2['fileid']
163
self.file_2b = self.inv_2['binfileid']
165
self.link_1 = self.inv_1['linkid']
166
self.link_2 = self.inv_2['linkid']
168
def test_file_diff_deleted(self):
170
self.file_1.diff(internal_diff,
171
"old_label", self.tree_1,
172
"/dev/null", None, None,
174
self.assertEqual(output.getvalue(), "--- old_label\t\n"
180
def test_file_diff_added(self):
182
self.file_1.diff(internal_diff,
183
"new_label", self.tree_1,
184
"/dev/null", None, None,
185
output, reverse=True)
186
self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
192
def test_file_diff_changed(self):
194
self.file_1.diff(internal_diff,
195
"/dev/null", self.tree_1,
196
"new_label", self.file_2, self.tree_2,
198
self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
205
def test_file_diff_binary(self):
207
self.file_1.diff(internal_diff,
208
"/dev/null", self.tree_1,
209
"new_label", self.file_2b, self.tree_2,
211
self.assertEqual(output.getvalue(),
212
"Binary files /dev/null and new_label differ\n")
213
def test_link_diff_deleted(self):
214
if not has_symlinks():
217
self.link_1.diff(internal_diff,
218
"old_label", self.tree_1,
219
"/dev/null", None, None,
221
self.assertEqual(output.getvalue(),
222
"=== target was 'target1'\n")
224
def test_link_diff_added(self):
225
if not has_symlinks():
228
self.link_1.diff(internal_diff,
229
"new_label", self.tree_1,
230
"/dev/null", None, None,
231
output, reverse=True)
232
self.assertEqual(output.getvalue(),
233
"=== target is 'target1'\n")
235
def test_link_diff_changed(self):
236
if not has_symlinks():
239
self.link_1.diff(internal_diff,
240
"/dev/null", self.tree_1,
241
"new_label", self.link_2, self.tree_2,
243
self.assertEqual(output.getvalue(),
244
"=== target changed 'target1' => 'target2'\n")
247
class TestSnapshot(TestCaseWithTransport):
250
# for full testing we'll need a branch
251
# with a subdir to test parent changes.
252
# and a file, link and dir under that.
253
# but right now I only need one attribute
254
# to change, and then test merge patterns
255
# with fake parent entries.
256
super(TestSnapshot, self).setUp()
257
self.wt = self.make_branch_and_tree('.')
258
self.branch = self.wt.branch
259
self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
260
self.wt.add(['subdir', 'subdir/file'],
264
self.wt.commit('message_1', rev_id = '1')
265
self.tree_1 = self.branch.repository.revision_tree('1')
266
self.inv_1 = self.branch.repository.get_inventory('1')
267
self.file_1 = self.inv_1['fileid']
268
self.file_active = self.wt.inventory['fileid']
270
def test_snapshot_new_revision(self):
271
# This tests that a simple commit with no parents makes a new
272
# revision value in the inventory entry
273
self.file_active.snapshot('2', 'subdir/file', {}, self.wt,
274
self.branch.repository.weave_store,
275
self.branch.get_transaction())
276
# expected outcome - file_1 has a revision id of '2', and we can get
277
# its text of 'file contents' out of the weave.
278
self.assertEqual(self.file_1.revision, '1')
279
self.assertEqual(self.file_active.revision, '2')
280
# this should be a separate test probably, but lets check it once..
281
lines = self.branch.repository.weave_store.get_weave(
283
self.branch.get_transaction()).get_lines('2')
284
self.assertEqual(lines, ['contents of subdir/file\n'])
286
def test_snapshot_unchanged(self):
287
#This tests that a simple commit does not make a new entry for
288
# an unchanged inventory entry
289
self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
291
self.branch.repository.weave_store,
292
self.branch.get_transaction())
293
self.assertEqual(self.file_1.revision, '1')
294
self.assertEqual(self.file_active.revision, '1')
295
vf = self.branch.repository.weave_store.get_weave(
297
self.branch.repository.get_transaction())
298
self.assertRaises(errors.RevisionNotPresent,
302
def test_snapshot_merge_identical_different_revid(self):
303
# This tests that a commit with two identical parents, one of which has
304
# a different revision id, results in a new revision id in the entry.
305
# 1->other, commit a merge of other against 1, results in 2.
306
other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
307
other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
308
other_ie.revision = '1'
309
other_ie.text_sha1 = self.file_1.text_sha1
310
other_ie.text_size = self.file_1.text_size
311
self.assertEqual(self.file_1, other_ie)
312
other_ie.revision = 'other'
313
self.assertNotEqual(self.file_1, other_ie)
314
versionfile = self.branch.repository.weave_store.get_weave(
315
'fileid', self.branch.repository.get_transaction())
316
versionfile.clone_text('other', '1', ['1'])
317
self.file_active.snapshot('2', 'subdir/file',
318
{'1':self.file_1, 'other':other_ie},
320
self.branch.repository.weave_store,
321
self.branch.get_transaction())
322
self.assertEqual(self.file_active.revision, '2')
324
def test_snapshot_changed(self):
325
# This tests that a commit with one different parent results in a new
326
# revision id in the entry.
327
self.file_active.name='newname'
328
rename('subdir/file', 'subdir/newname')
329
self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1},
331
self.branch.repository.weave_store,
332
self.branch.get_transaction())
333
# expected outcome - file_1 has a revision id of '2'
334
self.assertEqual(self.file_active.revision, '2')
337
class TestPreviousHeads(TestCaseWithTransport):
340
# we want several inventories, that respectively
341
# give use the following scenarios:
342
# A) fileid not in any inventory (A),
343
# B) fileid present in one inventory (B) and (A,B)
344
# C) fileid present in two inventories, and they
345
# are not mutual descendents (B, C)
346
# D) fileid present in two inventories and one is
347
# a descendent of the other. (B, D)
348
super(TestPreviousHeads, self).setUp()
349
self.wt = self.make_branch_and_tree('.')
350
self.branch = self.wt.branch
351
self.build_tree(['file'])
352
self.wt.commit('new branch', allow_pointless=True, rev_id='A')
353
self.inv_A = self.branch.repository.get_inventory('A')
354
self.wt.add(['file'], ['fileid'])
355
self.wt.commit('add file', rev_id='B')
356
self.inv_B = self.branch.repository.get_inventory('B')
357
uncommit(self.branch, tree=self.wt)
358
self.assertEqual(self.branch.revision_history(), ['A'])
359
self.wt.commit('another add of file', rev_id='C')
360
self.inv_C = self.branch.repository.get_inventory('C')
361
self.wt.add_pending_merge('B')
362
self.wt.commit('merge in B', rev_id='D')
363
self.inv_D = self.branch.repository.get_inventory('D')
364
self.file_active = self.wt.inventory['fileid']
365
self.weave = self.branch.repository.weave_store.get_weave('fileid',
366
self.branch.repository.get_transaction())
368
def get_previous_heads(self, inventories):
369
return self.file_active.find_previous_heads(
371
self.branch.repository.weave_store,
372
self.branch.repository.get_transaction())
374
def test_fileid_in_no_inventory(self):
375
self.assertEqual({}, self.get_previous_heads([self.inv_A]))
377
def test_fileid_in_one_inventory(self):
378
self.assertEqual({'B':self.inv_B['fileid']},
379
self.get_previous_heads([self.inv_B]))
380
self.assertEqual({'B':self.inv_B['fileid']},
381
self.get_previous_heads([self.inv_A, self.inv_B]))
382
self.assertEqual({'B':self.inv_B['fileid']},
383
self.get_previous_heads([self.inv_B, self.inv_A]))
385
def test_fileid_in_two_inventories_gives_both_entries(self):
386
self.assertEqual({'B':self.inv_B['fileid'],
387
'C':self.inv_C['fileid']},
388
self.get_previous_heads([self.inv_B, self.inv_C]))
389
self.assertEqual({'B':self.inv_B['fileid'],
390
'C':self.inv_C['fileid']},
391
self.get_previous_heads([self.inv_C, self.inv_B]))
393
def test_fileid_in_two_inventories_already_merged_gives_head(self):
394
self.assertEqual({'D':self.inv_D['fileid']},
395
self.get_previous_heads([self.inv_B, self.inv_D]))
396
self.assertEqual({'D':self.inv_D['fileid']},
397
self.get_previous_heads([self.inv_D, self.inv_B]))
399
# TODO: test two inventories with the same file revision
402
class TestExecutable(TestCaseWithTransport):
404
def test_stays_executable(self):
405
a_id = "a-20051208024829-849e76f7968d7a86"
406
b_id = "b-20051208024829-849e76f7968d7a86"
407
wt = self.make_branch_and_tree('b1')
409
tt = TreeTransform(wt)
410
tt.new_file('a', tt.root, 'a test\n', a_id, True)
411
tt.new_file('b', tt.root, 'b test\n', b_id, False)
414
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
416
# reopen the tree and ensure it stuck.
417
wt = wt.bzrdir.open_workingtree()
418
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
420
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
421
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
423
wt.commit('adding a,b', rev_id='r1')
425
rev_tree = b.repository.revision_tree('r1')
426
self.failUnless(rev_tree.is_executable(a_id), "'a' lost the execute bit")
427
self.failIf(rev_tree.is_executable(b_id), "'b' gained an execute bit")
429
self.failUnless(rev_tree.inventory[a_id].executable)
430
self.failIf(rev_tree.inventory[b_id].executable)
432
# Make sure the entries are gone
435
self.failIf(wt.has_id(a_id))
436
self.failIf(wt.has_filename('a'))
437
self.failIf(wt.has_id(b_id))
438
self.failIf(wt.has_filename('b'))
440
# Make sure that revert is able to bring them back,
441
# and sets 'a' back to being executable
443
wt.revert(['a', 'b'], rev_tree, backups=False)
444
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
446
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
447
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
449
# Now remove them again, and make sure that after a
450
# commit, they are still marked correctly
453
wt.commit('removed', rev_id='r2')
455
self.assertEqual([], [cn for cn,ie in wt.inventory.iter_entries()])
456
self.failIf(wt.has_id(a_id))
457
self.failIf(wt.has_filename('a'))
458
self.failIf(wt.has_id(b_id))
459
self.failIf(wt.has_filename('b'))
461
# Now revert back to the previous commit
462
wt.revert([], rev_tree, backups=False)
463
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
465
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
466
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
468
# Now make sure that 'bzr branch' also preserves the
470
# TODO: Maybe this should be a blackbox test
471
d2 = b.bzrdir.clone('b2', revision_id='r1')
472
t2 = d2.open_workingtree()
474
self.assertEquals('r1', b2.last_revision())
476
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
477
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
478
self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
480
# Make sure pull will delete the files
482
self.assertEquals('r2', b2.last_revision())
483
self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
485
# Now commit the changes on the first branch
486
# so that the second branch can pull the changes
487
# and make sure that the executable bit has been copied
488
wt.commit('resurrected', rev_id='r3')
491
self.assertEquals('r3', b2.last_revision())
492
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
494
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
495
self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
497
class TestRevert(TestCaseWithTransport):
498
def test_dangling_id(self):
499
wt = self.make_branch_and_tree('b1')
500
self.assertEqual(len(wt.inventory), 1)
501
open('b1/a', 'wb').write('a test\n')
503
self.assertEqual(len(wt.inventory), 2)
506
self.assertEqual(len(wt.inventory), 1)
added
removed
bzrlib/tests/test_inv.py
