← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: Robert Collins
  • Date: 2006-02-15 08:11:37 UTC
  • mto: (1534.1.24 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060215081137-4c27377517e96dd1
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
18
18
import os
19
19
 
20
20
from bzrlib.branch import Branch
21
 
from bzrlib.clone import copy_branch
22
21
import bzrlib.errors as errors
23
22
from bzrlib.diff import internal_diff
24
23
from bzrlib.inventory import Inventory, ROOT_ID
25
24
import bzrlib.inventory as inventory
26
 
from bzrlib.osutils import has_symlinks, rename
27
 
from bzrlib.selftest import TestCase, TestCaseInTempDir
 
25
from bzrlib.osutils import has_symlinks, rename, pathjoin
 
26
from bzrlib.tests import TestCase, TestCaseWithTransport
28
27
 
29
28
 
30
29
class TestInventory(TestCase):
32
31
    def test_is_within(self):
33
32
        from bzrlib.osutils import is_inside_any
34
33
 
35
 
        SRC_FOO_C = os.path.join('src', 'foo.c')
 
34
        SRC_FOO_C = pathjoin('src', 'foo.c')
36
35
        for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
37
36
                         (['src'], SRC_FOO_C),
38
37
                         (['src'], 'src'),
133
132
        self.failIf(link.has_text())
134
133
 
135
134
 
136
 
class TestEntryDiffing(TestCaseInTempDir):
 
135
class TestEntryDiffing(TestCaseWithTransport):
137
136
 
138
137
    def setUp(self):
139
138
        super(TestEntryDiffing, self).setUp()
140
 
        self.branch = Branch.initialize('.')
141
 
        self.wt = self.branch.working_tree()
 
139
        self.wt = self.make_branch_and_tree('.')
 
140
        self.branch = self.wt.branch
142
141
        print >> open('file', 'wb'), 'foo'
143
 
        self.branch.add(['file'], ['fileid'])
 
142
        self.wt.add(['file'], ['fileid'])
144
143
        if has_symlinks():
145
144
            os.symlink('target1', 'symlink')
146
 
            self.branch.add(['symlink'], ['linkid'])
 
145
            self.wt.add(['symlink'], ['linkid'])
147
146
        self.wt.commit('message_1', rev_id = '1')
148
147
        print >> open('file', 'wb'), 'bar'
149
148
        if has_symlinks():
150
149
            os.unlink('symlink')
151
150
            os.symlink('target2', 'symlink')
152
 
        self.tree_1 = self.branch.revision_tree('1')
153
 
        self.inv_1 = self.branch.get_inventory('1')
 
151
        self.tree_1 = self.branch.repository.revision_tree('1')
 
152
        self.inv_1 = self.branch.repository.get_inventory('1')
154
153
        self.file_1 = self.inv_1['fileid']
155
 
        self.tree_2 = self.branch.working_tree()
 
154
        self.tree_2 = self.wt
156
155
        self.inv_2 = self.tree_2.read_working_inventory()
157
156
        self.file_2 = self.inv_2['fileid']
158
157
        if has_symlinks():
230
229
                         "=== target changed 'target1' => 'target2'\n")
231
230
 
232
231
 
233
 
class TestSnapshot(TestCaseInTempDir):
 
232
class TestSnapshot(TestCaseWithTransport):
234
233
 
235
234
    def setUp(self):
236
235
        # for full testing we'll need a branch
240
239
        # to change, and then test merge patterns
241
240
        # with fake parent entries.
242
241
        super(TestSnapshot, self).setUp()
243
 
        self.branch = Branch.initialize('.')
 
242
        self.wt = self.make_branch_and_tree('.')
 
243
        self.branch = self.wt.branch
244
244
        self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
245
 
        self.branch.add(['subdir', 'subdir/file'], ['dirid', 'fileid'])
 
245
        self.wt.add(['subdir', 'subdir/file'],
 
246
                                       ['dirid', 'fileid'])
246
247
        if has_symlinks():
247
248
            pass
248
 
        self.wt = self.branch.working_tree()
249
249
        self.wt.commit('message_1', rev_id = '1')
250
 
        self.tree_1 = self.branch.revision_tree('1')
251
 
        self.inv_1 = self.branch.get_inventory('1')
 
250
        self.tree_1 = self.branch.repository.revision_tree('1')
 
251
        self.inv_1 = self.branch.repository.get_inventory('1')
252
252
        self.file_1 = self.inv_1['fileid']
253
 
        self.work_tree = self.branch.working_tree()
254
 
        self.file_active = self.work_tree.inventory['fileid']
 
253
        self.file_active = self.wt.inventory['fileid']
255
254
 
256
255
    def test_snapshot_new_revision(self):
257
256
        # This tests that a simple commit with no parents makes a new
258
257
        # revision value in the inventory entry
