1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
|
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import os
from bzrlib import merge, tests, transform, workingtree
class TestRevert(tests.TestCaseWithTransport):
"""Ensure that revert behaves as expected"""
def test_revert_merged_dir(self):
"""Reverting a merge that adds a directory deletes the directory"""
source_tree = self.make_branch_and_tree('source')
source_tree.commit('empty tree')
target_tree = source_tree.bzrdir.sprout('target').open_workingtree()
self.build_tree(['source/dir/', 'source/dir/contents'])
source_tree.add(['dir', 'dir/contents'], ['dir-id', 'contents-id'])
source_tree.commit('added dir')
target_tree.lock_write()
self.addCleanup(target_tree.unlock)
merge.merge_inner(target_tree.branch, source_tree.basis_tree(),
target_tree.basis_tree(), this_tree=target_tree)
self.assertPathExists('target/dir')
self.assertPathExists('target/dir/contents')
target_tree.revert()
self.assertPathDoesNotExist('target/dir/contents')
self.assertPathDoesNotExist('target/dir')
def test_revert_new(self):
"""Only locally-changed new files should be preserved when reverting
When a file isn't present in revert's target tree:
If a file hasn't been committed, revert should unversion it, but not
delete it.
If a file has local changes, revert should unversion it, but not
delete it.
If a file has no changes from the last commit, revert should delete it.
If a file has changes due to a merge, revert should delete it.
"""
tree = self.make_branch_and_tree('tree')
tree.commit('empty tree')
merge_target = tree.bzrdir.sprout('merge_target').open_workingtree()
self.build_tree(['tree/new_file'])
# newly-added files should not be deleted
tree.add('new_file')
basis_tree = tree.branch.repository.revision_tree(tree.last_revision())
tree.revert()
self.assertPathExists('tree/new_file')
# unchanged files should be deleted
tree.add('new_file')
tree.commit('add new_file')
tree.revert(old_tree=basis_tree)
self.assertPathDoesNotExist('tree/new_file')
# files should be deleted if their changes came from merges
merge_target.merge_from_branch(tree.branch)
self.assertPathExists('merge_target/new_file')
merge_target.revert()
self.assertPathDoesNotExist('merge_target/new_file')
# files should not be deleted if changed after a merge
merge_target.merge_from_branch(tree.branch)
self.assertPathExists('merge_target/new_file')
self.build_tree_contents([('merge_target/new_file', 'new_contents')])
merge_target.revert()
self.assertPathExists('merge_target/new_file')
def tree_with_executable(self):
tree = self.make_branch_and_tree('tree')
tt = transform.TreeTransform(tree)
tt.new_file('newfile', tt.root, 'helooo!', 'newfile-id', True)
tt.apply()
tree.lock_write()
try:
self.assertTrue(tree.is_executable('newfile-id'))
tree.commit('added newfile')
finally:
tree.unlock()
return tree
def test_preserve_execute(self):
tree = self.tree_with_executable()
tt = transform.TreeTransform(tree)
newfile = tt.trans_id_tree_file_id('newfile-id')
tt.delete_contents(newfile)
tt.create_file('Woooorld!', newfile)
tt.apply()
tree = workingtree.WorkingTree.open('tree')
tree.lock_write()
self.addCleanup(tree.unlock)
self.assertTrue(tree.is_executable('newfile-id'))
transform.revert(tree, tree.basis_tree(), None, backups=True)
self.assertEqual('helooo!', tree.get_file('newfile-id').read())
self.assertTrue(tree.is_executable('newfile-id'))
def test_revert_executable(self):
tree = self.tree_with_executable()
tt = transform.TreeTransform(tree)
newfile = tt.trans_id_tree_file_id('newfile-id')
tt.set_executability(False, newfile)
tt.apply()
tree.lock_write()
self.addCleanup(tree.unlock)
transform.revert(tree, tree.basis_tree(), None)
self.assertTrue(tree.is_executable('newfile-id'))
def test_revert_deletes_files_from_revert(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['file'])
tree.add('file')
tree.commit('added file', rev_id='rev1')
os.unlink('file')
tree.commit('removed file')
self.assertPathDoesNotExist('file')
tree.revert(old_tree=tree.branch.repository.revision_tree('rev1'))
self.assertPathExists('file')
tree.revert()
self.assertPathDoesNotExist('file')
self.assertEqual({}, tree.merge_modified())
def test_revert_file_in_deleted_dir(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
tree.add(['dir', 'dir/file1', 'dir/file2'],
['dir-id', 'file1-id', 'file2-id'])
tree.commit("Added files")
os.unlink('dir/file1')
os.unlink('dir/file2')
os.rmdir('dir')
tree.remove(['dir/', 'dir/file1', 'dir/file2'])
tree.revert(['dir/file1'])
self.assertPathExists('dir/file1')
self.assertPathDoesNotExist('dir/file2')
self.assertEqual('dir-id', tree.path2id('dir'))
def test_revert_root_id_change(self):
tree = self.make_branch_and_tree('.')
tree.set_root_id('initial-root-id')
self.build_tree(['file1'])
tree.add(['file1'])
tree.commit('first')
tree.set_root_id('temp-root-id')
self.assertEqual('temp-root-id', tree.get_root_id())
tree.revert()
self.assertEqual('initial-root-id', tree.get_root_id())
|