/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: Aaron Bentley
  • Date: 2006-04-07 22:46:52 UTC
  • mfrom: (1645 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: aaron.bentley@utoronto.ca-20060407224652-4925bc3735b926f8
Merged latest bzr.dev

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.tests 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(u'.')
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.working_tree().add(['file'], ['fileid'])
 
142
        self.wt.add(['file'], ['fileid'])
144
143
        if has_symlinks():
145
144
            os.symlink('target1', 'symlink')
146
 
            self.branch.working_tree().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(u'.')
 
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.working_tree().add(['subdir', 'subdir/file'],
 
245
        self.wt.add(['subdir', 'subdir/file'],
246
246
                                       ['dirid', 'fileid'])
247
247
        if has_symlinks():
248
248
            pass
249
 
        self.wt = self.branch.working_tree()
250
249
        self.wt.commit('message_1', rev_id = '1')
251
 
        self.tree_1 = self.branch.revision_tree('1')
252
 
        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')
253
252
        self.file_1 = self.inv_1['fileid']
254
 
        self.work_tree = self.branch.working_tree()
255
 
        self.file_active = self.work_tree.inventory['fileid']
 
253
        self.file_active = self.wt.inventory['fileid']
256
254
 
257
255
    def test_snapshot_new_revision(self):
258
256
        # This tests that a simple commit with no parents makes a new
259
257
        # revision value in the inventory entry
260
 
        self.file_active.snapshot('2', 'subdir/file', {}, self.work_tree, 
261
 
                                  self.branch.weave_store,
 
258
        self.file_active.snapshot('2', 'subdir/file', {}, self.wt, 
 
259
                                  self.branch.repository.weave_store,
262
260
                                  self.branch.get_transaction())
263
261
        # expected outcome - file_1 has a revision id of '2', and we can get
264
262
        # its text of 'file contents' out of the weave.
265
263
        self.assertEqual(self.file_1.revision, '1')
266
264
        self.assertEqual(self.file_active.revision, '2')
267
265
        # this should be a separate test probably, but lets check it once..
268
 
        lines = self.branch.weave_store.get_lines('fileid','2',
269
 
            self.branch.get_transaction())
 
266
        lines = self.branch.repository.weave_store.get_weave(
 
267
            'fileid', 
 
268
            self.branch.get_transaction()).get_lines('2')
270
269
        self.assertEqual(lines, ['contents of subdir/file\n'])
271
270
 
272
271
    def test_snapshot_unchanged(self):
273
272
        #This tests that a simple commit does not make a new entry for
274
273
        # an unchanged inventory entry
275
274
        self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
276
 
                                  self.work_tree, self.branch.weave_store,
 
275
                                  self.wt, 
 
276
                                  self.branch.repository.weave_store,
277
277
                                  self.branch.get_transaction())
278
278
        self.assertEqual(self.file_1.revision, '1')
279
279
        self.assertEqual(self.file_active.revision, '1')
280
 
        self.assertRaises(errors.WeaveError,
281
 
                          self.branch.weave_store.get_lines, 'fileid', '2',
282
 
                          self.branch.get_transaction())
 
280
        vf = self.branch.repository.weave_store.get_weave(
 
281
            'fileid', 
 
282
            self.branch.repository.get_transaction())
 
283
        self.assertRaises(errors.RevisionNotPresent,
 
284
                          vf.get_lines,
 
285
                          '2')
283
286
 
284
287
    def test_snapshot_merge_identical_different_revid(self):
285
288
        # This tests that a commit with two identical parents, one of which has
293
296
        self.assertEqual(self.file_1, other_ie)
294
297
        other_ie.revision = 'other'
295
298
        self.assertNotEqual(self.file_1, other_ie)
296
 
        self.branch.weave_store.add_identical_text('fileid', '1', 'other', ['1'],
297
 
            self.branch.get_transaction())
 
299
        versionfile = self.branch.repository.weave_store.get_weave(
 
300
            'fileid', self.branch.repository.get_transaction())
 
301
        versionfile.clone_text('other', '1', ['1'])
298
302
        self.file_active.snapshot('2', 'subdir/file', 
299
303
                                  {'1':self.file_1, 'other':other_ie},
300
 
                                  self.work_tree, self.branch.weave_store,
 
304
                                  self.wt, 
 
305
                                  self.branch.repository.weave_store,
301
306
                                  self.branch.get_transaction())
302
307
        self.assertEqual(self.file_active.revision, '2')
303
308
 
307
312
        self.file_active.name='newname'
308
313
        rename('subdir/file', 'subdir/newname')
309
314
        self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1}, 
310
 
                                  self.work_tree, 
311
 
                                  self.branch.weave_store,
 
315
                                  self.wt,
 
316
                                  self.branch.repository.weave_store,
312
317
                                  self.branch.get_transaction())
