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
17
"""Black-box tests for brz revert."""
17
"""Black-box tests for bzr revert."""
22
from breezy.tests import TestCaseWithTransport
23
from breezy.trace import mutter
24
from breezy.workingtree import WorkingTree
27
class TestRevert(TestCaseWithTransport):
21
from bzrlib.tests.blackbox import ExternalBase
22
from bzrlib.trace import mutter
25
class TestRevert(ExternalBase):
29
27
def _prepare_tree(self):
31
self.run_bzr('mkdir dir')
33
with open('dir/file', 'wb') as f:
35
self.run_bzr('add dir/file')
37
self.run_bzr('commit -m1')
29
self.runbzr('mkdir dir')
31
f = file('dir/file', 'wb')
34
self.runbzr('add dir/file')
36
self.runbzr('commit -m1')
40
with open('dir/file', 'wb') as f:
39
f = file('dir/file', 'wb')
44
self.assertEqual('modified:\n dir/file\n', self.run_bzr('status')[0])
46
def _prepare_rename_mod_tree(self):
47
self.build_tree(['a/', 'a/b', 'a/c', 'a/d/', 'a/d/e', 'f/', 'f/g',
51
self.run_bzr('commit -m 1')
52
wt = WorkingTree.open('.')
53
wt.rename_one('a/b', 'f/b')
54
wt.rename_one('a/d/e', 'f/e')
55
wt.rename_one('a/d', 'f/d')
56
wt.rename_one('f/g', 'a/g')
57
wt.rename_one('f/h', 'h')
58
wt.rename_one('f', 'j')
44
self.assertEquals('modified:\n dir/file\n', self.capture('status'))
60
46
def helper(self, param=''):
61
47
self._prepare_tree()
83
68
self._prepare_tree()
84
self.run_bzr('checkout --lightweight . ../sprach')
85
self.run_bzr('commit -m more')
69
self.runbzr('checkout --lightweight . ../sprach')
70
self.runbzr('commit -m more')
86
71
os.chdir('../sprach')
87
self.assertEqual('', self.run_bzr('status')[0])
88
self.run_bzr('revert')
89
self.assertEqual('', self.run_bzr('status')[0])
91
def test_revert_dirname(self):
92
"""Test that revert DIRECTORY does what's expected"""
93
self._prepare_rename_mod_tree()
94
self.run_bzr('revert a')
95
self.assertPathExists('a/b')
96
self.assertPathExists('a/d')
97
self.assertPathDoesNotExist('a/g')
99
"j is in the delta revert applies because j was renamed too",
100
self.assertPathExists, 'j')
101
self.assertPathExists('h')
102
self.run_bzr('revert f')
103
self.assertPathDoesNotExist('j')
104
self.assertPathDoesNotExist('h')
105
self.assertPathExists('a/d/e')
107
def test_revert_chatter(self):
108
self._prepare_rename_mod_tree()
109
chatter = self.run_bzr('revert')[1]
110
self.assertEqualDiff(
119
def test_revert(self):
122
with open('hello', 'wt') as f:
124
self.run_bzr('add hello')
125
self.run_bzr('commit -m setup hello')
127
with open('goodbye', 'wt') as f:
129
self.run_bzr('add goodbye')
130
self.run_bzr('commit -m setup goodbye')
132
with open('hello', 'wt') as f:
134
with open('goodbye', 'wt') as f:
136
self.run_bzr('revert hello')
137
self.check_file_contents('hello', b'foo')
138
self.check_file_contents('goodbye', b'qux')
139
self.run_bzr('revert')
140
self.check_file_contents('goodbye', b'baz')
142
os.mkdir('revertdir')
143
self.run_bzr('add revertdir')
144
self.run_bzr('commit -m f')
145
os.rmdir('revertdir')
146
self.run_bzr('revert')
148
if breezy.osutils.has_symlinks():
149
os.symlink('/unlikely/to/exist', 'symlink')
150
self.run_bzr('add symlink')
151
self.run_bzr('commit -m f')
153
self.run_bzr('revert')
154
self.assertPathExists('symlink')
156
os.symlink('a-different-path', 'symlink')
157
self.run_bzr('revert')
158
self.assertEqual('/unlikely/to/exist',
159
os.readlink('symlink'))
161
self.log("skipping revert symlink tests")
163
with open('hello', 'wt') as f:
165
self.run_bzr('commit -m xyz hello')
166
self.run_bzr('revert -r 1 hello')
167
self.check_file_contents('hello', b'foo')
168
self.run_bzr('revert hello')
169
self.check_file_contents('hello', b'xyz')
170
os.chdir('revertdir')
171
self.run_bzr('revert')
174
def test_revert_newly_added(self):
175
# this tests the UI reports reverting a newly added file
176
# correct (such files are not deleted)
177
tree = self.make_branch_and_tree('.')
178
self.build_tree(['file'])
180
out, err = self.run_bzr('revert')
181
self.assertEqual('', out)
182
self.assertEqual('- file\n', err)
184
def test_revert_removing_file(self):
185
# this tests the UI reports reverting a file which has been committed
186
# to a revision that did not have it, reports it as being deleted.
187
tree = self.make_branch_and_tree('.')
188
tree.commit('empty commit')
189
self.build_tree(['file'])
191
tree.commit('add file')
192
out, err = self.run_bzr('revert -r -2')
193
self.assertEqual('', out)
194
self.assertEqual('-D file\n', err)
196
def test_revert_forget_merges(self):
197
# revert --forget-merges removes any pending merges into the tree, but
198
# leaves the files unchanged
199
tree = self.make_branch_and_tree('.')
200
# forget-merges before first commit, though pointless, does not fail
201
self.run_bzr(['revert', '--forget-merges'])
202
self.build_tree(['file'])
203
first_rev_id = tree.commit('initial commit')
204
self.build_tree_contents([('file', b'new content')])
205
existing_parents = tree.get_parent_ids()
206
self.assertEqual([first_rev_id], existing_parents)
207
merged_parents = existing_parents + [b'merged-in-rev']
208
tree.set_parent_ids(merged_parents)
209
self.assertEqual(merged_parents, tree.get_parent_ids())
210
self.run_bzr(['revert', '--forget-merges'])
211
self.assertEqual([first_rev_id], tree.get_parent_ids())
212
# changed files are not reverted
213
self.assertFileEqual(b'new content', 'file')
214
# you can give it the path of a tree
215
self.run_bzr(['revert', '--forget-merges', tree.abspath('.')])
72
self.assertEqual('', self.capture('status'))
74
self.assertEqual('', self.capture('status'))