113
166
self.assertIs(self.wt.is_executable('my_pretties2'), False)
114
167
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
115
168
self.assertEqual(len(modified_paths), 3)
116
tree_mod_paths = [self.wt.id2abspath(f) for f in
169
tree_mod_paths = [self.wt.id2abspath(f) for f in
117
170
('ozzie', 'my_pretties', 'my_pretties2')]
118
171
self.assertSubset(tree_mod_paths, modified_paths)
119
172
# is it safe to finalize repeatedly?
120
173
transform.finalize()
121
174
transform.finalize()
176
def test_apply_informs_tree_of_observed_sha1(self):
177
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
178
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
181
orig = self.wt._observed_sha1
182
def _observed_sha1(*args):
185
self.wt._observed_sha1 = _observed_sha1
187
self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
190
def test_create_file_caches_sha1(self):
191
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
192
trans_id = trans.create_path('file1', root)
193
trans.create_file(contents, trans_id, sha1=sha1)
194
st_val = osutils.lstat(trans._limbo_name(trans_id))
195
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
196
self.assertEqual(o_sha1, sha1)
197
self.assertEqualStat(o_st_val, st_val)
199
def test__apply_insertions_updates_sha1(self):
200
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
201
trans_id = trans.create_path('file1', root)
202
trans.create_file(contents, trans_id, sha1=sha1)
203
st_val = osutils.lstat(trans._limbo_name(trans_id))
204
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
205
self.assertEqual(o_sha1, sha1)
206
self.assertEqualStat(o_st_val, st_val)
207
creation_mtime = trans._creation_mtime + 10.0
208
# We fake a time difference from when the file was created until now it
209
# is being renamed by using os.utime. Note that the change we actually
210
# want to see is the real ctime change from 'os.rename()', but as long
211
# as we observe a new stat value, we should be fine.
212
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
214
new_st_val = osutils.lstat(self.wt.abspath('file1'))
215
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
216
self.assertEqual(o_sha1, sha1)
217
self.assertEqualStat(o_st_val, new_st_val)
218
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
220
def test_new_file_caches_sha1(self):
221
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
222
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
224
st_val = osutils.lstat(trans._limbo_name(trans_id))
225
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
226
self.assertEqual(o_sha1, sha1)
227
self.assertEqualStat(o_st_val, st_val)
229
def test_cancel_creation_removes_observed_sha1(self):
230
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
231
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
233
self.assertTrue(trans_id in trans._observed_sha1s)
234
trans.cancel_creation(trans_id)
235
self.assertFalse(trans_id in trans._observed_sha1s)
237
def test_create_files_same_timestamp(self):
238
transform, root = self.get_transform()
239
self.wt.lock_tree_write()
240
self.addCleanup(self.wt.unlock)
241
# Roll back the clock, so that we know everything is being set to the
243
transform._creation_mtime = creation_mtime = time.time() - 20.0
244
transform.create_file('content-one',
245
transform.create_path('one', root))
246
time.sleep(1) # *ugly*
247
transform.create_file('content-two',
248
transform.create_path('two', root))
250
fo, st1 = self.wt.get_file_with_stat(None, path='one', filtered=False)
252
fo, st2 = self.wt.get_file_with_stat(None, path='two', filtered=False)
254
# We only guarantee 2s resolution
255
self.assertTrue(abs(creation_mtime - st1.st_mtime) < 2.0,
256
"%s != %s within 2 seconds" % (creation_mtime, st1.st_mtime))
257
# But if we have more than that, all files should get the same result
258
self.assertEqual(st1.st_mtime, st2.st_mtime)
260
def test_change_root_id(self):
261
transform, root = self.get_transform()
262
self.assertNotEqual('new-root-id', self.wt.get_root_id())
263
transform.new_directory('', ROOT_PARENT, 'new-root-id')
264
transform.delete_contents(root)
265
transform.unversion_file(root)
266
transform.fixup_new_roots()
268
self.assertEqual('new-root-id', self.wt.get_root_id())
270
def test_change_root_id_add_files(self):
271
transform, root = self.get_transform()
272
self.assertNotEqual('new-root-id', self.wt.get_root_id())
273
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
274
transform.new_file('file', new_trans_id, ['new-contents\n'],
276
transform.delete_contents(root)
277
transform.unversion_file(root)
278
transform.fixup_new_roots()
280
self.assertEqual('new-root-id', self.wt.get_root_id())
281
self.assertEqual('new-file-id', self.wt.path2id('file'))
282
self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
284
def test_add_two_roots(self):
285
transform, root = self.get_transform()
286
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
287
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
288
self.assertRaises(ValueError, transform.fixup_new_roots)
290
def test_retain_existing_root(self):
291
tt, root = self.get_transform()
293
tt.new_directory('', ROOT_PARENT, 'new-root-id')
295
self.assertNotEqual('new-root-id', tt.final_file_id(tt.root))
297
def test_retain_existing_root_added_file(self):
298
tt, root = self.get_transform()
299
new_trans_id = tt.new_directory('', ROOT_PARENT, 'new-root-id')
300
child = tt.new_directory('child', new_trans_id, 'child-id')
302
self.assertEqual(tt.root, tt.final_parent(child))
304
def test_add_unversioned_root(self):
305
transform, root = self.get_transform()
306
new_trans_id = transform.new_directory('', ROOT_PARENT, None)
307
transform.delete_contents(transform.root)
308
transform.fixup_new_roots()
309
self.assertNotIn(transform.root, transform._new_id)
311
def test_remove_root_fixup(self):
312
transform, root = self.get_transform()
313
old_root_id = self.wt.get_root_id()
314
self.assertNotEqual('new-root-id', old_root_id)
315
transform.delete_contents(root)
316
transform.unversion_file(root)
317
transform.fixup_new_roots()
319
self.assertEqual(old_root_id, self.wt.get_root_id())
321
transform, root = self.get_transform()
322
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
323
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
324
self.assertRaises(ValueError, transform.fixup_new_roots)
326
def test_fixup_new_roots_permits_empty_tree(self):
327
transform, root = self.get_transform()
328
transform.delete_contents(root)
329
transform.unversion_file(root)
330
transform.fixup_new_roots()
331
self.assertIs(None, transform.final_kind(root))
332
self.assertIs(None, transform.final_file_id(root))
334
def test_apply_retains_root_directory(self):
335
# Do not attempt to delete the physical root directory, because that
337
transform, root = self.get_transform()
339
transform.delete_contents(root)
340
e = self.assertRaises(AssertionError, self.assertRaises,
341
errors.TransformRenameFailed,
343
self.assertContainsRe('TransformRenameFailed not raised', str(e))
345
def test_apply_retains_file_id(self):
346
transform, root = self.get_transform()
347
old_root_id = transform.tree_file_id(root)
348
transform.unversion_file(root)
350
self.assertEqual(old_root_id, self.wt.get_root_id())
352
def test_hardlink(self):
353
self.requireFeature(HardlinkFeature)
354
transform, root = self.get_transform()
355
transform.new_file('file1', root, 'contents')
357
target = self.make_branch_and_tree('target')
358
target_transform = TreeTransform(target)
359
trans_id = target_transform.create_path('file1', target_transform.root)
360
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
361
target_transform.apply()
362
self.assertPathExists('target/file1')
363
source_stat = os.stat(self.wt.abspath('file1'))
364
target_stat = os.stat('target/file1')
365
self.assertEqual(source_stat, target_stat)
123
367
def test_convenience(self):
124
368
transform, root = self.get_transform()
125
trans_id = transform.new_file('name', root, 'contents',
369
self.wt.lock_tree_write()
370
self.addCleanup(self.wt.unlock)
371
trans_id = transform.new_file('name', root, 'contents',
126
372
'my_pretties', True)
127
373
oz = transform.new_directory('oz', root, 'oz-id')
128
374
dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
129
toto = transform.new_file('toto', dorothy, 'toto-contents',
375
toto = transform.new_file('toto', dorothy, 'toto-contents',
130
376
'toto-id', False)
132
378
self.assertEqual(len(transform.find_conflicts()), 0)
1318
2033
# children of non-root directories should not be renamed
1319
2034
self.assertEqual(2, transform_result.rename_count)
1322
class MockTransform(object):
1324
def has_named_child(self, by_parent, parent_id, name):
1325
for child_id in by_parent[parent_id]:
1329
elif name == "name.~%s~" % child_id:
1334
class MockEntry(object):
1336
object.__init__(self)
1339
class TestGetBackupName(TestCase):
1340
def test_get_backup_name(self):
2036
def create_ab_tree(self):
2037
"""Create a committed test tree with two files"""
2038
source = self.make_branch_and_tree('source')
2039
self.build_tree_contents([('source/file1', 'A')])
2040
self.build_tree_contents([('source/file2', 'B')])
2041
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
2042
source.commit('commit files')
2044
self.addCleanup(source.unlock)
2047
def test_build_tree_accelerator_tree(self):
2048
source = self.create_ab_tree()
2049
self.build_tree_contents([('source/file2', 'C')])
2051
real_source_get_file = source.get_file
2052
def get_file(file_id, path=None):
2053
calls.append(file_id)
2054
return real_source_get_file(file_id, path)
2055
source.get_file = get_file
2056
target = self.make_branch_and_tree('target')
2057
revision_tree = source.basis_tree()
2058
revision_tree.lock_read()
2059
self.addCleanup(revision_tree.unlock)
2060
build_tree(revision_tree, target, source)
2061
self.assertEqual(['file1-id'], calls)
2063
self.addCleanup(target.unlock)
2064
self.assertEqual([], list(target.iter_changes(revision_tree)))
2066
def test_build_tree_accelerator_tree_observes_sha1(self):
2067
source = self.create_ab_tree()
2068
sha1 = osutils.sha_string('A')
2069
target = self.make_branch_and_tree('target')
2071
self.addCleanup(target.unlock)
2072
state = target.current_dirstate()
2073
state._cutoff_time = time.time() + 60
2074
build_tree(source.basis_tree(), target, source)
2075
entry = state._get_entry(0, path_utf8='file1')
2076
self.assertEqual(sha1, entry[1][0][1])
2078
def test_build_tree_accelerator_tree_missing_file(self):
2079
source = self.create_ab_tree()
2080
os.unlink('source/file1')
2081
source.remove(['file2'])
2082
target = self.make_branch_and_tree('target')
2083
revision_tree = source.basis_tree()
2084
revision_tree.lock_read()
2085
self.addCleanup(revision_tree.unlock)
2086
build_tree(revision_tree, target, source)
2088
self.addCleanup(target.unlock)
2089
self.assertEqual([], list(target.iter_changes(revision_tree)))
2091
def test_build_tree_accelerator_wrong_kind(self):
2092
self.requireFeature(SymlinkFeature)
2093
source = self.make_branch_and_tree('source')
2094
self.build_tree_contents([('source/file1', '')])
2095
self.build_tree_contents([('source/file2', '')])
2096
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
2097
source.commit('commit files')
2098
os.unlink('source/file2')
2099
self.build_tree_contents([('source/file2/', 'C')])
2100
os.unlink('source/file1')
2101
os.symlink('file2', 'source/file1')
2103
real_source_get_file = source.get_file
2104
def get_file(file_id, path=None):
2105
calls.append(file_id)
2106
return real_source_get_file(file_id, path)
2107
source.get_file = get_file
2108
target = self.make_branch_and_tree('target')
2109
revision_tree = source.basis_tree()
2110
revision_tree.lock_read()
2111
self.addCleanup(revision_tree.unlock)
2112
build_tree(revision_tree, target, source)
2113
self.assertEqual([], calls)
2115
self.addCleanup(target.unlock)
2116
self.assertEqual([], list(target.iter_changes(revision_tree)))
2118
def test_build_tree_hardlink(self):
2119
self.requireFeature(HardlinkFeature)
2120
source = self.create_ab_tree()
2121
target = self.make_branch_and_tree('target')
2122
revision_tree = source.basis_tree()
2123
revision_tree.lock_read()
2124
self.addCleanup(revision_tree.unlock)
2125
build_tree(revision_tree, target, source, hardlink=True)
2127
self.addCleanup(target.unlock)
2128
self.assertEqual([], list(target.iter_changes(revision_tree)))
2129
source_stat = os.stat('source/file1')
2130
target_stat = os.stat('target/file1')
2131
self.assertEqual(source_stat, target_stat)
2133
# Explicitly disallowing hardlinks should prevent them.
2134
target2 = self.make_branch_and_tree('target2')
2135
build_tree(revision_tree, target2, source, hardlink=False)
2137
self.addCleanup(target2.unlock)
2138
self.assertEqual([], list(target2.iter_changes(revision_tree)))
2139
source_stat = os.stat('source/file1')
2140
target2_stat = os.stat('target2/file1')
2141
self.assertNotEqual(source_stat, target2_stat)
2143
def test_build_tree_accelerator_tree_moved(self):
2144
source = self.make_branch_and_tree('source')
2145
self.build_tree_contents([('source/file1', 'A')])
2146
source.add(['file1'], ['file1-id'])
2147
source.commit('commit files')
2148
source.rename_one('file1', 'file2')
2150
self.addCleanup(source.unlock)
2151
target = self.make_branch_and_tree('target')
2152
revision_tree = source.basis_tree()
2153
revision_tree.lock_read()
2154
self.addCleanup(revision_tree.unlock)
2155
build_tree(revision_tree, target, source)
2157
self.addCleanup(target.unlock)
2158
self.assertEqual([], list(target.iter_changes(revision_tree)))
2160
def test_build_tree_hardlinks_preserve_execute(self):
2161
self.requireFeature(HardlinkFeature)
2162
source = self.create_ab_tree()
2163
tt = TreeTransform(source)
2164
trans_id = tt.trans_id_tree_file_id('file1-id')
2165
tt.set_executability(True, trans_id)
2167
self.assertTrue(source.is_executable('file1-id'))
2168
target = self.make_branch_and_tree('target')
2169
revision_tree = source.basis_tree()
2170
revision_tree.lock_read()
2171
self.addCleanup(revision_tree.unlock)
2172
build_tree(revision_tree, target, source, hardlink=True)
2174
self.addCleanup(target.unlock)
2175
self.assertEqual([], list(target.iter_changes(revision_tree)))
2176
self.assertTrue(source.is_executable('file1-id'))
2178
def install_rot13_content_filter(self, pattern):
2180
# self.addCleanup(filters._reset_registry, filters._reset_registry())
2181
# below, but that looks a bit... hard to read even if it's exactly
2183
original_registry = filters._reset_registry()
2184
def restore_registry():
2185
filters._reset_registry(original_registry)
2186
self.addCleanup(restore_registry)
2187
def rot13(chunks, context=None):
2188
return [''.join(chunks).encode('rot13')]
2189
rot13filter = filters.ContentFilter(rot13, rot13)
2190
filters.register_filter_stack_map('rot13', {'yes': [rot13filter]}.get)
2191
os.mkdir(self.test_home_dir + '/.bazaar')
2192
rules_filename = self.test_home_dir + '/.bazaar/rules'
2193
f = open(rules_filename, 'wb')
2194
f.write('[name %s]\nrot13=yes\n' % (pattern,))
2196
def uninstall_rules():
2197
os.remove(rules_filename)
2199
self.addCleanup(uninstall_rules)
2202
def test_build_tree_content_filtered_files_are_not_hardlinked(self):
2203
"""build_tree will not hardlink files that have content filtering rules
2204
applied to them (but will still hardlink other files from the same tree
2207
self.requireFeature(HardlinkFeature)
2208
self.install_rot13_content_filter('file1')
2209
source = self.create_ab_tree()
2210
target = self.make_branch_and_tree('target')
2211
revision_tree = source.basis_tree()
2212
revision_tree.lock_read()
2213
self.addCleanup(revision_tree.unlock)
2214
build_tree(revision_tree, target, source, hardlink=True)
2216
self.addCleanup(target.unlock)
2217
self.assertEqual([], list(target.iter_changes(revision_tree)))
2218
source_stat = os.stat('source/file1')
2219
target_stat = os.stat('target/file1')
2220
self.assertNotEqual(source_stat, target_stat)
2221
source_stat = os.stat('source/file2')
2222
target_stat = os.stat('target/file2')
2223
self.assertEqualStat(source_stat, target_stat)
2225
def test_case_insensitive_build_tree_inventory(self):
2226
if (features.CaseInsensitiveFilesystemFeature.available()
2227
or features.CaseInsCasePresFilenameFeature.available()):
2228
raise tests.UnavailableFeature('Fully case sensitive filesystem')
2229
source = self.make_branch_and_tree('source')
2230
self.build_tree(['source/file', 'source/FILE'])
2231
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2232
source.commit('added files')
2233
# Don't try this at home, kids!
2234
# Force the tree to report that it is case insensitive
2235
target = self.make_branch_and_tree('target')
2236
target.case_sensitive = False
2237
build_tree(source.basis_tree(), target, source, delta_from_tree=True)
2238
self.assertEqual('file.moved', target.id2path('lower-id'))
2239
self.assertEqual('FILE', target.id2path('upper-id'))
2241
def test_build_tree_observes_sha(self):
2242
source = self.make_branch_and_tree('source')
2243
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2244
source.add(['file1', 'dir', 'dir/file2'],
2245
['file1-id', 'dir-id', 'file2-id'])
2246
source.commit('new files')
2247
target = self.make_branch_and_tree('target')
2249
self.addCleanup(target.unlock)
2250
# We make use of the fact that DirState caches its cutoff time. So we
2251
# set the 'safe' time to one minute in the future.
2252
state = target.current_dirstate()
2253
state._cutoff_time = time.time() + 60
2254
build_tree(source.basis_tree(), target)
2255
entry1_sha = osutils.sha_file_by_name('source/file1')
2256
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2257
# entry[1] is the state information, entry[1][0] is the state of the
2258
# working tree, entry[1][0][1] is the sha value for the current working
2260
entry1 = state._get_entry(0, path_utf8='file1')
2261
self.assertEqual(entry1_sha, entry1[1][0][1])
2262
# The 'size' field must also be set.
2263
self.assertEqual(25, entry1[1][0][2])
2264
entry1_state = entry1[1][0]
2265
entry2 = state._get_entry(0, path_utf8='dir/file2')
2266
self.assertEqual(entry2_sha, entry2[1][0][1])
2267
self.assertEqual(29, entry2[1][0][2])
2268
entry2_state = entry2[1][0]
2269
# Now, make sure that we don't have to re-read the content. The
2270
# packed_stat should match exactly.
2271
self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
2272
self.assertEqual(entry2_sha,
2273
target.get_file_sha1('file2-id', 'dir/file2'))
2274
self.assertEqual(entry1_state, entry1[1][0])
2275
self.assertEqual(entry2_state, entry2[1][0])
2278
class TestCommitTransform(tests.TestCaseWithTransport):
2280
def get_branch(self):
2281
tree = self.make_branch_and_tree('tree')
2283
self.addCleanup(tree.unlock)
2284
tree.commit('empty commit')
2287
def get_branch_and_transform(self):
2288
branch = self.get_branch()
2289
tt = TransformPreview(branch.basis_tree())
2290
self.addCleanup(tt.finalize)
2293
def test_commit_wrong_basis(self):
2294
branch = self.get_branch()
2295
basis = branch.repository.revision_tree(
2296
_mod_revision.NULL_REVISION)
2297
tt = TransformPreview(basis)
2298
self.addCleanup(tt.finalize)
2299
e = self.assertRaises(ValueError, tt.commit, branch, '')
2300
self.assertEqual('TreeTransform not based on branch basis: null:',
2303
def test_empy_commit(self):
2304
branch, tt = self.get_branch_and_transform()
2305
rev = tt.commit(branch, 'my message')
2306
self.assertEqual(2, branch.revno())
2307
repo = branch.repository
2308
self.assertEqual('my message', repo.get_revision(rev).message)
2310
def test_merge_parents(self):
2311
branch, tt = self.get_branch_and_transform()
2312
rev = tt.commit(branch, 'my message', ['rev1b', 'rev1c'])
2313
self.assertEqual(['rev1b', 'rev1c'],
2314
branch.basis_tree().get_parent_ids()[1:])
2316
def test_first_commit(self):
2317
branch = self.make_branch('branch')
2319
self.addCleanup(branch.unlock)
2320
tt = TransformPreview(branch.basis_tree())
2321
self.addCleanup(tt.finalize)
2322
tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
2323
rev = tt.commit(branch, 'my message')
2324
self.assertEqual([], branch.basis_tree().get_parent_ids())
2325
self.assertNotEqual(_mod_revision.NULL_REVISION,
2326
branch.last_revision())
2328
def test_first_commit_with_merge_parents(self):
2329
branch = self.make_branch('branch')
2331
self.addCleanup(branch.unlock)
2332
tt = TransformPreview(branch.basis_tree())
2333
self.addCleanup(tt.finalize)
2334
e = self.assertRaises(ValueError, tt.commit, branch,
2335
'my message', ['rev1b-id'])
2336
self.assertEqual('Cannot supply merge parents for first commit.',
2338
self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
2340
def test_add_files(self):
2341
branch, tt = self.get_branch_and_transform()
2342
tt.new_file('file', tt.root, 'contents', 'file-id')
2343
trans_id = tt.new_directory('dir', tt.root, 'dir-id')
2344
if SymlinkFeature.available():
2345
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2346
rev = tt.commit(branch, 'message')
2347
tree = branch.basis_tree()
2348
self.assertEqual('file', tree.id2path('file-id'))
2349
self.assertEqual('contents', tree.get_file_text('file-id'))
2350
self.assertEqual('dir', tree.id2path('dir-id'))
2351
if SymlinkFeature.available():
2352
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2353
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2355
def test_add_unversioned(self):
2356
branch, tt = self.get_branch_and_transform()
2357
tt.new_file('file', tt.root, 'contents')
2358
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2359
'message', strict=True)
2361
def test_modify_strict(self):
2362
branch, tt = self.get_branch_and_transform()
2363
tt.new_file('file', tt.root, 'contents', 'file-id')
2364
tt.commit(branch, 'message', strict=True)
2365
tt = TransformPreview(branch.basis_tree())
2366
self.addCleanup(tt.finalize)
2367
trans_id = tt.trans_id_file_id('file-id')
2368
tt.delete_contents(trans_id)
2369
tt.create_file('contents', trans_id)
2370
tt.commit(branch, 'message', strict=True)
2372
def test_commit_malformed(self):
2373
"""Committing a malformed transform should raise an exception.
2375
In this case, we are adding a file without adding its parent.
2377
branch, tt = self.get_branch_and_transform()
2378
parent_id = tt.trans_id_file_id('parent-id')
2379
tt.new_file('file', parent_id, 'contents', 'file-id')
2380
self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2383
def test_commit_rich_revision_data(self):
2384
branch, tt = self.get_branch_and_transform()
2385
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2386
committer='me <me@example.com>',
2387
revprops={'foo': 'bar'}, revision_id='revid-1',
2388
authors=['Author1 <author1@example.com>',
2389
'Author2 <author2@example.com>',
2391
self.assertEqual('revid-1', rev_id)
2392
revision = branch.repository.get_revision(rev_id)
2393
self.assertEqual(1, revision.timestamp)
2394
self.assertEqual(43201, revision.timezone)
2395
self.assertEqual('me <me@example.com>', revision.committer)
2396
self.assertEqual(['Author1 <author1@example.com>',
2397
'Author2 <author2@example.com>'],
2398
revision.get_apparent_authors())
2399
del revision.properties['authors']
2400
self.assertEqual({'foo': 'bar',
2401
'branch-nick': 'tree'},
2402
revision.properties)
2404
def test_no_explicit_revprops(self):
2405
branch, tt = self.get_branch_and_transform()
2406
rev_id = tt.commit(branch, 'message', authors=[
2407
'Author1 <author1@example.com>',
2408
'Author2 <author2@example.com>', ])
2409
revision = branch.repository.get_revision(rev_id)
2410
self.assertEqual(['Author1 <author1@example.com>',
2411
'Author2 <author2@example.com>'],
2412
revision.get_apparent_authors())
2413
self.assertEqual('tree', revision.properties['branch-nick'])
2416
class TestBackupName(tests.TestCase):
2418
def test_deprecations(self):
2419
class MockTransform(object):
2421
def has_named_child(self, by_parent, parent_id, name):
2422
return name in by_parent.get(parent_id, [])
2424
class MockEntry(object):
2427
object.__init__(self)
1341
2430
tt = MockTransform()
1342
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
1343
self.assertEqual(name, 'name.~1~')
1344
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
1345
self.assertEqual(name, 'name.~2~')
1346
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
1347
self.assertEqual(name, 'name.~1~')
1348
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
1349
self.assertEqual(name, 'name.~1~')
1350
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
1351
self.assertEqual(name, 'name.~4~')
2431
name1 = self.applyDeprecated(
2432
symbol_versioning.deprecated_in((2, 3, 0)),
2433
transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
2434
self.assertEqual('name.~1~', name1)
2435
name2 = self.applyDeprecated(
2436
symbol_versioning.deprecated_in((2, 3, 0)),
2437
transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
2438
self.assertEqual('name.~2~', name2)
1354
2441
class TestFileMover(tests.TestCaseWithTransport):
1466
2553
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
1467
2554
self.assertRaises(Bogus, tt.apply,
1468
2555
_mover=self.ExceptionFileMover(bad_target='d'))
1469
self.failUnlessExists('a')
1470
self.failUnlessExists('a/b')
2556
self.assertPathExists('a')
2557
self.assertPathExists('a/b')
2560
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2561
"""Ensure treetransform creation errors can be safely cleaned up after"""
2563
def _override_globals_in_method(self, instance, method_name, globals):
2564
"""Replace method on instance with one with updated globals"""
2566
func = getattr(instance, method_name).im_func
2567
new_globals = dict(func.func_globals)
2568
new_globals.update(globals)
2569
new_func = types.FunctionType(func.func_code, new_globals,
2570
func.func_name, func.func_defaults)
2571
setattr(instance, method_name,
2572
types.MethodType(new_func, instance, instance.__class__))
2573
self.addCleanup(delattr, instance, method_name)
2576
def _fake_open_raises_before(name, mode):
2577
"""Like open() but raises before doing anything"""
2581
def _fake_open_raises_after(name, mode):
2582
"""Like open() but raises after creating file without returning"""
2583
open(name, mode).close()
2586
def create_transform_and_root_trans_id(self):
2587
"""Setup a transform creating a file in limbo"""
2588
tree = self.make_branch_and_tree('.')
2589
tt = TreeTransform(tree)
2590
return tt, tt.create_path("a", tt.root)
2592
def create_transform_and_subdir_trans_id(self):
2593
"""Setup a transform creating a directory containing a file in limbo"""
2594
tree = self.make_branch_and_tree('.')
2595
tt = TreeTransform(tree)
2596
d_trans_id = tt.create_path("d", tt.root)
2597
tt.create_directory(d_trans_id)
2598
f_trans_id = tt.create_path("a", d_trans_id)
2599
tt.adjust_path("a", d_trans_id, f_trans_id)
2600
return tt, f_trans_id
2602
def test_root_create_file_open_raises_before_creation(self):
2603
tt, trans_id = self.create_transform_and_root_trans_id()
2604
self._override_globals_in_method(tt, "create_file",
2605
{"open": self._fake_open_raises_before})
2606
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2607
path = tt._limbo_name(trans_id)
2608
self.assertPathDoesNotExist(path)
2610
self.assertPathDoesNotExist(tt._limbodir)
2612
def test_root_create_file_open_raises_after_creation(self):
2613
tt, trans_id = self.create_transform_and_root_trans_id()
2614
self._override_globals_in_method(tt, "create_file",
2615
{"open": self._fake_open_raises_after})
2616
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2617
path = tt._limbo_name(trans_id)
2618
self.assertPathExists(path)
2620
self.assertPathDoesNotExist(path)
2621
self.assertPathDoesNotExist(tt._limbodir)
2623
def test_subdir_create_file_open_raises_before_creation(self):
2624
tt, trans_id = self.create_transform_and_subdir_trans_id()
2625
self._override_globals_in_method(tt, "create_file",
2626
{"open": self._fake_open_raises_before})
2627
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2628
path = tt._limbo_name(trans_id)
2629
self.assertPathDoesNotExist(path)
2631
self.assertPathDoesNotExist(tt._limbodir)
2633
def test_subdir_create_file_open_raises_after_creation(self):
2634
tt, trans_id = self.create_transform_and_subdir_trans_id()
2635
self._override_globals_in_method(tt, "create_file",
2636
{"open": self._fake_open_raises_after})
2637
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2638
path = tt._limbo_name(trans_id)
2639
self.assertPathExists(path)
2641
self.assertPathDoesNotExist(path)
2642
self.assertPathDoesNotExist(tt._limbodir)
2644
def test_rename_in_limbo_rename_raises_after_rename(self):
2645
tt, trans_id = self.create_transform_and_root_trans_id()
2646
parent1 = tt.new_directory('parent1', tt.root)
2647
child1 = tt.new_file('child1', parent1, 'contents')
2648
parent2 = tt.new_directory('parent2', tt.root)
2650
class FakeOSModule(object):
2651
def rename(self, old, new):
2654
self._override_globals_in_method(tt, "_rename_in_limbo",
2655
{"os": FakeOSModule()})
2657
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2658
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2659
self.assertPathExists(path)
2661
self.assertPathDoesNotExist(path)
2662
self.assertPathDoesNotExist(tt._limbodir)
2664
def test_rename_in_limbo_rename_raises_before_rename(self):
2665
tt, trans_id = self.create_transform_and_root_trans_id()
2666
parent1 = tt.new_directory('parent1', tt.root)
2667
child1 = tt.new_file('child1', parent1, 'contents')
2668
parent2 = tt.new_directory('parent2', tt.root)
2670
class FakeOSModule(object):
2671
def rename(self, old, new):
2673
self._override_globals_in_method(tt, "_rename_in_limbo",
2674
{"os": FakeOSModule()})
2676
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2677
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2678
self.assertPathExists(path)
2680
self.assertPathDoesNotExist(path)
2681
self.assertPathDoesNotExist(tt._limbodir)
2684
class TestTransformMissingParent(tests.TestCaseWithTransport):
2686
def make_tt_with_versioned_dir(self):
2687
wt = self.make_branch_and_tree('.')
2688
self.build_tree(['dir/',])
2689
wt.add(['dir'], ['dir-id'])
2690
wt.commit('Create dir')
2691
tt = TreeTransform(wt)
2692
self.addCleanup(tt.finalize)
2695
def test_resolve_create_parent_for_versioned_file(self):
2696
wt, tt = self.make_tt_with_versioned_dir()
2697
dir_tid = tt.trans_id_tree_file_id('dir-id')
2698
file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
2699
tt.delete_contents(dir_tid)
2700
tt.unversion_file(dir_tid)
2701
conflicts = resolve_conflicts(tt)
2702
# one conflict for the missing directory, one for the unversioned
2704
self.assertLength(2, conflicts)
2706
def test_non_versioned_file_create_conflict(self):
2707
wt, tt = self.make_tt_with_versioned_dir()
2708
dir_tid = tt.trans_id_tree_file_id('dir-id')
2709
tt.new_file('file', dir_tid, 'Contents')
2710
tt.delete_contents(dir_tid)
2711
tt.unversion_file(dir_tid)
2712
conflicts = resolve_conflicts(tt)
2713
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2714
self.assertLength(1, conflicts)
2715
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2719
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2720
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2722
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2723
('', ''), ('directory', 'directory'), (False, False))
2726
class TestTransformPreview(tests.TestCaseWithTransport):
2728
def create_tree(self):
2729
tree = self.make_branch_and_tree('.')
2730
self.build_tree_contents([('a', 'content 1')])
2731
tree.set_root_id('TREE_ROOT')
2732
tree.add('a', 'a-id')
2733
tree.commit('rev1', rev_id='rev1')
2734
return tree.branch.repository.revision_tree('rev1')
2736
def get_empty_preview(self):
2737
repository = self.make_repository('repo')
2738
tree = repository.revision_tree(_mod_revision.NULL_REVISION)
2739
preview = TransformPreview(tree)
2740
self.addCleanup(preview.finalize)
2743
def test_transform_preview(self):
2744
revision_tree = self.create_tree()
2745
preview = TransformPreview(revision_tree)
2746
self.addCleanup(preview.finalize)
2748
def test_transform_preview_tree(self):
2749
revision_tree = self.create_tree()
2750
preview = TransformPreview(revision_tree)
2751
self.addCleanup(preview.finalize)
2752
preview.get_preview_tree()
2754
def test_transform_new_file(self):
2755
revision_tree = self.create_tree()
2756
preview = TransformPreview(revision_tree)
2757
self.addCleanup(preview.finalize)
2758
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2759
preview_tree = preview.get_preview_tree()
2760
self.assertEqual(preview_tree.kind('file2-id'), 'file')
2762
preview_tree.get_file('file2-id').read(), 'content B\n')
2764
def test_diff_preview_tree(self):
2765
revision_tree = self.create_tree()
2766
preview = TransformPreview(revision_tree)
2767
self.addCleanup(preview.finalize)
2768
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2769
preview_tree = preview.get_preview_tree()
2771
show_diff_trees(revision_tree, preview_tree, out)
2772
lines = out.getvalue().splitlines()
2773
self.assertEqual(lines[0], "=== added file 'file2'")
2774
# 3 lines of diff administrivia
2775
self.assertEqual(lines[4], "+content B")
2777
def test_transform_conflicts(self):
2778
revision_tree = self.create_tree()
2779
preview = TransformPreview(revision_tree)
2780
self.addCleanup(preview.finalize)
2781
preview.new_file('a', preview.root, 'content 2')
2782
resolve_conflicts(preview)
2783
trans_id = preview.trans_id_file_id('a-id')
2784
self.assertEqual('a.moved', preview.final_name(trans_id))
2786
def get_tree_and_preview_tree(self):
2787
revision_tree = self.create_tree()
2788
preview = TransformPreview(revision_tree)
2789
self.addCleanup(preview.finalize)
2790
a_trans_id = preview.trans_id_file_id('a-id')
2791
preview.delete_contents(a_trans_id)
2792
preview.create_file('b content', a_trans_id)
2793
preview_tree = preview.get_preview_tree()
2794
return revision_tree, preview_tree
2796
def test_iter_changes(self):
2797
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2798
root = revision_tree.inventory.root.file_id
2799
self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2800
(root, root), ('a', 'a'), ('file', 'file'),
2802
list(preview_tree.iter_changes(revision_tree)))
2804
def test_include_unchanged_succeeds(self):
2805
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2806
changes = preview_tree.iter_changes(revision_tree,
2807
include_unchanged=True)
2808
root = revision_tree.inventory.root.file_id
2810
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2812
def test_specific_files(self):
2813
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2814
changes = preview_tree.iter_changes(revision_tree,
2815
specific_files=[''])
2816
self.assertEqual([A_ENTRY], list(changes))
2818
def test_want_unversioned(self):
2819
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2820
changes = preview_tree.iter_changes(revision_tree,
2821
want_unversioned=True)
2822
self.assertEqual([A_ENTRY], list(changes))
2824
def test_ignore_extra_trees_no_specific_files(self):
2825
# extra_trees is harmless without specific_files, so we'll silently
2826
# accept it, even though we won't use it.
2827
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2828
preview_tree.iter_changes(revision_tree, extra_trees=[preview_tree])
2830
def test_ignore_require_versioned_no_specific_files(self):
2831
# require_versioned is meaningless without specific_files.
2832
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2833
preview_tree.iter_changes(revision_tree, require_versioned=False)
2835
def test_ignore_pb(self):
2836
# pb could be supported, but TT.iter_changes doesn't support it.
2837
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2838
preview_tree.iter_changes(revision_tree)
2840
def test_kind(self):
2841
revision_tree = self.create_tree()
2842
preview = TransformPreview(revision_tree)
2843
self.addCleanup(preview.finalize)
2844
preview.new_file('file', preview.root, 'contents', 'file-id')
2845
preview.new_directory('directory', preview.root, 'dir-id')
2846
preview_tree = preview.get_preview_tree()
2847
self.assertEqual('file', preview_tree.kind('file-id'))
2848
self.assertEqual('directory', preview_tree.kind('dir-id'))
2850
def test_get_file_mtime(self):
2851
preview = self.get_empty_preview()
2852
file_trans_id = preview.new_file('file', preview.root, 'contents',
2854
limbo_path = preview._limbo_name(file_trans_id)
2855
preview_tree = preview.get_preview_tree()
2856
self.assertEqual(os.stat(limbo_path).st_mtime,
2857
preview_tree.get_file_mtime('file-id'))
2859
def test_get_file_mtime_renamed(self):
2860
work_tree = self.make_branch_and_tree('tree')
2861
self.build_tree(['tree/file'])
2862
work_tree.add('file', 'file-id')
2863
preview = TransformPreview(work_tree)
2864
self.addCleanup(preview.finalize)
2865
file_trans_id = preview.trans_id_tree_file_id('file-id')
2866
preview.adjust_path('renamed', preview.root, file_trans_id)
2867
preview_tree = preview.get_preview_tree()
2868
preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2869
work_mtime = work_tree.get_file_mtime('file-id', 'file')
2871
def test_get_file_size(self):
2872
work_tree = self.make_branch_and_tree('tree')
2873
self.build_tree_contents([('tree/old', 'old')])
2874
work_tree.add('old', 'old-id')
2875
preview = TransformPreview(work_tree)
2876
self.addCleanup(preview.finalize)
2877
new_id = preview.new_file('name', preview.root, 'contents', 'new-id',
2879
tree = preview.get_preview_tree()
2880
self.assertEqual(len('old'), tree.get_file_size('old-id'))
2881
self.assertEqual(len('contents'), tree.get_file_size('new-id'))
2883
def test_get_file(self):
2884
preview = self.get_empty_preview()
2885
preview.new_file('file', preview.root, 'contents', 'file-id')
2886
preview_tree = preview.get_preview_tree()
2887
tree_file = preview_tree.get_file('file-id')
2889
self.assertEqual('contents', tree_file.read())
2893
def test_get_symlink_target(self):
2894
self.requireFeature(SymlinkFeature)
2895
preview = self.get_empty_preview()
2896
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2897
preview_tree = preview.get_preview_tree()
2898
self.assertEqual('target',
2899
preview_tree.get_symlink_target('symlink-id'))
2901
def test_all_file_ids(self):
2902
tree = self.make_branch_and_tree('tree')
2903
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2904
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2905
preview = TransformPreview(tree)
2906
self.addCleanup(preview.finalize)
2907
preview.unversion_file(preview.trans_id_file_id('b-id'))
2908
c_trans_id = preview.trans_id_file_id('c-id')
2909
preview.unversion_file(c_trans_id)
2910
preview.version_file('c-id', c_trans_id)
2911
preview_tree = preview.get_preview_tree()
2912
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2913
preview_tree.all_file_ids())
2915
def test_path2id_deleted_unchanged(self):
2916
tree = self.make_branch_and_tree('tree')
2917
self.build_tree(['tree/unchanged', 'tree/deleted'])
2918
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2919
preview = TransformPreview(tree)
2920
self.addCleanup(preview.finalize)
2921
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2922
preview_tree = preview.get_preview_tree()
2923
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2924
self.assertIs(None, preview_tree.path2id('deleted'))
2926
def test_path2id_created(self):
2927
tree = self.make_branch_and_tree('tree')
2928
self.build_tree(['tree/unchanged'])
2929
tree.add(['unchanged'], ['unchanged-id'])
2930
preview = TransformPreview(tree)
2931
self.addCleanup(preview.finalize)
2932
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2933
'contents', 'new-id')
2934
preview_tree = preview.get_preview_tree()
2935
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2937
def test_path2id_moved(self):
2938
tree = self.make_branch_and_tree('tree')
2939
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2940
tree.add(['old_parent', 'old_parent/child'],
2941
['old_parent-id', 'child-id'])
2942
preview = TransformPreview(tree)
2943
self.addCleanup(preview.finalize)
2944
new_parent = preview.new_directory('new_parent', preview.root,
2946
preview.adjust_path('child', new_parent,
2947
preview.trans_id_file_id('child-id'))
2948
preview_tree = preview.get_preview_tree()
2949
self.assertIs(None, preview_tree.path2id('old_parent/child'))
2950
self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
2952
def test_path2id_renamed_parent(self):
2953
tree = self.make_branch_and_tree('tree')
2954
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2955
tree.add(['old_name', 'old_name/child'],
2956
['parent-id', 'child-id'])
2957
preview = TransformPreview(tree)
2958
self.addCleanup(preview.finalize)
2959
preview.adjust_path('new_name', preview.root,
2960
preview.trans_id_file_id('parent-id'))
2961
preview_tree = preview.get_preview_tree()
2962
self.assertIs(None, preview_tree.path2id('old_name/child'))
2963
self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
2965
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2966
preview_tree = tt.get_preview_tree()
2967
preview_result = list(preview_tree.iter_entries_by_dir(
2971
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
2972
self.assertEqual(actual_result, preview_result)
2974
def test_iter_entries_by_dir_new(self):
2975
tree = self.make_branch_and_tree('tree')
2976
tt = TreeTransform(tree)
2977
tt.new_file('new', tt.root, 'contents', 'new-id')
2978
self.assertMatchingIterEntries(tt)
2980
def test_iter_entries_by_dir_deleted(self):
2981
tree = self.make_branch_and_tree('tree')
2982
self.build_tree(['tree/deleted'])
2983
tree.add('deleted', 'deleted-id')
2984
tt = TreeTransform(tree)
2985
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
2986
self.assertMatchingIterEntries(tt)
2988
def test_iter_entries_by_dir_unversioned(self):
2989
tree = self.make_branch_and_tree('tree')
2990
self.build_tree(['tree/removed'])
2991
tree.add('removed', 'removed-id')
2992
tt = TreeTransform(tree)
2993
tt.unversion_file(tt.trans_id_file_id('removed-id'))
2994
self.assertMatchingIterEntries(tt)
2996
def test_iter_entries_by_dir_moved(self):
2997
tree = self.make_branch_and_tree('tree')
2998
self.build_tree(['tree/moved', 'tree/new_parent/'])
2999
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
3000
tt = TreeTransform(tree)
3001
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
3002
tt.trans_id_file_id('moved-id'))
3003
self.assertMatchingIterEntries(tt)
3005
def test_iter_entries_by_dir_specific_file_ids(self):
3006
tree = self.make_branch_and_tree('tree')
3007
tree.set_root_id('tree-root-id')
3008
self.build_tree(['tree/parent/', 'tree/parent/child'])
3009
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
3010
tt = TreeTransform(tree)
3011
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
3013
def test_symlink_content_summary(self):
3014
self.requireFeature(SymlinkFeature)
3015
preview = self.get_empty_preview()
3016
preview.new_symlink('path', preview.root, 'target', 'path-id')
3017
summary = preview.get_preview_tree().path_content_summary('path')
3018
self.assertEqual(('symlink', None, None, 'target'), summary)
3020
def test_missing_content_summary(self):
3021
preview = self.get_empty_preview()
3022
summary = preview.get_preview_tree().path_content_summary('path')
3023
self.assertEqual(('missing', None, None, None), summary)
3025
def test_deleted_content_summary(self):
3026
tree = self.make_branch_and_tree('tree')
3027
self.build_tree(['tree/path/'])
3029
preview = TransformPreview(tree)
3030
self.addCleanup(preview.finalize)
3031
preview.delete_contents(preview.trans_id_tree_path('path'))
3032
summary = preview.get_preview_tree().path_content_summary('path')
3033
self.assertEqual(('missing', None, None, None), summary)
3035
def test_file_content_summary_executable(self):
3036
preview = self.get_empty_preview()
3037
path_id = preview.new_file('path', preview.root, 'contents', 'path-id')
3038
preview.set_executability(True, path_id)
3039
summary = preview.get_preview_tree().path_content_summary('path')
3040
self.assertEqual(4, len(summary))
3041
self.assertEqual('file', summary[0])
3042
# size must be known
3043
self.assertEqual(len('contents'), summary[1])
3045
self.assertEqual(True, summary[2])
3046
# will not have hash (not cheap to determine)
3047
self.assertIs(None, summary[3])
3049
def test_change_executability(self):
3050
tree = self.make_branch_and_tree('tree')
3051
self.build_tree(['tree/path'])
3053
preview = TransformPreview(tree)
3054
self.addCleanup(preview.finalize)
3055
path_id = preview.trans_id_tree_path('path')
3056
preview.set_executability(True, path_id)
3057
summary = preview.get_preview_tree().path_content_summary('path')
3058
self.assertEqual(True, summary[2])
3060
def test_file_content_summary_non_exec(self):
3061
preview = self.get_empty_preview()
3062
preview.new_file('path', preview.root, 'contents', 'path-id')
3063
summary = preview.get_preview_tree().path_content_summary('path')
3064
self.assertEqual(4, len(summary))
3065
self.assertEqual('file', summary[0])
3066
# size must be known
3067
self.assertEqual(len('contents'), summary[1])
3069
self.assertEqual(False, summary[2])
3070
# will not have hash (not cheap to determine)
3071
self.assertIs(None, summary[3])
3073
def test_dir_content_summary(self):
3074
preview = self.get_empty_preview()
3075
preview.new_directory('path', preview.root, 'path-id')
3076
summary = preview.get_preview_tree().path_content_summary('path')
3077
self.assertEqual(('directory', None, None, None), summary)
3079
def test_tree_content_summary(self):
3080
preview = self.get_empty_preview()
3081
path = preview.new_directory('path', preview.root, 'path-id')
3082
preview.set_tree_reference('rev-1', path)
3083
summary = preview.get_preview_tree().path_content_summary('path')
3084
self.assertEqual(4, len(summary))
3085
self.assertEqual('tree-reference', summary[0])
3087
def test_annotate(self):
3088
tree = self.make_branch_and_tree('tree')
3089
self.build_tree_contents([('tree/file', 'a\n')])
3090
tree.add('file', 'file-id')
3091
tree.commit('a', rev_id='one')
3092
self.build_tree_contents([('tree/file', 'a\nb\n')])
3093
preview = TransformPreview(tree)
3094
self.addCleanup(preview.finalize)
3095
file_trans_id = preview.trans_id_file_id('file-id')
3096
preview.delete_contents(file_trans_id)
3097
preview.create_file('a\nb\nc\n', file_trans_id)
3098
preview_tree = preview.get_preview_tree()
3104
annotation = preview_tree.annotate_iter('file-id', 'me:')
3105
self.assertEqual(expected, annotation)
3107
def test_annotate_missing(self):
3108
preview = self.get_empty_preview()
3109
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3110
preview_tree = preview.get_preview_tree()
3116
annotation = preview_tree.annotate_iter('file-id', 'me:')
3117
self.assertEqual(expected, annotation)
3119
def test_annotate_rename(self):
3120
tree = self.make_branch_and_tree('tree')
3121
self.build_tree_contents([('tree/file', 'a\n')])
3122
tree.add('file', 'file-id')
3123
tree.commit('a', rev_id='one')
3124
preview = TransformPreview(tree)
3125
self.addCleanup(preview.finalize)
3126
file_trans_id = preview.trans_id_file_id('file-id')
3127
preview.adjust_path('newname', preview.root, file_trans_id)
3128
preview_tree = preview.get_preview_tree()
3132
annotation = preview_tree.annotate_iter('file-id', 'me:')
3133
self.assertEqual(expected, annotation)
3135
def test_annotate_deleted(self):
3136
tree = self.make_branch_and_tree('tree')
3137
self.build_tree_contents([('tree/file', 'a\n')])
3138
tree.add('file', 'file-id')
3139
tree.commit('a', rev_id='one')
3140
self.build_tree_contents([('tree/file', 'a\nb\n')])
3141
preview = TransformPreview(tree)
3142
self.addCleanup(preview.finalize)
3143
file_trans_id = preview.trans_id_file_id('file-id')
3144
preview.delete_contents(file_trans_id)
3145
preview_tree = preview.get_preview_tree()
3146
annotation = preview_tree.annotate_iter('file-id', 'me:')
3147
self.assertIs(None, annotation)
3149
def test_stored_kind(self):
3150
preview = self.get_empty_preview()
3151
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3152
preview_tree = preview.get_preview_tree()
3153
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3155
def test_is_executable(self):
3156
preview = self.get_empty_preview()
3157
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3158
preview.set_executability(True, preview.trans_id_file_id('file-id'))
3159
preview_tree = preview.get_preview_tree()
3160
self.assertEqual(True, preview_tree.is_executable('file-id'))
3162
def test_get_set_parent_ids(self):
3163
revision_tree, preview_tree = self.get_tree_and_preview_tree()
3164
self.assertEqual([], preview_tree.get_parent_ids())
3165
preview_tree.set_parent_ids(['rev-1'])
3166
self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
3168
def test_plan_file_merge(self):
3169
work_a = self.make_branch_and_tree('wta')
3170
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3171
work_a.add('file', 'file-id')
3172
base_id = work_a.commit('base version')
3173
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3174
preview = TransformPreview(work_a)
3175
self.addCleanup(preview.finalize)
3176
trans_id = preview.trans_id_file_id('file-id')
3177
preview.delete_contents(trans_id)
3178
preview.create_file('b\nc\nd\ne\n', trans_id)
3179
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3180
tree_a = preview.get_preview_tree()
3181
tree_a.set_parent_ids([base_id])
3183
('killed-a', 'a\n'),
3184
('killed-b', 'b\n'),
3185
('unchanged', 'c\n'),
3186
('unchanged', 'd\n'),
3189
], list(tree_a.plan_file_merge('file-id', tree_b)))
3191
def test_plan_file_merge_revision_tree(self):
3192
work_a = self.make_branch_and_tree('wta')
3193
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3194
work_a.add('file', 'file-id')
3195
base_id = work_a.commit('base version')
3196
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3197
preview = TransformPreview(work_a.basis_tree())
3198
self.addCleanup(preview.finalize)
3199
trans_id = preview.trans_id_file_id('file-id')
3200
preview.delete_contents(trans_id)
3201
preview.create_file('b\nc\nd\ne\n', trans_id)
3202
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3203
tree_a = preview.get_preview_tree()
3204
tree_a.set_parent_ids([base_id])
3206
('killed-a', 'a\n'),
3207
('killed-b', 'b\n'),
3208
('unchanged', 'c\n'),
3209
('unchanged', 'd\n'),
3212
], list(tree_a.plan_file_merge('file-id', tree_b)))
3214
def test_walkdirs(self):
3215
preview = self.get_empty_preview()
3216
root = preview.new_directory('', ROOT_PARENT, 'tree-root')
3217
# FIXME: new_directory should mark root.
3218
preview.fixup_new_roots()
3219
preview_tree = preview.get_preview_tree()
3220
file_trans_id = preview.new_file('a', preview.root, 'contents',
3222
expected = [(('', 'tree-root'),
3223
[('a', 'a', 'file', None, 'a-id', 'file')])]
3224
self.assertEqual(expected, list(preview_tree.walkdirs()))
3226
def test_extras(self):
3227
work_tree = self.make_branch_and_tree('tree')
3228
self.build_tree(['tree/removed-file', 'tree/existing-file',
3229
'tree/not-removed-file'])
3230
work_tree.add(['removed-file', 'not-removed-file'])
3231
preview = TransformPreview(work_tree)
3232
self.addCleanup(preview.finalize)
3233
preview.new_file('new-file', preview.root, 'contents')
3234
preview.new_file('new-versioned-file', preview.root, 'contents',
3236
tree = preview.get_preview_tree()
3237
preview.unversion_file(preview.trans_id_tree_path('removed-file'))
3238
self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
3241
def test_merge_into_preview(self):
3242
work_tree = self.make_branch_and_tree('tree')
3243
self.build_tree_contents([('tree/file','b\n')])
3244
work_tree.add('file', 'file-id')
3245
work_tree.commit('first commit')
3246
child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
3247
self.build_tree_contents([('child/file','b\nc\n')])
3248
child_tree.commit('child commit')
3249
child_tree.lock_write()
3250
self.addCleanup(child_tree.unlock)
3251
work_tree.lock_write()
3252
self.addCleanup(work_tree.unlock)
3253
preview = TransformPreview(work_tree)
3254
self.addCleanup(preview.finalize)
3255
file_trans_id = preview.trans_id_file_id('file-id')
3256
preview.delete_contents(file_trans_id)
3257
preview.create_file('a\nb\n', file_trans_id)
3258
preview_tree = preview.get_preview_tree()
3259
merger = Merger.from_revision_ids(None, preview_tree,
3260
child_tree.branch.last_revision(),
3261
other_branch=child_tree.branch,
3262
tree_branch=work_tree.branch)
3263
merger.merge_type = Merge3Merger
3264
tt = merger.make_merger().make_preview_transform()
3265
self.addCleanup(tt.finalize)
3266
final_tree = tt.get_preview_tree()
3267
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3269
def test_merge_preview_into_workingtree(self):
3270
tree = self.make_branch_and_tree('tree')
3271
tree.set_root_id('TREE_ROOT')
3272
tt = TransformPreview(tree)
3273
self.addCleanup(tt.finalize)
3274
tt.new_file('name', tt.root, 'content', 'file-id')
3275
tree2 = self.make_branch_and_tree('tree2')
3276
tree2.set_root_id('TREE_ROOT')
3277
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3278
None, tree.basis_tree())
3279
merger.merge_type = Merge3Merger
3282
def test_merge_preview_into_workingtree_handles_conflicts(self):
3283
tree = self.make_branch_and_tree('tree')
3284
self.build_tree_contents([('tree/foo', 'bar')])
3285
tree.add('foo', 'foo-id')
3287
tt = TransformPreview(tree)
3288
self.addCleanup(tt.finalize)
3289
trans_id = tt.trans_id_file_id('foo-id')
3290
tt.delete_contents(trans_id)
3291
tt.create_file('baz', trans_id)
3292
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
3293
self.build_tree_contents([('tree2/foo', 'qux')])
3295
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3296
pb, tree.basis_tree())
3297
merger.merge_type = Merge3Merger
3300
def test_has_filename(self):
3301
wt = self.make_branch_and_tree('tree')
3302
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3303
tt = TransformPreview(wt)
3304
removed_id = tt.trans_id_tree_path('removed')
3305
tt.delete_contents(removed_id)
3306
tt.new_file('new', tt.root, 'contents')
3307
modified_id = tt.trans_id_tree_path('modified')
3308
tt.delete_contents(modified_id)
3309
tt.create_file('modified-contents', modified_id)
3310
self.addCleanup(tt.finalize)
3311
tree = tt.get_preview_tree()
3312
self.assertTrue(tree.has_filename('unmodified'))
3313
self.assertFalse(tree.has_filename('not-present'))
3314
self.assertFalse(tree.has_filename('removed'))
3315
self.assertTrue(tree.has_filename('new'))
3316
self.assertTrue(tree.has_filename('modified'))
3318
def test_is_executable(self):
3319
tree = self.make_branch_and_tree('tree')
3320
preview = TransformPreview(tree)
3321
self.addCleanup(preview.finalize)
3322
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3323
preview_tree = preview.get_preview_tree()
3324
self.assertEqual(False, preview_tree.is_executable('baz-id',
3326
self.assertEqual(False, preview_tree.is_executable('baz-id'))
3328
def test_commit_preview_tree(self):
3329
tree = self.make_branch_and_tree('tree')
3330
rev_id = tree.commit('rev1')
3331
tree.branch.lock_write()
3332
self.addCleanup(tree.branch.unlock)
3333
tt = TransformPreview(tree)
3334
tt.new_file('file', tt.root, 'contents', 'file_id')
3335
self.addCleanup(tt.finalize)
3336
preview = tt.get_preview_tree()
3337
preview.set_parent_ids([rev_id])
3338
builder = tree.branch.get_commit_builder([rev_id])
3339
list(builder.record_iter_changes(preview, rev_id, tt.iter_changes()))
3340
builder.finish_inventory()
3341
rev2_id = builder.commit('rev2')
3342
rev2_tree = tree.branch.repository.revision_tree(rev2_id)
3343
self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
3345
def test_ascii_limbo_paths(self):
3346
self.requireFeature(features.UnicodeFilenameFeature)
3347
branch = self.make_branch('any')
3348
tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
3349
tt = TransformPreview(tree)
3350
self.addCleanup(tt.finalize)
3351
foo_id = tt.new_directory('', ROOT_PARENT)
3352
bar_id = tt.new_file(u'\u1234bar', foo_id, 'contents')
3353
limbo_path = tt._limbo_name(bar_id)
3354
self.assertEqual(limbo_path.encode('ascii', 'replace'), limbo_path)
3357
class FakeSerializer(object):
3358
"""Serializer implementation that simply returns the input.
3360
The input is returned in the order used by pack.ContainerPushParser.
3363
def bytes_record(bytes, names):
3367
class TestSerializeTransform(tests.TestCaseWithTransport):
3369
_test_needs_features = [features.UnicodeFilenameFeature]
3371
def get_preview(self, tree=None):
3373
tree = self.make_branch_and_tree('tree')
3374
tt = TransformPreview(tree)
3375
self.addCleanup(tt.finalize)
3378
def assertSerializesTo(self, expected, tt):
3379
records = list(tt.serialize(FakeSerializer()))
3380
self.assertEqual(expected, records)
3383
def default_attribs():
3388
'_new_executability': {},
3390
'_tree_path_ids': {'': 'new-0'},
3392
'_removed_contents': [],
3393
'_non_present_ids': {},
3396
def make_records(self, attribs, contents):
3398
(((('attribs'),),), bencode.bencode(attribs))]
3399
records.extend([(((n, k),), c) for n, k, c in contents])
3402
def creation_records(self):
3403
attribs = self.default_attribs()
3404
attribs['_id_number'] = 3
3405
attribs['_new_name'] = {
3406
'new-1': u'foo\u1234'.encode('utf-8'), 'new-2': 'qux'}
3407
attribs['_new_id'] = {'new-1': 'baz', 'new-2': 'quxx'}
3408
attribs['_new_parent'] = {'new-1': 'new-0', 'new-2': 'new-0'}
3409
attribs['_new_executability'] = {'new-1': 1}
3411
('new-1', 'file', 'i 1\nbar\n'),
3412
('new-2', 'directory', ''),
3414
return self.make_records(attribs, contents)
3416
def test_serialize_creation(self):
3417
tt = self.get_preview()
3418
tt.new_file(u'foo\u1234', tt.root, 'bar', 'baz', True)
3419
tt.new_directory('qux', tt.root, 'quxx')
3420
self.assertSerializesTo(self.creation_records(), tt)
3422
def test_deserialize_creation(self):
3423
tt = self.get_preview()
3424
tt.deserialize(iter(self.creation_records()))
3425
self.assertEqual(3, tt._id_number)
3426
self.assertEqual({'new-1': u'foo\u1234',
3427
'new-2': 'qux'}, tt._new_name)
3428
self.assertEqual({'new-1': 'baz', 'new-2': 'quxx'}, tt._new_id)
3429
self.assertEqual({'new-1': tt.root, 'new-2': tt.root}, tt._new_parent)
3430
self.assertEqual({'baz': 'new-1', 'quxx': 'new-2'}, tt._r_new_id)
3431
self.assertEqual({'new-1': True}, tt._new_executability)
3432
self.assertEqual({'new-1': 'file',
3433
'new-2': 'directory'}, tt._new_contents)
3434
foo_limbo = open(tt._limbo_name('new-1'), 'rb')
3436
foo_content = foo_limbo.read()
3439
self.assertEqual('bar', foo_content)
3441
def symlink_creation_records(self):
3442
attribs = self.default_attribs()
3443
attribs['_id_number'] = 2
3444
attribs['_new_name'] = {'new-1': u'foo\u1234'.encode('utf-8')}
3445
attribs['_new_parent'] = {'new-1': 'new-0'}
3446
contents = [('new-1', 'symlink', u'bar\u1234'.encode('utf-8'))]
3447
return self.make_records(attribs, contents)
3449
def test_serialize_symlink_creation(self):
3450
self.requireFeature(features.SymlinkFeature)
3451
tt = self.get_preview()
3452
tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
3453
self.assertSerializesTo(self.symlink_creation_records(), tt)
3455
def test_deserialize_symlink_creation(self):
3456
self.requireFeature(features.SymlinkFeature)
3457
tt = self.get_preview()
3458
tt.deserialize(iter(self.symlink_creation_records()))
3459
abspath = tt._limbo_name('new-1')
3460
foo_content = osutils.readlink(abspath)
3461
self.assertEqual(u'bar\u1234', foo_content)
3463
def make_destruction_preview(self):
3464
tree = self.make_branch_and_tree('.')
3465
self.build_tree([u'foo\u1234', 'bar'])
3466
tree.add([u'foo\u1234', 'bar'], ['foo-id', 'bar-id'])
3467
return self.get_preview(tree)
3469
def destruction_records(self):
3470
attribs = self.default_attribs()
3471
attribs['_id_number'] = 3
3472
attribs['_removed_id'] = ['new-1']
3473
attribs['_removed_contents'] = ['new-2']
3474
attribs['_tree_path_ids'] = {
3476
u'foo\u1234'.encode('utf-8'): 'new-1',
3479
return self.make_records(attribs, [])
3481
def test_serialize_destruction(self):
3482
tt = self.make_destruction_preview()
3483
foo_trans_id = tt.trans_id_tree_file_id('foo-id')
3484
tt.unversion_file(foo_trans_id)
3485
bar_trans_id = tt.trans_id_tree_file_id('bar-id')
3486
tt.delete_contents(bar_trans_id)
3487
self.assertSerializesTo(self.destruction_records(), tt)
3489
def test_deserialize_destruction(self):
3490
tt = self.make_destruction_preview()
3491
tt.deserialize(iter(self.destruction_records()))
3492
self.assertEqual({u'foo\u1234': 'new-1',
3494
'': tt.root}, tt._tree_path_ids)
3495
self.assertEqual({'new-1': u'foo\u1234',
3497
tt.root: ''}, tt._tree_id_paths)
3498
self.assertEqual(set(['new-1']), tt._removed_id)
3499
self.assertEqual(set(['new-2']), tt._removed_contents)
3501
def missing_records(self):
3502
attribs = self.default_attribs()
3503
attribs['_id_number'] = 2
3504
attribs['_non_present_ids'] = {
3506
return self.make_records(attribs, [])
3508
def test_serialize_missing(self):
3509
tt = self.get_preview()
3510
boo_trans_id = tt.trans_id_file_id('boo')
3511
self.assertSerializesTo(self.missing_records(), tt)
3513
def test_deserialize_missing(self):
3514
tt = self.get_preview()
3515
tt.deserialize(iter(self.missing_records()))
3516
self.assertEqual({'boo': 'new-1'}, tt._non_present_ids)
3518
def make_modification_preview(self):
3519
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3520
LINES_TWO = 'z\nbb\nx\ndd\n'
3521
tree = self.make_branch_and_tree('tree')
3522
self.build_tree_contents([('tree/file', LINES_ONE)])
3523
tree.add('file', 'file-id')
3524
return self.get_preview(tree), LINES_TWO
3526
def modification_records(self):
3527
attribs = self.default_attribs()
3528
attribs['_id_number'] = 2
3529
attribs['_tree_path_ids'] = {
3532
attribs['_removed_contents'] = ['new-1']
3533
contents = [('new-1', 'file',
3534
'i 1\nz\n\nc 0 1 1 1\ni 1\nx\n\nc 0 3 3 1\n')]
3535
return self.make_records(attribs, contents)
3537
def test_serialize_modification(self):
3538
tt, LINES = self.make_modification_preview()
3539
trans_id = tt.trans_id_file_id('file-id')
3540
tt.delete_contents(trans_id)
3541
tt.create_file(LINES, trans_id)
3542
self.assertSerializesTo(self.modification_records(), tt)
3544
def test_deserialize_modification(self):
3545
tt, LINES = self.make_modification_preview()
3546
tt.deserialize(iter(self.modification_records()))
3547
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3549
def make_kind_change_preview(self):
3550
LINES = 'a\nb\nc\nd\n'
3551
tree = self.make_branch_and_tree('tree')
3552
self.build_tree(['tree/foo/'])
3553
tree.add('foo', 'foo-id')
3554
return self.get_preview(tree), LINES
3556
def kind_change_records(self):
3557
attribs = self.default_attribs()
3558
attribs['_id_number'] = 2
3559
attribs['_tree_path_ids'] = {
3562
attribs['_removed_contents'] = ['new-1']
3563
contents = [('new-1', 'file',
3564
'i 4\na\nb\nc\nd\n\n')]
3565
return self.make_records(attribs, contents)
3567
def test_serialize_kind_change(self):
3568
tt, LINES = self.make_kind_change_preview()
3569
trans_id = tt.trans_id_file_id('foo-id')
3570
tt.delete_contents(trans_id)
3571
tt.create_file(LINES, trans_id)
3572
self.assertSerializesTo(self.kind_change_records(), tt)
3574
def test_deserialize_kind_change(self):
3575
tt, LINES = self.make_kind_change_preview()
3576
tt.deserialize(iter(self.kind_change_records()))
3577
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3579
def make_add_contents_preview(self):
3580
LINES = 'a\nb\nc\nd\n'
3581
tree = self.make_branch_and_tree('tree')
3582
self.build_tree(['tree/foo'])
3584
os.unlink('tree/foo')
3585
return self.get_preview(tree), LINES
3587
def add_contents_records(self):
3588
attribs = self.default_attribs()
3589
attribs['_id_number'] = 2
3590
attribs['_tree_path_ids'] = {
3593
contents = [('new-1', 'file',
3594
'i 4\na\nb\nc\nd\n\n')]
3595
return self.make_records(attribs, contents)
3597
def test_serialize_add_contents(self):
3598
tt, LINES = self.make_add_contents_preview()
3599
trans_id = tt.trans_id_tree_path('foo')
3600
tt.create_file(LINES, trans_id)
3601
self.assertSerializesTo(self.add_contents_records(), tt)
3603
def test_deserialize_add_contents(self):
3604
tt, LINES = self.make_add_contents_preview()
3605
tt.deserialize(iter(self.add_contents_records()))
3606
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3608
def test_get_parents_lines(self):
3609
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3610
LINES_TWO = 'z\nbb\nx\ndd\n'
3611
tree = self.make_branch_and_tree('tree')
3612
self.build_tree_contents([('tree/file', LINES_ONE)])
3613
tree.add('file', 'file-id')
3614
tt = self.get_preview(tree)
3615
trans_id = tt.trans_id_tree_path('file')
3616
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3617
tt._get_parents_lines(trans_id))
3619
def test_get_parents_texts(self):
3620
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3621
LINES_TWO = 'z\nbb\nx\ndd\n'
3622
tree = self.make_branch_and_tree('tree')
3623
self.build_tree_contents([('tree/file', LINES_ONE)])
3624
tree.add('file', 'file-id')
3625
tt = self.get_preview(tree)
3626
trans_id = tt.trans_id_tree_path('file')
3627
self.assertEqual((LINES_ONE,),
3628
tt._get_parents_texts(trans_id))
3631
class TestOrphan(tests.TestCaseWithTransport):
3633
def test_no_orphan_for_transform_preview(self):
3634
tree = self.make_branch_and_tree('tree')
3635
tt = transform.TransformPreview(tree)
3636
self.addCleanup(tt.finalize)
3637
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3639
def _set_orphan_policy(self, wt, policy):
3640
wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
3643
def _prepare_orphan(self, wt):
3644
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3645
wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
3646
wt.commit('add dir and file ignoring foo')
3647
tt = transform.TreeTransform(wt)
3648
self.addCleanup(tt.finalize)
3649
# dir and bar are deleted
3650
dir_tid = tt.trans_id_tree_path('dir')
3651
file_tid = tt.trans_id_tree_path('dir/file')
3652
orphan_tid = tt.trans_id_tree_path('dir/foo')
3653
tt.delete_contents(file_tid)
3654
tt.unversion_file(file_tid)
3655
tt.delete_contents(dir_tid)
3656
tt.unversion_file(dir_tid)
3657
# There should be a conflict because dir still contain foo
3658
raw_conflicts = tt.find_conflicts()
3659
self.assertLength(1, raw_conflicts)
3660
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3661
return tt, orphan_tid
3663
def test_new_orphan_created(self):
3664
wt = self.make_branch_and_tree('.')
3665
self._set_orphan_policy(wt, 'move')
3666
tt, orphan_tid = self._prepare_orphan(wt)
3669
warnings.append(args[0] % args[1:])
3670
self.overrideAttr(trace, 'warning', warning)
3671
remaining_conflicts = resolve_conflicts(tt)
3672
self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
3674
# Yeah for resolved conflicts !
3675
self.assertLength(0, remaining_conflicts)
3676
# We have a new orphan
3677
self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
3678
self.assertEquals('bzr-orphans',
3679
tt.final_name(tt.final_parent(orphan_tid)))
3681
def test_never_orphan(self):
3682
wt = self.make_branch_and_tree('.')
3683
self._set_orphan_policy(wt, 'conflict')
3684
tt, orphan_tid = self._prepare_orphan(wt)
3685
remaining_conflicts = resolve_conflicts(tt)
3686
self.assertLength(1, remaining_conflicts)
3687
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3688
remaining_conflicts.pop())
3690
def test_orphan_error(self):
3691
def bogus_orphan(tt, orphan_id, parent_id):
3692
raise transform.OrphaningError(tt.final_name(orphan_id),
3693
tt.final_name(parent_id))
3694
transform.orphaning_registry.register('bogus', bogus_orphan,
3695
'Raise an error when orphaning')
3696
wt = self.make_branch_and_tree('.')
3697
self._set_orphan_policy(wt, 'bogus')
3698
tt, orphan_tid = self._prepare_orphan(wt)
3699
remaining_conflicts = resolve_conflicts(tt)
3700
self.assertLength(1, remaining_conflicts)
3701
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3702
remaining_conflicts.pop())
3704
def test_unknown_orphan_policy(self):
3705
wt = self.make_branch_and_tree('.')
3706
# Set a fictional policy nobody ever implemented
3707
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3708
tt, orphan_tid = self._prepare_orphan(wt)
3711
warnings.append(args[0] % args[1:])
3712
self.overrideAttr(trace, 'warning', warning)
3713
remaining_conflicts = resolve_conflicts(tt)
3714
# We fallback to the default policy which create a conflict
3715
self.assertLength(1, remaining_conflicts)
3716
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3717
remaining_conflicts.pop())
3718
self.assertLength(1, warnings)
3719
self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')
added
removed
bzrlib/tests/test_transform.py
