/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_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-16 19:38:39 UTC
  • mfrom: (6852.3.1 is-versioned)
  • Revision ID: jelmer@jelmer.uk-20180216193839-a0efzmp1o64g86ln
Merge lp:~jelmer/brz/is-versioned.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_workingtree.py
420
420
        self.assertFalse(cloned_transport.has('deleted'))
421
421
        self.assertTrue(cloned_transport.has('added'))
422
422
        self.assertFalse(cloned_transport.has('notadded'))
423
 
        self.assertIsNot(None, cloned.path2id('added'))
424
 
        self.assertEqual(None, cloned.path2id('deleted'))
425
 
        self.assertEqual(None, cloned.path2id('notadded'))
 
423
        self.assertTrue(cloned.is_versioned('added'))
 
424
        self.assertFalse(cloned.is_versioned('deleted'))
 
425
        self.assertFalse(cloned.is_versioned('notadded'))
426
426
 
427
427
    def test_basis_tree_returns_last_revision(self):
428
428
        wt = self.make_branch_and_tree('.')
687
687
        # merge_modified stores a map from file id to hash
688
688
        tree = self.make_branch_and_tree('tree')
689
689
        self.build_tree_contents([('tree/somefile', 'hello')])
690
 
        tree.lock_write()
691
 
        try:
 
690
        with tree.lock_write():
692
691
            tree.add(['somefile'])
693
692
            d = {tree.path2id('somefile'): osutils.sha_string('hello')}
694
693
            tree.set_merge_modified(d)
695
694
            mm = tree.merge_modified()
696
695
            self.assertEqual(mm, d)
697
 
        finally:
698
 
            tree.unlock()
699
696
        mm = tree.merge_modified()
700
697
        self.assertEqual(mm, d)
701
698
 
971
968
                          'nonexistant')
972
969
        self.build_tree(['file'])
973
970
        tree.add('file')
974
 
        file_id = tree.path2id('file')
975
971
        tree.commit('foo')
976
972
        tree.remove('file')
977
973
        self.assertRaises(errors.NoSuchFile, tree.get_file_sha1,