128
167
self.assertIs(self.wt.is_executable('my_pretties2'), False)
129
168
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
130
169
self.assertEqual(len(modified_paths), 3)
131
tree_mod_paths = [self.wt.id2abspath(f) for f in
170
tree_mod_paths = [self.wt.id2abspath(f) for f in
132
171
('ozzie', 'my_pretties', 'my_pretties2')]
133
172
self.assertSubset(tree_mod_paths, modified_paths)
134
173
# is it safe to finalize repeatedly?
135
174
transform.finalize()
136
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())
138
353
def test_hardlink(self):
139
354
self.requireFeature(HardlinkFeature)
140
355
transform, root = self.get_transform()
1717
2236
self.assertEqual('file.moved', target.id2path('lower-id'))
1718
2237
self.assertEqual('FILE', target.id2path('upper-id'))
1721
class MockTransform(object):
1723
def has_named_child(self, by_parent, parent_id, name):
1724
for child_id in by_parent[parent_id]:
1728
elif name == "name.~%s~" % child_id:
1733
class MockEntry(object):
1735
object.__init__(self)
1739
class TestGetBackupName(TestCase):
1740
def test_get_backup_name(self):
1741
tt = MockTransform()
1742
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
1743
self.assertEqual(name, 'name.~1~')
1744
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
1745
self.assertEqual(name, 'name.~2~')
1746
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
1747
self.assertEqual(name, 'name.~1~')
1748
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
1749
self.assertEqual(name, 'name.~1~')
1750
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
1751
self.assertEqual(name, 'name.~4~')
2239
def test_build_tree_observes_sha(self):
2240
source = self.make_branch_and_tree('source')
2241
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2242
source.add(['file1', 'dir', 'dir/file2'],
2243
['file1-id', 'dir-id', 'file2-id'])
2244
source.commit('new files')
2245
target = self.make_branch_and_tree('target')
2247
self.addCleanup(target.unlock)
2248
# We make use of the fact that DirState caches its cutoff time. So we
2249
# set the 'safe' time to one minute in the future.
2250
state = target.current_dirstate()
2251
state._cutoff_time = time.time() + 60
2252
build_tree(source.basis_tree(), target)
2253
entry1_sha = osutils.sha_file_by_name('source/file1')
2254
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2255
# entry[1] is the state information, entry[1][0] is the state of the
2256
# working tree, entry[1][0][1] is the sha value for the current working
2258
entry1 = state._get_entry(0, path_utf8='file1')
2259
self.assertEqual(entry1_sha, entry1[1][0][1])
2260
# The 'size' field must also be set.
2261
self.assertEqual(25, entry1[1][0][2])
2262
entry1_state = entry1[1][0]
2263
entry2 = state._get_entry(0, path_utf8='dir/file2')
2264
self.assertEqual(entry2_sha, entry2[1][0][1])
2265
self.assertEqual(29, entry2[1][0][2])
2266
entry2_state = entry2[1][0]
2267
# Now, make sure that we don't have to re-read the content. The
2268
# packed_stat should match exactly.
2269
self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
2270
self.assertEqual(entry2_sha,
2271
target.get_file_sha1('file2-id', 'dir/file2'))
2272
self.assertEqual(entry1_state, entry1[1][0])
2273
self.assertEqual(entry2_state, entry2[1][0])
2276
class TestCommitTransform(tests.TestCaseWithTransport):
2278
def get_branch(self):
2279
tree = self.make_branch_and_tree('tree')
2281
self.addCleanup(tree.unlock)
2282
tree.commit('empty commit')
2285
def get_branch_and_transform(self):
2286
branch = self.get_branch()
2287
tt = TransformPreview(branch.basis_tree())
2288
self.addCleanup(tt.finalize)
2291
def test_commit_wrong_basis(self):
2292
branch = self.get_branch()
2293
basis = branch.repository.revision_tree(
2294
_mod_revision.NULL_REVISION)
2295
tt = TransformPreview(basis)
2296
self.addCleanup(tt.finalize)
2297
e = self.assertRaises(ValueError, tt.commit, branch, '')
2298
self.assertEqual('TreeTransform not based on branch basis: null:',
2301
def test_empy_commit(self):
2302
branch, tt = self.get_branch_and_transform()
2303
rev = tt.commit(branch, 'my message')
2304
self.assertEqual(2, branch.revno())
2305
repo = branch.repository
2306
self.assertEqual('my message', repo.get_revision(rev).message)
2308
def test_merge_parents(self):
2309
branch, tt = self.get_branch_and_transform()
2310
rev = tt.commit(branch, 'my message', ['rev1b', 'rev1c'])
2311
self.assertEqual(['rev1b', 'rev1c'],
2312
branch.basis_tree().get_parent_ids()[1:])
2314
def test_first_commit(self):
2315
branch = self.make_branch('branch')
2317
self.addCleanup(branch.unlock)
2318
tt = TransformPreview(branch.basis_tree())
2319
self.addCleanup(tt.finalize)
2320
tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
2321
rev = tt.commit(branch, 'my message')
2322
self.assertEqual([], branch.basis_tree().get_parent_ids())
2323
self.assertNotEqual(_mod_revision.NULL_REVISION,
2324
branch.last_revision())
2326
def test_first_commit_with_merge_parents(self):
2327
branch = self.make_branch('branch')
2329
self.addCleanup(branch.unlock)
2330
tt = TransformPreview(branch.basis_tree())
2331
self.addCleanup(tt.finalize)
2332
e = self.assertRaises(ValueError, tt.commit, branch,
2333
'my message', ['rev1b-id'])
2334
self.assertEqual('Cannot supply merge parents for first commit.',
2336
self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
2338
def test_add_files(self):
2339
branch, tt = self.get_branch_and_transform()
2340
tt.new_file('file', tt.root, 'contents', 'file-id')
2341
trans_id = tt.new_directory('dir', tt.root, 'dir-id')
2342
if SymlinkFeature.available():
2343
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2344
rev = tt.commit(branch, 'message')
2345
tree = branch.basis_tree()
2346
self.assertEqual('file', tree.id2path('file-id'))
2347
self.assertEqual('contents', tree.get_file_text('file-id'))
2348
self.assertEqual('dir', tree.id2path('dir-id'))
2349
if SymlinkFeature.available():
2350
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2351
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2353
def test_add_unversioned(self):
2354
branch, tt = self.get_branch_and_transform()
2355
tt.new_file('file', tt.root, 'contents')
2356
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2357
'message', strict=True)
2359
def test_modify_strict(self):
2360
branch, tt = self.get_branch_and_transform()
2361
tt.new_file('file', tt.root, 'contents', 'file-id')
2362
tt.commit(branch, 'message', strict=True)
2363
tt = TransformPreview(branch.basis_tree())
2364
self.addCleanup(tt.finalize)
2365
trans_id = tt.trans_id_file_id('file-id')
2366
tt.delete_contents(trans_id)
2367
tt.create_file('contents', trans_id)
2368
tt.commit(branch, 'message', strict=True)
2370
def test_commit_malformed(self):
2371
"""Committing a malformed transform should raise an exception.
2373
In this case, we are adding a file without adding its parent.
2375
branch, tt = self.get_branch_and_transform()
2376
parent_id = tt.trans_id_file_id('parent-id')
2377
tt.new_file('file', parent_id, 'contents', 'file-id')
2378
self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2381
def test_commit_rich_revision_data(self):
2382
branch, tt = self.get_branch_and_transform()
2383
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2384
committer='me <me@example.com>',
2385
revprops={'foo': 'bar'}, revision_id='revid-1',
2386
authors=['Author1 <author1@example.com>',
2387
'Author2 <author2@example.com>',
2389
self.assertEqual('revid-1', rev_id)
2390
revision = branch.repository.get_revision(rev_id)
2391
self.assertEqual(1, revision.timestamp)
2392
self.assertEqual(43201, revision.timezone)
2393
self.assertEqual('me <me@example.com>', revision.committer)
2394
self.assertEqual(['Author1 <author1@example.com>',
2395
'Author2 <author2@example.com>'],
2396
revision.get_apparent_authors())
2397
del revision.properties['authors']
2398
self.assertEqual({'foo': 'bar',
2399
'branch-nick': 'tree'},
2400
revision.properties)
2402
def test_no_explicit_revprops(self):
2403
branch, tt = self.get_branch_and_transform()
2404
rev_id = tt.commit(branch, 'message', authors=[
2405
'Author1 <author1@example.com>',
2406
'Author2 <author2@example.com>', ])
2407
revision = branch.repository.get_revision(rev_id)
2408
self.assertEqual(['Author1 <author1@example.com>',
2409
'Author2 <author2@example.com>'],
2410
revision.get_apparent_authors())
2411
self.assertEqual('tree', revision.properties['branch-nick'])
1754
2414
class TestFileMover(tests.TestCaseWithTransport):
1866
2526
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
1867
2527
self.assertRaises(Bogus, tt.apply,
1868
2528
_mover=self.ExceptionFileMover(bad_target='d'))
1869
self.failUnlessExists('a')
1870
self.failUnlessExists('a/b')
1872
def test_resolve_no_parent(self):
2529
self.assertPathExists('a')
2530
self.assertPathExists('a/b')
2533
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2534
"""Ensure treetransform creation errors can be safely cleaned up after"""
2536
def _override_globals_in_method(self, instance, method_name, globals):
2537
"""Replace method on instance with one with updated globals"""
2539
func = getattr(instance, method_name).im_func
2540
new_globals = dict(func.func_globals)
2541
new_globals.update(globals)
2542
new_func = types.FunctionType(func.func_code, new_globals,
2543
func.func_name, func.func_defaults)
2544
setattr(instance, method_name,
2545
types.MethodType(new_func, instance, instance.__class__))
2546
self.addCleanup(delattr, instance, method_name)
2549
def _fake_open_raises_before(name, mode):
2550
"""Like open() but raises before doing anything"""
2554
def _fake_open_raises_after(name, mode):
2555
"""Like open() but raises after creating file without returning"""
2556
open(name, mode).close()
2559
def create_transform_and_root_trans_id(self):
2560
"""Setup a transform creating a file in limbo"""
2561
tree = self.make_branch_and_tree('.')
2562
tt = TreeTransform(tree)
2563
return tt, tt.create_path("a", tt.root)
2565
def create_transform_and_subdir_trans_id(self):
2566
"""Setup a transform creating a directory containing a file in limbo"""
2567
tree = self.make_branch_and_tree('.')
2568
tt = TreeTransform(tree)
2569
d_trans_id = tt.create_path("d", tt.root)
2570
tt.create_directory(d_trans_id)
2571
f_trans_id = tt.create_path("a", d_trans_id)
2572
tt.adjust_path("a", d_trans_id, f_trans_id)
2573
return tt, f_trans_id
2575
def test_root_create_file_open_raises_before_creation(self):
2576
tt, trans_id = self.create_transform_and_root_trans_id()
2577
self._override_globals_in_method(tt, "create_file",
2578
{"open": self._fake_open_raises_before})
2579
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2580
path = tt._limbo_name(trans_id)
2581
self.assertPathDoesNotExist(path)
2583
self.assertPathDoesNotExist(tt._limbodir)
2585
def test_root_create_file_open_raises_after_creation(self):
2586
tt, trans_id = self.create_transform_and_root_trans_id()
2587
self._override_globals_in_method(tt, "create_file",
2588
{"open": self._fake_open_raises_after})
2589
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2590
path = tt._limbo_name(trans_id)
2591
self.assertPathExists(path)
2593
self.assertPathDoesNotExist(path)
2594
self.assertPathDoesNotExist(tt._limbodir)
2596
def test_subdir_create_file_open_raises_before_creation(self):
2597
tt, trans_id = self.create_transform_and_subdir_trans_id()
2598
self._override_globals_in_method(tt, "create_file",
2599
{"open": self._fake_open_raises_before})
2600
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2601
path = tt._limbo_name(trans_id)
2602
self.assertPathDoesNotExist(path)
2604
self.assertPathDoesNotExist(tt._limbodir)
2606
def test_subdir_create_file_open_raises_after_creation(self):
2607
tt, trans_id = self.create_transform_and_subdir_trans_id()
2608
self._override_globals_in_method(tt, "create_file",
2609
{"open": self._fake_open_raises_after})
2610
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2611
path = tt._limbo_name(trans_id)
2612
self.assertPathExists(path)
2614
self.assertPathDoesNotExist(path)
2615
self.assertPathDoesNotExist(tt._limbodir)
2617
def test_rename_in_limbo_rename_raises_after_rename(self):
2618
tt, trans_id = self.create_transform_and_root_trans_id()
2619
parent1 = tt.new_directory('parent1', tt.root)
2620
child1 = tt.new_file('child1', parent1, 'contents')
2621
parent2 = tt.new_directory('parent2', tt.root)
2623
class FakeOSModule(object):
2624
def rename(self, old, new):
2627
self._override_globals_in_method(tt, "_rename_in_limbo",
2628
{"os": FakeOSModule()})
2630
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2631
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2632
self.assertPathExists(path)
2634
self.assertPathDoesNotExist(path)
2635
self.assertPathDoesNotExist(tt._limbodir)
2637
def test_rename_in_limbo_rename_raises_before_rename(self):
2638
tt, trans_id = self.create_transform_and_root_trans_id()
2639
parent1 = tt.new_directory('parent1', tt.root)
2640
child1 = tt.new_file('child1', parent1, 'contents')
2641
parent2 = tt.new_directory('parent2', tt.root)
2643
class FakeOSModule(object):
2644
def rename(self, old, new):
2646
self._override_globals_in_method(tt, "_rename_in_limbo",
2647
{"os": FakeOSModule()})
2649
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2650
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2651
self.assertPathExists(path)
2653
self.assertPathDoesNotExist(path)
2654
self.assertPathDoesNotExist(tt._limbodir)
2657
class TestTransformMissingParent(tests.TestCaseWithTransport):
2659
def make_tt_with_versioned_dir(self):
1873
2660
wt = self.make_branch_and_tree('.')
2661
self.build_tree(['dir/',])
2662
wt.add(['dir'], ['dir-id'])
2663
wt.commit('Create dir')
1874
2664
tt = TreeTransform(wt)
1875
2665
self.addCleanup(tt.finalize)
1876
parent = tt.trans_id_file_id('parent-id')
1877
tt.new_file('file', parent, 'Contents')
1878
resolve_conflicts(tt)
2668
def test_resolve_create_parent_for_versioned_file(self):
2669
wt, tt = self.make_tt_with_versioned_dir()
2670
dir_tid = tt.trans_id_tree_file_id('dir-id')
2671
file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
2672
tt.delete_contents(dir_tid)
2673
tt.unversion_file(dir_tid)
2674
conflicts = resolve_conflicts(tt)
2675
# one conflict for the missing directory, one for the unversioned
2677
self.assertLength(2, conflicts)
2679
def test_non_versioned_file_create_conflict(self):
2680
wt, tt = self.make_tt_with_versioned_dir()
2681
dir_tid = tt.trans_id_tree_file_id('dir-id')
2682
tt.new_file('file', dir_tid, 'Contents')
2683
tt.delete_contents(dir_tid)
2684
tt.unversion_file(dir_tid)
2685
conflicts = resolve_conflicts(tt)
2686
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2687
self.assertLength(1, conflicts)
2688
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2692
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2693
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2695
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2696
('', ''), ('directory', 'directory'), (False, False))
1881
2699
class TestTransformPreview(tests.TestCaseWithTransport):
2031
2870
preview_tree = preview.get_preview_tree()
2032
2871
self.assertEqual('target',
2033
2872
preview_tree.get_symlink_target('symlink-id'))
2874
def test_all_file_ids(self):
2875
tree = self.make_branch_and_tree('tree')
2876
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2877
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2878
preview = TransformPreview(tree)
2879
self.addCleanup(preview.finalize)
2880
preview.unversion_file(preview.trans_id_file_id('b-id'))
2881
c_trans_id = preview.trans_id_file_id('c-id')
2882
preview.unversion_file(c_trans_id)
2883
preview.version_file('c-id', c_trans_id)
2884
preview_tree = preview.get_preview_tree()
2885
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2886
preview_tree.all_file_ids())
2888
def test_path2id_deleted_unchanged(self):
2889
tree = self.make_branch_and_tree('tree')
2890
self.build_tree(['tree/unchanged', 'tree/deleted'])
2891
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2892
preview = TransformPreview(tree)
2893
self.addCleanup(preview.finalize)
2894
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2895
preview_tree = preview.get_preview_tree()
2896
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2897
self.assertIs(None, preview_tree.path2id('deleted'))
2899
def test_path2id_created(self):
2900
tree = self.make_branch_and_tree('tree')
2901
self.build_tree(['tree/unchanged'])
2902
tree.add(['unchanged'], ['unchanged-id'])
2903
preview = TransformPreview(tree)
2904
self.addCleanup(preview.finalize)
2905
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2906
'contents', 'new-id')
2907
preview_tree = preview.get_preview_tree()
2908
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2910
def test_path2id_moved(self):
2911
tree = self.make_branch_and_tree('tree')
2912
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2913
tree.add(['old_parent', 'old_parent/child'],
2914
['old_parent-id', 'child-id'])
2915
preview = TransformPreview(tree)
2916
self.addCleanup(preview.finalize)
2917
new_parent = preview.new_directory('new_parent', preview.root,
2919
preview.adjust_path('child', new_parent,
2920
preview.trans_id_file_id('child-id'))
2921
preview_tree = preview.get_preview_tree()
2922
self.assertIs(None, preview_tree.path2id('old_parent/child'))
2923
self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
2925
def test_path2id_renamed_parent(self):
2926
tree = self.make_branch_and_tree('tree')
2927
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2928
tree.add(['old_name', 'old_name/child'],
2929
['parent-id', 'child-id'])
2930
preview = TransformPreview(tree)
2931
self.addCleanup(preview.finalize)
2932
preview.adjust_path('new_name', preview.root,
2933
preview.trans_id_file_id('parent-id'))
2934
preview_tree = preview.get_preview_tree()
2935
self.assertIs(None, preview_tree.path2id('old_name/child'))
2936
self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
2938
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2939
preview_tree = tt.get_preview_tree()
2940
preview_result = list(preview_tree.iter_entries_by_dir(
2944
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
2945
self.assertEqual(actual_result, preview_result)
2947
def test_iter_entries_by_dir_new(self):
2948
tree = self.make_branch_and_tree('tree')
2949
tt = TreeTransform(tree)
2950
tt.new_file('new', tt.root, 'contents', 'new-id')
2951
self.assertMatchingIterEntries(tt)
2953
def test_iter_entries_by_dir_deleted(self):
2954
tree = self.make_branch_and_tree('tree')
2955
self.build_tree(['tree/deleted'])
2956
tree.add('deleted', 'deleted-id')
2957
tt = TreeTransform(tree)
2958
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
2959
self.assertMatchingIterEntries(tt)
2961
def test_iter_entries_by_dir_unversioned(self):
2962
tree = self.make_branch_and_tree('tree')
2963
self.build_tree(['tree/removed'])
2964
tree.add('removed', 'removed-id')
2965
tt = TreeTransform(tree)
2966
tt.unversion_file(tt.trans_id_file_id('removed-id'))
2967
self.assertMatchingIterEntries(tt)
2969
def test_iter_entries_by_dir_moved(self):
2970
tree = self.make_branch_and_tree('tree')
2971
self.build_tree(['tree/moved', 'tree/new_parent/'])
2972
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
2973
tt = TreeTransform(tree)
2974
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2975
tt.trans_id_file_id('moved-id'))
2976
self.assertMatchingIterEntries(tt)
2978
def test_iter_entries_by_dir_specific_file_ids(self):
2979
tree = self.make_branch_and_tree('tree')
2980
tree.set_root_id('tree-root-id')
2981
self.build_tree(['tree/parent/', 'tree/parent/child'])
2982
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
2983
tt = TreeTransform(tree)
2984
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
2986
def test_symlink_content_summary(self):
2987
self.requireFeature(SymlinkFeature)
2988
preview = self.get_empty_preview()
2989
preview.new_symlink('path', preview.root, 'target', 'path-id')
2990
summary = preview.get_preview_tree().path_content_summary('path')
2991
self.assertEqual(('symlink', None, None, 'target'), summary)
2993
def test_missing_content_summary(self):
2994
preview = self.get_empty_preview()
2995
summary = preview.get_preview_tree().path_content_summary('path')
2996
self.assertEqual(('missing', None, None, None), summary)
2998
def test_deleted_content_summary(self):
2999
tree = self.make_branch_and_tree('tree')
3000
self.build_tree(['tree/path/'])
3002
preview = TransformPreview(tree)
3003
self.addCleanup(preview.finalize)
3004
preview.delete_contents(preview.trans_id_tree_path('path'))
3005
summary = preview.get_preview_tree().path_content_summary('path')
3006
self.assertEqual(('missing', None, None, None), summary)
3008
def test_file_content_summary_executable(self):
3009
preview = self.get_empty_preview()
3010
path_id = preview.new_file('path', preview.root, 'contents', 'path-id')
3011
preview.set_executability(True, path_id)
3012
summary = preview.get_preview_tree().path_content_summary('path')
3013
self.assertEqual(4, len(summary))
3014
self.assertEqual('file', summary[0])
3015
# size must be known
3016
self.assertEqual(len('contents'), summary[1])
3018
self.assertEqual(True, summary[2])
3019
# will not have hash (not cheap to determine)
3020
self.assertIs(None, summary[3])
3022
def test_change_executability(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
path_id = preview.trans_id_tree_path('path')
3029
preview.set_executability(True, path_id)
3030
summary = preview.get_preview_tree().path_content_summary('path')
3031
self.assertEqual(True, summary[2])
3033
def test_file_content_summary_non_exec(self):
3034
preview = self.get_empty_preview()
3035
preview.new_file('path', preview.root, 'contents', '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(False, summary[2])
3043
# will not have hash (not cheap to determine)
3044
self.assertIs(None, summary[3])
3046
def test_dir_content_summary(self):
3047
preview = self.get_empty_preview()
3048
preview.new_directory('path', preview.root, 'path-id')
3049
summary = preview.get_preview_tree().path_content_summary('path')
3050
self.assertEqual(('directory', None, None, None), summary)
3052
def test_tree_content_summary(self):
3053
preview = self.get_empty_preview()
3054
path = preview.new_directory('path', preview.root, 'path-id')
3055
preview.set_tree_reference('rev-1', path)
3056
summary = preview.get_preview_tree().path_content_summary('path')
3057
self.assertEqual(4, len(summary))
3058
self.assertEqual('tree-reference', summary[0])
3060
def test_annotate(self):
3061
tree = self.make_branch_and_tree('tree')
3062
self.build_tree_contents([('tree/file', 'a\n')])
3063
tree.add('file', 'file-id')
3064
tree.commit('a', rev_id='one')
3065
self.build_tree_contents([('tree/file', 'a\nb\n')])
3066
preview = TransformPreview(tree)
3067
self.addCleanup(preview.finalize)
3068
file_trans_id = preview.trans_id_file_id('file-id')
3069
preview.delete_contents(file_trans_id)
3070
preview.create_file('a\nb\nc\n', file_trans_id)
3071
preview_tree = preview.get_preview_tree()
3077
annotation = preview_tree.annotate_iter('file-id', 'me:')
3078
self.assertEqual(expected, annotation)
3080
def test_annotate_missing(self):
3081
preview = self.get_empty_preview()
3082
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3083
preview_tree = preview.get_preview_tree()
3089
annotation = preview_tree.annotate_iter('file-id', 'me:')
3090
self.assertEqual(expected, annotation)
3092
def test_annotate_rename(self):
3093
tree = self.make_branch_and_tree('tree')
3094
self.build_tree_contents([('tree/file', 'a\n')])
3095
tree.add('file', 'file-id')
3096
tree.commit('a', rev_id='one')
3097
preview = TransformPreview(tree)
3098
self.addCleanup(preview.finalize)
3099
file_trans_id = preview.trans_id_file_id('file-id')
3100
preview.adjust_path('newname', preview.root, file_trans_id)
3101
preview_tree = preview.get_preview_tree()
3105
annotation = preview_tree.annotate_iter('file-id', 'me:')
3106
self.assertEqual(expected, annotation)
3108
def test_annotate_deleted(self):
3109
tree = self.make_branch_and_tree('tree')
3110
self.build_tree_contents([('tree/file', 'a\n')])
3111
tree.add('file', 'file-id')
3112
tree.commit('a', rev_id='one')
3113
self.build_tree_contents([('tree/file', 'a\nb\n')])
3114
preview = TransformPreview(tree)
3115
self.addCleanup(preview.finalize)
3116
file_trans_id = preview.trans_id_file_id('file-id')
3117
preview.delete_contents(file_trans_id)
3118
preview_tree = preview.get_preview_tree()
3119
annotation = preview_tree.annotate_iter('file-id', 'me:')
3120
self.assertIs(None, annotation)
3122
def test_stored_kind(self):
3123
preview = self.get_empty_preview()
3124
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3125
preview_tree = preview.get_preview_tree()
3126
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3128
def test_is_executable(self):
3129
preview = self.get_empty_preview()
3130
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3131
preview.set_executability(True, preview.trans_id_file_id('file-id'))
3132
preview_tree = preview.get_preview_tree()
3133
self.assertEqual(True, preview_tree.is_executable('file-id'))
3135
def test_get_set_parent_ids(self):
3136
revision_tree, preview_tree = self.get_tree_and_preview_tree()
3137
self.assertEqual([], preview_tree.get_parent_ids())
3138
preview_tree.set_parent_ids(['rev-1'])
3139
self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
3141
def test_plan_file_merge(self):
3142
work_a = self.make_branch_and_tree('wta')
3143
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3144
work_a.add('file', 'file-id')
3145
base_id = work_a.commit('base version')
3146
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3147
preview = TransformPreview(work_a)
3148
self.addCleanup(preview.finalize)
3149
trans_id = preview.trans_id_file_id('file-id')
3150
preview.delete_contents(trans_id)
3151
preview.create_file('b\nc\nd\ne\n', trans_id)
3152
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3153
tree_a = preview.get_preview_tree()
3154
tree_a.set_parent_ids([base_id])
3156
('killed-a', 'a\n'),
3157
('killed-b', 'b\n'),
3158
('unchanged', 'c\n'),
3159
('unchanged', 'd\n'),
3162
], list(tree_a.plan_file_merge('file-id', tree_b)))
3164
def test_plan_file_merge_revision_tree(self):
3165
work_a = self.make_branch_and_tree('wta')
3166
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3167
work_a.add('file', 'file-id')
3168
base_id = work_a.commit('base version')
3169
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3170
preview = TransformPreview(work_a.basis_tree())
3171
self.addCleanup(preview.finalize)
3172
trans_id = preview.trans_id_file_id('file-id')
3173
preview.delete_contents(trans_id)
3174
preview.create_file('b\nc\nd\ne\n', trans_id)
3175
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3176
tree_a = preview.get_preview_tree()
3177
tree_a.set_parent_ids([base_id])
3179
('killed-a', 'a\n'),
3180
('killed-b', 'b\n'),
3181
('unchanged', 'c\n'),
3182
('unchanged', 'd\n'),
3185
], list(tree_a.plan_file_merge('file-id', tree_b)))
3187
def test_walkdirs(self):
3188
preview = self.get_empty_preview()
3189
root = preview.new_directory('', ROOT_PARENT, 'tree-root')
3190
# FIXME: new_directory should mark root.
3191
preview.fixup_new_roots()
3192
preview_tree = preview.get_preview_tree()
3193
file_trans_id = preview.new_file('a', preview.root, 'contents',
3195
expected = [(('', 'tree-root'),
3196
[('a', 'a', 'file', None, 'a-id', 'file')])]
3197
self.assertEqual(expected, list(preview_tree.walkdirs()))
3199
def test_extras(self):
3200
work_tree = self.make_branch_and_tree('tree')
3201
self.build_tree(['tree/removed-file', 'tree/existing-file',
3202
'tree/not-removed-file'])
3203
work_tree.add(['removed-file', 'not-removed-file'])
3204
preview = TransformPreview(work_tree)
3205
self.addCleanup(preview.finalize)
3206
preview.new_file('new-file', preview.root, 'contents')
3207
preview.new_file('new-versioned-file', preview.root, 'contents',
3209
tree = preview.get_preview_tree()
3210
preview.unversion_file(preview.trans_id_tree_path('removed-file'))
3211
self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
3214
def test_merge_into_preview(self):
3215
work_tree = self.make_branch_and_tree('tree')
3216
self.build_tree_contents([('tree/file','b\n')])
3217
work_tree.add('file', 'file-id')
3218
work_tree.commit('first commit')
3219
child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
3220
self.build_tree_contents([('child/file','b\nc\n')])
3221
child_tree.commit('child commit')
3222
child_tree.lock_write()
3223
self.addCleanup(child_tree.unlock)
3224
work_tree.lock_write()
3225
self.addCleanup(work_tree.unlock)
3226
preview = TransformPreview(work_tree)
3227
self.addCleanup(preview.finalize)
3228
file_trans_id = preview.trans_id_file_id('file-id')
3229
preview.delete_contents(file_trans_id)
3230
preview.create_file('a\nb\n', file_trans_id)
3231
preview_tree = preview.get_preview_tree()
3232
merger = Merger.from_revision_ids(None, preview_tree,
3233
child_tree.branch.last_revision(),
3234
other_branch=child_tree.branch,
3235
tree_branch=work_tree.branch)
3236
merger.merge_type = Merge3Merger
3237
tt = merger.make_merger().make_preview_transform()
3238
self.addCleanup(tt.finalize)
3239
final_tree = tt.get_preview_tree()
3240
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3242
def test_merge_preview_into_workingtree(self):
3243
tree = self.make_branch_and_tree('tree')
3244
tree.set_root_id('TREE_ROOT')
3245
tt = TransformPreview(tree)
3246
self.addCleanup(tt.finalize)
3247
tt.new_file('name', tt.root, 'content', 'file-id')
3248
tree2 = self.make_branch_and_tree('tree2')
3249
tree2.set_root_id('TREE_ROOT')
3250
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3251
None, tree.basis_tree())
3252
merger.merge_type = Merge3Merger
3255
def test_merge_preview_into_workingtree_handles_conflicts(self):
3256
tree = self.make_branch_and_tree('tree')
3257
self.build_tree_contents([('tree/foo', 'bar')])
3258
tree.add('foo', 'foo-id')
3260
tt = TransformPreview(tree)
3261
self.addCleanup(tt.finalize)
3262
trans_id = tt.trans_id_file_id('foo-id')
3263
tt.delete_contents(trans_id)
3264
tt.create_file('baz', trans_id)
3265
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
3266
self.build_tree_contents([('tree2/foo', 'qux')])
3268
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3269
pb, tree.basis_tree())
3270
merger.merge_type = Merge3Merger
3273
def test_has_filename(self):
3274
wt = self.make_branch_and_tree('tree')
3275
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3276
tt = TransformPreview(wt)
3277
removed_id = tt.trans_id_tree_path('removed')
3278
tt.delete_contents(removed_id)
3279
tt.new_file('new', tt.root, 'contents')
3280
modified_id = tt.trans_id_tree_path('modified')
3281
tt.delete_contents(modified_id)
3282
tt.create_file('modified-contents', modified_id)
3283
self.addCleanup(tt.finalize)
3284
tree = tt.get_preview_tree()
3285
self.assertTrue(tree.has_filename('unmodified'))
3286
self.assertFalse(tree.has_filename('not-present'))
3287
self.assertFalse(tree.has_filename('removed'))
3288
self.assertTrue(tree.has_filename('new'))
3289
self.assertTrue(tree.has_filename('modified'))
3291
def test_is_executable(self):
3292
tree = self.make_branch_and_tree('tree')
3293
preview = TransformPreview(tree)
3294
self.addCleanup(preview.finalize)
3295
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3296
preview_tree = preview.get_preview_tree()
3297
self.assertEqual(False, preview_tree.is_executable('baz-id',
3299
self.assertEqual(False, preview_tree.is_executable('baz-id'))
3301
def test_commit_preview_tree(self):
3302
tree = self.make_branch_and_tree('tree')
3303
rev_id = tree.commit('rev1')
3304
tree.branch.lock_write()
3305
self.addCleanup(tree.branch.unlock)
3306
tt = TransformPreview(tree)
3307
tt.new_file('file', tt.root, 'contents', 'file_id')
3308
self.addCleanup(tt.finalize)
3309
preview = tt.get_preview_tree()
3310
preview.set_parent_ids([rev_id])
3311
builder = tree.branch.get_commit_builder([rev_id])
3312
list(builder.record_iter_changes(preview, rev_id, tt.iter_changes()))
3313
builder.finish_inventory()
3314
rev2_id = builder.commit('rev2')
3315
rev2_tree = tree.branch.repository.revision_tree(rev2_id)
3316
self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
3318
def test_ascii_limbo_paths(self):
3319
self.requireFeature(features.UnicodeFilenameFeature)
3320
branch = self.make_branch('any')
3321
tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
3322
tt = TransformPreview(tree)
3323
self.addCleanup(tt.finalize)
3324
foo_id = tt.new_directory('', ROOT_PARENT)
3325
bar_id = tt.new_file(u'\u1234bar', foo_id, 'contents')
3326
limbo_path = tt._limbo_name(bar_id)
3327
self.assertEqual(limbo_path.encode('ascii', 'replace'), limbo_path)
3330
class FakeSerializer(object):
3331
"""Serializer implementation that simply returns the input.
3333
The input is returned in the order used by pack.ContainerPushParser.
3336
def bytes_record(bytes, names):
3340
class TestSerializeTransform(tests.TestCaseWithTransport):
3342
_test_needs_features = [features.UnicodeFilenameFeature]
3344
def get_preview(self, tree=None):
3346
tree = self.make_branch_and_tree('tree')
3347
tt = TransformPreview(tree)
3348
self.addCleanup(tt.finalize)
3351
def assertSerializesTo(self, expected, tt):
3352
records = list(tt.serialize(FakeSerializer()))
3353
self.assertEqual(expected, records)
3356
def default_attribs():
3361
'_new_executability': {},
3363
'_tree_path_ids': {'': 'new-0'},
3365
'_removed_contents': [],
3366
'_non_present_ids': {},
3369
def make_records(self, attribs, contents):
3371
(((('attribs'),),), bencode.bencode(attribs))]
3372
records.extend([(((n, k),), c) for n, k, c in contents])
3375
def creation_records(self):
3376
attribs = self.default_attribs()
3377
attribs['_id_number'] = 3
3378
attribs['_new_name'] = {
3379
'new-1': u'foo\u1234'.encode('utf-8'), 'new-2': 'qux'}
3380
attribs['_new_id'] = {'new-1': 'baz', 'new-2': 'quxx'}
3381
attribs['_new_parent'] = {'new-1': 'new-0', 'new-2': 'new-0'}
3382
attribs['_new_executability'] = {'new-1': 1}
3384
('new-1', 'file', 'i 1\nbar\n'),
3385
('new-2', 'directory', ''),
3387
return self.make_records(attribs, contents)
3389
def test_serialize_creation(self):
3390
tt = self.get_preview()
3391
tt.new_file(u'foo\u1234', tt.root, 'bar', 'baz', True)
3392
tt.new_directory('qux', tt.root, 'quxx')
3393
self.assertSerializesTo(self.creation_records(), tt)
3395
def test_deserialize_creation(self):
3396
tt = self.get_preview()
3397
tt.deserialize(iter(self.creation_records()))
3398
self.assertEqual(3, tt._id_number)
3399
self.assertEqual({'new-1': u'foo\u1234',
3400
'new-2': 'qux'}, tt._new_name)
3401
self.assertEqual({'new-1': 'baz', 'new-2': 'quxx'}, tt._new_id)
3402
self.assertEqual({'new-1': tt.root, 'new-2': tt.root}, tt._new_parent)
3403
self.assertEqual({'baz': 'new-1', 'quxx': 'new-2'}, tt._r_new_id)
3404
self.assertEqual({'new-1': True}, tt._new_executability)
3405
self.assertEqual({'new-1': 'file',
3406
'new-2': 'directory'}, tt._new_contents)
3407
foo_limbo = open(tt._limbo_name('new-1'), 'rb')
3409
foo_content = foo_limbo.read()
3412
self.assertEqual('bar', foo_content)
3414
def symlink_creation_records(self):
3415
attribs = self.default_attribs()
3416
attribs['_id_number'] = 2
3417
attribs['_new_name'] = {'new-1': u'foo\u1234'.encode('utf-8')}
3418
attribs['_new_parent'] = {'new-1': 'new-0'}
3419
contents = [('new-1', 'symlink', u'bar\u1234'.encode('utf-8'))]
3420
return self.make_records(attribs, contents)
3422
def test_serialize_symlink_creation(self):
3423
self.requireFeature(features.SymlinkFeature)
3424
tt = self.get_preview()
3425
tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
3426
self.assertSerializesTo(self.symlink_creation_records(), tt)
3428
def test_deserialize_symlink_creation(self):
3429
self.requireFeature(features.SymlinkFeature)
3430
tt = self.get_preview()
3431
tt.deserialize(iter(self.symlink_creation_records()))
3432
abspath = tt._limbo_name('new-1')
3433
foo_content = osutils.readlink(abspath)
3434
self.assertEqual(u'bar\u1234', foo_content)
3436
def make_destruction_preview(self):
3437
tree = self.make_branch_and_tree('.')
3438
self.build_tree([u'foo\u1234', 'bar'])
3439
tree.add([u'foo\u1234', 'bar'], ['foo-id', 'bar-id'])
3440
return self.get_preview(tree)
3442
def destruction_records(self):
3443
attribs = self.default_attribs()
3444
attribs['_id_number'] = 3
3445
attribs['_removed_id'] = ['new-1']
3446
attribs['_removed_contents'] = ['new-2']
3447
attribs['_tree_path_ids'] = {
3449
u'foo\u1234'.encode('utf-8'): 'new-1',
3452
return self.make_records(attribs, [])
3454
def test_serialize_destruction(self):
3455
tt = self.make_destruction_preview()
3456
foo_trans_id = tt.trans_id_tree_file_id('foo-id')
3457
tt.unversion_file(foo_trans_id)
3458
bar_trans_id = tt.trans_id_tree_file_id('bar-id')
3459
tt.delete_contents(bar_trans_id)
3460
self.assertSerializesTo(self.destruction_records(), tt)
3462
def test_deserialize_destruction(self):
3463
tt = self.make_destruction_preview()
3464
tt.deserialize(iter(self.destruction_records()))
3465
self.assertEqual({u'foo\u1234': 'new-1',
3467
'': tt.root}, tt._tree_path_ids)
3468
self.assertEqual({'new-1': u'foo\u1234',
3470
tt.root: ''}, tt._tree_id_paths)
3471
self.assertEqual(set(['new-1']), tt._removed_id)
3472
self.assertEqual(set(['new-2']), tt._removed_contents)
3474
def missing_records(self):
3475
attribs = self.default_attribs()
3476
attribs['_id_number'] = 2
3477
attribs['_non_present_ids'] = {
3479
return self.make_records(attribs, [])
3481
def test_serialize_missing(self):
3482
tt = self.get_preview()
3483
boo_trans_id = tt.trans_id_file_id('boo')
3484
self.assertSerializesTo(self.missing_records(), tt)
3486
def test_deserialize_missing(self):
3487
tt = self.get_preview()
3488
tt.deserialize(iter(self.missing_records()))
3489
self.assertEqual({'boo': 'new-1'}, tt._non_present_ids)
3491
def make_modification_preview(self):
3492
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3493
LINES_TWO = 'z\nbb\nx\ndd\n'
3494
tree = self.make_branch_and_tree('tree')
3495
self.build_tree_contents([('tree/file', LINES_ONE)])
3496
tree.add('file', 'file-id')
3497
return self.get_preview(tree), LINES_TWO
3499
def modification_records(self):
3500
attribs = self.default_attribs()
3501
attribs['_id_number'] = 2
3502
attribs['_tree_path_ids'] = {
3505
attribs['_removed_contents'] = ['new-1']
3506
contents = [('new-1', 'file',
3507
'i 1\nz\n\nc 0 1 1 1\ni 1\nx\n\nc 0 3 3 1\n')]
3508
return self.make_records(attribs, contents)
3510
def test_serialize_modification(self):
3511
tt, LINES = self.make_modification_preview()
3512
trans_id = tt.trans_id_file_id('file-id')
3513
tt.delete_contents(trans_id)
3514
tt.create_file(LINES, trans_id)
3515
self.assertSerializesTo(self.modification_records(), tt)
3517
def test_deserialize_modification(self):
3518
tt, LINES = self.make_modification_preview()
3519
tt.deserialize(iter(self.modification_records()))
3520
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3522
def make_kind_change_preview(self):
3523
LINES = 'a\nb\nc\nd\n'
3524
tree = self.make_branch_and_tree('tree')
3525
self.build_tree(['tree/foo/'])
3526
tree.add('foo', 'foo-id')
3527
return self.get_preview(tree), LINES
3529
def kind_change_records(self):
3530
attribs = self.default_attribs()
3531
attribs['_id_number'] = 2
3532
attribs['_tree_path_ids'] = {
3535
attribs['_removed_contents'] = ['new-1']
3536
contents = [('new-1', 'file',
3537
'i 4\na\nb\nc\nd\n\n')]
3538
return self.make_records(attribs, contents)
3540
def test_serialize_kind_change(self):
3541
tt, LINES = self.make_kind_change_preview()
3542
trans_id = tt.trans_id_file_id('foo-id')
3543
tt.delete_contents(trans_id)
3544
tt.create_file(LINES, trans_id)
3545
self.assertSerializesTo(self.kind_change_records(), tt)
3547
def test_deserialize_kind_change(self):
3548
tt, LINES = self.make_kind_change_preview()
3549
tt.deserialize(iter(self.kind_change_records()))
3550
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3552
def make_add_contents_preview(self):
3553
LINES = 'a\nb\nc\nd\n'
3554
tree = self.make_branch_and_tree('tree')
3555
self.build_tree(['tree/foo'])
3557
os.unlink('tree/foo')
3558
return self.get_preview(tree), LINES
3560
def add_contents_records(self):
3561
attribs = self.default_attribs()
3562
attribs['_id_number'] = 2
3563
attribs['_tree_path_ids'] = {
3566
contents = [('new-1', 'file',
3567
'i 4\na\nb\nc\nd\n\n')]
3568
return self.make_records(attribs, contents)
3570
def test_serialize_add_contents(self):
3571
tt, LINES = self.make_add_contents_preview()
3572
trans_id = tt.trans_id_tree_path('foo')
3573
tt.create_file(LINES, trans_id)
3574
self.assertSerializesTo(self.add_contents_records(), tt)
3576
def test_deserialize_add_contents(self):
3577
tt, LINES = self.make_add_contents_preview()
3578
tt.deserialize(iter(self.add_contents_records()))
3579
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3581
def test_get_parents_lines(self):
3582
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3583
LINES_TWO = 'z\nbb\nx\ndd\n'
3584
tree = self.make_branch_and_tree('tree')
3585
self.build_tree_contents([('tree/file', LINES_ONE)])
3586
tree.add('file', 'file-id')
3587
tt = self.get_preview(tree)
3588
trans_id = tt.trans_id_tree_path('file')
3589
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3590
tt._get_parents_lines(trans_id))
3592
def test_get_parents_texts(self):
3593
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3594
LINES_TWO = 'z\nbb\nx\ndd\n'
3595
tree = self.make_branch_and_tree('tree')
3596
self.build_tree_contents([('tree/file', LINES_ONE)])
3597
tree.add('file', 'file-id')
3598
tt = self.get_preview(tree)
3599
trans_id = tt.trans_id_tree_path('file')
3600
self.assertEqual((LINES_ONE,),
3601
tt._get_parents_texts(trans_id))
3604
class TestOrphan(tests.TestCaseWithTransport):
3606
def test_no_orphan_for_transform_preview(self):
3607
tree = self.make_branch_and_tree('tree')
3608
tt = transform.TransformPreview(tree)
3609
self.addCleanup(tt.finalize)
3610
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3612
def _set_orphan_policy(self, wt, policy):
3613
wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
3616
def _prepare_orphan(self, wt):
3617
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3618
wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
3619
wt.commit('add dir and file ignoring foo')
3620
tt = transform.TreeTransform(wt)
3621
self.addCleanup(tt.finalize)
3622
# dir and bar are deleted
3623
dir_tid = tt.trans_id_tree_path('dir')
3624
file_tid = tt.trans_id_tree_path('dir/file')
3625
orphan_tid = tt.trans_id_tree_path('dir/foo')
3626
tt.delete_contents(file_tid)
3627
tt.unversion_file(file_tid)
3628
tt.delete_contents(dir_tid)
3629
tt.unversion_file(dir_tid)
3630
# There should be a conflict because dir still contain foo
3631
raw_conflicts = tt.find_conflicts()
3632
self.assertLength(1, raw_conflicts)
3633
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3634
return tt, orphan_tid
3636
def test_new_orphan_created(self):
3637
wt = self.make_branch_and_tree('.')
3638
self._set_orphan_policy(wt, 'move')
3639
tt, orphan_tid = self._prepare_orphan(wt)
3642
warnings.append(args[0] % args[1:])
3643
self.overrideAttr(trace, 'warning', warning)
3644
remaining_conflicts = resolve_conflicts(tt)
3645
self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
3647
# Yeah for resolved conflicts !
3648
self.assertLength(0, remaining_conflicts)
3649
# We have a new orphan
3650
self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
3651
self.assertEquals('bzr-orphans',
3652
tt.final_name(tt.final_parent(orphan_tid)))
3654
def test_never_orphan(self):
3655
wt = self.make_branch_and_tree('.')
3656
self._set_orphan_policy(wt, 'conflict')
3657
tt, orphan_tid = self._prepare_orphan(wt)
3658
remaining_conflicts = resolve_conflicts(tt)
3659
self.assertLength(1, remaining_conflicts)
3660
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3661
remaining_conflicts.pop())
3663
def test_orphan_error(self):
3664
def bogus_orphan(tt, orphan_id, parent_id):
3665
raise transform.OrphaningError(tt.final_name(orphan_id),
3666
tt.final_name(parent_id))
3667
transform.orphaning_registry.register('bogus', bogus_orphan,
3668
'Raise an error when orphaning')
3669
wt = self.make_branch_and_tree('.')
3670
self._set_orphan_policy(wt, 'bogus')
3671
tt, orphan_tid = self._prepare_orphan(wt)
3672
remaining_conflicts = resolve_conflicts(tt)
3673
self.assertLength(1, remaining_conflicts)
3674
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3675
remaining_conflicts.pop())
3677
def test_unknown_orphan_policy(self):
3678
wt = self.make_branch_and_tree('.')
3679
# Set a fictional policy nobody ever implemented
3680
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3681
tt, orphan_tid = self._prepare_orphan(wt)
3684
warnings.append(args[0] % args[1:])
3685
self.overrideAttr(trace, 'warning', warning)
3686
remaining_conflicts = resolve_conflicts(tt)
3687
# We fallback to the default policy which create a conflict
3688
self.assertLength(1, remaining_conflicts)
3689
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3690
remaining_conflicts.pop())
3691
self.assertLength(1, warnings)
3692
self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3695
class TestTransformHooks(tests.TestCaseWithTransport):
3698
super(TestTransformHooks, self).setUp()
3699
self.wt = self.make_branch_and_tree('.')
3702
def get_transform(self):
3703
transform = TreeTransform(self.wt)
3704
self.addCleanup(transform.finalize)
3705
return transform, transform.root
3707
def test_pre_commit_hooks(self):
3709
def record_pre_transform(tree, tt):
3710
calls.append((tree, tt))
3711
MutableTree.hooks.install_named_hook('pre_transform',
3712
record_pre_transform, "Pre transform")
3713
transform, root = self.get_transform()
3714
old_root_id = transform.tree_file_id(root)
3716
self.assertEqual(old_root_id, self.wt.get_root_id())
3717
self.assertEquals([(self.wt, transform)], calls)
3719
def test_post_commit_hooks(self):
3721
def record_post_transform(tree, tt):
3722
calls.append((tree, tt))
3723
MutableTree.hooks.install_named_hook('post_transform',
3724
record_post_transform, "Post transform")
3725
transform, root = self.get_transform()
3726
old_root_id = transform.tree_file_id(root)
3728
self.assertEqual(old_root_id, self.wt.get_root_id())
3729
self.assertEquals([(self.wt, transform)], calls)
added
removed
bzrlib/tests/test_transform.py
