113
167
self.assertIs(self.wt.is_executable('my_pretties2'), False)
114
168
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
115
169
self.assertEqual(len(modified_paths), 3)
116
tree_mod_paths = [self.wt.id2abspath(f) for f in
170
tree_mod_paths = [self.wt.id2abspath(f) for f in
117
171
('ozzie', 'my_pretties', 'my_pretties2')]
118
172
self.assertSubset(tree_mod_paths, modified_paths)
119
173
# is it safe to finalize repeatedly?
120
174
transform.finalize()
121
175
transform.finalize()
177
def test_apply_informs_tree_of_observed_sha1(self):
178
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
179
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
182
orig = self.wt._observed_sha1
183
def _observed_sha1(*args):
186
self.wt._observed_sha1 = _observed_sha1
188
self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
191
def test_create_file_caches_sha1(self):
192
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
193
trans_id = trans.create_path('file1', root)
194
trans.create_file(contents, trans_id, sha1=sha1)
195
st_val = osutils.lstat(trans._limbo_name(trans_id))
196
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
197
self.assertEqual(o_sha1, sha1)
198
self.assertEqualStat(o_st_val, st_val)
200
def test__apply_insertions_updates_sha1(self):
201
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
202
trans_id = trans.create_path('file1', root)
203
trans.create_file(contents, trans_id, sha1=sha1)
204
st_val = osutils.lstat(trans._limbo_name(trans_id))
205
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
206
self.assertEqual(o_sha1, sha1)
207
self.assertEqualStat(o_st_val, st_val)
208
creation_mtime = trans._creation_mtime + 10.0
209
# We fake a time difference from when the file was created until now it
210
# is being renamed by using os.utime. Note that the change we actually
211
# want to see is the real ctime change from 'os.rename()', but as long
212
# as we observe a new stat value, we should be fine.
213
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
215
new_st_val = osutils.lstat(self.wt.abspath('file1'))
216
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
217
self.assertEqual(o_sha1, sha1)
218
self.assertEqualStat(o_st_val, new_st_val)
219
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
221
def test_new_file_caches_sha1(self):
222
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
223
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
225
st_val = osutils.lstat(trans._limbo_name(trans_id))
226
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
227
self.assertEqual(o_sha1, sha1)
228
self.assertEqualStat(o_st_val, st_val)
230
def test_cancel_creation_removes_observed_sha1(self):
231
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
232
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
234
self.assertTrue(trans_id in trans._observed_sha1s)
235
trans.cancel_creation(trans_id)
236
self.assertFalse(trans_id in trans._observed_sha1s)
238
def test_create_files_same_timestamp(self):
239
transform, root = self.get_transform()
240
self.wt.lock_tree_write()
241
self.addCleanup(self.wt.unlock)
242
# Roll back the clock, so that we know everything is being set to the
244
transform._creation_mtime = creation_mtime = time.time() - 20.0
245
transform.create_file('content-one',
246
transform.create_path('one', root))
247
time.sleep(1) # *ugly*
248
transform.create_file('content-two',
249
transform.create_path('two', root))
251
fo, st1 = self.wt.get_file_with_stat(None, path='one', filtered=False)
253
fo, st2 = self.wt.get_file_with_stat(None, path='two', filtered=False)
255
# We only guarantee 2s resolution
256
self.assertTrue(abs(creation_mtime - st1.st_mtime) < 2.0,
257
"%s != %s within 2 seconds" % (creation_mtime, st1.st_mtime))
258
# But if we have more than that, all files should get the same result
259
self.assertEqual(st1.st_mtime, st2.st_mtime)
261
def test_change_root_id(self):
262
transform, root = self.get_transform()
263
self.assertNotEqual('new-root-id', self.wt.get_root_id())
264
transform.new_directory('', ROOT_PARENT, 'new-root-id')
265
transform.delete_contents(root)
266
transform.unversion_file(root)
267
transform.fixup_new_roots()
269
self.assertEqual('new-root-id', self.wt.get_root_id())
271
def test_change_root_id_add_files(self):
272
transform, root = self.get_transform()
273
self.assertNotEqual('new-root-id', self.wt.get_root_id())
274
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
275
transform.new_file('file', new_trans_id, ['new-contents\n'],
277
transform.delete_contents(root)
278
transform.unversion_file(root)
279
transform.fixup_new_roots()
281
self.assertEqual('new-root-id', self.wt.get_root_id())
282
self.assertEqual('new-file-id', self.wt.path2id('file'))
283
self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
285
def test_add_two_roots(self):
286
transform, root = self.get_transform()
287
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
288
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
289
self.assertRaises(ValueError, transform.fixup_new_roots)
291
def test_retain_existing_root(self):
292
tt, root = self.get_transform()
294
tt.new_directory('', ROOT_PARENT, 'new-root-id')
296
self.assertNotEqual('new-root-id', tt.final_file_id(tt.root))
298
def test_retain_existing_root_added_file(self):
299
tt, root = self.get_transform()
300
new_trans_id = tt.new_directory('', ROOT_PARENT, 'new-root-id')
301
child = tt.new_directory('child', new_trans_id, 'child-id')
303
self.assertEqual(tt.root, tt.final_parent(child))
305
def test_add_unversioned_root(self):
306
transform, root = self.get_transform()
307
new_trans_id = transform.new_directory('', ROOT_PARENT, None)
308
transform.delete_contents(transform.root)
309
transform.fixup_new_roots()
310
self.assertNotIn(transform.root, transform._new_id)
312
def test_remove_root_fixup(self):
313
transform, root = self.get_transform()
314
old_root_id = self.wt.get_root_id()
315
self.assertNotEqual('new-root-id', old_root_id)
316
transform.delete_contents(root)
317
transform.unversion_file(root)
318
transform.fixup_new_roots()
320
self.assertEqual(old_root_id, self.wt.get_root_id())
322
transform, root = self.get_transform()
323
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
324
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
325
self.assertRaises(ValueError, transform.fixup_new_roots)
327
def test_fixup_new_roots_permits_empty_tree(self):
328
transform, root = self.get_transform()
329
transform.delete_contents(root)
330
transform.unversion_file(root)
331
transform.fixup_new_roots()
332
self.assertIs(None, transform.final_kind(root))
333
self.assertIs(None, transform.final_file_id(root))
335
def test_apply_retains_root_directory(self):
336
# Do not attempt to delete the physical root directory, because that
338
transform, root = self.get_transform()
340
transform.delete_contents(root)
341
e = self.assertRaises(AssertionError, self.assertRaises,
342
errors.TransformRenameFailed,
344
self.assertContainsRe('TransformRenameFailed not raised', str(e))
346
def test_apply_retains_file_id(self):
347
transform, root = self.get_transform()
348
old_root_id = transform.tree_file_id(root)
349
transform.unversion_file(root)
351
self.assertEqual(old_root_id, self.wt.get_root_id())
353
def test_hardlink(self):
354
self.requireFeature(HardlinkFeature)
355
transform, root = self.get_transform()
356
transform.new_file('file1', root, 'contents')
358
target = self.make_branch_and_tree('target')
359
target_transform = TreeTransform(target)
360
trans_id = target_transform.create_path('file1', target_transform.root)
361
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
362
target_transform.apply()
363
self.assertPathExists('target/file1')
364
source_stat = os.stat(self.wt.abspath('file1'))
365
target_stat = os.stat('target/file1')
366
self.assertEqual(source_stat, target_stat)
123
368
def test_convenience(self):
124
369
transform, root = self.get_transform()
125
trans_id = transform.new_file('name', root, 'contents',
370
self.wt.lock_tree_write()
371
self.addCleanup(self.wt.unlock)
372
trans_id = transform.new_file('name', root, 'contents',
126
373
'my_pretties', True)
127
374
oz = transform.new_directory('oz', root, 'oz-id')
128
375
dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
129
toto = transform.new_file('toto', dorothy, 'toto-contents',
376
toto = transform.new_file('toto', dorothy, 'toto-contents',
130
377
'toto-id', False)
132
379
self.assertEqual(len(transform.find_conflicts()), 0)
1318
2030
# children of non-root directories should not be renamed
1319
2031
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):
2033
def create_ab_tree(self):
2034
"""Create a committed test tree with two files"""
2035
source = self.make_branch_and_tree('source')
2036
self.build_tree_contents([('source/file1', 'A')])
2037
self.build_tree_contents([('source/file2', 'B')])
2038
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
2039
source.commit('commit files')
2041
self.addCleanup(source.unlock)
2044
def test_build_tree_accelerator_tree(self):
2045
source = self.create_ab_tree()
2046
self.build_tree_contents([('source/file2', 'C')])
2048
real_source_get_file = source.get_file
2049
def get_file(file_id, path=None):
2050
calls.append(file_id)
2051
return real_source_get_file(file_id, path)
2052
source.get_file = get_file
2053
target = self.make_branch_and_tree('target')
2054
revision_tree = source.basis_tree()
2055
revision_tree.lock_read()
2056
self.addCleanup(revision_tree.unlock)
2057
build_tree(revision_tree, target, source)
2058
self.assertEqual(['file1-id'], calls)
2060
self.addCleanup(target.unlock)
2061
self.assertEqual([], list(target.iter_changes(revision_tree)))
2063
def test_build_tree_accelerator_tree_observes_sha1(self):
2064
source = self.create_ab_tree()
2065
sha1 = osutils.sha_string('A')
2066
target = self.make_branch_and_tree('target')
2068
self.addCleanup(target.unlock)
2069
state = target.current_dirstate()
2070
state._cutoff_time = time.time() + 60
2071
build_tree(source.basis_tree(), target, source)
2072
entry = state._get_entry(0, path_utf8='file1')
2073
self.assertEqual(sha1, entry[1][0][1])
2075
def test_build_tree_accelerator_tree_missing_file(self):
2076
source = self.create_ab_tree()
2077
os.unlink('source/file1')
2078
source.remove(['file2'])
2079
target = self.make_branch_and_tree('target')
2080
revision_tree = source.basis_tree()
2081
revision_tree.lock_read()
2082
self.addCleanup(revision_tree.unlock)
2083
build_tree(revision_tree, target, source)
2085
self.addCleanup(target.unlock)
2086
self.assertEqual([], list(target.iter_changes(revision_tree)))
2088
def test_build_tree_accelerator_wrong_kind(self):
2089
self.requireFeature(SymlinkFeature)
2090
source = self.make_branch_and_tree('source')
2091
self.build_tree_contents([('source/file1', '')])
2092
self.build_tree_contents([('source/file2', '')])
2093
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
2094
source.commit('commit files')
2095
os.unlink('source/file2')
2096
self.build_tree_contents([('source/file2/', 'C')])
2097
os.unlink('source/file1')
2098
os.symlink('file2', 'source/file1')
2100
real_source_get_file = source.get_file
2101
def get_file(file_id, path=None):
2102
calls.append(file_id)
2103
return real_source_get_file(file_id, path)
2104
source.get_file = get_file
2105
target = self.make_branch_and_tree('target')
2106
revision_tree = source.basis_tree()
2107
revision_tree.lock_read()
2108
self.addCleanup(revision_tree.unlock)
2109
build_tree(revision_tree, target, source)
2110
self.assertEqual([], calls)
2112
self.addCleanup(target.unlock)
2113
self.assertEqual([], list(target.iter_changes(revision_tree)))
2115
def test_build_tree_hardlink(self):
2116
self.requireFeature(HardlinkFeature)
2117
source = self.create_ab_tree()
2118
target = self.make_branch_and_tree('target')
2119
revision_tree = source.basis_tree()
2120
revision_tree.lock_read()
2121
self.addCleanup(revision_tree.unlock)
2122
build_tree(revision_tree, target, source, hardlink=True)
2124
self.addCleanup(target.unlock)
2125
self.assertEqual([], list(target.iter_changes(revision_tree)))
2126
source_stat = os.stat('source/file1')
2127
target_stat = os.stat('target/file1')
2128
self.assertEqual(source_stat, target_stat)
2130
# Explicitly disallowing hardlinks should prevent them.
2131
target2 = self.make_branch_and_tree('target2')
2132
build_tree(revision_tree, target2, source, hardlink=False)
2134
self.addCleanup(target2.unlock)
2135
self.assertEqual([], list(target2.iter_changes(revision_tree)))
2136
source_stat = os.stat('source/file1')
2137
target2_stat = os.stat('target2/file1')
2138
self.assertNotEqual(source_stat, target2_stat)
2140
def test_build_tree_accelerator_tree_moved(self):
2141
source = self.make_branch_and_tree('source')
2142
self.build_tree_contents([('source/file1', 'A')])
2143
source.add(['file1'], ['file1-id'])
2144
source.commit('commit files')
2145
source.rename_one('file1', 'file2')
2147
self.addCleanup(source.unlock)
2148
target = self.make_branch_and_tree('target')
2149
revision_tree = source.basis_tree()
2150
revision_tree.lock_read()
2151
self.addCleanup(revision_tree.unlock)
2152
build_tree(revision_tree, target, source)
2154
self.addCleanup(target.unlock)
2155
self.assertEqual([], list(target.iter_changes(revision_tree)))
2157
def test_build_tree_hardlinks_preserve_execute(self):
2158
self.requireFeature(HardlinkFeature)
2159
source = self.create_ab_tree()
2160
tt = TreeTransform(source)
2161
trans_id = tt.trans_id_tree_file_id('file1-id')
2162
tt.set_executability(True, trans_id)
2164
self.assertTrue(source.is_executable('file1-id'))
2165
target = self.make_branch_and_tree('target')
2166
revision_tree = source.basis_tree()
2167
revision_tree.lock_read()
2168
self.addCleanup(revision_tree.unlock)
2169
build_tree(revision_tree, target, source, hardlink=True)
2171
self.addCleanup(target.unlock)
2172
self.assertEqual([], list(target.iter_changes(revision_tree)))
2173
self.assertTrue(source.is_executable('file1-id'))
2175
def install_rot13_content_filter(self, pattern):
2177
# self.addCleanup(filters._reset_registry, filters._reset_registry())
2178
# below, but that looks a bit... hard to read even if it's exactly
2180
original_registry = filters._reset_registry()
2181
def restore_registry():
2182
filters._reset_registry(original_registry)
2183
self.addCleanup(restore_registry)
2184
def rot13(chunks, context=None):
2185
return [''.join(chunks).encode('rot13')]
2186
rot13filter = filters.ContentFilter(rot13, rot13)
2187
filters.register_filter_stack_map('rot13', {'yes': [rot13filter]}.get)
2188
os.mkdir(self.test_home_dir + '/.bazaar')
2189
rules_filename = self.test_home_dir + '/.bazaar/rules'
2190
f = open(rules_filename, 'wb')
2191
f.write('[name %s]\nrot13=yes\n' % (pattern,))
2193
def uninstall_rules():
2194
os.remove(rules_filename)
2196
self.addCleanup(uninstall_rules)
2199
def test_build_tree_content_filtered_files_are_not_hardlinked(self):
2200
"""build_tree will not hardlink files that have content filtering rules
2201
applied to them (but will still hardlink other files from the same tree
2204
self.requireFeature(HardlinkFeature)
2205
self.install_rot13_content_filter('file1')
2206
source = self.create_ab_tree()
2207
target = self.make_branch_and_tree('target')
2208
revision_tree = source.basis_tree()
2209
revision_tree.lock_read()
2210
self.addCleanup(revision_tree.unlock)
2211
build_tree(revision_tree, target, source, hardlink=True)
2213
self.addCleanup(target.unlock)
2214
self.assertEqual([], list(target.iter_changes(revision_tree)))
2215
source_stat = os.stat('source/file1')
2216
target_stat = os.stat('target/file1')
2217
self.assertNotEqual(source_stat, target_stat)
2218
source_stat = os.stat('source/file2')
2219
target_stat = os.stat('target/file2')
2220
self.assertEqualStat(source_stat, target_stat)
2222
def test_case_insensitive_build_tree_inventory(self):
2223
if (features.CaseInsensitiveFilesystemFeature.available()
2224
or features.CaseInsCasePresFilenameFeature.available()):
2225
raise tests.UnavailableFeature('Fully case sensitive filesystem')
2226
source = self.make_branch_and_tree('source')
2227
self.build_tree(['source/file', 'source/FILE'])
2228
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2229
source.commit('added files')
2230
# Don't try this at home, kids!
2231
# Force the tree to report that it is case insensitive
2232
target = self.make_branch_and_tree('target')
2233
target.case_sensitive = False
2234
build_tree(source.basis_tree(), target, source, delta_from_tree=True)
2235
self.assertEqual('file.moved', target.id2path('lower-id'))
2236
self.assertEqual('FILE', target.id2path('upper-id'))
2238
def test_build_tree_observes_sha(self):
2239
source = self.make_branch_and_tree('source')
2240
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2241
source.add(['file1', 'dir', 'dir/file2'],
2242
['file1-id', 'dir-id', 'file2-id'])
2243
source.commit('new files')
2244
target = self.make_branch_and_tree('target')
2246
self.addCleanup(target.unlock)
2247
# We make use of the fact that DirState caches its cutoff time. So we
2248
# set the 'safe' time to one minute in the future.
2249
state = target.current_dirstate()
2250
state._cutoff_time = time.time() + 60
2251
build_tree(source.basis_tree(), target)
2252
entry1_sha = osutils.sha_file_by_name('source/file1')
2253
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2254
# entry[1] is the state information, entry[1][0] is the state of the
2255
# working tree, entry[1][0][1] is the sha value for the current working
2257
entry1 = state._get_entry(0, path_utf8='file1')
2258
self.assertEqual(entry1_sha, entry1[1][0][1])
2259
# The 'size' field must also be set.
2260
self.assertEqual(25, entry1[1][0][2])
2261
entry1_state = entry1[1][0]
2262
entry2 = state._get_entry(0, path_utf8='dir/file2')
2263
self.assertEqual(entry2_sha, entry2[1][0][1])
2264
self.assertEqual(29, entry2[1][0][2])
2265
entry2_state = entry2[1][0]
2266
# Now, make sure that we don't have to re-read the content. The
2267
# packed_stat should match exactly.
2268
self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
2269
self.assertEqual(entry2_sha,
2270
target.get_file_sha1('file2-id', 'dir/file2'))
2271
self.assertEqual(entry1_state, entry1[1][0])
2272
self.assertEqual(entry2_state, entry2[1][0])
2275
class TestCommitTransform(tests.TestCaseWithTransport):
2277
def get_branch(self):
2278
tree = self.make_branch_and_tree('tree')
2280
self.addCleanup(tree.unlock)
2281
tree.commit('empty commit')
2284
def get_branch_and_transform(self):
2285
branch = self.get_branch()
2286
tt = TransformPreview(branch.basis_tree())
2287
self.addCleanup(tt.finalize)
2290
def test_commit_wrong_basis(self):
2291
branch = self.get_branch()
2292
basis = branch.repository.revision_tree(
2293
_mod_revision.NULL_REVISION)
2294
tt = TransformPreview(basis)
2295
self.addCleanup(tt.finalize)
2296
e = self.assertRaises(ValueError, tt.commit, branch, '')
2297
self.assertEqual('TreeTransform not based on branch basis: null:',
2300
def test_empy_commit(self):
2301
branch, tt = self.get_branch_and_transform()
2302
rev = tt.commit(branch, 'my message')
2303
self.assertEqual(2, branch.revno())
2304
repo = branch.repository
2305
self.assertEqual('my message', repo.get_revision(rev).message)
2307
def test_merge_parents(self):
2308
branch, tt = self.get_branch_and_transform()
2309
rev = tt.commit(branch, 'my message', ['rev1b', 'rev1c'])
2310
self.assertEqual(['rev1b', 'rev1c'],
2311
branch.basis_tree().get_parent_ids()[1:])
2313
def test_first_commit(self):
2314
branch = self.make_branch('branch')
2316
self.addCleanup(branch.unlock)
2317
tt = TransformPreview(branch.basis_tree())
2318
self.addCleanup(tt.finalize)
2319
tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
2320
rev = tt.commit(branch, 'my message')
2321
self.assertEqual([], branch.basis_tree().get_parent_ids())
2322
self.assertNotEqual(_mod_revision.NULL_REVISION,
2323
branch.last_revision())
2325
def test_first_commit_with_merge_parents(self):
2326
branch = self.make_branch('branch')
2328
self.addCleanup(branch.unlock)
2329
tt = TransformPreview(branch.basis_tree())
2330
self.addCleanup(tt.finalize)
2331
e = self.assertRaises(ValueError, tt.commit, branch,
2332
'my message', ['rev1b-id'])
2333
self.assertEqual('Cannot supply merge parents for first commit.',
2335
self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
2337
def test_add_files(self):
2338
branch, tt = self.get_branch_and_transform()
2339
tt.new_file('file', tt.root, 'contents', 'file-id')
2340
trans_id = tt.new_directory('dir', tt.root, 'dir-id')
2341
if SymlinkFeature.available():
2342
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2343
rev = tt.commit(branch, 'message')
2344
tree = branch.basis_tree()
2345
self.assertEqual('file', tree.id2path('file-id'))
2346
self.assertEqual('contents', tree.get_file_text('file-id'))
2347
self.assertEqual('dir', tree.id2path('dir-id'))
2348
if SymlinkFeature.available():
2349
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2350
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2352
def test_add_unversioned(self):
2353
branch, tt = self.get_branch_and_transform()
2354
tt.new_file('file', tt.root, 'contents')
2355
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2356
'message', strict=True)
2358
def test_modify_strict(self):
2359
branch, tt = self.get_branch_and_transform()
2360
tt.new_file('file', tt.root, 'contents', 'file-id')
2361
tt.commit(branch, 'message', strict=True)
2362
tt = TransformPreview(branch.basis_tree())
2363
self.addCleanup(tt.finalize)
2364
trans_id = tt.trans_id_file_id('file-id')
2365
tt.delete_contents(trans_id)
2366
tt.create_file('contents', trans_id)
2367
tt.commit(branch, 'message', strict=True)
2369
def test_commit_malformed(self):
2370
"""Committing a malformed transform should raise an exception.
2372
In this case, we are adding a file without adding its parent.
2374
branch, tt = self.get_branch_and_transform()
2375
parent_id = tt.trans_id_file_id('parent-id')
2376
tt.new_file('file', parent_id, 'contents', 'file-id')
2377
self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2380
def test_commit_rich_revision_data(self):
2381
branch, tt = self.get_branch_and_transform()
2382
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2383
committer='me <me@example.com>',
2384
revprops={'foo': 'bar'}, revision_id='revid-1',
2385
authors=['Author1 <author1@example.com>',
2386
'Author2 <author2@example.com>',
2388
self.assertEqual('revid-1', rev_id)
2389
revision = branch.repository.get_revision(rev_id)
2390
self.assertEqual(1, revision.timestamp)
2391
self.assertEqual(43201, revision.timezone)
2392
self.assertEqual('me <me@example.com>', revision.committer)
2393
self.assertEqual(['Author1 <author1@example.com>',
2394
'Author2 <author2@example.com>'],
2395
revision.get_apparent_authors())
2396
del revision.properties['authors']
2397
self.assertEqual({'foo': 'bar',
2398
'branch-nick': 'tree'},
2399
revision.properties)
2401
def test_no_explicit_revprops(self):
2402
branch, tt = self.get_branch_and_transform()
2403
rev_id = tt.commit(branch, 'message', authors=[
2404
'Author1 <author1@example.com>',
2405
'Author2 <author2@example.com>', ])
2406
revision = branch.repository.get_revision(rev_id)
2407
self.assertEqual(['Author1 <author1@example.com>',
2408
'Author2 <author2@example.com>'],
2409
revision.get_apparent_authors())
2410
self.assertEqual('tree', revision.properties['branch-nick'])
2413
class TestBackupName(tests.TestCase):
2415
def test_deprecations(self):
2416
class MockTransform(object):
2418
def has_named_child(self, by_parent, parent_id, name):
2419
return name in by_parent.get(parent_id, [])
2421
class MockEntry(object):
2424
object.__init__(self)
1341
2427
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~')
2428
name1 = self.applyDeprecated(
2429
symbol_versioning.deprecated_in((2, 3, 0)),
2430
transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
2431
self.assertEqual('name.~1~', name1)
2432
name2 = self.applyDeprecated(
2433
symbol_versioning.deprecated_in((2, 3, 0)),
2434
transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
2435
self.assertEqual('name.~2~', name2)
1354
2438
class TestFileMover(tests.TestCaseWithTransport):
1466
2550
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
1467
2551
self.assertRaises(Bogus, tt.apply,
1468
2552
_mover=self.ExceptionFileMover(bad_target='d'))
1469
self.failUnlessExists('a')
1470
self.failUnlessExists('a/b')
2553
self.assertPathExists('a')
2554
self.assertPathExists('a/b')
2557
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2558
"""Ensure treetransform creation errors can be safely cleaned up after"""
2560
def _override_globals_in_method(self, instance, method_name, globals):
2561
"""Replace method on instance with one with updated globals"""
2563
func = getattr(instance, method_name).im_func
2564
new_globals = dict(func.func_globals)
2565
new_globals.update(globals)
2566
new_func = types.FunctionType(func.func_code, new_globals,
2567
func.func_name, func.func_defaults)
2568
setattr(instance, method_name,
2569
types.MethodType(new_func, instance, instance.__class__))
2570
self.addCleanup(delattr, instance, method_name)
2573
def _fake_open_raises_before(name, mode):
2574
"""Like open() but raises before doing anything"""
2578
def _fake_open_raises_after(name, mode):
2579
"""Like open() but raises after creating file without returning"""
2580
open(name, mode).close()
2583
def create_transform_and_root_trans_id(self):
2584
"""Setup a transform creating a file in limbo"""
2585
tree = self.make_branch_and_tree('.')
2586
tt = TreeTransform(tree)
2587
return tt, tt.create_path("a", tt.root)
2589
def create_transform_and_subdir_trans_id(self):
2590
"""Setup a transform creating a directory containing a file in limbo"""
2591
tree = self.make_branch_and_tree('.')
2592
tt = TreeTransform(tree)
2593
d_trans_id = tt.create_path("d", tt.root)
2594
tt.create_directory(d_trans_id)
2595
f_trans_id = tt.create_path("a", d_trans_id)
2596
tt.adjust_path("a", d_trans_id, f_trans_id)
2597
return tt, f_trans_id
2599
def test_root_create_file_open_raises_before_creation(self):
2600
tt, trans_id = self.create_transform_and_root_trans_id()
2601
self._override_globals_in_method(tt, "create_file",
2602
{"open": self._fake_open_raises_before})
2603
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2604
path = tt._limbo_name(trans_id)
2605
self.assertPathDoesNotExist(path)
2607
self.assertPathDoesNotExist(tt._limbodir)
2609
def test_root_create_file_open_raises_after_creation(self):
2610
tt, trans_id = self.create_transform_and_root_trans_id()
2611
self._override_globals_in_method(tt, "create_file",
2612
{"open": self._fake_open_raises_after})
2613
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2614
path = tt._limbo_name(trans_id)
2615
self.assertPathExists(path)
2617
self.assertPathDoesNotExist(path)
2618
self.assertPathDoesNotExist(tt._limbodir)
2620
def test_subdir_create_file_open_raises_before_creation(self):
2621
tt, trans_id = self.create_transform_and_subdir_trans_id()
2622
self._override_globals_in_method(tt, "create_file",
2623
{"open": self._fake_open_raises_before})
2624
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2625
path = tt._limbo_name(trans_id)
2626
self.assertPathDoesNotExist(path)
2628
self.assertPathDoesNotExist(tt._limbodir)
2630
def test_subdir_create_file_open_raises_after_creation(self):
2631
tt, trans_id = self.create_transform_and_subdir_trans_id()
2632
self._override_globals_in_method(tt, "create_file",
2633
{"open": self._fake_open_raises_after})
2634
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2635
path = tt._limbo_name(trans_id)
2636
self.assertPathExists(path)
2638
self.assertPathDoesNotExist(path)
2639
self.assertPathDoesNotExist(tt._limbodir)
2641
def test_rename_in_limbo_rename_raises_after_rename(self):
2642
tt, trans_id = self.create_transform_and_root_trans_id()
2643
parent1 = tt.new_directory('parent1', tt.root)
2644
child1 = tt.new_file('child1', parent1, 'contents')
2645
parent2 = tt.new_directory('parent2', tt.root)
2647
class FakeOSModule(object):
2648
def rename(self, old, new):
2651
self._override_globals_in_method(tt, "_rename_in_limbo",
2652
{"os": FakeOSModule()})
2654
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2655
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2656
self.assertPathExists(path)
2658
self.assertPathDoesNotExist(path)
2659
self.assertPathDoesNotExist(tt._limbodir)
2661
def test_rename_in_limbo_rename_raises_before_rename(self):
2662
tt, trans_id = self.create_transform_and_root_trans_id()
2663
parent1 = tt.new_directory('parent1', tt.root)
2664
child1 = tt.new_file('child1', parent1, 'contents')
2665
parent2 = tt.new_directory('parent2', tt.root)
2667
class FakeOSModule(object):
2668
def rename(self, old, new):
2670
self._override_globals_in_method(tt, "_rename_in_limbo",
2671
{"os": FakeOSModule()})
2673
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2674
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2675
self.assertPathExists(path)
2677
self.assertPathDoesNotExist(path)
2678
self.assertPathDoesNotExist(tt._limbodir)
2681
class TestTransformMissingParent(tests.TestCaseWithTransport):
2683
def make_tt_with_versioned_dir(self):
2684
wt = self.make_branch_and_tree('.')
2685
self.build_tree(['dir/',])
2686
wt.add(['dir'], ['dir-id'])
2687
wt.commit('Create dir')
2688
tt = TreeTransform(wt)
2689
self.addCleanup(tt.finalize)
2692
def test_resolve_create_parent_for_versioned_file(self):
2693
wt, tt = self.make_tt_with_versioned_dir()
2694
dir_tid = tt.trans_id_tree_file_id('dir-id')
2695
file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
2696
tt.delete_contents(dir_tid)
2697
tt.unversion_file(dir_tid)
2698
conflicts = resolve_conflicts(tt)
2699
# one conflict for the missing directory, one for the unversioned
2701
self.assertLength(2, conflicts)
2703
def test_non_versioned_file_create_conflict(self):
2704
wt, tt = self.make_tt_with_versioned_dir()
2705
dir_tid = tt.trans_id_tree_file_id('dir-id')
2706
tt.new_file('file', dir_tid, 'Contents')
2707
tt.delete_contents(dir_tid)
2708
tt.unversion_file(dir_tid)
2709
conflicts = resolve_conflicts(tt)
2710
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2711
self.assertLength(1, conflicts)
2712
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2716
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2717
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2719
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2720
('', ''), ('directory', 'directory'), (False, False))
2723
class TestTransformPreview(tests.TestCaseWithTransport):
2725
def create_tree(self):
2726
tree = self.make_branch_and_tree('.')
2727
self.build_tree_contents([('a', 'content 1')])
2728
tree.set_root_id('TREE_ROOT')
2729
tree.add('a', 'a-id')
2730
tree.commit('rev1', rev_id='rev1')
2731
return tree.branch.repository.revision_tree('rev1')
2733
def get_empty_preview(self):
2734
repository = self.make_repository('repo')
2735
tree = repository.revision_tree(_mod_revision.NULL_REVISION)
2736
preview = TransformPreview(tree)
2737
self.addCleanup(preview.finalize)
2740
def test_transform_preview(self):
2741
revision_tree = self.create_tree()
2742
preview = TransformPreview(revision_tree)
2743
self.addCleanup(preview.finalize)
2745
def test_transform_preview_tree(self):
2746
revision_tree = self.create_tree()
2747
preview = TransformPreview(revision_tree)
2748
self.addCleanup(preview.finalize)
2749
preview.get_preview_tree()
2751
def test_transform_new_file(self):
2752
revision_tree = self.create_tree()
2753
preview = TransformPreview(revision_tree)
2754
self.addCleanup(preview.finalize)
2755
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2756
preview_tree = preview.get_preview_tree()
2757
self.assertEqual(preview_tree.kind('file2-id'), 'file')
2759
preview_tree.get_file('file2-id').read(), 'content B\n')
2761
def test_diff_preview_tree(self):
2762
revision_tree = self.create_tree()
2763
preview = TransformPreview(revision_tree)
2764
self.addCleanup(preview.finalize)
2765
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2766
preview_tree = preview.get_preview_tree()
2768
show_diff_trees(revision_tree, preview_tree, out)
2769
lines = out.getvalue().splitlines()
2770
self.assertEqual(lines[0], "=== added file 'file2'")
2771
# 3 lines of diff administrivia
2772
self.assertEqual(lines[4], "+content B")
2774
def test_transform_conflicts(self):
2775
revision_tree = self.create_tree()
2776
preview = TransformPreview(revision_tree)
2777
self.addCleanup(preview.finalize)
2778
preview.new_file('a', preview.root, 'content 2')
2779
resolve_conflicts(preview)
2780
trans_id = preview.trans_id_file_id('a-id')
2781
self.assertEqual('a.moved', preview.final_name(trans_id))
2783
def get_tree_and_preview_tree(self):
2784
revision_tree = self.create_tree()
2785
preview = TransformPreview(revision_tree)
2786
self.addCleanup(preview.finalize)
2787
a_trans_id = preview.trans_id_file_id('a-id')
2788
preview.delete_contents(a_trans_id)
2789
preview.create_file('b content', a_trans_id)
2790
preview_tree = preview.get_preview_tree()
2791
return revision_tree, preview_tree
2793
def test_iter_changes(self):
2794
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2795
root = revision_tree.get_root_id()
2796
self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2797
(root, root), ('a', 'a'), ('file', 'file'),
2799
list(preview_tree.iter_changes(revision_tree)))
2801
def test_include_unchanged_succeeds(self):
2802
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2803
changes = preview_tree.iter_changes(revision_tree,
2804
include_unchanged=True)
2805
root = revision_tree.get_root_id()
2807
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2809
def test_specific_files(self):
2810
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2811
changes = preview_tree.iter_changes(revision_tree,
2812
specific_files=[''])
2813
self.assertEqual([A_ENTRY], list(changes))
2815
def test_want_unversioned(self):
2816
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2817
changes = preview_tree.iter_changes(revision_tree,
2818
want_unversioned=True)
2819
self.assertEqual([A_ENTRY], list(changes))
2821
def test_ignore_extra_trees_no_specific_files(self):
2822
# extra_trees is harmless without specific_files, so we'll silently
2823
# accept it, even though we won't use it.
2824
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2825
preview_tree.iter_changes(revision_tree, extra_trees=[preview_tree])
2827
def test_ignore_require_versioned_no_specific_files(self):
2828
# require_versioned is meaningless without specific_files.
2829
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2830
preview_tree.iter_changes(revision_tree, require_versioned=False)
2832
def test_ignore_pb(self):
2833
# pb could be supported, but TT.iter_changes doesn't support it.
2834
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2835
preview_tree.iter_changes(revision_tree)
2837
def test_kind(self):
2838
revision_tree = self.create_tree()
2839
preview = TransformPreview(revision_tree)
2840
self.addCleanup(preview.finalize)
2841
preview.new_file('file', preview.root, 'contents', 'file-id')
2842
preview.new_directory('directory', preview.root, 'dir-id')
2843
preview_tree = preview.get_preview_tree()
2844
self.assertEqual('file', preview_tree.kind('file-id'))
2845
self.assertEqual('directory', preview_tree.kind('dir-id'))
2847
def test_get_file_mtime(self):
2848
preview = self.get_empty_preview()
2849
file_trans_id = preview.new_file('file', preview.root, 'contents',
2851
limbo_path = preview._limbo_name(file_trans_id)
2852
preview_tree = preview.get_preview_tree()
2853
self.assertEqual(os.stat(limbo_path).st_mtime,
2854
preview_tree.get_file_mtime('file-id'))
2856
def test_get_file_mtime_renamed(self):
2857
work_tree = self.make_branch_and_tree('tree')
2858
self.build_tree(['tree/file'])
2859
work_tree.add('file', 'file-id')
2860
preview = TransformPreview(work_tree)
2861
self.addCleanup(preview.finalize)
2862
file_trans_id = preview.trans_id_tree_file_id('file-id')
2863
preview.adjust_path('renamed', preview.root, file_trans_id)
2864
preview_tree = preview.get_preview_tree()
2865
preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2866
work_mtime = work_tree.get_file_mtime('file-id', 'file')
2868
def test_get_file_size(self):
2869
work_tree = self.make_branch_and_tree('tree')
2870
self.build_tree_contents([('tree/old', 'old')])
2871
work_tree.add('old', 'old-id')
2872
preview = TransformPreview(work_tree)
2873
self.addCleanup(preview.finalize)
2874
new_id = preview.new_file('name', preview.root, 'contents', 'new-id',
2876
tree = preview.get_preview_tree()
2877
self.assertEqual(len('old'), tree.get_file_size('old-id'))
2878
self.assertEqual(len('contents'), tree.get_file_size('new-id'))
2880
def test_get_file(self):
2881
preview = self.get_empty_preview()
2882
preview.new_file('file', preview.root, 'contents', 'file-id')
2883
preview_tree = preview.get_preview_tree()
2884
tree_file = preview_tree.get_file('file-id')
2886
self.assertEqual('contents', tree_file.read())
2890
def test_get_symlink_target(self):
2891
self.requireFeature(SymlinkFeature)
2892
preview = self.get_empty_preview()
2893
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2894
preview_tree = preview.get_preview_tree()
2895
self.assertEqual('target',
2896
preview_tree.get_symlink_target('symlink-id'))
2898
def test_all_file_ids(self):
2899
tree = self.make_branch_and_tree('tree')
2900
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2901
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2902
preview = TransformPreview(tree)
2903
self.addCleanup(preview.finalize)
2904
preview.unversion_file(preview.trans_id_file_id('b-id'))
2905
c_trans_id = preview.trans_id_file_id('c-id')
2906
preview.unversion_file(c_trans_id)
2907
preview.version_file('c-id', c_trans_id)
2908
preview_tree = preview.get_preview_tree()
2909
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2910
preview_tree.all_file_ids())
2912
def test_path2id_deleted_unchanged(self):
2913
tree = self.make_branch_and_tree('tree')
2914
self.build_tree(['tree/unchanged', 'tree/deleted'])
2915
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2916
preview = TransformPreview(tree)
2917
self.addCleanup(preview.finalize)
2918
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2919
preview_tree = preview.get_preview_tree()
2920
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2921
self.assertIs(None, preview_tree.path2id('deleted'))
2923
def test_path2id_created(self):
2924
tree = self.make_branch_and_tree('tree')
2925
self.build_tree(['tree/unchanged'])
2926
tree.add(['unchanged'], ['unchanged-id'])
2927
preview = TransformPreview(tree)
2928
self.addCleanup(preview.finalize)
2929
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2930
'contents', 'new-id')
2931
preview_tree = preview.get_preview_tree()
2932
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2934
def test_path2id_moved(self):
2935
tree = self.make_branch_and_tree('tree')
2936
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2937
tree.add(['old_parent', 'old_parent/child'],
2938
['old_parent-id', 'child-id'])
2939
preview = TransformPreview(tree)
2940
self.addCleanup(preview.finalize)
2941
new_parent = preview.new_directory('new_parent', preview.root,
2943
preview.adjust_path('child', new_parent,
2944
preview.trans_id_file_id('child-id'))
2945
preview_tree = preview.get_preview_tree()
2946
self.assertIs(None, preview_tree.path2id('old_parent/child'))
2947
self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
2949
def test_path2id_renamed_parent(self):
2950
tree = self.make_branch_and_tree('tree')
2951
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2952
tree.add(['old_name', 'old_name/child'],
2953
['parent-id', 'child-id'])
2954
preview = TransformPreview(tree)
2955
self.addCleanup(preview.finalize)
2956
preview.adjust_path('new_name', preview.root,
2957
preview.trans_id_file_id('parent-id'))
2958
preview_tree = preview.get_preview_tree()
2959
self.assertIs(None, preview_tree.path2id('old_name/child'))
2960
self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
2962
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2963
preview_tree = tt.get_preview_tree()
2964
preview_result = list(preview_tree.iter_entries_by_dir(
2968
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
2969
self.assertEqual(actual_result, preview_result)
2971
def test_iter_entries_by_dir_new(self):
2972
tree = self.make_branch_and_tree('tree')
2973
tt = TreeTransform(tree)
2974
tt.new_file('new', tt.root, 'contents', 'new-id')
2975
self.assertMatchingIterEntries(tt)
2977
def test_iter_entries_by_dir_deleted(self):
2978
tree = self.make_branch_and_tree('tree')
2979
self.build_tree(['tree/deleted'])
2980
tree.add('deleted', 'deleted-id')
2981
tt = TreeTransform(tree)
2982
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
2983
self.assertMatchingIterEntries(tt)
2985
def test_iter_entries_by_dir_unversioned(self):
2986
tree = self.make_branch_and_tree('tree')
2987
self.build_tree(['tree/removed'])
2988
tree.add('removed', 'removed-id')
2989
tt = TreeTransform(tree)
2990
tt.unversion_file(tt.trans_id_file_id('removed-id'))
2991
self.assertMatchingIterEntries(tt)
2993
def test_iter_entries_by_dir_moved(self):
2994
tree = self.make_branch_and_tree('tree')
2995
self.build_tree(['tree/moved', 'tree/new_parent/'])
2996
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
2997
tt = TreeTransform(tree)
2998
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2999
tt.trans_id_file_id('moved-id'))
3000
self.assertMatchingIterEntries(tt)
3002
def test_iter_entries_by_dir_specific_file_ids(self):
3003
tree = self.make_branch_and_tree('tree')
3004
tree.set_root_id('tree-root-id')
3005
self.build_tree(['tree/parent/', 'tree/parent/child'])
3006
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
3007
tt = TreeTransform(tree)
3008
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
3010
def test_symlink_content_summary(self):
3011
self.requireFeature(SymlinkFeature)
3012
preview = self.get_empty_preview()
3013
preview.new_symlink('path', preview.root, 'target', 'path-id')
3014
summary = preview.get_preview_tree().path_content_summary('path')
3015
self.assertEqual(('symlink', None, None, 'target'), summary)
3017
def test_missing_content_summary(self):
3018
preview = self.get_empty_preview()
3019
summary = preview.get_preview_tree().path_content_summary('path')
3020
self.assertEqual(('missing', None, None, None), summary)
3022
def test_deleted_content_summary(self):
3023
tree = self.make_branch_and_tree('tree')
3024
self.build_tree(['tree/path/'])
3026
preview = TransformPreview(tree)
3027
self.addCleanup(preview.finalize)
3028
preview.delete_contents(preview.trans_id_tree_path('path'))
3029
summary = preview.get_preview_tree().path_content_summary('path')
3030
self.assertEqual(('missing', None, None, None), summary)
3032
def test_file_content_summary_executable(self):
3033
preview = self.get_empty_preview()
3034
path_id = preview.new_file('path', preview.root, 'contents', 'path-id')
3035
preview.set_executability(True, path_id)
3036
summary = preview.get_preview_tree().path_content_summary('path')
3037
self.assertEqual(4, len(summary))
3038
self.assertEqual('file', summary[0])
3039
# size must be known
3040
self.assertEqual(len('contents'), summary[1])
3042
self.assertEqual(True, summary[2])
3043
# will not have hash (not cheap to determine)
3044
self.assertIs(None, summary[3])
3046
def test_change_executability(self):
3047
tree = self.make_branch_and_tree('tree')
3048
self.build_tree(['tree/path'])
3050
preview = TransformPreview(tree)
3051
self.addCleanup(preview.finalize)
3052
path_id = preview.trans_id_tree_path('path')
3053
preview.set_executability(True, path_id)
3054
summary = preview.get_preview_tree().path_content_summary('path')
3055
self.assertEqual(True, summary[2])
3057
def test_file_content_summary_non_exec(self):
3058
preview = self.get_empty_preview()
3059
preview.new_file('path', preview.root, 'contents', 'path-id')
3060
summary = preview.get_preview_tree().path_content_summary('path')
3061
self.assertEqual(4, len(summary))
3062
self.assertEqual('file', summary[0])
3063
# size must be known
3064
self.assertEqual(len('contents'), summary[1])
3066
self.assertEqual(False, summary[2])
3067
# will not have hash (not cheap to determine)
3068
self.assertIs(None, summary[3])
3070
def test_dir_content_summary(self):
3071
preview = self.get_empty_preview()
3072
preview.new_directory('path', preview.root, 'path-id')
3073
summary = preview.get_preview_tree().path_content_summary('path')
3074
self.assertEqual(('directory', None, None, None), summary)
3076
def test_tree_content_summary(self):
3077
preview = self.get_empty_preview()
3078
path = preview.new_directory('path', preview.root, 'path-id')
3079
preview.set_tree_reference('rev-1', path)
3080
summary = preview.get_preview_tree().path_content_summary('path')
3081
self.assertEqual(4, len(summary))
3082
self.assertEqual('tree-reference', summary[0])
3084
def test_annotate(self):
3085
tree = self.make_branch_and_tree('tree')
3086
self.build_tree_contents([('tree/file', 'a\n')])
3087
tree.add('file', 'file-id')
3088
tree.commit('a', rev_id='one')
3089
self.build_tree_contents([('tree/file', 'a\nb\n')])
3090
preview = TransformPreview(tree)
3091
self.addCleanup(preview.finalize)
3092
file_trans_id = preview.trans_id_file_id('file-id')
3093
preview.delete_contents(file_trans_id)
3094
preview.create_file('a\nb\nc\n', file_trans_id)
3095
preview_tree = preview.get_preview_tree()
3101
annotation = preview_tree.annotate_iter('file-id', 'me:')
3102
self.assertEqual(expected, annotation)
3104
def test_annotate_missing(self):
3105
preview = self.get_empty_preview()
3106
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3107
preview_tree = preview.get_preview_tree()
3113
annotation = preview_tree.annotate_iter('file-id', 'me:')
3114
self.assertEqual(expected, annotation)
3116
def test_annotate_rename(self):
3117
tree = self.make_branch_and_tree('tree')
3118
self.build_tree_contents([('tree/file', 'a\n')])
3119
tree.add('file', 'file-id')
3120
tree.commit('a', rev_id='one')
3121
preview = TransformPreview(tree)
3122
self.addCleanup(preview.finalize)
3123
file_trans_id = preview.trans_id_file_id('file-id')
3124
preview.adjust_path('newname', preview.root, file_trans_id)
3125
preview_tree = preview.get_preview_tree()
3129
annotation = preview_tree.annotate_iter('file-id', 'me:')
3130
self.assertEqual(expected, annotation)
3132
def test_annotate_deleted(self):
3133
tree = self.make_branch_and_tree('tree')
3134
self.build_tree_contents([('tree/file', 'a\n')])
3135
tree.add('file', 'file-id')
3136
tree.commit('a', rev_id='one')
3137
self.build_tree_contents([('tree/file', 'a\nb\n')])
3138
preview = TransformPreview(tree)
3139
self.addCleanup(preview.finalize)
3140
file_trans_id = preview.trans_id_file_id('file-id')
3141
preview.delete_contents(file_trans_id)
3142
preview_tree = preview.get_preview_tree()
3143
annotation = preview_tree.annotate_iter('file-id', 'me:')
3144
self.assertIs(None, annotation)
3146
def test_stored_kind(self):
3147
preview = self.get_empty_preview()
3148
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3149
preview_tree = preview.get_preview_tree()
3150
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3152
def test_is_executable(self):
3153
preview = self.get_empty_preview()
3154
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3155
preview.set_executability(True, preview.trans_id_file_id('file-id'))
3156
preview_tree = preview.get_preview_tree()
3157
self.assertEqual(True, preview_tree.is_executable('file-id'))
3159
def test_get_set_parent_ids(self):
3160
revision_tree, preview_tree = self.get_tree_and_preview_tree()
3161
self.assertEqual([], preview_tree.get_parent_ids())
3162
preview_tree.set_parent_ids(['rev-1'])
3163
self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
3165
def test_plan_file_merge(self):
3166
work_a = self.make_branch_and_tree('wta')
3167
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3168
work_a.add('file', 'file-id')
3169
base_id = work_a.commit('base version')
3170
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3171
preview = TransformPreview(work_a)
3172
self.addCleanup(preview.finalize)
3173
trans_id = preview.trans_id_file_id('file-id')
3174
preview.delete_contents(trans_id)
3175
preview.create_file('b\nc\nd\ne\n', trans_id)
3176
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3177
tree_a = preview.get_preview_tree()
3178
tree_a.set_parent_ids([base_id])
3180
('killed-a', 'a\n'),
3181
('killed-b', 'b\n'),
3182
('unchanged', 'c\n'),
3183
('unchanged', 'd\n'),
3186
], list(tree_a.plan_file_merge('file-id', tree_b)))
3188
def test_plan_file_merge_revision_tree(self):
3189
work_a = self.make_branch_and_tree('wta')
3190
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3191
work_a.add('file', 'file-id')
3192
base_id = work_a.commit('base version')
3193
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3194
preview = TransformPreview(work_a.basis_tree())
3195
self.addCleanup(preview.finalize)
3196
trans_id = preview.trans_id_file_id('file-id')
3197
preview.delete_contents(trans_id)
3198
preview.create_file('b\nc\nd\ne\n', trans_id)
3199
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3200
tree_a = preview.get_preview_tree()
3201
tree_a.set_parent_ids([base_id])
3203
('killed-a', 'a\n'),
3204
('killed-b', 'b\n'),
3205
('unchanged', 'c\n'),
3206
('unchanged', 'd\n'),
3209
], list(tree_a.plan_file_merge('file-id', tree_b)))
3211
def test_walkdirs(self):
3212
preview = self.get_empty_preview()
3213
root = preview.new_directory('', ROOT_PARENT, 'tree-root')
3214
# FIXME: new_directory should mark root.
3215
preview.fixup_new_roots()
3216
preview_tree = preview.get_preview_tree()
3217
file_trans_id = preview.new_file('a', preview.root, 'contents',
3219
expected = [(('', 'tree-root'),
3220
[('a', 'a', 'file', None, 'a-id', 'file')])]
3221
self.assertEqual(expected, list(preview_tree.walkdirs()))
3223
def test_extras(self):
3224
work_tree = self.make_branch_and_tree('tree')
3225
self.build_tree(['tree/removed-file', 'tree/existing-file',
3226
'tree/not-removed-file'])
3227
work_tree.add(['removed-file', 'not-removed-file'])
3228
preview = TransformPreview(work_tree)
3229
self.addCleanup(preview.finalize)
3230
preview.new_file('new-file', preview.root, 'contents')
3231
preview.new_file('new-versioned-file', preview.root, 'contents',
3233
tree = preview.get_preview_tree()
3234
preview.unversion_file(preview.trans_id_tree_path('removed-file'))
3235
self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
3238
def test_merge_into_preview(self):
3239
work_tree = self.make_branch_and_tree('tree')
3240
self.build_tree_contents([('tree/file','b\n')])
3241
work_tree.add('file', 'file-id')
3242
work_tree.commit('first commit')
3243
child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
3244
self.build_tree_contents([('child/file','b\nc\n')])
3245
child_tree.commit('child commit')
3246
child_tree.lock_write()
3247
self.addCleanup(child_tree.unlock)
3248
work_tree.lock_write()
3249
self.addCleanup(work_tree.unlock)
3250
preview = TransformPreview(work_tree)
3251
self.addCleanup(preview.finalize)
3252
file_trans_id = preview.trans_id_file_id('file-id')
3253
preview.delete_contents(file_trans_id)
3254
preview.create_file('a\nb\n', file_trans_id)
3255
preview_tree = preview.get_preview_tree()
3256
merger = Merger.from_revision_ids(None, preview_tree,
3257
child_tree.branch.last_revision(),
3258
other_branch=child_tree.branch,
3259
tree_branch=work_tree.branch)
3260
merger.merge_type = Merge3Merger
3261
tt = merger.make_merger().make_preview_transform()
3262
self.addCleanup(tt.finalize)
3263
final_tree = tt.get_preview_tree()
3264
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3266
def test_merge_preview_into_workingtree(self):
3267
tree = self.make_branch_and_tree('tree')
3268
tree.set_root_id('TREE_ROOT')
3269
tt = TransformPreview(tree)
3270
self.addCleanup(tt.finalize)
3271
tt.new_file('name', tt.root, 'content', 'file-id')
3272
tree2 = self.make_branch_and_tree('tree2')
3273
tree2.set_root_id('TREE_ROOT')
3274
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3275
None, tree.basis_tree())
3276
merger.merge_type = Merge3Merger
3279
def test_merge_preview_into_workingtree_handles_conflicts(self):
3280
tree = self.make_branch_and_tree('tree')
3281
self.build_tree_contents([('tree/foo', 'bar')])
3282
tree.add('foo', 'foo-id')
3284
tt = TransformPreview(tree)
3285
self.addCleanup(tt.finalize)
3286
trans_id = tt.trans_id_file_id('foo-id')
3287
tt.delete_contents(trans_id)
3288
tt.create_file('baz', trans_id)
3289
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
3290
self.build_tree_contents([('tree2/foo', 'qux')])
3292
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3293
pb, tree.basis_tree())
3294
merger.merge_type = Merge3Merger
3297
def test_has_filename(self):
3298
wt = self.make_branch_and_tree('tree')
3299
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3300
tt = TransformPreview(wt)
3301
removed_id = tt.trans_id_tree_path('removed')
3302
tt.delete_contents(removed_id)
3303
tt.new_file('new', tt.root, 'contents')
3304
modified_id = tt.trans_id_tree_path('modified')
3305
tt.delete_contents(modified_id)
3306
tt.create_file('modified-contents', modified_id)
3307
self.addCleanup(tt.finalize)
3308
tree = tt.get_preview_tree()
3309
self.assertTrue(tree.has_filename('unmodified'))
3310
self.assertFalse(tree.has_filename('not-present'))
3311
self.assertFalse(tree.has_filename('removed'))
3312
self.assertTrue(tree.has_filename('new'))
3313
self.assertTrue(tree.has_filename('modified'))
3315
def test_is_executable(self):
3316
tree = self.make_branch_and_tree('tree')
3317
preview = TransformPreview(tree)
3318
self.addCleanup(preview.finalize)
3319
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3320
preview_tree = preview.get_preview_tree()
3321
self.assertEqual(False, preview_tree.is_executable('baz-id',
3323
self.assertEqual(False, preview_tree.is_executable('baz-id'))
3325
def test_commit_preview_tree(self):
3326
tree = self.make_branch_and_tree('tree')
3327
rev_id = tree.commit('rev1')
3328
tree.branch.lock_write()
3329
self.addCleanup(tree.branch.unlock)
3330
tt = TransformPreview(tree)
3331
tt.new_file('file', tt.root, 'contents', 'file_id')
3332
self.addCleanup(tt.finalize)
3333
preview = tt.get_preview_tree()
3334
preview.set_parent_ids([rev_id])
3335
builder = tree.branch.get_commit_builder([rev_id])
3336
list(builder.record_iter_changes(preview, rev_id, tt.iter_changes()))
3337
builder.finish_inventory()
3338
rev2_id = builder.commit('rev2')
3339
rev2_tree = tree.branch.repository.revision_tree(rev2_id)
3340
self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
3342
def test_ascii_limbo_paths(self):
3343
self.requireFeature(features.UnicodeFilenameFeature)
3344
branch = self.make_branch('any')
3345
tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
3346
tt = TransformPreview(tree)
3347
self.addCleanup(tt.finalize)
3348
foo_id = tt.new_directory('', ROOT_PARENT)
3349
bar_id = tt.new_file(u'\u1234bar', foo_id, 'contents')
3350
limbo_path = tt._limbo_name(bar_id)
3351
self.assertEqual(limbo_path.encode('ascii', 'replace'), limbo_path)
3354
class FakeSerializer(object):
3355
"""Serializer implementation that simply returns the input.
3357
The input is returned in the order used by pack.ContainerPushParser.
3360
def bytes_record(bytes, names):
3364
class TestSerializeTransform(tests.TestCaseWithTransport):
3366
_test_needs_features = [features.UnicodeFilenameFeature]
3368
def get_preview(self, tree=None):
3370
tree = self.make_branch_and_tree('tree')
3371
tt = TransformPreview(tree)
3372
self.addCleanup(tt.finalize)
3375
def assertSerializesTo(self, expected, tt):
3376
records = list(tt.serialize(FakeSerializer()))
3377
self.assertEqual(expected, records)
3380
def default_attribs():
3385
'_new_executability': {},
3387
'_tree_path_ids': {'': 'new-0'},
3389
'_removed_contents': [],
3390
'_non_present_ids': {},
3393
def make_records(self, attribs, contents):
3395
(((('attribs'),),), bencode.bencode(attribs))]
3396
records.extend([(((n, k),), c) for n, k, c in contents])
3399
def creation_records(self):
3400
attribs = self.default_attribs()
3401
attribs['_id_number'] = 3
3402
attribs['_new_name'] = {
3403
'new-1': u'foo\u1234'.encode('utf-8'), 'new-2': 'qux'}
3404
attribs['_new_id'] = {'new-1': 'baz', 'new-2': 'quxx'}
3405
attribs['_new_parent'] = {'new-1': 'new-0', 'new-2': 'new-0'}
3406
attribs['_new_executability'] = {'new-1': 1}
3408
('new-1', 'file', 'i 1\nbar\n'),
3409
('new-2', 'directory', ''),
3411
return self.make_records(attribs, contents)
3413
def test_serialize_creation(self):
3414
tt = self.get_preview()
3415
tt.new_file(u'foo\u1234', tt.root, 'bar', 'baz', True)
3416
tt.new_directory('qux', tt.root, 'quxx')
3417
self.assertSerializesTo(self.creation_records(), tt)
3419
def test_deserialize_creation(self):
3420
tt = self.get_preview()
3421
tt.deserialize(iter(self.creation_records()))
3422
self.assertEqual(3, tt._id_number)
3423
self.assertEqual({'new-1': u'foo\u1234',
3424
'new-2': 'qux'}, tt._new_name)
3425
self.assertEqual({'new-1': 'baz', 'new-2': 'quxx'}, tt._new_id)
3426
self.assertEqual({'new-1': tt.root, 'new-2': tt.root}, tt._new_parent)
3427
self.assertEqual({'baz': 'new-1', 'quxx': 'new-2'}, tt._r_new_id)
3428
self.assertEqual({'new-1': True}, tt._new_executability)
3429
self.assertEqual({'new-1': 'file',
3430
'new-2': 'directory'}, tt._new_contents)
3431
foo_limbo = open(tt._limbo_name('new-1'), 'rb')
3433
foo_content = foo_limbo.read()
3436
self.assertEqual('bar', foo_content)
3438
def symlink_creation_records(self):
3439
attribs = self.default_attribs()
3440
attribs['_id_number'] = 2
3441
attribs['_new_name'] = {'new-1': u'foo\u1234'.encode('utf-8')}
3442
attribs['_new_parent'] = {'new-1': 'new-0'}
3443
contents = [('new-1', 'symlink', u'bar\u1234'.encode('utf-8'))]
3444
return self.make_records(attribs, contents)
3446
def test_serialize_symlink_creation(self):
3447
self.requireFeature(features.SymlinkFeature)
3448
tt = self.get_preview()
3449
tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
3450
self.assertSerializesTo(self.symlink_creation_records(), tt)
3452
def test_deserialize_symlink_creation(self):
3453
self.requireFeature(features.SymlinkFeature)
3454
tt = self.get_preview()
3455
tt.deserialize(iter(self.symlink_creation_records()))
3456
abspath = tt._limbo_name('new-1')
3457
foo_content = osutils.readlink(abspath)
3458
self.assertEqual(u'bar\u1234', foo_content)
3460
def make_destruction_preview(self):
3461
tree = self.make_branch_and_tree('.')
3462
self.build_tree([u'foo\u1234', 'bar'])
3463
tree.add([u'foo\u1234', 'bar'], ['foo-id', 'bar-id'])
3464
return self.get_preview(tree)
3466
def destruction_records(self):
3467
attribs = self.default_attribs()
3468
attribs['_id_number'] = 3
3469
attribs['_removed_id'] = ['new-1']
3470
attribs['_removed_contents'] = ['new-2']
3471
attribs['_tree_path_ids'] = {
3473
u'foo\u1234'.encode('utf-8'): 'new-1',
3476
return self.make_records(attribs, [])
3478
def test_serialize_destruction(self):
3479
tt = self.make_destruction_preview()
3480
foo_trans_id = tt.trans_id_tree_file_id('foo-id')
3481
tt.unversion_file(foo_trans_id)
3482
bar_trans_id = tt.trans_id_tree_file_id('bar-id')
3483
tt.delete_contents(bar_trans_id)
3484
self.assertSerializesTo(self.destruction_records(), tt)
3486
def test_deserialize_destruction(self):
3487
tt = self.make_destruction_preview()
3488
tt.deserialize(iter(self.destruction_records()))
3489
self.assertEqual({u'foo\u1234': 'new-1',
3491
'': tt.root}, tt._tree_path_ids)
3492
self.assertEqual({'new-1': u'foo\u1234',
3494
tt.root: ''}, tt._tree_id_paths)
3495
self.assertEqual(set(['new-1']), tt._removed_id)
3496
self.assertEqual(set(['new-2']), tt._removed_contents)
3498
def missing_records(self):
3499
attribs = self.default_attribs()
3500
attribs['_id_number'] = 2
3501
attribs['_non_present_ids'] = {
3503
return self.make_records(attribs, [])
3505
def test_serialize_missing(self):
3506
tt = self.get_preview()
3507
boo_trans_id = tt.trans_id_file_id('boo')
3508
self.assertSerializesTo(self.missing_records(), tt)
3510
def test_deserialize_missing(self):
3511
tt = self.get_preview()
3512
tt.deserialize(iter(self.missing_records()))
3513
self.assertEqual({'boo': 'new-1'}, tt._non_present_ids)
3515
def make_modification_preview(self):
3516
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3517
LINES_TWO = 'z\nbb\nx\ndd\n'
3518
tree = self.make_branch_and_tree('tree')
3519
self.build_tree_contents([('tree/file', LINES_ONE)])
3520
tree.add('file', 'file-id')
3521
return self.get_preview(tree), LINES_TWO
3523
def modification_records(self):
3524
attribs = self.default_attribs()
3525
attribs['_id_number'] = 2
3526
attribs['_tree_path_ids'] = {
3529
attribs['_removed_contents'] = ['new-1']
3530
contents = [('new-1', 'file',
3531
'i 1\nz\n\nc 0 1 1 1\ni 1\nx\n\nc 0 3 3 1\n')]
3532
return self.make_records(attribs, contents)
3534
def test_serialize_modification(self):
3535
tt, LINES = self.make_modification_preview()
3536
trans_id = tt.trans_id_file_id('file-id')
3537
tt.delete_contents(trans_id)
3538
tt.create_file(LINES, trans_id)
3539
self.assertSerializesTo(self.modification_records(), tt)
3541
def test_deserialize_modification(self):
3542
tt, LINES = self.make_modification_preview()
3543
tt.deserialize(iter(self.modification_records()))
3544
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3546
def make_kind_change_preview(self):
3547
LINES = 'a\nb\nc\nd\n'
3548
tree = self.make_branch_and_tree('tree')
3549
self.build_tree(['tree/foo/'])
3550
tree.add('foo', 'foo-id')
3551
return self.get_preview(tree), LINES
3553
def kind_change_records(self):
3554
attribs = self.default_attribs()
3555
attribs['_id_number'] = 2
3556
attribs['_tree_path_ids'] = {
3559
attribs['_removed_contents'] = ['new-1']
3560
contents = [('new-1', 'file',
3561
'i 4\na\nb\nc\nd\n\n')]
3562
return self.make_records(attribs, contents)
3564
def test_serialize_kind_change(self):
3565
tt, LINES = self.make_kind_change_preview()
3566
trans_id = tt.trans_id_file_id('foo-id')
3567
tt.delete_contents(trans_id)
3568
tt.create_file(LINES, trans_id)
3569
self.assertSerializesTo(self.kind_change_records(), tt)
3571
def test_deserialize_kind_change(self):
3572
tt, LINES = self.make_kind_change_preview()
3573
tt.deserialize(iter(self.kind_change_records()))
3574
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3576
def make_add_contents_preview(self):
3577
LINES = 'a\nb\nc\nd\n'
3578
tree = self.make_branch_and_tree('tree')
3579
self.build_tree(['tree/foo'])
3581
os.unlink('tree/foo')
3582
return self.get_preview(tree), LINES
3584
def add_contents_records(self):
3585
attribs = self.default_attribs()
3586
attribs['_id_number'] = 2
3587
attribs['_tree_path_ids'] = {
3590
contents = [('new-1', 'file',
3591
'i 4\na\nb\nc\nd\n\n')]
3592
return self.make_records(attribs, contents)
3594
def test_serialize_add_contents(self):
3595
tt, LINES = self.make_add_contents_preview()
3596
trans_id = tt.trans_id_tree_path('foo')
3597
tt.create_file(LINES, trans_id)
3598
self.assertSerializesTo(self.add_contents_records(), tt)
3600
def test_deserialize_add_contents(self):
3601
tt, LINES = self.make_add_contents_preview()
3602
tt.deserialize(iter(self.add_contents_records()))
3603
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3605
def test_get_parents_lines(self):
3606
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3607
LINES_TWO = 'z\nbb\nx\ndd\n'
3608
tree = self.make_branch_and_tree('tree')
3609
self.build_tree_contents([('tree/file', LINES_ONE)])
3610
tree.add('file', 'file-id')
3611
tt = self.get_preview(tree)
3612
trans_id = tt.trans_id_tree_path('file')
3613
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3614
tt._get_parents_lines(trans_id))
3616
def test_get_parents_texts(self):
3617
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3618
LINES_TWO = 'z\nbb\nx\ndd\n'
3619
tree = self.make_branch_and_tree('tree')
3620
self.build_tree_contents([('tree/file', LINES_ONE)])
3621
tree.add('file', 'file-id')
3622
tt = self.get_preview(tree)
3623
trans_id = tt.trans_id_tree_path('file')
3624
self.assertEqual((LINES_ONE,),
3625
tt._get_parents_texts(trans_id))
3628
class TestOrphan(tests.TestCaseWithTransport):
3630
def test_no_orphan_for_transform_preview(self):
3631
tree = self.make_branch_and_tree('tree')
3632
tt = transform.TransformPreview(tree)
3633
self.addCleanup(tt.finalize)
3634
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3636
def _set_orphan_policy(self, wt, policy):
3637
wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
3640
def _prepare_orphan(self, wt):
3641
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3642
wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
3643
wt.commit('add dir and file ignoring foo')
3644
tt = transform.TreeTransform(wt)
3645
self.addCleanup(tt.finalize)
3646
# dir and bar are deleted
3647
dir_tid = tt.trans_id_tree_path('dir')
3648
file_tid = tt.trans_id_tree_path('dir/file')
3649
orphan_tid = tt.trans_id_tree_path('dir/foo')
3650
tt.delete_contents(file_tid)
3651
tt.unversion_file(file_tid)
3652
tt.delete_contents(dir_tid)
3653
tt.unversion_file(dir_tid)
3654
# There should be a conflict because dir still contain foo
3655
raw_conflicts = tt.find_conflicts()
3656
self.assertLength(1, raw_conflicts)
3657
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3658
return tt, orphan_tid
3660
def test_new_orphan_created(self):
3661
wt = self.make_branch_and_tree('.')
3662
self._set_orphan_policy(wt, 'move')
3663
tt, orphan_tid = self._prepare_orphan(wt)
3666
warnings.append(args[0] % args[1:])
3667
self.overrideAttr(trace, 'warning', warning)
3668
remaining_conflicts = resolve_conflicts(tt)
3669
self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
3671
# Yeah for resolved conflicts !
3672
self.assertLength(0, remaining_conflicts)
3673
# We have a new orphan
3674
self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
3675
self.assertEquals('bzr-orphans',
3676
tt.final_name(tt.final_parent(orphan_tid)))
3678
def test_never_orphan(self):
3679
wt = self.make_branch_and_tree('.')
3680
self._set_orphan_policy(wt, 'conflict')
3681
tt, orphan_tid = self._prepare_orphan(wt)
3682
remaining_conflicts = resolve_conflicts(tt)
3683
self.assertLength(1, remaining_conflicts)
3684
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3685
remaining_conflicts.pop())
3687
def test_orphan_error(self):
3688
def bogus_orphan(tt, orphan_id, parent_id):
3689
raise transform.OrphaningError(tt.final_name(orphan_id),
3690
tt.final_name(parent_id))
3691
transform.orphaning_registry.register('bogus', bogus_orphan,
3692
'Raise an error when orphaning')
3693
wt = self.make_branch_and_tree('.')
3694
self._set_orphan_policy(wt, 'bogus')
3695
tt, orphan_tid = self._prepare_orphan(wt)
3696
remaining_conflicts = resolve_conflicts(tt)
3697
self.assertLength(1, remaining_conflicts)
3698
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3699
remaining_conflicts.pop())
3701
def test_unknown_orphan_policy(self):
3702
wt = self.make_branch_and_tree('.')
3703
# Set a fictional policy nobody ever implemented
3704
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3705
tt, orphan_tid = self._prepare_orphan(wt)
3708
warnings.append(args[0] % args[1:])
3709
self.overrideAttr(trace, 'warning', warning)
3710
remaining_conflicts = resolve_conflicts(tt)
3711
# We fallback to the default policy which create a conflict
3712
self.assertLength(1, remaining_conflicts)
3713
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3714
remaining_conflicts.pop())
3715
self.assertLength(1, warnings)
3716
self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3719
class TestTransformHooks(tests.TestCaseWithTransport):
3722
super(TestTransformHooks, self).setUp()
3723
self.wt = self.make_branch_and_tree('.')
3726
def get_transform(self):
3727
transform = TreeTransform(self.wt)
3728
self.addCleanup(transform.finalize)
3729
return transform, transform.root
3731
def test_pre_commit_hooks(self):
3733
def record_pre_transform(tree, tt):
3734
calls.append((tree, tt))
3735
MutableTree.hooks.install_named_hook('pre_transform',
3736
record_pre_transform, "Pre transform")
3737
transform, root = self.get_transform()
3738
old_root_id = transform.tree_file_id(root)
3740
self.assertEqual(old_root_id, self.wt.get_root_id())
3741
self.assertEquals([(self.wt, transform)], calls)
3743
def test_post_commit_hooks(self):
3745
def record_post_transform(tree, tt):
3746
calls.append((tree, tt))
3747
MutableTree.hooks.install_named_hook('post_transform',
3748
record_post_transform, "Post transform")
3749
transform, root = self.get_transform()
3750
old_root_id = transform.tree_file_id(root)
3752
self.assertEqual(old_root_id, self.wt.get_root_id())
3753
self.assertEquals([(self.wt, transform)], calls)
added
removed
bzrlib/tests/test_transform.py
