← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

(mbp) merge bzr.dev to 0.8, prepare for release

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
 
27
from bzrlib.transform import TreeTransform
 
28
from bzrlib.uncommit import uncommit
28
29
 
29
30
 
30
31
class TestInventory(TestCase):
32
33
    def test_is_within(self):
33
34
        from bzrlib.osutils import is_inside_any
34
35
 
35
 
        SRC_FOO_C = os.path.join('src', 'foo.c')
 
36
        SRC_FOO_C = pathjoin('src', 'foo.c')
36
37
        for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
37
38
                         (['src'], SRC_FOO_C),
38
39
                         (['src'], 'src'),
133
134
        self.failIf(link.has_text())
134
135
 
135
136
 
136
 
class TestEntryDiffing(TestCaseInTempDir):
 
137
class TestEntryDiffing(TestCaseWithTransport):
137
138
 
138
139
    def setUp(self):
139
140
        super(TestEntryDiffing, self).setUp()
140
 
        self.branch = Branch.initialize('.')
 
141
        self.wt = self.make_branch_and_tree('.')
 
142
        self.branch = self.wt.branch
141
143
        print >> open('file', 'wb'), 'foo'
142
 
        self.branch.add(['file'], ['fileid'])
 
144
        print >> open('binfile', 'wb'), 'foo'
 
145
        self.wt.add(['file'], ['fileid'])
 
146
        self.wt.add(['binfile'], ['binfileid'])
143
147
        if has_symlinks():
144
148
            os.symlink('target1', 'symlink')
145
 
            self.branch.add(['symlink'], ['linkid'])
146
 
        self.branch.commit('message_1', rev_id = '1')
 
149
            self.wt.add(['symlink'], ['linkid'])
 
150
        self.wt.commit('message_1', rev_id = '1')
147
151
        print >> open('file', 'wb'), 'bar'
 
152
        print >> open('binfile', 'wb'), 'x' * 1023 + '\x00'
148
153
        if has_symlinks():
149
154
            os.unlink('symlink')
150
155
            os.symlink('target2', 'symlink')
151
 
        self.tree_1 = self.branch.revision_tree('1')
152
 
        self.inv_1 = self.branch.get_inventory('1')
 
156
        self.tree_1 = self.branch.repository.revision_tree('1')
 
157
        self.inv_1 = self.branch.repository.get_inventory('1')
153
158
        self.file_1 = self.inv_1['fileid']
154
 
        self.tree_2 = self.branch.working_tree()
155
 
        self.inv_2 = self.branch.inventory
 
159
        self.file_1b = self.inv_1['binfileid']
 
160
        self.tree_2 = self.wt
 
161
        self.inv_2 = self.tree_2.read_working_inventory()
156
162
        self.file_2 = self.inv_2['fileid']
 
163
        self.file_2b = self.inv_2['binfileid']
157
164
        if has_symlinks():
158
165
            self.link_1 = self.inv_1['linkid']
159
166
            self.link_2 = self.inv_2['linkid']
164
171
                          "old_label", self.tree_1,
165
172
                          "/dev/null", None, None,
166
173
                          output)
167
 
        self.assertEqual(output.getvalue(), "--- old_label\n"
168
 
                                            "+++ /dev/null\n"
 
174
        self.assertEqual(output.getvalue(), "--- old_label\t\n"
 
175
                                            "+++ /dev/null\t\n"
169
176
                                            "@@ -1,1 +0,0 @@\n"
170
177
                                            "-foo\n"
171
178
                                            "\n")
176
183
                          "new_label", self.tree_1,
177
184
                          "/dev/null", None, None,
178
185
                          output, reverse=True)
179
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
180
 
                                            "+++ new_label\n"
 
186
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
187
                                            "+++ new_label\t\n"
181
188
                                            "@@ -0,0 +1,1 @@\n"
182
189
                                            "+foo\n"
183
190
                                            "\n")
188
195
                          "/dev/null", self.tree_1, 
189
196
                          "new_label", self.file_2, self.tree_2,
190
197
                          output)
191
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
192
 
                                            "+++ new_label\n"
 
198
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
199
                                            "+++ new_label\t\n"
193
200
                                            "@@ -1,1 +1,1 @@\n"
194
201
                                            "-foo\n"
195
202
                                            "+bar\n"
196
203
                                            "\n")
197
204
        
 
205
    def test_file_diff_binary(self):
 
206
        output = StringIO()
 
207
        self.file_1.diff(internal_diff, 
 
208
                          "/dev/null", self.tree_1, 
 
209
                          "new_label", self.file_2b, self.tree_2,
 
210
                          output)
 
211
        self.assertEqual(output.getvalue(), 
 
212
                         "Binary files /dev/null and new_label differ\n")
198
213
    def test_link_diff_deleted(self):
199
214
        if not has_symlinks():
200
215
            return
