1
# Copyright (C) 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
from bzrlib import merge, tests, transform, workingtree
22
class TestRevert(tests.TestCaseWithTransport):
23
"""Ensure that revert behaves as expected"""
25
def test_revert_merged_dir(self):
26
"""Reverting a merge that adds a directory deletes the directory"""
27
source_tree = self.make_branch_and_tree('source')
28
source_tree.commit('empty tree')
29
target_tree = source_tree.bzrdir.sprout('target').open_workingtree()
30
self.build_tree(['source/dir/', 'source/dir/contents'])
31
source_tree.add(['dir', 'dir/contents'], ['dir-id', 'contents-id'])
32
source_tree.commit('added dir')
33
merge.merge_inner(target_tree.branch, source_tree.basis_tree(),
34
target_tree.basis_tree(), this_tree=target_tree)
35
self.failUnlessExists('target/dir')
36
self.failUnlessExists('target/dir/contents')
38
self.failIfExists('target/dir/contents')
39
self.failIfExists('target/dir')
41
def test_revert_new(self):
42
"""Only locally-changed new files should be preserved when reverting
44
When a file isn't present in revert's target tree:
45
If a file hasn't been committed, revert should unversion it, but not
47
If a file has local changes, revert should unversion it, but not
49
If a file has no changes from the last commit, revert should delete it.
50
If a file has changes due to a merge, revert should delete it.
52
tree = self.make_branch_and_tree('tree')
53
tree.commit('empty tree')
54
merge_target = tree.bzrdir.sprout('merge_target').open_workingtree()
55
self.build_tree(['tree/new_file'])
57
# newly-added files should not be deleted
59
basis_tree = tree.branch.repository.revision_tree(tree.last_revision())
61
self.failUnlessExists('tree/new_file')
63
# unchanged files should be deleted
65
tree.commit('add new_file')
66
tree.revert(old_tree=basis_tree)
67
self.failIfExists('tree/new_file')
69
# files should be deleted if their changes came from merges
70
merge_target.merge_from_branch(tree.branch)
71
self.failUnlessExists('merge_target/new_file')
73
self.failIfExists('merge_target/new_file')
75
# files should not be deleted if changed after a merge
76
merge_target.merge_from_branch(tree.branch)
77
self.failUnlessExists('merge_target/new_file')
78
self.build_tree_contents([('merge_target/new_file', 'new_contents')])
80
self.failUnlessExists('merge_target/new_file')
82
def tree_with_executable(self):
83
tree = self.make_branch_and_tree('tree')
84
tt = transform.TreeTransform(tree)
85
tt.new_file('newfile', tt.root, 'helooo!', 'newfile-id', True)
87
self.assertTrue(tree.is_executable('newfile-id'))
88
tree.commit('added newfile')
91
def test_preserve_execute(self):
92
tree = self.tree_with_executable()
93
tt = transform.TreeTransform(tree)
94
newfile = tt.trans_id_tree_file_id('newfile-id')
95
tt.delete_contents(newfile)
96
tt.create_file('Woooorld!', newfile)
98
tree = workingtree.WorkingTree.open('tree')
99
self.assertTrue(tree.is_executable('newfile-id'))
100
transform.revert(tree, tree.basis_tree(), None, backups=True)
101
self.assertEqual('helooo!', tree.get_file('newfile-id').read())
102
self.assertTrue(tree.is_executable('newfile-id'))
104
def test_revert_executable(self):
105
tree = self.tree_with_executable()
106
tt = transform.TreeTransform(tree)
107
newfile = tt.trans_id_tree_file_id('newfile-id')
108
tt.set_executability(False, newfile)
110
transform.revert(tree, tree.basis_tree(), None)
111
self.assertTrue(tree.is_executable('newfile-id'))
113
def test_revert_deletes_files_from_revert(self):
114
tree = self.make_branch_and_tree('.')
115
self.build_tree(['file'])
117
tree.commit('added file', rev_id='rev1')
119
tree.commit('removed file')
120
self.failIfExists('file')
121
tree.revert(old_tree=tree.branch.repository.revision_tree('rev1'))
122
self.failUnlessExists('file')
124
self.failIfExists('file')
125
self.assertEqual({}, tree.merge_modified())
127
def test_empty_deprecated(self):
128
tree = self.make_branch_and_tree('.')
129
self.build_tree(['file'])
131
self.callDeprecated(['Using [] to revert all files is deprecated'
132
' as of bzr 0.91. Please use None (the default) instead.'],
134
self.assertIs(None, tree.path2id('file'))
136
def test_revert_file_in_deleted_dir(self):
137
tree = self.make_branch_and_tree('.')
138
self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
139
tree.add(['dir', 'dir/file1', 'dir/file2'],
140
['dir-id', 'file1-id', 'file2-id'])
141
tree.commit("Added files")
142
os.unlink('dir/file1')
143
os.unlink('dir/file2')
145
tree.remove(['dir/', 'dir/file1', 'dir/file2'])
146
tree.revert(['dir/file1'])
147
self.failUnlessExists('dir/file1')
148
self.failIfExists('dir/file2')
149
self.assertEqual('dir-id', tree.path2id('dir'))
added
removed
bzrlib/tests/test_revert.py
