/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 bzrlib/tests/test_revert.py

  • Committer: John Arbash Meinel
  • Date: 2007-03-20 00:49:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2366.
  • Revision ID: john@arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
Simplify the test even further....
Basically, if you have a file deleted as removed, and then you unversion its directory
it deletes all records in the dirblock, not realizing that some of them might
already be marked as removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revert.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
18
17
 
19
18
from bzrlib import merge, tests, transform, workingtree
20
19
 
30
29
        self.build_tree(['source/dir/', 'source/dir/contents'])
31
30
        source_tree.add(['dir', 'dir/contents'], ['dir-id', 'contents-id'])
32
31
        source_tree.commit('added dir')
33
 
        target_tree.lock_write()
34
 
        self.addCleanup(target_tree.unlock)
35
 
        merge.merge_inner(target_tree.branch, source_tree.basis_tree(),
 
32
        merge.merge_inner(target_tree.branch, source_tree.basis_tree(), 
36
33
                          target_tree.basis_tree(), this_tree=target_tree)
37
34
        self.failUnlessExists('target/dir')
38
35
        self.failUnlessExists('target/dir/contents')
39
 
        target_tree.revert()
 
36
        target_tree.revert([])
40
37
        self.failIfExists('target/dir/contents')
41
38
        self.failIfExists('target/dir')
42
39
 
59
56
        # newly-added files should not be deleted
60
57
        tree.add('new_file')
61
58
        basis_tree = tree.branch.repository.revision_tree(tree.last_revision())
62
 
        tree.revert()
 
59
        tree.revert([])
63
60
        self.failUnlessExists('tree/new_file')
64
61
 
65
62
        # unchanged files should be deleted
66
63
        tree.add('new_file')
67
64
        tree.commit('add new_file')
68
 
        tree.revert(old_tree=basis_tree)
 
65
        tree.revert([], old_tree=basis_tree)
69
66
        self.failIfExists('tree/new_file')
70
 
 
 
67
        
71
68
        # files should be deleted if their changes came from merges
72
69
        merge_target.merge_from_branch(tree.branch)
73
70
        self.failUnlessExists('merge_target/new_file')
74
 
        merge_target.revert()
 
71
        merge_target.revert([])
75
72
        self.failIfExists('merge_target/new_file')
76
73
 
77
74
        # files should not be deleted if changed after a merge
78
75
        merge_target.merge_from_branch(tree.branch)
79
76
        self.failUnlessExists('merge_target/new_file')
80
77
        self.build_tree_contents([('merge_target/new_file', 'new_contents')])
81
 
        merge_target.revert()
 
78
        merge_target.revert([])
82
79
        self.failUnlessExists('merge_target/new_file')
83
80
 
84
81
    def tree_with_executable(self):
86
83
        tt = transform.TreeTransform(tree)
87
84
        tt.new_file('newfile', tt.root, 'helooo!', 'newfile-id', True)
88
85
        tt.apply()
89
 
        tree.lock_write()
90
 
        try:
91
 
            self.assertTrue(tree.is_executable('newfile-id'))
92
 
            tree.commit('added newfile')
93
 
        finally:
94
 
            tree.unlock()
 
86
        self.assertTrue(tree.is_executable('newfile-id'))
 
87
        tree.commit('added newfile')
95
88
        return tree
96
89
 
97
90
    def test_preserve_execute(self):
102
95
        tt.create_file('Woooorld!', newfile)
103
96
        tt.apply()
104
97
        tree = workingtree.WorkingTree.open('tree')
105
 
        tree.lock_write()
106
 
        self.addCleanup(tree.unlock)
107
98
        self.assertTrue(tree.is_executable('newfile-id'))
108
 
        transform.revert(tree, tree.basis_tree(), None, backups=True)
 
99
        transform.revert(tree, tree.basis_tree(), [], backups=True)
109
100
        self.assertEqual('helooo!', tree.get_file('newfile-id').read())
110
101
        self.assertTrue(tree.is_executable('newfile-id'))
111
102
 
115
106
        newfile = tt.trans_id_tree_file_id('newfile-id')
116
107
        tt.set_executability(False, newfile)
117
108
        tt.apply()
118
 
        tree.lock_write()
119
 
        self.addCleanup(tree.unlock)
120
 
        transform.revert(tree, tree.basis_tree(), None)
 
109
        transform.revert(tree, tree.basis_tree(), [])
121
110
        self.assertTrue(tree.is_executable('newfile-id'))
122
 
 
123
 
    def test_revert_deletes_files_from_revert(self):
124
 
        tree = self.make_branch_and_tree('.')
125
 
        self.build_tree(['file'])
126
 
        tree.add('file')
127
 
        tree.commit('added file', rev_id='rev1')
128
 
        os.unlink('file')
129
 
        tree.commit('removed file')
130
 
        self.failIfExists('file')
131
 
        tree.revert(old_tree=tree.branch.repository.revision_tree('rev1'))
132
 
        self.failUnlessExists('file')
133
 
        tree.revert()
134
 
        self.failIfExists('file')
135
 
        self.assertEqual({}, tree.merge_modified())
136
 
 
137
 
    def test_empty_deprecated(self):
138
 
        tree = self.make_branch_and_tree('.')
139
 
        self.build_tree(['file'])
140
 
        tree.add('file')
141
 
        self.callDeprecated(['Using [] to revert all files is deprecated'
142
 
            ' as of bzr 0.91.  Please use None (the default) instead.'],
143
 
            tree.revert, [])
144
 
        self.assertIs(None, tree.path2id('file'))
145
 
 
146
 
    def test_revert_file_in_deleted_dir(self):
147
 
        tree = self.make_branch_and_tree('.')
148
 
        self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
149
 
        tree.add(['dir', 'dir/file1', 'dir/file2'],
150
 
                 ['dir-id', 'file1-id', 'file2-id'])
151
 
        tree.commit("Added files")
152
 
        os.unlink('dir/file1')
153
 
        os.unlink('dir/file2')
154
 
        os.rmdir('dir')
155
 
        tree.remove(['dir/', 'dir/file1', 'dir/file2'])
156
 
        tree.revert(['dir/file1'])
157
 
        self.failUnlessExists('dir/file1')
158
 
        self.failIfExists('dir/file2')
159
 
        self.assertEqual('dir-id', tree.path2id('dir'))
160
 
 
161
 
    def test_revert_root_id_change(self):
162
 
        tree = self.make_branch_and_tree('.')
163
 
        tree.set_root_id('initial-root-id')
164
 
        self.build_tree(['file1'])
165
 
        tree.add(['file1'])
166
 
        tree.commit('first')
167
 
        tree.set_root_id('temp-root-id')
168
 
        self.assertEqual('temp-root-id', tree.get_root_id())
169
 
        tree.revert()
170
 
        self.assertEqual('initial-root-id', tree.get_root_id())