229
244
                         "=== target changed 'target1' => 'target2'\n")
230
245
 
231
246
 
232
 
class TestSnapshot(TestCaseInTempDir):
 
247
class TestSnapshot(TestCaseWithTransport):
233
248
 
234
249
    def setUp(self):
235
250
        # for full testing we'll need a branch
239
254
        # to change, and then test merge patterns
240
255
        # with fake parent entries.
241
256
        super(TestSnapshot, self).setUp()
242
 
        self.branch = Branch.initialize('.')
243
 
        self.build_tree(['subdir/', 'subdir/file'])
244
 
        self.branch.add(['subdir', 'subdir/file'], ['dirid', 'fileid'])
 
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'],
 
261
                                       ['dirid', 'fileid'])
245
262
        if has_symlinks():
246
263
            pass
247
 
        self.branch.commit('message_1', rev_id = '1')
248
 
        self.tree_1 = self.branch.revision_tree('1')
249
 
        self.inv_1 = self.branch.get_inventory('1')
 
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')
250
267
        self.file_1 = self.inv_1['fileid']
251
 
        self.work_tree = self.branch.working_tree()
252
 
        self.file_active = self.work_tree.inventory['fileid']
 
268
        self.file_active = self.wt.inventory['fileid']
253
269
 
254
270
    def test_snapshot_new_revision(self):
255
271
        # This tests that a simple commit with no parents makes a new
256
272
        # revision value in the inventory entry
257
 
        self.file_active.snapshot('2', 'subdir/file', {}, self.work_tree, 
258
 
                                  self.branch.weave_store,
 
273
        self.file_active.snapshot('2', 'subdir/file', {}, self.wt, 
 
274
                                  self.branch.repository.weave_store,
259
275
                                  self.branch.get_transaction())
260
276
        # expected outcome - file_1 has a revision id of '2', and we can get
261
277
        # its text of 'file contents' out of the weave.
262
278
        self.assertEqual(self.file_1.revision, '1')
263
279
        self.assertEqual(self.file_active.revision, '2')
264
280
        # this should be a separate test probably, but lets check it once..
265
 
        lines = self.branch.weave_store.get_lines('fileid','2',
266
 
            self.branch.get_transaction())
 
281
        lines = self.branch.repository.weave_store.get_weave(
 
282
            'fileid', 
 
283
            self.branch.get_transaction()).get_lines('2')
267
284
        self.assertEqual(lines, ['contents of subdir/file\n'])
268
285
 
269
286
    def test_snapshot_unchanged(self):
270
287
        #This tests that a simple commit does not make a new entry for
271
288
        # an unchanged inventory entry
272
289
        self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
273
 
                                  self.work_tree, self.branch.weave_store,
 
290
                                  self.wt, 
 
291
                                  self.branch.repository.weave_store,
274
292
                                  self.branch.get_transaction())
275
293
        self.assertEqual(self.file_1.revision, '1')
276
294
        self.assertEqual(self.file_active.revision, '1')
277
 
        self.assertRaises(errors.WeaveError,
278
 
                          self.branch.weave_store.get_lines, 'fileid', '2',
279
 
                          self.branch.get_transaction())
 
295
        vf = self.branch.repository.weave_store.get_weave(
 
296
            'fileid', 
 
297
            self.branch.repository.get_transaction())
 
298
        self.assertRaises(errors.RevisionNotPresent,
 
299
                          vf.get_lines,
 
300
                          '2')
280
301
 
281
302
    def test_snapshot_merge_identical_different_revid(self):
282
303
        # This tests that a commit with two identical parents, one of which has
290
311
        self.assertEqual(self.file_1, other_ie)
291
312
        other_ie.revision = 'other'
292
313
        self.assertNotEqual(self.file_1, other_ie)
293
 
        self.branch.weave_store.add_identical_text('fileid', '1', 'other', ['1'],
294
 
            self.branch.get_transaction())
 
314
        versionfile = self.branch.repository.weave_store.get_weave(
 
315
            'fileid', self.branch.repository.get_transaction())
 
316
        versionfile.clone_text('other', '1', ['1'])
295
317
        self.file_active.snapshot('2', 'subdir/file', 
296
318
                                  {'1':self.file_1, 'other':other_ie},
297
 
                                  self.work_tree, self.branch.weave_store,
 
319
                                  self.wt, 
 
320
                                  self.branch.repository.weave_store,
298
321
                                  self.branch.get_transaction())
299
322
        self.assertEqual(self.file_active.revision, '2')
300
323
 
304
327
        self.file_active.name='newname'
305
328
        rename('subdir/file', 'subdir/newname')
306
329
        self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1}, 
307
 
                                  self.work_tree, 
308
 
                                  self.branch.weave_store,
 
330
                                  self.wt,
 
331
                                  self.branch.repository.weave_store,
