71
class TestInventoryEntry(TestCase):
67
class TestInventoryEntry(TestCaseInTempDir):
73
69
def test_file_kind_character(self):
74
file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
70
file = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
75
71
self.assertEqual(file.kind_character(), '')
77
73
def test_dir_kind_character(self):
78
dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
74
dir = InventoryEntry('123', 'hello.c', 'directory', ROOT_ID)
79
75
self.assertEqual(dir.kind_character(), '/')
81
77
def test_link_kind_character(self):
82
dir = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
78
dir = InventoryEntry('123', 'hello.c', 'symlink', ROOT_ID)
83
79
self.assertEqual(dir.kind_character(), '')
85
81
def test_dir_detect_changes(self):
86
left = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
82
left = InventoryEntry('123', 'hello.c', 'directory', ROOT_ID)
87
83
left.text_sha1 = 123
88
84
left.executable = True
89
85
left.symlink_target='foo'
90
right = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
86
right = InventoryEntry('123', 'hello.c', 'directory', ROOT_ID)
91
87
right.text_sha1 = 321
92
88
right.symlink_target='bar'
93
89
self.assertEqual((False, False), left.detect_changes(right))
94
90
self.assertEqual((False, False), right.detect_changes(left))
96
92
def test_file_detect_changes(self):
97
left = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
93
left = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
98
94
left.text_sha1 = 123
99
right = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
95
right = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
100
96
right.text_sha1 = 123
101
97
self.assertEqual((False, False), left.detect_changes(right))
102
98
self.assertEqual((False, False), right.detect_changes(left))
122
118
self.assertEqual((True, False), right.detect_changes(left))
124
120
def test_file_has_text(self):
125
file = inventory.InventoryFile('123', 'hello.c', ROOT_ID)
121
file = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
126
122
self.failUnless(file.has_text())
128
124
def test_directory_has_text(self):
129
dir = inventory.InventoryDirectory('123', 'hello.c', ROOT_ID)
125
dir = InventoryEntry('123', 'hello.c', 'directory', ROOT_ID)
130
126
self.failIf(dir.has_text())
132
128
def test_link_has_text(self):
133
link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
129
link = InventoryEntry('123', 'hello.c', 'symlink', ROOT_ID)
134
130
self.failIf(link.has_text())
137
class TestEntryDiffing(TestCaseWithTransport):
133
class TestEntryDiffing(TestCaseInTempDir):
140
136
super(TestEntryDiffing, self).setUp()
141
self.wt = self.make_branch_and_tree('.')
142
self.branch = self.wt.branch
137
self.branch = Branch.initialize('.')
143
138
print >> open('file', 'wb'), 'foo'
144
print >> open('binfile', 'wb'), 'foo'
145
self.wt.add(['file'], ['fileid'])
146
self.wt.add(['binfile'], ['binfileid'])
139
self.branch.add(['file'], ['fileid'])
147
140
if has_symlinks():
148
141
os.symlink('target1', 'symlink')
149
self.wt.add(['symlink'], ['linkid'])
150
self.wt.commit('message_1', rev_id = '1')
142
self.branch.add(['symlink'], ['linkid'])
143
self.branch.commit('message_1', rev_id = '1')
151
144
print >> open('file', 'wb'), 'bar'
152
print >> open('binfile', 'wb'), 'x' * 1023 + '\x00'
153
145
if has_symlinks():
154
146
os.unlink('symlink')
155
147
os.symlink('target2', 'symlink')
156
self.tree_1 = self.branch.repository.revision_tree('1')
157
self.inv_1 = self.branch.repository.get_inventory('1')
148
self.tree_1 = self.branch.revision_tree('1')
149
self.inv_1 = self.branch.get_inventory('1')
158
150
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()
151
self.tree_2 = self.branch.working_tree()
152
self.inv_2 = self.branch.inventory
162
153
self.file_2 = self.inv_2['fileid']
163
self.file_2b = self.inv_2['binfileid']
164
154
if has_symlinks():
165
155
self.link_1 = self.inv_1['linkid']
166
156
self.link_2 = self.inv_2['linkid']
243
219
self.assertEqual(output.getvalue(),
244
220
"=== 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/selftest/testinv.py
