← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revert.py

  • Committer: Aaron Bentley
  • Date: 2007-06-11 14:59:52 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070611145952-cwt4480gphdhen6l
Get installation started

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
17
import os
18
18
 
30
30
        self.build_tree(['source/dir/', 'source/dir/contents'])
31
31
        source_tree.add(['dir', 'dir/contents'], ['dir-id', 'contents-id'])
32
32
        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(),
 
33
        merge.merge_inner(target_tree.branch, source_tree.basis_tree(), 
36
34
                          target_tree.basis_tree(), this_tree=target_tree)
37
 
        self.assertPathExists('target/dir')
38
 
        self.assertPathExists('target/dir/contents')
39
 
        target_tree.revert()
40
 
        self.assertPathDoesNotExist('target/dir/contents')
41
 
        self.assertPathDoesNotExist('target/dir')
 
35
        self.failUnlessExists('target/dir')
 
36
        self.failUnlessExists('target/dir/contents')
 
37
        target_tree.revert([])
 
38
        self.failIfExists('target/dir/contents')
 
39
        self.failIfExists('target/dir')
42
40
 
43
41
    def test_revert_new(self):
44
42
        """Only locally-changed new files should be preserved when reverting
59
57
        # newly-added files should not be deleted
60
58
        tree.add('new_file')
61
59
        basis_tree = tree.branch.repository.revision_tree(tree.last_revision())
62
 
        tree.revert()
63
 
        self.assertPathExists('tree/new_file')
 
60
        tree.revert([])
 
61
        self.failUnlessExists('tree/new_file')
64
62
 
65
63
        # unchanged files should be deleted
66
64
        tree.add('new_file')
67
65
        tree.commit('add new_file')
68
 
        tree.revert(old_tree=basis_tree)
69
 
        self.assertPathDoesNotExist('tree/new_file')
70
 
 
 
66
        tree.revert([], old_tree=basis_tree)
 
67
        self.failIfExists('tree/new_file')
 
68
        
71
69
        # files should be deleted if their changes came from merges
72
70
        merge_target.merge_from_branch(tree.branch)
73
 
        self.assertPathExists('merge_target/new_file')
74
 
        merge_target.revert()
75
 
        self.assertPathDoesNotExist('merge_target/new_file')
 
71
        self.failUnlessExists('merge_target/new_file')
 
72
        merge_target.revert([])
 
73
        self.failIfExists('merge_target/new_file')
76
74
 
77
75
        # files should not be deleted if changed after a merge
78
76
        merge_target.merge_from_branch(tree.branch)
79
 
        self.assertPathExists('merge_target/new_file')
 
77
        self.failUnlessExists('merge_target/new_file')
80
78
        self.build_tree_contents([('merge_target/new_file', 'new_contents')])
81
 
        merge_target.revert()
82
 
        self.assertPathExists('merge_target/new_file')
 
79
        merge_target.revert([])
 
80
        self.failUnlessExists('merge_target/new_file')
83
81
 
84
82
    def tree_with_executable(self):
85
83
        tree = self.make_branch_and_tree('tree')
86
84
        tt = transform.TreeTransform(tree)
87
85
        tt.new_file('newfile', tt.root, 'helooo!', 'newfile-id', True)
88
86
        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()
 
87
        self.assertTrue(tree.is_executable('newfile-id'))
 
88
        tree.commit('added newfile')
95
89
        return tree
96
90
 
97
91
    def test_preserve_execute(self):
102
96
        tt.create_file('Woooorld!', newfile)
103
97
        tt.apply()
104
98
        tree = workingtree.WorkingTree.open('tree')
105
 
        tree.lock_write()
106
 
        self.addCleanup(tree.unlock)
107
99
        self.assertTrue(tree.is_executable('newfile-id'))
108
 
        transform.revert(tree, tree.basis_tree(), None, backups=True)
 
100
        transform.revert(tree, tree.basis_tree(), [], backups=True)
109
101
        self.assertEqual('helooo!', tree.get_file('newfile-id').read())
110
102
        self.assertTrue(tree.is_executable('newfile-id'))
111
103
 
115
107
        newfile = tt.trans_id_tree_file_id('newfile-id')
116
108
        tt.set_executability(False, newfile)
117
109
        tt.apply()
118
 
        tree.lock_write()
119
 
        self.addCleanup(tree.unlock)
120
 
        transform.revert(tree, tree.basis_tree(), None)
 
110
        transform.revert(tree, tree.basis_tree(), [])
121
111
        self.assertTrue(tree.is_executable('newfile-id'))
122
112
 
123
113
    def test_revert_deletes_files_from_revert(self):
127
117
        tree.commit('added file', rev_id='rev1')
128
118
        os.unlink('file')
129
119
        tree.commit('removed file')
130
 
        self.assertPathDoesNotExist('file')
131
 
        tree.revert(old_tree=tree.branch.repository.revision_tree('rev1'))
132
 
        self.assertPathExists('file')
133
 
        tree.revert()
134
 
        self.assertPathDoesNotExist('file')
 
120
        self.failIfExists('file')
 
121
        tree.revert([], old_tree=tree.branch.repository.revision_tree('rev1'))
 
122
        self.failUnlessExists('file')
 
123
        tree.revert([])
 
124
        self.failIfExists('file')
135
125
        self.assertEqual({}, tree.merge_modified())
136
 
 
137
 
    def test_revert_file_in_deleted_dir(self):
138
 
        tree = self.make_branch_and_tree('.')
139
 
        self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
140
 
        tree.add(['dir', 'dir/file1', 'dir/file2'],
141
 
                 ['dir-id', 'file1-id', 'file2-id'])
142
 
        tree.commit("Added files")
143
 
        os.unlink('dir/file1')
144
 
        os.unlink('dir/file2')
145
 
        os.rmdir('dir')
146
 
        tree.remove(['dir/', 'dir/file1', 'dir/file2'])
147
 
        tree.revert(['dir/file1'])
148
 
        self.assertPathExists('dir/file1')
149
 
        self.assertPathDoesNotExist('dir/file2')
150
 
        self.assertEqual('dir-id', tree.path2id('dir'))
151
 
 
152
 
    def test_revert_root_id_change(self):
153
 
        tree = self.make_branch_and_tree('.')
154
 
        tree.set_root_id('initial-root-id')
155
 
        self.build_tree(['file1'])
156
 
        tree.add(['file1'])
157
 
        tree.commit('first')
158
 
        tree.set_root_id('temp-root-id')
159
 
        self.assertEqual('temp-root-id', tree.get_root_id())
160
 
        tree.revert()
161
 
        self.assertEqual('initial-root-id', tree.get_root_id())