101
145
imaginary_id = transform.trans_id_tree_path('imaginary')
102
146
imaginary_id2 = transform.trans_id_tree_path('imaginary/')
103
147
self.assertEqual(imaginary_id, imaginary_id2)
104
self.assertEqual(transform.get_tree_parent(imaginary_id), root)
105
self.assertEqual(transform.final_kind(root), 'directory')
106
self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
148
self.assertEqual(root, transform.get_tree_parent(imaginary_id))
149
self.assertEqual('directory', transform.final_kind(root))
150
self.assertEqual(self.wt.path2id(''), transform.final_file_id(root))
107
151
trans_id = transform.create_path('name', root)
108
152
self.assertIs(transform.final_file_id(trans_id), None)
109
self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
110
transform.create_file('contents', trans_id)
153
self.assertIs(None, transform.final_kind(trans_id))
154
transform.create_file([b'contents'], trans_id)
111
155
transform.set_executability(True, trans_id)
112
transform.version_file('my_pretties', trans_id)
156
transform.version_file(b'my_pretties', trans_id)
113
157
self.assertRaises(DuplicateKey, transform.version_file,
114
'my_pretties', trans_id)
115
self.assertEqual(transform.final_file_id(trans_id), 'my_pretties')
158
b'my_pretties', trans_id)
159
self.assertEqual(transform.final_file_id(trans_id), b'my_pretties')
116
160
self.assertEqual(transform.final_parent(trans_id), root)
117
161
self.assertIs(transform.final_parent(root), ROOT_PARENT)
118
162
self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
119
163
oz_id = transform.create_path('oz', root)
120
164
transform.create_directory(oz_id)
121
transform.version_file('ozzie', oz_id)
165
transform.version_file(b'ozzie', oz_id)
122
166
trans_id2 = transform.create_path('name2', root)
123
transform.create_file('contents', trans_id2)
167
transform.create_file([b'contents'], trans_id2)
124
168
transform.set_executability(False, trans_id2)
125
transform.version_file('my_pretties2', trans_id2)
169
transform.version_file(b'my_pretties2', trans_id2)
126
170
modified_paths = transform.apply().modified_paths
127
self.assertEqual('contents', self.wt.get_file_byname('name').read())
128
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
129
self.assertIs(self.wt.is_executable('my_pretties'), True)
130
self.assertIs(self.wt.is_executable('my_pretties2'), False)
171
with self.wt.get_file('name') as f:
172
self.assertEqual(b'contents', f.read())
173
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
174
self.assertIs(self.wt.is_executable('name'), True)
175
self.assertIs(self.wt.is_executable('name2'), False)
131
176
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
132
177
self.assertEqual(len(modified_paths), 3)
133
tree_mod_paths = [self.wt.id2abspath(f) for f in
134
('ozzie', 'my_pretties', 'my_pretties2')]
178
tree_mod_paths = [self.wt.abspath(self.wt.id2path(f)) for f in
179
(b'ozzie', b'my_pretties', b'my_pretties2')]
135
180
self.assertSubset(tree_mod_paths, modified_paths)
136
181
# is it safe to finalize repeatedly?
137
182
transform.finalize()
138
183
transform.finalize()
185
def test_apply_informs_tree_of_observed_sha1(self):
186
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
187
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
190
orig = self.wt._observed_sha1
192
def _observed_sha1(*args):
195
self.wt._observed_sha1 = _observed_sha1
197
self.assertEqual([('file1', trans._observed_sha1s[trans_id])],
200
def test_create_file_caches_sha1(self):
201
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
202
trans_id = trans.create_path('file1', root)
203
trans.create_file(contents, trans_id, sha1=sha1)
204
st_val = osutils.lstat(trans._limbo_name(trans_id))
205
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
206
self.assertEqual(o_sha1, sha1)
207
self.assertEqualStat(o_st_val, st_val)
209
def test__apply_insertions_updates_sha1(self):
210
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
211
trans_id = trans.create_path('file1', root)
212
trans.create_file(contents, trans_id, sha1=sha1)
213
st_val = osutils.lstat(trans._limbo_name(trans_id))
214
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
215
self.assertEqual(o_sha1, sha1)
216
self.assertEqualStat(o_st_val, st_val)
217
creation_mtime = trans._creation_mtime + 10.0
218
# We fake a time difference from when the file was created until now it
219
# is being renamed by using os.utime. Note that the change we actually
220
# want to see is the real ctime change from 'os.rename()', but as long
221
# as we observe a new stat value, we should be fine.
222
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
224
new_st_val = osutils.lstat(self.wt.abspath('file1'))
225
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
226
self.assertEqual(o_sha1, sha1)
227
self.assertEqualStat(o_st_val, new_st_val)
228
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
230
def test_new_file_caches_sha1(self):
231
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
232
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
234
st_val = osutils.lstat(trans._limbo_name(trans_id))
235
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
236
self.assertEqual(o_sha1, sha1)
237
self.assertEqualStat(o_st_val, st_val)
239
def test_cancel_creation_removes_observed_sha1(self):
240
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
241
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
243
self.assertTrue(trans_id in trans._observed_sha1s)
244
trans.cancel_creation(trans_id)
245
self.assertFalse(trans_id in trans._observed_sha1s)
140
247
def test_create_files_same_timestamp(self):
141
248
transform, root = self.get_transform()
142
249
self.wt.lock_tree_write()
144
251
# Roll back the clock, so that we know everything is being set to the
146
253
transform._creation_mtime = creation_mtime = time.time() - 20.0
147
transform.create_file('content-one',
254
transform.create_file([b'content-one'],
148
255
transform.create_path('one', root))
149
time.sleep(1) # *ugly*
150
transform.create_file('content-two',
256
time.sleep(1) # *ugly*
257
transform.create_file([b'content-two'],
151
258
transform.create_path('two', root))
152
259
transform.apply()
153
fo, st1 = self.wt.get_file_with_stat(None, path='one', filtered=False)
260
fo, st1 = self.wt.get_file_with_stat('one', filtered=False)
155
fo, st2 = self.wt.get_file_with_stat(None, path='two', filtered=False)
262
fo, st2 = self.wt.get_file_with_stat('two', filtered=False)
157
264
# We only guarantee 2s resolution
158
self.assertTrue(abs(creation_mtime - st1.st_mtime) < 2.0,
266
abs(creation_mtime - st1.st_mtime) < 2.0,
159
267
"%s != %s within 2 seconds" % (creation_mtime, st1.st_mtime))
160
268
# But if we have more than that, all files should get the same result
161
269
self.assertEqual(st1.st_mtime, st2.st_mtime)
163
271
def test_change_root_id(self):
164
272
transform, root = self.get_transform()
165
self.assertNotEqual('new-root-id', self.wt.get_root_id())
166
transform.new_directory('', ROOT_PARENT, 'new-root-id')
273
self.assertNotEqual(b'new-root-id', self.wt.path2id(''))
274
transform.new_directory('', ROOT_PARENT, b'new-root-id')
167
275
transform.delete_contents(root)
168
276
transform.unversion_file(root)
169
277
transform.fixup_new_roots()
170
278
transform.apply()
171
self.assertEqual('new-root-id', self.wt.get_root_id())
279
self.assertEqual(b'new-root-id', self.wt.path2id(''))
173
281
def test_change_root_id_add_files(self):
174
282
transform, root = self.get_transform()
175
self.assertNotEqual('new-root-id', self.wt.get_root_id())
176
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
177
transform.new_file('file', new_trans_id, ['new-contents\n'],
283
self.assertNotEqual(b'new-root-id', self.wt.path2id(''))
284
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
285
transform.new_file('file', new_trans_id, [b'new-contents\n'],
179
287
transform.delete_contents(root)
180
288
transform.unversion_file(root)
181
289
transform.fixup_new_roots()
182
290
transform.apply()
183
self.assertEqual('new-root-id', self.wt.get_root_id())
184
self.assertEqual('new-file-id', self.wt.path2id('file'))
185
self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
291
self.assertEqual(b'new-root-id', self.wt.path2id(''))
292
self.assertEqual(b'new-file-id', self.wt.path2id('file'))
293
self.assertFileEqual(b'new-contents\n', self.wt.abspath('file'))
187
295
def test_add_two_roots(self):
188
296
transform, root = self.get_transform()
189
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
190
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
191
self.assertRaises(ValueError, transform.fixup_new_roots)
297
transform.new_directory('', ROOT_PARENT, b'new-root-id')
298
transform.new_directory('', ROOT_PARENT, b'alt-root-id')
299
self.assertRaises(ValueError, transform.fixup_new_roots)
301
def test_retain_existing_root(self):
302
tt, root = self.get_transform()
304
tt.new_directory('', ROOT_PARENT, b'new-root-id')
306
self.assertNotEqual(b'new-root-id', tt.final_file_id(tt.root))
308
def test_retain_existing_root_added_file(self):
309
tt, root = self.get_transform()
310
new_trans_id = tt.new_directory('', ROOT_PARENT, b'new-root-id')
311
child = tt.new_directory('child', new_trans_id, b'child-id')
313
self.assertEqual(tt.root, tt.final_parent(child))
315
def test_add_unversioned_root(self):
316
transform, root = self.get_transform()
317
transform.new_directory('', ROOT_PARENT, None)
318
transform.delete_contents(transform.root)
319
transform.fixup_new_roots()
320
self.assertNotIn(transform.root, transform._new_id)
322
def test_remove_root_fixup(self):
323
transform, root = self.get_transform()
324
old_root_id = self.wt.path2id('')
325
self.assertNotEqual(b'new-root-id', old_root_id)
326
transform.delete_contents(root)
327
transform.unversion_file(root)
328
transform.fixup_new_roots()
330
self.assertEqual(old_root_id, self.wt.path2id(''))
332
transform, root = self.get_transform()
333
transform.new_directory('', ROOT_PARENT, b'new-root-id')
334
transform.new_directory('', ROOT_PARENT, b'alt-root-id')
335
self.assertRaises(ValueError, transform.fixup_new_roots)
337
def test_fixup_new_roots_permits_empty_tree(self):
338
transform, root = self.get_transform()
339
transform.delete_contents(root)
340
transform.unversion_file(root)
341
transform.fixup_new_roots()
342
self.assertIs(None, transform.final_kind(root))
343
self.assertIs(None, transform.final_file_id(root))
345
def test_apply_retains_root_directory(self):
346
# Do not attempt to delete the physical root directory, because that
348
transform, root = self.get_transform()
350
transform.delete_contents(root)
351
e = self.assertRaises(AssertionError, self.assertRaises,
352
errors.TransformRenameFailed,
354
self.assertContainsRe('TransformRenameFailed not raised', str(e))
356
def test_apply_retains_file_id(self):
357
transform, root = self.get_transform()
358
old_root_id = transform.tree_file_id(root)
359
transform.unversion_file(root)
361
self.assertEqual(old_root_id, self.wt.path2id(''))
193
363
def test_hardlink(self):
194
364
self.requireFeature(HardlinkFeature)
195
365
transform, root = self.get_transform()
196
transform.new_file('file1', root, 'contents')
366
transform.new_file('file1', root, [b'contents'])
197
367
transform.apply()
198
368
target = self.make_branch_and_tree('target')
199
369
target_transform = TreeTransform(target)
200
370
trans_id = target_transform.create_path('file1', target_transform.root)
201
371
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
202
372
target_transform.apply()
203
self.failUnlessExists('target/file1')
373
self.assertPathExists('target/file1')
204
374
source_stat = os.stat(self.wt.abspath('file1'))
205
375
target_stat = os.stat('target/file1')
206
376
self.assertEqual(source_stat, target_stat)
209
379
transform, root = self.get_transform()
210
380
self.wt.lock_tree_write()
211
381
self.addCleanup(self.wt.unlock)
212
trans_id = transform.new_file('name', root, 'contents',
214
oz = transform.new_directory('oz', root, 'oz-id')
215
dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
216
toto = transform.new_file('toto', dorothy, 'toto-contents',
382
transform.new_file('name', root, [b'contents'], b'my_pretties', True)
383
oz = transform.new_directory('oz', root, b'oz-id')
384
dorothy = transform.new_directory('dorothy', oz, b'dorothy-id')
385
transform.new_file('toto', dorothy, [b'toto-contents'], b'toto-id',
219
388
self.assertEqual(len(transform.find_conflicts()), 0)
220
389
transform.apply()
221
390
self.assertRaises(ReusingTransform, transform.find_conflicts)
222
self.assertEqual('contents', file(self.wt.abspath('name')).read())
223
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
224
self.assertIs(self.wt.is_executable('my_pretties'), True)
225
self.assertEqual(self.wt.path2id('oz'), 'oz-id')
226
self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
227
self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
391
with open(self.wt.abspath('name'), 'r') as f:
392
self.assertEqual('contents', f.read())
393
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
394
self.assertIs(self.wt.is_executable('name'), True)
395
self.assertEqual(self.wt.path2id('oz'), b'oz-id')
396
self.assertEqual(self.wt.path2id('oz/dorothy'), b'dorothy-id')
397
self.assertEqual(self.wt.path2id('oz/dorothy/toto'), b'toto-id')
229
self.assertEqual('toto-contents',
230
self.wt.get_file_byname('oz/dorothy/toto').read())
231
self.assertIs(self.wt.is_executable('toto-id'), False)
399
self.assertEqual(b'toto-contents',
400
self.wt.get_file('oz/dorothy/toto').read())
401
self.assertIs(self.wt.is_executable('oz/dorothy/toto'), False)
233
403
def test_tree_reference(self):
234
404
transform, root = self.get_transform()
235
405
tree = transform._tree
236
trans_id = transform.new_directory('reference', root, 'subtree-id')
237
transform.set_tree_reference('subtree-revision', trans_id)
406
trans_id = transform.new_directory('reference', root, b'subtree-id')
407
transform.set_tree_reference(b'subtree-revision', trans_id)
238
408
transform.apply()
240
410
self.addCleanup(tree.unlock)
241
self.assertEqual('subtree-revision',
242
tree.inventory['subtree-id'].reference_revision)
413
tree.root_inventory.get_entry(b'subtree-id').reference_revision)
244
415
def test_conflicts(self):
245
416
transform, root = self.get_transform()
246
trans_id = transform.new_file('name', root, 'contents',
417
trans_id = transform.new_file('name', root, [b'contents'],
248
419
self.assertEqual(len(transform.find_conflicts()), 0)
249
trans_id2 = transform.new_file('name', root, 'Crontents', 'toto')
420
trans_id2 = transform.new_file('name', root, [b'Crontents'], b'toto')
250
421
self.assertEqual(transform.find_conflicts(),
251
422
[('duplicate', trans_id, trans_id2, 'name')])
252
423
self.assertRaises(MalformedTransform, transform.apply)
463
635
create_tree, root = self.get_transform()
465
637
root = create_tree.root
466
create_tree.new_file('name1', root, 'hello1', 'name1')
467
create_tree.new_file('name2', root, 'hello2', 'name2')
468
ddir = create_tree.new_directory('dying_directory', root, 'ddir')
469
create_tree.new_file('dying_file', ddir, 'goodbye1', 'dfile')
470
create_tree.new_file('moving_file', ddir, 'later1', 'mfile')
471
create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
638
create_tree.new_file('name1', root, [b'hello1'], b'name1')
639
create_tree.new_file('name2', root, [b'hello2'], b'name2')
640
ddir = create_tree.new_directory('dying_directory', root, b'ddir')
641
create_tree.new_file('dying_file', ddir, [b'goodbye1'], b'dfile')
642
create_tree.new_file('moving_file', ddir, [b'later1'], b'mfile')
643
create_tree.new_file('moving_file2', root, [b'later2'], b'mfile2')
472
644
create_tree.apply()
474
mangle_tree,root = self.get_transform()
646
mangle_tree, root = self.get_transform()
475
647
root = mangle_tree.root
477
name1 = mangle_tree.trans_id_tree_file_id('name1')
478
name2 = mangle_tree.trans_id_tree_file_id('name2')
649
name1 = mangle_tree.trans_id_tree_path('name1')
650
name2 = mangle_tree.trans_id_tree_path('name2')
479
651
mangle_tree.adjust_path('name2', root, name1)
480
652
mangle_tree.adjust_path('name1', root, name2)
482
#tests for deleting parent directories
483
ddir = mangle_tree.trans_id_tree_file_id('ddir')
654
# tests for deleting parent directories
655
ddir = mangle_tree.trans_id_tree_path('dying_directory')
484
656
mangle_tree.delete_contents(ddir)
485
dfile = mangle_tree.trans_id_tree_file_id('dfile')
657
dfile = mangle_tree.trans_id_tree_path('dying_directory/dying_file')
486
658
mangle_tree.delete_versioned(dfile)
487
659
mangle_tree.unversion_file(dfile)
488
mfile = mangle_tree.trans_id_tree_file_id('mfile')
660
mfile = mangle_tree.trans_id_tree_path('dying_directory/moving_file')
489
661
mangle_tree.adjust_path('mfile', root, mfile)
491
#tests for adding parent directories
492
newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
493
mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
663
# tests for adding parent directories
664
newdir = mangle_tree.new_directory('new_directory', root, b'newdir')
665
mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
494
666
mangle_tree.adjust_path('mfile2', newdir, mfile2)
495
mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
496
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
667
mangle_tree.new_file('newfile', newdir, [b'hello3'], b'dfile')
668
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
497
669
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
498
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
670
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
499
671
mangle_tree.apply()
500
self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
501
self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
502
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
672
with open(self.wt.abspath('name1'), 'r') as f:
673
self.assertEqual(f.read(), 'hello2')
674
with open(self.wt.abspath('name2'), 'r') as f:
675
self.assertEqual(f.read(), 'hello1')
676
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
503
677
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
504
self.assertEqual(file(mfile2_path).read(), 'later2')
505
self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
506
self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
507
newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
508
self.assertEqual(file(newfile_path).read(), 'hello3')
509
self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
678
with open(mfile2_path, 'r') as f:
679
self.assertEqual(f.read(), 'later2')
680
self.assertEqual(self.wt.id2path(b'mfile2'), 'new_directory/mfile2')
681
self.assertEqual(self.wt.path2id('new_directory/mfile2'), b'mfile2')
682
newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
683
with open(newfile_path, 'r') as f:
684
self.assertEqual(f.read(), 'hello3')
685
self.assertEqual(self.wt.path2id('dying_directory'), b'ddir')
510
686
self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
511
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
687
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
513
689
def test_both_rename(self):
514
create_tree,root = self.get_transform()
515
newdir = create_tree.new_directory('selftest', root, 'selftest-id')
516
create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
690
create_tree, root = self.get_transform()
691
newdir = create_tree.new_directory('selftest', root, b'selftest-id')
692
create_tree.new_file('blackbox.py', newdir, [
693
b'hello1'], b'blackbox-id')
517
694
create_tree.apply()
518
mangle_tree,root = self.get_transform()
519
selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
520
blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
695
mangle_tree, root = self.get_transform()
696
selftest = mangle_tree.trans_id_tree_path('selftest')
697
blackbox = mangle_tree.trans_id_tree_path('selftest/blackbox.py')
521
698
mangle_tree.adjust_path('test', root, selftest)
522
699
mangle_tree.adjust_path('test_too_much', root, selftest)
523
700
mangle_tree.set_executability(True, blackbox)
524
701
mangle_tree.apply()
526
703
def test_both_rename2(self):
527
create_tree,root = self.get_transform()
528
bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
529
tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
530
blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
531
create_tree.new_file('test_too_much.py', blackbox, 'hello1',
704
create_tree, root = self.get_transform()
705
breezy = create_tree.new_directory('breezy', root, b'breezy-id')
706
tests = create_tree.new_directory('tests', breezy, b'tests-id')
707
blackbox = create_tree.new_directory('blackbox', tests, b'blackbox-id')
708
create_tree.new_file('test_too_much.py', blackbox, [b'hello1'],
533
710
create_tree.apply()
534
mangle_tree,root = self.get_transform()
535
bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
536
tests = mangle_tree.trans_id_tree_file_id('tests-id')
537
test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
538
mangle_tree.adjust_path('selftest', bzrlib, tests)
711
mangle_tree, root = self.get_transform()
712
breezy = mangle_tree.trans_id_tree_path('breezy')
713
tests = mangle_tree.trans_id_tree_path('breezy/tests')
714
test_too_much = mangle_tree.trans_id_tree_path(
715
'breezy/tests/blackbox/test_too_much.py')
716
mangle_tree.adjust_path('selftest', breezy, tests)
539
717
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
540
718
mangle_tree.set_executability(True, test_too_much)
541
719
mangle_tree.apply()
543
721
def test_both_rename3(self):
544
create_tree,root = self.get_transform()
545
tests = create_tree.new_directory('tests', root, 'tests-id')
546
create_tree.new_file('test_too_much.py', tests, 'hello1',
722
create_tree, root = self.get_transform()
723
tests = create_tree.new_directory('tests', root, b'tests-id')
724
create_tree.new_file('test_too_much.py', tests, [b'hello1'],
548
726
create_tree.apply()
549
mangle_tree,root = self.get_transform()
550
tests = mangle_tree.trans_id_tree_file_id('tests-id')
551
test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
727
mangle_tree, root = self.get_transform()
728
tests = mangle_tree.trans_id_tree_path('tests')
729
test_too_much = mangle_tree.trans_id_tree_path(
730
'tests/test_too_much.py')
552
731
mangle_tree.adjust_path('selftest', root, tests)
553
732
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
554
733
mangle_tree.set_executability(True, test_too_much)
622
801
'wizard2', 'behind_curtain')
624
803
def test_symlinks_unicode(self):
625
self.requireFeature(tests.UnicodeFilenameFeature)
804
self.requireFeature(features.UnicodeFilenameFeature)
626
805
self._test_symlinks(u'\N{Euro Sign}wizard',
627
806
u'wizard-targ\N{Euro Sign}t',
628
807
u'\N{Euro Sign}wizard2',
629
808
u'b\N{Euro Sign}hind_curtain')
631
def test_unable_create_symlink(self):
810
def test_unsupported_symlink_no_conflict(self):
633
812
wt = self.make_branch_and_tree('.')
634
tt = TreeTransform(wt) # TreeTransform obtains write lock
636
tt.new_symlink('foo', tt.root, 'bar')
813
tt = TreeTransform(wt)
814
self.addCleanup(tt.finalize)
815
tt.new_symlink('foo', tt.root, 'bar')
816
result = tt.find_conflicts()
817
self.assertEqual([], result)
640
818
os_symlink = getattr(os, 'symlink', None)
641
819
os.symlink = None
643
err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
645
"Unable to create symlink 'foo' on this platform",
649
824
os.symlink = os_symlink
651
826
def get_conflicted(self):
652
create,root = self.get_transform()
653
create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
654
oz = create.new_directory('oz', root, 'oz-id')
655
create.new_directory('emeraldcity', oz, 'emerald-id')
827
create, root = self.get_transform()
828
create.new_file('dorothy', root, [b'dorothy'], b'dorothy-id')
829
oz = create.new_directory('oz', root, b'oz-id')
830
create.new_directory('emeraldcity', oz, b'emerald-id')
657
conflicts,root = self.get_transform()
832
conflicts, root = self.get_transform()
658
833
# set up duplicate entry, duplicate id
659
new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
661
old_dorothy = conflicts.trans_id_tree_file_id('dorothy-id')
662
oz = conflicts.trans_id_tree_file_id('oz-id')
834
new_dorothy = conflicts.new_file('dorothy', root, [b'dorothy'],
836
old_dorothy = conflicts.trans_id_tree_path('dorothy')
837
oz = conflicts.trans_id_tree_path('oz')
663
838
# set up DeletedParent parent conflict
664
839
conflicts.delete_versioned(oz)
665
emerald = conflicts.trans_id_tree_file_id('emerald-id')
840
emerald = conflicts.trans_id_tree_path('oz/emeraldcity')
666
841
# set up MissingParent conflict
667
munchkincity = conflicts.trans_id_file_id('munchkincity-id')
842
munchkincity = conflicts.trans_id_file_id(b'munchkincity-id')
668
843
conflicts.adjust_path('munchkincity', root, munchkincity)
669
conflicts.new_directory('auntem', munchkincity, 'auntem-id')
844
conflicts.new_directory('auntem', munchkincity, b'auntem-id')
670
845
# set up parent loop
671
846
conflicts.adjust_path('emeraldcity', emerald, emerald)
672
847
return conflicts, emerald, oz, old_dorothy, new_dorothy
753
930
def test_resolve_conflicts_wrong_existing_parent_kind(self):
754
931
tt = self.prepare_wrong_parent_kind()
755
932
raw_conflicts = resolve_conflicts(tt)
756
self.assertEqual(set([('non-directory parent', 'Created directory',
757
'new-3')]), raw_conflicts)
933
self.assertEqual({('non-directory parent', 'Created directory',
934
'new-3')}, raw_conflicts)
758
935
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
759
936
self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
760
'parent-id')], cooked_conflicts)
937
b'parent-id')], cooked_conflicts)
762
self.assertEqual(None, self.wt.path2id('parent'))
763
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
939
self.assertFalse(self.wt.is_versioned('parent'))
940
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
765
942
def test_resolve_conflicts_wrong_new_parent_kind(self):
766
943
tt, root = self.get_transform()
767
parent_id = tt.new_directory('parent', root, 'parent-id')
768
tt.new_file('child,', parent_id, 'contents2', 'file-id')
944
parent_id = tt.new_directory('parent', root, b'parent-id')
945
tt.new_file('child,', parent_id, [b'contents2'], b'file-id')
770
947
tt, root = self.get_transform()
771
parent_id = tt.trans_id_file_id('parent-id')
948
parent_id = tt.trans_id_file_id(b'parent-id')
772
949
tt.delete_contents(parent_id)
773
tt.create_file('contents', parent_id)
950
tt.create_file([b'contents'], parent_id)
774
951
raw_conflicts = resolve_conflicts(tt)
775
self.assertEqual(set([('non-directory parent', 'Created directory',
776
'new-3')]), raw_conflicts)
952
self.assertEqual({('non-directory parent', 'Created directory',
953
'new-3')}, raw_conflicts)
778
self.assertEqual(None, self.wt.path2id('parent'))
779
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
955
self.assertFalse(self.wt.is_versioned('parent'))
956
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
781
958
def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
782
959
tt, root = self.get_transform()
783
960
parent_id = tt.new_directory('parent', root)
784
tt.new_file('child,', parent_id, 'contents2')
961
tt.new_file('child,', parent_id, [b'contents2'])
786
963
tt, root = self.get_transform()
787
964
parent_id = tt.trans_id_tree_path('parent')
788
965
tt.delete_contents(parent_id)
789
tt.create_file('contents', parent_id)
966
tt.create_file([b'contents'], parent_id)
790
967
resolve_conflicts(tt)
792
self.assertIs(None, self.wt.path2id('parent'))
793
self.assertIs(None, self.wt.path2id('parent.new'))
969
self.assertFalse(self.wt.is_versioned('parent'))
970
self.assertFalse(self.wt.is_versioned('parent.new'))
972
def test_resolve_conflicts_missing_parent(self):
973
wt = self.make_branch_and_tree('.')
974
tt = TreeTransform(wt)
975
self.addCleanup(tt.finalize)
976
parent = tt.trans_id_file_id(b'parent-id')
977
tt.new_file('file', parent, [b'Contents'])
978
raw_conflicts = resolve_conflicts(tt)
979
# Since the directory doesn't exist it's seen as 'missing'. So
980
# 'resolve_conflicts' create a conflict asking for it to be created.
981
self.assertLength(1, raw_conflicts)
982
self.assertEqual(('missing parent', 'Created directory', 'new-1'),
984
# apply fail since the missing directory doesn't exist
985
self.assertRaises(errors.NoFinalPath, tt.apply)
795
987
def test_moving_versioned_directories(self):
796
988
create, root = self.get_transform()
797
kansas = create.new_directory('kansas', root, 'kansas-id')
798
create.new_directory('house', kansas, 'house-id')
799
create.new_directory('oz', root, 'oz-id')
989
kansas = create.new_directory('kansas', root, b'kansas-id')
990
create.new_directory('house', kansas, b'house-id')
991
create.new_directory('oz', root, b'oz-id')
801
993
cyclone, root = self.get_transform()
802
oz = cyclone.trans_id_tree_file_id('oz-id')
803
house = cyclone.trans_id_tree_file_id('house-id')
994
oz = cyclone.trans_id_tree_path('oz')
995
house = cyclone.trans_id_tree_path('house')
804
996
cyclone.adjust_path('house', oz, house)
807
999
def test_moving_root(self):
808
1000
create, root = self.get_transform()
809
fun = create.new_directory('fun', root, 'fun-id')
810
create.new_directory('sun', root, 'sun-id')
811
create.new_directory('moon', root, 'moon')
1001
fun = create.new_directory('fun', root, b'fun-id')
1002
create.new_directory('sun', root, b'sun-id')
1003
create.new_directory('moon', root, b'moon')
813
1005
transform, root = self.get_transform()
814
1006
transform.adjust_root_path('oldroot', fun)
815
1007
new_root = transform.trans_id_tree_path('')
816
transform.version_file('new-root', new_root)
1008
transform.version_file(b'new-root', new_root)
817
1009
transform.apply()
819
1011
def test_renames(self):
820
1012
create, root = self.get_transform()
821
old = create.new_directory('old-parent', root, 'old-id')
822
intermediate = create.new_directory('intermediate', old, 'im-id')
823
myfile = create.new_file('myfile', intermediate, 'myfile-text',
1013
old = create.new_directory('old-parent', root, b'old-id')
1014
intermediate = create.new_directory('intermediate', old, b'im-id')
1015
myfile = create.new_file('myfile', intermediate, [b'myfile-text'],
826
1018
rename, root = self.get_transform()
827
old = rename.trans_id_file_id('old-id')
1019
old = rename.trans_id_file_id(b'old-id')
828
1020
rename.adjust_path('new', root, old)
829
myfile = rename.trans_id_file_id('myfile-id')
1021
myfile = rename.trans_id_file_id(b'myfile-id')
830
1022
rename.set_executability(True, myfile)
1025
def test_rename_fails(self):
1026
self.requireFeature(features.not_running_as_root)
1027
# see https://bugs.launchpad.net/bzr/+bug/491763
1028
create, root_id = self.get_transform()
1029
create.new_directory('first-dir', root_id, b'first-id')
1030
create.new_file('myfile', root_id, [b'myfile-text'], b'myfile-id')
1032
if os.name == "posix" and sys.platform != "cygwin":
1033
# posix filesystems fail on renaming if the readonly bit is set
1034
osutils.make_readonly(self.wt.abspath('first-dir'))
1035
elif os.name == "nt":
1036
# windows filesystems fail on renaming open files
1037
self.addCleanup(open(self.wt.abspath('myfile')).close)
1039
self.skipTest("Can't force a permissions error on rename")
1040
# now transform to rename
1041
rename_transform, root_id = self.get_transform()
1042
file_trans_id = rename_transform.trans_id_file_id(b'myfile-id')
1043
dir_id = rename_transform.trans_id_file_id(b'first-id')
1044
rename_transform.adjust_path('newname', dir_id, file_trans_id)
1045
e = self.assertRaises(errors.TransformRenameFailed,
1046
rename_transform.apply)
1047
# On nix looks like:
1048
# "Failed to rename .../work/.bzr/checkout/limbo/new-1
1049
# to .../first-dir/newname: [Errno 13] Permission denied"
1050
# On windows looks like:
1051
# "Failed to rename .../work/myfile to
1052
# .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
1053
# This test isn't concerned with exactly what the error looks like,
1054
# and the strerror will vary across OS and locales, but the assert
1055
# that the exeception attributes are what we expect
1056
self.assertEqual(e.errno, errno.EACCES)
1057
if os.name == "posix":
1058
self.assertEndsWith(e.to_path, "/first-dir/newname")
1060
self.assertEqual(os.path.basename(e.from_path), "myfile")
833
1062
def test_set_executability_order(self):
834
1063
"""Ensure that executability behaves the same, no matter what order.
836
1065
- create file and set executability simultaneously
837
1066
- create file and set executability afterward
838
- unsetting the executability of a file whose executability has not been
1067
- unsetting the executability of a file whose executability has not
839
1069
declared should throw an exception (this may happen when a
840
1070
merge attempts to create a file with a duplicate ID)
903
1135
self.assertEqual([bar1_abspath], stat_paths)
905
1137
def test_iter_changes(self):
906
self.wt.set_root_id('eert_toor')
1138
self.wt.set_root_id(b'eert_toor')
907
1139
transform, root = self.get_transform()
908
transform.new_file('old', root, 'blah', 'id-1', True)
1140
transform.new_file('old', root, [b'blah'], b'id-1', True)
909
1141
transform.apply()
910
1142
transform, root = self.get_transform()
912
1144
self.assertEqual([], list(transform.iter_changes()))
913
old = transform.trans_id_tree_file_id('id-1')
1145
old = transform.trans_id_tree_path('old')
914
1146
transform.unversion_file(old)
915
self.assertEqual([('id-1', ('old', None), False, (True, False),
916
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
917
(True, True))], list(transform.iter_changes()))
918
transform.new_directory('new', root, 'id-1')
919
self.assertEqual([('id-1', ('old', 'new'), True, (True, True),
920
('eert_toor', 'eert_toor'), ('old', 'new'),
921
('file', 'directory'),
922
(True, False))], list(transform.iter_changes()))
1147
self.assertEqual([(b'id-1', ('old', None), False, (True, False),
1148
(b'eert_toor', b'eert_toor'),
1149
('old', 'old'), ('file', 'file'),
1150
(True, True))], list(transform.iter_changes()))
1151
transform.new_directory('new', root, b'id-1')
1152
self.assertEqual([(b'id-1', ('old', 'new'), True, (True, True),
1153
(b'eert_toor', b'eert_toor'), ('old', 'new'),
1154
('file', 'directory'),
1155
(True, False))], list(transform.iter_changes()))
924
1157
transform.finalize()
926
1159
def test_iter_changes_new(self):
927
self.wt.set_root_id('eert_toor')
1160
self.wt.set_root_id(b'eert_toor')
928
1161
transform, root = self.get_transform()
929
transform.new_file('old', root, 'blah')
1162
transform.new_file('old', root, [b'blah'])
930
1163
transform.apply()
931
1164
transform, root = self.get_transform()
933
1166
old = transform.trans_id_tree_path('old')
934
transform.version_file('id-1', old)
935
self.assertEqual([('id-1', (None, 'old'), False, (False, True),
936
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
937
(False, False))], list(transform.iter_changes()))
1167
transform.version_file(b'id-1', old)
1168
self.assertEqual([(b'id-1', (None, 'old'), False, (False, True),
1169
(b'eert_toor', b'eert_toor'),
1170
('old', 'old'), ('file', 'file'),
1172
list(transform.iter_changes()))
939
1174
transform.finalize()
941
1176
def test_iter_changes_modifications(self):
942
self.wt.set_root_id('eert_toor')
1177
self.wt.set_root_id(b'eert_toor')
943
1178
transform, root = self.get_transform()
944
transform.new_file('old', root, 'blah', 'id-1')
945
transform.new_file('new', root, 'blah')
946
transform.new_directory('subdir', root, 'subdir-id')
1179
transform.new_file('old', root, [b'blah'], b'id-1')
1180
transform.new_file('new', root, [b'blah'])
1181
transform.new_directory('subdir', root, b'subdir-id')
947
1182
transform.apply()
948
1183
transform, root = self.get_transform()
950
1185
old = transform.trans_id_tree_path('old')
951
subdir = transform.trans_id_tree_file_id('subdir-id')
1186
subdir = transform.trans_id_tree_path('subdir')
952
1187
new = transform.trans_id_tree_path('new')
953
1188
self.assertEqual([], list(transform.iter_changes()))
956
1191
transform.delete_contents(old)
957
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
958
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', None),
959
(False, False))], list(transform.iter_changes()))
1192
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1193
(b'eert_toor', b'eert_toor'),
1194
('old', 'old'), ('file', None),
1196
list(transform.iter_changes()))
962
transform.create_file('blah', old)
963
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
964
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
965
(False, False))], list(transform.iter_changes()))
1199
transform.create_file([b'blah'], old)
1200
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1201
(b'eert_toor', b'eert_toor'),
1202
('old', 'old'), ('file', 'file'),
1204
list(transform.iter_changes()))
966
1205
transform.cancel_deletion(old)
967
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
968
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
969
(False, False))], list(transform.iter_changes()))
1206
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1207
(b'eert_toor', b'eert_toor'),
1208
('old', 'old'), ('file', 'file'),
1210
list(transform.iter_changes()))
970
1211
transform.cancel_creation(old)
972
1213
# move file_id to a different file
973
1214
self.assertEqual([], list(transform.iter_changes()))
974
1215
transform.unversion_file(old)
975
transform.version_file('id-1', new)
1216
transform.version_file(b'id-1', new)
976
1217
transform.adjust_path('old', root, new)
977
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
978
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
979
(False, False))], list(transform.iter_changes()))
1218
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1219
(b'eert_toor', b'eert_toor'),
1220
('old', 'old'), ('file', 'file'),
1222
list(transform.iter_changes()))
980
1223
transform.cancel_versioning(new)
981
1224
transform._removed_id = set()
984
1227
self.assertEqual([], list(transform.iter_changes()))
985
1228
transform.set_executability(True, old)
986
self.assertEqual([('id-1', ('old', 'old'), False, (True, True),
987
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
988
(False, True))], list(transform.iter_changes()))
1229
self.assertEqual([(b'id-1', ('old', 'old'), False, (True, True),
1230
(b'eert_toor', b'eert_toor'),
1231
('old', 'old'), ('file', 'file'),
1233
list(transform.iter_changes()))
989
1234
transform.set_executability(None, old)
992
1237
self.assertEqual([], list(transform.iter_changes()))
993
1238
transform.adjust_path('new', root, old)
994
1239
transform._new_parent = {}
995
self.assertEqual([('id-1', ('old', 'new'), False, (True, True),
996
('eert_toor', 'eert_toor'), ('old', 'new'), ('file', 'file'),
997
(False, False))], list(transform.iter_changes()))
1240
self.assertEqual([(b'id-1', ('old', 'new'), False, (True, True),
1241
(b'eert_toor', b'eert_toor'),
1242
('old', 'new'), ('file', 'file'),
1244
list(transform.iter_changes()))
998
1245
transform._new_name = {}
1000
1247
# parent directory
1001
1248
self.assertEqual([], list(transform.iter_changes()))
1002
1249
transform.adjust_path('new', subdir, old)
1003
1250
transform._new_name = {}
1004
self.assertEqual([('id-1', ('old', 'subdir/old'), False,
1005
(True, True), ('eert_toor', 'subdir-id'), ('old', 'old'),
1006
('file', 'file'), (False, False))],
1007
list(transform.iter_changes()))
1251
self.assertEqual([(b'id-1', ('old', 'subdir/old'), False,
1252
(True, True), (b'eert_toor',
1253
b'subdir-id'), ('old', 'old'),
1254
('file', 'file'), (False, False))],
1255
list(transform.iter_changes()))
1008
1256
transform._new_path = {}
1011
1259
transform.finalize()
1013
1261
def test_iter_changes_modified_bleed(self):
1014
self.wt.set_root_id('eert_toor')
1262
self.wt.set_root_id(b'eert_toor')
1015
1263
"""Modified flag should not bleed from one change to another"""
1016
1264
# unfortunately, we have no guarantee that file1 (which is modified)
1017
1265
# will be applied before file2. And if it's applied after file2, it
1018
1266
# obviously can't bleed into file2's change output. But for now, it
1020
1268
transform, root = self.get_transform()
1021
transform.new_file('file1', root, 'blah', 'id-1')
1022
transform.new_file('file2', root, 'blah', 'id-2')
1269
transform.new_file('file1', root, [b'blah'], b'id-1')
1270
transform.new_file('file2', root, [b'blah'], b'id-2')
1023
1271
transform.apply()
1024
1272
transform, root = self.get_transform()
1026
transform.delete_contents(transform.trans_id_file_id('id-1'))
1274
transform.delete_contents(transform.trans_id_file_id(b'id-1'))
1027
1275
transform.set_executability(True,
1028
transform.trans_id_file_id('id-2'))
1029
self.assertEqual([('id-1', (u'file1', u'file1'), True, (True, True),
1030
('eert_toor', 'eert_toor'), ('file1', u'file1'),
1031
('file', None), (False, False)),
1032
('id-2', (u'file2', u'file2'), False, (True, True),
1033
('eert_toor', 'eert_toor'), ('file2', u'file2'),
1034
('file', 'file'), (False, True))],
1276
transform.trans_id_file_id(b'id-2'))
1278
[(b'id-1', (u'file1', u'file1'), True, (True, True),
1279
(b'eert_toor', b'eert_toor'), ('file1', u'file1'),
1280
('file', None), (False, False)),
1281
(b'id-2', (u'file2', u'file2'), False, (True, True),
1282
(b'eert_toor', b'eert_toor'), ('file2', u'file2'),
1283
('file', 'file'), (False, True))],
1035
1284
list(transform.iter_changes()))
1037
1286
transform.finalize()
1039
1288
def test_iter_changes_move_missing(self):
1040
1289
"""Test moving ids with no files around"""
1041
self.wt.set_root_id('toor_eert')
1290
self.wt.set_root_id(b'toor_eert')
1042
1291
# Need two steps because versioning a non-existant file is a conflict.
1043
1292
transform, root = self.get_transform()
1044
transform.new_directory('floater', root, 'floater-id')
1293
transform.new_directory('floater', root, b'floater-id')
1045
1294
transform.apply()
1046
1295
transform, root = self.get_transform()
1047
1296
transform.delete_contents(transform.trans_id_tree_path('floater'))
1382
1646
self.build_tree(['baz'])
1383
1647
tt.create_hardlink("baz", foo_trans_id)
1385
self.failUnlessExists("foo")
1386
self.failUnlessExists("baz")
1649
self.assertPathExists("foo")
1650
self.assertPathExists("baz")
1388
1652
self.addCleanup(wt.unlock)
1389
self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1653
self.assertEqual(wt.kind("foo"), "file")
1392
1655
def test_no_final_path(self):
1393
1656
transform, root = self.get_transform()
1394
trans_id = transform.trans_id_file_id('foo')
1395
transform.create_file('bar', trans_id)
1657
trans_id = transform.trans_id_file_id(b'foo')
1658
transform.create_file([b'bar'], trans_id)
1396
1659
transform.cancel_creation(trans_id)
1397
1660
transform.apply()
1399
1662
def test_create_from_tree(self):
1400
1663
tree1 = self.make_branch_and_tree('tree1')
1401
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', 'baz')])
1402
tree1.add(['foo', 'bar'], ['foo-id', 'bar-id'])
1664
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', b'baz')])
1665
tree1.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
1403
1666
tree2 = self.make_branch_and_tree('tree2')
1404
1667
tt = TreeTransform(tree2)
1405
1668
foo_trans_id = tt.create_path('foo', tt.root)
1406
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1669
create_from_tree(tt, foo_trans_id, tree1, 'foo')
1407
1670
bar_trans_id = tt.create_path('bar', tt.root)
1408
create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
1671
create_from_tree(tt, bar_trans_id, tree1, 'bar')
1410
1673
self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1411
self.assertFileEqual('baz', 'tree2/bar')
1674
self.assertFileEqual(b'baz', 'tree2/bar')
1413
1676
def test_create_from_tree_bytes(self):
1414
1677
"""Provided lines are used instead of tree content."""
1415
1678
tree1 = self.make_branch_and_tree('tree1')
1416
self.build_tree_contents([('tree1/foo', 'bar'),])
1417
tree1.add('foo', 'foo-id')
1679
self.build_tree_contents([('tree1/foo', b'bar'), ])
1680
tree1.add('foo', b'foo-id')
1418
1681
tree2 = self.make_branch_and_tree('tree2')
1419
1682
tt = TreeTransform(tree2)
1420
1683
foo_trans_id = tt.create_path('foo', tt.root)
1421
create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
1684
create_from_tree(tt, foo_trans_id, tree1, 'foo', chunks=[b'qux'])
1423
self.assertFileEqual('qux', 'tree2/foo')
1686
self.assertFileEqual(b'qux', 'tree2/foo')
1425
1688
def test_create_from_tree_symlink(self):
1426
1689
self.requireFeature(SymlinkFeature)
1427
1690
tree1 = self.make_branch_and_tree('tree1')
1428
1691
os.symlink('bar', 'tree1/foo')
1429
tree1.add('foo', 'foo-id')
1692
tree1.add('foo', b'foo-id')
1430
1693
tt = TreeTransform(self.make_branch_and_tree('tree2'))
1431
1694
foo_trans_id = tt.create_path('foo', tt.root)
1432
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1695
create_from_tree(tt, foo_trans_id, tree1, 'foo')
1434
1697
self.assertEqual('bar', os.readlink('tree2/foo'))
1456
1751
def test_text_merge(self):
1457
1752
root_id = generate_ids.gen_root_id()
1458
1753
base = TransformGroup("base", root_id)
1459
base.tt.new_file('a', base.root, 'a\nb\nc\nd\be\n', 'a')
1460
base.tt.new_file('b', base.root, 'b1', 'b')
1461
base.tt.new_file('c', base.root, 'c', 'c')
1462
base.tt.new_file('d', base.root, 'd', 'd')
1463
base.tt.new_file('e', base.root, 'e', 'e')
1464
base.tt.new_file('f', base.root, 'f', 'f')
1465
base.tt.new_directory('g', base.root, 'g')
1466
base.tt.new_directory('h', base.root, 'h')
1754
base.tt.new_file('a', base.root, [b'a\nb\nc\nd\be\n'], b'a')
1755
base.tt.new_file('b', base.root, [b'b1'], b'b')
1756
base.tt.new_file('c', base.root, [b'c'], b'c')
1757
base.tt.new_file('d', base.root, [b'd'], b'd')
1758
base.tt.new_file('e', base.root, [b'e'], b'e')
1759
base.tt.new_file('f', base.root, [b'f'], b'f')
1760
base.tt.new_directory('g', base.root, b'g')
1761
base.tt.new_directory('h', base.root, b'h')
1467
1762
base.tt.apply()
1468
1763
other = TransformGroup("other", root_id)
1469
other.tt.new_file('a', other.root, 'y\nb\nc\nd\be\n', 'a')
1470
other.tt.new_file('b', other.root, 'b2', 'b')
1471
other.tt.new_file('c', other.root, 'c2', 'c')
1472
other.tt.new_file('d', other.root, 'd', 'd')
1473
other.tt.new_file('e', other.root, 'e2', 'e')
1474
other.tt.new_file('f', other.root, 'f', 'f')
1475
other.tt.new_file('g', other.root, 'g', 'g')
1476
other.tt.new_file('h', other.root, 'h\ni\nj\nk\n', 'h')
1477
other.tt.new_file('i', other.root, 'h\ni\nj\nk\n', 'i')
1764
other.tt.new_file('a', other.root, [b'y\nb\nc\nd\be\n'], b'a')
1765
other.tt.new_file('b', other.root, [b'b2'], b'b')
1766
other.tt.new_file('c', other.root, [b'c2'], b'c')
1767
other.tt.new_file('d', other.root, [b'd'], b'd')
1768
other.tt.new_file('e', other.root, [b'e2'], b'e')
1769
other.tt.new_file('f', other.root, [b'f'], b'f')
1770
other.tt.new_file('g', other.root, [b'g'], b'g')
1771
other.tt.new_file('h', other.root, [b'h\ni\nj\nk\n'], b'h')
1772
other.tt.new_file('i', other.root, [b'h\ni\nj\nk\n'], b'i')
1478
1773
other.tt.apply()
1479
1774
this = TransformGroup("this", root_id)
1480
this.tt.new_file('a', this.root, 'a\nb\nc\nd\bz\n', 'a')
1481
this.tt.new_file('b', this.root, 'b', 'b')
1482
this.tt.new_file('c', this.root, 'c', 'c')
1483
this.tt.new_file('d', this.root, 'd2', 'd')
1484
this.tt.new_file('e', this.root, 'e2', 'e')
1485
this.tt.new_file('f', this.root, 'f', 'f')
1486
this.tt.new_file('g', this.root, 'g', 'g')
1487
this.tt.new_file('h', this.root, '1\n2\n3\n4\n', 'h')
1488
this.tt.new_file('i', this.root, '1\n2\n3\n4\n', 'i')
1775
this.tt.new_file('a', this.root, [b'a\nb\nc\nd\bz\n'], b'a')
1776
this.tt.new_file('b', this.root, [b'b'], b'b')
1777
this.tt.new_file('c', this.root, [b'c'], b'c')
1778
this.tt.new_file('d', this.root, [b'd2'], b'd')
1779
this.tt.new_file('e', this.root, [b'e2'], b'e')
1780
this.tt.new_file('f', this.root, [b'f'], b'f')
1781
this.tt.new_file('g', this.root, [b'g'], b'g')
1782
this.tt.new_file('h', this.root, [b'1\n2\n3\n4\n'], b'h')
1783
this.tt.new_file('i', this.root, [b'1\n2\n3\n4\n'], b'i')
1489
1784
this.tt.apply()
1490
1785
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1492
1787
# textual merge
1493
self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
1788
with this.wt.get_file(this.wt.id2path(b'a')) as f:
1789
self.assertEqual(f.read(), b'y\nb\nc\nd\bz\n')
1494
1790
# three-way text conflict
1495
self.assertEqual(this.wt.get_file('b').read(),
1496
conflict_text('b', 'b2'))
1791
with this.wt.get_file(this.wt.id2path(b'b')) as f:
1792
self.assertEqual(f.read(), conflict_text(b'b', b'b2'))
1498
self.assertEqual(this.wt.get_file('c').read(), 'c2')
1794
self.assertEqual(this.wt.get_file(this.wt.id2path(b'c')).read(), b'c2')
1500
self.assertEqual(this.wt.get_file('d').read(), 'd2')
1796
self.assertEqual(this.wt.get_file(this.wt.id2path(b'd')).read(), b'd2')
1501
1797
# Ambigious clean merge
1502
self.assertEqual(this.wt.get_file('e').read(), 'e2')
1798
self.assertEqual(this.wt.get_file(this.wt.id2path(b'e')).read(), b'e2')
1504
self.assertEqual(this.wt.get_file('f').read(), 'f')
1800
self.assertEqual(this.wt.get_file(this.wt.id2path(b'f')).read(), b'f')
1505
1801
# Correct correct results when THIS == OTHER
1506
self.assertEqual(this.wt.get_file('g').read(), 'g')
1802
self.assertEqual(this.wt.get_file(this.wt.id2path(b'g')).read(), b'g')
1507
1803
# Text conflict when THIS & OTHER are text and BASE is dir
1508
self.assertEqual(this.wt.get_file('h').read(),
1509
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1510
self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
1512
self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
1804
self.assertEqual(this.wt.get_file(this.wt.id2path(b'h')).read(),
1805
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1806
self.assertEqual(this.wt.get_file('h.THIS').read(),
1808
self.assertEqual(this.wt.get_file('h.OTHER').read(),
1514
1810
self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
1515
self.assertEqual(this.wt.get_file('i').read(),
1516
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1517
self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
1519
self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
1811
self.assertEqual(this.wt.get_file(this.wt.id2path(b'i')).read(),
1812
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1813
self.assertEqual(this.wt.get_file('i.THIS').read(),
1815
self.assertEqual(this.wt.get_file('i.OTHER').read(),
1521
1817
self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1522
1818
modified = ['a', 'b', 'c', 'h', 'i']
1523
1819
merge_modified = this.wt.merge_modified()
1524
1820
self.assertSubset(merge_modified, modified)
1525
1821
self.assertEqual(len(merge_modified), len(modified))
1526
file(this.wt.id2abspath('a'), 'wb').write('booga')
1822
with open(this.wt.abspath(this.wt.id2path(b'a')), 'wb') as f:
1527
1824
modified.pop(0)
1528
1825
merge_modified = this.wt.merge_modified()
1529
1826
self.assertSubset(merge_modified, modified)
1578
1877
base = TransformGroup("BASE", root_id)
1579
1878
this = TransformGroup("THIS", root_id)
1580
1879
other = TransformGroup("OTHER", root_id)
1581
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
1582
for t in [base, this, other]]
1583
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1584
for t in [base, this, other]]
1585
base.tt.new_directory('c', base_a, 'c')
1586
this.tt.new_directory('c1', this_a, 'c')
1587
other.tt.new_directory('c', other_b, 'c')
1589
base.tt.new_directory('d', base_a, 'd')
1590
this.tt.new_directory('d1', this_b, 'd')
1591
other.tt.new_directory('d', other_a, 'd')
1593
base.tt.new_directory('e', base_a, 'e')
1594
this.tt.new_directory('e', this_a, 'e')
1595
other.tt.new_directory('e1', other_b, 'e')
1597
base.tt.new_directory('f', base_a, 'f')
1598
this.tt.new_directory('f1', this_b, 'f')
1599
other.tt.new_directory('f1', other_b, 'f')
1880
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, b'a')
1881
for t in [base, this, other]]
1882
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, b'b')
1883
for t in [base, this, other]]
1884
base.tt.new_directory('c', base_a, b'c')
1885
this.tt.new_directory('c1', this_a, b'c')
1886
other.tt.new_directory('c', other_b, b'c')
1888
base.tt.new_directory('d', base_a, b'd')
1889
this.tt.new_directory('d1', this_b, b'd')
1890
other.tt.new_directory('d', other_a, b'd')
1892
base.tt.new_directory('e', base_a, b'e')
1893
this.tt.new_directory('e', this_a, b'e')
1894
other.tt.new_directory('e1', other_b, b'e')
1896
base.tt.new_directory('f', base_a, b'f')
1897
this.tt.new_directory('f1', this_b, b'f')
1898
other.tt.new_directory('f1', other_b, b'f')
1601
1900
for tg in [this, base, other]:
1603
1902
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1604
self.assertEqual(this.wt.id2path('c'), pathjoin('b/c1'))
1605
self.assertEqual(this.wt.id2path('d'), pathjoin('b/d1'))
1606
self.assertEqual(this.wt.id2path('e'), pathjoin('b/e1'))
1607
self.assertEqual(this.wt.id2path('f'), pathjoin('b/f1'))
1903
self.assertEqual(this.wt.id2path(b'c'), pathjoin('b/c1'))
1904
self.assertEqual(this.wt.id2path(b'd'), pathjoin('b/d1'))
1905
self.assertEqual(this.wt.id2path(b'e'), pathjoin('b/e1'))
1906
self.assertEqual(this.wt.id2path(b'f'), pathjoin('b/f1'))
1609
1908
def test_filename_merge_conflicts(self):
1610
1909
root_id = generate_ids.gen_root_id()
1611
1910
base = TransformGroup("BASE", root_id)
1612
1911
this = TransformGroup("THIS", root_id)
1613
1912
other = TransformGroup("OTHER", root_id)
1614
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
1615
for t in [base, this, other]]
1616
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
1617
for t in [base, this, other]]
1619
base.tt.new_file('g', base_a, 'g', 'g')
1620
other.tt.new_file('g1', other_b, 'g1', 'g')
1622
base.tt.new_file('h', base_a, 'h', 'h')
1623
this.tt.new_file('h1', this_b, 'h1', 'h')
1625
base.tt.new_file('i', base.root, 'i', 'i')
1626
other.tt.new_directory('i1', this_b, 'i')
1913
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, b'a')
1914
for t in [base, this, other]]
1915
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, b'b')
1916
for t in [base, this, other]]
1918
base.tt.new_file('g', base_a, [b'g'], b'g')
1919
other.tt.new_file('g1', other_b, [b'g1'], b'g')
1921
base.tt.new_file('h', base_a, [b'h'], b'h')
1922
this.tt.new_file('h1', this_b, [b'h1'], b'h')
1924
base.tt.new_file('i', base.root, [b'i'], b'i')
1925
other.tt.new_directory('i1', this_b, b'i')
1628
1927
for tg in [this, base, other]:
1630
1929
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1632
self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1931
self.assertEqual(this.wt.id2path(b'g'), pathjoin('b/g1.OTHER'))
1633
1932
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1634
1933
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1635
self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
1934
self.assertEqual(this.wt.id2path(b'h'), pathjoin('b/h1.THIS'))
1636
1935
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1637
1936
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1638
self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
1937
self.assertEqual(this.wt.id2path(b'i'), pathjoin('b/i1.OTHER'))
1641
1940
class TestBuildTree(tests.TestCaseWithTransport):
1643
1942
def test_build_tree_with_symlinks(self):
1644
1943
self.requireFeature(SymlinkFeature)
1646
a = BzrDir.create_standalone_workingtree('a')
1945
a = ControlDir.create_standalone_workingtree('a')
1647
1946
os.mkdir('a/foo')
1648
file('a/foo/bar', 'wb').write('contents')
1947
with open('a/foo/bar', 'wb') as f:
1948
f.write(b'contents')
1649
1949
os.symlink('a/foo/bar', 'a/foo/baz')
1650
1950
a.add(['foo', 'foo/bar', 'foo/baz'])
1651
1951
a.commit('initial commit')
1652
b = BzrDir.create_standalone_workingtree('b')
1952
b = ControlDir.create_standalone_workingtree('b')
1653
1953
basis = a.basis_tree()
1654
1954
basis.lock_read()
1655
1955
self.addCleanup(basis.unlock)
1656
1956
build_tree(basis, b)
1657
1957
self.assertIs(os.path.isdir('b/foo'), True)
1658
self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
1958
with open('b/foo/bar', 'rb') as f:
1959
self.assertEqual(f.read(), b"contents")
1659
1960
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
1661
1962
def test_build_with_references(self):
1662
1963
tree = self.make_branch_and_tree('source',
1663
format='dirstate-with-subtree')
1964
format='development-subtree')
1664
1965
subtree = self.make_branch_and_tree('source/subtree',
1665
format='dirstate-with-subtree')
1966
format='development-subtree')
1666
1967
tree.add_reference(subtree)
1667
1968
tree.commit('a revision')
1668
1969
tree.branch.create_checkout('target')
1669
self.failUnlessExists('target')
1670
self.failUnlessExists('target/subtree')
1970
self.assertPathExists('target')
1971
self.assertPathExists('target/subtree')
1672
1973
def test_file_conflict_handling(self):
1673
1974
"""Ensure that when building trees, conflict handling is done"""
1674
1975
source = self.make_branch_and_tree('source')
1675
1976
target = self.make_branch_and_tree('target')
1676
1977
self.build_tree(['source/file', 'target/file'])
1677
source.add('file', 'new-file')
1978
source.add('file', b'new-file')
1678
1979
source.commit('added file')
1679
1980
build_tree(source.basis_tree(), target)
1680
self.assertEqual([DuplicateEntry('Moved existing file to',
1681
'file.moved', 'file', None, 'new-file')],
1982
[DuplicateEntry('Moved existing file to', 'file.moved',
1983
'file', None, 'new-file')],
1683
1985
target2 = self.make_branch_and_tree('target2')
1684
target_file = file('target2/file', 'wb')
1686
source_file = file('source/file', 'rb')
1688
target_file.write(source_file.read())
1986
with open('target2/file', 'wb') as target_file, \
1987
open('source/file', 'rb') as source_file:
1988
target_file.write(source_file.read())
1693
1989
build_tree(source.basis_tree(), target2)
1694
1990
self.assertEqual([], target2.conflicts())
1970
2290
self.assertEqualStat(source_stat, target_stat)
1972
2292
def test_case_insensitive_build_tree_inventory(self):
1973
if (tests.CaseInsensitiveFilesystemFeature.available()
1974
or tests.CaseInsCasePresFilenameFeature.available()):
2293
if (features.CaseInsensitiveFilesystemFeature.available()
2294
or features.CaseInsCasePresFilenameFeature.available()):
1975
2295
raise tests.UnavailableFeature('Fully case sensitive filesystem')
1976
2296
source = self.make_branch_and_tree('source')
1977
2297
self.build_tree(['source/file', 'source/FILE'])
1978
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2298
source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
1979
2299
source.commit('added files')
1980
2300
# Don't try this at home, kids!
1981
2301
# Force the tree to report that it is case insensitive
1982
2302
target = self.make_branch_and_tree('target')
1983
2303
target.case_sensitive = False
1984
2304
build_tree(source.basis_tree(), target, source, delta_from_tree=True)
1985
self.assertEqual('file.moved', target.id2path('lower-id'))
1986
self.assertEqual('FILE', target.id2path('upper-id'))
2305
self.assertEqual('file.moved', target.id2path(b'lower-id'))
2306
self.assertEqual('FILE', target.id2path(b'upper-id'))
2308
def test_build_tree_observes_sha(self):
2309
source = self.make_branch_and_tree('source')
2310
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2311
source.add(['file1', 'dir', 'dir/file2'],
2312
[b'file1-id', b'dir-id', b'file2-id'])
2313
source.commit('new files')
2314
target = self.make_branch_and_tree('target')
2316
self.addCleanup(target.unlock)
2317
# We make use of the fact that DirState caches its cutoff time. So we
2318
# set the 'safe' time to one minute in the future.
2319
state = target.current_dirstate()
2320
state._cutoff_time = time.time() + 60
2321
build_tree(source.basis_tree(), target)
2322
entry1_sha = osutils.sha_file_by_name('source/file1')
2323
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2324
# entry[1] is the state information, entry[1][0] is the state of the
2325
# working tree, entry[1][0][1] is the sha value for the current working
2327
entry1 = state._get_entry(0, path_utf8=b'file1')
2328
self.assertEqual(entry1_sha, entry1[1][0][1])
2329
# The 'size' field must also be set.
2330
self.assertEqual(25, entry1[1][0][2])
2331
entry1_state = entry1[1][0]
2332
entry2 = state._get_entry(0, path_utf8=b'dir/file2')
2333
self.assertEqual(entry2_sha, entry2[1][0][1])
2334
self.assertEqual(29, entry2[1][0][2])
2335
entry2_state = entry2[1][0]
2336
# Now, make sure that we don't have to re-read the content. The
2337
# packed_stat should match exactly.
2338
self.assertEqual(entry1_sha, target.get_file_sha1('file1'))
2339
self.assertEqual(entry2_sha, target.get_file_sha1('dir/file2'))
2340
self.assertEqual(entry1_state, entry1[1][0])
2341
self.assertEqual(entry2_state, entry2[1][0])
1989
2344
class TestCommitTransform(tests.TestCaseWithTransport):
2043
2398
tt = TransformPreview(branch.basis_tree())
2044
2399
self.addCleanup(tt.finalize)
2045
2400
e = self.assertRaises(ValueError, tt.commit, branch,
2046
'my message', ['rev1b-id'])
2401
'my message', [b'rev1b-id'])
2047
2402
self.assertEqual('Cannot supply merge parents for first commit.',
2049
2404
self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
2051
2406
def test_add_files(self):
2052
2407
branch, tt = self.get_branch_and_transform()
2053
tt.new_file('file', tt.root, 'contents', 'file-id')
2054
trans_id = tt.new_directory('dir', tt.root, 'dir-id')
2408
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2409
trans_id = tt.new_directory('dir', tt.root, b'dir-id')
2055
2410
if SymlinkFeature.available():
2056
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2057
rev = tt.commit(branch, 'message')
2411
tt.new_symlink('symlink', trans_id, 'target', b'symlink-id')
2412
tt.commit(branch, 'message')
2058
2413
tree = branch.basis_tree()
2059
self.assertEqual('file', tree.id2path('file-id'))
2060
self.assertEqual('contents', tree.get_file_text('file-id'))
2061
self.assertEqual('dir', tree.id2path('dir-id'))
2414
self.assertEqual('file', tree.id2path(b'file-id'))
2415
self.assertEqual(b'contents', tree.get_file_text('file'))
2416
self.assertEqual('dir', tree.id2path(b'dir-id'))
2062
2417
if SymlinkFeature.available():
2063
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2064
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2418
self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
2419
self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
2066
2421
def test_add_unversioned(self):
2067
2422
branch, tt = self.get_branch_and_transform()
2068
tt.new_file('file', tt.root, 'contents')
2423
tt.new_file('file', tt.root, [b'contents'])
2069
2424
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2070
2425
'message', strict=True)
2072
2427
def test_modify_strict(self):
2073
2428
branch, tt = self.get_branch_and_transform()
2074
tt.new_file('file', tt.root, 'contents', 'file-id')
2429
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2075
2430
tt.commit(branch, 'message', strict=True)
2076
2431
tt = TransformPreview(branch.basis_tree())
2077
2432
self.addCleanup(tt.finalize)
2078
trans_id = tt.trans_id_file_id('file-id')
2433
trans_id = tt.trans_id_file_id(b'file-id')
2079
2434
tt.delete_contents(trans_id)
2080
tt.create_file('contents', trans_id)
2435
tt.create_file([b'contents'], trans_id)
2081
2436
tt.commit(branch, 'message', strict=True)
2083
2438
def test_commit_malformed(self):
2086
2441
In this case, we are adding a file without adding its parent.
2088
2443
branch, tt = self.get_branch_and_transform()
2089
parent_id = tt.trans_id_file_id('parent-id')
2090
tt.new_file('file', parent_id, 'contents', 'file-id')
2444
parent_id = tt.trans_id_file_id(b'parent-id')
2445
tt.new_file('file', parent_id, [b'contents'], b'file-id')
2091
2446
self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2095
class MockTransform(object):
2097
def has_named_child(self, by_parent, parent_id, name):
2098
for child_id in by_parent[parent_id]:
2102
elif name == "name.~%s~" % child_id:
2107
class MockEntry(object):
2109
object.__init__(self)
2113
class TestGetBackupName(TestCase):
2114
def test_get_backup_name(self):
2115
tt = MockTransform()
2116
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2117
self.assertEqual(name, 'name.~1~')
2118
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2119
self.assertEqual(name, 'name.~2~')
2120
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2121
self.assertEqual(name, 'name.~1~')
2122
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2123
self.assertEqual(name, 'name.~1~')
2124
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2125
self.assertEqual(name, 'name.~4~')
2449
def test_commit_rich_revision_data(self):
2450
branch, tt = self.get_branch_and_transform()
2451
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2452
committer='me <me@example.com>',
2453
revprops={u'foo': 'bar'}, revision_id=b'revid-1',
2454
authors=['Author1 <author1@example.com>',
2455
'Author2 <author2@example.com>',
2457
self.assertEqual(b'revid-1', rev_id)
2458
revision = branch.repository.get_revision(rev_id)
2459
self.assertEqual(1, revision.timestamp)
2460
self.assertEqual(43201, revision.timezone)
2461
self.assertEqual('me <me@example.com>', revision.committer)
2462
self.assertEqual(['Author1 <author1@example.com>',
2463
'Author2 <author2@example.com>'],
2464
revision.get_apparent_authors())
2465
del revision.properties['authors']
2466
self.assertEqual({'foo': 'bar',
2467
'branch-nick': 'tree'},
2468
revision.properties)
2470
def test_no_explicit_revprops(self):
2471
branch, tt = self.get_branch_and_transform()
2472
rev_id = tt.commit(branch, 'message', authors=[
2473
'Author1 <author1@example.com>',
2474
'Author2 <author2@example.com>', ])
2475
revision = branch.repository.get_revision(rev_id)
2476
self.assertEqual(['Author1 <author1@example.com>',
2477
'Author2 <author2@example.com>'],
2478
revision.get_apparent_authors())
2479
self.assertEqual('tree', revision.properties['branch-nick'])
2128
2482
class TestFileMover(tests.TestCaseWithTransport):
2240
2594
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2595
self.assertRaises(Bogus, tt.apply,
2242
2596
_mover=self.ExceptionFileMover(bad_target='d'))
2243
self.failUnlessExists('a')
2244
self.failUnlessExists('a/b')
2246
def test_resolve_no_parent(self):
2597
self.assertPathExists('a')
2598
self.assertPathExists('a/b')
2601
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2602
"""Ensure treetransform creation errors can be safely cleaned up after"""
2604
def _override_globals_in_method(self, instance, method_name, globals):
2605
"""Replace method on instance with one with updated globals"""
2607
func = getattr(instance, method_name).__func__
2608
new_globals = dict(func.__globals__)
2609
new_globals.update(globals)
2610
new_func = types.FunctionType(func.__code__, new_globals,
2611
func.__name__, func.__defaults__)
2613
setattr(instance, method_name,
2614
types.MethodType(new_func, instance))
2616
setattr(instance, method_name,
2617
types.MethodType(new_func, instance, instance.__class__))
2618
self.addCleanup(delattr, instance, method_name)
2621
def _fake_open_raises_before(name, mode):
2622
"""Like open() but raises before doing anything"""
2626
def _fake_open_raises_after(name, mode):
2627
"""Like open() but raises after creating file without returning"""
2628
open(name, mode).close()
2631
def create_transform_and_root_trans_id(self):
2632
"""Setup a transform creating a file in limbo"""
2633
tree = self.make_branch_and_tree('.')
2634
tt = TreeTransform(tree)
2635
return tt, tt.create_path("a", tt.root)
2637
def create_transform_and_subdir_trans_id(self):
2638
"""Setup a transform creating a directory containing a file in limbo"""
2639
tree = self.make_branch_and_tree('.')
2640
tt = TreeTransform(tree)
2641
d_trans_id = tt.create_path("d", tt.root)
2642
tt.create_directory(d_trans_id)
2643
f_trans_id = tt.create_path("a", d_trans_id)
2644
tt.adjust_path("a", d_trans_id, f_trans_id)
2645
return tt, f_trans_id
2647
def test_root_create_file_open_raises_before_creation(self):
2648
tt, trans_id = self.create_transform_and_root_trans_id()
2649
self._override_globals_in_method(
2650
tt, "create_file", {"open": self._fake_open_raises_before})
2651
self.assertRaises(RuntimeError, tt.create_file,
2652
[b"contents"], trans_id)
2653
path = tt._limbo_name(trans_id)
2654
self.assertPathDoesNotExist(path)
2656
self.assertPathDoesNotExist(tt._limbodir)
2658
def test_root_create_file_open_raises_after_creation(self):
2659
tt, trans_id = self.create_transform_and_root_trans_id()
2660
self._override_globals_in_method(
2661
tt, "create_file", {"open": self._fake_open_raises_after})
2662
self.assertRaises(RuntimeError, tt.create_file,
2663
[b"contents"], trans_id)
2664
path = tt._limbo_name(trans_id)
2665
self.assertPathExists(path)
2667
self.assertPathDoesNotExist(path)
2668
self.assertPathDoesNotExist(tt._limbodir)
2670
def test_subdir_create_file_open_raises_before_creation(self):
2671
tt, trans_id = self.create_transform_and_subdir_trans_id()
2672
self._override_globals_in_method(
2673
tt, "create_file", {"open": self._fake_open_raises_before})
2674
self.assertRaises(RuntimeError, tt.create_file,
2675
[b"contents"], trans_id)
2676
path = tt._limbo_name(trans_id)
2677
self.assertPathDoesNotExist(path)
2679
self.assertPathDoesNotExist(tt._limbodir)
2681
def test_subdir_create_file_open_raises_after_creation(self):
2682
tt, trans_id = self.create_transform_and_subdir_trans_id()
2683
self._override_globals_in_method(
2684
tt, "create_file", {"open": self._fake_open_raises_after})
2685
self.assertRaises(RuntimeError, tt.create_file,
2686
[b"contents"], trans_id)
2687
path = tt._limbo_name(trans_id)
2688
self.assertPathExists(path)
2690
self.assertPathDoesNotExist(path)
2691
self.assertPathDoesNotExist(tt._limbodir)
2693
def test_rename_in_limbo_rename_raises_after_rename(self):
2694
tt, trans_id = self.create_transform_and_root_trans_id()
2695
parent1 = tt.new_directory('parent1', tt.root)
2696
child1 = tt.new_file('child1', parent1, [b'contents'])
2697
parent2 = tt.new_directory('parent2', tt.root)
2699
class FakeOSModule(object):
2700
def rename(self, old, new):
2703
self._override_globals_in_method(tt, "_rename_in_limbo",
2704
{"os": FakeOSModule()})
2706
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2707
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2708
self.assertPathExists(path)
2710
self.assertPathDoesNotExist(path)
2711
self.assertPathDoesNotExist(tt._limbodir)
2713
def test_rename_in_limbo_rename_raises_before_rename(self):
2714
tt, trans_id = self.create_transform_and_root_trans_id()
2715
parent1 = tt.new_directory('parent1', tt.root)
2716
child1 = tt.new_file('child1', parent1, [b'contents'])
2717
parent2 = tt.new_directory('parent2', tt.root)
2719
class FakeOSModule(object):
2720
def rename(self, old, new):
2722
self._override_globals_in_method(tt, "_rename_in_limbo",
2723
{"os": FakeOSModule()})
2725
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2726
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2727
self.assertPathExists(path)
2729
self.assertPathDoesNotExist(path)
2730
self.assertPathDoesNotExist(tt._limbodir)
2733
class TestTransformMissingParent(tests.TestCaseWithTransport):
2735
def make_tt_with_versioned_dir(self):
2247
2736
wt = self.make_branch_and_tree('.')
2737
self.build_tree(['dir/', ])
2738
wt.add(['dir'], [b'dir-id'])
2739
wt.commit('Create dir')
2248
2740
tt = TreeTransform(wt)
2249
2741
self.addCleanup(tt.finalize)
2250
parent = tt.trans_id_file_id('parent-id')
2251
tt.new_file('file', parent, 'Contents')
2252
resolve_conflicts(tt)
2255
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2256
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2258
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
('', ''), ('directory', 'directory'), (False, None))
2744
def test_resolve_create_parent_for_versioned_file(self):
2745
wt, tt = self.make_tt_with_versioned_dir()
2746
dir_tid = tt.trans_id_tree_path('dir')
2747
tt.new_file('file', dir_tid, [b'Contents'], file_id=b'file-id')
2748
tt.delete_contents(dir_tid)
2749
tt.unversion_file(dir_tid)
2750
conflicts = resolve_conflicts(tt)
2751
# one conflict for the missing directory, one for the unversioned
2753
self.assertLength(2, conflicts)
2755
def test_non_versioned_file_create_conflict(self):
2756
wt, tt = self.make_tt_with_versioned_dir()
2757
dir_tid = tt.trans_id_tree_path('dir')
2758
tt.new_file('file', dir_tid, [b'Contents'])
2759
tt.delete_contents(dir_tid)
2760
tt.unversion_file(dir_tid)
2761
conflicts = resolve_conflicts(tt)
2762
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2763
self.assertLength(1, conflicts)
2764
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2768
A_ENTRY = (b'a-id', ('a', 'a'), True, (True, True),
2769
(b'TREE_ROOT', b'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2771
ROOT_ENTRY = (b'TREE_ROOT', ('', ''), False, (True, True), (None, None),
2772
('', ''), ('directory', 'directory'), (False, False))
2262
2775
class TestTransformPreview(tests.TestCaseWithTransport):
2264
2777
def create_tree(self):
2265
2778
tree = self.make_branch_and_tree('.')
2266
self.build_tree_contents([('a', 'content 1')])
2267
tree.set_root_id('TREE_ROOT')
2268
tree.add('a', 'a-id')
2269
tree.commit('rev1', rev_id='rev1')
2270
return tree.branch.repository.revision_tree('rev1')
2779
self.build_tree_contents([('a', b'content 1')])
2780
tree.set_root_id(b'TREE_ROOT')
2781
tree.add('a', b'a-id')
2782
tree.commit('rev1', rev_id=b'rev1')
2783
return tree.branch.repository.revision_tree(b'rev1')
2272
2785
def get_empty_preview(self):
2273
2786
repository = self.make_repository('repo')
2291
2804
revision_tree = self.create_tree()
2292
2805
preview = TransformPreview(revision_tree)
2293
2806
self.addCleanup(preview.finalize)
2294
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2807
preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2295
2808
preview_tree = preview.get_preview_tree()
2296
self.assertEqual(preview_tree.kind('file2-id'), 'file')
2298
preview_tree.get_file('file2-id').read(), 'content B\n')
2809
self.assertEqual(preview_tree.kind('file2'), 'file')
2810
with preview_tree.get_file('file2') as f:
2811
self.assertEqual(f.read(), b'content B\n')
2300
2813
def test_diff_preview_tree(self):
2301
2814
revision_tree = self.create_tree()
2302
2815
preview = TransformPreview(revision_tree)
2303
2816
self.addCleanup(preview.finalize)
2304
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2817
preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2305
2818
preview_tree = preview.get_preview_tree()
2307
2820
show_diff_trees(revision_tree, preview_tree, out)
2308
2821
lines = out.getvalue().splitlines()
2309
self.assertEqual(lines[0], "=== added file 'file2'")
2822
self.assertEqual(lines[0], b"=== added file 'file2'")
2310
2823
# 3 lines of diff administrivia
2311
self.assertEqual(lines[4], "+content B")
2824
self.assertEqual(lines[4], b"+content B")
2826
def test_unsupported_symlink_diff(self):
2827
self.requireFeature(SymlinkFeature)
2828
tree = self.make_branch_and_tree('.')
2829
self.build_tree_contents([('a', 'content 1')])
2830
tree.set_root_id(b'TREE_ROOT')
2831
tree.add('a', b'a-id')
2832
os.symlink('a', 'foo')
2833
tree.add('foo', b'foo-id')
2834
tree.commit('rev1', rev_id=b'rev1')
2835
revision_tree = tree.branch.repository.revision_tree(b'rev1')
2836
preview = TransformPreview(revision_tree)
2837
self.addCleanup(preview.finalize)
2838
preview.delete_versioned(preview.trans_id_tree_path('foo'))
2839
preview_tree = preview.get_preview_tree()
2842
trace.push_log_file(log)
2843
os_symlink = getattr(os, 'symlink', None)
2846
show_diff_trees(revision_tree, preview_tree, out)
2847
lines = out.getvalue().splitlines()
2849
os.symlink = os_symlink
2850
self.assertContainsRe(
2852
b'Ignoring "foo" as symlinks are not supported on this filesystem')
2313
2854
def test_transform_conflicts(self):
2314
2855
revision_tree = self.create_tree()
2315
2856
preview = TransformPreview(revision_tree)
2316
2857
self.addCleanup(preview.finalize)
2317
preview.new_file('a', preview.root, 'content 2')
2858
preview.new_file('a', preview.root, [b'content 2'])
2318
2859
resolve_conflicts(preview)
2319
trans_id = preview.trans_id_file_id('a-id')
2860
trans_id = preview.trans_id_file_id(b'a-id')
2320
2861
self.assertEqual('a.moved', preview.final_name(trans_id))
2322
2863
def get_tree_and_preview_tree(self):
2323
2864
revision_tree = self.create_tree()
2324
2865
preview = TransformPreview(revision_tree)
2325
2866
self.addCleanup(preview.finalize)
2326
a_trans_id = preview.trans_id_file_id('a-id')
2867
a_trans_id = preview.trans_id_file_id(b'a-id')
2327
2868
preview.delete_contents(a_trans_id)
2328
preview.create_file('b content', a_trans_id)
2869
preview.create_file([b'b content'], a_trans_id)
2329
2870
preview_tree = preview.get_preview_tree()
2330
2871
return revision_tree, preview_tree
2332
2873
def test_iter_changes(self):
2333
2874
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2334
root = revision_tree.inventory.root.file_id
2335
self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2336
(root, root), ('a', 'a'), ('file', 'file'),
2338
list(preview_tree.iter_changes(revision_tree)))
2875
root = revision_tree.path2id('')
2876
self.assertEqual([(b'a-id', ('a', 'a'), True, (True, True),
2877
(root, root), ('a', 'a'), ('file', 'file'),
2879
list(preview_tree.iter_changes(revision_tree)))
2340
2881
def test_include_unchanged_succeeds(self):
2341
2882
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2342
2883
changes = preview_tree.iter_changes(revision_tree,
2343
2884
include_unchanged=True)
2344
root = revision_tree.inventory.root.file_id
2346
2885
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2348
2887
def test_specific_files(self):
2349
2888
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2350
2889
changes = preview_tree.iter_changes(revision_tree,
2351
2890
specific_files=[''])
2352
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2891
self.assertEqual([A_ENTRY], list(changes))
2354
2893
def test_want_unversioned(self):
2355
2894
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2356
2895
changes = preview_tree.iter_changes(revision_tree,
2357
2896
want_unversioned=True)
2358
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2897
self.assertEqual([A_ENTRY], list(changes))
2360
2899
def test_ignore_extra_trees_no_specific_files(self):
2361
2900
# extra_trees is harmless without specific_files, so we'll silently
2377
2916
revision_tree = self.create_tree()
2378
2917
preview = TransformPreview(revision_tree)
2379
2918
self.addCleanup(preview.finalize)
2380
preview.new_file('file', preview.root, 'contents', 'file-id')
2381
preview.new_directory('directory', preview.root, 'dir-id')
2919
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2920
preview.new_directory('directory', preview.root, b'dir-id')
2382
2921
preview_tree = preview.get_preview_tree()
2383
self.assertEqual('file', preview_tree.kind('file-id'))
2384
self.assertEqual('directory', preview_tree.kind('dir-id'))
2922
self.assertEqual('file', preview_tree.kind('file'))
2923
self.assertEqual('directory', preview_tree.kind('directory'))
2386
2925
def test_get_file_mtime(self):
2387
2926
preview = self.get_empty_preview()
2388
file_trans_id = preview.new_file('file', preview.root, 'contents',
2927
file_trans_id = preview.new_file('file', preview.root, [b'contents'],
2390
2929
limbo_path = preview._limbo_name(file_trans_id)
2391
2930
preview_tree = preview.get_preview_tree()
2392
2931
self.assertEqual(os.stat(limbo_path).st_mtime,
2393
preview_tree.get_file_mtime('file-id'))
2932
preview_tree.get_file_mtime('file'))
2395
2934
def test_get_file_mtime_renamed(self):
2396
2935
work_tree = self.make_branch_and_tree('tree')
2397
2936
self.build_tree(['tree/file'])
2398
work_tree.add('file', 'file-id')
2937
work_tree.add('file', b'file-id')
2399
2938
preview = TransformPreview(work_tree)
2400
2939
self.addCleanup(preview.finalize)
2401
file_trans_id = preview.trans_id_tree_file_id('file-id')
2940
file_trans_id = preview.trans_id_tree_path('file')
2402
2941
preview.adjust_path('renamed', preview.root, file_trans_id)
2403
2942
preview_tree = preview.get_preview_tree()
2404
preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2405
work_mtime = work_tree.get_file_mtime('file-id', 'file')
2943
preview_mtime = preview_tree.get_file_mtime('renamed')
2944
work_mtime = work_tree.get_file_mtime('file')
2946
def test_get_file_size(self):
2947
work_tree = self.make_branch_and_tree('tree')
2948
self.build_tree_contents([('tree/old', b'old')])
2949
work_tree.add('old', b'old-id')
2950
preview = TransformPreview(work_tree)
2951
self.addCleanup(preview.finalize)
2952
preview.new_file('name', preview.root, [b'contents'], b'new-id',
2954
tree = preview.get_preview_tree()
2955
self.assertEqual(len('old'), tree.get_file_size('old'))
2956
self.assertEqual(len('contents'), tree.get_file_size('name'))
2407
2958
def test_get_file(self):
2408
2959
preview = self.get_empty_preview()
2409
preview.new_file('file', preview.root, 'contents', 'file-id')
2960
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2410
2961
preview_tree = preview.get_preview_tree()
2411
tree_file = preview_tree.get_file('file-id')
2413
self.assertEqual('contents', tree_file.read())
2962
with preview_tree.get_file('file') as tree_file:
2963
self.assertEqual(b'contents', tree_file.read())
2417
2965
def test_get_symlink_target(self):
2418
2966
self.requireFeature(SymlinkFeature)
2419
2967
preview = self.get_empty_preview()
2420
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2968
preview.new_symlink('symlink', preview.root, 'target', b'symlink-id')
2421
2969
preview_tree = preview.get_preview_tree()
2422
2970
self.assertEqual('target',
2423
preview_tree.get_symlink_target('symlink-id'))
2971
preview_tree.get_symlink_target('symlink'))
2425
2973
def test_all_file_ids(self):
2426
2974
tree = self.make_branch_and_tree('tree')
2427
2975
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2428
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2976
tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
2429
2977
preview = TransformPreview(tree)
2430
2978
self.addCleanup(preview.finalize)
2431
preview.unversion_file(preview.trans_id_file_id('b-id'))
2432
c_trans_id = preview.trans_id_file_id('c-id')
2979
preview.unversion_file(preview.trans_id_file_id(b'b-id'))
2980
c_trans_id = preview.trans_id_file_id(b'c-id')
2433
2981
preview.unversion_file(c_trans_id)
2434
preview.version_file('c-id', c_trans_id)
2982
preview.version_file(b'c-id', c_trans_id)
2435
2983
preview_tree = preview.get_preview_tree()
2436
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2984
self.assertEqual({b'a-id', b'c-id', tree.path2id('')},
2437
2985
preview_tree.all_file_ids())
2439
2987
def test_path2id_deleted_unchanged(self):
2440
2988
tree = self.make_branch_and_tree('tree')
2441
2989
self.build_tree(['tree/unchanged', 'tree/deleted'])
2442
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2990
tree.add(['unchanged', 'deleted'], [b'unchanged-id', b'deleted-id'])
2443
2991
preview = TransformPreview(tree)
2444
2992
self.addCleanup(preview.finalize)
2445
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2993
preview.unversion_file(preview.trans_id_file_id(b'deleted-id'))
2446
2994
preview_tree = preview.get_preview_tree()
2447
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2448
self.assertIs(None, preview_tree.path2id('deleted'))
2995
self.assertEqual(b'unchanged-id', preview_tree.path2id('unchanged'))
2996
self.assertFalse(preview_tree.is_versioned('deleted'))
2450
2998
def test_path2id_created(self):
2451
2999
tree = self.make_branch_and_tree('tree')
2452
3000
self.build_tree(['tree/unchanged'])
2453
tree.add(['unchanged'], ['unchanged-id'])
3001
tree.add(['unchanged'], [b'unchanged-id'])
2454
3002
preview = TransformPreview(tree)
2455
3003
self.addCleanup(preview.finalize)
2456
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2457
'contents', 'new-id')
3004
preview.new_file('new', preview.trans_id_file_id(b'unchanged-id'),
3005
[b'contents'], b'new-id')
2458
3006
preview_tree = preview.get_preview_tree()
2459
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
3007
self.assertEqual(b'new-id', preview_tree.path2id('unchanged/new'))
2461
3009
def test_path2id_moved(self):
2462
3010
tree = self.make_branch_and_tree('tree')
2463
3011
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2464
3012
tree.add(['old_parent', 'old_parent/child'],
2465
['old_parent-id', 'child-id'])
3013
[b'old_parent-id', b'child-id'])
2466
3014
preview = TransformPreview(tree)
2467
3015
self.addCleanup(preview.finalize)
2468
3016
new_parent = preview.new_directory('new_parent', preview.root,
2470
3018
preview.adjust_path('child', new_parent,
2471
preview.trans_id_file_id('child-id'))
3019
preview.trans_id_file_id(b'child-id'))
2472
3020
preview_tree = preview.get_preview_tree()
2473
self.assertIs(None, preview_tree.path2id('old_parent/child'))
2474
self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
3021
self.assertFalse(preview_tree.is_versioned('old_parent/child'))
3022
self.assertEqual(b'child-id', preview_tree.path2id('new_parent/child'))
2476
3024
def test_path2id_renamed_parent(self):
2477
3025
tree = self.make_branch_and_tree('tree')
2478
3026
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2479
3027
tree.add(['old_name', 'old_name/child'],
2480
['parent-id', 'child-id'])
3028
[b'parent-id', b'child-id'])
2481
3029
preview = TransformPreview(tree)
2482
3030
self.addCleanup(preview.finalize)
2483
3031
preview.adjust_path('new_name', preview.root,
2484
preview.trans_id_file_id('parent-id'))
3032
preview.trans_id_file_id(b'parent-id'))
2485
3033
preview_tree = preview.get_preview_tree()
2486
self.assertIs(None, preview_tree.path2id('old_name/child'))
2487
self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
3034
self.assertFalse(preview_tree.is_versioned('old_name/child'))
3035
self.assertEqual(b'child-id', preview_tree.path2id('new_name/child'))
2489
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
3037
def assertMatchingIterEntries(self, tt, specific_files=None):
2490
3038
preview_tree = tt.get_preview_tree()
2491
3039
preview_result = list(preview_tree.iter_entries_by_dir(
3040
specific_files=specific_files))
2493
3041
tree = tt._tree
2495
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
3043
actual_result = list(tree.iter_entries_by_dir(
3044
specific_files=specific_files))
2496
3045
self.assertEqual(actual_result, preview_result)
2498
3047
def test_iter_entries_by_dir_new(self):
2499
3048
tree = self.make_branch_and_tree('tree')
2500
3049
tt = TreeTransform(tree)
2501
tt.new_file('new', tt.root, 'contents', 'new-id')
3050
tt.new_file('new', tt.root, [b'contents'], b'new-id')
2502
3051
self.assertMatchingIterEntries(tt)
2504
3053
def test_iter_entries_by_dir_deleted(self):
2505
3054
tree = self.make_branch_and_tree('tree')
2506
3055
self.build_tree(['tree/deleted'])
2507
tree.add('deleted', 'deleted-id')
3056
tree.add('deleted', b'deleted-id')
2508
3057
tt = TreeTransform(tree)
2509
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
3058
tt.delete_contents(tt.trans_id_file_id(b'deleted-id'))
2510
3059
self.assertMatchingIterEntries(tt)
2512
3061
def test_iter_entries_by_dir_unversioned(self):
2513
3062
tree = self.make_branch_and_tree('tree')
2514
3063
self.build_tree(['tree/removed'])
2515
tree.add('removed', 'removed-id')
3064
tree.add('removed', b'removed-id')
2516
3065
tt = TreeTransform(tree)
2517
tt.unversion_file(tt.trans_id_file_id('removed-id'))
3066
tt.unversion_file(tt.trans_id_file_id(b'removed-id'))
2518
3067
self.assertMatchingIterEntries(tt)
2520
3069
def test_iter_entries_by_dir_moved(self):
2521
3070
tree = self.make_branch_and_tree('tree')
2522
3071
self.build_tree(['tree/moved', 'tree/new_parent/'])
2523
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
3072
tree.add(['moved', 'new_parent'], [b'moved-id', b'new_parent-id'])
2524
3073
tt = TreeTransform(tree)
2525
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2526
tt.trans_id_file_id('moved-id'))
3074
tt.adjust_path('moved', tt.trans_id_file_id(b'new_parent-id'),
3075
tt.trans_id_file_id(b'moved-id'))
2527
3076
self.assertMatchingIterEntries(tt)
2529
def test_iter_entries_by_dir_specific_file_ids(self):
3078
def test_iter_entries_by_dir_specific_files(self):
2530
3079
tree = self.make_branch_and_tree('tree')
2531
tree.set_root_id('tree-root-id')
3080
tree.set_root_id(b'tree-root-id')
2532
3081
self.build_tree(['tree/parent/', 'tree/parent/child'])
2533
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
3082
tree.add(['parent', 'parent/child'], [b'parent-id', b'child-id'])
2534
3083
tt = TreeTransform(tree)
2535
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
3084
self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2537
3086
def test_symlink_content_summary(self):
2538
3087
self.requireFeature(SymlinkFeature)
2539
3088
preview = self.get_empty_preview()
2540
preview.new_symlink('path', preview.root, 'target', 'path-id')
3089
preview.new_symlink('path', preview.root, 'target', b'path-id')
2541
3090
summary = preview.get_preview_tree().path_content_summary('path')
2542
3091
self.assertEqual(('symlink', None, None, 'target'), summary)
2597
3147
def test_dir_content_summary(self):
2598
3148
preview = self.get_empty_preview()
2599
preview.new_directory('path', preview.root, 'path-id')
3149
preview.new_directory('path', preview.root, b'path-id')
2600
3150
summary = preview.get_preview_tree().path_content_summary('path')
2601
3151
self.assertEqual(('directory', None, None, None), summary)
2603
3153
def test_tree_content_summary(self):
2604
3154
preview = self.get_empty_preview()
2605
path = preview.new_directory('path', preview.root, 'path-id')
2606
preview.set_tree_reference('rev-1', path)
3155
path = preview.new_directory('path', preview.root, b'path-id')
3156
preview.set_tree_reference(b'rev-1', path)
2607
3157
summary = preview.get_preview_tree().path_content_summary('path')
2608
3158
self.assertEqual(4, len(summary))
2609
3159
self.assertEqual('tree-reference', summary[0])
2611
3161
def test_annotate(self):
2612
3162
tree = self.make_branch_and_tree('tree')
2613
self.build_tree_contents([('tree/file', 'a\n')])
2614
tree.add('file', 'file-id')
2615
tree.commit('a', rev_id='one')
2616
self.build_tree_contents([('tree/file', 'a\nb\n')])
3163
self.build_tree_contents([('tree/file', b'a\n')])
3164
tree.add('file', b'file-id')
3165
tree.commit('a', rev_id=b'one')
3166
self.build_tree_contents([('tree/file', b'a\nb\n')])
2617
3167
preview = TransformPreview(tree)
2618
3168
self.addCleanup(preview.finalize)
2619
file_trans_id = preview.trans_id_file_id('file-id')
3169
file_trans_id = preview.trans_id_file_id(b'file-id')
2620
3170
preview.delete_contents(file_trans_id)
2621
preview.create_file('a\nb\nc\n', file_trans_id)
3171
preview.create_file([b'a\nb\nc\n'], file_trans_id)
2622
3172
preview_tree = preview.get_preview_tree()
2628
annotation = preview_tree.annotate_iter('file-id', 'me:')
3178
annotation = preview_tree.annotate_iter(
3179
'file', default_revision=b'me:')
2629
3180
self.assertEqual(expected, annotation)
2631
3182
def test_annotate_missing(self):
2632
3183
preview = self.get_empty_preview()
2633
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3184
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2634
3185
preview_tree = preview.get_preview_tree()
2640
annotation = preview_tree.annotate_iter('file-id', 'me:')
3191
annotation = preview_tree.annotate_iter(
3192
'file', default_revision=b'me:')
2641
3193
self.assertEqual(expected, annotation)
2643
3195
def test_annotate_rename(self):
2644
3196
tree = self.make_branch_and_tree('tree')
2645
self.build_tree_contents([('tree/file', 'a\n')])
2646
tree.add('file', 'file-id')
2647
tree.commit('a', rev_id='one')
3197
self.build_tree_contents([('tree/file', b'a\n')])
3198
tree.add('file', b'file-id')
3199
tree.commit('a', rev_id=b'one')
2648
3200
preview = TransformPreview(tree)
2649
3201
self.addCleanup(preview.finalize)
2650
file_trans_id = preview.trans_id_file_id('file-id')
3202
file_trans_id = preview.trans_id_file_id(b'file-id')
2651
3203
preview.adjust_path('newname', preview.root, file_trans_id)
2652
3204
preview_tree = preview.get_preview_tree()
2656
annotation = preview_tree.annotate_iter('file-id', 'me:')
3208
annotation = preview_tree.annotate_iter(
3209
'file', default_revision=b'me:')
2657
3210
self.assertEqual(expected, annotation)
2659
3212
def test_annotate_deleted(self):
2660
3213
tree = self.make_branch_and_tree('tree')
2661
self.build_tree_contents([('tree/file', 'a\n')])
2662
tree.add('file', 'file-id')
2663
tree.commit('a', rev_id='one')
2664
self.build_tree_contents([('tree/file', 'a\nb\n')])
3214
self.build_tree_contents([('tree/file', b'a\n')])
3215
tree.add('file', b'file-id')
3216
tree.commit('a', rev_id=b'one')
3217
self.build_tree_contents([('tree/file', b'a\nb\n')])
2665
3218
preview = TransformPreview(tree)
2666
3219
self.addCleanup(preview.finalize)
2667
file_trans_id = preview.trans_id_file_id('file-id')
3220
file_trans_id = preview.trans_id_file_id(b'file-id')
2668
3221
preview.delete_contents(file_trans_id)
2669
3222
preview_tree = preview.get_preview_tree()
2670
annotation = preview_tree.annotate_iter('file-id', 'me:')
3223
annotation = preview_tree.annotate_iter(
3224
'file', default_revision=b'me:')
2671
3225
self.assertIs(None, annotation)
2673
3227
def test_stored_kind(self):
2674
3228
preview = self.get_empty_preview()
2675
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3229
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2676
3230
preview_tree = preview.get_preview_tree()
2677
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3231
self.assertEqual('file', preview_tree.stored_kind('file'))
2679
3233
def test_is_executable(self):
2680
3234
preview = self.get_empty_preview()
2681
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
2682
preview.set_executability(True, preview.trans_id_file_id('file-id'))
3235
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
3236
preview.set_executability(True, preview.trans_id_file_id(b'file-id'))
2683
3237
preview_tree = preview.get_preview_tree()
2684
self.assertEqual(True, preview_tree.is_executable('file-id'))
3238
self.assertEqual(True, preview_tree.is_executable('file'))
2686
3240
def test_get_set_parent_ids(self):
2687
3241
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2688
3242
self.assertEqual([], preview_tree.get_parent_ids())
2689
preview_tree.set_parent_ids(['rev-1'])
2690
self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
3243
preview_tree.set_parent_ids([b'rev-1'])
3244
self.assertEqual([b'rev-1'], preview_tree.get_parent_ids())
2692
3246
def test_plan_file_merge(self):
2693
3247
work_a = self.make_branch_and_tree('wta')
2694
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2695
work_a.add('file', 'file-id')
3248
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3249
work_a.add('file', b'file-id')
2696
3250
base_id = work_a.commit('base version')
2697
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3251
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2698
3252
preview = TransformPreview(work_a)
2699
3253
self.addCleanup(preview.finalize)
2700
trans_id = preview.trans_id_file_id('file-id')
3254
trans_id = preview.trans_id_file_id(b'file-id')
2701
3255
preview.delete_contents(trans_id)
2702
preview.create_file('b\nc\nd\ne\n', trans_id)
2703
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3256
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3257
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2704
3258
tree_a = preview.get_preview_tree()
2705
3259
tree_a.set_parent_ids([base_id])
2706
3260
self.assertEqual([
2707
('killed-a', 'a\n'),
2708
('killed-b', 'b\n'),
2709
('unchanged', 'c\n'),
2710
('unchanged', 'd\n'),
2713
], list(tree_a.plan_file_merge('file-id', tree_b)))
3261
('killed-a', b'a\n'),
3262
('killed-b', b'b\n'),
3263
('unchanged', b'c\n'),
3264
('unchanged', b'd\n'),
3267
], list(tree_a.plan_file_merge('file', tree_b)))
2715
3269
def test_plan_file_merge_revision_tree(self):
2716
3270
work_a = self.make_branch_and_tree('wta')
2717
self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
2718
work_a.add('file', 'file-id')
3271
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3272
work_a.add('file', b'file-id')
2719
3273
base_id = work_a.commit('base version')
2720
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3274
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2721
3275
preview = TransformPreview(work_a.basis_tree())
2722
3276
self.addCleanup(preview.finalize)
2723
trans_id = preview.trans_id_file_id('file-id')
3277
trans_id = preview.trans_id_file_id(b'file-id')
2724
3278
preview.delete_contents(trans_id)
2725
preview.create_file('b\nc\nd\ne\n', trans_id)
2726
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3279
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3280
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2727
3281
tree_a = preview.get_preview_tree()
2728
3282
tree_a.set_parent_ids([base_id])
2729
3283
self.assertEqual([
2730
('killed-a', 'a\n'),
2731
('killed-b', 'b\n'),
2732
('unchanged', 'c\n'),
2733
('unchanged', 'd\n'),
2736
], list(tree_a.plan_file_merge('file-id', tree_b)))
3284
('killed-a', b'a\n'),
3285
('killed-b', b'b\n'),
3286
('unchanged', b'c\n'),
3287
('unchanged', b'd\n'),
3290
], list(tree_a.plan_file_merge('file', tree_b)))
2738
3292
def test_walkdirs(self):
2739
3293
preview = self.get_empty_preview()
2740
root = preview.new_directory('', ROOT_PARENT, 'tree-root')
3294
preview.new_directory('', ROOT_PARENT, b'tree-root')
2741
3295
# FIXME: new_directory should mark root.
2742
3296
preview.fixup_new_roots()
2743
3297
preview_tree = preview.get_preview_tree()
2744
file_trans_id = preview.new_file('a', preview.root, 'contents',
2746
expected = [(('', 'tree-root'),
2747
[('a', 'a', 'file', None, 'a-id', 'file')])]
3298
preview.new_file('a', preview.root, [b'contents'], b'a-id')
3299
expected = [(('', b'tree-root'),
3300
[('a', 'a', 'file', None, b'a-id', 'file')])]
2748
3301
self.assertEqual(expected, list(preview_tree.walkdirs()))
2750
3303
def test_extras(self):
2788
3341
tt = merger.make_merger().make_preview_transform()
2789
3342
self.addCleanup(tt.finalize)
2790
3343
final_tree = tt.get_preview_tree()
2791
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3346
final_tree.get_file_text(final_tree.id2path(b'file-id')))
2793
3348
def test_merge_preview_into_workingtree(self):
2794
3349
tree = self.make_branch_and_tree('tree')
2795
tree.set_root_id('TREE_ROOT')
3350
tree.set_root_id(b'TREE_ROOT')
2796
3351
tt = TransformPreview(tree)
2797
3352
self.addCleanup(tt.finalize)
2798
tt.new_file('name', tt.root, 'content', 'file-id')
3353
tt.new_file('name', tt.root, [b'content'], b'file-id')
2799
3354
tree2 = self.make_branch_and_tree('tree2')
2800
tree2.set_root_id('TREE_ROOT')
3355
tree2.set_root_id(b'TREE_ROOT')
2801
3356
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
None, tree.basis_tree())
2803
3358
merger.merge_type = Merge3Merger
2804
3359
merger.do_merge()
2806
3361
def test_merge_preview_into_workingtree_handles_conflicts(self):
2807
3362
tree = self.make_branch_and_tree('tree')
2808
self.build_tree_contents([('tree/foo', 'bar')])
2809
tree.add('foo', 'foo-id')
3363
self.build_tree_contents([('tree/foo', b'bar')])
3364
tree.add('foo', b'foo-id')
2810
3365
tree.commit('foo')
2811
3366
tt = TransformPreview(tree)
2812
3367
self.addCleanup(tt.finalize)
2813
trans_id = tt.trans_id_file_id('foo-id')
3368
trans_id = tt.trans_id_file_id(b'foo-id')
2814
3369
tt.delete_contents(trans_id)
2815
tt.create_file('baz', trans_id)
2816
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2817
self.build_tree_contents([('tree2/foo', 'qux')])
3370
tt.create_file([b'baz'], trans_id)
3371
tree2 = tree.controldir.sprout('tree2').open_workingtree()
3372
self.build_tree_contents([('tree2/foo', b'qux')])
2819
3373
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
pb, tree.basis_tree())
2821
3375
merger.merge_type = Merge3Merger
2822
3376
merger.do_merge()
3378
def test_has_filename(self):
3379
wt = self.make_branch_and_tree('tree')
3380
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3381
tt = TransformPreview(wt)
3382
removed_id = tt.trans_id_tree_path('removed')
3383
tt.delete_contents(removed_id)
3384
tt.new_file('new', tt.root, [b'contents'])
3385
modified_id = tt.trans_id_tree_path('modified')
3386
tt.delete_contents(modified_id)
3387
tt.create_file([b'modified-contents'], modified_id)
3388
self.addCleanup(tt.finalize)
3389
tree = tt.get_preview_tree()
3390
self.assertTrue(tree.has_filename('unmodified'))
3391
self.assertFalse(tree.has_filename('not-present'))
3392
self.assertFalse(tree.has_filename('removed'))
3393
self.assertTrue(tree.has_filename('new'))
3394
self.assertTrue(tree.has_filename('modified'))
2824
3396
def test_is_executable(self):
2825
3397
tree = self.make_branch_and_tree('tree')
2826
3398
preview = TransformPreview(tree)
2827
3399
self.addCleanup(preview.finalize)
2828
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3400
preview.new_file('foo', preview.root, [b'bar'], b'baz-id')
2829
3401
preview_tree = preview.get_preview_tree()
2830
self.assertEqual(False, preview_tree.is_executable('baz-id',
2832
self.assertEqual(False, preview_tree.is_executable('baz-id'))
3402
self.assertEqual(False, preview_tree.is_executable('tree/foo'))
2834
3404
def test_commit_preview_tree(self):
2835
3405
tree = self.make_branch_and_tree('tree')
3112
3682
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3114
3684
def test_get_parents_lines(self):
3115
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3116
LINES_TWO = 'z\nbb\nx\ndd\n'
3685
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3117
3686
tree = self.make_branch_and_tree('tree')
3118
3687
self.build_tree_contents([('tree/file', LINES_ONE)])
3119
tree.add('file', 'file-id')
3688
tree.add('file', b'file-id')
3120
3689
tt = self.get_preview(tree)
3121
3690
trans_id = tt.trans_id_tree_path('file')
3122
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3123
tt._get_parents_lines(trans_id))
3691
self.assertEqual(([b'aa\n', b'bb\n', b'cc\n', b'dd\n'],),
3692
tt._get_parents_lines(trans_id))
3125
3694
def test_get_parents_texts(self):
3126
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3127
LINES_TWO = 'z\nbb\nx\ndd\n'
3695
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3128
3696
tree = self.make_branch_and_tree('tree')
3129
3697
self.build_tree_contents([('tree/file', LINES_ONE)])
3130
tree.add('file', 'file-id')
3698
tree.add('file', b'file-id')
3131
3699
tt = self.get_preview(tree)
3132
3700
trans_id = tt.trans_id_tree_path('file')
3133
3701
self.assertEqual((LINES_ONE,),
3134
tt._get_parents_texts(trans_id))
3702
tt._get_parents_texts(trans_id))
3705
class TestOrphan(tests.TestCaseWithTransport):
3707
def test_no_orphan_for_transform_preview(self):
3708
tree = self.make_branch_and_tree('tree')
3709
tt = transform.TransformPreview(tree)
3710
self.addCleanup(tt.finalize)
3711
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3713
def _set_orphan_policy(self, wt, policy):
3714
wt.branch.get_config_stack().set('transform.orphan_policy',
3717
def _prepare_orphan(self, wt):
3718
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3719
wt.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
3720
wt.commit('add dir and file ignoring foo')
3721
tt = transform.TreeTransform(wt)
3722
self.addCleanup(tt.finalize)
3723
# dir and bar are deleted
3724
dir_tid = tt.trans_id_tree_path('dir')
3725
file_tid = tt.trans_id_tree_path('dir/file')
3726
orphan_tid = tt.trans_id_tree_path('dir/foo')
3727
tt.delete_contents(file_tid)
3728
tt.unversion_file(file_tid)
3729
tt.delete_contents(dir_tid)
3730
tt.unversion_file(dir_tid)
3731
# There should be a conflict because dir still contain foo
3732
raw_conflicts = tt.find_conflicts()
3733
self.assertLength(1, raw_conflicts)
3734
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3735
return tt, orphan_tid
3737
def test_new_orphan_created(self):
3738
wt = self.make_branch_and_tree('.')
3739
self._set_orphan_policy(wt, 'move')
3740
tt, orphan_tid = self._prepare_orphan(wt)
3744
warnings.append(args[0] % args[1:])
3745
self.overrideAttr(trace, 'warning', warning)
3746
remaining_conflicts = resolve_conflicts(tt)
3747
self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
3749
# Yeah for resolved conflicts !
3750
self.assertLength(0, remaining_conflicts)
3751
# We have a new orphan
3752
self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
3753
self.assertEqual('brz-orphans',
3754
tt.final_name(tt.final_parent(orphan_tid)))
3756
def test_never_orphan(self):
3757
wt = self.make_branch_and_tree('.')
3758
self._set_orphan_policy(wt, 'conflict')
3759
tt, orphan_tid = self._prepare_orphan(wt)
3760
remaining_conflicts = resolve_conflicts(tt)
3761
self.assertLength(1, remaining_conflicts)
3762
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3763
remaining_conflicts.pop())
3765
def test_orphan_error(self):
3766
def bogus_orphan(tt, orphan_id, parent_id):
3767
raise transform.OrphaningError(tt.final_name(orphan_id),
3768
tt.final_name(parent_id))
3769
transform.orphaning_registry.register('bogus', bogus_orphan,
3770
'Raise an error when orphaning')
3771
wt = self.make_branch_and_tree('.')
3772
self._set_orphan_policy(wt, 'bogus')
3773
tt, orphan_tid = self._prepare_orphan(wt)
3774
remaining_conflicts = resolve_conflicts(tt)
3775
self.assertLength(1, remaining_conflicts)
3776
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3777
remaining_conflicts.pop())
3779
def test_unknown_orphan_policy(self):
3780
wt = self.make_branch_and_tree('.')
3781
# Set a fictional policy nobody ever implemented
3782
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3783
tt, orphan_tid = self._prepare_orphan(wt)
3787
warnings.append(args[0] % args[1:])
3788
self.overrideAttr(trace, 'warning', warning)
3789
remaining_conflicts = resolve_conflicts(tt)
3790
# We fallback to the default policy which create a conflict
3791
self.assertLength(1, remaining_conflicts)
3792
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3793
remaining_conflicts.pop())
3794
self.assertLength(1, warnings)
3795
self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3798
class TestTransformHooks(tests.TestCaseWithTransport):
3801
super(TestTransformHooks, self).setUp()
3802
self.wt = self.make_branch_and_tree('.')
3805
def get_transform(self):
3806
transform = TreeTransform(self.wt)
3807
self.addCleanup(transform.finalize)
3808
return transform, transform.root
3810
def test_pre_commit_hooks(self):
3813
def record_pre_transform(tree, tt):
3814
calls.append((tree, tt))
3815
MutableTree.hooks.install_named_hook(
3816
'pre_transform', record_pre_transform, "Pre transform")
3817
transform, root = self.get_transform()
3818
old_root_id = transform.tree_file_id(root)
3820
self.assertEqual(old_root_id, self.wt.path2id(''))
3821
self.assertEqual([(self.wt, transform)], calls)
3823
def test_post_commit_hooks(self):
3826
def record_post_transform(tree, tt):
3827
calls.append((tree, tt))
3828
MutableTree.hooks.install_named_hook(
3829
'post_transform', record_post_transform, "Post transform")
3830
transform, root = self.get_transform()
3831
old_root_id = transform.tree_file_id(root)
3833
self.assertEqual(old_root_id, self.wt.path2id(''))
3834
self.assertEqual([(self.wt, transform)], calls)
3837
class TestLinkTree(tests.TestCaseWithTransport):
3839
_test_needs_features = [HardlinkFeature]
3842
tests.TestCaseWithTransport.setUp(self)
3843
self.parent_tree = self.make_branch_and_tree('parent')
3844
self.parent_tree.lock_write()
3845
self.addCleanup(self.parent_tree.unlock)
3846
self.build_tree_contents([('parent/foo', b'bar')])
3847
self.parent_tree.add('foo')
3848
self.parent_tree.commit('added foo')
3849
child_controldir = self.parent_tree.controldir.sprout('child')
3850
self.child_tree = child_controldir.open_workingtree()
3852
def hardlinked(self):
3853
parent_stat = os.lstat(self.parent_tree.abspath('foo'))
3854
child_stat = os.lstat(self.child_tree.abspath('foo'))
3855
return parent_stat.st_ino == child_stat.st_ino
3857
def test_link_fails_if_modified(self):
3858
"""If the file to be linked has modified text, don't link."""
3859
self.build_tree_contents([('child/foo', b'baz')])
3860
transform.link_tree(self.child_tree, self.parent_tree)
3861
self.assertFalse(self.hardlinked())
3863
def test_link_fails_if_execute_bit_changed(self):
3864
"""If the file to be linked has modified execute bit, don't link."""
3865
tt = TreeTransform(self.child_tree)
3867
trans_id = tt.trans_id_tree_path('foo')
3868
tt.set_executability(True, trans_id)
3872
transform.link_tree(self.child_tree, self.parent_tree)
3873
self.assertFalse(self.hardlinked())
3875
def test_link_succeeds_if_unmodified(self):
3876
"""If the file to be linked is unmodified, link"""
3877
transform.link_tree(self.child_tree, self.parent_tree)
3878
self.assertTrue(self.hardlinked())
added
removed
breezy/tests/test_transform.py
