101
140
imaginary_id = transform.trans_id_tree_path('imaginary')
102
141
imaginary_id2 = transform.trans_id_tree_path('imaginary/')
103
142
self.assertEqual(imaginary_id, imaginary_id2)
104
self.assertEqual(transform.get_tree_parent(imaginary_id), root)
105
self.assertEqual(transform.final_kind(root), 'directory')
106
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))
107
146
trans_id = transform.create_path('name', root)
108
147
self.assertIs(transform.final_file_id(trans_id), None)
109
self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
110
transform.create_file('contents', trans_id)
148
self.assertIs(None, transform.final_kind(trans_id))
149
transform.create_file([b'contents'], trans_id)
111
150
transform.set_executability(True, trans_id)
112
transform.version_file('my_pretties', trans_id)
151
transform.version_file(b'my_pretties', trans_id)
113
152
self.assertRaises(DuplicateKey, transform.version_file,
114
'my_pretties', trans_id)
115
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')
116
155
self.assertEqual(transform.final_parent(trans_id), root)
117
156
self.assertIs(transform.final_parent(root), ROOT_PARENT)
118
157
self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
119
158
oz_id = transform.create_path('oz', root)
120
159
transform.create_directory(oz_id)
121
transform.version_file('ozzie', oz_id)
160
transform.version_file(b'ozzie', oz_id)
122
161
trans_id2 = transform.create_path('name2', root)
123
transform.create_file('contents', trans_id2)
162
transform.create_file([b'contents'], trans_id2)
124
163
transform.set_executability(False, trans_id2)
125
transform.version_file('my_pretties2', trans_id2)
164
transform.version_file(b'my_pretties2', trans_id2)
126
165
modified_paths = transform.apply().modified_paths
127
self.assertEqual('contents', self.wt.get_file_byname('name').read())
128
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
129
self.assertIs(self.wt.is_executable('my_pretties'), True)
130
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)
131
171
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
132
172
self.assertEqual(len(modified_paths), 3)
133
tree_mod_paths = [self.wt.id2abspath(f) for f in
134
('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')]
135
175
self.assertSubset(tree_mod_paths, modified_paths)
136
176
# is it safe to finalize repeatedly?
137
177
transform.finalize()
138
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)
140
241
def test_create_files_same_timestamp(self):
141
242
transform, root = self.get_transform()
142
243
self.wt.lock_tree_write()
163
264
def test_change_root_id(self):
164
265
transform, root = self.get_transform()
165
self.assertNotEqual('new-root-id', self.wt.get_root_id())
166
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')
167
268
transform.delete_contents(root)
168
269
transform.unversion_file(root)
169
270
transform.fixup_new_roots()
170
271
transform.apply()
171
self.assertEqual('new-root-id', self.wt.get_root_id())
272
self.assertEqual(b'new-root-id', self.wt.get_root_id())
173
274
def test_change_root_id_add_files(self):
174
275
transform, root = self.get_transform()
175
self.assertNotEqual('new-root-id', self.wt.get_root_id())
176
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
177
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'],
179
280
transform.delete_contents(root)
180
281
transform.unversion_file(root)
181
282
transform.fixup_new_roots()
182
283
transform.apply()
183
self.assertEqual('new-root-id', self.wt.get_root_id())
184
self.assertEqual('new-file-id', self.wt.path2id('file'))
185
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'))
187
288
def test_add_two_roots(self):
188
289
transform, root = self.get_transform()
189
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
190
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
191
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())
193
356
def test_hardlink(self):
194
357
self.requireFeature(HardlinkFeature)
195
358
transform, root = self.get_transform()
196
transform.new_file('file1', root, 'contents')
359
transform.new_file('file1', root, [b'contents'])
197
360
transform.apply()
198
361
target = self.make_branch_and_tree('target')
199
362
target_transform = TreeTransform(target)
200
363
trans_id = target_transform.create_path('file1', target_transform.root)
201
364
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
202
365
target_transform.apply()
203
self.failUnlessExists('target/file1')
366
self.assertPathExists('target/file1')
204
367
source_stat = os.stat(self.wt.abspath('file1'))
205
368
target_stat = os.stat('target/file1')
206
369
self.assertEqual(source_stat, target_stat)
209
372
transform, root = self.get_transform()
210
373
self.wt.lock_tree_write()
211
374
self.addCleanup(self.wt.unlock)
212
trans_id = transform.new_file('name', root, 'contents',
214
oz = transform.new_directory('oz', root, 'oz-id')
215
dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
216
toto = transform.new_file('toto', dorothy, 'toto-contents',
375
trans_id = transform.new_file('name', root, [b'contents'],
376
b'my_pretties', True)
377
oz = transform.new_directory('oz', root, b'oz-id')
378
dorothy = transform.new_directory('dorothy', oz, b'dorothy-id')
379
toto = transform.new_file('toto', dorothy, [b'toto-contents'],
219
382
self.assertEqual(len(transform.find_conflicts()), 0)
220
383
transform.apply()
221
384
self.assertRaises(ReusingTransform, transform.find_conflicts)
222
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())
223
387
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
224
self.assertIs(self.wt.is_executable('my_pretties'), True)
225
self.assertEqual(self.wt.path2id('oz'), 'oz-id')
226
self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
227
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')
229
self.assertEqual('toto-contents',
230
self.wt.get_file_byname('oz/dorothy/toto').read())
231
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)
233
397
def test_tree_reference(self):
234
398
transform, root = self.get_transform()
235
399
tree = transform._tree
236
trans_id = transform.new_directory('reference', root, 'subtree-id')
400
trans_id = transform.new_directory('reference', root, b'subtree-id')
237
401
transform.set_tree_reference('subtree-revision', trans_id)
238
402
transform.apply()
240
404
self.addCleanup(tree.unlock)
241
self.assertEqual('subtree-revision',
242
tree.inventory['subtree-id'].reference_revision)
405
self.assertEqual(b'subtree-revision',
406
tree.root_inventory.get_entry(b'subtree-id').reference_revision)
244
408
def test_conflicts(self):
245
409
transform, root = self.get_transform()
246
trans_id = transform.new_file('name', root, 'contents',
410
trans_id = transform.new_file('name', root, [b'contents'],
248
412
self.assertEqual(len(transform.find_conflicts()), 0)
249
trans_id2 = transform.new_file('name', root, 'Crontents', 'toto')
413
trans_id2 = transform.new_file('name', root, [b'Crontents'], b'toto')
250
414
self.assertEqual(transform.find_conflicts(),
251
415
[('duplicate', trans_id, trans_id2, 'name')])
252
416
self.assertRaises(MalformedTransform, transform.apply)
383
548
tree.case_sensitive = False
384
549
transform = TreeTransform(tree)
385
550
self.addCleanup(transform.finalize)
386
transform.new_file('file', transform.root, 'content')
387
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'])
388
553
resolve_conflicts(transform,
389
554
pass_func=lambda t, c: resolve_checkout(t, c, []))
390
555
transform.apply()
391
self.failUnlessExists('tree/file')
392
self.failUnlessExists('tree/FiLe.moved')
556
self.assertPathExists('tree/file')
557
self.assertPathExists('tree/FiLe.moved')
394
559
def test_apply_case_conflict(self):
395
560
"""Ensure that a transform with case conflicts can always be applied"""
396
561
tree = self.make_branch_and_tree('tree')
397
562
transform = TreeTransform(tree)
398
563
self.addCleanup(transform.finalize)
399
transform.new_file('file', transform.root, 'content')
400
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'])
401
566
dir = transform.new_directory('dir', transform.root)
402
transform.new_file('dirfile', dir, 'content')
403
transform.new_file('dirFiLe', dir, 'content')
567
transform.new_file('dirfile', dir, [b'content'])
568
transform.new_file('dirFiLe', dir, [b'content'])
404
569
resolve_conflicts(transform)
405
570
transform.apply()
406
self.failUnlessExists('tree/file')
571
self.assertPathExists('tree/file')
407
572
if not os.path.exists('tree/FiLe.moved'):
408
self.failUnlessExists('tree/FiLe')
409
self.failUnlessExists('tree/dir/dirfile')
573
self.assertPathExists('tree/FiLe')
574
self.assertPathExists('tree/dir/dirfile')
410
575
if not os.path.exists('tree/dir/dirFiLe.moved'):
411
self.failUnlessExists('tree/dir/dirFiLe')
576
self.assertPathExists('tree/dir/dirFiLe')
413
578
def test_case_insensitive_limbo(self):
414
579
tree = self.make_branch_and_tree('tree')
463
628
create_tree, root = self.get_transform()
465
630
root = create_tree.root
466
create_tree.new_file('name1', root, 'hello1', 'name1')
467
create_tree.new_file('name2', root, 'hello2', 'name2')
468
ddir = create_tree.new_directory('dying_directory', root, 'ddir')
469
create_tree.new_file('dying_file', ddir, 'goodbye1', 'dfile')
470
create_tree.new_file('moving_file', ddir, 'later1', 'mfile')
471
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')
472
637
create_tree.apply()
474
mangle_tree,root = self.get_transform()
639
mangle_tree, root = self.get_transform()
475
640
root = mangle_tree.root
477
name1 = mangle_tree.trans_id_tree_file_id('name1')
478
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')
479
644
mangle_tree.adjust_path('name2', root, name1)
480
645
mangle_tree.adjust_path('name1', root, name2)
482
647
#tests for deleting parent directories
483
ddir = mangle_tree.trans_id_tree_file_id('ddir')
648
ddir = mangle_tree.trans_id_tree_path('dying_directory')
484
649
mangle_tree.delete_contents(ddir)
485
dfile = mangle_tree.trans_id_tree_file_id('dfile')
650
dfile = mangle_tree.trans_id_tree_path('dying_directory/dying_file')
486
651
mangle_tree.delete_versioned(dfile)
487
652
mangle_tree.unversion_file(dfile)
488
mfile = mangle_tree.trans_id_tree_file_id('mfile')
653
mfile = mangle_tree.trans_id_tree_path('dying_directory/moving_file')
489
654
mangle_tree.adjust_path('mfile', root, mfile)
491
656
#tests for adding parent directories
492
657
newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
493
mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
658
mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
494
659
mangle_tree.adjust_path('mfile2', newdir, mfile2)
495
mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
496
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')
497
662
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
498
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
663
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
499
664
mangle_tree.apply()
500
self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
501
self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
502
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'))
503
670
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
504
self.assertEqual(file(mfile2_path).read(), 'later2')
505
self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
506
self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
507
newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
508
self.assertEqual(file(newfile_path).read(), 'hello3')
509
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')
510
679
self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
511
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
680
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
513
682
def test_both_rename(self):
514
create_tree,root = self.get_transform()
515
newdir = create_tree.new_directory('selftest', root, 'selftest-id')
516
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')
517
686
create_tree.apply()
518
mangle_tree,root = self.get_transform()
519
selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
520
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')
521
690
mangle_tree.adjust_path('test', root, selftest)
522
691
mangle_tree.adjust_path('test_too_much', root, selftest)
523
692
mangle_tree.set_executability(True, blackbox)
524
693
mangle_tree.apply()
526
695
def test_both_rename2(self):
527
create_tree,root = self.get_transform()
528
bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
529
tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
530
blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
531
create_tree.new_file('test_too_much.py', blackbox, 'hello1',
696
create_tree, root = self.get_transform()
697
breezy = create_tree.new_directory('breezy', root, b'breezy-id')
698
tests = create_tree.new_directory('tests', breezy, b'tests-id')
699
blackbox = create_tree.new_directory('blackbox', tests, b'blackbox-id')
700
create_tree.new_file('test_too_much.py', blackbox, [b'hello1'],
533
702
create_tree.apply()
534
mangle_tree,root = self.get_transform()
535
bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
536
tests = mangle_tree.trans_id_tree_file_id('tests-id')
537
test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
538
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)
539
708
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
540
709
mangle_tree.set_executability(True, test_too_much)
541
710
mangle_tree.apply()
543
712
def test_both_rename3(self):
544
create_tree,root = self.get_transform()
545
tests = create_tree.new_directory('tests', root, 'tests-id')
546
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'],
548
717
create_tree.apply()
549
mangle_tree,root = self.get_transform()
550
tests = mangle_tree.trans_id_tree_file_id('tests-id')
551
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')
552
721
mangle_tree.adjust_path('selftest', root, tests)
553
722
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
554
723
mangle_tree.set_executability(True, test_too_much)
574
743
create_tree, root = self.get_transform()
576
745
root = create_tree.root
577
create_tree.new_file('name1', root, 'hello1', 'name1')
746
create_tree.new_file('name1', root, [b'hello1'], 'name1')
578
747
create_tree.apply()
579
748
delete_contents = TreeTransform(self.wt)
580
749
self.addCleanup(delete_contents.finalize)
581
file = delete_contents.trans_id_tree_file_id('name1')
750
file = delete_contents.trans_id_tree_path('name1')
582
751
delete_contents.delete_contents(file)
583
752
delete_contents.apply()
584
753
delete_contents.finalize()
585
754
replace = TreeTransform(self.wt)
586
755
self.addCleanup(replace.finalize)
587
name2 = replace.new_file('name2', root, 'hello2', 'name1')
756
name2 = replace.new_file('name2', root, [b'hello2'], 'name1')
588
757
conflicts = replace.find_conflicts()
589
name1 = replace.trans_id_tree_file_id('name1')
758
name1 = replace.trans_id_tree_path('name1')
590
759
self.assertEqual(conflicts, [('duplicate id', name1, name2)])
591
760
resolve_conflicts(replace)
594
def _test_symlinks(self, link_name1,link_target1,
763
def _test_symlinks(self, link_name1, link_target1,
595
764
link_name2, link_target2):
597
766
def ozpath(p): return 'oz/' + p
599
768
self.requireFeature(SymlinkFeature)
600
769
transform, root = self.get_transform()
601
oz_id = transform.new_directory('oz', root, 'oz-id')
770
oz_id = transform.new_directory('oz', root, b'oz-id')
602
771
wizard = transform.new_symlink(link_name1, oz_id, link_target1,
604
773
wiz_id = transform.create_path(link_name2, oz_id)
605
774
transform.create_symlink(link_target2, wiz_id)
606
transform.version_file('wiz-id2', wiz_id)
775
transform.version_file(b'wiz-id2', wiz_id)
607
776
transform.set_executability(True, wiz_id)
608
777
self.assertEqual(transform.find_conflicts(),
609
778
[('non-file executability', wiz_id)])
610
779
transform.set_executability(None, wiz_id)
611
780
transform.apply()
612
self.assertEqual(self.wt.path2id(ozpath(link_name1)), 'wizard-id')
781
self.assertEqual(self.wt.path2id(ozpath(link_name1)), b'wizard-id')
613
782
self.assertEqual('symlink',
614
783
file_kind(self.wt.abspath(ozpath(link_name1))))
615
784
self.assertEqual(link_target2,
753
922
def test_resolve_conflicts_wrong_existing_parent_kind(self):
754
923
tt = self.prepare_wrong_parent_kind()
755
924
raw_conflicts = resolve_conflicts(tt)
756
self.assertEqual(set([('non-directory parent', 'Created directory',
757
'new-3')]), raw_conflicts)
925
self.assertEqual({('non-directory parent', 'Created directory',
926
'new-3')}, raw_conflicts)
758
927
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
759
928
self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
760
'parent-id')], cooked_conflicts)
929
b'parent-id')], cooked_conflicts)
762
self.assertEqual(None, self.wt.path2id('parent'))
763
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
931
self.assertFalse(self.wt.is_versioned('parent'))
932
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
765
934
def test_resolve_conflicts_wrong_new_parent_kind(self):
766
935
tt, root = self.get_transform()
767
parent_id = tt.new_directory('parent', root, 'parent-id')
768
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')
770
939
tt, root = self.get_transform()
771
parent_id = tt.trans_id_file_id('parent-id')
940
parent_id = tt.trans_id_file_id(b'parent-id')
772
941
tt.delete_contents(parent_id)
773
tt.create_file('contents', parent_id)
942
tt.create_file([b'contents'], parent_id)
774
943
raw_conflicts = resolve_conflicts(tt)
775
self.assertEqual(set([('non-directory parent', 'Created directory',
776
'new-3')]), raw_conflicts)
944
self.assertEqual({('non-directory parent', 'Created directory',
945
'new-3')}, raw_conflicts)
778
self.assertEqual(None, self.wt.path2id('parent'))
779
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'))
781
950
def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
782
951
tt, root = self.get_transform()
783
952
parent_id = tt.new_directory('parent', root)
784
tt.new_file('child,', parent_id, 'contents2')
953
tt.new_file('child,', parent_id, [b'contents2'])
786
955
tt, root = self.get_transform()
787
956
parent_id = tt.trans_id_tree_path('parent')
788
957
tt.delete_contents(parent_id)
789
tt.create_file('contents', parent_id)
958
tt.create_file([b'contents'], parent_id)
790
959
resolve_conflicts(tt)
792
self.assertIs(None, self.wt.path2id('parent'))
793
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)
795
979
def test_moving_versioned_directories(self):
796
980
create, root = self.get_transform()
797
kansas = create.new_directory('kansas', root, 'kansas-id')
798
create.new_directory('house', kansas, 'house-id')
799
create.new_directory('oz', root, 'oz-id')
981
kansas = create.new_directory('kansas', root, b'kansas-id')
982
create.new_directory('house', kansas, b'house-id')
983
create.new_directory('oz', root, b'oz-id')
801
985
cyclone, root = self.get_transform()
802
oz = cyclone.trans_id_tree_file_id('oz-id')
803
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')
804
988
cyclone.adjust_path('house', oz, house)
807
991
def test_moving_root(self):
808
992
create, root = self.get_transform()
809
fun = create.new_directory('fun', root, 'fun-id')
810
create.new_directory('sun', root, 'sun-id')
811
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')
813
997
transform, root = self.get_transform()
814
998
transform.adjust_root_path('oldroot', fun)
815
999
new_root = transform.trans_id_tree_path('')
816
transform.version_file('new-root', new_root)
1000
transform.version_file(b'new-root', new_root)
817
1001
transform.apply()
819
1003
def test_renames(self):
820
1004
create, root = self.get_transform()
821
old = create.new_directory('old-parent', root, 'old-id')
822
intermediate = create.new_directory('intermediate', old, 'im-id')
823
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'],
826
1010
rename, root = self.get_transform()
827
old = rename.trans_id_file_id('old-id')
1011
old = rename.trans_id_file_id(b'old-id')
828
1012
rename.adjust_path('new', root, old)
829
myfile = rename.trans_id_file_id('myfile-id')
1013
myfile = rename.trans_id_file_id(b'myfile-id')
830
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")
833
1055
def test_set_executability_order(self):
834
1056
"""Ensure that executability behaves the same, no matter what order.
903
1125
self.assertEqual([bar1_abspath], stat_paths)
905
1127
def test_iter_changes(self):
906
self.wt.set_root_id('eert_toor')
1128
self.wt.set_root_id(b'eert_toor')
907
1129
transform, root = self.get_transform()
908
transform.new_file('old', root, 'blah', 'id-1', True)
1130
transform.new_file('old', root, [b'blah'], b'id-1', True)
909
1131
transform.apply()
910
1132
transform, root = self.get_transform()
912
1134
self.assertEqual([], list(transform.iter_changes()))
913
old = transform.trans_id_tree_file_id('id-1')
1135
old = transform.trans_id_tree_path('old')
914
1136
transform.unversion_file(old)
915
self.assertEqual([('id-1', ('old', None), False, (True, False),
916
('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'),
917
1139
(True, True))], list(transform.iter_changes()))
918
transform.new_directory('new', root, 'id-1')
919
self.assertEqual([('id-1', ('old', 'new'), True, (True, True),
920
('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'),
921
1143
('file', 'directory'),
922
1144
(True, False))], list(transform.iter_changes()))
924
1146
transform.finalize()
926
1148
def test_iter_changes_new(self):
927
self.wt.set_root_id('eert_toor')
1149
self.wt.set_root_id(b'eert_toor')
928
1150
transform, root = self.get_transform()
929
transform.new_file('old', root, 'blah')
1151
transform.new_file('old', root, [b'blah'])
930
1152
transform.apply()
931
1153
transform, root = self.get_transform()
933
1155
old = transform.trans_id_tree_path('old')
934
transform.version_file('id-1', old)
935
self.assertEqual([('id-1', (None, 'old'), False, (False, True),
936
('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'),
937
1159
(False, False))], list(transform.iter_changes()))
939
1161
transform.finalize()
941
1163
def test_iter_changes_modifications(self):
942
self.wt.set_root_id('eert_toor')
1164
self.wt.set_root_id(b'eert_toor')
943
1165
transform, root = self.get_transform()
944
transform.new_file('old', root, 'blah', 'id-1')
945
transform.new_file('new', root, 'blah')
946
transform.new_directory('subdir', root, 'subdir-id')
1166
transform.new_file('old', root, [b'blah'], b'id-1')
1167
transform.new_file('new', root, [b'blah'])
1168
transform.new_directory('subdir', root, b'subdir-id')
947
1169
transform.apply()
948
1170
transform, root = self.get_transform()
950
1172
old = transform.trans_id_tree_path('old')
951
subdir = transform.trans_id_tree_file_id('subdir-id')
1173
subdir = transform.trans_id_tree_path('subdir')
952
1174
new = transform.trans_id_tree_path('new')
953
1175
self.assertEqual([], list(transform.iter_changes()))
955
1177
#content deletion
956
1178
transform.delete_contents(old)
957
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
958
('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),
959
1181
(False, False))], list(transform.iter_changes()))
962
transform.create_file('blah', old)
963
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
964
('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'),
965
1187
(False, False))], list(transform.iter_changes()))
966
1188
transform.cancel_deletion(old)
967
1189
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
968
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1190
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
969
1191
(False, False))], list(transform.iter_changes()))
970
1192
transform.cancel_creation(old)
972
1194
# move file_id to a different file
973
1195
self.assertEqual([], list(transform.iter_changes()))
974
1196
transform.unversion_file(old)
975
transform.version_file('id-1', new)
1197
transform.version_file(b'id-1', new)
976
1198
transform.adjust_path('old', root, new)
977
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
1199
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
978
1200
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
979
1201
(False, False))], list(transform.iter_changes()))
980
1202
transform.cancel_versioning(new)
1011
1233
transform.finalize()
1013
1235
def test_iter_changes_modified_bleed(self):
1014
self.wt.set_root_id('eert_toor')
1236
self.wt.set_root_id(b'eert_toor')
1015
1237
"""Modified flag should not bleed from one change to another"""
1016
1238
# unfortunately, we have no guarantee that file1 (which is modified)
1017
1239
# will be applied before file2. And if it's applied after file2, it
1018
1240
# obviously can't bleed into file2's change output. But for now, it
1020
1242
transform, root = self.get_transform()
1021
transform.new_file('file1', root, 'blah', 'id-1')
1022
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')
1023
1245
transform.apply()
1024
1246
transform, root = self.get_transform()
1026
transform.delete_contents(transform.trans_id_file_id('id-1'))
1248
transform.delete_contents(transform.trans_id_file_id(b'id-1'))
1027
1249
transform.set_executability(True,
1028
transform.trans_id_file_id('id-2'))
1029
self.assertEqual([('id-1', (u'file1', u'file1'), True, (True, True),
1030
('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'),
1031
1253
('file', None), (False, False)),
1032
('id-2', (u'file2', u'file2'), False, (True, True),
1033
('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'),
1034
1256
('file', 'file'), (False, True))],
1035
1257
list(transform.iter_changes()))
1382
1598
self.build_tree(['baz'])
1383
1599
tt.create_hardlink("baz", foo_trans_id)
1385
self.failUnlessExists("foo")
1386
self.failUnlessExists("baz")
1601
self.assertPathExists("foo")
1602
self.assertPathExists("baz")
1388
1604
self.addCleanup(wt.unlock)
1389
self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1605
self.assertEqual(wt.kind("foo"), "file")
1392
1607
def test_no_final_path(self):
1393
1608
transform, root = self.get_transform()
1394
trans_id = transform.trans_id_file_id('foo')
1395
transform.create_file('bar', trans_id)
1609
trans_id = transform.trans_id_file_id(b'foo')
1610
transform.create_file([b'bar'], trans_id)
1396
1611
transform.cancel_creation(trans_id)
1397
1612
transform.apply()
1399
1614
def test_create_from_tree(self):
1400
1615
tree1 = self.make_branch_and_tree('tree1')
1401
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', 'baz')])
1402
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'])
1403
1618
tree2 = self.make_branch_and_tree('tree2')
1404
1619
tt = TreeTransform(tree2)
1405
1620
foo_trans_id = tt.create_path('foo', tt.root)
1406
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')
1407
1622
bar_trans_id = tt.create_path('bar', tt.root)
1408
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')
1410
1625
self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1411
self.assertFileEqual('baz', 'tree2/bar')
1626
self.assertFileEqual(b'baz', 'tree2/bar')
1413
1628
def test_create_from_tree_bytes(self):
1414
1629
"""Provided lines are used instead of tree content."""
1415
1630
tree1 = self.make_branch_and_tree('tree1')
1416
self.build_tree_contents([('tree1/foo', 'bar'),])
1417
tree1.add('foo', 'foo-id')
1631
self.build_tree_contents([('tree1/foo', b'bar'),])
1632
tree1.add('foo', b'foo-id')
1418
1633
tree2 = self.make_branch_and_tree('tree2')
1419
1634
tt = TreeTransform(tree2)
1420
1635
foo_trans_id = tt.create_path('foo', tt.root)
1421
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',
1423
self.assertFileEqual('qux', 'tree2/foo')
1639
self.assertFileEqual(b'qux', 'tree2/foo')
1425
1641
def test_create_from_tree_symlink(self):
1426
1642
self.requireFeature(SymlinkFeature)
1427
1643
tree1 = self.make_branch_and_tree('tree1')
1428
1644
os.symlink('bar', 'tree1/foo')
1429
tree1.add('foo', 'foo-id')
1645
tree1.add('foo', b'foo-id')
1430
1646
tt = TreeTransform(self.make_branch_and_tree('tree2'))
1431
1647
foo_trans_id = tt.create_path('foo', tt.root)
1432
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')
1434
1650
self.assertEqual('bar', os.readlink('tree2/foo'))
1456
1704
def test_text_merge(self):
1457
1705
root_id = generate_ids.gen_root_id()
1458
1706
base = TransformGroup("base", root_id)
1459
base.tt.new_file('a', base.root, 'a\nb\nc\nd\be\n', 'a')
1460
base.tt.new_file('b', base.root, 'b1', 'b')
1461
base.tt.new_file('c', base.root, 'c', 'c')
1462
base.tt.new_file('d', base.root, 'd', 'd')
1463
base.tt.new_file('e', base.root, 'e', 'e')
1464
base.tt.new_file('f', base.root, 'f', 'f')
1465
base.tt.new_directory('g', base.root, 'g')
1466
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')
1467
1715
base.tt.apply()
1468
1716
other = TransformGroup("other", root_id)
1469
other.tt.new_file('a', other.root, 'y\nb\nc\nd\be\n', 'a')
1470
other.tt.new_file('b', other.root, 'b2', 'b')
1471
other.tt.new_file('c', other.root, 'c2', 'c')
1472
other.tt.new_file('d', other.root, 'd', 'd')
1473
other.tt.new_file('e', other.root, 'e2', 'e')
1474
other.tt.new_file('f', other.root, 'f', 'f')
1475
other.tt.new_file('g', other.root, 'g', 'g')
1476
other.tt.new_file('h', other.root, 'h\ni\nj\nk\n', 'h')
1477
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')
1478
1726
other.tt.apply()
1479
1727
this = TransformGroup("this", root_id)
1480
this.tt.new_file('a', this.root, 'a\nb\nc\nd\bz\n', 'a')
1481
this.tt.new_file('b', this.root, 'b', 'b')
1482
this.tt.new_file('c', this.root, 'c', 'c')
1483
this.tt.new_file('d', this.root, 'd2', 'd')
1484
this.tt.new_file('e', this.root, 'e2', 'e')
1485
this.tt.new_file('f', this.root, 'f', 'f')
1486
this.tt.new_file('g', this.root, 'g', 'g')
1487
this.tt.new_file('h', this.root, '1\n2\n3\n4\n', 'h')
1488
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')
1489
1737
this.tt.apply()
1490
1738
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1492
1740
# textual merge
1493
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')
1494
1743
# three-way text conflict
1495
self.assertEqual(this.wt.get_file('b').read(),
1496
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'))
1498
self.assertEqual(this.wt.get_file('c').read(), 'c2')
1747
self.assertEqual(this.wt.get_file(this.wt.id2path(b'c')).read(), b'c2')
1500
self.assertEqual(this.wt.get_file('d').read(), 'd2')
1749
self.assertEqual(this.wt.get_file(this.wt.id2path(b'd')).read(), b'd2')
1501
1750
# Ambigious clean merge
1502
self.assertEqual(this.wt.get_file('e').read(), 'e2')
1751
self.assertEqual(this.wt.get_file(this.wt.id2path(b'e')).read(), b'e2')
1504
self.assertEqual(this.wt.get_file('f').read(), 'f')
1753
self.assertEqual(this.wt.get_file(this.wt.id2path(b'f')).read(), b'f')
1505
1754
# Correct correct results when THIS == OTHER
1506
self.assertEqual(this.wt.get_file('g').read(), 'g')
1755
self.assertEqual(this.wt.get_file(this.wt.id2path(b'g')).read(), b'g')
1507
1756
# Text conflict when THIS & OTHER are text and BASE is dir
1508
self.assertEqual(this.wt.get_file('h').read(),
1509
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1510
self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
1512
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(),
1514
1763
self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
1515
self.assertEqual(this.wt.get_file('i').read(),
1516
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1517
self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
1519
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(),
1521
1770
self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1522
1771
modified = ['a', 'b', 'c', 'h', 'i']
1523
1772
merge_modified = this.wt.merge_modified()
1524
1773
self.assertSubset(merge_modified, modified)
1525
1774
self.assertEqual(len(merge_modified), len(modified))
1526
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')
1527
1776
modified.pop(0)
1528
1777
merge_modified = this.wt.merge_modified()
1529
1778
self.assertSubset(merge_modified, modified)
1616
1865
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1617
1866
for t in [base, this, other]]
1619
base.tt.new_file('g', base_a, 'g', 'g')
1620
other.tt.new_file('g1', other_b, 'g1', 'g')
1622
base.tt.new_file('h', base_a, 'h', 'h')
1623
this.tt.new_file('h1', this_b, 'h1', 'h')
1625
base.tt.new_file('i', base.root, 'i', 'i')
1626
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')
1628
1877
for tg in [this, base, other]:
1630
1879
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1632
self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1881
self.assertEqual(this.wt.id2path(b'g'), pathjoin('b/g1.OTHER'))
1633
1882
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1634
1883
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1635
self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
1884
self.assertEqual(this.wt.id2path(b'h'), pathjoin('b/h1.THIS'))
1636
1885
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1637
1886
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1638
self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
1887
self.assertEqual(this.wt.id2path(b'i'), pathjoin('b/i1.OTHER'))
1641
1890
class TestBuildTree(tests.TestCaseWithTransport):
1643
1892
def test_build_tree_with_symlinks(self):
1644
1893
self.requireFeature(SymlinkFeature)
1646
a = BzrDir.create_standalone_workingtree('a')
1895
a = ControlDir.create_standalone_workingtree('a')
1647
1896
os.mkdir('a/foo')
1648
file('a/foo/bar', 'wb').write('contents')
1897
with open('a/foo/bar', 'wb') as f: f.write(b'contents')
1649
1898
os.symlink('a/foo/bar', 'a/foo/baz')
1650
1899
a.add(['foo', 'foo/bar', 'foo/baz'])
1651
1900
a.commit('initial commit')
1652
b = BzrDir.create_standalone_workingtree('b')
1901
b = ControlDir.create_standalone_workingtree('b')
1653
1902
basis = a.basis_tree()
1654
1903
basis.lock_read()
1655
1904
self.addCleanup(basis.unlock)
1656
1905
build_tree(basis, b)
1657
1906
self.assertIs(os.path.isdir('b/foo'), True)
1658
self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
1907
with open('b/foo/bar', 'rb') as f:
1908
self.assertEqual(f.read(), "contents")
1659
1909
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
1661
1911
def test_build_with_references(self):
1662
1912
tree = self.make_branch_and_tree('source',
1663
format='dirstate-with-subtree')
1913
format='development-subtree')
1664
1914
subtree = self.make_branch_and_tree('source/subtree',
1665
format='dirstate-with-subtree')
1915
format='development-subtree')
1666
1916
tree.add_reference(subtree)
1667
1917
tree.commit('a revision')
1668
1918
tree.branch.create_checkout('target')
1669
self.failUnlessExists('target')
1670
self.failUnlessExists('target/subtree')
1919
self.assertPathExists('target')
1920
self.assertPathExists('target/subtree')
1672
1922
def test_file_conflict_handling(self):
1673
1923
"""Ensure that when building trees, conflict handling is done"""
1674
1924
source = self.make_branch_and_tree('source')
1675
1925
target = self.make_branch_and_tree('target')
1676
1926
self.build_tree(['source/file', 'target/file'])
1677
source.add('file', 'new-file')
1927
source.add('file', b'new-file')
1678
1928
source.commit('added file')
1679
1929
build_tree(source.basis_tree(), target)
1680
1930
self.assertEqual([DuplicateEntry('Moved existing file to',
1681
1931
'file.moved', 'file', None, 'new-file')],
1682
1932
target.conflicts())
1683
1933
target2 = self.make_branch_and_tree('target2')
1684
target_file = file('target2/file', 'wb')
1686
source_file = file('source/file', 'rb')
1688
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())
1693
1937
build_tree(source.basis_tree(), target2)
1694
1938
self.assertEqual([], target2.conflicts())
1970
2226
self.assertEqualStat(source_stat, target_stat)
1972
2228
def test_case_insensitive_build_tree_inventory(self):
1973
if (tests.CaseInsensitiveFilesystemFeature.available()
1974
or tests.CaseInsCasePresFilenameFeature.available()):
2229
if (features.CaseInsensitiveFilesystemFeature.available()
2230
or features.CaseInsCasePresFilenameFeature.available()):
1975
2231
raise tests.UnavailableFeature('Fully case sensitive filesystem')
1976
2232
source = self.make_branch_and_tree('source')
1977
2233
self.build_tree(['source/file', 'source/FILE'])
1978
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2234
source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
1979
2235
source.commit('added files')
1980
2236
# Don't try this at home, kids!
1981
2237
# Force the tree to report that it is case insensitive
1982
2238
target = self.make_branch_and_tree('target')
1983
2239
target.case_sensitive = False
1984
2240
build_tree(source.basis_tree(), target, source, delta_from_tree=True)
1985
self.assertEqual('file.moved', target.id2path('lower-id'))
1986
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])
1989
2281
class TestCommitTransform(tests.TestCaseWithTransport):
2051
2343
def test_add_files(self):
2052
2344
branch, tt = self.get_branch_and_transform()
2053
tt.new_file('file', tt.root, 'contents', 'file-id')
2054
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')
2055
2347
if SymlinkFeature.available():
2056
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2348
tt.new_symlink('symlink', trans_id, 'target', b'symlink-id')
2057
2349
rev = tt.commit(branch, 'message')
2058
2350
tree = branch.basis_tree()
2059
self.assertEqual('file', tree.id2path('file-id'))
2060
self.assertEqual('contents', tree.get_file_text('file-id'))
2061
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'))
2062
2354
if SymlinkFeature.available():
2063
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2064
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'))
2066
2358
def test_add_unversioned(self):
2067
2359
branch, tt = self.get_branch_and_transform()
2068
tt.new_file('file', tt.root, 'contents')
2360
tt.new_file('file', tt.root, [b'contents'])
2069
2361
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2070
2362
'message', strict=True)
2072
2364
def test_modify_strict(self):
2073
2365
branch, tt = self.get_branch_and_transform()
2074
tt.new_file('file', tt.root, 'contents', 'file-id')
2366
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2075
2367
tt.commit(branch, 'message', strict=True)
2076
2368
tt = TransformPreview(branch.basis_tree())
2077
2369
self.addCleanup(tt.finalize)
2078
trans_id = tt.trans_id_file_id('file-id')
2370
trans_id = tt.trans_id_file_id(b'file-id')
2079
2371
tt.delete_contents(trans_id)
2080
tt.create_file('contents', trans_id)
2372
tt.create_file([b'contents'], trans_id)
2081
2373
tt.commit(branch, 'message', strict=True)
2083
2375
def test_commit_malformed(self):
2086
2378
In this case, we are adding a file without adding its parent.
2088
2380
branch, tt = self.get_branch_and_transform()
2089
parent_id = tt.trans_id_file_id('parent-id')
2090
tt.new_file('file', parent_id, 'contents', 'file-id')
2381
parent_id = tt.trans_id_file_id(b'parent-id')
2382
tt.new_file('file', parent_id, [b'contents'], b'file-id')
2091
2383
self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2095
class MockTransform(object):
2097
def has_named_child(self, by_parent, parent_id, name):
2098
for child_id in by_parent[parent_id]:
2102
elif name == "name.~%s~" % child_id:
2107
class MockEntry(object):
2109
object.__init__(self)
2113
class TestGetBackupName(TestCase):
2114
def test_get_backup_name(self):
2115
tt = MockTransform()
2116
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2117
self.assertEqual(name, 'name.~1~')
2118
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2119
self.assertEqual(name, 'name.~2~')
2120
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2121
self.assertEqual(name, 'name.~1~')
2122
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2123
self.assertEqual(name, 'name.~1~')
2124
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2125
self.assertEqual(name, 'name.~4~')
2386
def test_commit_rich_revision_data(self):
2387
branch, tt = self.get_branch_and_transform()
2388
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2389
committer='me <me@example.com>',
2390
revprops={u'foo': 'bar'}, revision_id=b'revid-1',
2391
authors=['Author1 <author1@example.com>',
2392
'Author2 <author2@example.com>',
2394
self.assertEqual(b'revid-1', rev_id)
2395
revision = branch.repository.get_revision(rev_id)
2396
self.assertEqual(1, revision.timestamp)
2397
self.assertEqual(43201, revision.timezone)
2398
self.assertEqual('me <me@example.com>', revision.committer)
2399
self.assertEqual(['Author1 <author1@example.com>',
2400
'Author2 <author2@example.com>'],
2401
revision.get_apparent_authors())
2402
del revision.properties['authors']
2403
self.assertEqual({'foo': 'bar',
2404
'branch-nick': 'tree'},
2405
revision.properties)
2407
def test_no_explicit_revprops(self):
2408
branch, tt = self.get_branch_and_transform()
2409
rev_id = tt.commit(branch, 'message', authors=[
2410
'Author1 <author1@example.com>',
2411
'Author2 <author2@example.com>', ])
2412
revision = branch.repository.get_revision(rev_id)
2413
self.assertEqual(['Author1 <author1@example.com>',
2414
'Author2 <author2@example.com>'],
2415
revision.get_apparent_authors())
2416
self.assertEqual('tree', revision.properties['branch-nick'])
2128
2419
class TestFileMover(tests.TestCaseWithTransport):
2240
2531
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2532
self.assertRaises(Bogus, tt.apply,
2242
2533
_mover=self.ExceptionFileMover(bad_target='d'))
2243
self.failUnlessExists('a')
2244
self.failUnlessExists('a/b')
2246
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):
2247
2665
wt = self.make_branch_and_tree('.')
2666
self.build_tree(['dir/',])
2667
wt.add(['dir'], [b'dir-id'])
2668
wt.commit('Create dir')
2248
2669
tt = TreeTransform(wt)
2249
2670
self.addCleanup(tt.finalize)
2250
parent = tt.trans_id_file_id('parent-id')
2251
tt.new_file('file', parent, 'Contents')
2252
resolve_conflicts(tt)
2255
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2256
('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'),
2257
2699
(False, False))
2258
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
('', ''), ('directory', 'directory'), (False, None))
2700
ROOT_ENTRY = (b'TREE_ROOT', ('', ''), False, (True, True), (None, None),
2701
('', ''), ('directory', 'directory'), (False, False))
2262
2704
class TestTransformPreview(tests.TestCaseWithTransport):
2264
2706
def create_tree(self):
2265
2707
tree = self.make_branch_and_tree('.')
2266
self.build_tree_contents([('a', 'content 1')])
2267
tree.set_root_id('TREE_ROOT')
2268
tree.add('a', 'a-id')
2269
tree.commit('rev1', rev_id='rev1')
2270
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')
2272
2714
def get_empty_preview(self):
2273
2715
repository = self.make_repository('repo')
2377
2819
revision_tree = self.create_tree()
2378
2820
preview = TransformPreview(revision_tree)
2379
2821
self.addCleanup(preview.finalize)
2380
preview.new_file('file', preview.root, 'contents', 'file-id')
2381
preview.new_directory('directory', preview.root, 'dir-id')
2822
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2823
preview.new_directory('directory', preview.root, b'dir-id')
2382
2824
preview_tree = preview.get_preview_tree()
2383
self.assertEqual('file', preview_tree.kind('file-id'))
2384
self.assertEqual('directory', preview_tree.kind('dir-id'))
2825
self.assertEqual('file', preview_tree.kind('file'))
2826
self.assertEqual('directory', preview_tree.kind('directory'))
2386
2828
def test_get_file_mtime(self):
2387
2829
preview = self.get_empty_preview()
2388
file_trans_id = preview.new_file('file', preview.root, 'contents',
2830
file_trans_id = preview.new_file('file', preview.root, [b'contents'],
2390
2832
limbo_path = preview._limbo_name(file_trans_id)
2391
2833
preview_tree = preview.get_preview_tree()
2392
2834
self.assertEqual(os.stat(limbo_path).st_mtime,
2393
preview_tree.get_file_mtime('file-id'))
2835
preview_tree.get_file_mtime('file', b'file-id'))
2395
2837
def test_get_file_mtime_renamed(self):
2396
2838
work_tree = self.make_branch_and_tree('tree')
2397
2839
self.build_tree(['tree/file'])
2398
work_tree.add('file', 'file-id')
2840
work_tree.add('file', b'file-id')
2399
2841
preview = TransformPreview(work_tree)
2400
2842
self.addCleanup(preview.finalize)
2401
file_trans_id = preview.trans_id_tree_file_id('file-id')
2843
file_trans_id = preview.trans_id_tree_path('file')
2402
2844
preview.adjust_path('renamed', preview.root, file_trans_id)
2403
2845
preview_tree = preview.get_preview_tree()
2404
preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2405
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'))
2407
2861
def test_get_file(self):
2408
2862
preview = self.get_empty_preview()
2409
preview.new_file('file', preview.root, 'contents', 'file-id')
2863
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2410
2864
preview_tree = preview.get_preview_tree()
2411
tree_file = preview_tree.get_file('file-id')
2413
self.assertEqual('contents', tree_file.read())
2865
with preview_tree.get_file('file') as tree_file:
2866
self.assertEqual(b'contents', tree_file.read())
2417
2868
def test_get_symlink_target(self):
2418
2869
self.requireFeature(SymlinkFeature)
2419
2870
preview = self.get_empty_preview()
2420
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2871
preview.new_symlink('symlink', preview.root, 'target', b'symlink-id')
2421
2872
preview_tree = preview.get_preview_tree()
2422
2873
self.assertEqual('target',
2423
preview_tree.get_symlink_target('symlink-id'))
2874
preview_tree.get_symlink_target('symlink'))
2425
2876
def test_all_file_ids(self):
2426
2877
tree = self.make_branch_and_tree('tree')
2427
2878
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2428
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'])
2429
2880
preview = TransformPreview(tree)
2430
2881
self.addCleanup(preview.finalize)
2431
preview.unversion_file(preview.trans_id_file_id('b-id'))
2432
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')
2433
2884
preview.unversion_file(c_trans_id)
2434
preview.version_file('c-id', c_trans_id)
2885
preview.version_file(b'c-id', c_trans_id)
2435
2886
preview_tree = preview.get_preview_tree()
2436
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2887
self.assertEqual({b'a-id', b'c-id', tree.get_root_id()},
2437
2888
preview_tree.all_file_ids())
2439
2890
def test_path2id_deleted_unchanged(self):
2440
2891
tree = self.make_branch_and_tree('tree')
2441
2892
self.build_tree(['tree/unchanged', 'tree/deleted'])
2442
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2893
tree.add(['unchanged', 'deleted'], [b'unchanged-id', b'deleted-id'])
2443
2894
preview = TransformPreview(tree)
2444
2895
self.addCleanup(preview.finalize)
2445
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2896
preview.unversion_file(preview.trans_id_file_id(b'deleted-id'))
2446
2897
preview_tree = preview.get_preview_tree()
2447
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2448
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'))
2450
2901
def test_path2id_created(self):
2451
2902
tree = self.make_branch_and_tree('tree')
2452
2903
self.build_tree(['tree/unchanged'])
2453
tree.add(['unchanged'], ['unchanged-id'])
2904
tree.add(['unchanged'], [b'unchanged-id'])
2454
2905
preview = TransformPreview(tree)
2455
2906
self.addCleanup(preview.finalize)
2456
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2457
'contents', 'new-id')
2907
preview.new_file('new', preview.trans_id_file_id(b'unchanged-id'),
2908
[b'contents'], b'new-id')
2458
2909
preview_tree = preview.get_preview_tree()
2459
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2910
self.assertEqual(b'new-id', preview_tree.path2id('unchanged/new'))
2461
2912
def test_path2id_moved(self):
2462
2913
tree = self.make_branch_and_tree('tree')
2463
2914
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2464
2915
tree.add(['old_parent', 'old_parent/child'],
2465
['old_parent-id', 'child-id'])
2916
[b'old_parent-id', b'child-id'])
2466
2917
preview = TransformPreview(tree)
2467
2918
self.addCleanup(preview.finalize)
2468
2919
new_parent = preview.new_directory('new_parent', preview.root,
2470
2921
preview.adjust_path('child', new_parent,
2471
preview.trans_id_file_id('child-id'))
2922
preview.trans_id_file_id(b'child-id'))
2472
2923
preview_tree = preview.get_preview_tree()
2473
self.assertIs(None, preview_tree.path2id('old_parent/child'))
2474
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'))
2476
2927
def test_path2id_renamed_parent(self):
2477
2928
tree = self.make_branch_and_tree('tree')
2478
2929
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2479
2930
tree.add(['old_name', 'old_name/child'],
2480
['parent-id', 'child-id'])
2931
[b'parent-id', b'child-id'])
2481
2932
preview = TransformPreview(tree)
2482
2933
self.addCleanup(preview.finalize)
2483
2934
preview.adjust_path('new_name', preview.root,
2484
preview.trans_id_file_id('parent-id'))
2935
preview.trans_id_file_id(b'parent-id'))
2485
2936
preview_tree = preview.get_preview_tree()
2486
self.assertIs(None, preview_tree.path2id('old_name/child'))
2487
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'))
2489
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2940
def assertMatchingIterEntries(self, tt, specific_files=None):
2490
2941
preview_tree = tt.get_preview_tree()
2491
2942
preview_result = list(preview_tree.iter_entries_by_dir(
2943
specific_files=specific_files))
2493
2944
tree = tt._tree
2495
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))
2496
2948
self.assertEqual(actual_result, preview_result)
2498
2950
def test_iter_entries_by_dir_new(self):
2499
2951
tree = self.make_branch_and_tree('tree')
2500
2952
tt = TreeTransform(tree)
2501
tt.new_file('new', tt.root, 'contents', 'new-id')
2953
tt.new_file('new', tt.root, [b'contents'], b'new-id')
2502
2954
self.assertMatchingIterEntries(tt)
2504
2956
def test_iter_entries_by_dir_deleted(self):
2505
2957
tree = self.make_branch_and_tree('tree')
2506
2958
self.build_tree(['tree/deleted'])
2507
tree.add('deleted', 'deleted-id')
2959
tree.add('deleted', b'deleted-id')
2508
2960
tt = TreeTransform(tree)
2509
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
2961
tt.delete_contents(tt.trans_id_file_id(b'deleted-id'))
2510
2962
self.assertMatchingIterEntries(tt)
2512
2964
def test_iter_entries_by_dir_unversioned(self):
2513
2965
tree = self.make_branch_and_tree('tree')
2514
2966
self.build_tree(['tree/removed'])
2515
tree.add('removed', 'removed-id')
2967
tree.add('removed', b'removed-id')
2516
2968
tt = TreeTransform(tree)
2517
tt.unversion_file(tt.trans_id_file_id('removed-id'))
2969
tt.unversion_file(tt.trans_id_file_id(b'removed-id'))
2518
2970
self.assertMatchingIterEntries(tt)
2520
2972
def test_iter_entries_by_dir_moved(self):
2521
2973
tree = self.make_branch_and_tree('tree')
2522
2974
self.build_tree(['tree/moved', 'tree/new_parent/'])
2523
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
2975
tree.add(['moved', 'new_parent'], [b'moved-id', b'new_parent-id'])
2524
2976
tt = TreeTransform(tree)
2525
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2526
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'))
2527
2979
self.assertMatchingIterEntries(tt)
2529
def test_iter_entries_by_dir_specific_file_ids(self):
2981
def test_iter_entries_by_dir_specific_files(self):
2530
2982
tree = self.make_branch_and_tree('tree')
2531
tree.set_root_id('tree-root-id')
2983
tree.set_root_id(b'tree-root-id')
2532
2984
self.build_tree(['tree/parent/', 'tree/parent/child'])
2533
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
2985
tree.add(['parent', 'parent/child'], [b'parent-id', b'child-id'])
2534
2986
tt = TreeTransform(tree)
2535
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
2987
self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2537
2989
def test_symlink_content_summary(self):
2538
2990
self.requireFeature(SymlinkFeature)
2539
2991
preview = self.get_empty_preview()
2540
preview.new_symlink('path', preview.root, 'target', 'path-id')
2992
preview.new_symlink('path', preview.root, 'target', b'path-id')
2541
2993
summary = preview.get_preview_tree().path_content_summary('path')
2542
2994
self.assertEqual(('symlink', None, None, 'target'), summary)
2611
3063
def test_annotate(self):
2612
3064
tree = self.make_branch_and_tree('tree')
2613
self.build_tree_contents([('tree/file', 'a\n')])
2614
tree.add('file', 'file-id')
2615
tree.commit('a', rev_id='one')
2616
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')])
2617
3069
preview = TransformPreview(tree)
2618
3070
self.addCleanup(preview.finalize)
2619
file_trans_id = preview.trans_id_file_id('file-id')
3071
file_trans_id = preview.trans_id_file_id(b'file-id')
2620
3072
preview.delete_contents(file_trans_id)
2621
preview.create_file('a\nb\nc\n', file_trans_id)
3073
preview.create_file([b'a\nb\nc\n'], file_trans_id)
2622
3074
preview_tree = preview.get_preview_tree()
2628
annotation = preview_tree.annotate_iter('file-id', 'me:')
3080
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2629
3081
self.assertEqual(expected, annotation)
2631
3083
def test_annotate_missing(self):
2632
3084
preview = self.get_empty_preview()
2633
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')
2634
3086
preview_tree = preview.get_preview_tree()
2640
annotation = preview_tree.annotate_iter('file-id', 'me:')
3092
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2641
3093
self.assertEqual(expected, annotation)
2643
3095
def test_annotate_rename(self):
2644
3096
tree = self.make_branch_and_tree('tree')
2645
self.build_tree_contents([('tree/file', 'a\n')])
2646
tree.add('file', 'file-id')
2647
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')
2648
3100
preview = TransformPreview(tree)
2649
3101
self.addCleanup(preview.finalize)
2650
file_trans_id = preview.trans_id_file_id('file-id')
3102
file_trans_id = preview.trans_id_file_id(b'file-id')
2651
3103
preview.adjust_path('newname', preview.root, file_trans_id)
2652
3104
preview_tree = preview.get_preview_tree()
2654
3106
('one', 'a\n'),
2656
annotation = preview_tree.annotate_iter('file-id', 'me:')
3108
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2657
3109
self.assertEqual(expected, annotation)
2659
3111
def test_annotate_deleted(self):
2660
3112
tree = self.make_branch_and_tree('tree')
2661
self.build_tree_contents([('tree/file', 'a\n')])
2662
tree.add('file', 'file-id')
2663
tree.commit('a', rev_id='one')
2664
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')])
2665
3117
preview = TransformPreview(tree)
2666
3118
self.addCleanup(preview.finalize)
2667
file_trans_id = preview.trans_id_file_id('file-id')
3119
file_trans_id = preview.trans_id_file_id(b'file-id')
2668
3120
preview.delete_contents(file_trans_id)
2669
3121
preview_tree = preview.get_preview_tree()
2670
annotation = preview_tree.annotate_iter('file-id', 'me:')
3122
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2671
3123
self.assertIs(None, annotation)
2673
3125
def test_stored_kind(self):
2674
3126
preview = self.get_empty_preview()
2675
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')
2676
3128
preview_tree = preview.get_preview_tree()
2677
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3129
self.assertEqual('file', preview_tree.stored_kind('file'))
2679
3131
def test_is_executable(self):
2680
3132
preview = self.get_empty_preview()
2681
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
2682
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'))
2683
3135
preview_tree = preview.get_preview_tree()
2684
self.assertEqual(True, preview_tree.is_executable('file-id'))
3136
self.assertEqual(True, preview_tree.is_executable('file'))
2686
3138
def test_get_set_parent_ids(self):
2687
3139
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2688
3140
self.assertEqual([], preview_tree.get_parent_ids())
2689
preview_tree.set_parent_ids(['rev-1'])
2690
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())
2692
3144
def test_plan_file_merge(self):
2693
3145
work_a = self.make_branch_and_tree('wta')
2694
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2695
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')
2696
3148
base_id = work_a.commit('base version')
2697
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3149
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2698
3150
preview = TransformPreview(work_a)
2699
3151
self.addCleanup(preview.finalize)
2700
trans_id = preview.trans_id_file_id('file-id')
3152
trans_id = preview.trans_id_file_id(b'file-id')
2701
3153
preview.delete_contents(trans_id)
2702
preview.create_file('b\nc\nd\ne\n', trans_id)
2703
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')])
2704
3156
tree_a = preview.get_preview_tree()
2705
3157
tree_a.set_parent_ids([base_id])
2706
3158
self.assertEqual([
2788
3240
tt = merger.make_merger().make_preview_transform()
2789
3241
self.addCleanup(tt.finalize)
2790
3242
final_tree = tt.get_preview_tree()
2791
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')))
2793
3247
def test_merge_preview_into_workingtree(self):
2794
3248
tree = self.make_branch_and_tree('tree')
2795
tree.set_root_id('TREE_ROOT')
3249
tree.set_root_id(b'TREE_ROOT')
2796
3250
tt = TransformPreview(tree)
2797
3251
self.addCleanup(tt.finalize)
2798
tt.new_file('name', tt.root, 'content', 'file-id')
3252
tt.new_file('name', tt.root, [b'content'], b'file-id')
2799
3253
tree2 = self.make_branch_and_tree('tree2')
2800
tree2.set_root_id('TREE_ROOT')
3254
tree2.set_root_id(b'TREE_ROOT')
2801
3255
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
None, tree.basis_tree())
2803
3257
merger.merge_type = Merge3Merger
2804
3258
merger.do_merge()
2806
3260
def test_merge_preview_into_workingtree_handles_conflicts(self):
2807
3261
tree = self.make_branch_and_tree('tree')
2808
self.build_tree_contents([('tree/foo', 'bar')])
2809
tree.add('foo', 'foo-id')
3262
self.build_tree_contents([('tree/foo', b'bar')])
3263
tree.add('foo', b'foo-id')
2810
3264
tree.commit('foo')
2811
3265
tt = TransformPreview(tree)
2812
3266
self.addCleanup(tt.finalize)
2813
trans_id = tt.trans_id_file_id('foo-id')
3267
trans_id = tt.trans_id_file_id(b'foo-id')
2814
3268
tt.delete_contents(trans_id)
2815
tt.create_file('baz', trans_id)
2816
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2817
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')])
2819
3272
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
pb, tree.basis_tree())
2821
3274
merger.merge_type = Merge3Merger
2822
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'))
2824
3295
def test_is_executable(self):
2825
3296
tree = self.make_branch_and_tree('tree')
2826
3297
preview = TransformPreview(tree)
2827
3298
self.addCleanup(preview.finalize)
2828
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3299
preview.new_file('foo', preview.root, [b'bar'], b'baz-id')
2829
3300
preview_tree = preview.get_preview_tree()
2830
self.assertEqual(False, preview_tree.is_executable('baz-id',
2832
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'))
2834
3304
def test_commit_preview_tree(self):
2835
3305
tree = self.make_branch_and_tree('tree')
3112
3582
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3114
3584
def test_get_parents_lines(self):
3115
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3116
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'
3117
3587
tree = self.make_branch_and_tree('tree')
3118
3588
self.build_tree_contents([('tree/file', LINES_ONE)])
3119
tree.add('file', 'file-id')
3589
tree.add('file', b'file-id')
3120
3590
tt = self.get_preview(tree)
3121
3591
trans_id = tt.trans_id_tree_path('file')
3122
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'],),
3123
3593
tt._get_parents_lines(trans_id))
3125
3595
def test_get_parents_texts(self):
3126
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3127
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'
3128
3598
tree = self.make_branch_and_tree('tree')
3129
3599
self.build_tree_contents([('tree/file', LINES_ONE)])
3130
tree.add('file', 'file-id')
3600
tree.add('file', b'file-id')
3131
3601
tt = self.get_preview(tree)
3132
3602
trans_id = tt.trans_id_tree_path('file')
3133
3603
self.assertEqual((LINES_ONE,),
3134
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
