/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: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_unversion.py
32
32
        tree.unlock()
33
33
 
34
34
    def test_unversion_missing_file(self):
35
 
        """WT.unversion(['missing-id']) raises NoSuchId."""
 
35
        """WT.unversion(['missing']) raises NoSuchId."""
36
36
        tree = self.make_branch_and_tree('.')
37
 
        self.assertRaises(errors.NoSuchId, tree.unversion, ['missing-id'])
 
37
        self.assertRaises(errors.NoSuchFile, tree.unversion, ['missing'])
38
38
 
39
39
    def test_unversion_parent_and_child_renamed_bug_187207(self):
40
40
        # When unversioning dirstate trees show a bug in dealing with
47
47
        tree.commit('setup')
48
48
        tree.rename_one('del/sub', 'sub')
49
49
        self.assertEqual('sub/b', tree.id2path('b'))
50
 
        tree.unversion(['del', 'b'])
 
50
        tree.unversion(['del', 'sub/b'])
51
51
        self.assertRaises(errors.NoSuchId, tree.id2path, 'b')
52
52
 
53
53
    def test_unversion_several_files(self):
57
57
        tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
58
58
        # within a lock unversion should take effect
59
59
        tree.lock_write()
60
 
        tree.unversion(['a-id', 'b-id'])
 
60
        tree.unversion(['a', 'b'])
61
61
        self.assertFalse(tree.has_id('a-id'))
62
62
        self.assertFalse(tree.has_id('b-id'))
63
63
        self.assertTrue(tree.has_id('c-id'))
84
84
        tree.add(['a', 'a/b', 'c'], ['a-id', 'b-id', 'c-id'])
85
85
        # within a lock unversion should take effect
86
86
        tree.lock_write()
87
 
        tree.unversion(['a-id'])
 
87
        tree.unversion(['a'])
88
88
        self.assertFalse(tree.has_id('a-id'))
89
89
        self.assertFalse(tree.has_id('b-id'))
90
90
        self.assertTrue(tree.has_id('c-id'))
103
103
        tree.add(['a', 'a/b', 'a/c', 'd'], ['a-id', 'b-id', 'c-id', 'd-id'])
104
104
        tree.lock_write()
105
105
        try:
106
 
            tree.unversion(['b-id', 'a-id'])
 
106
            tree.unversion(['a/b', 'a'])
107
107
            self.assertFalse(tree.has_id('a-id'))
108
108
            self.assertFalse(tree.has_id('b-id'))
109
109
            self.assertFalse(tree.has_id('c-id'))
144
144
                          ('dir2/f3', 'f3-id'),
145
145
                         ], paths)
146
146
 
147
 
        tree.unversion({'dir-id'})
 
147
        tree.unversion({'dir'})
148
148
        paths = [(path, ie.file_id)
149
149
                 for path, ie in tree.iter_entries_by_dir()]
150
150
 
170
170
        self.build_tree(['B/xyz/'])
171
171
        tree_b.add(['xyz'], ['xyz-id'])
172
172
        tree_b.rename_one('a/m', 'xyz/m')
173
 
        tree_b.unversion(['a-id'])
 
173
        tree_b.unversion(['a'])
174
174
        tree_b.commit('delete in B')
175
175
 
176
176
        paths = [(path, ie.file_id)
196
196
                          ('a/n.OTHER', 'n-id'),
197
197
                          ('xyz/m', 'm-id'),
198
198
                         ], paths)
199
 
        tree_b.unversion(['a-id'])
 
199
        tree_b.unversion(['a'])
200
200
        paths = [(path, ie.file_id)
201
201
                 for path, ie in tree_b.iter_entries_by_dir()]
202
202
        self.assertEqual([('', root_id),