/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_unversion.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_unversion.py
61
61
        c_id = tree.path2id('c')
62
62
        # within a lock unversion should take effect
63
63
        tree.lock_write()
 
64
        self.assertTrue(tree.is_versioned('a'))
64
65
        tree.unversion(['a', 'b'])
 
66
        self.assertFalse(tree.is_versioned('a'))
65
67
        self.assertFalse(tree.has_id(a_id))
66
68
        self.assertFalse(tree.has_id(b_id))
67
69
        self.assertTrue(tree.has_id(c_id))
111
113
        b_id = tree.path2id('a/b')
112
114
        c_id = tree.path2id('a/c')
113
115
        d_id = tree.path2id('d')
114
 
        tree.lock_write()
115
 
        try:
 
116
        with tree.lock_write():
116
117
            tree.unversion(['a/b', 'a'])
117
118
            self.assertFalse(tree.has_id(a_id))
118
119
            self.assertFalse(tree.has_id(b_id))
123
124
            self.assertTrue(tree.has_filename('a/b'))
124
125
            self.assertTrue(tree.has_filename('a/c'))
125
126
            self.assertTrue(tree.has_filename('d'))
126
 
        finally:
127
 
            tree.unlock()
128
127
 
129
128
    def test_unversion_renamed(self):
130
129
        tree = self.make_branch_and_tree('a')