123
140
imaginary_id = transform.trans_id_tree_path('imaginary')
124
141
imaginary_id2 = transform.trans_id_tree_path('imaginary/')
125
142
self.assertEqual(imaginary_id, imaginary_id2)
126
self.assertEqual(transform.get_tree_parent(imaginary_id), root)
127
self.assertEqual(transform.final_kind(root), 'directory')
128
self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
143
self.assertEqual(root, transform.get_tree_parent(imaginary_id))
144
self.assertEqual('directory', transform.final_kind(root))
145
self.assertEqual(self.wt.path2id(''), transform.final_file_id(root))
129
146
trans_id = transform.create_path('name', root)
130
147
self.assertIs(transform.final_file_id(trans_id), None)
131
self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
132
transform.create_file('contents', trans_id)
148
self.assertIs(None, transform.final_kind(trans_id))
149
transform.create_file([b'contents'], trans_id)
133
150
transform.set_executability(True, trans_id)
134
transform.version_file('my_pretties', trans_id)
151
transform.version_file(b'my_pretties', trans_id)
135
152
self.assertRaises(DuplicateKey, transform.version_file,
136
'my_pretties', trans_id)
137
self.assertEqual(transform.final_file_id(trans_id), 'my_pretties')
153
b'my_pretties', trans_id)
154
self.assertEqual(transform.final_file_id(trans_id), b'my_pretties')
138
155
self.assertEqual(transform.final_parent(trans_id), root)
139
156
self.assertIs(transform.final_parent(root), ROOT_PARENT)
140
157
self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
141
158
oz_id = transform.create_path('oz', root)
142
159
transform.create_directory(oz_id)
143
transform.version_file('ozzie', oz_id)
160
transform.version_file(b'ozzie', oz_id)
144
161
trans_id2 = transform.create_path('name2', root)
145
transform.create_file('contents', trans_id2)
162
transform.create_file([b'contents'], trans_id2)
146
163
transform.set_executability(False, trans_id2)
147
transform.version_file('my_pretties2', trans_id2)
164
transform.version_file(b'my_pretties2', trans_id2)
148
165
modified_paths = transform.apply().modified_paths
149
self.assertEqual('contents', self.wt.get_file_byname('name').read())
150
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
151
self.assertIs(self.wt.is_executable('my_pretties'), True)
152
self.assertIs(self.wt.is_executable('my_pretties2'), False)
166
with self.wt.get_file('name') as f:
167
self.assertEqual(b'contents', f.read())
168
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
169
self.assertIs(self.wt.is_executable('name'), True)
170
self.assertIs(self.wt.is_executable('name2'), False)
153
171
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
154
172
self.assertEqual(len(modified_paths), 3)
155
tree_mod_paths = [self.wt.id2abspath(f) for f in
156
('ozzie', 'my_pretties', 'my_pretties2')]
173
tree_mod_paths = [self.wt.abspath(self.wt.id2path(f)) for f in
174
(b'ozzie', b'my_pretties', b'my_pretties2')]
157
175
self.assertSubset(tree_mod_paths, modified_paths)
158
176
# is it safe to finalize repeatedly?
159
177
transform.finalize()
160
178
transform.finalize()
180
def test_apply_informs_tree_of_observed_sha1(self):
181
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
182
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
185
orig = self.wt._observed_sha1
187
def _observed_sha1(*args):
190
self.wt._observed_sha1 = _observed_sha1
192
self.assertEqual([('file1', trans._observed_sha1s[trans_id])],
195
def test_create_file_caches_sha1(self):
196
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
197
trans_id = trans.create_path('file1', root)
198
trans.create_file(contents, trans_id, sha1=sha1)
199
st_val = osutils.lstat(trans._limbo_name(trans_id))
200
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
201
self.assertEqual(o_sha1, sha1)
202
self.assertEqualStat(o_st_val, st_val)
204
def test__apply_insertions_updates_sha1(self):
205
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
206
trans_id = trans.create_path('file1', root)
207
trans.create_file(contents, trans_id, sha1=sha1)
208
st_val = osutils.lstat(trans._limbo_name(trans_id))
209
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
210
self.assertEqual(o_sha1, sha1)
211
self.assertEqualStat(o_st_val, st_val)
212
creation_mtime = trans._creation_mtime + 10.0
213
# We fake a time difference from when the file was created until now it
214
# is being renamed by using os.utime. Note that the change we actually
215
# want to see is the real ctime change from 'os.rename()', but as long
216
# as we observe a new stat value, we should be fine.
217
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
219
new_st_val = osutils.lstat(self.wt.abspath('file1'))
220
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
221
self.assertEqual(o_sha1, sha1)
222
self.assertEqualStat(o_st_val, new_st_val)
223
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
225
def test_new_file_caches_sha1(self):
226
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
227
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
229
st_val = osutils.lstat(trans._limbo_name(trans_id))
230
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
231
self.assertEqual(o_sha1, sha1)
232
self.assertEqualStat(o_st_val, st_val)
234
def test_cancel_creation_removes_observed_sha1(self):
235
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
236
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
238
self.assertTrue(trans_id in trans._observed_sha1s)
239
trans.cancel_creation(trans_id)
240
self.assertFalse(trans_id in trans._observed_sha1s)
162
242
def test_create_files_same_timestamp(self):
163
243
transform, root = self.get_transform()
164
244
self.wt.lock_tree_write()
166
246
# Roll back the clock, so that we know everything is being set to the
168
248
transform._creation_mtime = creation_mtime = time.time() - 20.0
169
transform.create_file('content-one',
249
transform.create_file([b'content-one'],
170
250
transform.create_path('one', root))
171
time.sleep(1) # *ugly*
172
transform.create_file('content-two',
251
time.sleep(1) # *ugly*
252
transform.create_file([b'content-two'],
173
253
transform.create_path('two', root))
174
254
transform.apply()
175
fo, st1 = self.wt.get_file_with_stat(None, path='one', filtered=False)
255
fo, st1 = self.wt.get_file_with_stat('one', filtered=False)
177
fo, st2 = self.wt.get_file_with_stat(None, path='two', filtered=False)
257
fo, st2 = self.wt.get_file_with_stat('two', filtered=False)
179
259
# We only guarantee 2s resolution
180
self.assertTrue(abs(creation_mtime - st1.st_mtime) < 2.0,
261
abs(creation_mtime - st1.st_mtime) < 2.0,
181
262
"%s != %s within 2 seconds" % (creation_mtime, st1.st_mtime))
182
263
# But if we have more than that, all files should get the same result
183
264
self.assertEqual(st1.st_mtime, st2.st_mtime)
185
266
def test_change_root_id(self):
186
267
transform, root = self.get_transform()
187
self.assertNotEqual('new-root-id', self.wt.get_root_id())
188
transform.new_directory('', ROOT_PARENT, 'new-root-id')
268
self.assertNotEqual(b'new-root-id', self.wt.path2id(''))
269
transform.new_directory('', ROOT_PARENT, b'new-root-id')
189
270
transform.delete_contents(root)
190
271
transform.unversion_file(root)
191
272
transform.fixup_new_roots()
192
273
transform.apply()
193
self.assertEqual('new-root-id', self.wt.get_root_id())
274
self.assertEqual(b'new-root-id', self.wt.path2id(''))
195
276
def test_change_root_id_add_files(self):
196
277
transform, root = self.get_transform()
197
self.assertNotEqual('new-root-id', self.wt.get_root_id())
198
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
199
transform.new_file('file', new_trans_id, ['new-contents\n'],
278
self.assertNotEqual(b'new-root-id', self.wt.path2id(''))
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'],
201
282
transform.delete_contents(root)
202
283
transform.unversion_file(root)
203
284
transform.fixup_new_roots()
204
285
transform.apply()
205
self.assertEqual('new-root-id', self.wt.get_root_id())
206
self.assertEqual('new-file-id', self.wt.path2id('file'))
207
self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
286
self.assertEqual(b'new-root-id', self.wt.path2id(''))
287
self.assertEqual(b'new-file-id', self.wt.path2id('file'))
288
self.assertFileEqual(b'new-contents\n', self.wt.abspath('file'))
209
290
def test_add_two_roots(self):
210
291
transform, root = self.get_transform()
211
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
212
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
213
self.assertRaises(ValueError, transform.fixup_new_roots)
292
transform.new_directory('', ROOT_PARENT, b'new-root-id')
293
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
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.path2id('')
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.path2id(''))
327
transform, root = self.get_transform()
328
transform.new_directory('', ROOT_PARENT, b'new-root-id')
329
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.path2id(''))
215
358
def test_hardlink(self):
216
359
self.requireFeature(HardlinkFeature)
217
360
transform, root = self.get_transform()
218
transform.new_file('file1', root, 'contents')
361
transform.new_file('file1', root, [b'contents'])
219
362
transform.apply()
220
363
target = self.make_branch_and_tree('target')
221
364
target_transform = TreeTransform(target)
222
365
trans_id = target_transform.create_path('file1', target_transform.root)
223
366
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
224
367
target_transform.apply()
225
self.failUnlessExists('target/file1')
368
self.assertPathExists('target/file1')
226
369
source_stat = os.stat(self.wt.abspath('file1'))
227
370
target_stat = os.stat('target/file1')
228
371
self.assertEqual(source_stat, target_stat)
231
374
transform, root = self.get_transform()
232
375
self.wt.lock_tree_write()
233
376
self.addCleanup(self.wt.unlock)
234
trans_id = transform.new_file('name', root, 'contents',
236
oz = transform.new_directory('oz', root, 'oz-id')
237
dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
238
toto = transform.new_file('toto', dorothy, 'toto-contents',
377
transform.new_file('name', root, [b'contents'], b'my_pretties', True)
378
oz = transform.new_directory('oz', root, b'oz-id')
379
dorothy = transform.new_directory('dorothy', oz, b'dorothy-id')
380
transform.new_file('toto', dorothy, [b'toto-contents'], b'toto-id',
241
383
self.assertEqual(len(transform.find_conflicts()), 0)
242
384
transform.apply()
243
385
self.assertRaises(ReusingTransform, transform.find_conflicts)
244
self.assertEqual('contents', file(self.wt.abspath('name')).read())
245
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
246
self.assertIs(self.wt.is_executable('my_pretties'), True)
247
self.assertEqual(self.wt.path2id('oz'), 'oz-id')
248
self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
249
self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
386
with open(self.wt.abspath('name'), 'r') as f:
387
self.assertEqual('contents', f.read())
388
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
389
self.assertIs(self.wt.is_executable('name'), True)
390
self.assertEqual(self.wt.path2id('oz'), b'oz-id')
391
self.assertEqual(self.wt.path2id('oz/dorothy'), b'dorothy-id')
392
self.assertEqual(self.wt.path2id('oz/dorothy/toto'), b'toto-id')
251
self.assertEqual('toto-contents',
252
self.wt.get_file_byname('oz/dorothy/toto').read())
253
self.assertIs(self.wt.is_executable('toto-id'), False)
394
self.assertEqual(b'toto-contents',
395
self.wt.get_file('oz/dorothy/toto').read())
396
self.assertIs(self.wt.is_executable('oz/dorothy/toto'), False)
255
398
def test_tree_reference(self):
256
399
transform, root = self.get_transform()
257
400
tree = transform._tree
258
trans_id = transform.new_directory('reference', root, 'subtree-id')
259
transform.set_tree_reference('subtree-revision', trans_id)
401
trans_id = transform.new_directory('reference', root, b'subtree-id')
402
transform.set_tree_reference(b'subtree-revision', trans_id)
260
403
transform.apply()
262
405
self.addCleanup(tree.unlock)
263
self.assertEqual('subtree-revision',
264
tree.inventory['subtree-id'].reference_revision)
408
tree.root_inventory.get_entry(b'subtree-id').reference_revision)
266
410
def test_conflicts(self):
267
411
transform, root = self.get_transform()
268
trans_id = transform.new_file('name', root, 'contents',
412
trans_id = transform.new_file('name', root, [b'contents'],
270
414
self.assertEqual(len(transform.find_conflicts()), 0)
271
trans_id2 = transform.new_file('name', root, 'Crontents', 'toto')
415
trans_id2 = transform.new_file('name', root, [b'Crontents'], b'toto')
272
416
self.assertEqual(transform.find_conflicts(),
273
417
[('duplicate', trans_id, trans_id2, 'name')])
274
418
self.assertRaises(MalformedTransform, transform.apply)
485
630
create_tree, root = self.get_transform()
487
632
root = create_tree.root
488
create_tree.new_file('name1', root, 'hello1', 'name1')
489
create_tree.new_file('name2', root, 'hello2', 'name2')
490
ddir = create_tree.new_directory('dying_directory', root, 'ddir')
491
create_tree.new_file('dying_file', ddir, 'goodbye1', 'dfile')
492
create_tree.new_file('moving_file', ddir, 'later1', 'mfile')
493
create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
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')
494
639
create_tree.apply()
496
mangle_tree,root = self.get_transform()
641
mangle_tree, root = self.get_transform()
497
642
root = mangle_tree.root
499
name1 = mangle_tree.trans_id_tree_file_id('name1')
500
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')
501
646
mangle_tree.adjust_path('name2', root, name1)
502
647
mangle_tree.adjust_path('name1', root, name2)
504
#tests for deleting parent directories
505
ddir = mangle_tree.trans_id_tree_file_id('ddir')
649
# tests for deleting parent directories
650
ddir = mangle_tree.trans_id_tree_path('dying_directory')
506
651
mangle_tree.delete_contents(ddir)
507
dfile = mangle_tree.trans_id_tree_file_id('dfile')
652
dfile = mangle_tree.trans_id_tree_path('dying_directory/dying_file')
508
653
mangle_tree.delete_versioned(dfile)
509
654
mangle_tree.unversion_file(dfile)
510
mfile = mangle_tree.trans_id_tree_file_id('mfile')
655
mfile = mangle_tree.trans_id_tree_path('dying_directory/moving_file')
511
656
mangle_tree.adjust_path('mfile', root, mfile)
513
#tests for adding parent directories
514
newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
515
mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
658
# tests for adding parent directories
659
newdir = mangle_tree.new_directory('new_directory', root, b'newdir')
660
mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
516
661
mangle_tree.adjust_path('mfile2', newdir, mfile2)
517
mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
518
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
662
mangle_tree.new_file('newfile', newdir, [b'hello3'], b'dfile')
663
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
519
664
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
520
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
665
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
521
666
mangle_tree.apply()
522
self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
523
self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
524
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
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'))
525
672
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
526
self.assertEqual(file(mfile2_path).read(), 'later2')
527
self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
528
self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
529
newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
530
self.assertEqual(file(newfile_path).read(), 'hello3')
531
self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
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')
532
681
self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
533
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
682
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
535
684
def test_both_rename(self):
536
create_tree,root = self.get_transform()
537
newdir = create_tree.new_directory('selftest', root, 'selftest-id')
538
create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
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, [
688
b'hello1'], b'blackbox-id')
539
689
create_tree.apply()
540
mangle_tree,root = self.get_transform()
541
selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
542
blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
690
mangle_tree, root = self.get_transform()
691
selftest = mangle_tree.trans_id_tree_path('selftest')
692
blackbox = mangle_tree.trans_id_tree_path('selftest/blackbox.py')
543
693
mangle_tree.adjust_path('test', root, selftest)
544
694
mangle_tree.adjust_path('test_too_much', root, selftest)
545
695
mangle_tree.set_executability(True, blackbox)
546
696
mangle_tree.apply()
548
698
def test_both_rename2(self):
549
create_tree,root = self.get_transform()
550
bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
551
tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
552
blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
553
create_tree.new_file('test_too_much.py', blackbox, 'hello1',
699
create_tree, root = self.get_transform()
700
breezy = create_tree.new_directory('breezy', root, b'breezy-id')
701
tests = create_tree.new_directory('tests', breezy, b'tests-id')
702
blackbox = create_tree.new_directory('blackbox', tests, b'blackbox-id')
703
create_tree.new_file('test_too_much.py', blackbox, [b'hello1'],
555
705
create_tree.apply()
556
mangle_tree,root = self.get_transform()
557
bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
558
tests = mangle_tree.trans_id_tree_file_id('tests-id')
559
test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
560
mangle_tree.adjust_path('selftest', bzrlib, tests)
706
mangle_tree, root = self.get_transform()
707
breezy = mangle_tree.trans_id_tree_path('breezy')
708
tests = mangle_tree.trans_id_tree_path('breezy/tests')
709
test_too_much = mangle_tree.trans_id_tree_path(
710
'breezy/tests/blackbox/test_too_much.py')
711
mangle_tree.adjust_path('selftest', breezy, tests)
561
712
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
562
713
mangle_tree.set_executability(True, test_too_much)
563
714
mangle_tree.apply()
565
716
def test_both_rename3(self):
566
create_tree,root = self.get_transform()
567
tests = create_tree.new_directory('tests', root, 'tests-id')
568
create_tree.new_file('test_too_much.py', tests, 'hello1',
717
create_tree, root = self.get_transform()
718
tests = create_tree.new_directory('tests', root, b'tests-id')
719
create_tree.new_file('test_too_much.py', tests, [b'hello1'],
570
721
create_tree.apply()
571
mangle_tree,root = self.get_transform()
572
tests = mangle_tree.trans_id_tree_file_id('tests-id')
573
test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
722
mangle_tree, root = self.get_transform()
723
tests = mangle_tree.trans_id_tree_path('tests')
724
test_too_much = mangle_tree.trans_id_tree_path(
725
'tests/test_too_much.py')
574
726
mangle_tree.adjust_path('selftest', root, tests)
575
727
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
576
728
mangle_tree.set_executability(True, test_too_much)
644
796
'wizard2', 'behind_curtain')
646
798
def test_symlinks_unicode(self):
647
self.requireFeature(tests.UnicodeFilenameFeature)
799
self.requireFeature(features.UnicodeFilenameFeature)
648
800
self._test_symlinks(u'\N{Euro Sign}wizard',
649
801
u'wizard-targ\N{Euro Sign}t',
650
802
u'\N{Euro Sign}wizard2',
651
803
u'b\N{Euro Sign}hind_curtain')
653
def test_unable_create_symlink(self):
805
def test_unsupported_symlink_no_conflict(self):
655
807
wt = self.make_branch_and_tree('.')
656
tt = TreeTransform(wt) # TreeTransform obtains write lock
658
tt.new_symlink('foo', tt.root, 'bar')
808
tt = TreeTransform(wt)
809
self.addCleanup(tt.finalize)
810
tt.new_symlink('foo', tt.root, 'bar')
811
result = tt.find_conflicts()
812
self.assertEqual([], result)
662
813
os_symlink = getattr(os, 'symlink', None)
663
814
os.symlink = None
665
err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
667
"Unable to create symlink 'foo' on this platform",
671
819
os.symlink = os_symlink
673
821
def get_conflicted(self):
674
create,root = self.get_transform()
675
create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
676
oz = create.new_directory('oz', root, 'oz-id')
677
create.new_directory('emeraldcity', oz, 'emerald-id')
822
create, root = self.get_transform()
823
create.new_file('dorothy', root, [b'dorothy'], b'dorothy-id')
824
oz = create.new_directory('oz', root, b'oz-id')
825
create.new_directory('emeraldcity', oz, b'emerald-id')
679
conflicts,root = self.get_transform()
827
conflicts, root = self.get_transform()
680
828
# set up duplicate entry, duplicate id
681
new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
683
old_dorothy = conflicts.trans_id_tree_file_id('dorothy-id')
684
oz = conflicts.trans_id_tree_file_id('oz-id')
829
new_dorothy = conflicts.new_file('dorothy', root, [b'dorothy'],
831
old_dorothy = conflicts.trans_id_tree_path('dorothy')
832
oz = conflicts.trans_id_tree_path('oz')
685
833
# set up DeletedParent parent conflict
686
834
conflicts.delete_versioned(oz)
687
emerald = conflicts.trans_id_tree_file_id('emerald-id')
835
emerald = conflicts.trans_id_tree_path('oz/emeraldcity')
688
836
# set up MissingParent conflict
689
munchkincity = conflicts.trans_id_file_id('munchkincity-id')
837
munchkincity = conflicts.trans_id_file_id(b'munchkincity-id')
690
838
conflicts.adjust_path('munchkincity', root, munchkincity)
691
conflicts.new_directory('auntem', munchkincity, 'auntem-id')
839
conflicts.new_directory('auntem', munchkincity, b'auntem-id')
692
840
# set up parent loop
693
841
conflicts.adjust_path('emeraldcity', emerald, emerald)
694
842
return conflicts, emerald, oz, old_dorothy, new_dorothy
775
925
def test_resolve_conflicts_wrong_existing_parent_kind(self):
776
926
tt = self.prepare_wrong_parent_kind()
777
927
raw_conflicts = resolve_conflicts(tt)
778
self.assertEqual(set([('non-directory parent', 'Created directory',
779
'new-3')]), raw_conflicts)
928
self.assertEqual({('non-directory parent', 'Created directory',
929
'new-3')}, raw_conflicts)
780
930
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
781
931
self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
782
'parent-id')], cooked_conflicts)
932
b'parent-id')], cooked_conflicts)
784
self.assertEqual(None, self.wt.path2id('parent'))
785
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
934
self.assertFalse(self.wt.is_versioned('parent'))
935
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
787
937
def test_resolve_conflicts_wrong_new_parent_kind(self):
788
938
tt, root = self.get_transform()
789
parent_id = tt.new_directory('parent', root, 'parent-id')
790
tt.new_file('child,', parent_id, 'contents2', 'file-id')
939
parent_id = tt.new_directory('parent', root, b'parent-id')
940
tt.new_file('child,', parent_id, [b'contents2'], b'file-id')
792
942
tt, root = self.get_transform()
793
parent_id = tt.trans_id_file_id('parent-id')
943
parent_id = tt.trans_id_file_id(b'parent-id')
794
944
tt.delete_contents(parent_id)
795
tt.create_file('contents', parent_id)
945
tt.create_file([b'contents'], parent_id)
796
946
raw_conflicts = resolve_conflicts(tt)
797
self.assertEqual(set([('non-directory parent', 'Created directory',
798
'new-3')]), raw_conflicts)
947
self.assertEqual({('non-directory parent', 'Created directory',
948
'new-3')}, raw_conflicts)
800
self.assertEqual(None, self.wt.path2id('parent'))
801
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
950
self.assertFalse(self.wt.is_versioned('parent'))
951
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
803
953
def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
804
954
tt, root = self.get_transform()
805
955
parent_id = tt.new_directory('parent', root)
806
tt.new_file('child,', parent_id, 'contents2')
956
tt.new_file('child,', parent_id, [b'contents2'])
808
958
tt, root = self.get_transform()
809
959
parent_id = tt.trans_id_tree_path('parent')
810
960
tt.delete_contents(parent_id)
811
tt.create_file('contents', parent_id)
961
tt.create_file([b'contents'], parent_id)
812
962
resolve_conflicts(tt)
814
self.assertIs(None, self.wt.path2id('parent'))
815
self.assertIs(None, self.wt.path2id('parent.new'))
964
self.assertFalse(self.wt.is_versioned('parent'))
965
self.assertFalse(self.wt.is_versioned('parent.new'))
967
def test_resolve_conflicts_missing_parent(self):
968
wt = self.make_branch_and_tree('.')
969
tt = TreeTransform(wt)
970
self.addCleanup(tt.finalize)
971
parent = tt.trans_id_file_id(b'parent-id')
972
tt.new_file('file', parent, [b'Contents'])
973
raw_conflicts = resolve_conflicts(tt)
974
# Since the directory doesn't exist it's seen as 'missing'. So
975
# 'resolve_conflicts' create a conflict asking for it to be created.
976
self.assertLength(1, raw_conflicts)
977
self.assertEqual(('missing parent', 'Created directory', 'new-1'),
979
# apply fail since the missing directory doesn't exist
980
self.assertRaises(errors.NoFinalPath, tt.apply)
817
982
def test_moving_versioned_directories(self):
818
983
create, root = self.get_transform()
819
kansas = create.new_directory('kansas', root, 'kansas-id')
820
create.new_directory('house', kansas, 'house-id')
821
create.new_directory('oz', root, 'oz-id')
984
kansas = create.new_directory('kansas', root, b'kansas-id')
985
create.new_directory('house', kansas, b'house-id')
986
create.new_directory('oz', root, b'oz-id')
823
988
cyclone, root = self.get_transform()
824
oz = cyclone.trans_id_tree_file_id('oz-id')
825
house = cyclone.trans_id_tree_file_id('house-id')
989
oz = cyclone.trans_id_tree_path('oz')
990
house = cyclone.trans_id_tree_path('house')
826
991
cyclone.adjust_path('house', oz, house)
829
994
def test_moving_root(self):
830
995
create, root = self.get_transform()
831
fun = create.new_directory('fun', root, 'fun-id')
832
create.new_directory('sun', root, 'sun-id')
833
create.new_directory('moon', root, 'moon')
996
fun = create.new_directory('fun', root, b'fun-id')
997
create.new_directory('sun', root, b'sun-id')
998
create.new_directory('moon', root, b'moon')
835
1000
transform, root = self.get_transform()
836
1001
transform.adjust_root_path('oldroot', fun)
837
1002
new_root = transform.trans_id_tree_path('')
838
transform.version_file('new-root', new_root)
1003
transform.version_file(b'new-root', new_root)
839
1004
transform.apply()
841
1006
def test_renames(self):
842
1007
create, root = self.get_transform()
843
old = create.new_directory('old-parent', root, 'old-id')
844
intermediate = create.new_directory('intermediate', old, 'im-id')
845
myfile = create.new_file('myfile', intermediate, 'myfile-text',
1008
old = create.new_directory('old-parent', root, b'old-id')
1009
intermediate = create.new_directory('intermediate', old, b'im-id')
1010
myfile = create.new_file('myfile', intermediate, [b'myfile-text'],
848
1013
rename, root = self.get_transform()
849
old = rename.trans_id_file_id('old-id')
1014
old = rename.trans_id_file_id(b'old-id')
850
1015
rename.adjust_path('new', root, old)
851
myfile = rename.trans_id_file_id('myfile-id')
1016
myfile = rename.trans_id_file_id(b'myfile-id')
852
1017
rename.set_executability(True, myfile)
1020
def test_rename_fails(self):
1021
self.requireFeature(features.not_running_as_root)
1022
# see https://bugs.launchpad.net/bzr/+bug/491763
1023
create, root_id = self.get_transform()
1024
create.new_directory('first-dir', root_id, b'first-id')
1025
create.new_file('myfile', root_id, [b'myfile-text'], b'myfile-id')
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")
855
1057
def test_set_executability_order(self):
856
1058
"""Ensure that executability behaves the same, no matter what order.
858
1060
- create file and set executability simultaneously
859
1061
- create file and set executability afterward
860
- unsetting the executability of a file whose executability has not been
1062
- unsetting the executability of a file whose executability has not
861
1064
declared should throw an exception (this may happen when a
862
1065
merge attempts to create a file with a duplicate ID)
925
1130
self.assertEqual([bar1_abspath], stat_paths)
927
1132
def test_iter_changes(self):
928
self.wt.set_root_id('eert_toor')
1133
self.wt.set_root_id(b'eert_toor')
929
1134
transform, root = self.get_transform()
930
transform.new_file('old', root, 'blah', 'id-1', True)
1135
transform.new_file('old', root, [b'blah'], b'id-1', True)
931
1136
transform.apply()
932
1137
transform, root = self.get_transform()
934
1139
self.assertEqual([], list(transform.iter_changes()))
935
old = transform.trans_id_tree_file_id('id-1')
1140
old = transform.trans_id_tree_path('old')
936
1141
transform.unversion_file(old)
937
self.assertEqual([('id-1', ('old', None), False, (True, False),
938
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
939
(True, True))], list(transform.iter_changes()))
940
transform.new_directory('new', root, 'id-1')
941
self.assertEqual([('id-1', ('old', 'new'), True, (True, True),
942
('eert_toor', 'eert_toor'), ('old', 'new'),
943
('file', 'directory'),
944
(True, False))], list(transform.iter_changes()))
1142
self.assertEqual([(b'id-1', ('old', None), False, (True, False),
1143
(b'eert_toor', b'eert_toor'),
1144
('old', 'old'), ('file', 'file'),
1145
(True, True), False)],
1146
list(transform.iter_changes()))
1147
transform.new_directory('new', root, b'id-1')
1148
self.assertEqual([(b'id-1', ('old', 'new'), True, (True, True),
1149
(b'eert_toor', b'eert_toor'), ('old', 'new'),
1150
('file', 'directory'),
1151
(True, False), False)],
1152
list(transform.iter_changes()))
946
1154
transform.finalize()
948
1156
def test_iter_changes_new(self):
949
self.wt.set_root_id('eert_toor')
1157
self.wt.set_root_id(b'eert_toor')
950
1158
transform, root = self.get_transform()
951
transform.new_file('old', root, 'blah')
1159
transform.new_file('old', root, [b'blah'])
952
1160
transform.apply()
953
1161
transform, root = self.get_transform()
955
1163
old = transform.trans_id_tree_path('old')
956
transform.version_file('id-1', old)
957
self.assertEqual([('id-1', (None, 'old'), False, (False, True),
958
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
959
(False, False))], list(transform.iter_changes()))
1164
transform.version_file(b'id-1', old)
1165
self.assertEqual([(b'id-1', (None, 'old'), False, (False, True),
1166
(b'eert_toor', b'eert_toor'),
1167
('old', 'old'), ('file', 'file'),
1168
(False, False), False)],
1169
list(transform.iter_changes()))
961
1171
transform.finalize()
963
1173
def test_iter_changes_modifications(self):
964
self.wt.set_root_id('eert_toor')
1174
self.wt.set_root_id(b'eert_toor')
965
1175
transform, root = self.get_transform()
966
transform.new_file('old', root, 'blah', 'id-1')
967
transform.new_file('new', root, 'blah')
968
transform.new_directory('subdir', root, 'subdir-id')
1176
transform.new_file('old', root, [b'blah'], b'id-1')
1177
transform.new_file('new', root, [b'blah'])
1178
transform.new_directory('subdir', root, b'subdir-id')
969
1179
transform.apply()
970
1180
transform, root = self.get_transform()
972
1182
old = transform.trans_id_tree_path('old')
973
subdir = transform.trans_id_tree_file_id('subdir-id')
1183
subdir = transform.trans_id_tree_path('subdir')
974
1184
new = transform.trans_id_tree_path('new')
975
1185
self.assertEqual([], list(transform.iter_changes()))
978
1188
transform.delete_contents(old)
979
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
980
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', None),
981
(False, False))], list(transform.iter_changes()))
1189
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1190
(b'eert_toor', b'eert_toor'),
1191
('old', 'old'), ('file', None),
1192
(False, False), False)],
1193
list(transform.iter_changes()))
984
transform.create_file('blah', old)
985
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
986
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
987
(False, False))], list(transform.iter_changes()))
1196
transform.create_file([b'blah'], old)
1197
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1198
(b'eert_toor', b'eert_toor'),
1199
('old', 'old'), ('file', 'file'),
1200
(False, False), False)],
1201
list(transform.iter_changes()))
988
1202
transform.cancel_deletion(old)
989
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
990
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
991
(False, False))], list(transform.iter_changes()))
1203
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1204
(b'eert_toor', b'eert_toor'),
1205
('old', 'old'), ('file', 'file'),
1206
(False, False), False)],
1207
list(transform.iter_changes()))
992
1208
transform.cancel_creation(old)
994
1210
# move file_id to a different file
995
1211
self.assertEqual([], list(transform.iter_changes()))
996
1212
transform.unversion_file(old)
997
transform.version_file('id-1', new)
1213
transform.version_file(b'id-1', new)
998
1214
transform.adjust_path('old', root, new)
999
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
1000
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1001
(False, False))], list(transform.iter_changes()))
1215
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1216
(b'eert_toor', b'eert_toor'),
1217
('old', 'old'), ('file', 'file'),
1218
(False, False), False)],
1219
list(transform.iter_changes()))
1002
1220
transform.cancel_versioning(new)
1003
1221
transform._removed_id = set()
1006
1224
self.assertEqual([], list(transform.iter_changes()))
1007
1225
transform.set_executability(True, old)
1008
self.assertEqual([('id-1', ('old', 'old'), False, (True, True),
1009
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
1010
(False, True))], list(transform.iter_changes()))
1226
self.assertEqual([(b'id-1', ('old', 'old'), False, (True, True),
1227
(b'eert_toor', b'eert_toor'),
1228
('old', 'old'), ('file', 'file'),
1229
(False, True), False)],
1230
list(transform.iter_changes()))
1011
1231
transform.set_executability(None, old)
1014
1234
self.assertEqual([], list(transform.iter_changes()))
1015
1235
transform.adjust_path('new', root, old)
1016
1236
transform._new_parent = {}
1017
self.assertEqual([('id-1', ('old', 'new'), False, (True, True),
1018
('eert_toor', 'eert_toor'), ('old', 'new'), ('file', 'file'),
1019
(False, False))], list(transform.iter_changes()))
1237
self.assertEqual([(b'id-1', ('old', 'new'), False, (True, True),
1238
(b'eert_toor', b'eert_toor'),
1239
('old', 'new'), ('file', 'file'),
1240
(False, False), False)],
1241
list(transform.iter_changes()))
1020
1242
transform._new_name = {}
1022
1244
# parent directory
1023
1245
self.assertEqual([], list(transform.iter_changes()))
1024
1246
transform.adjust_path('new', subdir, old)
1025
1247
transform._new_name = {}
1026
self.assertEqual([('id-1', ('old', 'subdir/old'), False,
1027
(True, True), ('eert_toor', 'subdir-id'), ('old', 'old'),
1028
('file', 'file'), (False, False))],
1029
list(transform.iter_changes()))
1248
self.assertEqual([(b'id-1', ('old', 'subdir/old'), False,
1249
(True, True), (b'eert_toor',
1250
b'subdir-id'), ('old', 'old'),
1251
('file', 'file'), (False, False), False)],
1252
list(transform.iter_changes()))
1030
1253
transform._new_path = {}
1033
1256
transform.finalize()
1035
1258
def test_iter_changes_modified_bleed(self):
1036
self.wt.set_root_id('eert_toor')
1259
self.wt.set_root_id(b'eert_toor')
1037
1260
"""Modified flag should not bleed from one change to another"""
1038
1261
# unfortunately, we have no guarantee that file1 (which is modified)
1039
1262
# will be applied before file2. And if it's applied after file2, it
1040
1263
# obviously can't bleed into file2's change output. But for now, it
1042
1265
transform, root = self.get_transform()
1043
transform.new_file('file1', root, 'blah', 'id-1')
1044
transform.new_file('file2', root, 'blah', 'id-2')
1266
transform.new_file('file1', root, [b'blah'], b'id-1')
1267
transform.new_file('file2', root, [b'blah'], b'id-2')
1045
1268
transform.apply()
1046
1269
transform, root = self.get_transform()
1048
transform.delete_contents(transform.trans_id_file_id('id-1'))
1271
transform.delete_contents(transform.trans_id_file_id(b'id-1'))
1049
1272
transform.set_executability(True,
1050
transform.trans_id_file_id('id-2'))
1051
self.assertEqual([('id-1', (u'file1', u'file1'), True, (True, True),
1052
('eert_toor', 'eert_toor'), ('file1', u'file1'),
1053
('file', None), (False, False)),
1054
('id-2', (u'file2', u'file2'), False, (True, True),
1055
('eert_toor', 'eert_toor'), ('file2', u'file2'),
1056
('file', 'file'), (False, True))],
1273
transform.trans_id_file_id(b'id-2'))
1275
[(b'id-1', (u'file1', u'file1'), True, (True, True),
1276
(b'eert_toor', b'eert_toor'), ('file1', u'file1'),
1277
('file', None), (False, False), False),
1278
(b'id-2', (u'file2', u'file2'), False, (True, True),
1279
(b'eert_toor', b'eert_toor'), ('file2', u'file2'),
1280
('file', 'file'), (False, True), False)],
1057
1281
list(transform.iter_changes()))
1059
1283
transform.finalize()
1061
1285
def test_iter_changes_move_missing(self):
1062
1286
"""Test moving ids with no files around"""
1063
self.wt.set_root_id('toor_eert')
1287
self.wt.set_root_id(b'toor_eert')
1064
1288
# Need two steps because versioning a non-existant file is a conflict.
1065
1289
transform, root = self.get_transform()
1066
transform.new_directory('floater', root, 'floater-id')
1290
transform.new_directory('floater', root, b'floater-id')
1067
1291
transform.apply()
1068
1292
transform, root = self.get_transform()
1069
1293
transform.delete_contents(transform.trans_id_tree_path('floater'))
1404
1643
self.build_tree(['baz'])
1405
1644
tt.create_hardlink("baz", foo_trans_id)
1407
self.failUnlessExists("foo")
1408
self.failUnlessExists("baz")
1646
self.assertPathExists("foo")
1647
self.assertPathExists("baz")
1410
1649
self.addCleanup(wt.unlock)
1411
self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1650
self.assertEqual(wt.kind("foo"), "file")
1414
1652
def test_no_final_path(self):
1415
1653
transform, root = self.get_transform()
1416
trans_id = transform.trans_id_file_id('foo')
1417
transform.create_file('bar', trans_id)
1654
trans_id = transform.trans_id_file_id(b'foo')
1655
transform.create_file([b'bar'], trans_id)
1418
1656
transform.cancel_creation(trans_id)
1419
1657
transform.apply()
1421
1659
def test_create_from_tree(self):
1422
1660
tree1 = self.make_branch_and_tree('tree1')
1423
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', 'baz')])
1424
tree1.add(['foo', 'bar'], ['foo-id', 'bar-id'])
1661
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', b'baz')])
1662
tree1.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
1425
1663
tree2 = self.make_branch_and_tree('tree2')
1426
1664
tt = TreeTransform(tree2)
1427
1665
foo_trans_id = tt.create_path('foo', tt.root)
1428
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1666
create_from_tree(tt, foo_trans_id, tree1, 'foo')
1429
1667
bar_trans_id = tt.create_path('bar', tt.root)
1430
create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
1668
create_from_tree(tt, bar_trans_id, tree1, 'bar')
1432
1670
self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1433
self.assertFileEqual('baz', 'tree2/bar')
1671
self.assertFileEqual(b'baz', 'tree2/bar')
1435
1673
def test_create_from_tree_bytes(self):
1436
1674
"""Provided lines are used instead of tree content."""
1437
1675
tree1 = self.make_branch_and_tree('tree1')
1438
self.build_tree_contents([('tree1/foo', 'bar'),])
1439
tree1.add('foo', 'foo-id')
1676
self.build_tree_contents([('tree1/foo', b'bar'), ])
1677
tree1.add('foo', b'foo-id')
1440
1678
tree2 = self.make_branch_and_tree('tree2')
1441
1679
tt = TreeTransform(tree2)
1442
1680
foo_trans_id = tt.create_path('foo', tt.root)
1443
create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
1681
create_from_tree(tt, foo_trans_id, tree1, 'foo', chunks=[b'qux'])
1445
self.assertFileEqual('qux', 'tree2/foo')
1683
self.assertFileEqual(b'qux', 'tree2/foo')
1447
1685
def test_create_from_tree_symlink(self):
1448
1686
self.requireFeature(SymlinkFeature)
1449
1687
tree1 = self.make_branch_and_tree('tree1')
1450
1688
os.symlink('bar', 'tree1/foo')
1451
tree1.add('foo', 'foo-id')
1689
tree1.add('foo', b'foo-id')
1452
1690
tt = TreeTransform(self.make_branch_and_tree('tree2'))
1453
1691
foo_trans_id = tt.create_path('foo', tt.root)
1454
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1692
create_from_tree(tt, foo_trans_id, tree1, 'foo')
1456
1694
self.assertEqual('bar', os.readlink('tree2/foo'))
1478
1748
def test_text_merge(self):
1479
1749
root_id = generate_ids.gen_root_id()
1480
1750
base = TransformGroup("base", root_id)
1481
base.tt.new_file('a', base.root, 'a\nb\nc\nd\be\n', 'a')
1482
base.tt.new_file('b', base.root, 'b1', 'b')
1483
base.tt.new_file('c', base.root, 'c', 'c')
1484
base.tt.new_file('d', base.root, 'd', 'd')
1485
base.tt.new_file('e', base.root, 'e', 'e')
1486
base.tt.new_file('f', base.root, 'f', 'f')
1487
base.tt.new_directory('g', base.root, 'g')
1488
base.tt.new_directory('h', base.root, 'h')
1751
base.tt.new_file('a', base.root, [b'a\nb\nc\nd\be\n'], b'a')
1752
base.tt.new_file('b', base.root, [b'b1'], b'b')
1753
base.tt.new_file('c', base.root, [b'c'], b'c')
1754
base.tt.new_file('d', base.root, [b'd'], b'd')
1755
base.tt.new_file('e', base.root, [b'e'], b'e')
1756
base.tt.new_file('f', base.root, [b'f'], b'f')
1757
base.tt.new_directory('g', base.root, b'g')
1758
base.tt.new_directory('h', base.root, b'h')
1489
1759
base.tt.apply()
1490
1760
other = TransformGroup("other", root_id)
1491
other.tt.new_file('a', other.root, 'y\nb\nc\nd\be\n', 'a')
1492
other.tt.new_file('b', other.root, 'b2', 'b')
1493
other.tt.new_file('c', other.root, 'c2', 'c')
1494
other.tt.new_file('d', other.root, 'd', 'd')
1495
other.tt.new_file('e', other.root, 'e2', 'e')
1496
other.tt.new_file('f', other.root, 'f', 'f')
1497
other.tt.new_file('g', other.root, 'g', 'g')
1498
other.tt.new_file('h', other.root, 'h\ni\nj\nk\n', 'h')
1499
other.tt.new_file('i', other.root, 'h\ni\nj\nk\n', 'i')
1761
other.tt.new_file('a', other.root, [b'y\nb\nc\nd\be\n'], b'a')
1762
other.tt.new_file('b', other.root, [b'b2'], b'b')
1763
other.tt.new_file('c', other.root, [b'c2'], b'c')
1764
other.tt.new_file('d', other.root, [b'd'], b'd')
1765
other.tt.new_file('e', other.root, [b'e2'], b'e')
1766
other.tt.new_file('f', other.root, [b'f'], b'f')
1767
other.tt.new_file('g', other.root, [b'g'], b'g')
1768
other.tt.new_file('h', other.root, [b'h\ni\nj\nk\n'], b'h')
1769
other.tt.new_file('i', other.root, [b'h\ni\nj\nk\n'], b'i')
1500
1770
other.tt.apply()
1501
1771
this = TransformGroup("this", root_id)
1502
this.tt.new_file('a', this.root, 'a\nb\nc\nd\bz\n', 'a')
1503
this.tt.new_file('b', this.root, 'b', 'b')
1504
this.tt.new_file('c', this.root, 'c', 'c')
1505
this.tt.new_file('d', this.root, 'd2', 'd')
1506
this.tt.new_file('e', this.root, 'e2', 'e')
1507
this.tt.new_file('f', this.root, 'f', 'f')
1508
this.tt.new_file('g', this.root, 'g', 'g')
1509
this.tt.new_file('h', this.root, '1\n2\n3\n4\n', 'h')
1510
this.tt.new_file('i', this.root, '1\n2\n3\n4\n', 'i')
1772
this.tt.new_file('a', this.root, [b'a\nb\nc\nd\bz\n'], b'a')
1773
this.tt.new_file('b', this.root, [b'b'], b'b')
1774
this.tt.new_file('c', this.root, [b'c'], b'c')
1775
this.tt.new_file('d', this.root, [b'd2'], b'd')
1776
this.tt.new_file('e', this.root, [b'e2'], b'e')
1777
this.tt.new_file('f', this.root, [b'f'], b'f')
1778
this.tt.new_file('g', this.root, [b'g'], b'g')
1779
this.tt.new_file('h', this.root, [b'1\n2\n3\n4\n'], b'h')
1780
this.tt.new_file('i', this.root, [b'1\n2\n3\n4\n'], b'i')
1511
1781
this.tt.apply()
1512
1782
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1514
1784
# textual merge
1515
self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
1785
with this.wt.get_file(this.wt.id2path(b'a')) as f:
1786
self.assertEqual(f.read(), b'y\nb\nc\nd\bz\n')
1516
1787
# three-way text conflict
1517
self.assertEqual(this.wt.get_file('b').read(),
1518
conflict_text('b', 'b2'))
1788
with this.wt.get_file(this.wt.id2path(b'b')) as f:
1789
self.assertEqual(f.read(), conflict_text(b'b', b'b2'))
1520
self.assertEqual(this.wt.get_file('c').read(), 'c2')
1791
self.assertEqual(this.wt.get_file(this.wt.id2path(b'c')).read(), b'c2')
1522
self.assertEqual(this.wt.get_file('d').read(), 'd2')
1793
self.assertEqual(this.wt.get_file(this.wt.id2path(b'd')).read(), b'd2')
1523
1794
# Ambigious clean merge
1524
self.assertEqual(this.wt.get_file('e').read(), 'e2')
1795
self.assertEqual(this.wt.get_file(this.wt.id2path(b'e')).read(), b'e2')
1526
self.assertEqual(this.wt.get_file('f').read(), 'f')
1797
self.assertEqual(this.wt.get_file(this.wt.id2path(b'f')).read(), b'f')
1527
1798
# Correct correct results when THIS == OTHER
1528
self.assertEqual(this.wt.get_file('g').read(), 'g')
1799
self.assertEqual(this.wt.get_file(this.wt.id2path(b'g')).read(), b'g')
1529
1800
# Text conflict when THIS & OTHER are text and BASE is dir
1530
self.assertEqual(this.wt.get_file('h').read(),
1531
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1532
self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
1534
self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
1801
self.assertEqual(this.wt.get_file(this.wt.id2path(b'h')).read(),
1802
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1803
self.assertEqual(this.wt.get_file('h.THIS').read(),
1805
self.assertEqual(this.wt.get_file('h.OTHER').read(),
1536
1807
self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
1537
self.assertEqual(this.wt.get_file('i').read(),
1538
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1539
self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
1541
self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
1808
self.assertEqual(this.wt.get_file(this.wt.id2path(b'i')).read(),
1809
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1810
self.assertEqual(this.wt.get_file('i.THIS').read(),
1812
self.assertEqual(this.wt.get_file('i.OTHER').read(),
1543
1814
self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1544
1815
modified = ['a', 'b', 'c', 'h', 'i']
1545
1816
merge_modified = this.wt.merge_modified()
1546
1817
self.assertSubset(merge_modified, modified)
1547
1818
self.assertEqual(len(merge_modified), len(modified))
1548
file(this.wt.id2abspath('a'), 'wb').write('booga')
1819
with open(this.wt.abspath(this.wt.id2path(b'a')), 'wb') as f:
1549
1821
modified.pop(0)
1550
1822
merge_modified = this.wt.merge_modified()
1551
1823
self.assertSubset(merge_modified, modified)
1600
1874
base = TransformGroup("BASE", root_id)
1601
1875
this = TransformGroup("THIS", root_id)
1602
1876
other = TransformGroup("OTHER", root_id)
1603
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
1604
for t in [base, this, other]]
1605
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1606
for t in [base, this, other]]
1607
base.tt.new_directory('c', base_a, 'c')
1608
this.tt.new_directory('c1', this_a, 'c')
1609
other.tt.new_directory('c', other_b, 'c')
1611
base.tt.new_directory('d', base_a, 'd')
1612
this.tt.new_directory('d1', this_b, 'd')
1613
other.tt.new_directory('d', other_a, 'd')
1615
base.tt.new_directory('e', base_a, 'e')
1616
this.tt.new_directory('e', this_a, 'e')
1617
other.tt.new_directory('e1', other_b, 'e')
1619
base.tt.new_directory('f', base_a, 'f')
1620
this.tt.new_directory('f1', this_b, 'f')
1621
other.tt.new_directory('f1', other_b, 'f')
1877
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, b'a')
1878
for t in [base, this, other]]
1879
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, b'b')
1880
for t in [base, this, other]]
1881
base.tt.new_directory('c', base_a, b'c')
1882
this.tt.new_directory('c1', this_a, b'c')
1883
other.tt.new_directory('c', other_b, b'c')
1885
base.tt.new_directory('d', base_a, b'd')
1886
this.tt.new_directory('d1', this_b, b'd')
1887
other.tt.new_directory('d', other_a, b'd')
1889
base.tt.new_directory('e', base_a, b'e')
1890
this.tt.new_directory('e', this_a, b'e')
1891
other.tt.new_directory('e1', other_b, b'e')
1893
base.tt.new_directory('f', base_a, b'f')
1894
this.tt.new_directory('f1', this_b, b'f')
1895
other.tt.new_directory('f1', other_b, b'f')
1623
1897
for tg in [this, base, other]:
1625
1899
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1626
self.assertEqual(this.wt.id2path('c'), pathjoin('b/c1'))
1627
self.assertEqual(this.wt.id2path('d'), pathjoin('b/d1'))
1628
self.assertEqual(this.wt.id2path('e'), pathjoin('b/e1'))
1629
self.assertEqual(this.wt.id2path('f'), pathjoin('b/f1'))
1900
self.assertEqual(this.wt.id2path(b'c'), pathjoin('b/c1'))
1901
self.assertEqual(this.wt.id2path(b'd'), pathjoin('b/d1'))
1902
self.assertEqual(this.wt.id2path(b'e'), pathjoin('b/e1'))
1903
self.assertEqual(this.wt.id2path(b'f'), pathjoin('b/f1'))
1631
1905
def test_filename_merge_conflicts(self):
1632
1906
root_id = generate_ids.gen_root_id()
1633
1907
base = TransformGroup("BASE", root_id)
1634
1908
this = TransformGroup("THIS", root_id)
1635
1909
other = TransformGroup("OTHER", root_id)
1636
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
1637
for t in [base, this, other]]
1638
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1639
for t in [base, this, other]]
1641
base.tt.new_file('g', base_a, 'g', 'g')
1642
other.tt.new_file('g1', other_b, 'g1', 'g')
1644
base.tt.new_file('h', base_a, 'h', 'h')
1645
this.tt.new_file('h1', this_b, 'h1', 'h')
1647
base.tt.new_file('i', base.root, 'i', 'i')
1648
other.tt.new_directory('i1', this_b, 'i')
1910
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, b'a')
1911
for t in [base, this, other]]
1912
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, b'b')
1913
for t in [base, this, other]]
1915
base.tt.new_file('g', base_a, [b'g'], b'g')
1916
other.tt.new_file('g1', other_b, [b'g1'], b'g')
1918
base.tt.new_file('h', base_a, [b'h'], b'h')
1919
this.tt.new_file('h1', this_b, [b'h1'], b'h')
1921
base.tt.new_file('i', base.root, [b'i'], b'i')
1922
other.tt.new_directory('i1', this_b, b'i')
1650
1924
for tg in [this, base, other]:
1652
1926
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1654
self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1928
self.assertEqual(this.wt.id2path(b'g'), pathjoin('b/g1.OTHER'))
1655
1929
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1656
1930
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1657
self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
1931
self.assertEqual(this.wt.id2path(b'h'), pathjoin('b/h1.THIS'))
1658
1932
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1659
1933
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1660
self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
1934
self.assertEqual(this.wt.id2path(b'i'), pathjoin('b/i1.OTHER'))
1663
1937
class TestBuildTree(tests.TestCaseWithTransport):
1665
1939
def test_build_tree_with_symlinks(self):
1666
1940
self.requireFeature(SymlinkFeature)
1668
a = BzrDir.create_standalone_workingtree('a')
1942
a = ControlDir.create_standalone_workingtree('a')
1669
1943
os.mkdir('a/foo')
1670
file('a/foo/bar', 'wb').write('contents')
1944
with open('a/foo/bar', 'wb') as f:
1945
f.write(b'contents')
1671
1946
os.symlink('a/foo/bar', 'a/foo/baz')
1672
1947
a.add(['foo', 'foo/bar', 'foo/baz'])
1673
1948
a.commit('initial commit')
1674
b = BzrDir.create_standalone_workingtree('b')
1949
b = ControlDir.create_standalone_workingtree('b')
1675
1950
basis = a.basis_tree()
1676
1951
basis.lock_read()
1677
1952
self.addCleanup(basis.unlock)
1678
1953
build_tree(basis, b)
1679
1954
self.assertIs(os.path.isdir('b/foo'), True)
1680
self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
1955
with open('b/foo/bar', 'rb') as f:
1956
self.assertEqual(f.read(), b"contents")
1681
1957
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
1683
1959
def test_build_with_references(self):
1684
1960
tree = self.make_branch_and_tree('source',
1685
format='dirstate-with-subtree')
1961
format='development-subtree')
1686
1962
subtree = self.make_branch_and_tree('source/subtree',
1687
format='dirstate-with-subtree')
1963
format='development-subtree')
1688
1964
tree.add_reference(subtree)
1689
1965
tree.commit('a revision')
1690
1966
tree.branch.create_checkout('target')
1691
self.failUnlessExists('target')
1692
self.failUnlessExists('target/subtree')
1967
self.assertPathExists('target')
1968
self.assertPathExists('target/subtree')
1694
1970
def test_file_conflict_handling(self):
1695
1971
"""Ensure that when building trees, conflict handling is done"""
1696
1972
source = self.make_branch_and_tree('source')
1697
1973
target = self.make_branch_and_tree('target')
1698
1974
self.build_tree(['source/file', 'target/file'])
1699
source.add('file', 'new-file')
1975
source.add('file', b'new-file')
1700
1976
source.commit('added file')
1701
1977
build_tree(source.basis_tree(), target)
1702
self.assertEqual([DuplicateEntry('Moved existing file to',
1703
'file.moved', 'file', None, 'new-file')],
1979
[DuplicateEntry('Moved existing file to', 'file.moved',
1980
'file', None, 'new-file')],
1705
1982
target2 = self.make_branch_and_tree('target2')
1706
target_file = file('target2/file', 'wb')
1708
source_file = file('source/file', 'rb')
1710
target_file.write(source_file.read())
1983
with open('target2/file', 'wb') as target_file, \
1984
open('source/file', 'rb') as source_file:
1985
target_file.write(source_file.read())
1715
1986
build_tree(source.basis_tree(), target2)
1716
1987
self.assertEqual([], target2.conflicts())
1992
2287
self.assertEqualStat(source_stat, target_stat)
1994
2289
def test_case_insensitive_build_tree_inventory(self):
1995
if (tests.CaseInsensitiveFilesystemFeature.available()
1996
or tests.CaseInsCasePresFilenameFeature.available()):
2290
if (features.CaseInsensitiveFilesystemFeature.available()
2291
or features.CaseInsCasePresFilenameFeature.available()):
1997
2292
raise tests.UnavailableFeature('Fully case sensitive filesystem')
1998
2293
source = self.make_branch_and_tree('source')
1999
2294
self.build_tree(['source/file', 'source/FILE'])
2000
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2295
source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
2001
2296
source.commit('added files')
2002
2297
# Don't try this at home, kids!
2003
2298
# Force the tree to report that it is case insensitive
2004
2299
target = self.make_branch_and_tree('target')
2005
2300
target.case_sensitive = False
2006
2301
build_tree(source.basis_tree(), target, source, delta_from_tree=True)
2007
self.assertEqual('file.moved', target.id2path('lower-id'))
2008
self.assertEqual('FILE', target.id2path('upper-id'))
2302
self.assertEqual('file.moved', target.id2path(b'lower-id'))
2303
self.assertEqual('FILE', target.id2path(b'upper-id'))
2305
def test_build_tree_observes_sha(self):
2306
source = self.make_branch_and_tree('source')
2307
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2308
source.add(['file1', 'dir', 'dir/file2'],
2309
[b'file1-id', b'dir-id', b'file2-id'])
2310
source.commit('new files')
2311
target = self.make_branch_and_tree('target')
2313
self.addCleanup(target.unlock)
2314
# We make use of the fact that DirState caches its cutoff time. So we
2315
# set the 'safe' time to one minute in the future.
2316
state = target.current_dirstate()
2317
state._cutoff_time = time.time() + 60
2318
build_tree(source.basis_tree(), target)
2319
entry1_sha = osutils.sha_file_by_name('source/file1')
2320
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2321
# entry[1] is the state information, entry[1][0] is the state of the
2322
# working tree, entry[1][0][1] is the sha value for the current working
2324
entry1 = state._get_entry(0, path_utf8=b'file1')
2325
self.assertEqual(entry1_sha, entry1[1][0][1])
2326
# The 'size' field must also be set.
2327
self.assertEqual(25, entry1[1][0][2])
2328
entry1_state = entry1[1][0]
2329
entry2 = state._get_entry(0, path_utf8=b'dir/file2')
2330
self.assertEqual(entry2_sha, entry2[1][0][1])
2331
self.assertEqual(29, entry2[1][0][2])
2332
entry2_state = entry2[1][0]
2333
# Now, make sure that we don't have to re-read the content. The
2334
# packed_stat should match exactly.
2335
self.assertEqual(entry1_sha, target.get_file_sha1('file1'))
2336
self.assertEqual(entry2_sha, target.get_file_sha1('dir/file2'))
2337
self.assertEqual(entry1_state, entry1[1][0])
2338
self.assertEqual(entry2_state, entry2[1][0])
2011
2341
class TestCommitTransform(tests.TestCaseWithTransport):
2065
2395
tt = TransformPreview(branch.basis_tree())
2066
2396
self.addCleanup(tt.finalize)
2067
2397
e = self.assertRaises(ValueError, tt.commit, branch,
2068
'my message', ['rev1b-id'])
2398
'my message', [b'rev1b-id'])
2069
2399
self.assertEqual('Cannot supply merge parents for first commit.',
2071
2401
self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
2073
2403
def test_add_files(self):
2074
2404
branch, tt = self.get_branch_and_transform()
2075
tt.new_file('file', tt.root, 'contents', 'file-id')
2076
trans_id = tt.new_directory('dir', tt.root, 'dir-id')
2405
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2406
trans_id = tt.new_directory('dir', tt.root, b'dir-id')
2077
2407
if SymlinkFeature.available():
2078
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2079
rev = tt.commit(branch, 'message')
2408
tt.new_symlink('symlink', trans_id, 'target', b'symlink-id')
2409
tt.commit(branch, 'message')
2080
2410
tree = branch.basis_tree()
2081
self.assertEqual('file', tree.id2path('file-id'))
2082
self.assertEqual('contents', tree.get_file_text('file-id'))
2083
self.assertEqual('dir', tree.id2path('dir-id'))
2411
self.assertEqual('file', tree.id2path(b'file-id'))
2412
self.assertEqual(b'contents', tree.get_file_text('file'))
2413
self.assertEqual('dir', tree.id2path(b'dir-id'))
2084
2414
if SymlinkFeature.available():
2085
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2086
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2415
self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
2416
self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
2088
2418
def test_add_unversioned(self):
2089
2419
branch, tt = self.get_branch_and_transform()
2090
tt.new_file('file', tt.root, 'contents')
2420
tt.new_file('file', tt.root, [b'contents'])
2091
2421
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2092
2422
'message', strict=True)
2094
2424
def test_modify_strict(self):
2095
2425
branch, tt = self.get_branch_and_transform()
2096
tt.new_file('file', tt.root, 'contents', 'file-id')
2426
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2097
2427
tt.commit(branch, 'message', strict=True)
2098
2428
tt = TransformPreview(branch.basis_tree())
2099
2429
self.addCleanup(tt.finalize)
2100
trans_id = tt.trans_id_file_id('file-id')
2430
trans_id = tt.trans_id_file_id(b'file-id')
2101
2431
tt.delete_contents(trans_id)
2102
tt.create_file('contents', trans_id)
2432
tt.create_file([b'contents'], trans_id)
2103
2433
tt.commit(branch, 'message', strict=True)
2105
2435
def test_commit_malformed(self):
2146
2476
self.assertEqual('tree', revision.properties['branch-nick'])
2149
class MockTransform(object):
2151
def has_named_child(self, by_parent, parent_id, name):
2152
for child_id in by_parent[parent_id]:
2156
elif name == "name.~%s~" % child_id:
2161
class MockEntry(object):
2163
object.__init__(self)
2167
class TestGetBackupName(TestCase):
2168
def test_get_backup_name(self):
2169
tt = MockTransform()
2170
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2171
self.assertEqual(name, 'name.~1~')
2172
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2173
self.assertEqual(name, 'name.~2~')
2174
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2175
self.assertEqual(name, 'name.~1~')
2176
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2177
self.assertEqual(name, 'name.~1~')
2178
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2179
self.assertEqual(name, 'name.~4~')
2182
2479
class TestFileMover(tests.TestCaseWithTransport):
2184
2481
def test_file_mover(self):
2185
2482
self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2186
2483
mover = _FileMover()
2187
2484
mover.rename('a', 'q')
2188
self.failUnlessExists('q')
2189
self.failIfExists('a')
2190
self.failUnlessExists('q/b')
2191
self.failUnlessExists('c')
2192
self.failUnlessExists('c/d')
2485
self.assertPathExists('q')
2486
self.assertPathDoesNotExist('a')
2487
self.assertPathExists('q/b')
2488
self.assertPathExists('c')
2489
self.assertPathExists('c/d')
2194
2491
def test_pre_delete_rollback(self):
2195
2492
self.build_tree(['a/'])
2196
2493
mover = _FileMover()
2197
2494
mover.pre_delete('a', 'q')
2198
self.failUnlessExists('q')
2199
self.failIfExists('a')
2495
self.assertPathExists('q')
2496
self.assertPathDoesNotExist('a')
2200
2497
mover.rollback()
2201
self.failIfExists('q')
2202
self.failUnlessExists('a')
2498
self.assertPathDoesNotExist('q')
2499
self.assertPathExists('a')
2204
2501
def test_apply_deletions(self):
2205
2502
self.build_tree(['a/', 'b/'])
2206
2503
mover = _FileMover()
2207
2504
mover.pre_delete('a', 'q')
2208
2505
mover.pre_delete('b', 'r')
2209
self.failUnlessExists('q')
2210
self.failUnlessExists('r')
2211
self.failIfExists('a')
2212
self.failIfExists('b')
2506
self.assertPathExists('q')
2507
self.assertPathExists('r')
2508
self.assertPathDoesNotExist('a')
2509
self.assertPathDoesNotExist('b')
2213
2510
mover.apply_deletions()
2214
self.failIfExists('q')
2215
self.failIfExists('r')
2216
self.failIfExists('a')
2217
self.failIfExists('b')
2511
self.assertPathDoesNotExist('q')
2512
self.assertPathDoesNotExist('r')
2513
self.assertPathDoesNotExist('a')
2514
self.assertPathDoesNotExist('b')
2219
2516
def test_file_mover_rollback(self):
2220
2517
self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2294
2591
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2295
2592
self.assertRaises(Bogus, tt.apply,
2296
2593
_mover=self.ExceptionFileMover(bad_target='d'))
2297
self.failUnlessExists('a')
2298
self.failUnlessExists('a/b')
2300
def test_resolve_no_parent(self):
2594
self.assertPathExists('a')
2595
self.assertPathExists('a/b')
2598
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2599
"""Ensure treetransform creation errors can be safely cleaned up after"""
2601
def _override_globals_in_method(self, instance, method_name, globals):
2602
"""Replace method on instance with one with updated globals"""
2604
func = getattr(instance, method_name).__func__
2605
new_globals = dict(func.__globals__)
2606
new_globals.update(globals)
2607
new_func = types.FunctionType(func.__code__, new_globals,
2608
func.__name__, func.__defaults__)
2609
setattr(instance, method_name,
2610
types.MethodType(new_func, instance))
2611
self.addCleanup(delattr, instance, method_name)
2614
def _fake_open_raises_before(name, mode):
2615
"""Like open() but raises before doing anything"""
2619
def _fake_open_raises_after(name, mode):
2620
"""Like open() but raises after creating file without returning"""
2621
open(name, mode).close()
2624
def create_transform_and_root_trans_id(self):
2625
"""Setup a transform creating a file in limbo"""
2626
tree = self.make_branch_and_tree('.')
2627
tt = TreeTransform(tree)
2628
return tt, tt.create_path("a", tt.root)
2630
def create_transform_and_subdir_trans_id(self):
2631
"""Setup a transform creating a directory containing a file in limbo"""
2632
tree = self.make_branch_and_tree('.')
2633
tt = TreeTransform(tree)
2634
d_trans_id = tt.create_path("d", tt.root)
2635
tt.create_directory(d_trans_id)
2636
f_trans_id = tt.create_path("a", d_trans_id)
2637
tt.adjust_path("a", d_trans_id, f_trans_id)
2638
return tt, f_trans_id
2640
def test_root_create_file_open_raises_before_creation(self):
2641
tt, trans_id = self.create_transform_and_root_trans_id()
2642
self._override_globals_in_method(
2643
tt, "create_file", {"open": self._fake_open_raises_before})
2644
self.assertRaises(RuntimeError, tt.create_file,
2645
[b"contents"], trans_id)
2646
path = tt._limbo_name(trans_id)
2647
self.assertPathDoesNotExist(path)
2649
self.assertPathDoesNotExist(tt._limbodir)
2651
def test_root_create_file_open_raises_after_creation(self):
2652
tt, trans_id = self.create_transform_and_root_trans_id()
2653
self._override_globals_in_method(
2654
tt, "create_file", {"open": self._fake_open_raises_after})
2655
self.assertRaises(RuntimeError, tt.create_file,
2656
[b"contents"], trans_id)
2657
path = tt._limbo_name(trans_id)
2658
self.assertPathExists(path)
2660
self.assertPathDoesNotExist(path)
2661
self.assertPathDoesNotExist(tt._limbodir)
2663
def test_subdir_create_file_open_raises_before_creation(self):
2664
tt, trans_id = self.create_transform_and_subdir_trans_id()
2665
self._override_globals_in_method(
2666
tt, "create_file", {"open": self._fake_open_raises_before})
2667
self.assertRaises(RuntimeError, tt.create_file,
2668
[b"contents"], trans_id)
2669
path = tt._limbo_name(trans_id)
2670
self.assertPathDoesNotExist(path)
2672
self.assertPathDoesNotExist(tt._limbodir)
2674
def test_subdir_create_file_open_raises_after_creation(self):
2675
tt, trans_id = self.create_transform_and_subdir_trans_id()
2676
self._override_globals_in_method(
2677
tt, "create_file", {"open": self._fake_open_raises_after})
2678
self.assertRaises(RuntimeError, tt.create_file,
2679
[b"contents"], trans_id)
2680
path = tt._limbo_name(trans_id)
2681
self.assertPathExists(path)
2683
self.assertPathDoesNotExist(path)
2684
self.assertPathDoesNotExist(tt._limbodir)
2686
def test_rename_in_limbo_rename_raises_after_rename(self):
2687
tt, trans_id = self.create_transform_and_root_trans_id()
2688
parent1 = tt.new_directory('parent1', tt.root)
2689
child1 = tt.new_file('child1', parent1, [b'contents'])
2690
parent2 = tt.new_directory('parent2', tt.root)
2692
class FakeOSModule(object):
2693
def rename(self, old, new):
2696
self._override_globals_in_method(tt, "_rename_in_limbo",
2697
{"os": FakeOSModule()})
2699
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2700
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2701
self.assertPathExists(path)
2703
self.assertPathDoesNotExist(path)
2704
self.assertPathDoesNotExist(tt._limbodir)
2706
def test_rename_in_limbo_rename_raises_before_rename(self):
2707
tt, trans_id = self.create_transform_and_root_trans_id()
2708
parent1 = tt.new_directory('parent1', tt.root)
2709
child1 = tt.new_file('child1', parent1, [b'contents'])
2710
parent2 = tt.new_directory('parent2', tt.root)
2712
class FakeOSModule(object):
2713
def rename(self, old, new):
2715
self._override_globals_in_method(tt, "_rename_in_limbo",
2716
{"os": FakeOSModule()})
2718
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2719
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2720
self.assertPathExists(path)
2722
self.assertPathDoesNotExist(path)
2723
self.assertPathDoesNotExist(tt._limbodir)
2726
class TestTransformMissingParent(tests.TestCaseWithTransport):
2728
def make_tt_with_versioned_dir(self):
2301
2729
wt = self.make_branch_and_tree('.')
2730
self.build_tree(['dir/', ])
2731
wt.add(['dir'], [b'dir-id'])
2732
wt.commit('Create dir')
2302
2733
tt = TreeTransform(wt)
2303
2734
self.addCleanup(tt.finalize)
2304
parent = tt.trans_id_file_id('parent-id')
2305
tt.new_file('file', parent, 'Contents')
2306
resolve_conflicts(tt)
2309
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2310
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2312
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2313
('', ''), ('directory', 'directory'), (False, None))
2737
def test_resolve_create_parent_for_versioned_file(self):
2738
wt, tt = self.make_tt_with_versioned_dir()
2739
dir_tid = tt.trans_id_tree_path('dir')
2740
tt.new_file('file', dir_tid, [b'Contents'], file_id=b'file-id')
2741
tt.delete_contents(dir_tid)
2742
tt.unversion_file(dir_tid)
2743
conflicts = resolve_conflicts(tt)
2744
# one conflict for the missing directory, one for the unversioned
2746
self.assertLength(2, conflicts)
2748
def test_non_versioned_file_create_conflict(self):
2749
wt, tt = self.make_tt_with_versioned_dir()
2750
dir_tid = tt.trans_id_tree_path('dir')
2751
tt.new_file('file', dir_tid, [b'Contents'])
2752
tt.delete_contents(dir_tid)
2753
tt.unversion_file(dir_tid)
2754
conflicts = resolve_conflicts(tt)
2755
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2756
self.assertLength(1, conflicts)
2757
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2761
A_ENTRY = (b'a-id', ('a', 'a'), True, (True, True),
2762
(b'TREE_ROOT', b'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2763
(False, False), False)
2764
ROOT_ENTRY = (b'TREE_ROOT', ('', ''), False, (True, True), (None, None),
2765
('', ''), ('directory', 'directory'), (False, False), False)
2316
2768
class TestTransformPreview(tests.TestCaseWithTransport):
2318
2770
def create_tree(self):
2319
2771
tree = self.make_branch_and_tree('.')
2320
self.build_tree_contents([('a', 'content 1')])
2321
tree.set_root_id('TREE_ROOT')
2322
tree.add('a', 'a-id')
2323
tree.commit('rev1', rev_id='rev1')
2324
return tree.branch.repository.revision_tree('rev1')
2772
self.build_tree_contents([('a', b'content 1')])
2773
tree.set_root_id(b'TREE_ROOT')
2774
tree.add('a', b'a-id')
2775
tree.commit('rev1', rev_id=b'rev1')
2776
return tree.branch.repository.revision_tree(b'rev1')
2326
2778
def get_empty_preview(self):
2327
2779
repository = self.make_repository('repo')
2345
2797
revision_tree = self.create_tree()
2346
2798
preview = TransformPreview(revision_tree)
2347
2799
self.addCleanup(preview.finalize)
2348
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2800
preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2349
2801
preview_tree = preview.get_preview_tree()
2350
self.assertEqual(preview_tree.kind('file2-id'), 'file')
2352
preview_tree.get_file('file2-id').read(), 'content B\n')
2802
self.assertEqual(preview_tree.kind('file2'), 'file')
2803
with preview_tree.get_file('file2') as f:
2804
self.assertEqual(f.read(), b'content B\n')
2354
2806
def test_diff_preview_tree(self):
2355
2807
revision_tree = self.create_tree()
2356
2808
preview = TransformPreview(revision_tree)
2357
2809
self.addCleanup(preview.finalize)
2358
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2810
preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2359
2811
preview_tree = preview.get_preview_tree()
2361
2813
show_diff_trees(revision_tree, preview_tree, out)
2362
2814
lines = out.getvalue().splitlines()
2363
self.assertEqual(lines[0], "=== added file 'file2'")
2815
self.assertEqual(lines[0], b"=== added file 'file2'")
2364
2816
# 3 lines of diff administrivia
2365
self.assertEqual(lines[4], "+content B")
2817
self.assertEqual(lines[4], b"+content B")
2819
def test_unsupported_symlink_diff(self):
2820
self.requireFeature(SymlinkFeature)
2821
tree = self.make_branch_and_tree('.')
2822
self.build_tree_contents([('a', 'content 1')])
2823
tree.set_root_id(b'TREE_ROOT')
2824
tree.add('a', b'a-id')
2825
os.symlink('a', 'foo')
2826
tree.add('foo', b'foo-id')
2827
tree.commit('rev1', rev_id=b'rev1')
2828
revision_tree = tree.branch.repository.revision_tree(b'rev1')
2829
preview = TransformPreview(revision_tree)
2830
self.addCleanup(preview.finalize)
2831
preview.delete_versioned(preview.trans_id_tree_path('foo'))
2832
preview_tree = preview.get_preview_tree()
2835
trace.push_log_file(log)
2836
os_symlink = getattr(os, 'symlink', None)
2839
show_diff_trees(revision_tree, preview_tree, out)
2840
lines = out.getvalue().splitlines()
2842
os.symlink = os_symlink
2843
self.assertContainsRe(
2845
b'Ignoring "foo" as symlinks are not supported on this filesystem')
2367
2847
def test_transform_conflicts(self):
2368
2848
revision_tree = self.create_tree()
2369
2849
preview = TransformPreview(revision_tree)
2370
2850
self.addCleanup(preview.finalize)
2371
preview.new_file('a', preview.root, 'content 2')
2851
preview.new_file('a', preview.root, [b'content 2'])
2372
2852
resolve_conflicts(preview)
2373
trans_id = preview.trans_id_file_id('a-id')
2853
trans_id = preview.trans_id_file_id(b'a-id')
2374
2854
self.assertEqual('a.moved', preview.final_name(trans_id))
2376
2856
def get_tree_and_preview_tree(self):
2377
2857
revision_tree = self.create_tree()
2378
2858
preview = TransformPreview(revision_tree)
2379
2859
self.addCleanup(preview.finalize)
2380
a_trans_id = preview.trans_id_file_id('a-id')
2860
a_trans_id = preview.trans_id_file_id(b'a-id')
2381
2861
preview.delete_contents(a_trans_id)
2382
preview.create_file('b content', a_trans_id)
2862
preview.create_file([b'b content'], a_trans_id)
2383
2863
preview_tree = preview.get_preview_tree()
2384
2864
return revision_tree, preview_tree
2386
2866
def test_iter_changes(self):
2387
2867
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2388
root = revision_tree.inventory.root.file_id
2389
self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2390
(root, root), ('a', 'a'), ('file', 'file'),
2392
list(preview_tree.iter_changes(revision_tree)))
2868
root = revision_tree.path2id('')
2869
self.assertEqual([(b'a-id', ('a', 'a'), True, (True, True),
2870
(root, root), ('a', 'a'), ('file', 'file'),
2871
(False, False), False)],
2872
list(preview_tree.iter_changes(revision_tree)))
2394
2874
def test_include_unchanged_succeeds(self):
2395
2875
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2396
2876
changes = preview_tree.iter_changes(revision_tree,
2397
2877
include_unchanged=True)
2398
root = revision_tree.inventory.root.file_id
2400
2878
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2402
2880
def test_specific_files(self):
2403
2881
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2404
2882
changes = preview_tree.iter_changes(revision_tree,
2405
2883
specific_files=[''])
2406
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2884
self.assertEqual([A_ENTRY], list(changes))
2408
2886
def test_want_unversioned(self):
2409
2887
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2410
2888
changes = preview_tree.iter_changes(revision_tree,
2411
2889
want_unversioned=True)
2412
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2890
self.assertEqual([A_ENTRY], list(changes))
2414
2892
def test_ignore_extra_trees_no_specific_files(self):
2415
2893
# extra_trees is harmless without specific_files, so we'll silently
2431
2909
revision_tree = self.create_tree()
2432
2910
preview = TransformPreview(revision_tree)
2433
2911
self.addCleanup(preview.finalize)
2434
preview.new_file('file', preview.root, 'contents', 'file-id')
2435
preview.new_directory('directory', preview.root, 'dir-id')
2912
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2913
preview.new_directory('directory', preview.root, b'dir-id')
2436
2914
preview_tree = preview.get_preview_tree()
2437
self.assertEqual('file', preview_tree.kind('file-id'))
2438
self.assertEqual('directory', preview_tree.kind('dir-id'))
2915
self.assertEqual('file', preview_tree.kind('file'))
2916
self.assertEqual('directory', preview_tree.kind('directory'))
2440
2918
def test_get_file_mtime(self):
2441
2919
preview = self.get_empty_preview()
2442
file_trans_id = preview.new_file('file', preview.root, 'contents',
2920
file_trans_id = preview.new_file('file', preview.root, [b'contents'],
2444
2922
limbo_path = preview._limbo_name(file_trans_id)
2445
2923
preview_tree = preview.get_preview_tree()
2446
2924
self.assertEqual(os.stat(limbo_path).st_mtime,
2447
preview_tree.get_file_mtime('file-id'))
2925
preview_tree.get_file_mtime('file'))
2449
2927
def test_get_file_mtime_renamed(self):
2450
2928
work_tree = self.make_branch_and_tree('tree')
2451
2929
self.build_tree(['tree/file'])
2452
work_tree.add('file', 'file-id')
2930
work_tree.add('file', b'file-id')
2453
2931
preview = TransformPreview(work_tree)
2454
2932
self.addCleanup(preview.finalize)
2455
file_trans_id = preview.trans_id_tree_file_id('file-id')
2933
file_trans_id = preview.trans_id_tree_path('file')
2456
2934
preview.adjust_path('renamed', preview.root, file_trans_id)
2457
2935
preview_tree = preview.get_preview_tree()
2458
preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2459
work_mtime = work_tree.get_file_mtime('file-id', 'file')
2936
preview_mtime = preview_tree.get_file_mtime('renamed')
2937
work_mtime = work_tree.get_file_mtime('file')
2939
def test_get_file_size(self):
2940
work_tree = self.make_branch_and_tree('tree')
2941
self.build_tree_contents([('tree/old', b'old')])
2942
work_tree.add('old', b'old-id')
2943
preview = TransformPreview(work_tree)
2944
self.addCleanup(preview.finalize)
2945
preview.new_file('name', preview.root, [b'contents'], b'new-id',
2947
tree = preview.get_preview_tree()
2948
self.assertEqual(len('old'), tree.get_file_size('old'))
2949
self.assertEqual(len('contents'), tree.get_file_size('name'))
2461
2951
def test_get_file(self):
2462
2952
preview = self.get_empty_preview()
2463
preview.new_file('file', preview.root, 'contents', 'file-id')
2953
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2464
2954
preview_tree = preview.get_preview_tree()
2465
tree_file = preview_tree.get_file('file-id')
2467
self.assertEqual('contents', tree_file.read())
2955
with preview_tree.get_file('file') as tree_file:
2956
self.assertEqual(b'contents', tree_file.read())
2471
2958
def test_get_symlink_target(self):
2472
2959
self.requireFeature(SymlinkFeature)
2473
2960
preview = self.get_empty_preview()
2474
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2961
preview.new_symlink('symlink', preview.root, 'target', b'symlink-id')
2475
2962
preview_tree = preview.get_preview_tree()
2476
2963
self.assertEqual('target',
2477
preview_tree.get_symlink_target('symlink-id'))
2964
preview_tree.get_symlink_target('symlink'))
2479
2966
def test_all_file_ids(self):
2480
2967
tree = self.make_branch_and_tree('tree')
2481
2968
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2482
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2969
tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
2483
2970
preview = TransformPreview(tree)
2484
2971
self.addCleanup(preview.finalize)
2485
preview.unversion_file(preview.trans_id_file_id('b-id'))
2486
c_trans_id = preview.trans_id_file_id('c-id')
2972
preview.unversion_file(preview.trans_id_file_id(b'b-id'))
2973
c_trans_id = preview.trans_id_file_id(b'c-id')
2487
2974
preview.unversion_file(c_trans_id)
2488
preview.version_file('c-id', c_trans_id)
2975
preview.version_file(b'c-id', c_trans_id)
2489
2976
preview_tree = preview.get_preview_tree()
2490
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2977
self.assertEqual({b'a-id', b'c-id', tree.path2id('')},
2491
2978
preview_tree.all_file_ids())
2493
2980
def test_path2id_deleted_unchanged(self):
2494
2981
tree = self.make_branch_and_tree('tree')
2495
2982
self.build_tree(['tree/unchanged', 'tree/deleted'])
2496
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2983
tree.add(['unchanged', 'deleted'], [b'unchanged-id', b'deleted-id'])
2497
2984
preview = TransformPreview(tree)
2498
2985
self.addCleanup(preview.finalize)
2499
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2986
preview.unversion_file(preview.trans_id_file_id(b'deleted-id'))
2500
2987
preview_tree = preview.get_preview_tree()
2501
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2502
self.assertIs(None, preview_tree.path2id('deleted'))
2988
self.assertEqual(b'unchanged-id', preview_tree.path2id('unchanged'))
2989
self.assertFalse(preview_tree.is_versioned('deleted'))
2504
2991
def test_path2id_created(self):
2505
2992
tree = self.make_branch_and_tree('tree')
2506
2993
self.build_tree(['tree/unchanged'])
2507
tree.add(['unchanged'], ['unchanged-id'])
2994
tree.add(['unchanged'], [b'unchanged-id'])
2508
2995
preview = TransformPreview(tree)
2509
2996
self.addCleanup(preview.finalize)
2510
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2511
'contents', 'new-id')
2997
preview.new_file('new', preview.trans_id_file_id(b'unchanged-id'),
2998
[b'contents'], b'new-id')
2512
2999
preview_tree = preview.get_preview_tree()
2513
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
3000
self.assertEqual(b'new-id', preview_tree.path2id('unchanged/new'))
2515
3002
def test_path2id_moved(self):
2516
3003
tree = self.make_branch_and_tree('tree')
2517
3004
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2518
3005
tree.add(['old_parent', 'old_parent/child'],
2519
['old_parent-id', 'child-id'])
3006
[b'old_parent-id', b'child-id'])
2520
3007
preview = TransformPreview(tree)
2521
3008
self.addCleanup(preview.finalize)
2522
3009
new_parent = preview.new_directory('new_parent', preview.root,
2524
3011
preview.adjust_path('child', new_parent,
2525
preview.trans_id_file_id('child-id'))
3012
preview.trans_id_file_id(b'child-id'))
2526
3013
preview_tree = preview.get_preview_tree()
2527
self.assertIs(None, preview_tree.path2id('old_parent/child'))
2528
self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
3014
self.assertFalse(preview_tree.is_versioned('old_parent/child'))
3015
self.assertEqual(b'child-id', preview_tree.path2id('new_parent/child'))
2530
3017
def test_path2id_renamed_parent(self):
2531
3018
tree = self.make_branch_and_tree('tree')
2532
3019
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2533
3020
tree.add(['old_name', 'old_name/child'],
2534
['parent-id', 'child-id'])
3021
[b'parent-id', b'child-id'])
2535
3022
preview = TransformPreview(tree)
2536
3023
self.addCleanup(preview.finalize)
2537
3024
preview.adjust_path('new_name', preview.root,
2538
preview.trans_id_file_id('parent-id'))
3025
preview.trans_id_file_id(b'parent-id'))
2539
3026
preview_tree = preview.get_preview_tree()
2540
self.assertIs(None, preview_tree.path2id('old_name/child'))
2541
self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
3027
self.assertFalse(preview_tree.is_versioned('old_name/child'))
3028
self.assertEqual(b'child-id', preview_tree.path2id('new_name/child'))
2543
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
3030
def assertMatchingIterEntries(self, tt, specific_files=None):
2544
3031
preview_tree = tt.get_preview_tree()
2545
3032
preview_result = list(preview_tree.iter_entries_by_dir(
3033
specific_files=specific_files))
2547
3034
tree = tt._tree
2549
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
3036
actual_result = list(tree.iter_entries_by_dir(
3037
specific_files=specific_files))
2550
3038
self.assertEqual(actual_result, preview_result)
2552
3040
def test_iter_entries_by_dir_new(self):
2553
3041
tree = self.make_branch_and_tree('tree')
2554
3042
tt = TreeTransform(tree)
2555
tt.new_file('new', tt.root, 'contents', 'new-id')
3043
tt.new_file('new', tt.root, [b'contents'], b'new-id')
2556
3044
self.assertMatchingIterEntries(tt)
2558
3046
def test_iter_entries_by_dir_deleted(self):
2559
3047
tree = self.make_branch_and_tree('tree')
2560
3048
self.build_tree(['tree/deleted'])
2561
tree.add('deleted', 'deleted-id')
3049
tree.add('deleted', b'deleted-id')
2562
3050
tt = TreeTransform(tree)
2563
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
3051
tt.delete_contents(tt.trans_id_file_id(b'deleted-id'))
2564
3052
self.assertMatchingIterEntries(tt)
2566
3054
def test_iter_entries_by_dir_unversioned(self):
2567
3055
tree = self.make_branch_and_tree('tree')
2568
3056
self.build_tree(['tree/removed'])
2569
tree.add('removed', 'removed-id')
3057
tree.add('removed', b'removed-id')
2570
3058
tt = TreeTransform(tree)
2571
tt.unversion_file(tt.trans_id_file_id('removed-id'))
3059
tt.unversion_file(tt.trans_id_file_id(b'removed-id'))
2572
3060
self.assertMatchingIterEntries(tt)
2574
3062
def test_iter_entries_by_dir_moved(self):
2575
3063
tree = self.make_branch_and_tree('tree')
2576
3064
self.build_tree(['tree/moved', 'tree/new_parent/'])
2577
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
3065
tree.add(['moved', 'new_parent'], [b'moved-id', b'new_parent-id'])
2578
3066
tt = TreeTransform(tree)
2579
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2580
tt.trans_id_file_id('moved-id'))
3067
tt.adjust_path('moved', tt.trans_id_file_id(b'new_parent-id'),
3068
tt.trans_id_file_id(b'moved-id'))
2581
3069
self.assertMatchingIterEntries(tt)
2583
def test_iter_entries_by_dir_specific_file_ids(self):
3071
def test_iter_entries_by_dir_specific_files(self):
2584
3072
tree = self.make_branch_and_tree('tree')
2585
tree.set_root_id('tree-root-id')
3073
tree.set_root_id(b'tree-root-id')
2586
3074
self.build_tree(['tree/parent/', 'tree/parent/child'])
2587
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
3075
tree.add(['parent', 'parent/child'], [b'parent-id', b'child-id'])
2588
3076
tt = TreeTransform(tree)
2589
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
3077
self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2591
3079
def test_symlink_content_summary(self):
2592
3080
self.requireFeature(SymlinkFeature)
2593
3081
preview = self.get_empty_preview()
2594
preview.new_symlink('path', preview.root, 'target', 'path-id')
3082
preview.new_symlink('path', preview.root, 'target', b'path-id')
2595
3083
summary = preview.get_preview_tree().path_content_summary('path')
2596
3084
self.assertEqual(('symlink', None, None, 'target'), summary)
2651
3140
def test_dir_content_summary(self):
2652
3141
preview = self.get_empty_preview()
2653
preview.new_directory('path', preview.root, 'path-id')
3142
preview.new_directory('path', preview.root, b'path-id')
2654
3143
summary = preview.get_preview_tree().path_content_summary('path')
2655
3144
self.assertEqual(('directory', None, None, None), summary)
2657
3146
def test_tree_content_summary(self):
2658
3147
preview = self.get_empty_preview()
2659
path = preview.new_directory('path', preview.root, 'path-id')
2660
preview.set_tree_reference('rev-1', path)
3148
path = preview.new_directory('path', preview.root, b'path-id')
3149
preview.set_tree_reference(b'rev-1', path)
2661
3150
summary = preview.get_preview_tree().path_content_summary('path')
2662
3151
self.assertEqual(4, len(summary))
2663
3152
self.assertEqual('tree-reference', summary[0])
2665
3154
def test_annotate(self):
2666
3155
tree = self.make_branch_and_tree('tree')
2667
self.build_tree_contents([('tree/file', 'a\n')])
2668
tree.add('file', 'file-id')
2669
tree.commit('a', rev_id='one')
2670
self.build_tree_contents([('tree/file', 'a\nb\n')])
3156
self.build_tree_contents([('tree/file', b'a\n')])
3157
tree.add('file', b'file-id')
3158
tree.commit('a', rev_id=b'one')
3159
self.build_tree_contents([('tree/file', b'a\nb\n')])
2671
3160
preview = TransformPreview(tree)
2672
3161
self.addCleanup(preview.finalize)
2673
file_trans_id = preview.trans_id_file_id('file-id')
3162
file_trans_id = preview.trans_id_file_id(b'file-id')
2674
3163
preview.delete_contents(file_trans_id)
2675
preview.create_file('a\nb\nc\n', file_trans_id)
3164
preview.create_file([b'a\nb\nc\n'], file_trans_id)
2676
3165
preview_tree = preview.get_preview_tree()
2682
annotation = preview_tree.annotate_iter('file-id', 'me:')
3171
annotation = preview_tree.annotate_iter(
3172
'file', default_revision=b'me:')
2683
3173
self.assertEqual(expected, annotation)
2685
3175
def test_annotate_missing(self):
2686
3176
preview = self.get_empty_preview()
2687
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3177
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2688
3178
preview_tree = preview.get_preview_tree()
2694
annotation = preview_tree.annotate_iter('file-id', 'me:')
3184
annotation = preview_tree.annotate_iter(
3185
'file', default_revision=b'me:')
2695
3186
self.assertEqual(expected, annotation)
2697
3188
def test_annotate_rename(self):
2698
3189
tree = self.make_branch_and_tree('tree')
2699
self.build_tree_contents([('tree/file', 'a\n')])
2700
tree.add('file', 'file-id')
2701
tree.commit('a', rev_id='one')
3190
self.build_tree_contents([('tree/file', b'a\n')])
3191
tree.add('file', b'file-id')
3192
tree.commit('a', rev_id=b'one')
2702
3193
preview = TransformPreview(tree)
2703
3194
self.addCleanup(preview.finalize)
2704
file_trans_id = preview.trans_id_file_id('file-id')
3195
file_trans_id = preview.trans_id_file_id(b'file-id')
2705
3196
preview.adjust_path('newname', preview.root, file_trans_id)
2706
3197
preview_tree = preview.get_preview_tree()
2710
annotation = preview_tree.annotate_iter('file-id', 'me:')
3201
annotation = preview_tree.annotate_iter(
3202
'file', default_revision=b'me:')
2711
3203
self.assertEqual(expected, annotation)
2713
3205
def test_annotate_deleted(self):
2714
3206
tree = self.make_branch_and_tree('tree')
2715
self.build_tree_contents([('tree/file', 'a\n')])
2716
tree.add('file', 'file-id')
2717
tree.commit('a', rev_id='one')
2718
self.build_tree_contents([('tree/file', 'a\nb\n')])
3207
self.build_tree_contents([('tree/file', b'a\n')])
3208
tree.add('file', b'file-id')
3209
tree.commit('a', rev_id=b'one')
3210
self.build_tree_contents([('tree/file', b'a\nb\n')])
2719
3211
preview = TransformPreview(tree)
2720
3212
self.addCleanup(preview.finalize)
2721
file_trans_id = preview.trans_id_file_id('file-id')
3213
file_trans_id = preview.trans_id_file_id(b'file-id')
2722
3214
preview.delete_contents(file_trans_id)
2723
3215
preview_tree = preview.get_preview_tree()
2724
annotation = preview_tree.annotate_iter('file-id', 'me:')
3216
annotation = preview_tree.annotate_iter(
3217
'file', default_revision=b'me:')
2725
3218
self.assertIs(None, annotation)
2727
3220
def test_stored_kind(self):
2728
3221
preview = self.get_empty_preview()
2729
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3222
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2730
3223
preview_tree = preview.get_preview_tree()
2731
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3224
self.assertEqual('file', preview_tree.stored_kind('file'))
2733
3226
def test_is_executable(self):
2734
3227
preview = self.get_empty_preview()
2735
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
2736
preview.set_executability(True, preview.trans_id_file_id('file-id'))
3228
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
3229
preview.set_executability(True, preview.trans_id_file_id(b'file-id'))
2737
3230
preview_tree = preview.get_preview_tree()
2738
self.assertEqual(True, preview_tree.is_executable('file-id'))
3231
self.assertEqual(True, preview_tree.is_executable('file'))
2740
3233
def test_get_set_parent_ids(self):
2741
3234
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2742
3235
self.assertEqual([], preview_tree.get_parent_ids())
2743
preview_tree.set_parent_ids(['rev-1'])
2744
self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
3236
preview_tree.set_parent_ids([b'rev-1'])
3237
self.assertEqual([b'rev-1'], preview_tree.get_parent_ids())
2746
3239
def test_plan_file_merge(self):
2747
3240
work_a = self.make_branch_and_tree('wta')
2748
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2749
work_a.add('file', 'file-id')
3241
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3242
work_a.add('file', b'file-id')
2750
3243
base_id = work_a.commit('base version')
2751
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3244
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2752
3245
preview = TransformPreview(work_a)
2753
3246
self.addCleanup(preview.finalize)
2754
trans_id = preview.trans_id_file_id('file-id')
3247
trans_id = preview.trans_id_file_id(b'file-id')
2755
3248
preview.delete_contents(trans_id)
2756
preview.create_file('b\nc\nd\ne\n', trans_id)
2757
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3249
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3250
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2758
3251
tree_a = preview.get_preview_tree()
2759
3252
tree_a.set_parent_ids([base_id])
2760
3253
self.assertEqual([
2761
('killed-a', 'a\n'),
2762
('killed-b', 'b\n'),
2763
('unchanged', 'c\n'),
2764
('unchanged', 'd\n'),
2767
], list(tree_a.plan_file_merge('file-id', tree_b)))
3254
('killed-a', b'a\n'),
3255
('killed-b', b'b\n'),
3256
('unchanged', b'c\n'),
3257
('unchanged', b'd\n'),
3260
], list(tree_a.plan_file_merge('file', tree_b)))
2769
3262
def test_plan_file_merge_revision_tree(self):
2770
3263
work_a = self.make_branch_and_tree('wta')
2771
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2772
work_a.add('file', 'file-id')
3264
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3265
work_a.add('file', b'file-id')
2773
3266
base_id = work_a.commit('base version')
2774
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3267
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2775
3268
preview = TransformPreview(work_a.basis_tree())
2776
3269
self.addCleanup(preview.finalize)
2777
trans_id = preview.trans_id_file_id('file-id')
3270
trans_id = preview.trans_id_file_id(b'file-id')
2778
3271
preview.delete_contents(trans_id)
2779
preview.create_file('b\nc\nd\ne\n', trans_id)
2780
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3272
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3273
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2781
3274
tree_a = preview.get_preview_tree()
2782
3275
tree_a.set_parent_ids([base_id])
2783
3276
self.assertEqual([
2784
('killed-a', 'a\n'),
2785
('killed-b', 'b\n'),
2786
('unchanged', 'c\n'),
2787
('unchanged', 'd\n'),
2790
], list(tree_a.plan_file_merge('file-id', tree_b)))
3277
('killed-a', b'a\n'),
3278
('killed-b', b'b\n'),
3279
('unchanged', b'c\n'),
3280
('unchanged', b'd\n'),
3283
], list(tree_a.plan_file_merge('file', tree_b)))
2792
3285
def test_walkdirs(self):
2793
3286
preview = self.get_empty_preview()
2794
root = preview.new_directory('', ROOT_PARENT, 'tree-root')
3287
preview.new_directory('', ROOT_PARENT, b'tree-root')
2795
3288
# FIXME: new_directory should mark root.
2796
3289
preview.fixup_new_roots()
2797
3290
preview_tree = preview.get_preview_tree()
2798
file_trans_id = preview.new_file('a', preview.root, 'contents',
2800
expected = [(('', 'tree-root'),
2801
[('a', 'a', 'file', None, 'a-id', 'file')])]
3291
preview.new_file('a', preview.root, [b'contents'], b'a-id')
3292
expected = [(('', b'tree-root'),
3293
[('a', 'a', 'file', None, b'a-id', 'file')])]
2802
3294
self.assertEqual(expected, list(preview_tree.walkdirs()))
2804
3296
def test_extras(self):
2842
3334
tt = merger.make_merger().make_preview_transform()
2843
3335
self.addCleanup(tt.finalize)
2844
3336
final_tree = tt.get_preview_tree()
2845
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3339
final_tree.get_file_text(final_tree.id2path(b'file-id')))
2847
3341
def test_merge_preview_into_workingtree(self):
2848
3342
tree = self.make_branch_and_tree('tree')
2849
tree.set_root_id('TREE_ROOT')
3343
tree.set_root_id(b'TREE_ROOT')
2850
3344
tt = TransformPreview(tree)
2851
3345
self.addCleanup(tt.finalize)
2852
tt.new_file('name', tt.root, 'content', 'file-id')
3346
tt.new_file('name', tt.root, [b'content'], b'file-id')
2853
3347
tree2 = self.make_branch_and_tree('tree2')
2854
tree2.set_root_id('TREE_ROOT')
3348
tree2.set_root_id(b'TREE_ROOT')
2855
3349
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2856
None, tree.basis_tree())
2857
3351
merger.merge_type = Merge3Merger
2858
3352
merger.do_merge()
2860
3354
def test_merge_preview_into_workingtree_handles_conflicts(self):
2861
3355
tree = self.make_branch_and_tree('tree')
2862
self.build_tree_contents([('tree/foo', 'bar')])
2863
tree.add('foo', 'foo-id')
3356
self.build_tree_contents([('tree/foo', b'bar')])
3357
tree.add('foo', b'foo-id')
2864
3358
tree.commit('foo')
2865
3359
tt = TransformPreview(tree)
2866
3360
self.addCleanup(tt.finalize)
2867
trans_id = tt.trans_id_file_id('foo-id')
3361
trans_id = tt.trans_id_file_id(b'foo-id')
2868
3362
tt.delete_contents(trans_id)
2869
tt.create_file('baz', trans_id)
2870
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2871
self.build_tree_contents([('tree2/foo', 'qux')])
3363
tt.create_file([b'baz'], trans_id)
3364
tree2 = tree.controldir.sprout('tree2').open_workingtree()
3365
self.build_tree_contents([('tree2/foo', b'qux')])
2873
3366
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2874
pb, tree.basis_tree())
2875
3368
merger.merge_type = Merge3Merger
2876
3369
merger.do_merge()
3371
def test_has_filename(self):
3372
wt = self.make_branch_and_tree('tree')
3373
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3374
tt = TransformPreview(wt)
3375
removed_id = tt.trans_id_tree_path('removed')
3376
tt.delete_contents(removed_id)
3377
tt.new_file('new', tt.root, [b'contents'])
3378
modified_id = tt.trans_id_tree_path('modified')
3379
tt.delete_contents(modified_id)
3380
tt.create_file([b'modified-contents'], modified_id)
3381
self.addCleanup(tt.finalize)
3382
tree = tt.get_preview_tree()
3383
self.assertTrue(tree.has_filename('unmodified'))
3384
self.assertFalse(tree.has_filename('not-present'))
3385
self.assertFalse(tree.has_filename('removed'))
3386
self.assertTrue(tree.has_filename('new'))
3387
self.assertTrue(tree.has_filename('modified'))
2878
3389
def test_is_executable(self):
2879
3390
tree = self.make_branch_and_tree('tree')
2880
3391
preview = TransformPreview(tree)
2881
3392
self.addCleanup(preview.finalize)
2882
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3393
preview.new_file('foo', preview.root, [b'bar'], b'baz-id')
2883
3394
preview_tree = preview.get_preview_tree()
2884
self.assertEqual(False, preview_tree.is_executable('baz-id',
2886
self.assertEqual(False, preview_tree.is_executable('baz-id'))
3395
self.assertEqual(False, preview_tree.is_executable('tree/foo'))
2888
3397
def test_commit_preview_tree(self):
2889
3398
tree = self.make_branch_and_tree('tree')
3166
3675
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3168
3677
def test_get_parents_lines(self):
3169
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3170
LINES_TWO = 'z\nbb\nx\ndd\n'
3678
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3171
3679
tree = self.make_branch_and_tree('tree')
3172
3680
self.build_tree_contents([('tree/file', LINES_ONE)])
3173
tree.add('file', 'file-id')
3681
tree.add('file', b'file-id')
3174
3682
tt = self.get_preview(tree)
3175
3683
trans_id = tt.trans_id_tree_path('file')
3176
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3177
tt._get_parents_lines(trans_id))
3684
self.assertEqual(([b'aa\n', b'bb\n', b'cc\n', b'dd\n'],),
3685
tt._get_parents_lines(trans_id))
3179
3687
def test_get_parents_texts(self):
3180
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3181
LINES_TWO = 'z\nbb\nx\ndd\n'
3688
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3182
3689
tree = self.make_branch_and_tree('tree')
3183
3690
self.build_tree_contents([('tree/file', LINES_ONE)])
3184
tree.add('file', 'file-id')
3691
tree.add('file', b'file-id')
3185
3692
tt = self.get_preview(tree)
3186
3693
trans_id = tt.trans_id_tree_path('file')
3187
3694
self.assertEqual((LINES_ONE,),
3188
tt._get_parents_texts(trans_id))
3695
tt._get_parents_texts(trans_id))
3698
class TestOrphan(tests.TestCaseWithTransport):
3700
def test_no_orphan_for_transform_preview(self):
3701
tree = self.make_branch_and_tree('tree')
3702
tt = transform.TransformPreview(tree)
3703
self.addCleanup(tt.finalize)
3704
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3706
def _set_orphan_policy(self, wt, policy):
3707
wt.branch.get_config_stack().set('transform.orphan_policy',
3710
def _prepare_orphan(self, wt):
3711
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3712
wt.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
3713
wt.commit('add dir and file ignoring foo')
3714
tt = transform.TreeTransform(wt)
3715
self.addCleanup(tt.finalize)
3716
# dir and bar are deleted
3717
dir_tid = tt.trans_id_tree_path('dir')
3718
file_tid = tt.trans_id_tree_path('dir/file')
3719
orphan_tid = tt.trans_id_tree_path('dir/foo')
3720
tt.delete_contents(file_tid)
3721
tt.unversion_file(file_tid)
3722
tt.delete_contents(dir_tid)
3723
tt.unversion_file(dir_tid)
3724
# There should be a conflict because dir still contain foo
3725
raw_conflicts = tt.find_conflicts()
3726
self.assertLength(1, raw_conflicts)
3727
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3728
return tt, orphan_tid
3730
def test_new_orphan_created(self):
3731
wt = self.make_branch_and_tree('.')
3732
self._set_orphan_policy(wt, 'move')
3733
tt, orphan_tid = self._prepare_orphan(wt)
3737
warnings.append(args[0] % args[1:])
3738
self.overrideAttr(trace, 'warning', warning)
3739
remaining_conflicts = resolve_conflicts(tt)
3740
self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
3742
# Yeah for resolved conflicts !
3743
self.assertLength(0, remaining_conflicts)
3744
# We have a new orphan
3745
self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
3746
self.assertEqual('brz-orphans',
3747
tt.final_name(tt.final_parent(orphan_tid)))
3749
def test_never_orphan(self):
3750
wt = self.make_branch_and_tree('.')
3751
self._set_orphan_policy(wt, 'conflict')
3752
tt, orphan_tid = self._prepare_orphan(wt)
3753
remaining_conflicts = resolve_conflicts(tt)
3754
self.assertLength(1, remaining_conflicts)
3755
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3756
remaining_conflicts.pop())
3758
def test_orphan_error(self):
3759
def bogus_orphan(tt, orphan_id, parent_id):
3760
raise transform.OrphaningError(tt.final_name(orphan_id),
3761
tt.final_name(parent_id))
3762
transform.orphaning_registry.register('bogus', bogus_orphan,
3763
'Raise an error when orphaning')
3764
wt = self.make_branch_and_tree('.')
3765
self._set_orphan_policy(wt, 'bogus')
3766
tt, orphan_tid = self._prepare_orphan(wt)
3767
remaining_conflicts = resolve_conflicts(tt)
3768
self.assertLength(1, remaining_conflicts)
3769
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3770
remaining_conflicts.pop())
3772
def test_unknown_orphan_policy(self):
3773
wt = self.make_branch_and_tree('.')
3774
# Set a fictional policy nobody ever implemented
3775
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3776
tt, orphan_tid = self._prepare_orphan(wt)
3780
warnings.append(args[0] % args[1:])
3781
self.overrideAttr(trace, 'warning', warning)
3782
remaining_conflicts = resolve_conflicts(tt)
3783
# We fallback to the default policy which create a conflict
3784
self.assertLength(1, remaining_conflicts)
3785
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3786
remaining_conflicts.pop())
3787
self.assertLength(1, warnings)
3788
self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3791
class TestTransformHooks(tests.TestCaseWithTransport):
3794
super(TestTransformHooks, self).setUp()
3795
self.wt = self.make_branch_and_tree('.')
3798
def get_transform(self):
3799
transform = TreeTransform(self.wt)
3800
self.addCleanup(transform.finalize)
3801
return transform, transform.root
3803
def test_pre_commit_hooks(self):
3806
def record_pre_transform(tree, tt):
3807
calls.append((tree, tt))
3808
MutableTree.hooks.install_named_hook(
3809
'pre_transform', record_pre_transform, "Pre transform")
3810
transform, root = self.get_transform()
3811
old_root_id = transform.tree_file_id(root)
3813
self.assertEqual(old_root_id, self.wt.path2id(''))
3814
self.assertEqual([(self.wt, transform)], calls)
3816
def test_post_commit_hooks(self):
3819
def record_post_transform(tree, tt):
3820
calls.append((tree, tt))
3821
MutableTree.hooks.install_named_hook(
3822
'post_transform', record_post_transform, "Post transform")
3823
transform, root = self.get_transform()
3824
old_root_id = transform.tree_file_id(root)
3826
self.assertEqual(old_root_id, self.wt.path2id(''))
3827
self.assertEqual([(self.wt, transform)], calls)
3830
class TestLinkTree(tests.TestCaseWithTransport):
3832
_test_needs_features = [HardlinkFeature]
3835
tests.TestCaseWithTransport.setUp(self)
3836
self.parent_tree = self.make_branch_and_tree('parent')
3837
self.parent_tree.lock_write()
3838
self.addCleanup(self.parent_tree.unlock)
3839
self.build_tree_contents([('parent/foo', b'bar')])
3840
self.parent_tree.add('foo')
3841
self.parent_tree.commit('added foo')
3842
child_controldir = self.parent_tree.controldir.sprout('child')
3843
self.child_tree = child_controldir.open_workingtree()
3845
def hardlinked(self):
3846
parent_stat = os.lstat(self.parent_tree.abspath('foo'))
3847
child_stat = os.lstat(self.child_tree.abspath('foo'))
3848
return parent_stat.st_ino == child_stat.st_ino
3850
def test_link_fails_if_modified(self):
3851
"""If the file to be linked has modified text, don't link."""
3852
self.build_tree_contents([('child/foo', b'baz')])
3853
transform.link_tree(self.child_tree, self.parent_tree)
3854
self.assertFalse(self.hardlinked())
3856
def test_link_fails_if_execute_bit_changed(self):
3857
"""If the file to be linked has modified execute bit, don't link."""
3858
tt = TreeTransform(self.child_tree)
3860
trans_id = tt.trans_id_tree_path('foo')
3861
tt.set_executability(True, trans_id)
3865
transform.link_tree(self.child_tree, self.parent_tree)
3866
self.assertFalse(self.hardlinked())
3868
def test_link_succeeds_if_unmodified(self):
3869
"""If the file to be linked is unmodified, link"""
3870
transform.link_tree(self.child_tree, self.parent_tree)
3871
self.assertTrue(self.hardlinked())
added
removed
breezy/tests/test_transform.py