313
318
        # expected outcome - file_1 has a revision id of '2'
314
319
        self.assertEqual(self.file_active.revision, '2')
315
320
 
316
321
 
317
 
class TestPreviousHeads(TestCaseInTempDir):
 
322
class TestPreviousHeads(TestCaseWithTransport):
318
323
 
319
324
    def setUp(self):
320
325
        # we want several inventories, that respectively
326
331
        # D) fileid present in two inventories and one is
327
332
        #   a descendent of the other. (B, D)
328
333
        super(TestPreviousHeads, self).setUp()
 
334
        self.wt = self.make_branch_and_tree('.')
 
335
        self.branch = self.wt.branch
329
336
        self.build_tree(['file'])
330
 
        self.branch = Branch.initialize(u'.')
331
 
        self.wt = self.branch.working_tree()
332
337
        self.wt.commit('new branch', allow_pointless=True, rev_id='A')
333
 
        self.inv_A = self.branch.get_inventory('A')
334
 
        self.branch.working_tree().add(['file'], ['fileid'])
 
338
        self.inv_A = self.branch.repository.get_inventory('A')
 
339
        self.wt.add(['file'], ['fileid'])
335
340
        self.wt.commit('add file', rev_id='B')
336
 
        self.inv_B = self.branch.get_inventory('B')
337
 
        self.branch.put_controlfile('revision-history', 'A\n')
 
341
        self.inv_B = self.branch.repository.get_inventory('B')
 
342
        self.branch.lock_write()
 
343
        try:
 
344
            self.branch.control_files.put_utf8('revision-history', 'A\n')
 
345
        finally:
 
346
            self.branch.unlock()
338
347
        self.assertEqual(self.branch.revision_history(), ['A'])
339
348
        self.wt.commit('another add of file', rev_id='C')
340
 
        self.inv_C = self.branch.get_inventory('C')
 
349
        self.inv_C = self.branch.repository.get_inventory('C')
341
350
        self.wt.add_pending_merge('B')
342
351
        self.wt.commit('merge in B', rev_id='D')
343
 
        self.inv_D = self.branch.get_inventory('D')
 
352
        self.inv_D = self.branch.repository.get_inventory('D')
344
353
        self.file_active = self.wt.inventory['fileid']
345
 
        self.weave = self.branch.weave_store.get_weave('fileid',
346
 
            self.branch.get_transaction())
 
354
        self.weave = self.branch.repository.weave_store.get_weave('fileid',
 
355
            self.branch.repository.get_transaction())
347
356
        
348
357
    def get_previous_heads(self, inventories):
349
 
        return self.file_active.find_previous_heads(inventories, self.weave)
 
358
        return self.file_active.find_previous_heads(
 
359
            inventories, 
 
360
            self.branch.repository.weave_store,
 
361
            self.branch.repository.get_transaction())
350
362
        
351
363
    def test_fileid_in_no_inventory(self):
352
364
        self.assertEqual({}, self.get_previous_heads([self.inv_A]))
374
386
                         self.get_previous_heads([self.inv_D, self.inv_B]))
375
387
 
376
388
    # TODO: test two inventories with the same file revision 
 
389
 
 
390
 
 
391
class TestExecutable(TestCaseWithTransport):
 
392
 
 
393
    def test_stays_executable(self):
 
394
        basic_inv = """<inventory format="5">
 
395
<file file_id="a-20051208024829-849e76f7968d7a86" name="a" executable="yes" />
 
396
<file file_id="b-20051208024829-849e76f7968d7a86" name="b" />
 
397
</inventory>
 
398
"""
 
399
        wt = self.make_branch_and_tree('b1')
 
400
        b = wt.branch
 
