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