/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 breezy/tests/per_workingtree/test_commit.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-10-13 17:31:55 UTC
  • mfrom: (7397.4.9 remove-unused)
  • Revision ID: breezy.the.bot@gmail.com-20191013173155-yoiokny4mknxb3um
Remove Tree.has_id.

Merged from https://code.launchpad.net/~jelmer/brz/remove-unused/+merge/373320

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_commit.py
312
312
        # a present on disk. After commit b-id, c-id and d-id should be
313
313
        # missing from the inventory, within the same tree transaction.
314
314
        wt.commit('commit stuff')
315
 
        self.assertTrue(wt.has_id(a_id))
316
 
        self.assertFalse(wt.has_id(b_id))
317
 
        self.assertFalse(wt.has_id(c_id))
318
 
        self.assertFalse(wt.has_id(d_id))
319
315
        self.assertTrue(wt.has_filename('a'))
320
316
        self.assertFalse(wt.has_filename('b'))
321
317
        self.assertFalse(wt.has_filename('b/c'))
324
320
        # the changes should have persisted to disk - reopen the workingtree
325
321
        # to be sure.
326
322
        wt = wt.controldir.open_workingtree()
327
 
        wt.lock_read()
328
 
        self.assertTrue(wt.has_id(a_id))
329
 
        self.assertFalse(wt.has_id(b_id))
330
 
        self.assertFalse(wt.has_id(c_id))
331
 
        self.assertFalse(wt.has_id(d_id))
332
 
        self.assertTrue(wt.has_filename('a'))
333
 
        self.assertFalse(wt.has_filename('b'))
334
 
        self.assertFalse(wt.has_filename('b/c'))
335
 
        self.assertFalse(wt.has_filename('d'))
336
 
        wt.unlock()
 
323
        with wt.lock_read():
 
324
            self.assertTrue(wt.has_filename('a'))
 
325
            self.assertFalse(wt.has_filename('b'))
 
326
            self.assertFalse(wt.has_filename('b/c'))
 
327
            self.assertFalse(wt.has_filename('d'))
337
328
 
338
329
    def test_commit_deleted_subtree_with_removed(self):
339
330
        wt = self.make_branch_and_tree('.')
346
337
        wt.remove('b/c')
347
338
        this_dir = wt.controldir.root_transport
348
339
        this_dir.delete_tree('b')
349
 
        wt.lock_write()
350
 
        wt.commit('commit deleted rename')
351
 
        self.assertTrue(wt.is_versioned('a'))
352
 
        self.assertFalse(wt.has_id(b_id))
353
 
        self.assertFalse(wt.has_id(c_id))
354
 
        self.assertTrue(wt.has_filename('a'))
355
 
        self.assertFalse(wt.has_filename('b'))
356
 
        self.assertFalse(wt.has_filename('b/c'))
357
 
        wt.unlock()
 
340
        with wt.lock_write():
 
341
            wt.commit('commit deleted rename')
 
342
            self.assertTrue(wt.is_versioned('a'))
 
343
            self.assertTrue(wt.has_filename('a'))
 
344
            self.assertFalse(wt.has_filename('b'))
 
345
            self.assertFalse(wt.has_filename('b/c'))
358
346
 
359
347
    def test_commit_move_new(self):
360
348
        wt = self.make_branch_and_tree('first')