401
        open('b1/a', 'wb').write('a test\n')
 
402
        open('b1/b', 'wb').write('b test\n')
 
403
        os.chmod('b1/a', 0755)
 
404
        os.chmod('b1/b', 0644)
 
405
        # Manually writing the inventory, to ensure that
 
406
        # the executable="yes" entry is set for 'a' and not for 'b'
 
407
        open('b1/.bzr/inventory', 'wb').write(basic_inv)
 
408
 
 
409
        a_id = "a-20051208024829-849e76f7968d7a86"
 
410
        b_id = "b-20051208024829-849e76f7968d7a86"
 
411
        wt = wt.bzrdir.open_workingtree()
 
412
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
413
 
 
414
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
415
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
 
416
 
 
417
        wt.commit('adding a,b', rev_id='r1')
 
418
 
 
419
        rev_tree = b.repository.revision_tree('r1')
 
420
        self.failUnless(rev_tree.is_executable(a_id), "'a' lost the execute bit")
 
421
        self.failIf(rev_tree.is_executable(b_id), "'b' gained an execute bit")
 
422
 
 
423
        self.failUnless(rev_tree.inventory[a_id].executable)
 
424
        self.failIf(rev_tree.inventory[b_id].executable)
 
425
 
 
426
        # Make sure the entries are gone
 
427
        os.remove('b1/a')
 
428
        os.remove('b1/b')
 
429
        self.failIf(wt.has_id(a_id))
 
430
        self.failIf(wt.has_filename('a'))
 
431
        self.failIf(wt.has_id(b_id))
 
432
        self.failIf(wt.has_filename('b'))
 
433
 
 
434
        # Make sure that revert is able to bring them back,
 
435
        # and sets 'a' back to being executable
 
436
 
 
437
        wt.revert(['a', 'b'], rev_tree, backups=False)
 
438
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
439
 
 
440
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
441
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
 
442
 
 
443
        # Now remove them again, and make sure that after a
 
444
        # commit, they are still marked correctly
 
445
        os.remove('b1/a')
 
446
        os.remove('b1/b')
 
447
        wt.commit('removed', rev_id='r2')
 
448
 
 
449
        self.assertEqual([], [cn for cn,ie in wt.inventory.iter_entries()])
 
450
        self.failIf(wt.has_id(a_id))
 
451
        self.failIf(wt.has_filename('a'))
 
452
        self.failIf(wt.has_id(b_id))
 
453
        self.failIf(wt.has_filename('b'))
 
454
 
 
455
        # Now revert back to the previous commit
 
456
        wt.revert([], rev_tree, backups=False)
 
457
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
458
 
 
459
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
460
        self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
 
461
 
 
462
        # Now make sure that 'bzr branch' also preserves the
 
463
        # executable bit
 
464
        # TODO: Maybe this should be a blackbox test
 
465
        d2 = b.bzrdir.clone('b2', revision_id='r1')
 
466
        t2 = d2.open_workingtree()
 
467
        b2 = t2.branch
 
468
        self.assertEquals('r1', b2.last_revision())
 
469
 
 
470
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
 
471
        self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
 
472
        self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
 
473
 
 
474
        # Make sure pull will delete the files
 
475
        t2.pull(b)
 
476
        self.assertEquals('r2', b2.last_revision())
 
477
        self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
 
478
 
 
479
        # Now commit the changes on the first branch
 
480
        # so that the second branch can pull the changes
 
481
        # and make sure that the executable bit has been copied
 
482
        wt.commit('resurrected', rev_id='r3')
 
483
 
 
484
        t2.pull(b)
 
485
        self.assertEquals('r3', b2.last_revision())
 
486
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
 
487
 
 
488
        self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
 
489
        self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
 
490
 
 
491
class TestRevert(TestCaseWithTransport):
 
492
    def test_dangling_id(self):
 
493
        wt = self.make_branch_and_tree('b1')
 
494
        self.assertEqual(len(wt.inventory), 1)
 
495
        open('b1/a', 'wb').write('a test\n')
 
496
        wt.add('a')
 
497
        self.assertEqual(len(wt.inventory), 2)
 
498
        os.unlink('b1/a')
 
499
        wt.revert([])
 
500
        self.assertEqual(len(wt.inventory), 1)
 
501
 
 
502