123
140
imaginary_id = transform.trans_id_tree_path('imaginary')
124
141
imaginary_id2 = transform.trans_id_tree_path('imaginary/')
125
142
self.assertEqual(imaginary_id, imaginary_id2)
126
self.assertEqual(transform.get_tree_parent(imaginary_id), root)
127
self.assertEqual(transform.final_kind(root), 'directory')
128
self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
143
self.assertEqual(root, transform.get_tree_parent(imaginary_id))
144
self.assertEqual('directory', transform.final_kind(root))
145
self.assertEqual(self.wt.get_root_id(), transform.final_file_id(root))
129
146
trans_id = transform.create_path('name', root)
130
147
self.assertIs(transform.final_file_id(trans_id), None)
131
self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
132
transform.create_file('contents', trans_id)
148
self.assertIs(None, transform.final_kind(trans_id))
149
transform.create_file([b'contents'], trans_id)
133
150
transform.set_executability(True, trans_id)
134
transform.version_file('my_pretties', trans_id)
151
transform.version_file(b'my_pretties', trans_id)
135
152
self.assertRaises(DuplicateKey, transform.version_file,
136
'my_pretties', trans_id)
137
self.assertEqual(transform.final_file_id(trans_id), 'my_pretties')
153
b'my_pretties', trans_id)
154
self.assertEqual(transform.final_file_id(trans_id), b'my_pretties')
138
155
self.assertEqual(transform.final_parent(trans_id), root)
139
156
self.assertIs(transform.final_parent(root), ROOT_PARENT)
140
157
self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
141
158
oz_id = transform.create_path('oz', root)
142
159
transform.create_directory(oz_id)
143
transform.version_file('ozzie', oz_id)
160
transform.version_file(b'ozzie', oz_id)
144
161
trans_id2 = transform.create_path('name2', root)
145
transform.create_file('contents', trans_id2)
162
transform.create_file([b'contents'], trans_id2)
146
163
transform.set_executability(False, trans_id2)
147
transform.version_file('my_pretties2', trans_id2)
164
transform.version_file(b'my_pretties2', trans_id2)
148
165
modified_paths = transform.apply().modified_paths
149
self.assertEqual('contents', self.wt.get_file_byname('name').read())
150
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
151
self.assertIs(self.wt.is_executable('my_pretties'), True)
152
self.assertIs(self.wt.is_executable('my_pretties2'), False)
166
with self.wt.get_file('name') as f:
167
self.assertEqual(b'contents', f.read())
168
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
169
self.assertIs(self.wt.is_executable('name'), True)
170
self.assertIs(self.wt.is_executable('name2'), False)
153
171
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
154
172
self.assertEqual(len(modified_paths), 3)
155
tree_mod_paths = [self.wt.id2abspath(f) for f in
156
('ozzie', 'my_pretties', 'my_pretties2')]
173
tree_mod_paths = [self.wt.abspath(self.wt.id2path(f)) for f in
174
(b'ozzie', b'my_pretties', b'my_pretties2')]
157
175
self.assertSubset(tree_mod_paths, modified_paths)
158
176
# is it safe to finalize repeatedly?
159
177
transform.finalize()
160
178
transform.finalize()
180
def test_apply_informs_tree_of_observed_sha1(self):
181
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
182
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
185
orig = self.wt._observed_sha1
186
def _observed_sha1(*args):
189
self.wt._observed_sha1 = _observed_sha1
191
self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
194
def test_create_file_caches_sha1(self):
195
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
196
trans_id = trans.create_path('file1', root)
197
trans.create_file(contents, trans_id, sha1=sha1)
198
st_val = osutils.lstat(trans._limbo_name(trans_id))
199
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
200
self.assertEqual(o_sha1, sha1)
201
self.assertEqualStat(o_st_val, st_val)
203
def test__apply_insertions_updates_sha1(self):
204
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
205
trans_id = trans.create_path('file1', root)
206
trans.create_file(contents, trans_id, sha1=sha1)
207
st_val = osutils.lstat(trans._limbo_name(trans_id))
208
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
209
self.assertEqual(o_sha1, sha1)
210
self.assertEqualStat(o_st_val, st_val)
211
creation_mtime = trans._creation_mtime + 10.0
212
# We fake a time difference from when the file was created until now it
213
# is being renamed by using os.utime. Note that the change we actually
214
# want to see is the real ctime change from 'os.rename()', but as long
215
# as we observe a new stat value, we should be fine.
216
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
218
new_st_val = osutils.lstat(self.wt.abspath('file1'))
219
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
220
self.assertEqual(o_sha1, sha1)
221
self.assertEqualStat(o_st_val, new_st_val)
222
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
224
def test_new_file_caches_sha1(self):
225
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
226
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
228
st_val = osutils.lstat(trans._limbo_name(trans_id))
229
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
230
self.assertEqual(o_sha1, sha1)
231
self.assertEqualStat(o_st_val, st_val)
233
def test_cancel_creation_removes_observed_sha1(self):
234
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
235
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
237
self.assertTrue(trans_id in trans._observed_sha1s)
238
trans.cancel_creation(trans_id)
239
self.assertFalse(trans_id in trans._observed_sha1s)
162
241
def test_create_files_same_timestamp(self):
163
242
transform, root = self.get_transform()
164
243
self.wt.lock_tree_write()
185
264
def test_change_root_id(self):
186
265
transform, root = self.get_transform()
187
self.assertNotEqual('new-root-id', self.wt.get_root_id())
188
transform.new_directory('', ROOT_PARENT, 'new-root-id')
266
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
267
transform.new_directory('', ROOT_PARENT, b'new-root-id')
189
268
transform.delete_contents(root)
190
269
transform.unversion_file(root)
191
270
transform.fixup_new_roots()
192
271
transform.apply()
193
self.assertEqual('new-root-id', self.wt.get_root_id())
272
self.assertEqual(b'new-root-id', self.wt.get_root_id())
195
274
def test_change_root_id_add_files(self):
196
275
transform, root = self.get_transform()
197
self.assertNotEqual('new-root-id', self.wt.get_root_id())
198
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
199
transform.new_file('file', new_trans_id, ['new-contents\n'],
276
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
277
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
278
transform.new_file('file', new_trans_id, [b'new-contents\n'],
201
280
transform.delete_contents(root)
202
281
transform.unversion_file(root)
203
282
transform.fixup_new_roots()
204
283
transform.apply()
205
self.assertEqual('new-root-id', self.wt.get_root_id())
206
self.assertEqual('new-file-id', self.wt.path2id('file'))
207
self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
284
self.assertEqual(b'new-root-id', self.wt.get_root_id())
285
self.assertEqual(b'new-file-id', self.wt.path2id('file'))
286
self.assertFileEqual(b'new-contents\n', self.wt.abspath('file'))
209
288
def test_add_two_roots(self):
210
289
transform, root = self.get_transform()
211
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
212
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
213
self.assertRaises(ValueError, transform.fixup_new_roots)
290
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
291
new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
292
self.assertRaises(ValueError, transform.fixup_new_roots)
294
def test_retain_existing_root(self):
295
tt, root = self.get_transform()
297
tt.new_directory('', ROOT_PARENT, b'new-root-id')
299
self.assertNotEqual(b'new-root-id', tt.final_file_id(tt.root))
301
def test_retain_existing_root_added_file(self):
302
tt, root = self.get_transform()
303
new_trans_id = tt.new_directory('', ROOT_PARENT, b'new-root-id')
304
child = tt.new_directory('child', new_trans_id, b'child-id')
306
self.assertEqual(tt.root, tt.final_parent(child))
308
def test_add_unversioned_root(self):
309
transform, root = self.get_transform()
310
new_trans_id = transform.new_directory('', ROOT_PARENT, None)
311
transform.delete_contents(transform.root)
312
transform.fixup_new_roots()
313
self.assertNotIn(transform.root, transform._new_id)
315
def test_remove_root_fixup(self):
316
transform, root = self.get_transform()
317
old_root_id = self.wt.get_root_id()
318
self.assertNotEqual(b'new-root-id', old_root_id)
319
transform.delete_contents(root)
320
transform.unversion_file(root)
321
transform.fixup_new_roots()
323
self.assertEqual(old_root_id, self.wt.get_root_id())
325
transform, root = self.get_transform()
326
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
327
new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
328
self.assertRaises(ValueError, transform.fixup_new_roots)
330
def test_fixup_new_roots_permits_empty_tree(self):
331
transform, root = self.get_transform()
332
transform.delete_contents(root)
333
transform.unversion_file(root)
334
transform.fixup_new_roots()
335
self.assertIs(None, transform.final_kind(root))
336
self.assertIs(None, transform.final_file_id(root))
338
def test_apply_retains_root_directory(self):
339
# Do not attempt to delete the physical root directory, because that
341
transform, root = self.get_transform()
343
transform.delete_contents(root)
344
e = self.assertRaises(AssertionError, self.assertRaises,
345
errors.TransformRenameFailed,
347
self.assertContainsRe('TransformRenameFailed not raised', str(e))
349
def test_apply_retains_file_id(self):
350
transform, root = self.get_transform()
351
old_root_id = transform.tree_file_id(root)
352
transform.unversion_file(root)
354
self.assertEqual(old_root_id, self.wt.get_root_id())
215
356
def test_hardlink(self):
216
357
self.requireFeature(HardlinkFeature)
217
358
transform, root = self.get_transform()
218
transform.new_file('file1', root, 'contents')
359
transform.new_file('file1', root, [b'contents'])
219
360
transform.apply()
220
361
target = self.make_branch_and_tree('target')
221
362
target_transform = TreeTransform(target)
222
363
trans_id = target_transform.create_path('file1', target_transform.root)
223
364
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
224
365
target_transform.apply()
225
self.failUnlessExists('target/file1')
366
self.assertPathExists('target/file1')
226
367
source_stat = os.stat(self.wt.abspath('file1'))
227
368
target_stat = os.stat('target/file1')
228
369
self.assertEqual(source_stat, target_stat)
231
372
transform, root = self.get_transform()
232
373
self.wt.lock_tree_write()
233
374
self.addCleanup(self.wt.unlock)
234
trans_id = transform.new_file('name', root, 'contents',
375
trans_id = transform.new_file('name', root, [b'contents'],
376
b'my_pretties', True)
236
377
oz = transform.new_directory('oz', root, 'oz-id')
237
dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
238
toto = transform.new_file('toto', dorothy, 'toto-contents',
378
dorothy = transform.new_directory('dorothy', oz, b'dorothy-id')
379
toto = transform.new_file('toto', dorothy, [b'toto-contents'],
241
382
self.assertEqual(len(transform.find_conflicts()), 0)
242
383
transform.apply()
243
384
self.assertRaises(ReusingTransform, transform.find_conflicts)
244
self.assertEqual('contents', file(self.wt.abspath('name')).read())
385
with open(self.wt.abspath('name'), 'r') as f:
386
self.assertEqual('contents', f.read())
245
387
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
246
self.assertIs(self.wt.is_executable('my_pretties'), True)
247
self.assertEqual(self.wt.path2id('oz'), 'oz-id')
248
self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
249
self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
388
self.assertIs(self.wt.is_executable('name'), True)
389
self.assertEqual(self.wt.path2id('oz'), b'oz-id')
390
self.assertEqual(self.wt.path2id('oz/dorothy'), b'dorothy-id')
391
self.assertEqual(self.wt.path2id('oz/dorothy/toto'), b'toto-id')
251
self.assertEqual('toto-contents',
252
self.wt.get_file_byname('oz/dorothy/toto').read())
253
self.assertIs(self.wt.is_executable('toto-id'), False)
393
self.assertEqual(b'toto-contents',
394
self.wt.get_file('oz/dorothy/toto').read())
395
self.assertIs(self.wt.is_executable('oz/dorothy/toto'), False)
255
397
def test_tree_reference(self):
256
398
transform, root = self.get_transform()
305
447
transform.set_executability(True, oz_id)
306
448
self.assertEqual(transform.find_conflicts(),
307
449
[('unversioned executability', oz_id)])
308
transform.version_file('oz-id', oz_id)
450
transform.version_file(b'oz-id', oz_id)
309
451
self.assertEqual(transform.find_conflicts(),
310
452
[('non-file executability', oz_id)])
311
453
transform.set_executability(None, oz_id)
312
tip_id = transform.new_file('tip', oz_id, 'ozma', 'tip-id')
454
tip_id = transform.new_file('tip', oz_id, [b'ozma'], b'tip-id')
313
455
transform.apply()
314
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
315
self.assertEqual('contents', file(self.wt.abspath('name')).read())
456
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
457
with open(self.wt.abspath('name'), 'r') as f:
458
self.assertEqual(b'contents', f.read())
316
459
transform2, root = self.get_transform()
317
oz_id = transform2.trans_id_tree_file_id('oz-id')
318
newtip = transform2.new_file('tip', oz_id, 'other', 'tip-id')
460
oz_id = transform2.trans_id_tree_path('oz')
461
newtip = transform2.new_file('tip', oz_id, [b'other'], b'tip-id')
319
462
result = transform2.find_conflicts()
320
463
fp = FinalPaths(transform2)
321
self.assert_('oz/tip' in transform2._tree_path_ids)
464
self.assertTrue('oz/tip' in transform2._tree_path_ids)
322
465
self.assertEqual(fp.get_path(newtip), pathjoin('oz', 'tip'))
323
466
self.assertEqual(len(result), 2)
324
467
self.assertEqual((result[0][0], result[0][1]),
405
548
tree.case_sensitive = False
406
549
transform = TreeTransform(tree)
407
550
self.addCleanup(transform.finalize)
408
transform.new_file('file', transform.root, 'content')
409
transform.new_file('FiLe', transform.root, 'content')
551
transform.new_file('file', transform.root, [b'content'])
552
transform.new_file('FiLe', transform.root, [b'content'])
410
553
resolve_conflicts(transform,
411
554
pass_func=lambda t, c: resolve_checkout(t, c, []))
412
555
transform.apply()
413
self.failUnlessExists('tree/file')
414
self.failUnlessExists('tree/FiLe.moved')
556
self.assertPathExists('tree/file')
557
self.assertPathExists('tree/FiLe.moved')
416
559
def test_apply_case_conflict(self):
417
560
"""Ensure that a transform with case conflicts can always be applied"""
418
561
tree = self.make_branch_and_tree('tree')
419
562
transform = TreeTransform(tree)
420
563
self.addCleanup(transform.finalize)
421
transform.new_file('file', transform.root, 'content')
422
transform.new_file('FiLe', transform.root, 'content')
564
transform.new_file('file', transform.root, [b'content'])
565
transform.new_file('FiLe', transform.root, [b'content'])
423
566
dir = transform.new_directory('dir', transform.root)
424
transform.new_file('dirfile', dir, 'content')
425
transform.new_file('dirFiLe', dir, 'content')
567
transform.new_file('dirfile', dir, [b'content'])
568
transform.new_file('dirFiLe', dir, [b'content'])
426
569
resolve_conflicts(transform)
427
570
transform.apply()
428
self.failUnlessExists('tree/file')
571
self.assertPathExists('tree/file')
429
572
if not os.path.exists('tree/FiLe.moved'):
430
self.failUnlessExists('tree/FiLe')
431
self.failUnlessExists('tree/dir/dirfile')
573
self.assertPathExists('tree/FiLe')
574
self.assertPathExists('tree/dir/dirfile')
432
575
if not os.path.exists('tree/dir/dirFiLe.moved'):
433
self.failUnlessExists('tree/dir/dirFiLe')
576
self.assertPathExists('tree/dir/dirFiLe')
435
578
def test_case_insensitive_limbo(self):
436
579
tree = self.make_branch_and_tree('tree')
485
628
create_tree, root = self.get_transform()
487
630
root = create_tree.root
488
create_tree.new_file('name1', root, 'hello1', 'name1')
489
create_tree.new_file('name2', root, 'hello2', 'name2')
490
ddir = create_tree.new_directory('dying_directory', root, 'ddir')
491
create_tree.new_file('dying_file', ddir, 'goodbye1', 'dfile')
492
create_tree.new_file('moving_file', ddir, 'later1', 'mfile')
493
create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
631
create_tree.new_file('name1', root, [b'hello1'], b'name1')
632
create_tree.new_file('name2', root, [b'hello2'], b'name2')
633
ddir = create_tree.new_directory('dying_directory', root, b'ddir')
634
create_tree.new_file('dying_file', ddir, [b'goodbye1'], b'dfile')
635
create_tree.new_file('moving_file', ddir, [b'later1'], b'mfile')
636
create_tree.new_file('moving_file2', root, [b'later2'], b'mfile2')
494
637
create_tree.apply()
496
mangle_tree,root = self.get_transform()
639
mangle_tree, root = self.get_transform()
497
640
root = mangle_tree.root
499
name1 = mangle_tree.trans_id_tree_file_id('name1')
500
name2 = mangle_tree.trans_id_tree_file_id('name2')
642
name1 = mangle_tree.trans_id_tree_path('name1')
643
name2 = mangle_tree.trans_id_tree_path('name2')
501
644
mangle_tree.adjust_path('name2', root, name1)
502
645
mangle_tree.adjust_path('name1', root, name2)
504
647
#tests for deleting parent directories
505
ddir = mangle_tree.trans_id_tree_file_id('ddir')
648
ddir = mangle_tree.trans_id_tree_path('dying_directory')
506
649
mangle_tree.delete_contents(ddir)
507
dfile = mangle_tree.trans_id_tree_file_id('dfile')
650
dfile = mangle_tree.trans_id_tree_path('dying_directory/dying_file')
508
651
mangle_tree.delete_versioned(dfile)
509
652
mangle_tree.unversion_file(dfile)
510
mfile = mangle_tree.trans_id_tree_file_id('mfile')
653
mfile = mangle_tree.trans_id_tree_path('dying_directory/moving_file')
511
654
mangle_tree.adjust_path('mfile', root, mfile)
513
656
#tests for adding parent directories
514
657
newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
515
mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
658
mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
516
659
mangle_tree.adjust_path('mfile2', newdir, mfile2)
517
mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
518
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
660
mangle_tree.new_file('newfile', newdir, [b'hello3'], b'dfile')
661
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
519
662
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
520
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
663
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
521
664
mangle_tree.apply()
522
self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
523
self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
524
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
665
with open(self.wt.abspath('name1'), 'r') as f:
666
self.assertEqual(f.read(), 'hello2')
667
with open(self.wt.abspath('name2'), 'r') as f:
668
self.assertEqual(f.read(), 'hello1')
669
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
525
670
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
526
self.assertEqual(file(mfile2_path).read(), 'later2')
527
self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
528
self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
529
newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
530
self.assertEqual(file(newfile_path).read(), 'hello3')
531
self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
671
with open(mfile2_path, 'r') as f:
672
self.assertEqual(f.read(), 'later2')
673
self.assertEqual(self.wt.id2path(b'mfile2'), 'new_directory/mfile2')
674
self.assertEqual(self.wt.path2id('new_directory/mfile2'), b'mfile2')
675
newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
676
with open(newfile_path, 'r') as f:
677
self.assertEqual(f.read(), 'hello3')
678
self.assertEqual(self.wt.path2id('dying_directory'), b'ddir')
532
679
self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
533
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
680
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
535
682
def test_both_rename(self):
536
create_tree,root = self.get_transform()
537
newdir = create_tree.new_directory('selftest', root, 'selftest-id')
538
create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
683
create_tree, root = self.get_transform()
684
newdir = create_tree.new_directory('selftest', root, b'selftest-id')
685
create_tree.new_file('blackbox.py', newdir, [b'hello1'], b'blackbox-id')
539
686
create_tree.apply()
540
mangle_tree,root = self.get_transform()
541
selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
542
blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
687
mangle_tree, root = self.get_transform()
688
selftest = mangle_tree.trans_id_tree_path('selftest')
689
blackbox = mangle_tree.trans_id_tree_path('selftest/blackbox.py')
543
690
mangle_tree.adjust_path('test', root, selftest)
544
691
mangle_tree.adjust_path('test_too_much', root, selftest)
545
692
mangle_tree.set_executability(True, blackbox)
546
693
mangle_tree.apply()
548
695
def test_both_rename2(self):
549
create_tree,root = self.get_transform()
550
bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
551
tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
696
create_tree, root = self.get_transform()
697
breezy = create_tree.new_directory('breezy', root, 'breezy-id')
698
tests = create_tree.new_directory('tests', breezy, 'tests-id')
552
699
blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
553
create_tree.new_file('test_too_much.py', blackbox, 'hello1',
700
create_tree.new_file('test_too_much.py', blackbox, [b'hello1'],
555
702
create_tree.apply()
556
mangle_tree,root = self.get_transform()
557
bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
558
tests = mangle_tree.trans_id_tree_file_id('tests-id')
559
test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
560
mangle_tree.adjust_path('selftest', bzrlib, tests)
703
mangle_tree, root = self.get_transform()
704
breezy = mangle_tree.trans_id_tree_path('breezy')
705
tests = mangle_tree.trans_id_tree_path('breezy/tests')
706
test_too_much = mangle_tree.trans_id_tree_path('breezy/tests/blackbox/test_too_much.py')
707
mangle_tree.adjust_path('selftest', breezy, tests)
561
708
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
562
709
mangle_tree.set_executability(True, test_too_much)
563
710
mangle_tree.apply()
565
712
def test_both_rename3(self):
566
create_tree,root = self.get_transform()
567
tests = create_tree.new_directory('tests', root, 'tests-id')
568
create_tree.new_file('test_too_much.py', tests, 'hello1',
713
create_tree, root = self.get_transform()
714
tests = create_tree.new_directory('tests', root, b'tests-id')
715
create_tree.new_file('test_too_much.py', tests, [b'hello1'],
570
717
create_tree.apply()
571
mangle_tree,root = self.get_transform()
572
tests = mangle_tree.trans_id_tree_file_id('tests-id')
573
test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
718
mangle_tree, root = self.get_transform()
719
tests = mangle_tree.trans_id_tree_path('tests')
720
test_too_much = mangle_tree.trans_id_tree_path('tests/test_too_much.py')
574
721
mangle_tree.adjust_path('selftest', root, tests)
575
722
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
576
723
mangle_tree.set_executability(True, test_too_much)
596
743
create_tree, root = self.get_transform()
598
745
root = create_tree.root
599
create_tree.new_file('name1', root, 'hello1', 'name1')
746
create_tree.new_file('name1', root, [b'hello1'], 'name1')
600
747
create_tree.apply()
601
748
delete_contents = TreeTransform(self.wt)
602
749
self.addCleanup(delete_contents.finalize)
603
file = delete_contents.trans_id_tree_file_id('name1')
750
file = delete_contents.trans_id_tree_path('name1')
604
751
delete_contents.delete_contents(file)
605
752
delete_contents.apply()
606
753
delete_contents.finalize()
607
754
replace = TreeTransform(self.wt)
608
755
self.addCleanup(replace.finalize)
609
name2 = replace.new_file('name2', root, 'hello2', 'name1')
756
name2 = replace.new_file('name2', root, [b'hello2'], 'name1')
610
757
conflicts = replace.find_conflicts()
611
name1 = replace.trans_id_tree_file_id('name1')
758
name1 = replace.trans_id_tree_path('name1')
612
759
self.assertEqual(conflicts, [('duplicate id', name1, name2)])
613
760
resolve_conflicts(replace)
616
def _test_symlinks(self, link_name1,link_target1,
763
def _test_symlinks(self, link_name1, link_target1,
617
764
link_name2, link_target2):
619
766
def ozpath(p): return 'oz/' + p
621
768
self.requireFeature(SymlinkFeature)
622
769
transform, root = self.get_transform()
623
oz_id = transform.new_directory('oz', root, 'oz-id')
770
oz_id = transform.new_directory('oz', root, b'oz-id')
624
771
wizard = transform.new_symlink(link_name1, oz_id, link_target1,
626
773
wiz_id = transform.create_path(link_name2, oz_id)
627
774
transform.create_symlink(link_target2, wiz_id)
628
transform.version_file('wiz-id2', wiz_id)
775
transform.version_file(b'wiz-id2', wiz_id)
629
776
transform.set_executability(True, wiz_id)
630
777
self.assertEqual(transform.find_conflicts(),
631
778
[('non-file executability', wiz_id)])
632
779
transform.set_executability(None, wiz_id)
633
780
transform.apply()
634
self.assertEqual(self.wt.path2id(ozpath(link_name1)), 'wizard-id')
781
self.assertEqual(self.wt.path2id(ozpath(link_name1)), b'wizard-id')
635
782
self.assertEqual('symlink',
636
783
file_kind(self.wt.abspath(ozpath(link_name1))))
637
784
self.assertEqual(link_target2,
671
818
os.symlink = os_symlink
673
820
def get_conflicted(self):
674
create,root = self.get_transform()
675
create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
676
oz = create.new_directory('oz', root, 'oz-id')
677
create.new_directory('emeraldcity', oz, 'emerald-id')
821
create, root = self.get_transform()
822
create.new_file('dorothy', root, [b'dorothy'], b'dorothy-id')
823
oz = create.new_directory('oz', root, b'oz-id')
824
create.new_directory('emeraldcity', oz, b'emerald-id')
679
conflicts,root = self.get_transform()
826
conflicts, root = self.get_transform()
680
827
# set up duplicate entry, duplicate id
681
new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
683
old_dorothy = conflicts.trans_id_tree_file_id('dorothy-id')
684
oz = conflicts.trans_id_tree_file_id('oz-id')
828
new_dorothy = conflicts.new_file('dorothy', root, [b'dorothy'],
830
old_dorothy = conflicts.trans_id_tree_path('dorothy')
831
oz = conflicts.trans_id_tree_path('oz')
685
832
# set up DeletedParent parent conflict
686
833
conflicts.delete_versioned(oz)
687
emerald = conflicts.trans_id_tree_file_id('emerald-id')
834
emerald = conflicts.trans_id_tree_path('oz/emeraldcity')
688
835
# set up MissingParent conflict
689
munchkincity = conflicts.trans_id_file_id('munchkincity-id')
836
munchkincity = conflicts.trans_id_file_id(b'munchkincity-id')
690
837
conflicts.adjust_path('munchkincity', root, munchkincity)
691
conflicts.new_directory('auntem', munchkincity, 'auntem-id')
838
conflicts.new_directory('auntem', munchkincity, b'auntem-id')
692
839
# set up parent loop
693
840
conflicts.adjust_path('emeraldcity', emerald, emerald)
694
841
return conflicts, emerald, oz, old_dorothy, new_dorothy
775
922
def test_resolve_conflicts_wrong_existing_parent_kind(self):
776
923
tt = self.prepare_wrong_parent_kind()
777
924
raw_conflicts = resolve_conflicts(tt)
778
self.assertEqual(set([('non-directory parent', 'Created directory',
779
'new-3')]), raw_conflicts)
925
self.assertEqual({('non-directory parent', 'Created directory',
926
'new-3')}, raw_conflicts)
780
927
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
781
928
self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
782
'parent-id')], cooked_conflicts)
929
b'parent-id')], cooked_conflicts)
784
self.assertEqual(None, self.wt.path2id('parent'))
931
self.assertFalse(self.wt.is_versioned('parent'))
785
932
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
787
934
def test_resolve_conflicts_wrong_new_parent_kind(self):
788
935
tt, root = self.get_transform()
789
parent_id = tt.new_directory('parent', root, 'parent-id')
790
tt.new_file('child,', parent_id, 'contents2', 'file-id')
936
parent_id = tt.new_directory('parent', root, b'parent-id')
937
tt.new_file('child,', parent_id, [b'contents2'], b'file-id')
792
939
tt, root = self.get_transform()
793
parent_id = tt.trans_id_file_id('parent-id')
940
parent_id = tt.trans_id_file_id(b'parent-id')
794
941
tt.delete_contents(parent_id)
795
tt.create_file('contents', parent_id)
942
tt.create_file([b'contents'], parent_id)
796
943
raw_conflicts = resolve_conflicts(tt)
797
self.assertEqual(set([('non-directory parent', 'Created directory',
798
'new-3')]), raw_conflicts)
944
self.assertEqual({('non-directory parent', 'Created directory',
945
'new-3')}, raw_conflicts)
800
self.assertEqual(None, self.wt.path2id('parent'))
801
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
947
self.assertFalse(self.wt.is_versioned('parent'))
948
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
803
950
def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
804
951
tt, root = self.get_transform()
805
952
parent_id = tt.new_directory('parent', root)
806
tt.new_file('child,', parent_id, 'contents2')
953
tt.new_file('child,', parent_id, [b'contents2'])
808
955
tt, root = self.get_transform()
809
956
parent_id = tt.trans_id_tree_path('parent')
810
957
tt.delete_contents(parent_id)
811
tt.create_file('contents', parent_id)
958
tt.create_file([b'contents'], parent_id)
812
959
resolve_conflicts(tt)
814
self.assertIs(None, self.wt.path2id('parent'))
815
self.assertIs(None, self.wt.path2id('parent.new'))
961
self.assertFalse(self.wt.is_versioned('parent'))
962
self.assertFalse(self.wt.is_versioned('parent.new'))
964
def test_resolve_conflicts_missing_parent(self):
965
wt = self.make_branch_and_tree('.')
966
tt = TreeTransform(wt)
967
self.addCleanup(tt.finalize)
968
parent = tt.trans_id_file_id(b'parent-id')
969
tt.new_file('file', parent, [b'Contents'])
970
raw_conflicts = resolve_conflicts(tt)
971
# Since the directory doesn't exist it's seen as 'missing'. So
972
# 'resolve_conflicts' create a conflict asking for it to be created.
973
self.assertLength(1, raw_conflicts)
974
self.assertEqual(('missing parent', 'Created directory', 'new-1'),
976
# apply fail since the missing directory doesn't exist
977
self.assertRaises(errors.NoFinalPath, tt.apply)
817
979
def test_moving_versioned_directories(self):
818
980
create, root = self.get_transform()
821
983
create.new_directory('oz', root, 'oz-id')
823
985
cyclone, root = self.get_transform()
824
oz = cyclone.trans_id_tree_file_id('oz-id')
825
house = cyclone.trans_id_tree_file_id('house-id')
986
oz = cyclone.trans_id_tree_path('oz')
987
house = cyclone.trans_id_tree_path('house')
826
988
cyclone.adjust_path('house', oz, house)
829
991
def test_moving_root(self):
830
992
create, root = self.get_transform()
831
fun = create.new_directory('fun', root, 'fun-id')
832
create.new_directory('sun', root, 'sun-id')
833
create.new_directory('moon', root, 'moon')
993
fun = create.new_directory('fun', root, b'fun-id')
994
create.new_directory('sun', root, b'sun-id')
995
create.new_directory('moon', root, b'moon')
835
997
transform, root = self.get_transform()
836
998
transform.adjust_root_path('oldroot', fun)
837
999
new_root = transform.trans_id_tree_path('')
838
transform.version_file('new-root', new_root)
1000
transform.version_file(b'new-root', new_root)
839
1001
transform.apply()
841
1003
def test_renames(self):
842
1004
create, root = self.get_transform()
843
old = create.new_directory('old-parent', root, 'old-id')
844
intermediate = create.new_directory('intermediate', old, 'im-id')
845
myfile = create.new_file('myfile', intermediate, 'myfile-text',
1005
old = create.new_directory('old-parent', root, b'old-id')
1006
intermediate = create.new_directory('intermediate', old, b'im-id')
1007
myfile = create.new_file('myfile', intermediate, [b'myfile-text'],
848
1010
rename, root = self.get_transform()
849
old = rename.trans_id_file_id('old-id')
1011
old = rename.trans_id_file_id(b'old-id')
850
1012
rename.adjust_path('new', root, old)
851
myfile = rename.trans_id_file_id('myfile-id')
1013
myfile = rename.trans_id_file_id(b'myfile-id')
852
1014
rename.set_executability(True, myfile)
1017
def test_rename_fails(self):
1018
self.requireFeature(features.not_running_as_root)
1019
# see https://bugs.launchpad.net/bzr/+bug/491763
1020
create, root_id = self.get_transform()
1021
first_dir = create.new_directory('first-dir', root_id, b'first-id')
1022
myfile = create.new_file('myfile', root_id, [b'myfile-text'],
1025
if os.name == "posix" and sys.platform != "cygwin":
1026
# posix filesystems fail on renaming if the readonly bit is set
1027
osutils.make_readonly(self.wt.abspath('first-dir'))
1028
elif os.name == "nt":
1029
# windows filesystems fail on renaming open files
1030
self.addCleanup(open(self.wt.abspath('myfile')).close)
1032
self.skipTest("Can't force a permissions error on rename")
1033
# now transform to rename
1034
rename_transform, root_id = self.get_transform()
1035
file_trans_id = rename_transform.trans_id_file_id(b'myfile-id')
1036
dir_id = rename_transform.trans_id_file_id(b'first-id')
1037
rename_transform.adjust_path('newname', dir_id, file_trans_id)
1038
e = self.assertRaises(errors.TransformRenameFailed,
1039
rename_transform.apply)
1040
# On nix looks like:
1041
# "Failed to rename .../work/.bzr/checkout/limbo/new-1
1042
# to .../first-dir/newname: [Errno 13] Permission denied"
1043
# On windows looks like:
1044
# "Failed to rename .../work/myfile to
1045
# .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
1046
# This test isn't concerned with exactly what the error looks like,
1047
# and the strerror will vary across OS and locales, but the assert
1048
# that the exeception attributes are what we expect
1049
self.assertEqual(e.errno, errno.EACCES)
1050
if os.name == "posix":
1051
self.assertEndsWith(e.to_path, "/first-dir/newname")
1053
self.assertEqual(os.path.basename(e.from_path), "myfile")
855
1055
def test_set_executability_order(self):
856
1056
"""Ensure that executability behaves the same, no matter what order.
865
1065
wt = transform._tree
867
1067
self.addCleanup(wt.unlock)
868
transform.new_file('set_on_creation', root, 'Set on creation', 'soc',
1068
transform.new_file('set_on_creation', root, [b'Set on creation'], 'soc',
870
1070
sac = transform.new_file('set_after_creation', root,
871
'Set after creation', 'sac')
1071
[b'Set after creation'], 'sac')
872
1072
transform.set_executability(True, sac)
873
uws = transform.new_file('unset_without_set', root, 'Unset badly',
1073
uws = transform.new_file('unset_without_set', root, [b'Unset badly'],
875
1075
self.assertRaises(KeyError, transform.set_executability, None, uws)
876
1076
transform.apply()
877
self.assertTrue(wt.is_executable('soc'))
878
self.assertTrue(wt.is_executable('sac'))
1077
self.assertTrue(wt.is_executable('set_on_creation'))
1078
self.assertTrue(wt.is_executable('set_after_creation'))
880
1080
def test_preserve_mode(self):
881
1081
"""File mode is preserved when replacing content"""
882
1082
if sys.platform == 'win32':
883
1083
raise TestSkipped('chmod has no effect on win32')
884
1084
transform, root = self.get_transform()
885
transform.new_file('file1', root, 'contents', 'file1-id', True)
1085
transform.new_file('file1', root, [b'contents'], b'file1-id', True)
886
1086
transform.apply()
887
1087
self.wt.lock_write()
888
1088
self.addCleanup(self.wt.unlock)
889
self.assertTrue(self.wt.is_executable('file1-id'))
1089
self.assertTrue(self.wt.is_executable('file1'))
890
1090
transform, root = self.get_transform()
891
file1_id = transform.trans_id_tree_file_id('file1-id')
1091
file1_id = transform.trans_id_tree_path('file1')
892
1092
transform.delete_contents(file1_id)
893
transform.create_file('contents2', file1_id)
1093
transform.create_file([b'contents2'], file1_id)
894
1094
transform.apply()
895
self.assertTrue(self.wt.is_executable('file1-id'))
1095
self.assertTrue(self.wt.is_executable('file1'))
897
1097
def test__set_mode_stats_correctly(self):
898
1098
"""_set_mode stats to determine file mode."""
925
1125
self.assertEqual([bar1_abspath], stat_paths)
927
1127
def test_iter_changes(self):
928
self.wt.set_root_id('eert_toor')
1128
self.wt.set_root_id(b'eert_toor')
929
1129
transform, root = self.get_transform()
930
transform.new_file('old', root, 'blah', 'id-1', True)
1130
transform.new_file('old', root, [b'blah'], b'id-1', True)
931
1131
transform.apply()
932
1132
transform, root = self.get_transform()
934
1134
self.assertEqual([], list(transform.iter_changes()))
935
old = transform.trans_id_tree_file_id('id-1')
1135
old = transform.trans_id_tree_path('old')
936
1136
transform.unversion_file(old)
937
self.assertEqual([('id-1', ('old', None), False, (True, False),
938
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1137
self.assertEqual([(b'id-1', ('old', None), False, (True, False),
1138
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
939
1139
(True, True))], list(transform.iter_changes()))
940
transform.new_directory('new', root, 'id-1')
941
self.assertEqual([('id-1', ('old', 'new'), True, (True, True),
942
('eert_toor', 'eert_toor'), ('old', 'new'),
1140
transform.new_directory('new', root, b'id-1')
1141
self.assertEqual([(b'id-1', ('old', 'new'), True, (True, True),
1142
(b'eert_toor', b'eert_toor'), ('old', 'new'),
943
1143
('file', 'directory'),
944
1144
(True, False))], list(transform.iter_changes()))
946
1146
transform.finalize()
948
1148
def test_iter_changes_new(self):
949
self.wt.set_root_id('eert_toor')
1149
self.wt.set_root_id(b'eert_toor')
950
1150
transform, root = self.get_transform()
951
transform.new_file('old', root, 'blah')
1151
transform.new_file('old', root, [b'blah'])
952
1152
transform.apply()
953
1153
transform, root = self.get_transform()
955
1155
old = transform.trans_id_tree_path('old')
956
transform.version_file('id-1', old)
957
self.assertEqual([('id-1', (None, 'old'), False, (False, True),
958
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1156
transform.version_file(b'id-1', old)
1157
self.assertEqual([(b'id-1', (None, 'old'), False, (False, True),
1158
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
959
1159
(False, False))], list(transform.iter_changes()))
961
1161
transform.finalize()
963
1163
def test_iter_changes_modifications(self):
964
self.wt.set_root_id('eert_toor')
1164
self.wt.set_root_id(b'eert_toor')
965
1165
transform, root = self.get_transform()
966
transform.new_file('old', root, 'blah', 'id-1')
967
transform.new_file('new', root, 'blah')
1166
transform.new_file('old', root, [b'blah'], 'id-1')
1167
transform.new_file('new', root, [b'blah'])
968
1168
transform.new_directory('subdir', root, 'subdir-id')
969
1169
transform.apply()
970
1170
transform, root = self.get_transform()
972
1172
old = transform.trans_id_tree_path('old')
973
subdir = transform.trans_id_tree_file_id('subdir-id')
1173
subdir = transform.trans_id_tree_path('subdir')
974
1174
new = transform.trans_id_tree_path('new')
975
1175
self.assertEqual([], list(transform.iter_changes()))
977
1177
#content deletion
978
1178
transform.delete_contents(old)
979
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
980
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', None),
1179
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1180
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', None),
981
1181
(False, False))], list(transform.iter_changes()))
984
transform.create_file('blah', old)
985
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
986
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1184
transform.create_file([b'blah'], old)
1185
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1186
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
987
1187
(False, False))], list(transform.iter_changes()))
988
1188
transform.cancel_deletion(old)
989
1189
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
990
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1190
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
991
1191
(False, False))], list(transform.iter_changes()))
992
1192
transform.cancel_creation(old)
994
1194
# move file_id to a different file
995
1195
self.assertEqual([], list(transform.iter_changes()))
996
1196
transform.unversion_file(old)
997
transform.version_file('id-1', new)
1197
transform.version_file(b'id-1', new)
998
1198
transform.adjust_path('old', root, new)
999
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
1199
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1000
1200
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1001
1201
(False, False))], list(transform.iter_changes()))
1002
1202
transform.cancel_versioning(new)
1033
1233
transform.finalize()
1035
1235
def test_iter_changes_modified_bleed(self):
1036
self.wt.set_root_id('eert_toor')
1236
self.wt.set_root_id(b'eert_toor')
1037
1237
"""Modified flag should not bleed from one change to another"""
1038
1238
# unfortunately, we have no guarantee that file1 (which is modified)
1039
1239
# will be applied before file2. And if it's applied after file2, it
1040
1240
# obviously can't bleed into file2's change output. But for now, it
1042
1242
transform, root = self.get_transform()
1043
transform.new_file('file1', root, 'blah', 'id-1')
1044
transform.new_file('file2', root, 'blah', 'id-2')
1243
transform.new_file('file1', root, [b'blah'], b'id-1')
1244
transform.new_file('file2', root, [b'blah'], b'id-2')
1045
1245
transform.apply()
1046
1246
transform, root = self.get_transform()
1048
transform.delete_contents(transform.trans_id_file_id('id-1'))
1248
transform.delete_contents(transform.trans_id_file_id(b'id-1'))
1049
1249
transform.set_executability(True,
1050
transform.trans_id_file_id('id-2'))
1051
self.assertEqual([('id-1', (u'file1', u'file1'), True, (True, True),
1052
('eert_toor', 'eert_toor'), ('file1', u'file1'),
1250
transform.trans_id_file_id(b'id-2'))
1251
self.assertEqual([(b'id-1', (u'file1', u'file1'), True, (True, True),
1252
(b'eert_toor', b'eert_toor'), ('file1', u'file1'),
1053
1253
('file', None), (False, False)),
1054
('id-2', (u'file2', u'file2'), False, (True, True),
1055
('eert_toor', 'eert_toor'), ('file2', u'file2'),
1254
(b'id-2', (u'file2', u'file2'), False, (True, True),
1255
(b'eert_toor', b'eert_toor'), ('file2', u'file2'),
1056
1256
('file', 'file'), (False, True))],
1057
1257
list(transform.iter_changes()))
1404
1598
self.build_tree(['baz'])
1405
1599
tt.create_hardlink("baz", foo_trans_id)
1407
self.failUnlessExists("foo")
1408
self.failUnlessExists("baz")
1601
self.assertPathExists("foo")
1602
self.assertPathExists("baz")
1410
1604
self.addCleanup(wt.unlock)
1411
self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1605
self.assertEqual(wt.kind("foo"), "file")
1414
1607
def test_no_final_path(self):
1415
1608
transform, root = self.get_transform()
1416
trans_id = transform.trans_id_file_id('foo')
1417
transform.create_file('bar', trans_id)
1609
trans_id = transform.trans_id_file_id(b'foo')
1610
transform.create_file([b'bar'], trans_id)
1418
1611
transform.cancel_creation(trans_id)
1419
1612
transform.apply()
1421
1614
def test_create_from_tree(self):
1422
1615
tree1 = self.make_branch_and_tree('tree1')
1423
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', 'baz')])
1424
tree1.add(['foo', 'bar'], ['foo-id', 'bar-id'])
1616
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', b'baz')])
1617
tree1.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
1425
1618
tree2 = self.make_branch_and_tree('tree2')
1426
1619
tt = TreeTransform(tree2)
1427
1620
foo_trans_id = tt.create_path('foo', tt.root)
1428
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1621
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
1429
1622
bar_trans_id = tt.create_path('bar', tt.root)
1430
create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
1623
create_from_tree(tt, bar_trans_id, tree1, 'bar', file_id=b'bar-id')
1432
1625
self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1433
self.assertFileEqual('baz', 'tree2/bar')
1626
self.assertFileEqual(b'baz', 'tree2/bar')
1435
1628
def test_create_from_tree_bytes(self):
1436
1629
"""Provided lines are used instead of tree content."""
1437
1630
tree1 = self.make_branch_and_tree('tree1')
1438
self.build_tree_contents([('tree1/foo', 'bar'),])
1439
tree1.add('foo', 'foo-id')
1631
self.build_tree_contents([('tree1/foo', b'bar'),])
1632
tree1.add('foo', b'foo-id')
1440
1633
tree2 = self.make_branch_and_tree('tree2')
1441
1634
tt = TreeTransform(tree2)
1442
1635
foo_trans_id = tt.create_path('foo', tt.root)
1443
create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
1636
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id',
1445
self.assertFileEqual('qux', 'tree2/foo')
1639
self.assertFileEqual(b'qux', 'tree2/foo')
1447
1641
def test_create_from_tree_symlink(self):
1448
1642
self.requireFeature(SymlinkFeature)
1449
1643
tree1 = self.make_branch_and_tree('tree1')
1450
1644
os.symlink('bar', 'tree1/foo')
1451
tree1.add('foo', 'foo-id')
1645
tree1.add('foo', b'foo-id')
1452
1646
tt = TreeTransform(self.make_branch_and_tree('tree2'))
1453
1647
foo_trans_id = tt.create_path('foo', tt.root)
1454
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1648
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
1456
1650
self.assertEqual('bar', os.readlink('tree2/foo'))
1461
1655
def __init__(self, dirname, root_id):
1462
1656
self.name = dirname
1463
1657
os.mkdir(dirname)
1464
self.wt = BzrDir.create_standalone_workingtree(dirname)
1658
self.wt = ControlDir.create_standalone_workingtree(dirname)
1465
1659
self.wt.set_root_id(root_id)
1466
1660
self.b = self.wt.branch
1467
1661
self.tt = TreeTransform(self.wt)
1468
self.root = self.tt.trans_id_tree_file_id(self.wt.get_root_id())
1662
self.root = self.tt.trans_id_tree_path('')
1471
1665
def conflict_text(tree, merge):
1472
template = '%s TREE\n%s%s\n%s%s MERGE-SOURCE\n'
1473
return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1666
template = b'%s TREE\n%s%s\n%s%s MERGE-SOURCE\n'
1667
return template % (b'<' * 7, tree, b'=' * 7, merge, b'>' * 7)
1670
class TestInventoryAltered(tests.TestCaseWithTransport):
1672
def test_inventory_altered_unchanged(self):
1673
tree = self.make_branch_and_tree('tree')
1674
self.build_tree(['tree/foo'])
1675
tree.add('foo', b'foo-id')
1676
with TransformPreview(tree) as tt:
1677
self.assertEqual([], tt._inventory_altered())
1679
def test_inventory_altered_changed_parent_id(self):
1680
tree = self.make_branch_and_tree('tree')
1681
self.build_tree(['tree/foo'])
1682
tree.add('foo', b'foo-id')
1683
with TransformPreview(tree) as tt:
1684
tt.unversion_file(tt.root)
1685
tt.version_file(b'new-id', tt.root)
1686
foo_trans_id = tt.trans_id_tree_path('foo')
1687
foo_tuple = ('foo', foo_trans_id)
1688
root_tuple = ('', tt.root)
1689
self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
1691
def test_inventory_altered_noop_changed_parent_id(self):
1692
tree = self.make_branch_and_tree('tree')
1693
self.build_tree(['tree/foo'])
1694
tree.add('foo', b'foo-id')
1695
with TransformPreview(tree) as tt:
1696
tt.unversion_file(tt.root)
1697
tt.version_file(tree.get_root_id(), tt.root)
1698
foo_trans_id = tt.trans_id_tree_path('foo')
1699
self.assertEqual([], tt._inventory_altered())
1476
1702
class TestTransformMerge(TestCaseInTempDir):
1478
1704
def test_text_merge(self):
1479
1705
root_id = generate_ids.gen_root_id()
1480
1706
base = TransformGroup("base", root_id)
1481
base.tt.new_file('a', base.root, 'a\nb\nc\nd\be\n', 'a')
1482
base.tt.new_file('b', base.root, 'b1', 'b')
1483
base.tt.new_file('c', base.root, 'c', 'c')
1484
base.tt.new_file('d', base.root, 'd', 'd')
1485
base.tt.new_file('e', base.root, 'e', 'e')
1486
base.tt.new_file('f', base.root, 'f', 'f')
1487
base.tt.new_directory('g', base.root, 'g')
1488
base.tt.new_directory('h', base.root, 'h')
1707
base.tt.new_file('a', base.root, [b'a\nb\nc\nd\be\n'], b'a')
1708
base.tt.new_file('b', base.root, [b'b1'], b'b')
1709
base.tt.new_file('c', base.root, [b'c'], b'c')
1710
base.tt.new_file('d', base.root, [b'd'], b'd')
1711
base.tt.new_file('e', base.root, [b'e'], b'e')
1712
base.tt.new_file('f', base.root, [b'f'], b'f')
1713
base.tt.new_directory('g', base.root, b'g')
1714
base.tt.new_directory('h', base.root, b'h')
1489
1715
base.tt.apply()
1490
1716
other = TransformGroup("other", root_id)
1491
other.tt.new_file('a', other.root, 'y\nb\nc\nd\be\n', 'a')
1492
other.tt.new_file('b', other.root, 'b2', 'b')
1493
other.tt.new_file('c', other.root, 'c2', 'c')
1494
other.tt.new_file('d', other.root, 'd', 'd')
1495
other.tt.new_file('e', other.root, 'e2', 'e')
1496
other.tt.new_file('f', other.root, 'f', 'f')
1497
other.tt.new_file('g', other.root, 'g', 'g')
1498
other.tt.new_file('h', other.root, 'h\ni\nj\nk\n', 'h')
1499
other.tt.new_file('i', other.root, 'h\ni\nj\nk\n', 'i')
1717
other.tt.new_file('a', other.root, [b'y\nb\nc\nd\be\n'], b'a')
1718
other.tt.new_file('b', other.root, [b'b2'], b'b')
1719
other.tt.new_file('c', other.root, [b'c2'], b'c')
1720
other.tt.new_file('d', other.root, [b'd'], b'd')
1721
other.tt.new_file('e', other.root, [b'e2'], b'e')
1722
other.tt.new_file('f', other.root, [b'f'], b'f')
1723
other.tt.new_file('g', other.root, [b'g'], b'g')
1724
other.tt.new_file('h', other.root, [b'h\ni\nj\nk\n'], b'h')
1725
other.tt.new_file('i', other.root, [b'h\ni\nj\nk\n'], b'i')
1500
1726
other.tt.apply()
1501
1727
this = TransformGroup("this", root_id)
1502
this.tt.new_file('a', this.root, 'a\nb\nc\nd\bz\n', 'a')
1503
this.tt.new_file('b', this.root, 'b', 'b')
1504
this.tt.new_file('c', this.root, 'c', 'c')
1505
this.tt.new_file('d', this.root, 'd2', 'd')
1506
this.tt.new_file('e', this.root, 'e2', 'e')
1507
this.tt.new_file('f', this.root, 'f', 'f')
1508
this.tt.new_file('g', this.root, 'g', 'g')
1509
this.tt.new_file('h', this.root, '1\n2\n3\n4\n', 'h')
1510
this.tt.new_file('i', this.root, '1\n2\n3\n4\n', 'i')
1728
this.tt.new_file('a', this.root, [b'a\nb\nc\nd\bz\n'], b'a')
1729
this.tt.new_file('b', this.root, [b'b'], b'b')
1730
this.tt.new_file('c', this.root, [b'c'], b'c')
1731
this.tt.new_file('d', this.root, [b'd2'], b'd')
1732
this.tt.new_file('e', this.root, [b'e2'], b'e')
1733
this.tt.new_file('f', this.root, [b'f'], b'f')
1734
this.tt.new_file('g', this.root, [b'g'], b'g')
1735
this.tt.new_file('h', this.root, [b'1\n2\n3\n4\n'], b'h')
1736
this.tt.new_file('i', this.root, [b'1\n2\n3\n4\n'], b'i')
1511
1737
this.tt.apply()
1512
1738
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1514
1740
# textual merge
1515
self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
1741
with this.wt.get_file(this.wt.id2path(b'a')) as f:
1742
self.assertEqual(f.read(), b'y\nb\nc\nd\bz\n')
1516
1743
# three-way text conflict
1517
self.assertEqual(this.wt.get_file('b').read(),
1518
conflict_text('b', 'b2'))
1744
with this.wt.get_file(this.wt.id2path(b'b')) as f:
1745
self.assertEqual(f.read(), conflict_text('b', 'b2'))
1520
self.assertEqual(this.wt.get_file('c').read(), 'c2')
1747
self.assertEqual(this.wt.get_file(this.wt.id2path(b'c')).read(), b'c2')
1522
self.assertEqual(this.wt.get_file('d').read(), 'd2')
1749
self.assertEqual(this.wt.get_file(this.wt.id2path(b'd')).read(), b'd2')
1523
1750
# Ambigious clean merge
1524
self.assertEqual(this.wt.get_file('e').read(), 'e2')
1751
self.assertEqual(this.wt.get_file(this.wt.id2path(b'e')).read(), b'e2')
1526
self.assertEqual(this.wt.get_file('f').read(), 'f')
1753
self.assertEqual(this.wt.get_file(this.wt.id2path(b'f')).read(), b'f')
1527
1754
# Correct correct results when THIS == OTHER
1528
self.assertEqual(this.wt.get_file('g').read(), 'g')
1755
self.assertEqual(this.wt.get_file(this.wt.id2path(b'g')).read(), b'g')
1529
1756
# Text conflict when THIS & OTHER are text and BASE is dir
1530
self.assertEqual(this.wt.get_file('h').read(),
1531
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1532
self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
1534
self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
1757
self.assertEqual(this.wt.get_file(this.wt.id2path(b'h')).read(),
1758
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1759
self.assertEqual(this.wt.get_file('h.THIS').read(),
1761
self.assertEqual(this.wt.get_file('h.OTHER').read(),
1536
1763
self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
1537
self.assertEqual(this.wt.get_file('i').read(),
1538
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1539
self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
1541
self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
1764
self.assertEqual(this.wt.get_file(this.wt.id2path(b'i')).read(),
1765
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1766
self.assertEqual(this.wt.get_file('i.THIS').read(),
1768
self.assertEqual(this.wt.get_file('i.OTHER').read(),
1543
1770
self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1544
1771
modified = ['a', 'b', 'c', 'h', 'i']
1545
1772
merge_modified = this.wt.merge_modified()
1546
1773
self.assertSubset(merge_modified, modified)
1547
1774
self.assertEqual(len(merge_modified), len(modified))
1548
file(this.wt.id2abspath('a'), 'wb').write('booga')
1775
with open(this.wt.abspath(this.wt.id2path('a')), 'wb') as f: f.write(b'booga')
1549
1776
modified.pop(0)
1550
1777
merge_modified = this.wt.merge_modified()
1551
1778
self.assertSubset(merge_modified, modified)
1638
1865
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1639
1866
for t in [base, this, other]]
1641
base.tt.new_file('g', base_a, 'g', 'g')
1642
other.tt.new_file('g1', other_b, 'g1', 'g')
1644
base.tt.new_file('h', base_a, 'h', 'h')
1645
this.tt.new_file('h1', this_b, 'h1', 'h')
1647
base.tt.new_file('i', base.root, 'i', 'i')
1648
other.tt.new_directory('i1', this_b, 'i')
1868
base.tt.new_file('g', base_a, [b'g'], b'g')
1869
other.tt.new_file('g1', other_b, [b'g1'], b'g')
1871
base.tt.new_file('h', base_a, [b'h'], b'h')
1872
this.tt.new_file('h1', this_b, [b'h1'], b'h')
1874
base.tt.new_file('i', base.root, [b'i'], b'i')
1875
other.tt.new_directory('i1', this_b, b'i')
1650
1877
for tg in [this, base, other]:
1652
1879
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1654
self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1881
self.assertEqual(this.wt.id2path(b'g'), pathjoin('b/g1.OTHER'))
1655
1882
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1656
1883
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1657
self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
1884
self.assertEqual(this.wt.id2path(b'h'), pathjoin('b/h1.THIS'))
1658
1885
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1659
1886
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1660
self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
1887
self.assertEqual(this.wt.id2path(b'i'), pathjoin('b/i1.OTHER'))
1663
1890
class TestBuildTree(tests.TestCaseWithTransport):
1665
1892
def test_build_tree_with_symlinks(self):
1666
1893
self.requireFeature(SymlinkFeature)
1668
a = BzrDir.create_standalone_workingtree('a')
1895
a = ControlDir.create_standalone_workingtree('a')
1669
1896
os.mkdir('a/foo')
1670
file('a/foo/bar', 'wb').write('contents')
1897
with open('a/foo/bar', 'wb') as f: f.write(b'contents')
1671
1898
os.symlink('a/foo/bar', 'a/foo/baz')
1672
1899
a.add(['foo', 'foo/bar', 'foo/baz'])
1673
1900
a.commit('initial commit')
1674
b = BzrDir.create_standalone_workingtree('b')
1901
b = ControlDir.create_standalone_workingtree('b')
1675
1902
basis = a.basis_tree()
1676
1903
basis.lock_read()
1677
1904
self.addCleanup(basis.unlock)
1678
1905
build_tree(basis, b)
1679
1906
self.assertIs(os.path.isdir('b/foo'), True)
1680
self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
1907
with open('b/foo/bar', 'rb') as f:
1908
self.assertEqual(f.read(), "contents")
1681
1909
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
1683
1911
def test_build_with_references(self):
1684
1912
tree = self.make_branch_and_tree('source',
1685
format='dirstate-with-subtree')
1913
format='development-subtree')
1686
1914
subtree = self.make_branch_and_tree('source/subtree',
1687
format='dirstate-with-subtree')
1915
format='development-subtree')
1688
1916
tree.add_reference(subtree)
1689
1917
tree.commit('a revision')
1690
1918
tree.branch.create_checkout('target')
1691
self.failUnlessExists('target')
1692
self.failUnlessExists('target/subtree')
1919
self.assertPathExists('target')
1920
self.assertPathExists('target/subtree')
1694
1922
def test_file_conflict_handling(self):
1695
1923
"""Ensure that when building trees, conflict handling is done"""
1696
1924
source = self.make_branch_and_tree('source')
1697
1925
target = self.make_branch_and_tree('target')
1698
1926
self.build_tree(['source/file', 'target/file'])
1699
source.add('file', 'new-file')
1927
source.add('file', b'new-file')
1700
1928
source.commit('added file')
1701
1929
build_tree(source.basis_tree(), target)
1702
1930
self.assertEqual([DuplicateEntry('Moved existing file to',
1703
1931
'file.moved', 'file', None, 'new-file')],
1704
1932
target.conflicts())
1705
1933
target2 = self.make_branch_and_tree('target2')
1706
target_file = file('target2/file', 'wb')
1708
source_file = file('source/file', 'rb')
1710
target_file.write(source_file.read())
1934
with open('target2/file', 'wb') as target_file, \
1935
open('source/file', 'rb') as source_file:
1936
target_file.write(source_file.read())
1715
1937
build_tree(source.basis_tree(), target2)
1716
1938
self.assertEqual([], target2.conflicts())
1738
1960
source = self.make_branch_and_tree('source')
1739
1961
target = self.make_branch_and_tree('target')
1740
1962
self.build_tree(['source/dir1/', 'source/dir1/file', 'target/dir1/'])
1741
source.add(['dir1', 'dir1/file'], ['new-dir1', 'new-file'])
1963
source.add(['dir1', 'dir1/file'], [b'new-dir1', b'new-file'])
1742
1964
source.commit('added file')
1743
1965
build_tree(source.basis_tree(), target)
1744
1966
self.assertEqual([], target.conflicts())
1745
self.failUnlessExists('target/dir1/file')
1967
self.assertPathExists('target/dir1/file')
1747
1969
# Ensure contents are merged
1748
1970
target = self.make_branch_and_tree('target2')
1749
1971
self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1750
1972
build_tree(source.basis_tree(), target)
1751
1973
self.assertEqual([], target.conflicts())
1752
self.failUnlessExists('target2/dir1/file2')
1753
self.failUnlessExists('target2/dir1/file')
1974
self.assertPathExists('target2/dir1/file2')
1975
self.assertPathExists('target2/dir1/file')
1755
1977
# Ensure new contents are suppressed for existing branches
1756
1978
target = self.make_branch_and_tree('target3')
1757
1979
self.make_branch('target3/dir1')
1758
1980
self.build_tree(['target3/dir1/file2'])
1759
1981
build_tree(source.basis_tree(), target)
1760
self.failIfExists('target3/dir1/file')
1761
self.failUnlessExists('target3/dir1/file2')
1762
self.failUnlessExists('target3/dir1.diverted/file')
1982
self.assertPathDoesNotExist('target3/dir1/file')
1983
self.assertPathExists('target3/dir1/file2')
1984
self.assertPathExists('target3/dir1.diverted/file')
1763
1985
self.assertEqual([DuplicateEntry('Diverted to',
1764
1986
'dir1.diverted', 'dir1', 'new-dir1', None)],
1765
1987
target.conflicts())
1828
2050
def test_build_tree_accelerator_tree(self):
1829
2051
source = self.create_ab_tree()
1830
self.build_tree_contents([('source/file2', 'C')])
2052
self.build_tree_contents([('source/file2', b'C')])
1832
2054
real_source_get_file = source.get_file
1833
def get_file(file_id, path=None):
2055
def get_file(path, file_id=None):
1834
2056
calls.append(file_id)
1835
return real_source_get_file(file_id, path)
2057
return real_source_get_file(path, file_id)
1836
2058
source.get_file = get_file
1837
2059
target = self.make_branch_and_tree('target')
1838
2060
revision_tree = source.basis_tree()
1839
2061
revision_tree.lock_read()
1840
2062
self.addCleanup(revision_tree.unlock)
1841
2063
build_tree(revision_tree, target, source)
1842
self.assertEqual(['file1-id'], calls)
2064
self.assertEqual([b'file1-id'], calls)
1843
2065
target.lock_read()
1844
2066
self.addCleanup(target.unlock)
1845
2067
self.assertEqual([], list(target.iter_changes(revision_tree)))
2069
def test_build_tree_accelerator_tree_observes_sha1(self):
2070
source = self.create_ab_tree()
2071
sha1 = osutils.sha_string(b'A')
2072
target = self.make_branch_and_tree('target')
2074
self.addCleanup(target.unlock)
2075
state = target.current_dirstate()
2076
state._cutoff_time = time.time() + 60
2077
build_tree(source.basis_tree(), target, source)
2078
entry = state._get_entry(0, path_utf8=b'file1')
2079
self.assertEqual(sha1, entry[1][0][1])
1847
2081
def test_build_tree_accelerator_tree_missing_file(self):
1848
2082
source = self.create_ab_tree()
1849
2083
os.unlink('source/file1')
1992
2226
self.assertEqualStat(source_stat, target_stat)
1994
2228
def test_case_insensitive_build_tree_inventory(self):
1995
if (tests.CaseInsensitiveFilesystemFeature.available()
1996
or tests.CaseInsCasePresFilenameFeature.available()):
2229
if (features.CaseInsensitiveFilesystemFeature.available()
2230
or features.CaseInsCasePresFilenameFeature.available()):
1997
2231
raise tests.UnavailableFeature('Fully case sensitive filesystem')
1998
2232
source = self.make_branch_and_tree('source')
1999
2233
self.build_tree(['source/file', 'source/FILE'])
2000
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2234
source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
2001
2235
source.commit('added files')
2002
2236
# Don't try this at home, kids!
2003
2237
# Force the tree to report that it is case insensitive
2004
2238
target = self.make_branch_and_tree('target')
2005
2239
target.case_sensitive = False
2006
2240
build_tree(source.basis_tree(), target, source, delta_from_tree=True)
2007
self.assertEqual('file.moved', target.id2path('lower-id'))
2008
self.assertEqual('FILE', target.id2path('upper-id'))
2241
self.assertEqual('file.moved', target.id2path(b'lower-id'))
2242
self.assertEqual('FILE', target.id2path(b'upper-id'))
2244
def test_build_tree_observes_sha(self):
2245
source = self.make_branch_and_tree('source')
2246
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2247
source.add(['file1', 'dir', 'dir/file2'],
2248
[b'file1-id', b'dir-id', b'file2-id'])
2249
source.commit('new files')
2250
target = self.make_branch_and_tree('target')
2252
self.addCleanup(target.unlock)
2253
# We make use of the fact that DirState caches its cutoff time. So we
2254
# set the 'safe' time to one minute in the future.
2255
state = target.current_dirstate()
2256
state._cutoff_time = time.time() + 60
2257
build_tree(source.basis_tree(), target)
2258
entry1_sha = osutils.sha_file_by_name('source/file1')
2259
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2260
# entry[1] is the state information, entry[1][0] is the state of the
2261
# working tree, entry[1][0][1] is the sha value for the current working
2263
entry1 = state._get_entry(0, path_utf8='file1')
2264
self.assertEqual(entry1_sha, entry1[1][0][1])
2265
# The 'size' field must also be set.
2266
self.assertEqual(25, entry1[1][0][2])
2267
entry1_state = entry1[1][0]
2268
entry2 = state._get_entry(0, path_utf8='dir/file2')
2269
self.assertEqual(entry2_sha, entry2[1][0][1])
2270
self.assertEqual(29, entry2[1][0][2])
2271
entry2_state = entry2[1][0]
2272
# Now, make sure that we don't have to re-read the content. The
2273
# packed_stat should match exactly.
2274
self.assertEqual(entry1_sha, target.get_file_sha1('file1', b'file1-id'))
2275
self.assertEqual(entry2_sha,
2276
target.get_file_sha1('dir/file2', b'file2-id'))
2277
self.assertEqual(entry1_state, entry1[1][0])
2278
self.assertEqual(entry2_state, entry2[1][0])
2011
2281
class TestCommitTransform(tests.TestCaseWithTransport):
2073
2343
def test_add_files(self):
2074
2344
branch, tt = self.get_branch_and_transform()
2075
tt.new_file('file', tt.root, 'contents', 'file-id')
2076
trans_id = tt.new_directory('dir', tt.root, 'dir-id')
2345
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2346
trans_id = tt.new_directory('dir', tt.root, b'dir-id')
2077
2347
if SymlinkFeature.available():
2078
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2348
tt.new_symlink('symlink', trans_id, 'target', b'symlink-id')
2079
2349
rev = tt.commit(branch, 'message')
2080
2350
tree = branch.basis_tree()
2081
self.assertEqual('file', tree.id2path('file-id'))
2082
self.assertEqual('contents', tree.get_file_text('file-id'))
2083
self.assertEqual('dir', tree.id2path('dir-id'))
2351
self.assertEqual('file', tree.id2path(b'file-id'))
2352
self.assertEqual(b'contents', tree.get_file_text('file', b'file-id'))
2353
self.assertEqual('dir', tree.id2path(b'dir-id'))
2084
2354
if SymlinkFeature.available():
2085
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2086
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2355
self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
2356
self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
2088
2358
def test_add_unversioned(self):
2089
2359
branch, tt = self.get_branch_and_transform()
2090
tt.new_file('file', tt.root, 'contents')
2360
tt.new_file('file', tt.root, [b'contents'])
2091
2361
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2092
2362
'message', strict=True)
2094
2364
def test_modify_strict(self):
2095
2365
branch, tt = self.get_branch_and_transform()
2096
tt.new_file('file', tt.root, 'contents', 'file-id')
2366
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2097
2367
tt.commit(branch, 'message', strict=True)
2098
2368
tt = TransformPreview(branch.basis_tree())
2099
2369
self.addCleanup(tt.finalize)
2100
trans_id = tt.trans_id_file_id('file-id')
2370
trans_id = tt.trans_id_file_id(b'file-id')
2101
2371
tt.delete_contents(trans_id)
2102
tt.create_file('contents', trans_id)
2372
tt.create_file([b'contents'], trans_id)
2103
2373
tt.commit(branch, 'message', strict=True)
2105
2375
def test_commit_malformed(self):
2146
2416
self.assertEqual('tree', revision.properties['branch-nick'])
2149
class MockTransform(object):
2151
def has_named_child(self, by_parent, parent_id, name):
2152
for child_id in by_parent[parent_id]:
2156
elif name == "name.~%s~" % child_id:
2161
class MockEntry(object):
2163
object.__init__(self)
2167
class TestGetBackupName(TestCase):
2168
def test_get_backup_name(self):
2169
tt = MockTransform()
2170
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2171
self.assertEqual(name, 'name.~1~')
2172
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2173
self.assertEqual(name, 'name.~2~')
2174
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2175
self.assertEqual(name, 'name.~1~')
2176
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2177
self.assertEqual(name, 'name.~1~')
2178
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2179
self.assertEqual(name, 'name.~4~')
2182
2419
class TestFileMover(tests.TestCaseWithTransport):
2184
2421
def test_file_mover(self):
2185
2422
self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2186
2423
mover = _FileMover()
2187
2424
mover.rename('a', 'q')
2188
self.failUnlessExists('q')
2189
self.failIfExists('a')
2190
self.failUnlessExists('q/b')
2191
self.failUnlessExists('c')
2192
self.failUnlessExists('c/d')
2425
self.assertPathExists('q')
2426
self.assertPathDoesNotExist('a')
2427
self.assertPathExists('q/b')
2428
self.assertPathExists('c')
2429
self.assertPathExists('c/d')
2194
2431
def test_pre_delete_rollback(self):
2195
2432
self.build_tree(['a/'])
2196
2433
mover = _FileMover()
2197
2434
mover.pre_delete('a', 'q')
2198
self.failUnlessExists('q')
2199
self.failIfExists('a')
2435
self.assertPathExists('q')
2436
self.assertPathDoesNotExist('a')
2200
2437
mover.rollback()
2201
self.failIfExists('q')
2202
self.failUnlessExists('a')
2438
self.assertPathDoesNotExist('q')
2439
self.assertPathExists('a')
2204
2441
def test_apply_deletions(self):
2205
2442
self.build_tree(['a/', 'b/'])
2206
2443
mover = _FileMover()
2207
2444
mover.pre_delete('a', 'q')
2208
2445
mover.pre_delete('b', 'r')
2209
self.failUnlessExists('q')
2210
self.failUnlessExists('r')
2211
self.failIfExists('a')
2212
self.failIfExists('b')
2446
self.assertPathExists('q')
2447
self.assertPathExists('r')
2448
self.assertPathDoesNotExist('a')
2449
self.assertPathDoesNotExist('b')
2213
2450
mover.apply_deletions()
2214
self.failIfExists('q')
2215
self.failIfExists('r')
2216
self.failIfExists('a')
2217
self.failIfExists('b')
2451
self.assertPathDoesNotExist('q')
2452
self.assertPathDoesNotExist('r')
2453
self.assertPathDoesNotExist('a')
2454
self.assertPathDoesNotExist('b')
2219
2456
def test_file_mover_rollback(self):
2220
2457
self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2294
2531
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2295
2532
self.assertRaises(Bogus, tt.apply,
2296
2533
_mover=self.ExceptionFileMover(bad_target='d'))
2297
self.failUnlessExists('a')
2298
self.failUnlessExists('a/b')
2300
def test_resolve_no_parent(self):
2534
self.assertPathExists('a')
2535
self.assertPathExists('a/b')
2538
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2539
"""Ensure treetransform creation errors can be safely cleaned up after"""
2541
def _override_globals_in_method(self, instance, method_name, globals):
2542
"""Replace method on instance with one with updated globals"""
2544
func = getattr(instance, method_name).__func__
2545
new_globals = dict(func.__globals__)
2546
new_globals.update(globals)
2547
new_func = types.FunctionType(func.__code__, new_globals,
2548
func.__name__, func.__defaults__)
2549
setattr(instance, method_name,
2550
types.MethodType(new_func, instance, instance.__class__))
2551
self.addCleanup(delattr, instance, method_name)
2554
def _fake_open_raises_before(name, mode):
2555
"""Like open() but raises before doing anything"""
2559
def _fake_open_raises_after(name, mode):
2560
"""Like open() but raises after creating file without returning"""
2561
open(name, mode).close()
2564
def create_transform_and_root_trans_id(self):
2565
"""Setup a transform creating a file in limbo"""
2566
tree = self.make_branch_and_tree('.')
2567
tt = TreeTransform(tree)
2568
return tt, tt.create_path("a", tt.root)
2570
def create_transform_and_subdir_trans_id(self):
2571
"""Setup a transform creating a directory containing a file in limbo"""
2572
tree = self.make_branch_and_tree('.')
2573
tt = TreeTransform(tree)
2574
d_trans_id = tt.create_path("d", tt.root)
2575
tt.create_directory(d_trans_id)
2576
f_trans_id = tt.create_path("a", d_trans_id)
2577
tt.adjust_path("a", d_trans_id, f_trans_id)
2578
return tt, f_trans_id
2580
def test_root_create_file_open_raises_before_creation(self):
2581
tt, trans_id = self.create_transform_and_root_trans_id()
2582
self._override_globals_in_method(tt, "create_file",
2583
{"open": self._fake_open_raises_before})
2584
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2585
path = tt._limbo_name(trans_id)
2586
self.assertPathDoesNotExist(path)
2588
self.assertPathDoesNotExist(tt._limbodir)
2590
def test_root_create_file_open_raises_after_creation(self):
2591
tt, trans_id = self.create_transform_and_root_trans_id()
2592
self._override_globals_in_method(tt, "create_file",
2593
{"open": self._fake_open_raises_after})
2594
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2595
path = tt._limbo_name(trans_id)
2596
self.assertPathExists(path)
2598
self.assertPathDoesNotExist(path)
2599
self.assertPathDoesNotExist(tt._limbodir)
2601
def test_subdir_create_file_open_raises_before_creation(self):
2602
tt, trans_id = self.create_transform_and_subdir_trans_id()
2603
self._override_globals_in_method(tt, "create_file",
2604
{"open": self._fake_open_raises_before})
2605
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2606
path = tt._limbo_name(trans_id)
2607
self.assertPathDoesNotExist(path)
2609
self.assertPathDoesNotExist(tt._limbodir)
2611
def test_subdir_create_file_open_raises_after_creation(self):
2612
tt, trans_id = self.create_transform_and_subdir_trans_id()
2613
self._override_globals_in_method(tt, "create_file",
2614
{"open": self._fake_open_raises_after})
2615
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2616
path = tt._limbo_name(trans_id)
2617
self.assertPathExists(path)
2619
self.assertPathDoesNotExist(path)
2620
self.assertPathDoesNotExist(tt._limbodir)
2622
def test_rename_in_limbo_rename_raises_after_rename(self):
2623
tt, trans_id = self.create_transform_and_root_trans_id()
2624
parent1 = tt.new_directory('parent1', tt.root)
2625
child1 = tt.new_file('child1', parent1, [b'contents'])
2626
parent2 = tt.new_directory('parent2', tt.root)
2628
class FakeOSModule(object):
2629
def rename(self, old, new):
2632
self._override_globals_in_method(tt, "_rename_in_limbo",
2633
{"os": FakeOSModule()})
2635
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2636
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2637
self.assertPathExists(path)
2639
self.assertPathDoesNotExist(path)
2640
self.assertPathDoesNotExist(tt._limbodir)
2642
def test_rename_in_limbo_rename_raises_before_rename(self):
2643
tt, trans_id = self.create_transform_and_root_trans_id()
2644
parent1 = tt.new_directory('parent1', tt.root)
2645
child1 = tt.new_file('child1', parent1, [b'contents'])
2646
parent2 = tt.new_directory('parent2', tt.root)
2648
class FakeOSModule(object):
2649
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(parent1), "child1")
2656
self.assertPathExists(path)
2658
self.assertPathDoesNotExist(path)
2659
self.assertPathDoesNotExist(tt._limbodir)
2662
class TestTransformMissingParent(tests.TestCaseWithTransport):
2664
def make_tt_with_versioned_dir(self):
2301
2665
wt = self.make_branch_and_tree('.')
2666
self.build_tree(['dir/',])
2667
wt.add(['dir'], [b'dir-id'])
2668
wt.commit('Create dir')
2302
2669
tt = TreeTransform(wt)
2303
2670
self.addCleanup(tt.finalize)
2304
parent = tt.trans_id_file_id('parent-id')
2305
tt.new_file('file', parent, 'Contents')
2306
resolve_conflicts(tt)
2309
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2310
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2673
def test_resolve_create_parent_for_versioned_file(self):
2674
wt, tt = self.make_tt_with_versioned_dir()
2675
dir_tid = tt.trans_id_tree_path('dir')
2676
file_tid = tt.new_file('file', dir_tid, [b'Contents'], file_id=b'file-id')
2677
tt.delete_contents(dir_tid)
2678
tt.unversion_file(dir_tid)
2679
conflicts = resolve_conflicts(tt)
2680
# one conflict for the missing directory, one for the unversioned
2682
self.assertLength(2, conflicts)
2684
def test_non_versioned_file_create_conflict(self):
2685
wt, tt = self.make_tt_with_versioned_dir()
2686
dir_tid = tt.trans_id_tree_path('dir')
2687
tt.new_file('file', dir_tid, [b'Contents'])
2688
tt.delete_contents(dir_tid)
2689
tt.unversion_file(dir_tid)
2690
conflicts = resolve_conflicts(tt)
2691
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2692
self.assertLength(1, conflicts)
2693
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2697
A_ENTRY = (b'a-id', ('a', 'a'), True, (True, True),
2698
(b'TREE_ROOT', b'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2311
2699
(False, False))
2312
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2313
('', ''), ('directory', 'directory'), (False, None))
2700
ROOT_ENTRY = (b'TREE_ROOT', ('', ''), False, (True, True), (None, None),
2701
('', ''), ('directory', 'directory'), (False, False))
2316
2704
class TestTransformPreview(tests.TestCaseWithTransport):
2318
2706
def create_tree(self):
2319
2707
tree = self.make_branch_and_tree('.')
2320
self.build_tree_contents([('a', 'content 1')])
2321
tree.set_root_id('TREE_ROOT')
2322
tree.add('a', 'a-id')
2323
tree.commit('rev1', rev_id='rev1')
2324
return tree.branch.repository.revision_tree('rev1')
2708
self.build_tree_contents([('a', b'content 1')])
2709
tree.set_root_id(b'TREE_ROOT')
2710
tree.add('a', b'a-id')
2711
tree.commit('rev1', rev_id=b'rev1')
2712
return tree.branch.repository.revision_tree(b'rev1')
2326
2714
def get_empty_preview(self):
2327
2715
repository = self.make_repository('repo')
2368
2756
revision_tree = self.create_tree()
2369
2757
preview = TransformPreview(revision_tree)
2370
2758
self.addCleanup(preview.finalize)
2371
preview.new_file('a', preview.root, 'content 2')
2759
preview.new_file('a', preview.root, [b'content 2'])
2372
2760
resolve_conflicts(preview)
2373
trans_id = preview.trans_id_file_id('a-id')
2761
trans_id = preview.trans_id_file_id(b'a-id')
2374
2762
self.assertEqual('a.moved', preview.final_name(trans_id))
2376
2764
def get_tree_and_preview_tree(self):
2377
2765
revision_tree = self.create_tree()
2378
2766
preview = TransformPreview(revision_tree)
2379
2767
self.addCleanup(preview.finalize)
2380
a_trans_id = preview.trans_id_file_id('a-id')
2768
a_trans_id = preview.trans_id_file_id(b'a-id')
2381
2769
preview.delete_contents(a_trans_id)
2382
preview.create_file('b content', a_trans_id)
2770
preview.create_file([b'b content'], a_trans_id)
2383
2771
preview_tree = preview.get_preview_tree()
2384
2772
return revision_tree, preview_tree
2386
2774
def test_iter_changes(self):
2387
2775
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2388
root = revision_tree.inventory.root.file_id
2389
self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2776
root = revision_tree.get_root_id()
2777
self.assertEqual([(b'a-id', ('a', 'a'), True, (True, True),
2390
2778
(root, root), ('a', 'a'), ('file', 'file'),
2391
2779
(False, False))],
2392
2780
list(preview_tree.iter_changes(revision_tree)))
2431
2819
revision_tree = self.create_tree()
2432
2820
preview = TransformPreview(revision_tree)
2433
2821
self.addCleanup(preview.finalize)
2434
preview.new_file('file', preview.root, 'contents', 'file-id')
2822
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2435
2823
preview.new_directory('directory', preview.root, 'dir-id')
2436
2824
preview_tree = preview.get_preview_tree()
2437
self.assertEqual('file', preview_tree.kind('file-id'))
2438
self.assertEqual('directory', preview_tree.kind('dir-id'))
2825
self.assertEqual('file', preview_tree.kind('file'))
2826
self.assertEqual('directory', preview_tree.kind('directory'))
2440
2828
def test_get_file_mtime(self):
2441
2829
preview = self.get_empty_preview()
2442
file_trans_id = preview.new_file('file', preview.root, 'contents',
2830
file_trans_id = preview.new_file('file', preview.root, [b'contents'],
2444
2832
limbo_path = preview._limbo_name(file_trans_id)
2445
2833
preview_tree = preview.get_preview_tree()
2446
2834
self.assertEqual(os.stat(limbo_path).st_mtime,
2447
preview_tree.get_file_mtime('file-id'))
2835
preview_tree.get_file_mtime('file', b'file-id'))
2449
2837
def test_get_file_mtime_renamed(self):
2450
2838
work_tree = self.make_branch_and_tree('tree')
2451
2839
self.build_tree(['tree/file'])
2452
work_tree.add('file', 'file-id')
2840
work_tree.add('file', b'file-id')
2453
2841
preview = TransformPreview(work_tree)
2454
2842
self.addCleanup(preview.finalize)
2455
file_trans_id = preview.trans_id_tree_file_id('file-id')
2843
file_trans_id = preview.trans_id_tree_path('file')
2456
2844
preview.adjust_path('renamed', preview.root, file_trans_id)
2457
2845
preview_tree = preview.get_preview_tree()
2458
preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2459
work_mtime = work_tree.get_file_mtime('file-id', 'file')
2846
preview_mtime = preview_tree.get_file_mtime('renamed', b'file-id')
2847
work_mtime = work_tree.get_file_mtime('file', b'file-id')
2849
def test_get_file_size(self):
2850
work_tree = self.make_branch_and_tree('tree')
2851
self.build_tree_contents([('tree/old', b'old')])
2852
work_tree.add('old', b'old-id')
2853
preview = TransformPreview(work_tree)
2854
self.addCleanup(preview.finalize)
2855
new_id = preview.new_file('name', preview.root, [b'contents'], b'new-id',
2857
tree = preview.get_preview_tree()
2858
self.assertEqual(len('old'), tree.get_file_size('old'))
2859
self.assertEqual(len('contents'), tree.get_file_size('name'))
2461
2861
def test_get_file(self):
2462
2862
preview = self.get_empty_preview()
2463
preview.new_file('file', preview.root, 'contents', 'file-id')
2863
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2464
2864
preview_tree = preview.get_preview_tree()
2465
tree_file = preview_tree.get_file('file-id')
2467
self.assertEqual('contents', tree_file.read())
2865
with preview_tree.get_file('file') as tree_file:
2866
self.assertEqual(b'contents', tree_file.read())
2471
2868
def test_get_symlink_target(self):
2472
2869
self.requireFeature(SymlinkFeature)
2474
2871
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2475
2872
preview_tree = preview.get_preview_tree()
2476
2873
self.assertEqual('target',
2477
preview_tree.get_symlink_target('symlink-id'))
2874
preview_tree.get_symlink_target('symlink'))
2479
2876
def test_all_file_ids(self):
2480
2877
tree = self.make_branch_and_tree('tree')
2481
2878
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2482
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2879
tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
2483
2880
preview = TransformPreview(tree)
2484
2881
self.addCleanup(preview.finalize)
2485
preview.unversion_file(preview.trans_id_file_id('b-id'))
2486
c_trans_id = preview.trans_id_file_id('c-id')
2882
preview.unversion_file(preview.trans_id_file_id(b'b-id'))
2883
c_trans_id = preview.trans_id_file_id(b'c-id')
2487
2884
preview.unversion_file(c_trans_id)
2488
preview.version_file('c-id', c_trans_id)
2885
preview.version_file(b'c-id', c_trans_id)
2489
2886
preview_tree = preview.get_preview_tree()
2490
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2887
self.assertEqual({b'a-id', b'c-id', tree.get_root_id()},
2491
2888
preview_tree.all_file_ids())
2493
2890
def test_path2id_deleted_unchanged(self):
2494
2891
tree = self.make_branch_and_tree('tree')
2495
2892
self.build_tree(['tree/unchanged', 'tree/deleted'])
2496
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2893
tree.add(['unchanged', 'deleted'], [b'unchanged-id', b'deleted-id'])
2497
2894
preview = TransformPreview(tree)
2498
2895
self.addCleanup(preview.finalize)
2499
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2896
preview.unversion_file(preview.trans_id_file_id(b'deleted-id'))
2500
2897
preview_tree = preview.get_preview_tree()
2501
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2502
self.assertIs(None, preview_tree.path2id('deleted'))
2898
self.assertEqual(b'unchanged-id', preview_tree.path2id('unchanged'))
2899
self.assertFalse(preview_tree.is_versioned('deleted'))
2504
2901
def test_path2id_created(self):
2505
2902
tree = self.make_branch_and_tree('tree')
2506
2903
self.build_tree(['tree/unchanged'])
2507
tree.add(['unchanged'], ['unchanged-id'])
2904
tree.add(['unchanged'], [b'unchanged-id'])
2508
2905
preview = TransformPreview(tree)
2509
2906
self.addCleanup(preview.finalize)
2510
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2511
'contents', 'new-id')
2907
preview.new_file('new', preview.trans_id_file_id(b'unchanged-id'),
2908
[b'contents'], b'new-id')
2512
2909
preview_tree = preview.get_preview_tree()
2513
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2910
self.assertEqual(b'new-id', preview_tree.path2id('unchanged/new'))
2515
2912
def test_path2id_moved(self):
2516
2913
tree = self.make_branch_and_tree('tree')
2517
2914
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2518
2915
tree.add(['old_parent', 'old_parent/child'],
2519
['old_parent-id', 'child-id'])
2916
[b'old_parent-id', b'child-id'])
2520
2917
preview = TransformPreview(tree)
2521
2918
self.addCleanup(preview.finalize)
2522
2919
new_parent = preview.new_directory('new_parent', preview.root,
2524
2921
preview.adjust_path('child', new_parent,
2525
preview.trans_id_file_id('child-id'))
2922
preview.trans_id_file_id(b'child-id'))
2526
2923
preview_tree = preview.get_preview_tree()
2527
self.assertIs(None, preview_tree.path2id('old_parent/child'))
2528
self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
2924
self.assertFalse(preview_tree.is_versioned('old_parent/child'))
2925
self.assertEqual(b'child-id', preview_tree.path2id('new_parent/child'))
2530
2927
def test_path2id_renamed_parent(self):
2531
2928
tree = self.make_branch_and_tree('tree')
2532
2929
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2533
2930
tree.add(['old_name', 'old_name/child'],
2534
['parent-id', 'child-id'])
2931
[b'parent-id', b'child-id'])
2535
2932
preview = TransformPreview(tree)
2536
2933
self.addCleanup(preview.finalize)
2537
2934
preview.adjust_path('new_name', preview.root,
2538
preview.trans_id_file_id('parent-id'))
2935
preview.trans_id_file_id(b'parent-id'))
2539
2936
preview_tree = preview.get_preview_tree()
2540
self.assertIs(None, preview_tree.path2id('old_name/child'))
2541
self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
2937
self.assertFalse(preview_tree.is_versioned('old_name/child'))
2938
self.assertEqual(b'child-id', preview_tree.path2id('new_name/child'))
2543
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2940
def assertMatchingIterEntries(self, tt, specific_files=None):
2544
2941
preview_tree = tt.get_preview_tree()
2545
2942
preview_result = list(preview_tree.iter_entries_by_dir(
2943
specific_files=specific_files))
2547
2944
tree = tt._tree
2549
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
2946
actual_result = list(tree.iter_entries_by_dir(
2947
specific_files=specific_files))
2550
2948
self.assertEqual(actual_result, preview_result)
2552
2950
def test_iter_entries_by_dir_new(self):
2553
2951
tree = self.make_branch_and_tree('tree')
2554
2952
tt = TreeTransform(tree)
2555
tt.new_file('new', tt.root, 'contents', 'new-id')
2953
tt.new_file('new', tt.root, [b'contents'], b'new-id')
2556
2954
self.assertMatchingIterEntries(tt)
2558
2956
def test_iter_entries_by_dir_deleted(self):
2559
2957
tree = self.make_branch_and_tree('tree')
2560
2958
self.build_tree(['tree/deleted'])
2561
tree.add('deleted', 'deleted-id')
2959
tree.add('deleted', b'deleted-id')
2562
2960
tt = TreeTransform(tree)
2563
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
2961
tt.delete_contents(tt.trans_id_file_id(b'deleted-id'))
2564
2962
self.assertMatchingIterEntries(tt)
2566
2964
def test_iter_entries_by_dir_unversioned(self):
2567
2965
tree = self.make_branch_and_tree('tree')
2568
2966
self.build_tree(['tree/removed'])
2569
tree.add('removed', 'removed-id')
2967
tree.add('removed', b'removed-id')
2570
2968
tt = TreeTransform(tree)
2571
tt.unversion_file(tt.trans_id_file_id('removed-id'))
2969
tt.unversion_file(tt.trans_id_file_id(b'removed-id'))
2572
2970
self.assertMatchingIterEntries(tt)
2574
2972
def test_iter_entries_by_dir_moved(self):
2575
2973
tree = self.make_branch_and_tree('tree')
2576
2974
self.build_tree(['tree/moved', 'tree/new_parent/'])
2577
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
2975
tree.add(['moved', 'new_parent'], [b'moved-id', b'new_parent-id'])
2578
2976
tt = TreeTransform(tree)
2579
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2580
tt.trans_id_file_id('moved-id'))
2977
tt.adjust_path('moved', tt.trans_id_file_id(b'new_parent-id'),
2978
tt.trans_id_file_id(b'moved-id'))
2581
2979
self.assertMatchingIterEntries(tt)
2583
def test_iter_entries_by_dir_specific_file_ids(self):
2981
def test_iter_entries_by_dir_specific_files(self):
2584
2982
tree = self.make_branch_and_tree('tree')
2585
tree.set_root_id('tree-root-id')
2983
tree.set_root_id(b'tree-root-id')
2586
2984
self.build_tree(['tree/parent/', 'tree/parent/child'])
2587
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
2985
tree.add(['parent', 'parent/child'], [b'parent-id', b'child-id'])
2588
2986
tt = TreeTransform(tree)
2589
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
2987
self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2591
2989
def test_symlink_content_summary(self):
2592
2990
self.requireFeature(SymlinkFeature)
2593
2991
preview = self.get_empty_preview()
2594
preview.new_symlink('path', preview.root, 'target', 'path-id')
2992
preview.new_symlink('path', preview.root, 'target', b'path-id')
2595
2993
summary = preview.get_preview_tree().path_content_summary('path')
2596
2994
self.assertEqual(('symlink', None, None, 'target'), summary)
2665
3063
def test_annotate(self):
2666
3064
tree = self.make_branch_and_tree('tree')
2667
self.build_tree_contents([('tree/file', 'a\n')])
2668
tree.add('file', 'file-id')
2669
tree.commit('a', rev_id='one')
2670
self.build_tree_contents([('tree/file', 'a\nb\n')])
3065
self.build_tree_contents([('tree/file', b'a\n')])
3066
tree.add('file', b'file-id')
3067
tree.commit('a', rev_id=b'one')
3068
self.build_tree_contents([('tree/file', b'a\nb\n')])
2671
3069
preview = TransformPreview(tree)
2672
3070
self.addCleanup(preview.finalize)
2673
file_trans_id = preview.trans_id_file_id('file-id')
3071
file_trans_id = preview.trans_id_file_id(b'file-id')
2674
3072
preview.delete_contents(file_trans_id)
2675
preview.create_file('a\nb\nc\n', file_trans_id)
3073
preview.create_file([b'a\nb\nc\n'], file_trans_id)
2676
3074
preview_tree = preview.get_preview_tree()
2682
annotation = preview_tree.annotate_iter('file-id', 'me:')
3080
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2683
3081
self.assertEqual(expected, annotation)
2685
3083
def test_annotate_missing(self):
2686
3084
preview = self.get_empty_preview()
2687
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3085
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2688
3086
preview_tree = preview.get_preview_tree()
2694
annotation = preview_tree.annotate_iter('file-id', 'me:')
3092
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2695
3093
self.assertEqual(expected, annotation)
2697
3095
def test_annotate_rename(self):
2698
3096
tree = self.make_branch_and_tree('tree')
2699
self.build_tree_contents([('tree/file', 'a\n')])
2700
tree.add('file', 'file-id')
2701
tree.commit('a', rev_id='one')
3097
self.build_tree_contents([('tree/file', b'a\n')])
3098
tree.add('file', b'file-id')
3099
tree.commit('a', rev_id=b'one')
2702
3100
preview = TransformPreview(tree)
2703
3101
self.addCleanup(preview.finalize)
2704
file_trans_id = preview.trans_id_file_id('file-id')
3102
file_trans_id = preview.trans_id_file_id(b'file-id')
2705
3103
preview.adjust_path('newname', preview.root, file_trans_id)
2706
3104
preview_tree = preview.get_preview_tree()
2708
3106
('one', 'a\n'),
2710
annotation = preview_tree.annotate_iter('file-id', 'me:')
3108
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2711
3109
self.assertEqual(expected, annotation)
2713
3111
def test_annotate_deleted(self):
2714
3112
tree = self.make_branch_and_tree('tree')
2715
self.build_tree_contents([('tree/file', 'a\n')])
2716
tree.add('file', 'file-id')
2717
tree.commit('a', rev_id='one')
2718
self.build_tree_contents([('tree/file', 'a\nb\n')])
3113
self.build_tree_contents([('tree/file', b'a\n')])
3114
tree.add('file', b'file-id')
3115
tree.commit('a', rev_id=b'one')
3116
self.build_tree_contents([('tree/file', b'a\nb\n')])
2719
3117
preview = TransformPreview(tree)
2720
3118
self.addCleanup(preview.finalize)
2721
file_trans_id = preview.trans_id_file_id('file-id')
3119
file_trans_id = preview.trans_id_file_id(b'file-id')
2722
3120
preview.delete_contents(file_trans_id)
2723
3121
preview_tree = preview.get_preview_tree()
2724
annotation = preview_tree.annotate_iter('file-id', 'me:')
3122
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2725
3123
self.assertIs(None, annotation)
2727
3125
def test_stored_kind(self):
2728
3126
preview = self.get_empty_preview()
2729
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3127
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2730
3128
preview_tree = preview.get_preview_tree()
2731
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3129
self.assertEqual('file', preview_tree.stored_kind('file'))
2733
3131
def test_is_executable(self):
2734
3132
preview = self.get_empty_preview()
2735
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
2736
preview.set_executability(True, preview.trans_id_file_id('file-id'))
3133
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
3134
preview.set_executability(True, preview.trans_id_file_id(b'file-id'))
2737
3135
preview_tree = preview.get_preview_tree()
2738
self.assertEqual(True, preview_tree.is_executable('file-id'))
3136
self.assertEqual(True, preview_tree.is_executable('file'))
2740
3138
def test_get_set_parent_ids(self):
2741
3139
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2742
3140
self.assertEqual([], preview_tree.get_parent_ids())
2743
preview_tree.set_parent_ids(['rev-1'])
2744
self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
3141
preview_tree.set_parent_ids([b'rev-1'])
3142
self.assertEqual([b'rev-1'], preview_tree.get_parent_ids())
2746
3144
def test_plan_file_merge(self):
2747
3145
work_a = self.make_branch_and_tree('wta')
2748
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2749
work_a.add('file', 'file-id')
3146
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3147
work_a.add('file', b'file-id')
2750
3148
base_id = work_a.commit('base version')
2751
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3149
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2752
3150
preview = TransformPreview(work_a)
2753
3151
self.addCleanup(preview.finalize)
2754
trans_id = preview.trans_id_file_id('file-id')
3152
trans_id = preview.trans_id_file_id(b'file-id')
2755
3153
preview.delete_contents(trans_id)
2756
preview.create_file('b\nc\nd\ne\n', trans_id)
2757
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3154
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3155
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2758
3156
tree_a = preview.get_preview_tree()
2759
3157
tree_a.set_parent_ids([base_id])
2760
3158
self.assertEqual([
2842
3240
tt = merger.make_merger().make_preview_transform()
2843
3241
self.addCleanup(tt.finalize)
2844
3242
final_tree = tt.get_preview_tree()
2845
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3245
final_tree.get_file_text(final_tree.id2path(b'file-id')))
2847
3247
def test_merge_preview_into_workingtree(self):
2848
3248
tree = self.make_branch_and_tree('tree')
2849
tree.set_root_id('TREE_ROOT')
3249
tree.set_root_id(b'TREE_ROOT')
2850
3250
tt = TransformPreview(tree)
2851
3251
self.addCleanup(tt.finalize)
2852
tt.new_file('name', tt.root, 'content', 'file-id')
3252
tt.new_file('name', tt.root, [b'content'], b'file-id')
2853
3253
tree2 = self.make_branch_and_tree('tree2')
2854
tree2.set_root_id('TREE_ROOT')
3254
tree2.set_root_id(b'TREE_ROOT')
2855
3255
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2856
None, tree.basis_tree())
2857
3257
merger.merge_type = Merge3Merger
2858
3258
merger.do_merge()
2860
3260
def test_merge_preview_into_workingtree_handles_conflicts(self):
2861
3261
tree = self.make_branch_and_tree('tree')
2862
self.build_tree_contents([('tree/foo', 'bar')])
2863
tree.add('foo', 'foo-id')
3262
self.build_tree_contents([('tree/foo', b'bar')])
3263
tree.add('foo', b'foo-id')
2864
3264
tree.commit('foo')
2865
3265
tt = TransformPreview(tree)
2866
3266
self.addCleanup(tt.finalize)
2867
trans_id = tt.trans_id_file_id('foo-id')
3267
trans_id = tt.trans_id_file_id(b'foo-id')
2868
3268
tt.delete_contents(trans_id)
2869
tt.create_file('baz', trans_id)
2870
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2871
self.build_tree_contents([('tree2/foo', 'qux')])
3269
tt.create_file([b'baz'], trans_id)
3270
tree2 = tree.controldir.sprout('tree2').open_workingtree()
3271
self.build_tree_contents([('tree2/foo', b'qux')])
2873
3272
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2874
pb, tree.basis_tree())
2875
3274
merger.merge_type = Merge3Merger
2876
3275
merger.do_merge()
3277
def test_has_filename(self):
3278
wt = self.make_branch_and_tree('tree')
3279
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3280
tt = TransformPreview(wt)
3281
removed_id = tt.trans_id_tree_path('removed')
3282
tt.delete_contents(removed_id)
3283
tt.new_file('new', tt.root, [b'contents'])
3284
modified_id = tt.trans_id_tree_path('modified')
3285
tt.delete_contents(modified_id)
3286
tt.create_file([b'modified-contents'], modified_id)
3287
self.addCleanup(tt.finalize)
3288
tree = tt.get_preview_tree()
3289
self.assertTrue(tree.has_filename('unmodified'))
3290
self.assertFalse(tree.has_filename('not-present'))
3291
self.assertFalse(tree.has_filename('removed'))
3292
self.assertTrue(tree.has_filename('new'))
3293
self.assertTrue(tree.has_filename('modified'))
2878
3295
def test_is_executable(self):
2879
3296
tree = self.make_branch_and_tree('tree')
2880
3297
preview = TransformPreview(tree)
2881
3298
self.addCleanup(preview.finalize)
2882
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3299
preview.new_file('foo', preview.root, [b'bar'], b'baz-id')
2883
3300
preview_tree = preview.get_preview_tree()
2884
self.assertEqual(False, preview_tree.is_executable('baz-id',
2886
self.assertEqual(False, preview_tree.is_executable('baz-id'))
3301
self.assertEqual(False, preview_tree.is_executable('tree/foo', b'baz-id'))
3302
self.assertEqual(False, preview_tree.is_executable('tree/foo'))
2888
3304
def test_commit_preview_tree(self):
2889
3305
tree = self.make_branch_and_tree('tree')
3166
3582
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3168
3584
def test_get_parents_lines(self):
3169
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3170
LINES_TWO = 'z\nbb\nx\ndd\n'
3585
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3586
LINES_TWO = b'z\nbb\nx\ndd\n'
3171
3587
tree = self.make_branch_and_tree('tree')
3172
3588
self.build_tree_contents([('tree/file', LINES_ONE)])
3173
tree.add('file', 'file-id')
3589
tree.add('file', b'file-id')
3174
3590
tt = self.get_preview(tree)
3175
3591
trans_id = tt.trans_id_tree_path('file')
3176
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3592
self.assertEqual(([b'aa\n', b'bb\n', b'cc\n', b'dd\n'],),
3177
3593
tt._get_parents_lines(trans_id))
3179
3595
def test_get_parents_texts(self):
3180
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3181
LINES_TWO = 'z\nbb\nx\ndd\n'
3596
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3597
LINES_TWO = b'z\nbb\nx\ndd\n'
3182
3598
tree = self.make_branch_and_tree('tree')
3183
3599
self.build_tree_contents([('tree/file', LINES_ONE)])
3184
tree.add('file', 'file-id')
3600
tree.add('file', b'file-id')
3185
3601
tt = self.get_preview(tree)
3186
3602
trans_id = tt.trans_id_tree_path('file')
3187
3603
self.assertEqual((LINES_ONE,),
3188
3604
tt._get_parents_texts(trans_id))
3607
class TestOrphan(tests.TestCaseWithTransport):
3609
def test_no_orphan_for_transform_preview(self):
3610
tree = self.make_branch_and_tree('tree')
3611
tt = transform.TransformPreview(tree)
3612
self.addCleanup(tt.finalize)
3613
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3615
def _set_orphan_policy(self, wt, policy):
3616
wt.branch.get_config_stack().set('transform.orphan_policy',
3619
def _prepare_orphan(self, wt):
3620
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3621
wt.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
3622
wt.commit('add dir and file ignoring foo')
3623
tt = transform.TreeTransform(wt)
3624
self.addCleanup(tt.finalize)
3625
# dir and bar are deleted
3626
dir_tid = tt.trans_id_tree_path('dir')
3627
file_tid = tt.trans_id_tree_path('dir/file')
3628
orphan_tid = tt.trans_id_tree_path('dir/foo')
3629
tt.delete_contents(file_tid)
3630
tt.unversion_file(file_tid)
3631
tt.delete_contents(dir_tid)
3632
tt.unversion_file(dir_tid)
3633
# There should be a conflict because dir still contain foo
3634
raw_conflicts = tt.find_conflicts()
3635
self.assertLength(1, raw_conflicts)
3636
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3637
return tt, orphan_tid
3639
def test_new_orphan_created(self):
3640
wt = self.make_branch_and_tree('.')
3641
self._set_orphan_policy(wt, 'move')
3642
tt, orphan_tid = self._prepare_orphan(wt)
3645
warnings.append(args[0] % args[1:])
3646
self.overrideAttr(trace, 'warning', warning)
3647
remaining_conflicts = resolve_conflicts(tt)
3648
self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
3650
# Yeah for resolved conflicts !
3651
self.assertLength(0, remaining_conflicts)
3652
# We have a new orphan
3653
self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
3654
self.assertEqual('brz-orphans',
3655
tt.final_name(tt.final_parent(orphan_tid)))
3657
def test_never_orphan(self):
3658
wt = self.make_branch_and_tree('.')
3659
self._set_orphan_policy(wt, 'conflict')
3660
tt, orphan_tid = self._prepare_orphan(wt)
3661
remaining_conflicts = resolve_conflicts(tt)
3662
self.assertLength(1, remaining_conflicts)
3663
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3664
remaining_conflicts.pop())
3666
def test_orphan_error(self):
3667
def bogus_orphan(tt, orphan_id, parent_id):
3668
raise transform.OrphaningError(tt.final_name(orphan_id),
3669
tt.final_name(parent_id))
3670
transform.orphaning_registry.register('bogus', bogus_orphan,
3671
'Raise an error when orphaning')
3672
wt = self.make_branch_and_tree('.')
3673
self._set_orphan_policy(wt, 'bogus')
3674
tt, orphan_tid = self._prepare_orphan(wt)
3675
remaining_conflicts = resolve_conflicts(tt)
3676
self.assertLength(1, remaining_conflicts)
3677
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3678
remaining_conflicts.pop())
3680
def test_unknown_orphan_policy(self):
3681
wt = self.make_branch_and_tree('.')
3682
# Set a fictional policy nobody ever implemented
3683
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3684
tt, orphan_tid = self._prepare_orphan(wt)
3687
warnings.append(args[0] % args[1:])
3688
self.overrideAttr(trace, 'warning', warning)
3689
remaining_conflicts = resolve_conflicts(tt)
3690
# We fallback to the default policy which create a conflict
3691
self.assertLength(1, remaining_conflicts)
3692
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3693
remaining_conflicts.pop())
3694
self.assertLength(1, warnings)
3695
self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3698
class TestTransformHooks(tests.TestCaseWithTransport):
3701
super(TestTransformHooks, self).setUp()
3702
self.wt = self.make_branch_and_tree('.')
3705
def get_transform(self):
3706
transform = TreeTransform(self.wt)
3707
self.addCleanup(transform.finalize)
3708
return transform, transform.root
3710
def test_pre_commit_hooks(self):
3712
def record_pre_transform(tree, tt):
3713
calls.append((tree, tt))
3714
MutableTree.hooks.install_named_hook('pre_transform',
3715
record_pre_transform, "Pre transform")
3716
transform, root = self.get_transform()
3717
old_root_id = transform.tree_file_id(root)
3719
self.assertEqual(old_root_id, self.wt.get_root_id())
3720
self.assertEqual([(self.wt, transform)], calls)
3722
def test_post_commit_hooks(self):
3724
def record_post_transform(tree, tt):
3725
calls.append((tree, tt))
3726
MutableTree.hooks.install_named_hook('post_transform',
3727
record_post_transform, "Post transform")
3728
transform, root = self.get_transform()
3729
old_root_id = transform.tree_file_id(root)
3731
self.assertEqual(old_root_id, self.wt.get_root_id())
3732
self.assertEqual([(self.wt, transform)], calls)
3735
class TestLinkTree(tests.TestCaseWithTransport):
3737
_test_needs_features = [HardlinkFeature]
3740
tests.TestCaseWithTransport.setUp(self)
3741
self.parent_tree = self.make_branch_and_tree('parent')
3742
self.parent_tree.lock_write()
3743
self.addCleanup(self.parent_tree.unlock)
3744
self.build_tree_contents([('parent/foo', b'bar')])
3745
self.parent_tree.add('foo')
3746
self.parent_tree.commit('added foo')
3747
child_controldir = self.parent_tree.controldir.sprout('child')
3748
self.child_tree = child_controldir.open_workingtree()
3750
def hardlinked(self):
3751
parent_stat = os.lstat(self.parent_tree.abspath('foo'))
3752
child_stat = os.lstat(self.child_tree.abspath('foo'))
3753
return parent_stat.st_ino == child_stat.st_ino
3755
def test_link_fails_if_modified(self):
3756
"""If the file to be linked has modified text, don't link."""
3757
self.build_tree_contents([('child/foo', b'baz')])
3758
transform.link_tree(self.child_tree, self.parent_tree)
3759
self.assertFalse(self.hardlinked())
3761
def test_link_fails_if_execute_bit_changed(self):
3762
"""If the file to be linked has modified execute bit, don't link."""
3763
tt = TreeTransform(self.child_tree)
3765
trans_id = tt.trans_id_tree_path('foo')
3766
tt.set_executability(True, trans_id)
3770
transform.link_tree(self.child_tree, self.parent_tree)
3771
self.assertFalse(self.hardlinked())
3773
def test_link_succeeds_if_unmodified(self):
3774
"""If the file to be linked is unmodified, link"""
3775
transform.link_tree(self.child_tree, self.parent_tree)
3776
self.assertTrue(self.hardlinked())
added
removed
breezy/tests/test_transform.py
