17
17
from cStringIO import StringIO
21
20
from bzrlib.branch import Branch
22
21
import bzrlib.errors as errors
23
22
from bzrlib.diff import internal_diff
24
from bzrlib.inventory import (Inventory, ROOT_ID, InventoryFile,
25
InventoryDirectory, InventoryEntry)
23
from bzrlib.inventory import Inventory, ROOT_ID
26
24
import bzrlib.inventory as inventory
27
from bzrlib.osutils import (has_symlinks, rename, pathjoin, is_inside_any,
28
is_inside_or_parent_of_any)
25
from bzrlib.osutils import has_symlinks, rename, pathjoin
29
26
from bzrlib.tests import TestCase, TestCaseWithTransport
30
from bzrlib.transform import TreeTransform
31
from bzrlib.uncommit import uncommit
27
from bzrlib.workingtree import WorkingTree
34
30
class TestInventory(TestCase):
36
32
def test_is_within(self):
33
from bzrlib.osutils import is_inside_any
38
35
SRC_FOO_C = pathjoin('src', 'foo.c')
39
36
for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
45
42
for dirs, fn in [(['src'], 'srccontrol'),
46
43
(['src'], 'srccontrol/foo')]:
47
44
self.assertFalse(is_inside_any(dirs, fn))
49
def test_is_within_or_parent(self):
50
for dirs, fn in [(['src', 'doc'], 'src/foo.c'),
51
(['src'], 'src/foo.c'),
52
(['src/bar.c'], 'src'),
53
(['src/bar.c', 'bla/foo.c'], 'src'),
56
self.assert_(is_inside_or_parent_of_any(dirs, fn))
58
for dirs, fn in [(['src'], 'srccontrol'),
59
(['srccontrol/foo.c'], 'src'),
60
(['src'], 'srccontrol/foo')]:
61
self.assertFalse(is_inside_or_parent_of_any(dirs, fn))
63
46
def test_ids(self):
64
47
"""Test detection of files within selected directories."""
77
60
self.assert_('src-id' in inv)
79
def test_iter_entries(self):
82
for args in [('src', 'directory', 'src-id'),
83
('doc', 'directory', 'doc-id'),
84
('src/hello.c', 'file', 'hello-id'),
85
('src/bye.c', 'file', 'bye-id'),
86
('Makefile', 'file', 'makefile-id')]:
90
('Makefile', 'makefile-id'),
93
('src/bye.c', 'bye-id'),
94
('src/hello.c', 'hello-id'),
95
], [(path, ie.file_id) for path, ie in inv.iter_entries()])
97
def test_iter_entries_by_dir(self):
100
for args in [('src', 'directory', 'src-id'),
101
('doc', 'directory', 'doc-id'),
102
('src/hello.c', 'file', 'hello-id'),
103
('src/bye.c', 'file', 'bye-id'),
104
('zz', 'file', 'zz-id'),
105
('src/sub/', 'directory', 'sub-id'),
106
('src/zz.c', 'file', 'zzc-id'),
107
('src/sub/a', 'file', 'a-id'),
108
('Makefile', 'file', 'makefile-id')]:
112
('Makefile', 'makefile-id'),
116
('src/bye.c', 'bye-id'),
117
('src/hello.c', 'hello-id'),
118
('src/sub', 'sub-id'),
119
('src/zz.c', 'zzc-id'),
120
('src/sub/a', 'a-id'),
121
], [(path, ie.file_id) for path, ie in inv.iter_entries_by_dir()])
123
63
def test_version(self):
124
64
"""Inventory remembers the text's version."""
207
140
self.wt = self.make_branch_and_tree('.')
208
141
self.branch = self.wt.branch
209
142
print >> open('file', 'wb'), 'foo'
210
print >> open('binfile', 'wb'), 'foo'
211
143
self.wt.add(['file'], ['fileid'])
212
self.wt.add(['binfile'], ['binfileid'])
213
144
if has_symlinks():
214
145
os.symlink('target1', 'symlink')
215
146
self.wt.add(['symlink'], ['linkid'])
216
147
self.wt.commit('message_1', rev_id = '1')
217
148
print >> open('file', 'wb'), 'bar'
218
print >> open('binfile', 'wb'), 'x' * 1023 + '\x00'
219
149
if has_symlinks():
220
150
os.unlink('symlink')
221
151
os.symlink('target2', 'symlink')
222
152
self.tree_1 = self.branch.repository.revision_tree('1')
223
153
self.inv_1 = self.branch.repository.get_inventory('1')
224
154
self.file_1 = self.inv_1['fileid']
225
self.file_1b = self.inv_1['binfileid']
226
self.tree_2 = self.wt
155
self.tree_2 = self.branch.working_tree()
227
156
self.inv_2 = self.tree_2.read_working_inventory()
228
157
self.file_2 = self.inv_2['fileid']
229
self.file_2b = self.inv_2['binfileid']
230
158
if has_symlinks():
231
159
self.link_1 = self.inv_1['linkid']
232
160
self.link_2 = self.inv_2['linkid']
261
189
"/dev/null", self.tree_1,
262
190
"new_label", self.file_2, self.tree_2,
264
self.assertEqual(output.getvalue(), "--- /dev/null\n"
192
self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
266
194
"@@ -1,1 +1,1 @@\n"
271
def test_file_diff_binary(self):
273
self.file_1.diff(internal_diff,
274
"/dev/null", self.tree_1,
275
"new_label", self.file_2b, self.tree_2,
277
self.assertEqual(output.getvalue(),
278
"Binary files /dev/null and new_label differ\n")
279
199
def test_link_diff_deleted(self):
280
200
if not has_symlinks():
332
252
self.inv_1 = self.branch.repository.get_inventory('1')
333
253
self.file_1 = self.inv_1['fileid']
334
254
self.file_active = self.wt.inventory['fileid']
335
self.builder = self.branch.get_commit_builder([], timestamp=time.time(), revision_id='2')
337
256
def test_snapshot_new_revision(self):
338
257
# This tests that a simple commit with no parents makes a new
339
258
# revision value in the inventory entry
340
self.file_active.snapshot('2', 'subdir/file', {}, self.wt, self.builder)
259
self.file_active.snapshot('2', 'subdir/file', {}, self.wt,
260
self.branch.repository.weave_store,
261
self.branch.get_transaction())
341
262
# expected outcome - file_1 has a revision id of '2', and we can get
342
263
# its text of 'file contents' out of the weave.
343
264
self.assertEqual(self.file_1.revision, '1')
344
265
self.assertEqual(self.file_active.revision, '2')
345
266
# this should be a separate test probably, but lets check it once..
346
lines = self.branch.repository.weave_store.get_weave(
348
self.branch.get_transaction()).get_lines('2')
267
lines = self.branch.repository.weave_store.get_lines('fileid','2',
268
self.branch.get_transaction())
349
269
self.assertEqual(lines, ['contents of subdir/file\n'])
351
271
def test_snapshot_unchanged(self):
352
272
#This tests that a simple commit does not make a new entry for
353
273
# an unchanged inventory entry
354
274
self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
355
self.wt, self.builder)
276
self.branch.repository.weave_store,
277
self.branch.get_transaction())
356
278
self.assertEqual(self.file_1.revision, '1')
357
279
self.assertEqual(self.file_active.revision, '1')
358
vf = self.branch.repository.weave_store.get_weave(
360
self.branch.repository.get_transaction())
361
self.assertRaises(errors.RevisionNotPresent,
280
self.assertRaises(errors.WeaveError,
281
self.branch.repository.weave_store.get_lines,
282
'fileid', '2', self.branch.get_transaction())
365
284
def test_snapshot_merge_identical_different_revid(self):
366
285
# This tests that a commit with two identical parents, one of which has
374
293
self.assertEqual(self.file_1, other_ie)
375
294
other_ie.revision = 'other'
376
295
self.assertNotEqual(self.file_1, other_ie)
377
versionfile = self.branch.repository.weave_store.get_weave(
378
'fileid', self.branch.repository.get_transaction())
379
versionfile.clone_text('other', '1', ['1'])
296
self.branch.repository.weave_store.add_identical_text('fileid', '1',
297
'other', ['1'], self.branch.get_transaction())
380
298
self.file_active.snapshot('2', 'subdir/file',
381
299
{'1':self.file_1, 'other':other_ie},
382
self.wt, self.builder)
301
self.branch.repository.weave_store,
302
self.branch.get_transaction())
383
303
self.assertEqual(self.file_active.revision, '2')
385
305
def test_snapshot_changed(self):
413
335
self.wt.add(['file'], ['fileid'])
414
336
self.wt.commit('add file', rev_id='B')
415
337
self.inv_B = self.branch.repository.get_inventory('B')
416
uncommit(self.branch, tree=self.wt)
338
self.branch.lock_write()
340
self.branch.control_files.put_utf8('revision-history', 'A\n')
417
343
self.assertEqual(self.branch.revision_history(), ['A'])
418
344
self.wt.commit('another add of file', rev_id='C')
419
345
self.inv_C = self.branch.repository.get_inventory('C')
420
346
self.wt.add_pending_merge('B')
421
347
self.wt.commit('merge in B', rev_id='D')
422
348
self.inv_D = self.branch.repository.get_inventory('D')
423
self.file_active = self.wt.inventory['fileid']
349
self.file_active = self.branch.working_tree().inventory['fileid']
424
350
self.weave = self.branch.repository.weave_store.get_weave('fileid',
425
self.branch.repository.get_transaction())
351
self.branch.get_transaction())
427
353
def get_previous_heads(self, inventories):
428
return self.file_active.find_previous_heads(
430
self.branch.repository.weave_store,
431
self.branch.repository.get_transaction())
354
return self.file_active.find_previous_heads(inventories, self.weave)
433
356
def test_fileid_in_no_inventory(self):
434
357
self.assertEqual({}, self.get_previous_heads([self.inv_A]))
458
381
# TODO: test two inventories with the same file revision
461
class TestDescribeChanges(TestCase):
463
def test_describe_change(self):
464
# we need to test the following change combinations:
470
# renamed/reparented and modified
471
# change kind (perhaps can't be done yet?)
472
# also, merged in combination with all of these?
473
old_a = InventoryFile('a-id', 'a_file', ROOT_ID)
474
old_a.text_sha1 = '123132'
476
new_a = InventoryFile('a-id', 'a_file', ROOT_ID)
477
new_a.text_sha1 = '123132'
480
self.assertChangeDescription('unchanged', old_a, new_a)
483
new_a.text_sha1 = 'abcabc'
484
self.assertChangeDescription('modified', old_a, new_a)
486
self.assertChangeDescription('added', None, new_a)
487
self.assertChangeDescription('removed', old_a, None)
488
# perhaps a bit questionable but seems like the most reasonable thing...
489
self.assertChangeDescription('unchanged', None, None)
491
# in this case it's both renamed and modified; show a rename and
493
new_a.name = 'newfilename'
494
self.assertChangeDescription('modified and renamed', old_a, new_a)
496
# reparenting is 'renaming'
497
new_a.name = old_a.name
498
new_a.parent_id = 'somedir-id'
499
self.assertChangeDescription('modified and renamed', old_a, new_a)
501
# reset the content values so its not modified
502
new_a.text_size = old_a.text_size
503
new_a.text_sha1 = old_a.text_sha1
504
new_a.name = old_a.name
506
new_a.name = 'newfilename'
507
self.assertChangeDescription('renamed', old_a, new_a)
509
# reparenting is 'renaming'
510
new_a.name = old_a.name
511
new_a.parent_id = 'somedir-id'
512
self.assertChangeDescription('renamed', old_a, new_a)
514
def assertChangeDescription(self, expected_change, old_ie, new_ie):
515
change = InventoryEntry.describe_change(old_ie, new_ie)
516
self.assertEqual(expected_change, change)
519
384
class TestExecutable(TestCaseWithTransport):
521
386
def test_stays_executable(self):
387
basic_inv = """<inventory format="5">
388
<file file_id="a-20051208024829-849e76f7968d7a86" name="a" executable="yes" />
389
<file file_id="b-20051208024829-849e76f7968d7a86" name="b" />
392
wt = self.make_branch_and_tree('b1')
394
open('b1/a', 'wb').write('a test\n')
395
open('b1/b', 'wb').write('b test\n')
396
os.chmod('b1/a', 0755)
397
os.chmod('b1/b', 0644)
398
# Manually writing the inventory, to ensure that
399
# the executable="yes" entry is set for 'a' and not for 'b'
400
open('b1/.bzr/inventory', 'wb').write(basic_inv)
522
402
a_id = "a-20051208024829-849e76f7968d7a86"
523
403
b_id = "b-20051208024829-849e76f7968d7a86"
524
wt = self.make_branch_and_tree('b1')
526
tt = TreeTransform(wt)
527
tt.new_file('a', tt.root, 'a test\n', a_id, True)
528
tt.new_file('b', tt.root, 'b test\n', b_id, False)
531
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
533
# reopen the tree and ensure it stuck.
534
wt = wt.bzrdir.open_workingtree()
535
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
537
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
538
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
540
wt.commit('adding a,b', rev_id='r1')
404
t = WorkingTree('b1', b)
405
self.assertEqual(['a', 'b'], [cn for cn,ie in t.inventory.iter_entries()])
407
self.failUnless(t.is_executable(a_id), "'a' lost the execute bit")
408
self.failIf(t.is_executable(b_id), "'b' gained an execute bit")
410
t.commit('adding a,b', rev_id='r1')
542
412
rev_tree = b.repository.revision_tree('r1')
543
413
self.failUnless(rev_tree.is_executable(a_id), "'a' lost the execute bit")
549
419
# Make sure the entries are gone
550
420
os.remove('b1/a')
551
421
os.remove('b1/b')
552
self.failIf(wt.has_id(a_id))
553
self.failIf(wt.has_filename('a'))
554
self.failIf(wt.has_id(b_id))
555
self.failIf(wt.has_filename('b'))
422
self.failIf(t.has_id(a_id))
423
self.failIf(t.has_filename('a'))
424
self.failIf(t.has_id(b_id))
425
self.failIf(t.has_filename('b'))
557
427
# Make sure that revert is able to bring them back,
558
428
# and sets 'a' back to being executable
560
wt.revert(['a', 'b'], rev_tree, backups=False)
561
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
430
t.revert(['a', 'b'], rev_tree, backups=False)
431
self.assertEqual(['a', 'b'], [cn for cn,ie in t.inventory.iter_entries()])
563
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
564
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
433
self.failUnless(t.is_executable(a_id), "'a' lost the execute bit")
434
self.failIf(t.is_executable(b_id), "'b' gained an execute bit")
566
436
# Now remove them again, and make sure that after a
567
437
# commit, they are still marked correctly
568
438
os.remove('b1/a')
569
439
os.remove('b1/b')
570
wt.commit('removed', rev_id='r2')
440
t.commit('removed', rev_id='r2')
572
self.assertEqual([], [cn for cn,ie in wt.inventory.iter_entries()])
573
self.failIf(wt.has_id(a_id))
574
self.failIf(wt.has_filename('a'))
575
self.failIf(wt.has_id(b_id))
576
self.failIf(wt.has_filename('b'))
442
self.assertEqual([], [cn for cn,ie in t.inventory.iter_entries()])
443
self.failIf(t.has_id(a_id))
444
self.failIf(t.has_filename('a'))
445
self.failIf(t.has_id(b_id))
446
self.failIf(t.has_filename('b'))
578
448
# Now revert back to the previous commit
579
wt.revert([], rev_tree, backups=False)
580
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
582
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
583
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
449
t.revert([], rev_tree, backups=False)
450
# TODO: FIXME: For some reason, after revert, the tree does not
451
# regenerate its working inventory, so we have to manually delete
452
# the working tree, and create a new one
453
# This seems to happen any time you do a merge operation on the
456
t = WorkingTree('b1', b)
458
self.assertEqual(['a', 'b'], [cn for cn,ie in t.inventory.iter_entries()])
460
self.failUnless(t.is_executable(a_id), "'a' lost the execute bit")
461
self.failIf(t.is_executable(b_id), "'b' gained an execute bit")
585
463
# Now make sure that 'bzr branch' also preserves the
587
465
# TODO: Maybe this should be a blackbox test
588
d2 = b.bzrdir.clone('b2', revision_id='r1')
589
t2 = d2.open_workingtree()
466
b.clone('b2', revision='r1')
467
b2 = Branch.open('b2')
591
468
self.assertEquals('r1', b2.last_revision())
469
t2 = b2.working_tree()
593
471
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
594
472
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
597
475
# Make sure pull will delete the files
599
477
self.assertEquals('r2', b2.last_revision())
478
# FIXME: Same thing here, t2 needs to be recreated
480
t2 = b2.working_tree()
600
481
self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
602
483
# Now commit the changes on the first branch
603
484
# so that the second branch can pull the changes
604
485
# and make sure that the executable bit has been copied
605
wt.commit('resurrected', rev_id='r3')
486
t.commit('resurrected', rev_id='r3')
491
t2 = b2.working_tree()
608
492
self.assertEquals('r3', b2.last_revision())
609
493
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
611
495
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
612
496
self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
615
class TestRevert(TestCaseWithTransport):
617
def test_dangling_id(self):
618
wt = self.make_branch_and_tree('b1')
619
self.assertEqual(len(wt.inventory), 1)
620
open('b1/a', 'wb').write('a test\n')
622
self.assertEqual(len(wt.inventory), 2)
625
self.assertEqual(len(wt.inventory), 1)
added
removed
bzrlib/tests/test_inv.py
