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
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
|
# Copyright (C) 2006, 2007 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tests for interface conformance of 'WorkingTree.move'"""
import os
from bzrlib import (
errors,
osutils,
)
from bzrlib.workingtree_4 import WorkingTreeFormat4
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
class TestMove(TestCaseWithWorkingTree):
def get_tree_layout(self, tree):
"""Get the (path, file_id) pairs for the current tree."""
tree.lock_read()
try:
return [(path, ie.file_id) for path, ie
in tree.iter_entries_by_dir()]
finally:
tree.unlock()
def assertTreeLayout(self, expected, tree):
"""Check that the tree has the correct layout."""
actual = self.get_tree_layout(tree)
self.assertEqual(expected, actual)
def test_move_correct_call_named(self):
"""tree.move has the deprecated parameter 'to_name'.
It has been replaced by 'to_dir' for consistency.
Test the new API using named parameter
"""
self.build_tree(['a1', 'sub1/'])
tree = self.make_branch_and_tree('.')
tree.add(['a1', 'sub1'])
tree.commit('initial commit')
tree.move(['a1'], to_dir='sub1', after=False)
def test_move_correct_call_unnamed(self):
"""tree.move has the deprecated parameter 'to_name'.
It has been replaced by 'to_dir' for consistency.
Test the new API using unnamed parameter
"""
self.build_tree(['a1', 'sub1/'])
tree = self.make_branch_and_tree('.')
tree.add(['a1', 'sub1'])
tree.commit('initial commit')
tree.move(['a1'], 'sub1', after=False)
def test_move_deprecated_wrong_call(self):
"""tree.move has the deprecated parameter 'to_name'.
It has been replaced by 'to_dir' for consistency.
Test the new API using wrong parameter
"""
self.build_tree(['a1', 'sub1/'])
tree = self.make_branch_and_tree('.')
tree.add(['a1', 'sub1'])
tree.commit('initial commit')
self.assertRaises(TypeError, tree.move, ['a1'],
to_this_parameter_does_not_exist='sub1',
after=False)
def test_move_deprecated_call(self):
"""tree.move has the deprecated parameter 'to_name'.
It has been replaced by 'to_dir' for consistency.
Test the new API using deprecated parameter
"""
self.build_tree(['a1', 'sub1/'])
tree = self.make_branch_and_tree('.')
tree.add(['a1', 'sub1'])
tree.commit('initial commit')
try:
self.callDeprecated(['The parameter to_name was deprecated'
' in version 0.13. Use to_dir instead'],
tree.move, ['a1'], to_name='sub1',
after=False)
except TypeError:
# WorkingTreeFormat4 doesn't have to maintain api compatibility
# since it was deprecated before the class was introduced.
if not isinstance(self.workingtree_format, WorkingTreeFormat4):
raise
def test_move_target_not_dir(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a'])
tree.add(['a'])
tree.commit('initial', rev_id='rev-1')
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['a'], 'not-a-dir')
def test_move_non_existent(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a/'])
tree.add(['a'])
tree.commit('initial', rev_id='rev-1')
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['not-a-file'], 'a')
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['not-a-file'], '')
def test_move_target_not_versioned(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a/', 'b'])
tree.add(['b'])
tree.commit('initial', rev_id='rev-1')
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['b'], 'a')
# TODO: jam 20070225 What about a test when the target is now a directory,
# but in the past it was a file. Theoretically WorkingTree should
# notice the kind change.
def test_move_unversioned(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a/', 'b'])
tree.add(['a'])
tree.commit('initial', rev_id='rev-1')
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['b'], 'a')
def test_move_multi_unversioned(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a/', 'b', 'c', 'd'])
tree.add(['a', 'c', 'd'], ['a-id', 'c-id', 'd-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['c', 'b', 'd'], 'a')
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['b', 'c', 'd'], 'a')
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['d', 'c', 'b'], 'a')
if osutils.lexists('a/c'):
# If 'c' was actually moved, then 'd' should have also been moved
self.assertTreeLayout([('', root_id), ('a', 'a-id'),
('a/c', 'c-id'), ('a/d', 'd-id')], tree)
else:
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('c', 'c-id'),
('d', 'd-id')], tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('c', 'c-id'),
('d', 'd-id')], tree.basis_tree())
def test_move_subdir(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a', 'b/', 'b/c'])
tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
('b/c', 'c-id')], tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
('b/c', 'c-id')], tree.basis_tree())
a_contents = tree.get_file_text('a-id')
tree.move(['a'], 'b')
self.assertTreeLayout([('', root_id), ('b', 'b-id'), ('b/a', 'a-id'),
('b/c', 'c-id')], tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
('b/c', 'c-id')], tree.basis_tree())
self.failIfExists('a')
self.assertFileEqual(a_contents, 'b/a')
def test_move_parent_dir(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a', 'b/', 'b/c'])
tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
c_contents = tree.get_file_text('c-id')
tree.move(['b/c'], '')
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
('c', 'c-id')], tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
('b/c', 'c-id')], tree.basis_tree())
self.failIfExists('b/c')
self.assertFileEqual(c_contents, 'c')
def test_move_fail_consistent(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a', 'b/', 'b/a', 'c'])
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
# Target already exists
self.assertRaises(errors.RenameFailedFilesExist,
tree.move, ['c', 'a'], 'b')
# 'c' may or may not have been moved, but either way the tree should
# maintain a consistent state.
if osutils.lexists('c'):
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
('c', 'c-id')], tree)
else:
self.failUnlessExists('b/c')
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
('b/c', 'c-id')], tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
('c', 'c-id')], tree.basis_tree())
def test_move_onto_self(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['b/', 'b/a'])
tree.add(['b', 'b/a'], ['b-id', 'a-id'])
tree.commit('initial', rev_id='rev-1')
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['b/a'], 'b')
def test_move_onto_self_root(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a'])
tree.add(['a'], ['a-id'])
tree.commit('initial', rev_id='rev-1')
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['a'], 'a')
def test_move_after(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a', 'b/'])
tree.add(['a', 'b'], ['a-id', 'b-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
os.rename('a', 'b/a')
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
tree)
# We don't need after=True as long as source is missing and target
# exists.
tree.move(['a'], 'b')
self.assertTreeLayout([('', root_id), ('b', 'b-id'), ('b/a', 'a-id')],
tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
tree.basis_tree())
def test_move_after_with_after(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a', 'b/'])
tree.add(['a', 'b'], ['a-id', 'b-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
os.rename('a', 'b/a')
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
tree)
# Passing after=True should work as well
tree.move(['a'], 'b', after=True)
self.assertTreeLayout([('', root_id), ('b', 'b-id'), ('b/a', 'a-id')],
tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
tree.basis_tree())
def test_move_after_no_target(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a', 'b/'])
tree.add(['a', 'b'], ['a-id', 'b-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
# Passing after when the file hasn't been move raises an exception
self.assertRaises(errors.BzrMoveFailedError,
tree.move, ['a'], 'b', after=True)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
tree.basis_tree())
def test_move_after_source_and_dest(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a', 'b/', 'b/a'])
tree.add(['a', 'b'], ['a-id', 'b-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
# TODO: jam 20070225 I would usually use 'rb', but assertFileEqual
# uses 'r'.
a_file = open('a', 'r')
try:
a_text = a_file.read()
finally:
a_file.close()
ba_file = open('b/a', 'r')
try:
ba_text = ba_file.read()
finally:
ba_file.close()
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
tree)
self.assertRaises(errors.RenameFailedFilesExist,
tree.move, ['a'], 'b', after=False)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
tree)
self.assertFileEqual(a_text, 'a')
self.assertFileEqual(ba_text, 'b/a')
# But you can pass after=True
tree.move(['a'], 'b', after=True)
self.assertTreeLayout([('', root_id), ('b', 'b-id'), ('b/a', 'a-id')],
tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
tree.basis_tree())
# But it shouldn't actually move anything
self.assertFileEqual(a_text, 'a')
self.assertFileEqual(ba_text, 'b/a')
def test_move_directory(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a/', 'a/b', 'a/c/', 'a/c/d', 'e/'])
tree.add(['a', 'a/b', 'a/c', 'a/c/d', 'e'],
['a-id', 'b-id', 'c-id', 'd-id', 'e-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
tree.move(['a'], 'e')
self.assertTreeLayout([('', root_id), ('e', 'e-id'), ('e/a', 'a-id'),
('e/a/b', 'b-id'), ('e/a/c', 'c-id'),
('e/a/c/d', 'd-id')], tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('e', 'e-id'),
('a/b', 'b-id'), ('a/c', 'c-id'),
('a/c/d', 'd-id')], tree.basis_tree())
def test_move_moved(self):
"""Moving a moved entry works as expected."""
tree = self.make_branch_and_tree('.')
self.build_tree(['a/', 'a/b', 'c/'])
tree.add(['a', 'a/b', 'c'], ['a-id', 'b-id', 'c-id'])
tree.commit('initial', rev_id='rev-1')
root_id = tree.get_root_id()
tree.move(['a/b'], 'c')
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('c', 'c-id'),
('c/b', 'b-id')], tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('c', 'c-id'),
('a/b', 'b-id')], tree.basis_tree())
tree.move(['c/b'], '')
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
('c', 'c-id')], tree)
self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('c', 'c-id'),
('a/b', 'b-id')], tree.basis_tree())
|