101
141
imaginary_id = transform.trans_id_tree_path('imaginary')
102
142
imaginary_id2 = transform.trans_id_tree_path('imaginary/')
103
143
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())
144
self.assertEqual(root, transform.get_tree_parent(imaginary_id))
145
self.assertEqual('directory', transform.final_kind(root))
146
self.assertEqual(self.wt.get_root_id(), transform.final_file_id(root))
107
147
trans_id = transform.create_path('name', root)
108
148
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)
149
self.assertIs(None, transform.final_kind(trans_id))
150
transform.create_file([b'contents'], trans_id)
111
151
transform.set_executability(True, trans_id)
112
transform.version_file('my_pretties', trans_id)
152
transform.version_file(b'my_pretties', trans_id)
113
153
self.assertRaises(DuplicateKey, transform.version_file,
114
'my_pretties', trans_id)
115
self.assertEqual(transform.final_file_id(trans_id), 'my_pretties')
154
b'my_pretties', trans_id)
155
self.assertEqual(transform.final_file_id(trans_id), b'my_pretties')
116
156
self.assertEqual(transform.final_parent(trans_id), root)
117
157
self.assertIs(transform.final_parent(root), ROOT_PARENT)
118
158
self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
119
159
oz_id = transform.create_path('oz', root)
120
160
transform.create_directory(oz_id)
121
transform.version_file('ozzie', oz_id)
161
transform.version_file(b'ozzie', oz_id)
122
162
trans_id2 = transform.create_path('name2', root)
123
transform.create_file('contents', trans_id2)
163
transform.create_file([b'contents'], trans_id2)
124
164
transform.set_executability(False, trans_id2)
125
transform.version_file('my_pretties2', trans_id2)
165
transform.version_file(b'my_pretties2', trans_id2)
126
166
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)
167
with self.wt.get_file('name') as f:
168
self.assertEqual(b'contents', f.read())
169
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
170
self.assertIs(self.wt.is_executable('name'), True)
171
self.assertIs(self.wt.is_executable('name2'), False)
131
172
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
132
173
self.assertEqual(len(modified_paths), 3)
133
tree_mod_paths = [self.wt.id2abspath(f) for f in
134
('ozzie', 'my_pretties', 'my_pretties2')]
174
tree_mod_paths = [self.wt.abspath(self.wt.id2path(f)) for f in
175
(b'ozzie', b'my_pretties', b'my_pretties2')]
135
176
self.assertSubset(tree_mod_paths, modified_paths)
136
177
# is it safe to finalize repeatedly?
137
178
transform.finalize()
138
179
transform.finalize()
181
def test_apply_informs_tree_of_observed_sha1(self):
182
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
183
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
186
orig = self.wt._observed_sha1
187
def _observed_sha1(*args):
190
self.wt._observed_sha1 = _observed_sha1
192
self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
195
def test_create_file_caches_sha1(self):
196
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
197
trans_id = trans.create_path('file1', root)
198
trans.create_file(contents, trans_id, sha1=sha1)
199
st_val = osutils.lstat(trans._limbo_name(trans_id))
200
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
201
self.assertEqual(o_sha1, sha1)
202
self.assertEqualStat(o_st_val, st_val)
204
def test__apply_insertions_updates_sha1(self):
205
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
206
trans_id = trans.create_path('file1', root)
207
trans.create_file(contents, trans_id, sha1=sha1)
208
st_val = osutils.lstat(trans._limbo_name(trans_id))
209
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
210
self.assertEqual(o_sha1, sha1)
211
self.assertEqualStat(o_st_val, st_val)
212
creation_mtime = trans._creation_mtime + 10.0
213
# We fake a time difference from when the file was created until now it
214
# is being renamed by using os.utime. Note that the change we actually
215
# want to see is the real ctime change from 'os.rename()', but as long
216
# as we observe a new stat value, we should be fine.
217
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
219
new_st_val = osutils.lstat(self.wt.abspath('file1'))
220
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
221
self.assertEqual(o_sha1, sha1)
222
self.assertEqualStat(o_st_val, new_st_val)
223
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
225
def test_new_file_caches_sha1(self):
226
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
227
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
229
st_val = osutils.lstat(trans._limbo_name(trans_id))
230
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
231
self.assertEqual(o_sha1, sha1)
232
self.assertEqualStat(o_st_val, st_val)
234
def test_cancel_creation_removes_observed_sha1(self):
235
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
236
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
238
self.assertTrue(trans_id in trans._observed_sha1s)
239
trans.cancel_creation(trans_id)
240
self.assertFalse(trans_id in trans._observed_sha1s)
140
242
def test_create_files_same_timestamp(self):
141
243
transform, root = self.get_transform()
142
244
self.wt.lock_tree_write()
163
265
def test_change_root_id(self):
164
266
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')
267
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
268
transform.new_directory('', ROOT_PARENT, b'new-root-id')
167
269
transform.delete_contents(root)
168
270
transform.unversion_file(root)
169
271
transform.fixup_new_roots()
170
272
transform.apply()
171
self.assertEqual('new-root-id', self.wt.get_root_id())
273
self.assertEqual(b'new-root-id', self.wt.get_root_id())
173
275
def test_change_root_id_add_files(self):
174
276
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'],
277
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
278
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
279
transform.new_file('file', new_trans_id, [b'new-contents\n'],
179
281
transform.delete_contents(root)
180
282
transform.unversion_file(root)
181
283
transform.fixup_new_roots()
182
284
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'))
285
self.assertEqual(b'new-root-id', self.wt.get_root_id())
286
self.assertEqual(b'new-file-id', self.wt.path2id('file'))
287
self.assertFileEqual(b'new-contents\n', self.wt.abspath('file'))
187
289
def test_add_two_roots(self):
188
290
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)
291
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
292
new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
293
self.assertRaises(ValueError, transform.fixup_new_roots)
295
def test_retain_existing_root(self):
296
tt, root = self.get_transform()
298
tt.new_directory('', ROOT_PARENT, b'new-root-id')
300
self.assertNotEqual(b'new-root-id', tt.final_file_id(tt.root))
302
def test_retain_existing_root_added_file(self):
303
tt, root = self.get_transform()
304
new_trans_id = tt.new_directory('', ROOT_PARENT, b'new-root-id')
305
child = tt.new_directory('child', new_trans_id, b'child-id')
307
self.assertEqual(tt.root, tt.final_parent(child))
309
def test_add_unversioned_root(self):
310
transform, root = self.get_transform()
311
new_trans_id = transform.new_directory('', ROOT_PARENT, None)
312
transform.delete_contents(transform.root)
313
transform.fixup_new_roots()
314
self.assertNotIn(transform.root, transform._new_id)
316
def test_remove_root_fixup(self):
317
transform, root = self.get_transform()
318
old_root_id = self.wt.get_root_id()
319
self.assertNotEqual(b'new-root-id', old_root_id)
320
transform.delete_contents(root)
321
transform.unversion_file(root)
322
transform.fixup_new_roots()
324
self.assertEqual(old_root_id, self.wt.get_root_id())
326
transform, root = self.get_transform()
327
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
328
new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
329
self.assertRaises(ValueError, transform.fixup_new_roots)
331
def test_fixup_new_roots_permits_empty_tree(self):
332
transform, root = self.get_transform()
333
transform.delete_contents(root)
334
transform.unversion_file(root)
335
transform.fixup_new_roots()
336
self.assertIs(None, transform.final_kind(root))
337
self.assertIs(None, transform.final_file_id(root))
339
def test_apply_retains_root_directory(self):
340
# Do not attempt to delete the physical root directory, because that
342
transform, root = self.get_transform()
344
transform.delete_contents(root)
345
e = self.assertRaises(AssertionError, self.assertRaises,
346
errors.TransformRenameFailed,
348
self.assertContainsRe('TransformRenameFailed not raised', str(e))
350
def test_apply_retains_file_id(self):
351
transform, root = self.get_transform()
352
old_root_id = transform.tree_file_id(root)
353
transform.unversion_file(root)
355
self.assertEqual(old_root_id, self.wt.get_root_id())
193
357
def test_hardlink(self):
194
358
self.requireFeature(HardlinkFeature)
195
359
transform, root = self.get_transform()
196
transform.new_file('file1', root, 'contents')
360
transform.new_file('file1', root, [b'contents'])
197
361
transform.apply()
198
362
target = self.make_branch_and_tree('target')
199
363
target_transform = TreeTransform(target)
200
364
trans_id = target_transform.create_path('file1', target_transform.root)
201
365
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
202
366
target_transform.apply()
203
self.failUnlessExists('target/file1')
367
self.assertPathExists('target/file1')
204
368
source_stat = os.stat(self.wt.abspath('file1'))
205
369
target_stat = os.stat('target/file1')
206
370
self.assertEqual(source_stat, target_stat)
209
373
transform, root = self.get_transform()
210
374
self.wt.lock_tree_write()
211
375
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',
376
trans_id = transform.new_file('name', root, [b'contents'],
377
b'my_pretties', True)
378
oz = transform.new_directory('oz', root, b'oz-id')
379
dorothy = transform.new_directory('dorothy', oz, b'dorothy-id')
380
toto = transform.new_file('toto', dorothy, [b'toto-contents'],
219
383
self.assertEqual(len(transform.find_conflicts()), 0)
220
384
transform.apply()
221
385
self.assertRaises(ReusingTransform, transform.find_conflicts)
222
self.assertEqual('contents', file(self.wt.abspath('name')).read())
223
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')
386
with open(self.wt.abspath('name'), 'r') as f:
387
self.assertEqual('contents', f.read())
388
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
389
self.assertIs(self.wt.is_executable('name'), True)
390
self.assertEqual(self.wt.path2id('oz'), b'oz-id')
391
self.assertEqual(self.wt.path2id('oz/dorothy'), b'dorothy-id')
392
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)
394
self.assertEqual(b'toto-contents',
395
self.wt.get_file('oz/dorothy/toto').read())
396
self.assertIs(self.wt.is_executable('oz/dorothy/toto'), False)
233
398
def test_tree_reference(self):
234
399
transform, root = self.get_transform()
235
400
tree = transform._tree
236
trans_id = transform.new_directory('reference', root, 'subtree-id')
237
transform.set_tree_reference('subtree-revision', trans_id)
401
trans_id = transform.new_directory('reference', root, b'subtree-id')
402
transform.set_tree_reference(b'subtree-revision', trans_id)
238
403
transform.apply()
240
405
self.addCleanup(tree.unlock)
241
self.assertEqual('subtree-revision',
242
tree.inventory['subtree-id'].reference_revision)
406
self.assertEqual(b'subtree-revision',
407
tree.root_inventory.get_entry(b'subtree-id').reference_revision)
244
409
def test_conflicts(self):
245
410
transform, root = self.get_transform()
246
trans_id = transform.new_file('name', root, 'contents',
411
trans_id = transform.new_file('name', root, [b'contents'],
248
413
self.assertEqual(len(transform.find_conflicts()), 0)
249
trans_id2 = transform.new_file('name', root, 'Crontents', 'toto')
414
trans_id2 = transform.new_file('name', root, [b'Crontents'], b'toto')
250
415
self.assertEqual(transform.find_conflicts(),
251
416
[('duplicate', trans_id, trans_id2, 'name')])
252
417
self.assertRaises(MalformedTransform, transform.apply)
383
549
tree.case_sensitive = False
384
550
transform = TreeTransform(tree)
385
551
self.addCleanup(transform.finalize)
386
transform.new_file('file', transform.root, 'content')
387
transform.new_file('FiLe', transform.root, 'content')
552
transform.new_file('file', transform.root, [b'content'])
553
transform.new_file('FiLe', transform.root, [b'content'])
388
554
resolve_conflicts(transform,
389
555
pass_func=lambda t, c: resolve_checkout(t, c, []))
390
556
transform.apply()
391
self.failUnlessExists('tree/file')
392
self.failUnlessExists('tree/FiLe.moved')
557
self.assertPathExists('tree/file')
558
self.assertPathExists('tree/FiLe.moved')
394
560
def test_apply_case_conflict(self):
395
561
"""Ensure that a transform with case conflicts can always be applied"""
396
562
tree = self.make_branch_and_tree('tree')
397
563
transform = TreeTransform(tree)
398
564
self.addCleanup(transform.finalize)
399
transform.new_file('file', transform.root, 'content')
400
transform.new_file('FiLe', transform.root, 'content')
565
transform.new_file('file', transform.root, [b'content'])
566
transform.new_file('FiLe', transform.root, [b'content'])
401
567
dir = transform.new_directory('dir', transform.root)
402
transform.new_file('dirfile', dir, 'content')
403
transform.new_file('dirFiLe', dir, 'content')
568
transform.new_file('dirfile', dir, [b'content'])
569
transform.new_file('dirFiLe', dir, [b'content'])
404
570
resolve_conflicts(transform)
405
571
transform.apply()
406
self.failUnlessExists('tree/file')
572
self.assertPathExists('tree/file')
407
573
if not os.path.exists('tree/FiLe.moved'):
408
self.failUnlessExists('tree/FiLe')
409
self.failUnlessExists('tree/dir/dirfile')
574
self.assertPathExists('tree/FiLe')
575
self.assertPathExists('tree/dir/dirfile')
410
576
if not os.path.exists('tree/dir/dirFiLe.moved'):
411
self.failUnlessExists('tree/dir/dirFiLe')
577
self.assertPathExists('tree/dir/dirFiLe')
413
579
def test_case_insensitive_limbo(self):
414
580
tree = self.make_branch_and_tree('tree')
463
629
create_tree, root = self.get_transform()
465
631
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')
632
create_tree.new_file('name1', root, [b'hello1'], b'name1')
633
create_tree.new_file('name2', root, [b'hello2'], b'name2')
634
ddir = create_tree.new_directory('dying_directory', root, b'ddir')
635
create_tree.new_file('dying_file', ddir, [b'goodbye1'], b'dfile')
636
create_tree.new_file('moving_file', ddir, [b'later1'], b'mfile')
637
create_tree.new_file('moving_file2', root, [b'later2'], b'mfile2')
472
638
create_tree.apply()
474
mangle_tree,root = self.get_transform()
640
mangle_tree, root = self.get_transform()
475
641
root = mangle_tree.root
477
name1 = mangle_tree.trans_id_tree_file_id('name1')
478
name2 = mangle_tree.trans_id_tree_file_id('name2')
643
name1 = mangle_tree.trans_id_tree_path('name1')
644
name2 = mangle_tree.trans_id_tree_path('name2')
479
645
mangle_tree.adjust_path('name2', root, name1)
480
646
mangle_tree.adjust_path('name1', root, name2)
482
648
#tests for deleting parent directories
483
ddir = mangle_tree.trans_id_tree_file_id('ddir')
649
ddir = mangle_tree.trans_id_tree_path('dying_directory')
484
650
mangle_tree.delete_contents(ddir)
485
dfile = mangle_tree.trans_id_tree_file_id('dfile')
651
dfile = mangle_tree.trans_id_tree_path('dying_directory/dying_file')
486
652
mangle_tree.delete_versioned(dfile)
487
653
mangle_tree.unversion_file(dfile)
488
mfile = mangle_tree.trans_id_tree_file_id('mfile')
654
mfile = mangle_tree.trans_id_tree_path('dying_directory/moving_file')
489
655
mangle_tree.adjust_path('mfile', root, mfile)
491
657
#tests for adding parent directories
492
newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
493
mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
658
newdir = mangle_tree.new_directory('new_directory', root, b'newdir')
659
mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
494
660
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')
661
mangle_tree.new_file('newfile', newdir, [b'hello3'], b'dfile')
662
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
497
663
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
498
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
664
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
499
665
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'))
666
with open(self.wt.abspath('name1'), 'r') as f:
667
self.assertEqual(f.read(), 'hello2')
668
with open(self.wt.abspath('name2'), 'r') as f:
669
self.assertEqual(f.read(), 'hello1')
670
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
503
671
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')
672
with open(mfile2_path, 'r') as f:
673
self.assertEqual(f.read(), 'later2')
674
self.assertEqual(self.wt.id2path(b'mfile2'), 'new_directory/mfile2')
675
self.assertEqual(self.wt.path2id('new_directory/mfile2'), b'mfile2')
676
newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
677
with open(newfile_path, 'r') as f:
678
self.assertEqual(f.read(), 'hello3')
679
self.assertEqual(self.wt.path2id('dying_directory'), b'ddir')
510
680
self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
511
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
681
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
513
683
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')
684
create_tree, root = self.get_transform()
685
newdir = create_tree.new_directory('selftest', root, b'selftest-id')
686
create_tree.new_file('blackbox.py', newdir, [b'hello1'], b'blackbox-id')
517
687
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')
688
mangle_tree, root = self.get_transform()
689
selftest = mangle_tree.trans_id_tree_path('selftest')
690
blackbox = mangle_tree.trans_id_tree_path('selftest/blackbox.py')
521
691
mangle_tree.adjust_path('test', root, selftest)
522
692
mangle_tree.adjust_path('test_too_much', root, selftest)
523
693
mangle_tree.set_executability(True, blackbox)
524
694
mangle_tree.apply()
526
696
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',
697
create_tree, root = self.get_transform()
698
breezy = create_tree.new_directory('breezy', root, b'breezy-id')
699
tests = create_tree.new_directory('tests', breezy, b'tests-id')
700
blackbox = create_tree.new_directory('blackbox', tests, b'blackbox-id')
701
create_tree.new_file('test_too_much.py', blackbox, [b'hello1'],
533
703
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)
704
mangle_tree, root = self.get_transform()
705
breezy = mangle_tree.trans_id_tree_path('breezy')
706
tests = mangle_tree.trans_id_tree_path('breezy/tests')
707
test_too_much = mangle_tree.trans_id_tree_path('breezy/tests/blackbox/test_too_much.py')
708
mangle_tree.adjust_path('selftest', breezy, tests)
539
709
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
540
710
mangle_tree.set_executability(True, test_too_much)
541
711
mangle_tree.apply()
543
713
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',
714
create_tree, root = self.get_transform()
715
tests = create_tree.new_directory('tests', root, b'tests-id')
716
create_tree.new_file('test_too_much.py', tests, [b'hello1'],
548
718
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')
719
mangle_tree, root = self.get_transform()
720
tests = mangle_tree.trans_id_tree_path('tests')
721
test_too_much = mangle_tree.trans_id_tree_path('tests/test_too_much.py')
552
722
mangle_tree.adjust_path('selftest', root, tests)
553
723
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
554
724
mangle_tree.set_executability(True, test_too_much)
574
744
create_tree, root = self.get_transform()
576
746
root = create_tree.root
577
create_tree.new_file('name1', root, 'hello1', 'name1')
747
create_tree.new_file('name1', root, [b'hello1'], b'name1')
578
748
create_tree.apply()
579
749
delete_contents = TreeTransform(self.wt)
580
750
self.addCleanup(delete_contents.finalize)
581
file = delete_contents.trans_id_tree_file_id('name1')
751
file = delete_contents.trans_id_tree_path('name1')
582
752
delete_contents.delete_contents(file)
583
753
delete_contents.apply()
584
754
delete_contents.finalize()
585
755
replace = TreeTransform(self.wt)
586
756
self.addCleanup(replace.finalize)
587
name2 = replace.new_file('name2', root, 'hello2', 'name1')
757
name2 = replace.new_file('name2', root, [b'hello2'], b'name1')
588
758
conflicts = replace.find_conflicts()
589
name1 = replace.trans_id_tree_file_id('name1')
759
name1 = replace.trans_id_tree_path('name1')
590
760
self.assertEqual(conflicts, [('duplicate id', name1, name2)])
591
761
resolve_conflicts(replace)
594
def _test_symlinks(self, link_name1,link_target1,
764
def _test_symlinks(self, link_name1, link_target1,
595
765
link_name2, link_target2):
597
767
def ozpath(p): return 'oz/' + p
599
769
self.requireFeature(SymlinkFeature)
600
770
transform, root = self.get_transform()
601
oz_id = transform.new_directory('oz', root, 'oz-id')
771
oz_id = transform.new_directory('oz', root, b'oz-id')
602
772
wizard = transform.new_symlink(link_name1, oz_id, link_target1,
604
774
wiz_id = transform.create_path(link_name2, oz_id)
605
775
transform.create_symlink(link_target2, wiz_id)
606
transform.version_file('wiz-id2', wiz_id)
776
transform.version_file(b'wiz-id2', wiz_id)
607
777
transform.set_executability(True, wiz_id)
608
778
self.assertEqual(transform.find_conflicts(),
609
779
[('non-file executability', wiz_id)])
610
780
transform.set_executability(None, wiz_id)
611
781
transform.apply()
612
self.assertEqual(self.wt.path2id(ozpath(link_name1)), 'wizard-id')
782
self.assertEqual(self.wt.path2id(ozpath(link_name1)), b'wizard-id')
613
783
self.assertEqual('symlink',
614
784
file_kind(self.wt.abspath(ozpath(link_name1))))
615
785
self.assertEqual(link_target2,
753
923
def test_resolve_conflicts_wrong_existing_parent_kind(self):
754
924
tt = self.prepare_wrong_parent_kind()
755
925
raw_conflicts = resolve_conflicts(tt)
756
self.assertEqual(set([('non-directory parent', 'Created directory',
757
'new-3')]), raw_conflicts)
926
self.assertEqual({('non-directory parent', 'Created directory',
927
'new-3')}, raw_conflicts)
758
928
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
759
929
self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
760
'parent-id')], cooked_conflicts)
930
b'parent-id')], cooked_conflicts)
762
self.assertEqual(None, self.wt.path2id('parent'))
763
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
932
self.assertFalse(self.wt.is_versioned('parent'))
933
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
765
935
def test_resolve_conflicts_wrong_new_parent_kind(self):
766
936
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')
937
parent_id = tt.new_directory('parent', root, b'parent-id')
938
tt.new_file('child,', parent_id, [b'contents2'], b'file-id')
770
940
tt, root = self.get_transform()
771
parent_id = tt.trans_id_file_id('parent-id')
941
parent_id = tt.trans_id_file_id(b'parent-id')
772
942
tt.delete_contents(parent_id)
773
tt.create_file('contents', parent_id)
943
tt.create_file([b'contents'], parent_id)
774
944
raw_conflicts = resolve_conflicts(tt)
775
self.assertEqual(set([('non-directory parent', 'Created directory',
776
'new-3')]), raw_conflicts)
945
self.assertEqual({('non-directory parent', 'Created directory',
946
'new-3')}, raw_conflicts)
778
self.assertEqual(None, self.wt.path2id('parent'))
779
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
948
self.assertFalse(self.wt.is_versioned('parent'))
949
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
781
951
def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
782
952
tt, root = self.get_transform()
783
953
parent_id = tt.new_directory('parent', root)
784
tt.new_file('child,', parent_id, 'contents2')
954
tt.new_file('child,', parent_id, [b'contents2'])
786
956
tt, root = self.get_transform()
787
957
parent_id = tt.trans_id_tree_path('parent')
788
958
tt.delete_contents(parent_id)
789
tt.create_file('contents', parent_id)
959
tt.create_file([b'contents'], parent_id)
790
960
resolve_conflicts(tt)
792
self.assertIs(None, self.wt.path2id('parent'))
793
self.assertIs(None, self.wt.path2id('parent.new'))
962
self.assertFalse(self.wt.is_versioned('parent'))
963
self.assertFalse(self.wt.is_versioned('parent.new'))
965
def test_resolve_conflicts_missing_parent(self):
966
wt = self.make_branch_and_tree('.')
967
tt = TreeTransform(wt)
968
self.addCleanup(tt.finalize)
969
parent = tt.trans_id_file_id(b'parent-id')
970
tt.new_file('file', parent, [b'Contents'])
971
raw_conflicts = resolve_conflicts(tt)
972
# Since the directory doesn't exist it's seen as 'missing'. So
973
# 'resolve_conflicts' create a conflict asking for it to be created.
974
self.assertLength(1, raw_conflicts)
975
self.assertEqual(('missing parent', 'Created directory', 'new-1'),
977
# apply fail since the missing directory doesn't exist
978
self.assertRaises(errors.NoFinalPath, tt.apply)
795
980
def test_moving_versioned_directories(self):
796
981
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')
982
kansas = create.new_directory('kansas', root, b'kansas-id')
983
create.new_directory('house', kansas, b'house-id')
984
create.new_directory('oz', root, b'oz-id')
801
986
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')
987
oz = cyclone.trans_id_tree_path('oz')
988
house = cyclone.trans_id_tree_path('house')
804
989
cyclone.adjust_path('house', oz, house)
807
992
def test_moving_root(self):
808
993
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')
994
fun = create.new_directory('fun', root, b'fun-id')
995
create.new_directory('sun', root, b'sun-id')
996
create.new_directory('moon', root, b'moon')
813
998
transform, root = self.get_transform()
814
999
transform.adjust_root_path('oldroot', fun)
815
1000
new_root = transform.trans_id_tree_path('')
816
transform.version_file('new-root', new_root)
1001
transform.version_file(b'new-root', new_root)
817
1002
transform.apply()
819
1004
def test_renames(self):
820
1005
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',
1006
old = create.new_directory('old-parent', root, b'old-id')
1007
intermediate = create.new_directory('intermediate', old, b'im-id')
1008
myfile = create.new_file('myfile', intermediate, [b'myfile-text'],
826
1011
rename, root = self.get_transform()
827
old = rename.trans_id_file_id('old-id')
1012
old = rename.trans_id_file_id(b'old-id')
828
1013
rename.adjust_path('new', root, old)
829
myfile = rename.trans_id_file_id('myfile-id')
1014
myfile = rename.trans_id_file_id(b'myfile-id')
830
1015
rename.set_executability(True, myfile)
1018
def test_rename_fails(self):
1019
self.requireFeature(features.not_running_as_root)
1020
# see https://bugs.launchpad.net/bzr/+bug/491763
1021
create, root_id = self.get_transform()
1022
first_dir = create.new_directory('first-dir', root_id, b'first-id')
1023
myfile = create.new_file('myfile', root_id, [b'myfile-text'],
1026
if os.name == "posix" and sys.platform != "cygwin":
1027
# posix filesystems fail on renaming if the readonly bit is set
1028
osutils.make_readonly(self.wt.abspath('first-dir'))
1029
elif os.name == "nt":
1030
# windows filesystems fail on renaming open files
1031
self.addCleanup(open(self.wt.abspath('myfile')).close)
1033
self.skipTest("Can't force a permissions error on rename")
1034
# now transform to rename
1035
rename_transform, root_id = self.get_transform()
1036
file_trans_id = rename_transform.trans_id_file_id(b'myfile-id')
1037
dir_id = rename_transform.trans_id_file_id(b'first-id')
1038
rename_transform.adjust_path('newname', dir_id, file_trans_id)
1039
e = self.assertRaises(errors.TransformRenameFailed,
1040
rename_transform.apply)
1041
# On nix looks like:
1042
# "Failed to rename .../work/.bzr/checkout/limbo/new-1
1043
# to .../first-dir/newname: [Errno 13] Permission denied"
1044
# On windows looks like:
1045
# "Failed to rename .../work/myfile to
1046
# .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
1047
# This test isn't concerned with exactly what the error looks like,
1048
# and the strerror will vary across OS and locales, but the assert
1049
# that the exeception attributes are what we expect
1050
self.assertEqual(e.errno, errno.EACCES)
1051
if os.name == "posix":
1052
self.assertEndsWith(e.to_path, "/first-dir/newname")
1054
self.assertEqual(os.path.basename(e.from_path), "myfile")
833
1056
def test_set_executability_order(self):
834
1057
"""Ensure that executability behaves the same, no matter what order.
903
1126
self.assertEqual([bar1_abspath], stat_paths)
905
1128
def test_iter_changes(self):
906
self.wt.set_root_id('eert_toor')
1129
self.wt.set_root_id(b'eert_toor')
907
1130
transform, root = self.get_transform()
908
transform.new_file('old', root, 'blah', 'id-1', True)
1131
transform.new_file('old', root, [b'blah'], b'id-1', True)
909
1132
transform.apply()
910
1133
transform, root = self.get_transform()
912
1135
self.assertEqual([], list(transform.iter_changes()))
913
old = transform.trans_id_tree_file_id('id-1')
1136
old = transform.trans_id_tree_path('old')
914
1137
transform.unversion_file(old)
915
self.assertEqual([('id-1', ('old', None), False, (True, False),
916
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1138
self.assertEqual([(b'id-1', ('old', None), False, (True, False),
1139
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
917
1140
(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'),
1141
transform.new_directory('new', root, b'id-1')
1142
self.assertEqual([(b'id-1', ('old', 'new'), True, (True, True),
1143
(b'eert_toor', b'eert_toor'), ('old', 'new'),
921
1144
('file', 'directory'),
922
1145
(True, False))], list(transform.iter_changes()))
924
1147
transform.finalize()
926
1149
def test_iter_changes_new(self):
927
self.wt.set_root_id('eert_toor')
1150
self.wt.set_root_id(b'eert_toor')
928
1151
transform, root = self.get_transform()
929
transform.new_file('old', root, 'blah')
1152
transform.new_file('old', root, [b'blah'])
930
1153
transform.apply()
931
1154
transform, root = self.get_transform()
933
1156
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'),
1157
transform.version_file(b'id-1', old)
1158
self.assertEqual([(b'id-1', (None, 'old'), False, (False, True),
1159
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
937
1160
(False, False))], list(transform.iter_changes()))
939
1162
transform.finalize()
941
1164
def test_iter_changes_modifications(self):
942
self.wt.set_root_id('eert_toor')
1165
self.wt.set_root_id(b'eert_toor')
943
1166
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')
1167
transform.new_file('old', root, [b'blah'], b'id-1')
1168
transform.new_file('new', root, [b'blah'])
1169
transform.new_directory('subdir', root, b'subdir-id')
947
1170
transform.apply()
948
1171
transform, root = self.get_transform()
950
1173
old = transform.trans_id_tree_path('old')
951
subdir = transform.trans_id_tree_file_id('subdir-id')
1174
subdir = transform.trans_id_tree_path('subdir')
952
1175
new = transform.trans_id_tree_path('new')
953
1176
self.assertEqual([], list(transform.iter_changes()))
955
1178
#content deletion
956
1179
transform.delete_contents(old)
957
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
958
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', None),
1180
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1181
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', None),
959
1182
(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'),
1185
transform.create_file([b'blah'], old)
1186
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1187
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
965
1188
(False, False))], list(transform.iter_changes()))
966
1189
transform.cancel_deletion(old)
967
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
968
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1190
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1191
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
969
1192
(False, False))], list(transform.iter_changes()))
970
1193
transform.cancel_creation(old)
972
1195
# move file_id to a different file
973
1196
self.assertEqual([], list(transform.iter_changes()))
974
1197
transform.unversion_file(old)
975
transform.version_file('id-1', new)
1198
transform.version_file(b'id-1', new)
976
1199
transform.adjust_path('old', root, new)
977
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
978
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1200
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1201
(b'eert_toor', b'eert_toor'), ('old', 'old'), ('file', 'file'),
979
1202
(False, False))], list(transform.iter_changes()))
980
1203
transform.cancel_versioning(new)
981
1204
transform._removed_id = set()
1011
1234
transform.finalize()
1013
1236
def test_iter_changes_modified_bleed(self):
1014
self.wt.set_root_id('eert_toor')
1237
self.wt.set_root_id(b'eert_toor')
1015
1238
"""Modified flag should not bleed from one change to another"""
1016
1239
# unfortunately, we have no guarantee that file1 (which is modified)
1017
1240
# will be applied before file2. And if it's applied after file2, it
1018
1241
# obviously can't bleed into file2's change output. But for now, it
1020
1243
transform, root = self.get_transform()
1021
transform.new_file('file1', root, 'blah', 'id-1')
1022
transform.new_file('file2', root, 'blah', 'id-2')
1244
transform.new_file('file1', root, [b'blah'], b'id-1')
1245
transform.new_file('file2', root, [b'blah'], b'id-2')
1023
1246
transform.apply()
1024
1247
transform, root = self.get_transform()
1026
transform.delete_contents(transform.trans_id_file_id('id-1'))
1249
transform.delete_contents(transform.trans_id_file_id(b'id-1'))
1027
1250
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'),
1251
transform.trans_id_file_id(b'id-2'))
1252
self.assertEqual([(b'id-1', (u'file1', u'file1'), True, (True, True),
1253
(b'eert_toor', b'eert_toor'), ('file1', u'file1'),
1031
1254
('file', None), (False, False)),
1032
('id-2', (u'file2', u'file2'), False, (True, True),
1033
('eert_toor', 'eert_toor'), ('file2', u'file2'),
1255
(b'id-2', (u'file2', u'file2'), False, (True, True),
1256
(b'eert_toor', b'eert_toor'), ('file2', u'file2'),
1034
1257
('file', 'file'), (False, True))],
1035
1258
list(transform.iter_changes()))
1382
1599
self.build_tree(['baz'])
1383
1600
tt.create_hardlink("baz", foo_trans_id)
1385
self.failUnlessExists("foo")
1386
self.failUnlessExists("baz")
1602
self.assertPathExists("foo")
1603
self.assertPathExists("baz")
1388
1605
self.addCleanup(wt.unlock)
1389
self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1606
self.assertEqual(wt.kind("foo"), "file")
1392
1608
def test_no_final_path(self):
1393
1609
transform, root = self.get_transform()
1394
trans_id = transform.trans_id_file_id('foo')
1395
transform.create_file('bar', trans_id)
1610
trans_id = transform.trans_id_file_id(b'foo')
1611
transform.create_file([b'bar'], trans_id)
1396
1612
transform.cancel_creation(trans_id)
1397
1613
transform.apply()
1399
1615
def test_create_from_tree(self):
1400
1616
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'])
1617
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', b'baz')])
1618
tree1.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
1403
1619
tree2 = self.make_branch_and_tree('tree2')
1404
1620
tt = TreeTransform(tree2)
1405
1621
foo_trans_id = tt.create_path('foo', tt.root)
1406
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1622
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
1407
1623
bar_trans_id = tt.create_path('bar', tt.root)
1408
create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
1624
create_from_tree(tt, bar_trans_id, tree1, 'bar', file_id=b'bar-id')
1410
1626
self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1411
self.assertFileEqual('baz', 'tree2/bar')
1627
self.assertFileEqual(b'baz', 'tree2/bar')
1413
1629
def test_create_from_tree_bytes(self):
1414
1630
"""Provided lines are used instead of tree content."""
1415
1631
tree1 = self.make_branch_and_tree('tree1')
1416
self.build_tree_contents([('tree1/foo', 'bar'),])
1417
tree1.add('foo', 'foo-id')
1632
self.build_tree_contents([('tree1/foo', b'bar'),])
1633
tree1.add('foo', b'foo-id')
1418
1634
tree2 = self.make_branch_and_tree('tree2')
1419
1635
tt = TreeTransform(tree2)
1420
1636
foo_trans_id = tt.create_path('foo', tt.root)
1421
create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
1637
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id',
1423
self.assertFileEqual('qux', 'tree2/foo')
1640
self.assertFileEqual(b'qux', 'tree2/foo')
1425
1642
def test_create_from_tree_symlink(self):
1426
1643
self.requireFeature(SymlinkFeature)
1427
1644
tree1 = self.make_branch_and_tree('tree1')
1428
1645
os.symlink('bar', 'tree1/foo')
1429
tree1.add('foo', 'foo-id')
1646
tree1.add('foo', b'foo-id')
1430
1647
tt = TreeTransform(self.make_branch_and_tree('tree2'))
1431
1648
foo_trans_id = tt.create_path('foo', tt.root)
1432
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1649
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
1434
1651
self.assertEqual('bar', os.readlink('tree2/foo'))
1456
1705
def test_text_merge(self):
1457
1706
root_id = generate_ids.gen_root_id()
1458
1707
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')
1708
base.tt.new_file('a', base.root, [b'a\nb\nc\nd\be\n'], b'a')
1709
base.tt.new_file('b', base.root, [b'b1'], b'b')
1710
base.tt.new_file('c', base.root, [b'c'], b'c')
1711
base.tt.new_file('d', base.root, [b'd'], b'd')
1712
base.tt.new_file('e', base.root, [b'e'], b'e')
1713
base.tt.new_file('f', base.root, [b'f'], b'f')
1714
base.tt.new_directory('g', base.root, b'g')
1715
base.tt.new_directory('h', base.root, b'h')
1467
1716
base.tt.apply()
1468
1717
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')
1718
other.tt.new_file('a', other.root, [b'y\nb\nc\nd\be\n'], b'a')
1719
other.tt.new_file('b', other.root, [b'b2'], b'b')
1720
other.tt.new_file('c', other.root, [b'c2'], b'c')
1721
other.tt.new_file('d', other.root, [b'd'], b'd')
1722
other.tt.new_file('e', other.root, [b'e2'], b'e')
1723
other.tt.new_file('f', other.root, [b'f'], b'f')
1724
other.tt.new_file('g', other.root, [b'g'], b'g')
1725
other.tt.new_file('h', other.root, [b'h\ni\nj\nk\n'], b'h')
1726
other.tt.new_file('i', other.root, [b'h\ni\nj\nk\n'], b'i')
1478
1727
other.tt.apply()
1479
1728
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')
1729
this.tt.new_file('a', this.root, [b'a\nb\nc\nd\bz\n'], b'a')
1730
this.tt.new_file('b', this.root, [b'b'], b'b')
1731
this.tt.new_file('c', this.root, [b'c'], b'c')
1732
this.tt.new_file('d', this.root, [b'd2'], b'd')
1733
this.tt.new_file('e', this.root, [b'e2'], b'e')
1734
this.tt.new_file('f', this.root, [b'f'], b'f')
1735
this.tt.new_file('g', this.root, [b'g'], b'g')
1736
this.tt.new_file('h', this.root, [b'1\n2\n3\n4\n'], b'h')
1737
this.tt.new_file('i', this.root, [b'1\n2\n3\n4\n'], b'i')
1489
1738
this.tt.apply()
1490
1739
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1492
1741
# textual merge
1493
self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
1742
with this.wt.get_file(this.wt.id2path(b'a')) as f:
1743
self.assertEqual(f.read(), b'y\nb\nc\nd\bz\n')
1494
1744
# three-way text conflict
1495
self.assertEqual(this.wt.get_file('b').read(),
1496
conflict_text('b', 'b2'))
1745
with this.wt.get_file(this.wt.id2path(b'b')) as f:
1746
self.assertEqual(f.read(), conflict_text(b'b', b'b2'))
1498
self.assertEqual(this.wt.get_file('c').read(), 'c2')
1748
self.assertEqual(this.wt.get_file(this.wt.id2path(b'c')).read(), b'c2')
1500
self.assertEqual(this.wt.get_file('d').read(), 'd2')
1750
self.assertEqual(this.wt.get_file(this.wt.id2path(b'd')).read(), b'd2')
1501
1751
# Ambigious clean merge
1502
self.assertEqual(this.wt.get_file('e').read(), 'e2')
1752
self.assertEqual(this.wt.get_file(this.wt.id2path(b'e')).read(), b'e2')
1504
self.assertEqual(this.wt.get_file('f').read(), 'f')
1754
self.assertEqual(this.wt.get_file(this.wt.id2path(b'f')).read(), b'f')
1505
1755
# Correct correct results when THIS == OTHER
1506
self.assertEqual(this.wt.get_file('g').read(), 'g')
1756
self.assertEqual(this.wt.get_file(this.wt.id2path(b'g')).read(), b'g')
1507
1757
# 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(),
1758
self.assertEqual(this.wt.get_file(this.wt.id2path(b'h')).read(),
1759
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1760
self.assertEqual(this.wt.get_file('h.THIS').read(),
1762
self.assertEqual(this.wt.get_file('h.OTHER').read(),
1514
1764
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(),
1765
self.assertEqual(this.wt.get_file(this.wt.id2path(b'i')).read(),
1766
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1767
self.assertEqual(this.wt.get_file('i.THIS').read(),
1769
self.assertEqual(this.wt.get_file('i.OTHER').read(),
1521
1771
self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1522
modified = ['a', 'b', 'c', 'h', 'i']
1772
modified = [b'a', b'b', b'c', b'h', b'i']
1523
1773
merge_modified = this.wt.merge_modified()
1524
1774
self.assertSubset(merge_modified, modified)
1525
1775
self.assertEqual(len(merge_modified), len(modified))
1526
file(this.wt.id2abspath('a'), 'wb').write('booga')
1776
with open(this.wt.abspath(this.wt.id2path(b'a')), 'wb') as f: f.write(b'booga')
1527
1777
modified.pop(0)
1528
1778
merge_modified = this.wt.merge_modified()
1529
1779
self.assertSubset(merge_modified, modified)
1578
1828
base = TransformGroup("BASE", root_id)
1579
1829
this = TransformGroup("THIS", root_id)
1580
1830
other = TransformGroup("OTHER", root_id)
1581
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
1582
for t in [base, this, other]]
1583
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1584
for t in [base, this, other]]
1585
base.tt.new_directory('c', base_a, 'c')
1586
this.tt.new_directory('c1', this_a, 'c')
1587
other.tt.new_directory('c', other_b, 'c')
1589
base.tt.new_directory('d', base_a, 'd')
1590
this.tt.new_directory('d1', this_b, 'd')
1591
other.tt.new_directory('d', other_a, 'd')
1593
base.tt.new_directory('e', base_a, 'e')
1594
this.tt.new_directory('e', this_a, 'e')
1595
other.tt.new_directory('e1', other_b, 'e')
1597
base.tt.new_directory('f', base_a, 'f')
1598
this.tt.new_directory('f1', this_b, 'f')
1599
other.tt.new_directory('f1', other_b, 'f')
1831
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, b'a')
1832
for t in [base, this, other]]
1833
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, b'b')
1834
for t in [base, this, other]]
1835
base.tt.new_directory('c', base_a, b'c')
1836
this.tt.new_directory('c1', this_a, b'c')
1837
other.tt.new_directory('c', other_b, b'c')
1839
base.tt.new_directory('d', base_a, b'd')
1840
this.tt.new_directory('d1', this_b, b'd')
1841
other.tt.new_directory('d', other_a, b'd')
1843
base.tt.new_directory('e', base_a, b'e')
1844
this.tt.new_directory('e', this_a, b'e')
1845
other.tt.new_directory('e1', other_b, b'e')
1847
base.tt.new_directory('f', base_a, b'f')
1848
this.tt.new_directory('f1', this_b, b'f')
1849
other.tt.new_directory('f1', other_b, b'f')
1601
1851
for tg in [this, base, other]:
1603
1853
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1604
self.assertEqual(this.wt.id2path('c'), pathjoin('b/c1'))
1605
self.assertEqual(this.wt.id2path('d'), pathjoin('b/d1'))
1606
self.assertEqual(this.wt.id2path('e'), pathjoin('b/e1'))
1607
self.assertEqual(this.wt.id2path('f'), pathjoin('b/f1'))
1854
self.assertEqual(this.wt.id2path(b'c'), pathjoin('b/c1'))
1855
self.assertEqual(this.wt.id2path(b'd'), pathjoin('b/d1'))
1856
self.assertEqual(this.wt.id2path(b'e'), pathjoin('b/e1'))
1857
self.assertEqual(this.wt.id2path(b'f'), pathjoin('b/f1'))
1609
1859
def test_filename_merge_conflicts(self):
1610
1860
root_id = generate_ids.gen_root_id()
1611
1861
base = TransformGroup("BASE", root_id)
1612
1862
this = TransformGroup("THIS", root_id)
1613
1863
other = TransformGroup("OTHER", root_id)
1614
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
1615
for t in [base, this, other]]
1616
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1617
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')
1864
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, b'a')
1865
for t in [base, this, other]]
1866
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, b'b')
1867
for t in [base, this, other]]
1869
base.tt.new_file('g', base_a, [b'g'], b'g')
1870
other.tt.new_file('g1', other_b, [b'g1'], b'g')
1872
base.tt.new_file('h', base_a, [b'h'], b'h')
1873
this.tt.new_file('h1', this_b, [b'h1'], b'h')
1875
base.tt.new_file('i', base.root, [b'i'], b'i')
1876
other.tt.new_directory('i1', this_b, b'i')
1628
1878
for tg in [this, base, other]:
1630
1880
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1632
self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1882
self.assertEqual(this.wt.id2path(b'g'), pathjoin('b/g1.OTHER'))
1633
1883
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1634
1884
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1635
self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
1885
self.assertEqual(this.wt.id2path(b'h'), pathjoin('b/h1.THIS'))
1636
1886
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1637
1887
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1638
self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
1888
self.assertEqual(this.wt.id2path(b'i'), pathjoin('b/i1.OTHER'))
1641
1891
class TestBuildTree(tests.TestCaseWithTransport):
1643
1893
def test_build_tree_with_symlinks(self):
1644
1894
self.requireFeature(SymlinkFeature)
1646
a = BzrDir.create_standalone_workingtree('a')
1896
a = ControlDir.create_standalone_workingtree('a')
1647
1897
os.mkdir('a/foo')
1648
file('a/foo/bar', 'wb').write('contents')
1898
with open('a/foo/bar', 'wb') as f: f.write(b'contents')
1649
1899
os.symlink('a/foo/bar', 'a/foo/baz')
1650
1900
a.add(['foo', 'foo/bar', 'foo/baz'])
1651
1901
a.commit('initial commit')
1652
b = BzrDir.create_standalone_workingtree('b')
1902
b = ControlDir.create_standalone_workingtree('b')
1653
1903
basis = a.basis_tree()
1654
1904
basis.lock_read()
1655
1905
self.addCleanup(basis.unlock)
1656
1906
build_tree(basis, b)
1657
1907
self.assertIs(os.path.isdir('b/foo'), True)
1658
self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
1908
with open('b/foo/bar', 'rb') as f:
1909
self.assertEqual(f.read(), b"contents")
1659
1910
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
1661
1912
def test_build_with_references(self):
1662
1913
tree = self.make_branch_and_tree('source',
1663
format='dirstate-with-subtree')
1914
format='development-subtree')
1664
1915
subtree = self.make_branch_and_tree('source/subtree',
1665
format='dirstate-with-subtree')
1916
format='development-subtree')
1666
1917
tree.add_reference(subtree)
1667
1918
tree.commit('a revision')
1668
1919
tree.branch.create_checkout('target')
1669
self.failUnlessExists('target')
1670
self.failUnlessExists('target/subtree')
1920
self.assertPathExists('target')
1921
self.assertPathExists('target/subtree')
1672
1923
def test_file_conflict_handling(self):
1673
1924
"""Ensure that when building trees, conflict handling is done"""
1674
1925
source = self.make_branch_and_tree('source')
1675
1926
target = self.make_branch_and_tree('target')
1676
1927
self.build_tree(['source/file', 'target/file'])
1677
source.add('file', 'new-file')
1928
source.add('file', b'new-file')
1678
1929
source.commit('added file')
1679
1930
build_tree(source.basis_tree(), target)
1680
1931
self.assertEqual([DuplicateEntry('Moved existing file to',
1681
1932
'file.moved', 'file', None, 'new-file')],
1682
1933
target.conflicts())
1683
1934
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())
1935
with open('target2/file', 'wb') as target_file, \
1936
open('source/file', 'rb') as source_file:
1937
target_file.write(source_file.read())
1693
1938
build_tree(source.basis_tree(), target2)
1694
1939
self.assertEqual([], target2.conflicts())
1970
2228
self.assertEqualStat(source_stat, target_stat)
1972
2230
def test_case_insensitive_build_tree_inventory(self):
1973
if (tests.CaseInsensitiveFilesystemFeature.available()
1974
or tests.CaseInsCasePresFilenameFeature.available()):
2231
if (features.CaseInsensitiveFilesystemFeature.available()
2232
or features.CaseInsCasePresFilenameFeature.available()):
1975
2233
raise tests.UnavailableFeature('Fully case sensitive filesystem')
1976
2234
source = self.make_branch_and_tree('source')
1977
2235
self.build_tree(['source/file', 'source/FILE'])
1978
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2236
source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
1979
2237
source.commit('added files')
1980
2238
# Don't try this at home, kids!
1981
2239
# Force the tree to report that it is case insensitive
1982
2240
target = self.make_branch_and_tree('target')
1983
2241
target.case_sensitive = False
1984
2242
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'))
2243
self.assertEqual('file.moved', target.id2path(b'lower-id'))
2244
self.assertEqual('FILE', target.id2path(b'upper-id'))
2246
def test_build_tree_observes_sha(self):
2247
source = self.make_branch_and_tree('source')
2248
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2249
source.add(['file1', 'dir', 'dir/file2'],
2250
[b'file1-id', b'dir-id', b'file2-id'])
2251
source.commit('new files')
2252
target = self.make_branch_and_tree('target')
2254
self.addCleanup(target.unlock)
2255
# We make use of the fact that DirState caches its cutoff time. So we
2256
# set the 'safe' time to one minute in the future.
2257
state = target.current_dirstate()
2258
state._cutoff_time = time.time() + 60
2259
build_tree(source.basis_tree(), target)
2260
entry1_sha = osutils.sha_file_by_name('source/file1')
2261
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2262
# entry[1] is the state information, entry[1][0] is the state of the
2263
# working tree, entry[1][0][1] is the sha value for the current working
2265
entry1 = state._get_entry(0, path_utf8=b'file1')
2266
self.assertEqual(entry1_sha, entry1[1][0][1])
2267
# The 'size' field must also be set.
2268
self.assertEqual(25, entry1[1][0][2])
2269
entry1_state = entry1[1][0]
2270
entry2 = state._get_entry(0, path_utf8=b'dir/file2')
2271
self.assertEqual(entry2_sha, entry2[1][0][1])
2272
self.assertEqual(29, entry2[1][0][2])
2273
entry2_state = entry2[1][0]
2274
# Now, make sure that we don't have to re-read the content. The
2275
# packed_stat should match exactly.
2276
self.assertEqual(entry1_sha, target.get_file_sha1('file1', b'file1-id'))
2277
self.assertEqual(entry2_sha,
2278
target.get_file_sha1('dir/file2', b'file2-id'))
2279
self.assertEqual(entry1_state, entry1[1][0])
2280
self.assertEqual(entry2_state, entry2[1][0])
1989
2283
class TestCommitTransform(tests.TestCaseWithTransport):
2043
2337
tt = TransformPreview(branch.basis_tree())
2044
2338
self.addCleanup(tt.finalize)
2045
2339
e = self.assertRaises(ValueError, tt.commit, branch,
2046
'my message', ['rev1b-id'])
2340
'my message', [b'rev1b-id'])
2047
2341
self.assertEqual('Cannot supply merge parents for first commit.',
2049
2343
self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
2051
2345
def test_add_files(self):
2052
2346
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')
2347
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2348
trans_id = tt.new_directory('dir', tt.root, b'dir-id')
2055
2349
if SymlinkFeature.available():
2056
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2350
tt.new_symlink('symlink', trans_id, 'target', b'symlink-id')
2057
2351
rev = tt.commit(branch, 'message')
2058
2352
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'))
2353
self.assertEqual('file', tree.id2path(b'file-id'))
2354
self.assertEqual(b'contents', tree.get_file_text('file', b'file-id'))
2355
self.assertEqual('dir', tree.id2path(b'dir-id'))
2062
2356
if SymlinkFeature.available():
2063
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2064
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2357
self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
2358
self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
2066
2360
def test_add_unversioned(self):
2067
2361
branch, tt = self.get_branch_and_transform()
2068
tt.new_file('file', tt.root, 'contents')
2362
tt.new_file('file', tt.root, [b'contents'])
2069
2363
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2070
2364
'message', strict=True)
2072
2366
def test_modify_strict(self):
2073
2367
branch, tt = self.get_branch_and_transform()
2074
tt.new_file('file', tt.root, 'contents', 'file-id')
2368
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2075
2369
tt.commit(branch, 'message', strict=True)
2076
2370
tt = TransformPreview(branch.basis_tree())
2077
2371
self.addCleanup(tt.finalize)
2078
trans_id = tt.trans_id_file_id('file-id')
2372
trans_id = tt.trans_id_file_id(b'file-id')
2079
2373
tt.delete_contents(trans_id)
2080
tt.create_file('contents', trans_id)
2374
tt.create_file([b'contents'], trans_id)
2081
2375
tt.commit(branch, 'message', strict=True)
2083
2377
def test_commit_malformed(self):
2086
2380
In this case, we are adding a file without adding its parent.
2088
2382
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')
2383
parent_id = tt.trans_id_file_id(b'parent-id')
2384
tt.new_file('file', parent_id, [b'contents'], b'file-id')
2091
2385
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~')
2388
def test_commit_rich_revision_data(self):
2389
branch, tt = self.get_branch_and_transform()
2390
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2391
committer='me <me@example.com>',
2392
revprops={u'foo': 'bar'}, revision_id=b'revid-1',
2393
authors=['Author1 <author1@example.com>',
2394
'Author2 <author2@example.com>',
2396
self.assertEqual(b'revid-1', rev_id)
2397
revision = branch.repository.get_revision(rev_id)
2398
self.assertEqual(1, revision.timestamp)
2399
self.assertEqual(43201, revision.timezone)
2400
self.assertEqual('me <me@example.com>', revision.committer)
2401
self.assertEqual(['Author1 <author1@example.com>',
2402
'Author2 <author2@example.com>'],
2403
revision.get_apparent_authors())
2404
del revision.properties['authors']
2405
self.assertEqual({'foo': 'bar',
2406
'branch-nick': 'tree'},
2407
revision.properties)
2409
def test_no_explicit_revprops(self):
2410
branch, tt = self.get_branch_and_transform()
2411
rev_id = tt.commit(branch, 'message', authors=[
2412
'Author1 <author1@example.com>',
2413
'Author2 <author2@example.com>', ])
2414
revision = branch.repository.get_revision(rev_id)
2415
self.assertEqual(['Author1 <author1@example.com>',
2416
'Author2 <author2@example.com>'],
2417
revision.get_apparent_authors())
2418
self.assertEqual('tree', revision.properties['branch-nick'])
2128
2421
class TestFileMover(tests.TestCaseWithTransport):
2240
2533
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2534
self.assertRaises(Bogus, tt.apply,
2242
2535
_mover=self.ExceptionFileMover(bad_target='d'))
2243
self.failUnlessExists('a')
2244
self.failUnlessExists('a/b')
2246
def test_resolve_no_parent(self):
2536
self.assertPathExists('a')
2537
self.assertPathExists('a/b')
2540
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2541
"""Ensure treetransform creation errors can be safely cleaned up after"""
2543
def _override_globals_in_method(self, instance, method_name, globals):
2544
"""Replace method on instance with one with updated globals"""
2546
func = getattr(instance, method_name).__func__
2547
new_globals = dict(func.__globals__)
2548
new_globals.update(globals)
2549
new_func = types.FunctionType(func.__code__, new_globals,
2550
func.__name__, func.__defaults__)
2551
setattr(instance, method_name,
2552
types.MethodType(new_func, instance, instance.__class__))
2553
self.addCleanup(delattr, instance, method_name)
2556
def _fake_open_raises_before(name, mode):
2557
"""Like open() but raises before doing anything"""
2561
def _fake_open_raises_after(name, mode):
2562
"""Like open() but raises after creating file without returning"""
2563
open(name, mode).close()
2566
def create_transform_and_root_trans_id(self):
2567
"""Setup a transform creating a file in limbo"""
2568
tree = self.make_branch_and_tree('.')
2569
tt = TreeTransform(tree)
2570
return tt, tt.create_path("a", tt.root)
2572
def create_transform_and_subdir_trans_id(self):
2573
"""Setup a transform creating a directory containing a file in limbo"""
2574
tree = self.make_branch_and_tree('.')
2575
tt = TreeTransform(tree)
2576
d_trans_id = tt.create_path("d", tt.root)
2577
tt.create_directory(d_trans_id)
2578
f_trans_id = tt.create_path("a", d_trans_id)
2579
tt.adjust_path("a", d_trans_id, f_trans_id)
2580
return tt, f_trans_id
2582
def test_root_create_file_open_raises_before_creation(self):
2583
tt, trans_id = self.create_transform_and_root_trans_id()
2584
self._override_globals_in_method(tt, "create_file",
2585
{"open": self._fake_open_raises_before})
2586
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2587
path = tt._limbo_name(trans_id)
2588
self.assertPathDoesNotExist(path)
2590
self.assertPathDoesNotExist(tt._limbodir)
2592
def test_root_create_file_open_raises_after_creation(self):
2593
tt, trans_id = self.create_transform_and_root_trans_id()
2594
self._override_globals_in_method(tt, "create_file",
2595
{"open": self._fake_open_raises_after})
2596
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2597
path = tt._limbo_name(trans_id)
2598
self.assertPathExists(path)
2600
self.assertPathDoesNotExist(path)
2601
self.assertPathDoesNotExist(tt._limbodir)
2603
def test_subdir_create_file_open_raises_before_creation(self):
2604
tt, trans_id = self.create_transform_and_subdir_trans_id()
2605
self._override_globals_in_method(tt, "create_file",
2606
{"open": self._fake_open_raises_before})
2607
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2608
path = tt._limbo_name(trans_id)
2609
self.assertPathDoesNotExist(path)
2611
self.assertPathDoesNotExist(tt._limbodir)
2613
def test_subdir_create_file_open_raises_after_creation(self):
2614
tt, trans_id = self.create_transform_and_subdir_trans_id()
2615
self._override_globals_in_method(tt, "create_file",
2616
{"open": self._fake_open_raises_after})
2617
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2618
path = tt._limbo_name(trans_id)
2619
self.assertPathExists(path)
2621
self.assertPathDoesNotExist(path)
2622
self.assertPathDoesNotExist(tt._limbodir)
2624
def test_rename_in_limbo_rename_raises_after_rename(self):
2625
tt, trans_id = self.create_transform_and_root_trans_id()
2626
parent1 = tt.new_directory('parent1', tt.root)
2627
child1 = tt.new_file('child1', parent1, [b'contents'])
2628
parent2 = tt.new_directory('parent2', tt.root)
2630
class FakeOSModule(object):
2631
def rename(self, old, new):
2634
self._override_globals_in_method(tt, "_rename_in_limbo",
2635
{"os": FakeOSModule()})
2637
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2638
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2639
self.assertPathExists(path)
2641
self.assertPathDoesNotExist(path)
2642
self.assertPathDoesNotExist(tt._limbodir)
2644
def test_rename_in_limbo_rename_raises_before_rename(self):
2645
tt, trans_id = self.create_transform_and_root_trans_id()
2646
parent1 = tt.new_directory('parent1', tt.root)
2647
child1 = tt.new_file('child1', parent1, [b'contents'])
2648
parent2 = tt.new_directory('parent2', tt.root)
2650
class FakeOSModule(object):
2651
def rename(self, old, new):
2653
self._override_globals_in_method(tt, "_rename_in_limbo",
2654
{"os": FakeOSModule()})
2656
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2657
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2658
self.assertPathExists(path)
2660
self.assertPathDoesNotExist(path)
2661
self.assertPathDoesNotExist(tt._limbodir)
2664
class TestTransformMissingParent(tests.TestCaseWithTransport):
2666
def make_tt_with_versioned_dir(self):
2247
2667
wt = self.make_branch_and_tree('.')
2668
self.build_tree(['dir/',])
2669
wt.add(['dir'], [b'dir-id'])
2670
wt.commit('Create dir')
2248
2671
tt = TreeTransform(wt)
2249
2672
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'),
2675
def test_resolve_create_parent_for_versioned_file(self):
2676
wt, tt = self.make_tt_with_versioned_dir()
2677
dir_tid = tt.trans_id_tree_path('dir')
2678
file_tid = tt.new_file('file', dir_tid, [b'Contents'], file_id=b'file-id')
2679
tt.delete_contents(dir_tid)
2680
tt.unversion_file(dir_tid)
2681
conflicts = resolve_conflicts(tt)
2682
# one conflict for the missing directory, one for the unversioned
2684
self.assertLength(2, conflicts)
2686
def test_non_versioned_file_create_conflict(self):
2687
wt, tt = self.make_tt_with_versioned_dir()
2688
dir_tid = tt.trans_id_tree_path('dir')
2689
tt.new_file('file', dir_tid, [b'Contents'])
2690
tt.delete_contents(dir_tid)
2691
tt.unversion_file(dir_tid)
2692
conflicts = resolve_conflicts(tt)
2693
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2694
self.assertLength(1, conflicts)
2695
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2699
A_ENTRY = (b'a-id', ('a', 'a'), True, (True, True),
2700
(b'TREE_ROOT', b'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2257
2701
(False, False))
2258
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
('', ''), ('directory', 'directory'), (False, None))
2702
ROOT_ENTRY = (b'TREE_ROOT', ('', ''), False, (True, True), (None, None),
2703
('', ''), ('directory', 'directory'), (False, False))
2262
2706
class TestTransformPreview(tests.TestCaseWithTransport):
2264
2708
def create_tree(self):
2265
2709
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')
2710
self.build_tree_contents([('a', b'content 1')])
2711
tree.set_root_id(b'TREE_ROOT')
2712
tree.add('a', b'a-id')
2713
tree.commit('rev1', rev_id=b'rev1')
2714
return tree.branch.repository.revision_tree(b'rev1')
2272
2716
def get_empty_preview(self):
2273
2717
repository = self.make_repository('repo')
2291
2735
revision_tree = self.create_tree()
2292
2736
preview = TransformPreview(revision_tree)
2293
2737
self.addCleanup(preview.finalize)
2294
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2738
preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2295
2739
preview_tree = preview.get_preview_tree()
2296
self.assertEqual(preview_tree.kind('file2-id'), 'file')
2298
preview_tree.get_file('file2-id').read(), 'content B\n')
2740
self.assertEqual(preview_tree.kind('file2'), 'file')
2741
with preview_tree.get_file('file2', b'file2-id') as f:
2742
self.assertEqual(f.read(), b'content B\n')
2300
2744
def test_diff_preview_tree(self):
2301
2745
revision_tree = self.create_tree()
2302
2746
preview = TransformPreview(revision_tree)
2303
2747
self.addCleanup(preview.finalize)
2304
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2748
preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2305
2749
preview_tree = preview.get_preview_tree()
2307
2751
show_diff_trees(revision_tree, preview_tree, out)
2308
2752
lines = out.getvalue().splitlines()
2309
self.assertEqual(lines[0], "=== added file 'file2'")
2753
self.assertEqual(lines[0], b"=== added file 'file2'")
2310
2754
# 3 lines of diff administrivia
2311
self.assertEqual(lines[4], "+content B")
2755
self.assertEqual(lines[4], b"+content B")
2313
2757
def test_transform_conflicts(self):
2314
2758
revision_tree = self.create_tree()
2315
2759
preview = TransformPreview(revision_tree)
2316
2760
self.addCleanup(preview.finalize)
2317
preview.new_file('a', preview.root, 'content 2')
2761
preview.new_file('a', preview.root, [b'content 2'])
2318
2762
resolve_conflicts(preview)
2319
trans_id = preview.trans_id_file_id('a-id')
2763
trans_id = preview.trans_id_file_id(b'a-id')
2320
2764
self.assertEqual('a.moved', preview.final_name(trans_id))
2322
2766
def get_tree_and_preview_tree(self):
2323
2767
revision_tree = self.create_tree()
2324
2768
preview = TransformPreview(revision_tree)
2325
2769
self.addCleanup(preview.finalize)
2326
a_trans_id = preview.trans_id_file_id('a-id')
2770
a_trans_id = preview.trans_id_file_id(b'a-id')
2327
2771
preview.delete_contents(a_trans_id)
2328
preview.create_file('b content', a_trans_id)
2772
preview.create_file([b'b content'], a_trans_id)
2329
2773
preview_tree = preview.get_preview_tree()
2330
2774
return revision_tree, preview_tree
2332
2776
def test_iter_changes(self):
2333
2777
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2334
root = revision_tree.inventory.root.file_id
2335
self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2778
root = revision_tree.get_root_id()
2779
self.assertEqual([(b'a-id', ('a', 'a'), True, (True, True),
2336
2780
(root, root), ('a', 'a'), ('file', 'file'),
2337
2781
(False, False))],
2338
2782
list(preview_tree.iter_changes(revision_tree)))
2377
2821
revision_tree = self.create_tree()
2378
2822
preview = TransformPreview(revision_tree)
2379
2823
self.addCleanup(preview.finalize)
2380
preview.new_file('file', preview.root, 'contents', 'file-id')
2381
preview.new_directory('directory', preview.root, 'dir-id')
2824
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2825
preview.new_directory('directory', preview.root, b'dir-id')
2382
2826
preview_tree = preview.get_preview_tree()
2383
self.assertEqual('file', preview_tree.kind('file-id'))
2384
self.assertEqual('directory', preview_tree.kind('dir-id'))
2827
self.assertEqual('file', preview_tree.kind('file'))
2828
self.assertEqual('directory', preview_tree.kind('directory'))
2386
2830
def test_get_file_mtime(self):
2387
2831
preview = self.get_empty_preview()
2388
file_trans_id = preview.new_file('file', preview.root, 'contents',
2832
file_trans_id = preview.new_file('file', preview.root, [b'contents'],
2390
2834
limbo_path = preview._limbo_name(file_trans_id)
2391
2835
preview_tree = preview.get_preview_tree()
2392
2836
self.assertEqual(os.stat(limbo_path).st_mtime,
2393
preview_tree.get_file_mtime('file-id'))
2837
preview_tree.get_file_mtime('file', b'file-id'))
2395
2839
def test_get_file_mtime_renamed(self):
2396
2840
work_tree = self.make_branch_and_tree('tree')
2397
2841
self.build_tree(['tree/file'])
2398
work_tree.add('file', 'file-id')
2842
work_tree.add('file', b'file-id')
2399
2843
preview = TransformPreview(work_tree)
2400
2844
self.addCleanup(preview.finalize)
2401
file_trans_id = preview.trans_id_tree_file_id('file-id')
2845
file_trans_id = preview.trans_id_tree_path('file')
2402
2846
preview.adjust_path('renamed', preview.root, file_trans_id)
2403
2847
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')
2848
preview_mtime = preview_tree.get_file_mtime('renamed', b'file-id')
2849
work_mtime = work_tree.get_file_mtime('file', b'file-id')
2851
def test_get_file_size(self):
2852
work_tree = self.make_branch_and_tree('tree')
2853
self.build_tree_contents([('tree/old', b'old')])
2854
work_tree.add('old', b'old-id')
2855
preview = TransformPreview(work_tree)
2856
self.addCleanup(preview.finalize)
2857
new_id = preview.new_file('name', preview.root, [b'contents'], b'new-id',
2859
tree = preview.get_preview_tree()
2860
self.assertEqual(len('old'), tree.get_file_size('old'))
2861
self.assertEqual(len('contents'), tree.get_file_size('name'))
2407
2863
def test_get_file(self):
2408
2864
preview = self.get_empty_preview()
2409
preview.new_file('file', preview.root, 'contents', 'file-id')
2865
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2410
2866
preview_tree = preview.get_preview_tree()
2411
tree_file = preview_tree.get_file('file-id')
2413
self.assertEqual('contents', tree_file.read())
2867
with preview_tree.get_file('file') as tree_file:
2868
self.assertEqual(b'contents', tree_file.read())
2417
2870
def test_get_symlink_target(self):
2418
2871
self.requireFeature(SymlinkFeature)
2419
2872
preview = self.get_empty_preview()
2420
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2873
preview.new_symlink('symlink', preview.root, 'target', b'symlink-id')
2421
2874
preview_tree = preview.get_preview_tree()
2422
2875
self.assertEqual('target',
2423
preview_tree.get_symlink_target('symlink-id'))
2876
preview_tree.get_symlink_target('symlink'))
2425
2878
def test_all_file_ids(self):
2426
2879
tree = self.make_branch_and_tree('tree')
2427
2880
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2428
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2881
tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
2429
2882
preview = TransformPreview(tree)
2430
2883
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')
2884
preview.unversion_file(preview.trans_id_file_id(b'b-id'))
2885
c_trans_id = preview.trans_id_file_id(b'c-id')
2433
2886
preview.unversion_file(c_trans_id)
2434
preview.version_file('c-id', c_trans_id)
2887
preview.version_file(b'c-id', c_trans_id)
2435
2888
preview_tree = preview.get_preview_tree()
2436
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2889
self.assertEqual({b'a-id', b'c-id', tree.get_root_id()},
2437
2890
preview_tree.all_file_ids())
2439
2892
def test_path2id_deleted_unchanged(self):
2440
2893
tree = self.make_branch_and_tree('tree')
2441
2894
self.build_tree(['tree/unchanged', 'tree/deleted'])
2442
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2895
tree.add(['unchanged', 'deleted'], [b'unchanged-id', b'deleted-id'])
2443
2896
preview = TransformPreview(tree)
2444
2897
self.addCleanup(preview.finalize)
2445
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2898
preview.unversion_file(preview.trans_id_file_id(b'deleted-id'))
2446
2899
preview_tree = preview.get_preview_tree()
2447
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2448
self.assertIs(None, preview_tree.path2id('deleted'))
2900
self.assertEqual(b'unchanged-id', preview_tree.path2id('unchanged'))
2901
self.assertFalse(preview_tree.is_versioned('deleted'))
2450
2903
def test_path2id_created(self):
2451
2904
tree = self.make_branch_and_tree('tree')
2452
2905
self.build_tree(['tree/unchanged'])
2453
tree.add(['unchanged'], ['unchanged-id'])
2906
tree.add(['unchanged'], [b'unchanged-id'])
2454
2907
preview = TransformPreview(tree)
2455
2908
self.addCleanup(preview.finalize)
2456
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2457
'contents', 'new-id')
2909
preview.new_file('new', preview.trans_id_file_id(b'unchanged-id'),
2910
[b'contents'], b'new-id')
2458
2911
preview_tree = preview.get_preview_tree()
2459
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2912
self.assertEqual(b'new-id', preview_tree.path2id('unchanged/new'))
2461
2914
def test_path2id_moved(self):
2462
2915
tree = self.make_branch_and_tree('tree')
2463
2916
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2464
2917
tree.add(['old_parent', 'old_parent/child'],
2465
['old_parent-id', 'child-id'])
2918
[b'old_parent-id', b'child-id'])
2466
2919
preview = TransformPreview(tree)
2467
2920
self.addCleanup(preview.finalize)
2468
2921
new_parent = preview.new_directory('new_parent', preview.root,
2470
2923
preview.adjust_path('child', new_parent,
2471
preview.trans_id_file_id('child-id'))
2924
preview.trans_id_file_id(b'child-id'))
2472
2925
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'))
2926
self.assertFalse(preview_tree.is_versioned('old_parent/child'))
2927
self.assertEqual(b'child-id', preview_tree.path2id('new_parent/child'))
2476
2929
def test_path2id_renamed_parent(self):
2477
2930
tree = self.make_branch_and_tree('tree')
2478
2931
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2479
2932
tree.add(['old_name', 'old_name/child'],
2480
['parent-id', 'child-id'])
2933
[b'parent-id', b'child-id'])
2481
2934
preview = TransformPreview(tree)
2482
2935
self.addCleanup(preview.finalize)
2483
2936
preview.adjust_path('new_name', preview.root,
2484
preview.trans_id_file_id('parent-id'))
2937
preview.trans_id_file_id(b'parent-id'))
2485
2938
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'))
2939
self.assertFalse(preview_tree.is_versioned('old_name/child'))
2940
self.assertEqual(b'child-id', preview_tree.path2id('new_name/child'))
2489
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2942
def assertMatchingIterEntries(self, tt, specific_files=None):
2490
2943
preview_tree = tt.get_preview_tree()
2491
2944
preview_result = list(preview_tree.iter_entries_by_dir(
2945
specific_files=specific_files))
2493
2946
tree = tt._tree
2495
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
2948
actual_result = list(tree.iter_entries_by_dir(
2949
specific_files=specific_files))
2496
2950
self.assertEqual(actual_result, preview_result)
2498
2952
def test_iter_entries_by_dir_new(self):
2499
2953
tree = self.make_branch_and_tree('tree')
2500
2954
tt = TreeTransform(tree)
2501
tt.new_file('new', tt.root, 'contents', 'new-id')
2955
tt.new_file('new', tt.root, [b'contents'], b'new-id')
2502
2956
self.assertMatchingIterEntries(tt)
2504
2958
def test_iter_entries_by_dir_deleted(self):
2505
2959
tree = self.make_branch_and_tree('tree')
2506
2960
self.build_tree(['tree/deleted'])
2507
tree.add('deleted', 'deleted-id')
2961
tree.add('deleted', b'deleted-id')
2508
2962
tt = TreeTransform(tree)
2509
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
2963
tt.delete_contents(tt.trans_id_file_id(b'deleted-id'))
2510
2964
self.assertMatchingIterEntries(tt)
2512
2966
def test_iter_entries_by_dir_unversioned(self):
2513
2967
tree = self.make_branch_and_tree('tree')
2514
2968
self.build_tree(['tree/removed'])
2515
tree.add('removed', 'removed-id')
2969
tree.add('removed', b'removed-id')
2516
2970
tt = TreeTransform(tree)
2517
tt.unversion_file(tt.trans_id_file_id('removed-id'))
2971
tt.unversion_file(tt.trans_id_file_id(b'removed-id'))
2518
2972
self.assertMatchingIterEntries(tt)
2520
2974
def test_iter_entries_by_dir_moved(self):
2521
2975
tree = self.make_branch_and_tree('tree')
2522
2976
self.build_tree(['tree/moved', 'tree/new_parent/'])
2523
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
2977
tree.add(['moved', 'new_parent'], [b'moved-id', b'new_parent-id'])
2524
2978
tt = TreeTransform(tree)
2525
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2526
tt.trans_id_file_id('moved-id'))
2979
tt.adjust_path('moved', tt.trans_id_file_id(b'new_parent-id'),
2980
tt.trans_id_file_id(b'moved-id'))
2527
2981
self.assertMatchingIterEntries(tt)
2529
def test_iter_entries_by_dir_specific_file_ids(self):
2983
def test_iter_entries_by_dir_specific_files(self):
2530
2984
tree = self.make_branch_and_tree('tree')
2531
tree.set_root_id('tree-root-id')
2985
tree.set_root_id(b'tree-root-id')
2532
2986
self.build_tree(['tree/parent/', 'tree/parent/child'])
2533
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
2987
tree.add(['parent', 'parent/child'], [b'parent-id', b'child-id'])
2534
2988
tt = TreeTransform(tree)
2535
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
2989
self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2537
2991
def test_symlink_content_summary(self):
2538
2992
self.requireFeature(SymlinkFeature)
2539
2993
preview = self.get_empty_preview()
2540
preview.new_symlink('path', preview.root, 'target', 'path-id')
2994
preview.new_symlink('path', preview.root, 'target', b'path-id')
2541
2995
summary = preview.get_preview_tree().path_content_summary('path')
2542
2996
self.assertEqual(('symlink', None, None, 'target'), summary)
2597
3051
def test_dir_content_summary(self):
2598
3052
preview = self.get_empty_preview()
2599
preview.new_directory('path', preview.root, 'path-id')
3053
preview.new_directory('path', preview.root, b'path-id')
2600
3054
summary = preview.get_preview_tree().path_content_summary('path')
2601
3055
self.assertEqual(('directory', None, None, None), summary)
2603
3057
def test_tree_content_summary(self):
2604
3058
preview = self.get_empty_preview()
2605
path = preview.new_directory('path', preview.root, 'path-id')
2606
preview.set_tree_reference('rev-1', path)
3059
path = preview.new_directory('path', preview.root, b'path-id')
3060
preview.set_tree_reference(b'rev-1', path)
2607
3061
summary = preview.get_preview_tree().path_content_summary('path')
2608
3062
self.assertEqual(4, len(summary))
2609
3063
self.assertEqual('tree-reference', summary[0])
2611
3065
def test_annotate(self):
2612
3066
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')])
3067
self.build_tree_contents([('tree/file', b'a\n')])
3068
tree.add('file', b'file-id')
3069
tree.commit('a', rev_id=b'one')
3070
self.build_tree_contents([('tree/file', b'a\nb\n')])
2617
3071
preview = TransformPreview(tree)
2618
3072
self.addCleanup(preview.finalize)
2619
file_trans_id = preview.trans_id_file_id('file-id')
3073
file_trans_id = preview.trans_id_file_id(b'file-id')
2620
3074
preview.delete_contents(file_trans_id)
2621
preview.create_file('a\nb\nc\n', file_trans_id)
3075
preview.create_file([b'a\nb\nc\n'], file_trans_id)
2622
3076
preview_tree = preview.get_preview_tree()
2628
annotation = preview_tree.annotate_iter('file-id', 'me:')
3082
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2629
3083
self.assertEqual(expected, annotation)
2631
3085
def test_annotate_missing(self):
2632
3086
preview = self.get_empty_preview()
2633
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3087
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2634
3088
preview_tree = preview.get_preview_tree()
2640
annotation = preview_tree.annotate_iter('file-id', 'me:')
3094
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2641
3095
self.assertEqual(expected, annotation)
2643
3097
def test_annotate_rename(self):
2644
3098
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')
3099
self.build_tree_contents([('tree/file', b'a\n')])
3100
tree.add('file', b'file-id')
3101
tree.commit('a', rev_id=b'one')
2648
3102
preview = TransformPreview(tree)
2649
3103
self.addCleanup(preview.finalize)
2650
file_trans_id = preview.trans_id_file_id('file-id')
3104
file_trans_id = preview.trans_id_file_id(b'file-id')
2651
3105
preview.adjust_path('newname', preview.root, file_trans_id)
2652
3106
preview_tree = preview.get_preview_tree()
2656
annotation = preview_tree.annotate_iter('file-id', 'me:')
3110
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2657
3111
self.assertEqual(expected, annotation)
2659
3113
def test_annotate_deleted(self):
2660
3114
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')])
3115
self.build_tree_contents([('tree/file', b'a\n')])
3116
tree.add('file', b'file-id')
3117
tree.commit('a', rev_id=b'one')
3118
self.build_tree_contents([('tree/file', b'a\nb\n')])
2665
3119
preview = TransformPreview(tree)
2666
3120
self.addCleanup(preview.finalize)
2667
file_trans_id = preview.trans_id_file_id('file-id')
3121
file_trans_id = preview.trans_id_file_id(b'file-id')
2668
3122
preview.delete_contents(file_trans_id)
2669
3123
preview_tree = preview.get_preview_tree()
2670
annotation = preview_tree.annotate_iter('file-id', 'me:')
3124
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2671
3125
self.assertIs(None, annotation)
2673
3127
def test_stored_kind(self):
2674
3128
preview = self.get_empty_preview()
2675
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3129
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2676
3130
preview_tree = preview.get_preview_tree()
2677
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3131
self.assertEqual('file', preview_tree.stored_kind('file'))
2679
3133
def test_is_executable(self):
2680
3134
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'))
3135
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
3136
preview.set_executability(True, preview.trans_id_file_id(b'file-id'))
2683
3137
preview_tree = preview.get_preview_tree()
2684
self.assertEqual(True, preview_tree.is_executable('file-id'))
3138
self.assertEqual(True, preview_tree.is_executable('file'))
2686
3140
def test_get_set_parent_ids(self):
2687
3141
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2688
3142
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())
3143
preview_tree.set_parent_ids([b'rev-1'])
3144
self.assertEqual([b'rev-1'], preview_tree.get_parent_ids())
2692
3146
def test_plan_file_merge(self):
2693
3147
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')
3148
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3149
work_a.add('file', b'file-id')
2696
3150
base_id = work_a.commit('base version')
2697
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3151
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2698
3152
preview = TransformPreview(work_a)
2699
3153
self.addCleanup(preview.finalize)
2700
trans_id = preview.trans_id_file_id('file-id')
3154
trans_id = preview.trans_id_file_id(b'file-id')
2701
3155
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')])
3156
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3157
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2704
3158
tree_a = preview.get_preview_tree()
2705
3159
tree_a.set_parent_ids([base_id])
2706
3160
self.assertEqual([
2707
('killed-a', 'a\n'),
2708
('killed-b', 'b\n'),
2709
('unchanged', 'c\n'),
2710
('unchanged', 'd\n'),
2713
], list(tree_a.plan_file_merge('file-id', tree_b)))
3161
('killed-a', b'a\n'),
3162
('killed-b', b'b\n'),
3163
('unchanged', b'c\n'),
3164
('unchanged', b'd\n'),
3167
], list(tree_a.plan_file_merge(b'file-id', tree_b)))
2715
3169
def test_plan_file_merge_revision_tree(self):
2716
3170
work_a = self.make_branch_and_tree('wta')
2717
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2718
work_a.add('file', 'file-id')
3171
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3172
work_a.add('file', b'file-id')
2719
3173
base_id = work_a.commit('base version')
2720
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3174
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2721
3175
preview = TransformPreview(work_a.basis_tree())
2722
3176
self.addCleanup(preview.finalize)
2723
trans_id = preview.trans_id_file_id('file-id')
3177
trans_id = preview.trans_id_file_id(b'file-id')
2724
3178
preview.delete_contents(trans_id)
2725
preview.create_file('b\nc\nd\ne\n', trans_id)
2726
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3179
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3180
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2727
3181
tree_a = preview.get_preview_tree()
2728
3182
tree_a.set_parent_ids([base_id])
2729
3183
self.assertEqual([
2730
('killed-a', 'a\n'),
2731
('killed-b', 'b\n'),
2732
('unchanged', 'c\n'),
2733
('unchanged', 'd\n'),
2736
], list(tree_a.plan_file_merge('file-id', tree_b)))
3184
('killed-a', b'a\n'),
3185
('killed-b', b'b\n'),
3186
('unchanged', b'c\n'),
3187
('unchanged', b'd\n'),
3190
], list(tree_a.plan_file_merge(b'file-id', tree_b)))
2738
3192
def test_walkdirs(self):
2739
3193
preview = self.get_empty_preview()
2740
root = preview.new_directory('', ROOT_PARENT, 'tree-root')
3194
root = preview.new_directory('', ROOT_PARENT, b'tree-root')
2741
3195
# FIXME: new_directory should mark root.
2742
3196
preview.fixup_new_roots()
2743
3197
preview_tree = preview.get_preview_tree()
2744
file_trans_id = preview.new_file('a', preview.root, 'contents',
2746
expected = [(('', 'tree-root'),
2747
[('a', 'a', 'file', None, 'a-id', 'file')])]
3198
file_trans_id = preview.new_file('a', preview.root, [b'contents'],
3200
expected = [(('', b'tree-root'),
3201
[('a', 'a', 'file', None, b'a-id', 'file')])]
2748
3202
self.assertEqual(expected, list(preview_tree.walkdirs()))
2750
3204
def test_extras(self):
2788
3242
tt = merger.make_merger().make_preview_transform()
2789
3243
self.addCleanup(tt.finalize)
2790
3244
final_tree = tt.get_preview_tree()
2791
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3247
final_tree.get_file_text(final_tree.id2path(b'file-id')))
2793
3249
def test_merge_preview_into_workingtree(self):
2794
3250
tree = self.make_branch_and_tree('tree')
2795
tree.set_root_id('TREE_ROOT')
3251
tree.set_root_id(b'TREE_ROOT')
2796
3252
tt = TransformPreview(tree)
2797
3253
self.addCleanup(tt.finalize)
2798
tt.new_file('name', tt.root, 'content', 'file-id')
3254
tt.new_file('name', tt.root, [b'content'], b'file-id')
2799
3255
tree2 = self.make_branch_and_tree('tree2')
2800
tree2.set_root_id('TREE_ROOT')
3256
tree2.set_root_id(b'TREE_ROOT')
2801
3257
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
None, tree.basis_tree())
2803
3259
merger.merge_type = Merge3Merger
2804
3260
merger.do_merge()
2806
3262
def test_merge_preview_into_workingtree_handles_conflicts(self):
2807
3263
tree = self.make_branch_and_tree('tree')
2808
self.build_tree_contents([('tree/foo', 'bar')])
2809
tree.add('foo', 'foo-id')
3264
self.build_tree_contents([('tree/foo', b'bar')])
3265
tree.add('foo', b'foo-id')
2810
3266
tree.commit('foo')
2811
3267
tt = TransformPreview(tree)
2812
3268
self.addCleanup(tt.finalize)
2813
trans_id = tt.trans_id_file_id('foo-id')
3269
trans_id = tt.trans_id_file_id(b'foo-id')
2814
3270
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')])
3271
tt.create_file([b'baz'], trans_id)
3272
tree2 = tree.controldir.sprout('tree2').open_workingtree()
3273
self.build_tree_contents([('tree2/foo', b'qux')])
2819
3274
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
pb, tree.basis_tree())
2821
3276
merger.merge_type = Merge3Merger
2822
3277
merger.do_merge()
3279
def test_has_filename(self):
3280
wt = self.make_branch_and_tree('tree')
3281
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3282
tt = TransformPreview(wt)
3283
removed_id = tt.trans_id_tree_path('removed')
3284
tt.delete_contents(removed_id)
3285
tt.new_file('new', tt.root, [b'contents'])
3286
modified_id = tt.trans_id_tree_path('modified')
3287
tt.delete_contents(modified_id)
3288
tt.create_file([b'modified-contents'], modified_id)
3289
self.addCleanup(tt.finalize)
3290
tree = tt.get_preview_tree()
3291
self.assertTrue(tree.has_filename('unmodified'))
3292
self.assertFalse(tree.has_filename('not-present'))
3293
self.assertFalse(tree.has_filename('removed'))
3294
self.assertTrue(tree.has_filename('new'))
3295
self.assertTrue(tree.has_filename('modified'))
2824
3297
def test_is_executable(self):
2825
3298
tree = self.make_branch_and_tree('tree')
2826
3299
preview = TransformPreview(tree)
2827
3300
self.addCleanup(preview.finalize)
2828
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3301
preview.new_file('foo', preview.root, [b'bar'], b'baz-id')
2829
3302
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'))
3303
self.assertEqual(False, preview_tree.is_executable('tree/foo', b'baz-id'))
3304
self.assertEqual(False, preview_tree.is_executable('tree/foo'))
2834
3306
def test_commit_preview_tree(self):
2835
3307
tree = self.make_branch_and_tree('tree')
2889
3361
def default_attribs():
2894
'_new_executability': {},
2896
'_tree_path_ids': {'': 'new-0'},
2898
'_removed_contents': [],
2899
'_non_present_ids': {},
3366
b'_new_executability': {},
3368
b'_tree_path_ids': {b'': b'new-0'},
3370
b'_removed_contents': [],
3371
b'_non_present_ids': {},
2902
3374
def make_records(self, attribs, contents):
2904
(((('attribs'),),), bencode.bencode(attribs))]
3376
((((b'attribs'),),), bencode.bencode(attribs))]
2905
3377
records.extend([(((n, k),), c) for n, k, c in contents])
2908
3380
def creation_records(self):
2909
3381
attribs = self.default_attribs()
2910
attribs['_id_number'] = 3
2911
attribs['_new_name'] = {
2912
'new-1': u'foo\u1234'.encode('utf-8'), 'new-2': 'qux'}
2913
attribs['_new_id'] = {'new-1': 'baz', 'new-2': 'quxx'}
2914
attribs['_new_parent'] = {'new-1': 'new-0', 'new-2': 'new-0'}
2915
attribs['_new_executability'] = {'new-1': 1}
3382
attribs[b'_id_number'] = 3
3383
attribs[b'_new_name'] = {
3384
b'new-1': u'foo\u1234'.encode('utf-8'), b'new-2': b'qux'}
3385
attribs[b'_new_id'] = {b'new-1': b'baz', b'new-2': b'quxx'}
3386
attribs[b'_new_parent'] = {b'new-1': b'new-0', b'new-2': b'new-0'}
3387
attribs[b'_new_executability'] = {b'new-1': 1}
2917
('new-1', 'file', 'i 1\nbar\n'),
2918
('new-2', 'directory', ''),
3389
(b'new-1', b'file', b'i 1\nbar\n'),
3390
(b'new-2', b'directory', b''),
2920
3392
return self.make_records(attribs, contents)
2922
3394
def test_serialize_creation(self):
2923
3395
tt = self.get_preview()
2924
tt.new_file(u'foo\u1234', tt.root, 'bar', 'baz', True)
2925
tt.new_directory('qux', tt.root, 'quxx')
3396
tt.new_file(u'foo\u1234', tt.root, [b'bar'], b'baz', True)
3397
tt.new_directory('qux', tt.root, b'quxx')
2926
3398
self.assertSerializesTo(self.creation_records(), tt)
2928
3400
def test_deserialize_creation(self):
3001
3473
self.assertEqual({'new-1': u'foo\u1234',
3002
3474
'new-2': 'bar',
3003
3475
tt.root: ''}, tt._tree_id_paths)
3004
self.assertEqual(set(['new-1']), tt._removed_id)
3005
self.assertEqual(set(['new-2']), tt._removed_contents)
3476
self.assertEqual({'new-1'}, tt._removed_id)
3477
self.assertEqual({'new-2'}, tt._removed_contents)
3007
3479
def missing_records(self):
3008
3480
attribs = self.default_attribs()
3009
attribs['_id_number'] = 2
3010
attribs['_non_present_ids'] = {
3481
attribs[b'_id_number'] = 2
3482
attribs[b'_non_present_ids'] = {
3012
3484
return self.make_records(attribs, [])
3014
3486
def test_serialize_missing(self):
3015
3487
tt = self.get_preview()
3016
boo_trans_id = tt.trans_id_file_id('boo')
3488
boo_trans_id = tt.trans_id_file_id(b'boo')
3017
3489
self.assertSerializesTo(self.missing_records(), tt)
3019
3491
def test_deserialize_missing(self):
3020
3492
tt = self.get_preview()
3021
3493
tt.deserialize(iter(self.missing_records()))
3022
self.assertEqual({'boo': 'new-1'}, tt._non_present_ids)
3494
self.assertEqual({b'boo': 'new-1'}, tt._non_present_ids)
3024
3496
def make_modification_preview(self):
3025
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3026
LINES_TWO = 'z\nbb\nx\ndd\n'
3497
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3498
LINES_TWO = b'z\nbb\nx\ndd\n'
3027
3499
tree = self.make_branch_and_tree('tree')
3028
3500
self.build_tree_contents([('tree/file', LINES_ONE)])
3029
tree.add('file', 'file-id')
3030
return self.get_preview(tree), LINES_TWO
3501
tree.add('file', b'file-id')
3502
return self.get_preview(tree), [LINES_TWO]
3032
3504
def modification_records(self):
3033
3505
attribs = self.default_attribs()
3034
attribs['_id_number'] = 2
3035
attribs['_tree_path_ids'] = {
3038
attribs['_removed_contents'] = ['new-1']
3039
contents = [('new-1', 'file',
3040
'i 1\nz\n\nc 0 1 1 1\ni 1\nx\n\nc 0 3 3 1\n')]
3506
attribs[b'_id_number'] = 2
3507
attribs[b'_tree_path_ids'] = {
3510
attribs[b'_removed_contents'] = [b'new-1']
3511
contents = [(b'new-1', b'file',
3512
b'i 1\nz\n\nc 0 1 1 1\ni 1\nx\n\nc 0 3 3 1\n')]
3041
3513
return self.make_records(attribs, contents)
3043
3515
def test_serialize_modification(self):
3044
3516
tt, LINES = self.make_modification_preview()
3045
trans_id = tt.trans_id_file_id('file-id')
3517
trans_id = tt.trans_id_file_id(b'file-id')
3046
3518
tt.delete_contents(trans_id)
3047
3519
tt.create_file(LINES, trans_id)
3048
3520
self.assertSerializesTo(self.modification_records(), tt)
3112
3584
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3114
3586
def test_get_parents_lines(self):
3115
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3116
LINES_TWO = 'z\nbb\nx\ndd\n'
3587
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3588
LINES_TWO = b'z\nbb\nx\ndd\n'
3117
3589
tree = self.make_branch_and_tree('tree')
3118
3590
self.build_tree_contents([('tree/file', LINES_ONE)])
3119
tree.add('file', 'file-id')
3591
tree.add('file', b'file-id')
3120
3592
tt = self.get_preview(tree)
3121
3593
trans_id = tt.trans_id_tree_path('file')
3122
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3594
self.assertEqual(([b'aa\n', b'bb\n', b'cc\n', b'dd\n'],),
3123
3595
tt._get_parents_lines(trans_id))
3125
3597
def test_get_parents_texts(self):
3126
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3127
LINES_TWO = 'z\nbb\nx\ndd\n'
3598
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3599
LINES_TWO = b'z\nbb\nx\ndd\n'
3128
3600
tree = self.make_branch_and_tree('tree')
3129
3601
self.build_tree_contents([('tree/file', LINES_ONE)])
3130
tree.add('file', 'file-id')
3602
tree.add('file', b'file-id')
3131
3603
tt = self.get_preview(tree)
3132
3604
trans_id = tt.trans_id_tree_path('file')
3133
3605
self.assertEqual((LINES_ONE,),
3134
3606
tt._get_parents_texts(trans_id))
3609
class TestOrphan(tests.TestCaseWithTransport):
3611
def test_no_orphan_for_transform_preview(self):
3612
tree = self.make_branch_and_tree('tree')
3613
tt = transform.TransformPreview(tree)
3614
self.addCleanup(tt.finalize)
3615
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3617
def _set_orphan_policy(self, wt, policy):
3618
wt.branch.get_config_stack().set('transform.orphan_policy',
3621
def _prepare_orphan(self, wt):
3622
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3623
wt.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
3624
wt.commit('add dir and file ignoring foo')
3625
tt = transform.TreeTransform(wt)
3626
self.addCleanup(tt.finalize)
3627
# dir and bar are deleted
3628
dir_tid = tt.trans_id_tree_path('dir')
3629
file_tid = tt.trans_id_tree_path('dir/file')
3630
orphan_tid = tt.trans_id_tree_path('dir/foo')
3631
tt.delete_contents(file_tid)
3632
tt.unversion_file(file_tid)
3633
tt.delete_contents(dir_tid)
3634
tt.unversion_file(dir_tid)
3635
# There should be a conflict because dir still contain foo
3636
raw_conflicts = tt.find_conflicts()
3637
self.assertLength(1, raw_conflicts)
3638
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3639
return tt, orphan_tid
3641
def test_new_orphan_created(self):
3642
wt = self.make_branch_and_tree('.')
3643
self._set_orphan_policy(wt, 'move')
3644
tt, orphan_tid = self._prepare_orphan(wt)
3647
warnings.append(args[0] % args[1:])
3648
self.overrideAttr(trace, 'warning', warning)
3649
remaining_conflicts = resolve_conflicts(tt)
3650
self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
3652
# Yeah for resolved conflicts !
3653
self.assertLength(0, remaining_conflicts)
3654
# We have a new orphan
3655
self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
3656
self.assertEqual('brz-orphans',
3657
tt.final_name(tt.final_parent(orphan_tid)))
3659
def test_never_orphan(self):
3660
wt = self.make_branch_and_tree('.')
3661
self._set_orphan_policy(wt, 'conflict')
3662
tt, orphan_tid = self._prepare_orphan(wt)
3663
remaining_conflicts = resolve_conflicts(tt)
3664
self.assertLength(1, remaining_conflicts)
3665
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3666
remaining_conflicts.pop())
3668
def test_orphan_error(self):
3669
def bogus_orphan(tt, orphan_id, parent_id):
3670
raise transform.OrphaningError(tt.final_name(orphan_id),
3671
tt.final_name(parent_id))
3672
transform.orphaning_registry.register('bogus', bogus_orphan,
3673
'Raise an error when orphaning')
3674
wt = self.make_branch_and_tree('.')
3675
self._set_orphan_policy(wt, 'bogus')
3676
tt, orphan_tid = self._prepare_orphan(wt)
3677
remaining_conflicts = resolve_conflicts(tt)
3678
self.assertLength(1, remaining_conflicts)
3679
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3680
remaining_conflicts.pop())
3682
def test_unknown_orphan_policy(self):
3683
wt = self.make_branch_and_tree('.')
3684
# Set a fictional policy nobody ever implemented
3685
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3686
tt, orphan_tid = self._prepare_orphan(wt)
3689
warnings.append(args[0] % args[1:])
3690
self.overrideAttr(trace, 'warning', warning)
3691
remaining_conflicts = resolve_conflicts(tt)
3692
# We fallback to the default policy which create a conflict
3693
self.assertLength(1, remaining_conflicts)
3694
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3695
remaining_conflicts.pop())
3696
self.assertLength(1, warnings)
3697
self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3700
class TestTransformHooks(tests.TestCaseWithTransport):
3703
super(TestTransformHooks, self).setUp()
3704
self.wt = self.make_branch_and_tree('.')
3707
def get_transform(self):
3708
transform = TreeTransform(self.wt)
3709
self.addCleanup(transform.finalize)
3710
return transform, transform.root
3712
def test_pre_commit_hooks(self):
3714
def record_pre_transform(tree, tt):
3715
calls.append((tree, tt))
3716
MutableTree.hooks.install_named_hook('pre_transform',
3717
record_pre_transform, "Pre transform")
3718
transform, root = self.get_transform()
3719
old_root_id = transform.tree_file_id(root)
3721
self.assertEqual(old_root_id, self.wt.get_root_id())
3722
self.assertEqual([(self.wt, transform)], calls)
3724
def test_post_commit_hooks(self):
3726
def record_post_transform(tree, tt):
3727
calls.append((tree, tt))
3728
MutableTree.hooks.install_named_hook('post_transform',
3729
record_post_transform, "Post transform")
3730
transform, root = self.get_transform()
3731
old_root_id = transform.tree_file_id(root)
3733
self.assertEqual(old_root_id, self.wt.get_root_id())
3734
self.assertEqual([(self.wt, transform)], calls)
3737
class TestLinkTree(tests.TestCaseWithTransport):
3739
_test_needs_features = [HardlinkFeature]
3742
tests.TestCaseWithTransport.setUp(self)
3743
self.parent_tree = self.make_branch_and_tree('parent')
3744
self.parent_tree.lock_write()
3745
self.addCleanup(self.parent_tree.unlock)
3746
self.build_tree_contents([('parent/foo', b'bar')])
3747
self.parent_tree.add('foo')
3748
self.parent_tree.commit('added foo')
3749
child_controldir = self.parent_tree.controldir.sprout('child')
3750
self.child_tree = child_controldir.open_workingtree()
3752
def hardlinked(self):
3753
parent_stat = os.lstat(self.parent_tree.abspath('foo'))
3754
child_stat = os.lstat(self.child_tree.abspath('foo'))
3755
return parent_stat.st_ino == child_stat.st_ino
3757
def test_link_fails_if_modified(self):
3758
"""If the file to be linked has modified text, don't link."""
3759
self.build_tree_contents([('child/foo', b'baz')])
3760
transform.link_tree(self.child_tree, self.parent_tree)
3761
self.assertFalse(self.hardlinked())
3763
def test_link_fails_if_execute_bit_changed(self):
3764
"""If the file to be linked has modified execute bit, don't link."""
3765
tt = TreeTransform(self.child_tree)
3767
trans_id = tt.trans_id_tree_path('foo')
3768
tt.set_executability(True, trans_id)
3772
transform.link_tree(self.child_tree, self.parent_tree)
3773
self.assertFalse(self.hardlinked())
3775
def test_link_succeeds_if_unmodified(self):
3776
"""If the file to be linked is unmodified, link"""
3777
transform.link_tree(self.child_tree, self.parent_tree)
3778
self.assertTrue(self.hardlinked())
added
removed
breezy/tests/test_transform.py