259
 
        self.file_active.snapshot('2', 'subdir/file', {}, self.work_tree, 
260
 
                                  self.branch.weave_store,
 
258
        self.file_active.snapshot('2', 'subdir/file', {}, self.wt, 
 
259
                                  self.branch.repository.weave_store,
261
260
                                  self.branch.get_transaction())
262
261
        # expected outcome - file_1 has a revision id of '2', and we can get
263
262
        # its text of 'file contents' out of the weave.
264
263
        self.assertEqual(self.file_1.revision, '1')
265
264
        self.assertEqual(self.file_active.revision, '2')
266
265
        # this should be a separate test probably, but lets check it once..
267
 
        lines = self.branch.weave_store.get_lines('fileid','2',
 
266
        lines = self.branch.repository.weave_store.get_lines('fileid','2',
268
267
            self.branch.get_transaction())
269
268
        self.assertEqual(lines, ['contents of subdir/file\n'])
270
269
 
272
271
        #This tests that a simple commit does not make a new entry for
273
272
        # an unchanged inventory entry
274
273
        self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
275
 
                                  self.work_tree, self.branch.weave_store,
 
274
                                  self.wt, 
 
275
                                  self.branch.repository.weave_store,
276
276
                                  self.branch.get_transaction())
277
277
        self.assertEqual(self.file_1.revision, '1')
278
278
        self.assertEqual(self.file_active.revision, '1')
279
279
        self.assertRaises(errors.WeaveError,
280
 
                          self.branch.weave_store.get_lines, 'fileid', '2',
281
 
                          self.branch.get_transaction())
 
280
                          self.branch.repository.weave_store.get_lines, 
 
281
                          'fileid', '2', self.branch.get_transaction())
282
282
 
283
283
    def test_snapshot_merge_identical_different_revid(self):
284
284
        # This tests that a commit with two identical parents, one of which has
292
292
        self.assertEqual(self.file_1, other_ie)
293
293
        other_ie.revision = 'other'
294
294
        self.assertNotEqual(self.file_1, other_ie)
295
 
        self.branch.weave_store.add_identical_text('fileid', '1', 'other', ['1'],
296
 
            self.branch.get_transaction())
 
295
        self.branch.repository.weave_store.add_identical_text('fileid', '1', 
 
296
            'other', ['1'], self.branch.get_transaction())
297
297
        self.file_active.snapshot('2', 'subdir/file', 
298
298
                                  {'1':self.file_1, 'other':other_ie},
299
 
                                  self.work_tree, self.branch.weave_store,
 
299
                                  self.wt, 
 
300
                                  self.branch.repository.weave_store,
300
301
                                  self.branch.get_transaction())
301
302
        self.assertEqual(self.file_active.revision, '2')
302
303
 
306
307
        self.file_active.name='newname'
307
308
        rename('subdir/file', 'subdir/newname')
308
309
        self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1}, 
309
 
                                  self.work_tree, 
310
 
                                  self.branch.weave_store,
 
310
                                  self.wt,
 
311
                                  self.branch.repository.weave_store,
311
312
                                  self.branch.get_transaction())
312
313
        # expected outcome - file_1 has a revision id of '2'
313
314
        self.assertEqual(self.file_active.revision, '2')
314
315
 
315
316
 
316
 
class TestPreviousHeads(TestCaseInTempDir):
 
317
class TestPreviousHeads(TestCaseWithTransport):
317
318
 
318
319
    def setUp(self):
319
320
        # we want several inventories, that respectively
325
326
        # D) fileid present in two inventories and one is
326
327
        #   a descendent of the other. (B, D)
327
328
        super(TestPreviousHeads, self).setUp()
 
329
        self.wt = self.make_branch_and_tree('.')
 
330
        self.branch = self.wt.branch
328
331
        self.build_tree(['file'])
329
 
        self.branch = Branch.initialize('.')
330
 
        self.wt = self.branch.working_tree()
331
332
        self.wt.commit('new branch', allow_pointless=True, rev_id='A')
332
 
        self.inv_A = self.branch.get_inventory('A')
333
 
        self.branch.add(['file'], ['fileid'])
 
333
        self.inv_A = self.branch.repository.get_inventory('A')
 
334
        self.wt.add(['file'], ['fileid'])
334
335
        self.wt.commit('add file', rev_id='B')
335
 
        self.inv_B = self.branch.get_inventory('B')
336
 
        self.branch.put_controlfile('revision-history', 'A\n')
 
336
        self.inv_B = self.branch.repository.get_inventory('B')
 
337
        self.branch.lock_write()
 
338
        try:
 
339
            self.branch.control_files.put_utf8('revision-history', 'A\n')
 
340
        finally:
 
341
            self.branch.unlock()
337
342
        self.assertEqual(self.branch.revision_history(), ['A'])
338
343
        self.wt.commit('another add of file', rev_id='C')
339
 
        self.inv_C = self.branch.get_inventory('C')
 
344
        self.inv_C = self.branch.repository.get_inventory('C')
340
345
        self.wt.add_pending_merge('B')