309
332
                                  self.branch.get_transaction())
310
333
        # expected outcome - file_1 has a revision id of '2'
311
334
        self.assertEqual(self.file_active.revision, '2')
312
335
 
313
336
 
314
 
class TestPreviousHeads(TestCaseInTempDir):
 
337
class TestPreviousHeads(TestCaseWithTransport):
315
338
 
316
339
    def setUp(self):
317
340
        # we want several inventories, that respectively
323
346
        # D) fileid present in two inventories and one is
324
347
        #   a descendent of the other. (B, D)
325
348
        super(TestPreviousHeads, self).setUp()
 
349
        self.wt = self.make_branch_and_tree('.')
 
350
        self.branch = self.wt.branch
326
351
        self.build_tree(['file'])
327
 
        self.branch = Branch.initialize('.')
328
 
        self.branch.commit('new branch', allow_pointless=True, rev_id='A')
329
 
        self.inv_A = self.branch.get_inventory('A')
330
 
        self.branch.add(['file'], ['fileid'])
331
 
        self.branch.commit('add file', rev_id='B')
332
 
        self.inv_B = self.branch.get_inventory('B')
333
 
        self.branch.put_controlfile('revision-history', 'A\n')
 
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)
334
358
        self.assertEqual(self.branch.revision_history(), ['A'])
335
 
        self.branch.commit('another add of file', rev_id='C')
336
 
        self.inv_C = self.branch.get_inventory('C')
337
 
        self.branch.add_pending_merge('B')
338
 
        self.branch.commit('merge in B', rev_id='D')
339
 
        self.inv_D = self.branch.get_inventory('D')
340
 
        self.file_active = self.branch.working_tree().inventory['fileid']
341
 
        self.weave = self.branch.weave_store.get_weave('fileid',
342
 
            self.branch.get_transaction())
 
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())
343
367
        
344
368
    def get_previous_heads(self, inventories):
345
 
        return self.file_active.find_previous_heads(inventories, self.weave)
 
369
        return self.file_active.find_previous_heads(
 
370
            inventories, 
 
371
            self.branch.repository.weave_store,
 
372
            self.branch.repository.get_transaction())
346
373
        
347
374
    def test_fileid_in_no_inventory(self):
348
375
        self.assertEqual({}, self.get_previous_heads([self.inv_A]))
370
397
                         self.get_previous_heads([self.inv_D, self.inv_B]))
371
398
 
372
399
    # TODO: test two inventories with the same file revision 
 
400
 
 
401
 
 
402
class TestExecutable(TestCaseWithTransport):
 
403
 
 
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')
 
408
        b = wt.branch
 
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)
 
412
        tt.apply()
 
413
 
 
414
        self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
 
415
 
 
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()])
 
419
 
 
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")
 
422
 
 
423
        wt.commit('adding a,b', rev_id='r1')
 
424
 
 
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")
 
428
 
 
429
        self.failUnless(rev_tree.inventory[a_id].executable)
 
430
        self.failIf(rev_tree.inventory[b_id].executable)
 
431
 
 
432
        # Make sure the entries are gone
 
433
        os.remove('b1/a')
 
434
        os.remove('b1/b')
 
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'))
 
439
 
 
440
        # Make sure that revert is able to bring them back,
 
441
        # and sets 'a' back to being executable
 
442
 
 
443
        wt.revert(['a', 'b'], rev_tree, backups=False)
 
444
        self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
 
445
 
 
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")
 
448
 
 
449
        # Now remove them again, and make sure that after a
 
450
        # commit, they are still marked correctly
 
451
        os.remove('b1/a')
 
452
        os.remove('b1/b')
 
453
        wt.commit('removed', rev_id='r2')
 
454
 
 
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'))
 
460
 
 
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()])
 
464
 
 
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")
 
467
 
 
468
        # Now make sure that 'bzr branch' also preserves the
 
469
        # executable bit
 
470
        # TODO: Maybe this should be a blackbox test
 
471
        d2 = b.bzrdir.clone('b2', revision_id='r1')
 
472
        t2 = d2.open_workingtree()
 
473
        b2 = t2.branch
 
474
        self.assertEquals('r1', b2.last_revision())
 
475
 
 
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")
 
479
 
 
480
        # Make sure pull will delete the files
 
481
        t2.pull(b)
 
482
        self.assertEquals('r2', b2.last_revision())
 
483
        self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
 
484
 
 
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')
 
489
 
 
490
        t2.pull(b)
 
491
        self.assertEquals('r3', b2.last_revision())
 
492
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
 
493
 
 
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")
 
496
 
 
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')
 
502
        wt.add('a')
 
503
        self.assertEqual(len(wt.inventory), 2)
 
504
        os.unlink('b1/a')
 
505
        wt.revert([])
 
506
        self.assertEqual(len(wt.inventory), 1)
 
507
 
 
508