341
346
        self.wt.commit('merge in B', rev_id='D')
342
 
        self.inv_D = self.branch.get_inventory('D')
 
347
        self.inv_D = self.branch.repository.get_inventory('D')
343
348
        self.file_active = self.wt.inventory['fileid']
344
 
        self.weave = self.branch.weave_store.get_weave('fileid',
 
349
        self.weave = self.branch.repository.weave_store.get_weave('fileid',
345
350
            self.branch.get_transaction())
346
351
        
347
352
    def get_previous_heads(self, inventories):
373
378
                         self.get_previous_heads([self.inv_D, self.inv_B]))
374
379
 
375
380
    # TODO: test two inventories with the same file revision 
 
381
 
 
382
 
 
383
class TestExecutable(TestCaseWithTransport):
 
384
 
 
385
    def test_stays_executable(self):
 
386
        basic_inv = """<inventory format="5">
 
387
<file file_id="a-20051208024829-849e76f7968d7a86" name="a" executable="yes" />
 
388
<file file_id="b-20051208024829-849e76f7968d7a86" name="b" />
 
389
</inventory>
 
390
"""
 
391
        wt = self.make_branch_and_tree('b1')
 
392
        b = wt.branch
 
393
        open('b1/a', 'wb').write('a test\n')
 
394
        open('b1/b', 'wb').write('b test\n')
 
395
        os.chmod('b1/a', 0755)
 
396
        os.chmod('b1/b', 0644)
 
397
        # Manually writing the inventory, to ensure that
 
398
        # the executable="yes" entry is set for 'a' and not for 'b'
 
399
        open('b1/.bzr/inventory', 'wb').write(basic_inv)
 
400
 
 
401
        a_id = "a-20051208024829-849e76f7968d7a86"
 
402
        b_id = "b-20051208024829-849e76f7968d7a86"
 
403
        wt = wt.bzrdir.open_workingtree()
 
404
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
405
 
 
406
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
407
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
 
408
 
 
409
        wt.commit('adding a,b', rev_id='r1')
 
410
 
 
411
        rev_tree = b.repository.revision_tree('r1')
 
412
        self.failUnless(rev_tree.is_executable(a_id), "'a' lost the execute bit")
 
413
        self.failIf(rev_tree.is_executable(b_id), "'b' gained an execute bit")
 
414
 
 
415
        self.failUnless(rev_tree.inventory[a_id].executable)
 
416
        self.failIf(rev_tree.inventory[b_id].executable)
 
417
 
 
418
        # Make sure the entries are gone
 
419
        os.remove('b1/a')
 
420
        os.remove('b1/b')
 
421
        self.failIf(wt.has_id(a_id))
 
422
        self.failIf(wt.has_filename('a'))
 
423
        self.failIf(wt.has_id(b_id))
 
424
        self.failIf(wt.has_filename('b'))
 
425
 
 
426
        # Make sure that revert is able to bring them back,
 
427
        # and sets 'a' back to being executable
 
428
 
 
429
        wt.revert(['a', 'b'], rev_tree, backups=False)
 
430
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
431
 
 
432
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
433
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
 
434
 
 
435
        # Now remove them again, and make sure that after a
 
436
        # commit, they are still marked correctly
 
437
        os.remove('b1/a')
 
438
        os.remove('b1/b')
 
439
        wt.commit('removed', rev_id='r2')
 
440
 
 
441
        self.assertEqual([], [cn for cn,ie in wt.inventory.iter_entries()])
 
442
        self.failIf(wt.has_id(a_id))
 
443
        self.failIf(wt.has_filename('a'))
 
444
        self.failIf(wt.has_id(b_id))
 
445
        self.failIf(wt.has_filename('b'))
 
446
 
 
447
        # Now revert back to the previous commit
 
448
        wt.revert([], rev_tree, backups=False)
 
449
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
450
 
 
451
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
452
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
 
453
 
 
454
        # Now make sure that 'bzr branch' also preserves the
 
455
        # executable bit
 
456
        # TODO: Maybe this should be a blackbox test
 
457
        d2 = b.bzrdir.clone('b2', revision_id='r1')
 
458
        t2 = d2.open_workingtree()
 
459
        b2 = t2.branch
 
460
        self.assertEquals('r1', b2.last_revision())
 
461
 
 
462
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
 
463
        self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
 
464
        self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
 
465
 
 
466
        # Make sure pull will delete the files
 
467
        t2.pull(b)
 
468
        self.assertEquals('r2', b2.last_revision())
 
469
        self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
 
470
 
 
471
        # Now commit the changes on the first branch
 
472
        # so that the second branch can pull the changes
 
473
        # and make sure that the executable bit has been copied
 
474
        wt.commit('resurrected', rev_id='r3')
 
475
 
 
476
        t2.pull(b)
 
477
        self.assertEquals('r3', b2.last_revision())
 
478
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
 
479
 
 
480
        self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
 
481
        self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")