101
142
imaginary_id = transform.trans_id_tree_path('imaginary')
102
143
imaginary_id2 = transform.trans_id_tree_path('imaginary/')
103
144
self.assertEqual(imaginary_id, imaginary_id2)
104
self.assertEqual(transform.get_tree_parent(imaginary_id), root)
105
self.assertEqual(transform.final_kind(root), 'directory')
106
self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
145
self.assertEqual(root, transform.get_tree_parent(imaginary_id))
146
self.assertEqual('directory', transform.final_kind(root))
147
self.assertEqual(self.wt.get_root_id(), transform.final_file_id(root))
107
148
trans_id = transform.create_path('name', root)
108
149
self.assertIs(transform.final_file_id(trans_id), None)
109
self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
110
transform.create_file('contents', trans_id)
150
self.assertIs(None, transform.final_kind(trans_id))
151
transform.create_file([b'contents'], trans_id)
111
152
transform.set_executability(True, trans_id)
112
transform.version_file('my_pretties', trans_id)
153
transform.version_file(b'my_pretties', trans_id)
113
154
self.assertRaises(DuplicateKey, transform.version_file,
114
'my_pretties', trans_id)
115
self.assertEqual(transform.final_file_id(trans_id), 'my_pretties')
155
b'my_pretties', trans_id)
156
self.assertEqual(transform.final_file_id(trans_id), b'my_pretties')
116
157
self.assertEqual(transform.final_parent(trans_id), root)
117
158
self.assertIs(transform.final_parent(root), ROOT_PARENT)
118
159
self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
119
160
oz_id = transform.create_path('oz', root)
120
161
transform.create_directory(oz_id)
121
transform.version_file('ozzie', oz_id)
162
transform.version_file(b'ozzie', oz_id)
122
163
trans_id2 = transform.create_path('name2', root)
123
transform.create_file('contents', trans_id2)
164
transform.create_file([b'contents'], trans_id2)
124
165
transform.set_executability(False, trans_id2)
125
transform.version_file('my_pretties2', trans_id2)
166
transform.version_file(b'my_pretties2', trans_id2)
126
167
modified_paths = transform.apply().modified_paths
127
self.assertEqual('contents', self.wt.get_file_byname('name').read())
128
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
129
self.assertIs(self.wt.is_executable('my_pretties'), True)
130
self.assertIs(self.wt.is_executable('my_pretties2'), False)
168
with self.wt.get_file('name') as f:
169
self.assertEqual(b'contents', f.read())
170
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
171
self.assertIs(self.wt.is_executable('name'), True)
172
self.assertIs(self.wt.is_executable('name2'), False)
131
173
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
132
174
self.assertEqual(len(modified_paths), 3)
133
tree_mod_paths = [self.wt.id2abspath(f) for f in
134
('ozzie', 'my_pretties', 'my_pretties2')]
175
tree_mod_paths = [self.wt.abspath(self.wt.id2path(f)) for f in
176
(b'ozzie', b'my_pretties', b'my_pretties2')]
135
177
self.assertSubset(tree_mod_paths, modified_paths)
136
178
# is it safe to finalize repeatedly?
137
179
transform.finalize()
138
180
transform.finalize()
182
def test_apply_informs_tree_of_observed_sha1(self):
183
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
184
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
187
orig = self.wt._observed_sha1
189
def _observed_sha1(*args):
192
self.wt._observed_sha1 = _observed_sha1
194
self.assertEqual([('file1', trans._observed_sha1s[trans_id])],
197
def test_create_file_caches_sha1(self):
198
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
199
trans_id = trans.create_path('file1', root)
200
trans.create_file(contents, trans_id, sha1=sha1)
201
st_val = osutils.lstat(trans._limbo_name(trans_id))
202
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
203
self.assertEqual(o_sha1, sha1)
204
self.assertEqualStat(o_st_val, st_val)
206
def test__apply_insertions_updates_sha1(self):
207
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
208
trans_id = trans.create_path('file1', root)
209
trans.create_file(contents, trans_id, sha1=sha1)
210
st_val = osutils.lstat(trans._limbo_name(trans_id))
211
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
212
self.assertEqual(o_sha1, sha1)
213
self.assertEqualStat(o_st_val, st_val)
214
creation_mtime = trans._creation_mtime + 10.0
215
# We fake a time difference from when the file was created until now it
216
# is being renamed by using os.utime. Note that the change we actually
217
# want to see is the real ctime change from 'os.rename()', but as long
218
# as we observe a new stat value, we should be fine.
219
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
221
new_st_val = osutils.lstat(self.wt.abspath('file1'))
222
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
223
self.assertEqual(o_sha1, sha1)
224
self.assertEqualStat(o_st_val, new_st_val)
225
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
227
def test_new_file_caches_sha1(self):
228
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
229
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
231
st_val = osutils.lstat(trans._limbo_name(trans_id))
232
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
233
self.assertEqual(o_sha1, sha1)
234
self.assertEqualStat(o_st_val, st_val)
236
def test_cancel_creation_removes_observed_sha1(self):
237
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
238
trans_id = trans.new_file('file1', root, contents, file_id=b'file1-id',
240
self.assertTrue(trans_id in trans._observed_sha1s)
241
trans.cancel_creation(trans_id)
242
self.assertFalse(trans_id in trans._observed_sha1s)
140
244
def test_create_files_same_timestamp(self):
141
245
transform, root = self.get_transform()
142
246
self.wt.lock_tree_write()
144
248
# Roll back the clock, so that we know everything is being set to the
146
250
transform._creation_mtime = creation_mtime = time.time() - 20.0
147
transform.create_file('content-one',
251
transform.create_file([b'content-one'],
148
252
transform.create_path('one', root))
149
time.sleep(1) # *ugly*
150
transform.create_file('content-two',
253
time.sleep(1) # *ugly*
254
transform.create_file([b'content-two'],
151
255
transform.create_path('two', root))
152
256
transform.apply()
153
fo, st1 = self.wt.get_file_with_stat(None, path='one', filtered=False)
257
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)
259
fo, st2 = self.wt.get_file_with_stat('two', filtered=False)
157
261
# We only guarantee 2s resolution
158
self.assertTrue(abs(creation_mtime - st1.st_mtime) < 2.0,
263
abs(creation_mtime - st1.st_mtime) < 2.0,
159
264
"%s != %s within 2 seconds" % (creation_mtime, st1.st_mtime))
160
265
# But if we have more than that, all files should get the same result
161
266
self.assertEqual(st1.st_mtime, st2.st_mtime)
163
268
def test_change_root_id(self):
164
269
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')
270
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
271
transform.new_directory('', ROOT_PARENT, b'new-root-id')
167
272
transform.delete_contents(root)
168
273
transform.unversion_file(root)
169
274
transform.fixup_new_roots()
170
275
transform.apply()
171
self.assertEqual('new-root-id', self.wt.get_root_id())
276
self.assertEqual(b'new-root-id', self.wt.get_root_id())
173
278
def test_change_root_id_add_files(self):
174
279
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'],
280
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
281
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
282
transform.new_file('file', new_trans_id, [b'new-contents\n'],
179
284
transform.delete_contents(root)
180
285
transform.unversion_file(root)
181
286
transform.fixup_new_roots()
182
287
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'))
288
self.assertEqual(b'new-root-id', self.wt.get_root_id())
289
self.assertEqual(b'new-file-id', self.wt.path2id('file'))
290
self.assertFileEqual(b'new-contents\n', self.wt.abspath('file'))
187
292
def test_add_two_roots(self):
188
293
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)
294
transform.new_directory('', ROOT_PARENT, b'new-root-id')
295
transform.new_directory('', ROOT_PARENT, b'alt-root-id')
296
self.assertRaises(ValueError, transform.fixup_new_roots)
298
def test_retain_existing_root(self):
299
tt, root = self.get_transform()
301
tt.new_directory('', ROOT_PARENT, b'new-root-id')
303
self.assertNotEqual(b'new-root-id', tt.final_file_id(tt.root))
305
def test_retain_existing_root_added_file(self):
306
tt, root = self.get_transform()
307
new_trans_id = tt.new_directory('', ROOT_PARENT, b'new-root-id')
308
child = tt.new_directory('child', new_trans_id, b'child-id')
310
self.assertEqual(tt.root, tt.final_parent(child))
312
def test_add_unversioned_root(self):
313
transform, root = self.get_transform()
314
transform.new_directory('', ROOT_PARENT, None)
315
transform.delete_contents(transform.root)
316
transform.fixup_new_roots()
317
self.assertNotIn(transform.root, transform._new_id)
319
def test_remove_root_fixup(self):
320
transform, root = self.get_transform()
321
old_root_id = self.wt.get_root_id()
322
self.assertNotEqual(b'new-root-id', old_root_id)
323
transform.delete_contents(root)
324
transform.unversion_file(root)
325
transform.fixup_new_roots()
327
self.assertEqual(old_root_id, self.wt.get_root_id())
329
transform, root = self.get_transform()
330
transform.new_directory('', ROOT_PARENT, b'new-root-id')
331
transform.new_directory('', ROOT_PARENT, b'alt-root-id')
332
self.assertRaises(ValueError, transform.fixup_new_roots)
334
def test_fixup_new_roots_permits_empty_tree(self):
335
transform, root = self.get_transform()
336
transform.delete_contents(root)
337
transform.unversion_file(root)
338
transform.fixup_new_roots()
339
self.assertIs(None, transform.final_kind(root))
340
self.assertIs(None, transform.final_file_id(root))
342
def test_apply_retains_root_directory(self):
343
# Do not attempt to delete the physical root directory, because that
345
transform, root = self.get_transform()
347
transform.delete_contents(root)
348
e = self.assertRaises(AssertionError, self.assertRaises,
349
errors.TransformRenameFailed,
351
self.assertContainsRe('TransformRenameFailed not raised', str(e))
353
def test_apply_retains_file_id(self):
354
transform, root = self.get_transform()
355
old_root_id = transform.tree_file_id(root)
356
transform.unversion_file(root)
358
self.assertEqual(old_root_id, self.wt.get_root_id())
193
360
def test_hardlink(self):
194
361
self.requireFeature(HardlinkFeature)
195
362
transform, root = self.get_transform()
196
transform.new_file('file1', root, 'contents')
363
transform.new_file('file1', root, [b'contents'])
197
364
transform.apply()
198
365
target = self.make_branch_and_tree('target')
199
366
target_transform = TreeTransform(target)
200
367
trans_id = target_transform.create_path('file1', target_transform.root)
201
368
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
202
369
target_transform.apply()
203
self.failUnlessExists('target/file1')
370
self.assertPathExists('target/file1')
204
371
source_stat = os.stat(self.wt.abspath('file1'))
205
372
target_stat = os.stat('target/file1')
206
373
self.assertEqual(source_stat, target_stat)
209
376
transform, root = self.get_transform()
210
377
self.wt.lock_tree_write()
211
378
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',
379
transform.new_file('name', root, [b'contents'], b'my_pretties', True)
380
oz = transform.new_directory('oz', root, b'oz-id')
381
dorothy = transform.new_directory('dorothy', oz, b'dorothy-id')
382
transform.new_file('toto', dorothy, [b'toto-contents'], b'toto-id',
219
385
self.assertEqual(len(transform.find_conflicts()), 0)
220
386
transform.apply()
221
387
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')
388
with open(self.wt.abspath('name'), 'r') as f:
389
self.assertEqual('contents', f.read())
390
self.assertEqual(self.wt.path2id('name'), b'my_pretties')
391
self.assertIs(self.wt.is_executable('name'), True)
392
self.assertEqual(self.wt.path2id('oz'), b'oz-id')
393
self.assertEqual(self.wt.path2id('oz/dorothy'), b'dorothy-id')
394
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)
396
self.assertEqual(b'toto-contents',
397
self.wt.get_file('oz/dorothy/toto').read())
398
self.assertIs(self.wt.is_executable('oz/dorothy/toto'), False)
233
400
def test_tree_reference(self):
234
401
transform, root = self.get_transform()
235
402
tree = transform._tree
236
trans_id = transform.new_directory('reference', root, 'subtree-id')
237
transform.set_tree_reference('subtree-revision', trans_id)
403
trans_id = transform.new_directory('reference', root, b'subtree-id')
404
transform.set_tree_reference(b'subtree-revision', trans_id)
238
405
transform.apply()
240
407
self.addCleanup(tree.unlock)
241
self.assertEqual('subtree-revision',
242
tree.inventory['subtree-id'].reference_revision)
410
tree.root_inventory.get_entry(b'subtree-id').reference_revision)
244
412
def test_conflicts(self):
245
413
transform, root = self.get_transform()
246
trans_id = transform.new_file('name', root, 'contents',
414
trans_id = transform.new_file('name', root, [b'contents'],
248
416
self.assertEqual(len(transform.find_conflicts()), 0)
249
trans_id2 = transform.new_file('name', root, 'Crontents', 'toto')
417
trans_id2 = transform.new_file('name', root, [b'Crontents'], b'toto')
250
418
self.assertEqual(transform.find_conflicts(),
251
419
[('duplicate', trans_id, trans_id2, 'name')])
252
420
self.assertRaises(MalformedTransform, transform.apply)
463
632
create_tree, root = self.get_transform()
465
634
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')
635
create_tree.new_file('name1', root, [b'hello1'], b'name1')
636
create_tree.new_file('name2', root, [b'hello2'], b'name2')
637
ddir = create_tree.new_directory('dying_directory', root, b'ddir')
638
create_tree.new_file('dying_file', ddir, [b'goodbye1'], b'dfile')
639
create_tree.new_file('moving_file', ddir, [b'later1'], b'mfile')
640
create_tree.new_file('moving_file2', root, [b'later2'], b'mfile2')
472
641
create_tree.apply()
474
mangle_tree,root = self.get_transform()
643
mangle_tree, root = self.get_transform()
475
644
root = mangle_tree.root
477
name1 = mangle_tree.trans_id_tree_file_id('name1')
478
name2 = mangle_tree.trans_id_tree_file_id('name2')
646
name1 = mangle_tree.trans_id_tree_path('name1')
647
name2 = mangle_tree.trans_id_tree_path('name2')
479
648
mangle_tree.adjust_path('name2', root, name1)
480
649
mangle_tree.adjust_path('name1', root, name2)
482
#tests for deleting parent directories
483
ddir = mangle_tree.trans_id_tree_file_id('ddir')
651
# tests for deleting parent directories
652
ddir = mangle_tree.trans_id_tree_path('dying_directory')
484
653
mangle_tree.delete_contents(ddir)
485
dfile = mangle_tree.trans_id_tree_file_id('dfile')
654
dfile = mangle_tree.trans_id_tree_path('dying_directory/dying_file')
486
655
mangle_tree.delete_versioned(dfile)
487
656
mangle_tree.unversion_file(dfile)
488
mfile = mangle_tree.trans_id_tree_file_id('mfile')
657
mfile = mangle_tree.trans_id_tree_path('dying_directory/moving_file')
489
658
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')
660
# tests for adding parent directories
661
newdir = mangle_tree.new_directory('new_directory', root, b'newdir')
662
mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
494
663
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')
664
mangle_tree.new_file('newfile', newdir, [b'hello3'], b'dfile')
665
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
497
666
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
498
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
667
self.assertEqual(mangle_tree.final_file_id(mfile2), b'mfile2')
499
668
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'))
669
with open(self.wt.abspath('name1'), 'r') as f:
670
self.assertEqual(f.read(), 'hello2')
671
with open(self.wt.abspath('name2'), 'r') as f:
672
self.assertEqual(f.read(), 'hello1')
673
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
503
674
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')
675
with open(mfile2_path, 'r') as f:
676
self.assertEqual(f.read(), 'later2')
677
self.assertEqual(self.wt.id2path(b'mfile2'), 'new_directory/mfile2')
678
self.assertEqual(self.wt.path2id('new_directory/mfile2'), b'mfile2')
679
newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
680
with open(newfile_path, 'r') as f:
681
self.assertEqual(f.read(), 'hello3')
682
self.assertEqual(self.wt.path2id('dying_directory'), b'ddir')
510
683
self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
511
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
684
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
513
686
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')
687
create_tree, root = self.get_transform()
688
newdir = create_tree.new_directory('selftest', root, b'selftest-id')
689
create_tree.new_file('blackbox.py', newdir, [
690
b'hello1'], b'blackbox-id')
517
691
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')
692
mangle_tree, root = self.get_transform()
693
selftest = mangle_tree.trans_id_tree_path('selftest')
694
blackbox = mangle_tree.trans_id_tree_path('selftest/blackbox.py')
521
695
mangle_tree.adjust_path('test', root, selftest)
522
696
mangle_tree.adjust_path('test_too_much', root, selftest)
523
697
mangle_tree.set_executability(True, blackbox)
524
698
mangle_tree.apply()
526
700
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',
701
create_tree, root = self.get_transform()
702
breezy = create_tree.new_directory('breezy', root, b'breezy-id')
703
tests = create_tree.new_directory('tests', breezy, b'tests-id')
704
blackbox = create_tree.new_directory('blackbox', tests, b'blackbox-id')
705
create_tree.new_file('test_too_much.py', blackbox, [b'hello1'],
533
707
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)
708
mangle_tree, root = self.get_transform()
709
breezy = mangle_tree.trans_id_tree_path('breezy')
710
tests = mangle_tree.trans_id_tree_path('breezy/tests')
711
test_too_much = mangle_tree.trans_id_tree_path(
712
'breezy/tests/blackbox/test_too_much.py')
713
mangle_tree.adjust_path('selftest', breezy, tests)
539
714
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
540
715
mangle_tree.set_executability(True, test_too_much)
541
716
mangle_tree.apply()
543
718
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',
719
create_tree, root = self.get_transform()
720
tests = create_tree.new_directory('tests', root, b'tests-id')
721
create_tree.new_file('test_too_much.py', tests, [b'hello1'],
548
723
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')
724
mangle_tree, root = self.get_transform()
725
tests = mangle_tree.trans_id_tree_path('tests')
726
test_too_much = mangle_tree.trans_id_tree_path(
727
'tests/test_too_much.py')
552
728
mangle_tree.adjust_path('selftest', root, tests)
553
729
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
554
730
mangle_tree.set_executability(True, test_too_much)
753
931
def test_resolve_conflicts_wrong_existing_parent_kind(self):
754
932
tt = self.prepare_wrong_parent_kind()
755
933
raw_conflicts = resolve_conflicts(tt)
756
self.assertEqual(set([('non-directory parent', 'Created directory',
757
'new-3')]), raw_conflicts)
934
self.assertEqual({('non-directory parent', 'Created directory',
935
'new-3')}, raw_conflicts)
758
936
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
759
937
self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
760
'parent-id')], cooked_conflicts)
938
b'parent-id')], cooked_conflicts)
762
self.assertEqual(None, self.wt.path2id('parent'))
763
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
940
self.assertFalse(self.wt.is_versioned('parent'))
941
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
765
943
def test_resolve_conflicts_wrong_new_parent_kind(self):
766
944
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')
945
parent_id = tt.new_directory('parent', root, b'parent-id')
946
tt.new_file('child,', parent_id, [b'contents2'], b'file-id')
770
948
tt, root = self.get_transform()
771
parent_id = tt.trans_id_file_id('parent-id')
949
parent_id = tt.trans_id_file_id(b'parent-id')
772
950
tt.delete_contents(parent_id)
773
tt.create_file('contents', parent_id)
951
tt.create_file([b'contents'], parent_id)
774
952
raw_conflicts = resolve_conflicts(tt)
775
self.assertEqual(set([('non-directory parent', 'Created directory',
776
'new-3')]), raw_conflicts)
953
self.assertEqual({('non-directory parent', 'Created directory',
954
'new-3')}, raw_conflicts)
778
self.assertEqual(None, self.wt.path2id('parent'))
779
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
956
self.assertFalse(self.wt.is_versioned('parent'))
957
self.assertEqual(b'parent-id', self.wt.path2id('parent.new'))
781
959
def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
782
960
tt, root = self.get_transform()
783
961
parent_id = tt.new_directory('parent', root)
784
tt.new_file('child,', parent_id, 'contents2')
962
tt.new_file('child,', parent_id, [b'contents2'])
786
964
tt, root = self.get_transform()
787
965
parent_id = tt.trans_id_tree_path('parent')
788
966
tt.delete_contents(parent_id)
789
tt.create_file('contents', parent_id)
967
tt.create_file([b'contents'], parent_id)
790
968
resolve_conflicts(tt)
792
self.assertIs(None, self.wt.path2id('parent'))
793
self.assertIs(None, self.wt.path2id('parent.new'))
970
self.assertFalse(self.wt.is_versioned('parent'))
971
self.assertFalse(self.wt.is_versioned('parent.new'))
973
def test_resolve_conflicts_missing_parent(self):
974
wt = self.make_branch_and_tree('.')
975
tt = TreeTransform(wt)
976
self.addCleanup(tt.finalize)
977
parent = tt.trans_id_file_id(b'parent-id')
978
tt.new_file('file', parent, [b'Contents'])
979
raw_conflicts = resolve_conflicts(tt)
980
# Since the directory doesn't exist it's seen as 'missing'. So
981
# 'resolve_conflicts' create a conflict asking for it to be created.
982
self.assertLength(1, raw_conflicts)
983
self.assertEqual(('missing parent', 'Created directory', 'new-1'),
985
# apply fail since the missing directory doesn't exist
986
self.assertRaises(errors.NoFinalPath, tt.apply)
795
988
def test_moving_versioned_directories(self):
796
989
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')
990
kansas = create.new_directory('kansas', root, b'kansas-id')
991
create.new_directory('house', kansas, b'house-id')
992
create.new_directory('oz', root, b'oz-id')
801
994
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')
995
oz = cyclone.trans_id_tree_path('oz')
996
house = cyclone.trans_id_tree_path('house')
804
997
cyclone.adjust_path('house', oz, house)
807
1000
def test_moving_root(self):
808
1001
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')
1002
fun = create.new_directory('fun', root, b'fun-id')
1003
create.new_directory('sun', root, b'sun-id')
1004
create.new_directory('moon', root, b'moon')
813
1006
transform, root = self.get_transform()
814
1007
transform.adjust_root_path('oldroot', fun)
815
1008
new_root = transform.trans_id_tree_path('')
816
transform.version_file('new-root', new_root)
1009
transform.version_file(b'new-root', new_root)
817
1010
transform.apply()
819
1012
def test_renames(self):
820
1013
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',
1014
old = create.new_directory('old-parent', root, b'old-id')
1015
intermediate = create.new_directory('intermediate', old, b'im-id')
1016
myfile = create.new_file('myfile', intermediate, [b'myfile-text'],
826
1019
rename, root = self.get_transform()
827
old = rename.trans_id_file_id('old-id')
1020
old = rename.trans_id_file_id(b'old-id')
828
1021
rename.adjust_path('new', root, old)
829
myfile = rename.trans_id_file_id('myfile-id')
1022
myfile = rename.trans_id_file_id(b'myfile-id')
830
1023
rename.set_executability(True, myfile)
1026
def test_rename_fails(self):
1027
self.requireFeature(features.not_running_as_root)
1028
# see https://bugs.launchpad.net/bzr/+bug/491763
1029
create, root_id = self.get_transform()
1030
create.new_directory('first-dir', root_id, b'first-id')
1031
create.new_file('myfile', root_id, [b'myfile-text'], b'myfile-id')
1033
if os.name == "posix" and sys.platform != "cygwin":
1034
# posix filesystems fail on renaming if the readonly bit is set
1035
osutils.make_readonly(self.wt.abspath('first-dir'))
1036
elif os.name == "nt":
1037
# windows filesystems fail on renaming open files
1038
self.addCleanup(open(self.wt.abspath('myfile')).close)
1040
self.skipTest("Can't force a permissions error on rename")
1041
# now transform to rename
1042
rename_transform, root_id = self.get_transform()
1043
file_trans_id = rename_transform.trans_id_file_id(b'myfile-id')
1044
dir_id = rename_transform.trans_id_file_id(b'first-id')
1045
rename_transform.adjust_path('newname', dir_id, file_trans_id)
1046
e = self.assertRaises(errors.TransformRenameFailed,
1047
rename_transform.apply)
1048
# On nix looks like:
1049
# "Failed to rename .../work/.bzr/checkout/limbo/new-1
1050
# to .../first-dir/newname: [Errno 13] Permission denied"
1051
# On windows looks like:
1052
# "Failed to rename .../work/myfile to
1053
# .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
1054
# This test isn't concerned with exactly what the error looks like,
1055
# and the strerror will vary across OS and locales, but the assert
1056
# that the exeception attributes are what we expect
1057
self.assertEqual(e.errno, errno.EACCES)
1058
if os.name == "posix":
1059
self.assertEndsWith(e.to_path, "/first-dir/newname")
1061
self.assertEqual(os.path.basename(e.from_path), "myfile")
833
1063
def test_set_executability_order(self):
834
1064
"""Ensure that executability behaves the same, no matter what order.
836
1066
- create file and set executability simultaneously
837
1067
- create file and set executability afterward
838
- unsetting the executability of a file whose executability has not been
1068
- unsetting the executability of a file whose executability has not
839
1070
declared should throw an exception (this may happen when a
840
1071
merge attempts to create a file with a duplicate ID)
903
1136
self.assertEqual([bar1_abspath], stat_paths)
905
1138
def test_iter_changes(self):
906
self.wt.set_root_id('eert_toor')
1139
self.wt.set_root_id(b'eert_toor')
907
1140
transform, root = self.get_transform()
908
transform.new_file('old', root, 'blah', 'id-1', True)
1141
transform.new_file('old', root, [b'blah'], b'id-1', True)
909
1142
transform.apply()
910
1143
transform, root = self.get_transform()
912
1145
self.assertEqual([], list(transform.iter_changes()))
913
old = transform.trans_id_tree_file_id('id-1')
1146
old = transform.trans_id_tree_path('old')
914
1147
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()))
1148
self.assertEqual([(b'id-1', ('old', None), False, (True, False),
1149
(b'eert_toor', b'eert_toor'),
1150
('old', 'old'), ('file', 'file'),
1151
(True, True))], list(transform.iter_changes()))
1152
transform.new_directory('new', root, b'id-1')
1153
self.assertEqual([(b'id-1', ('old', 'new'), True, (True, True),
1154
(b'eert_toor', b'eert_toor'), ('old', 'new'),
1155
('file', 'directory'),
1156
(True, False))], list(transform.iter_changes()))
924
1158
transform.finalize()
926
1160
def test_iter_changes_new(self):
927
self.wt.set_root_id('eert_toor')
1161
self.wt.set_root_id(b'eert_toor')
928
1162
transform, root = self.get_transform()
929
transform.new_file('old', root, 'blah')
1163
transform.new_file('old', root, [b'blah'])
930
1164
transform.apply()
931
1165
transform, root = self.get_transform()
933
1167
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()))
1168
transform.version_file(b'id-1', old)
1169
self.assertEqual([(b'id-1', (None, 'old'), False, (False, True),
1170
(b'eert_toor', b'eert_toor'),
1171
('old', 'old'), ('file', 'file'),
1173
list(transform.iter_changes()))
939
1175
transform.finalize()
941
1177
def test_iter_changes_modifications(self):
942
self.wt.set_root_id('eert_toor')
1178
self.wt.set_root_id(b'eert_toor')
943
1179
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')
1180
transform.new_file('old', root, [b'blah'], b'id-1')
1181
transform.new_file('new', root, [b'blah'])
1182
transform.new_directory('subdir', root, b'subdir-id')
947
1183
transform.apply()
948
1184
transform, root = self.get_transform()
950
1186
old = transform.trans_id_tree_path('old')
951
subdir = transform.trans_id_tree_file_id('subdir-id')
1187
subdir = transform.trans_id_tree_path('subdir')
952
1188
new = transform.trans_id_tree_path('new')
953
1189
self.assertEqual([], list(transform.iter_changes()))
956
1192
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()))
1193
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1194
(b'eert_toor', b'eert_toor'),
1195
('old', 'old'), ('file', None),
1197
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()))
1200
transform.create_file([b'blah'], old)
1201
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1202
(b'eert_toor', b'eert_toor'),
1203
('old', 'old'), ('file', 'file'),
1205
list(transform.iter_changes()))
966
1206
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()))
1207
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1208
(b'eert_toor', b'eert_toor'),
1209
('old', 'old'), ('file', 'file'),
1211
list(transform.iter_changes()))
970
1212
transform.cancel_creation(old)
972
1214
# move file_id to a different file
973
1215
self.assertEqual([], list(transform.iter_changes()))
974
1216
transform.unversion_file(old)
975
transform.version_file('id-1', new)
1217
transform.version_file(b'id-1', new)
976
1218
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()))
1219
self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1220
(b'eert_toor', b'eert_toor'),
1221
('old', 'old'), ('file', 'file'),
1223
list(transform.iter_changes()))
980
1224
transform.cancel_versioning(new)
981
1225
transform._removed_id = set()
984
1228
self.assertEqual([], list(transform.iter_changes()))
985
1229
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()))
1230
self.assertEqual([(b'id-1', ('old', 'old'), False, (True, True),
1231
(b'eert_toor', b'eert_toor'),
1232
('old', 'old'), ('file', 'file'),
1234
list(transform.iter_changes()))
989
1235
transform.set_executability(None, old)
992
1238
self.assertEqual([], list(transform.iter_changes()))
993
1239
transform.adjust_path('new', root, old)
994
1240
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()))
1241
self.assertEqual([(b'id-1', ('old', 'new'), False, (True, True),
1242
(b'eert_toor', b'eert_toor'),
1243
('old', 'new'), ('file', 'file'),
1245
list(transform.iter_changes()))
998
1246
transform._new_name = {}
1000
1248
# parent directory
1001
1249
self.assertEqual([], list(transform.iter_changes()))
1002
1250
transform.adjust_path('new', subdir, old)
1003
1251
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()))
1252
self.assertEqual([(b'id-1', ('old', 'subdir/old'), False,
1253
(True, True), (b'eert_toor',
1254
b'subdir-id'), ('old', 'old'),
1255
('file', 'file'), (False, False))],
1256
list(transform.iter_changes()))
1008
1257
transform._new_path = {}
1011
1260
transform.finalize()
1013
1262
def test_iter_changes_modified_bleed(self):
1014
self.wt.set_root_id('eert_toor')
1263
self.wt.set_root_id(b'eert_toor')
1015
1264
"""Modified flag should not bleed from one change to another"""
1016
1265
# unfortunately, we have no guarantee that file1 (which is modified)
1017
1266
# will be applied before file2. And if it's applied after file2, it
1018
1267
# obviously can't bleed into file2's change output. But for now, it
1020
1269
transform, root = self.get_transform()
1021
transform.new_file('file1', root, 'blah', 'id-1')
1022
transform.new_file('file2', root, 'blah', 'id-2')
1270
transform.new_file('file1', root, [b'blah'], b'id-1')
1271
transform.new_file('file2', root, [b'blah'], b'id-2')
1023
1272
transform.apply()
1024
1273
transform, root = self.get_transform()
1026
transform.delete_contents(transform.trans_id_file_id('id-1'))
1275
transform.delete_contents(transform.trans_id_file_id(b'id-1'))
1027
1276
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))],
1277
transform.trans_id_file_id(b'id-2'))
1279
[(b'id-1', (u'file1', u'file1'), True, (True, True),
1280
(b'eert_toor', b'eert_toor'), ('file1', u'file1'),
1281
('file', None), (False, False)),
1282
(b'id-2', (u'file2', u'file2'), False, (True, True),
1283
(b'eert_toor', b'eert_toor'), ('file2', u'file2'),
1284
('file', 'file'), (False, True))],
1035
1285
list(transform.iter_changes()))
1037
1287
transform.finalize()
1039
1289
def test_iter_changes_move_missing(self):
1040
1290
"""Test moving ids with no files around"""
1041
self.wt.set_root_id('toor_eert')
1291
self.wt.set_root_id(b'toor_eert')
1042
1292
# Need two steps because versioning a non-existant file is a conflict.
1043
1293
transform, root = self.get_transform()
1044
transform.new_directory('floater', root, 'floater-id')
1294
transform.new_directory('floater', root, b'floater-id')
1045
1295
transform.apply()
1046
1296
transform, root = self.get_transform()
1047
1297
transform.delete_contents(transform.trans_id_tree_path('floater'))
1382
1629
self.build_tree(['baz'])
1383
1630
tt.create_hardlink("baz", foo_trans_id)
1385
self.failUnlessExists("foo")
1386
self.failUnlessExists("baz")
1632
self.assertPathExists("foo")
1633
self.assertPathExists("baz")
1388
1635
self.addCleanup(wt.unlock)
1389
self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1636
self.assertEqual(wt.kind("foo"), "file")
1392
1638
def test_no_final_path(self):
1393
1639
transform, root = self.get_transform()
1394
trans_id = transform.trans_id_file_id('foo')
1395
transform.create_file('bar', trans_id)
1640
trans_id = transform.trans_id_file_id(b'foo')
1641
transform.create_file([b'bar'], trans_id)
1396
1642
transform.cancel_creation(trans_id)
1397
1643
transform.apply()
1399
1645
def test_create_from_tree(self):
1400
1646
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'])
1647
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', b'baz')])
1648
tree1.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
1403
1649
tree2 = self.make_branch_and_tree('tree2')
1404
1650
tt = TreeTransform(tree2)
1405
1651
foo_trans_id = tt.create_path('foo', tt.root)
1406
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1652
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
1407
1653
bar_trans_id = tt.create_path('bar', tt.root)
1408
create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
1654
create_from_tree(tt, bar_trans_id, tree1, 'bar', file_id=b'bar-id')
1410
1656
self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1411
self.assertFileEqual('baz', 'tree2/bar')
1657
self.assertFileEqual(b'baz', 'tree2/bar')
1413
1659
def test_create_from_tree_bytes(self):
1414
1660
"""Provided lines are used instead of tree content."""
1415
1661
tree1 = self.make_branch_and_tree('tree1')
1416
self.build_tree_contents([('tree1/foo', 'bar'),])
1417
tree1.add('foo', 'foo-id')
1662
self.build_tree_contents([('tree1/foo', b'bar'), ])
1663
tree1.add('foo', b'foo-id')
1418
1664
tree2 = self.make_branch_and_tree('tree2')
1419
1665
tt = TreeTransform(tree2)
1420
1666
foo_trans_id = tt.create_path('foo', tt.root)
1421
create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
1667
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id',
1423
self.assertFileEqual('qux', 'tree2/foo')
1670
self.assertFileEqual(b'qux', 'tree2/foo')
1425
1672
def test_create_from_tree_symlink(self):
1426
1673
self.requireFeature(SymlinkFeature)
1427
1674
tree1 = self.make_branch_and_tree('tree1')
1428
1675
os.symlink('bar', 'tree1/foo')
1429
tree1.add('foo', 'foo-id')
1676
tree1.add('foo', b'foo-id')
1430
1677
tt = TreeTransform(self.make_branch_and_tree('tree2'))
1431
1678
foo_trans_id = tt.create_path('foo', tt.root)
1432
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1679
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
1434
1681
self.assertEqual('bar', os.readlink('tree2/foo'))
1456
1735
def test_text_merge(self):
1457
1736
root_id = generate_ids.gen_root_id()
1458
1737
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')
1738
base.tt.new_file('a', base.root, [b'a\nb\nc\nd\be\n'], b'a')
1739
base.tt.new_file('b', base.root, [b'b1'], b'b')
1740
base.tt.new_file('c', base.root, [b'c'], b'c')
1741
base.tt.new_file('d', base.root, [b'd'], b'd')
1742
base.tt.new_file('e', base.root, [b'e'], b'e')
1743
base.tt.new_file('f', base.root, [b'f'], b'f')
1744
base.tt.new_directory('g', base.root, b'g')
1745
base.tt.new_directory('h', base.root, b'h')
1467
1746
base.tt.apply()
1468
1747
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')
1748
other.tt.new_file('a', other.root, [b'y\nb\nc\nd\be\n'], b'a')
1749
other.tt.new_file('b', other.root, [b'b2'], b'b')
1750
other.tt.new_file('c', other.root, [b'c2'], b'c')
1751
other.tt.new_file('d', other.root, [b'd'], b'd')
1752
other.tt.new_file('e', other.root, [b'e2'], b'e')
1753
other.tt.new_file('f', other.root, [b'f'], b'f')
1754
other.tt.new_file('g', other.root, [b'g'], b'g')
1755
other.tt.new_file('h', other.root, [b'h\ni\nj\nk\n'], b'h')
1756
other.tt.new_file('i', other.root, [b'h\ni\nj\nk\n'], b'i')
1478
1757
other.tt.apply()
1479
1758
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')
1759
this.tt.new_file('a', this.root, [b'a\nb\nc\nd\bz\n'], b'a')
1760
this.tt.new_file('b', this.root, [b'b'], b'b')
1761
this.tt.new_file('c', this.root, [b'c'], b'c')
1762
this.tt.new_file('d', this.root, [b'd2'], b'd')
1763
this.tt.new_file('e', this.root, [b'e2'], b'e')
1764
this.tt.new_file('f', this.root, [b'f'], b'f')
1765
this.tt.new_file('g', this.root, [b'g'], b'g')
1766
this.tt.new_file('h', this.root, [b'1\n2\n3\n4\n'], b'h')
1767
this.tt.new_file('i', this.root, [b'1\n2\n3\n4\n'], b'i')
1489
1768
this.tt.apply()
1490
1769
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1492
1771
# textual merge
1493
self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
1772
with this.wt.get_file(this.wt.id2path(b'a')) as f:
1773
self.assertEqual(f.read(), b'y\nb\nc\nd\bz\n')
1494
1774
# three-way text conflict
1495
self.assertEqual(this.wt.get_file('b').read(),
1496
conflict_text('b', 'b2'))
1775
with this.wt.get_file(this.wt.id2path(b'b')) as f:
1776
self.assertEqual(f.read(), conflict_text(b'b', b'b2'))
1498
self.assertEqual(this.wt.get_file('c').read(), 'c2')
1778
self.assertEqual(this.wt.get_file(this.wt.id2path(b'c')).read(), b'c2')
1500
self.assertEqual(this.wt.get_file('d').read(), 'd2')
1780
self.assertEqual(this.wt.get_file(this.wt.id2path(b'd')).read(), b'd2')
1501
1781
# Ambigious clean merge
1502
self.assertEqual(this.wt.get_file('e').read(), 'e2')
1782
self.assertEqual(this.wt.get_file(this.wt.id2path(b'e')).read(), b'e2')
1504
self.assertEqual(this.wt.get_file('f').read(), 'f')
1784
self.assertEqual(this.wt.get_file(this.wt.id2path(b'f')).read(), b'f')
1505
1785
# Correct correct results when THIS == OTHER
1506
self.assertEqual(this.wt.get_file('g').read(), 'g')
1786
self.assertEqual(this.wt.get_file(this.wt.id2path(b'g')).read(), b'g')
1507
1787
# 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(),
1788
self.assertEqual(this.wt.get_file(this.wt.id2path(b'h')).read(),
1789
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1790
self.assertEqual(this.wt.get_file('h.THIS').read(),
1792
self.assertEqual(this.wt.get_file('h.OTHER').read(),
1514
1794
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(),
1795
self.assertEqual(this.wt.get_file(this.wt.id2path(b'i')).read(),
1796
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1797
self.assertEqual(this.wt.get_file('i.THIS').read(),
1799
self.assertEqual(this.wt.get_file('i.OTHER').read(),
1521
1801
self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1522
modified = ['a', 'b', 'c', 'h', 'i']
1802
modified = [b'a', b'b', b'c', b'h', b'i']
1523
1803
merge_modified = this.wt.merge_modified()
1524
1804
self.assertSubset(merge_modified, modified)
1525
1805
self.assertEqual(len(merge_modified), len(modified))
1526
file(this.wt.id2abspath('a'), 'wb').write('booga')
1806
with open(this.wt.abspath(this.wt.id2path(b'a')), 'wb') as f:
1527
1808
modified.pop(0)
1528
1809
merge_modified = this.wt.merge_modified()
1529
1810
self.assertSubset(merge_modified, modified)
1578
1861
base = TransformGroup("BASE", root_id)
1579
1862
this = TransformGroup("THIS", root_id)
1580
1863
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')
1864
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, b'a')
1865
for t in [base, this, other]]
1866
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, b'b')
1867
for t in [base, this, other]]
1868
base.tt.new_directory('c', base_a, b'c')
1869
this.tt.new_directory('c1', this_a, b'c')
1870
other.tt.new_directory('c', other_b, b'c')
1872
base.tt.new_directory('d', base_a, b'd')
1873
this.tt.new_directory('d1', this_b, b'd')
1874
other.tt.new_directory('d', other_a, b'd')
1876
base.tt.new_directory('e', base_a, b'e')
1877
this.tt.new_directory('e', this_a, b'e')
1878
other.tt.new_directory('e1', other_b, b'e')
1880
base.tt.new_directory('f', base_a, b'f')
1881
this.tt.new_directory('f1', this_b, b'f')
1882
other.tt.new_directory('f1', other_b, b'f')
1601
1884
for tg in [this, base, other]:
1603
1886
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'))
1887
self.assertEqual(this.wt.id2path(b'c'), pathjoin('b/c1'))
1888
self.assertEqual(this.wt.id2path(b'd'), pathjoin('b/d1'))
1889
self.assertEqual(this.wt.id2path(b'e'), pathjoin('b/e1'))
1890
self.assertEqual(this.wt.id2path(b'f'), pathjoin('b/f1'))
1609
1892
def test_filename_merge_conflicts(self):
1610
1893
root_id = generate_ids.gen_root_id()
1611
1894
base = TransformGroup("BASE", root_id)
1612
1895
this = TransformGroup("THIS", root_id)
1613
1896
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')
1897
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, b'a')
1898
for t in [base, this, other]]
1899
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, b'b')
1900
for t in [base, this, other]]
1902
base.tt.new_file('g', base_a, [b'g'], b'g')
1903
other.tt.new_file('g1', other_b, [b'g1'], b'g')
1905
base.tt.new_file('h', base_a, [b'h'], b'h')
1906
this.tt.new_file('h1', this_b, [b'h1'], b'h')
1908
base.tt.new_file('i', base.root, [b'i'], b'i')
1909
other.tt.new_directory('i1', this_b, b'i')
1628
1911
for tg in [this, base, other]:
1630
1913
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1632
self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
1915
self.assertEqual(this.wt.id2path(b'g'), pathjoin('b/g1.OTHER'))
1633
1916
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
1634
1917
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
1635
self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
1918
self.assertEqual(this.wt.id2path(b'h'), pathjoin('b/h1.THIS'))
1636
1919
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
1637
1920
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
1638
self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
1921
self.assertEqual(this.wt.id2path(b'i'), pathjoin('b/i1.OTHER'))
1641
1924
class TestBuildTree(tests.TestCaseWithTransport):
1643
1926
def test_build_tree_with_symlinks(self):
1644
1927
self.requireFeature(SymlinkFeature)
1646
a = BzrDir.create_standalone_workingtree('a')
1929
a = ControlDir.create_standalone_workingtree('a')
1647
1930
os.mkdir('a/foo')
1648
file('a/foo/bar', 'wb').write('contents')
1931
with open('a/foo/bar', 'wb') as f:
1932
f.write(b'contents')
1649
1933
os.symlink('a/foo/bar', 'a/foo/baz')
1650
1934
a.add(['foo', 'foo/bar', 'foo/baz'])
1651
1935
a.commit('initial commit')
1652
b = BzrDir.create_standalone_workingtree('b')
1936
b = ControlDir.create_standalone_workingtree('b')
1653
1937
basis = a.basis_tree()
1654
1938
basis.lock_read()
1655
1939
self.addCleanup(basis.unlock)
1656
1940
build_tree(basis, b)
1657
1941
self.assertIs(os.path.isdir('b/foo'), True)
1658
self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
1942
with open('b/foo/bar', 'rb') as f:
1943
self.assertEqual(f.read(), b"contents")
1659
1944
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
1661
1946
def test_build_with_references(self):
1662
1947
tree = self.make_branch_and_tree('source',
1663
format='dirstate-with-subtree')
1948
format='development-subtree')
1664
1949
subtree = self.make_branch_and_tree('source/subtree',
1665
format='dirstate-with-subtree')
1950
format='development-subtree')
1666
1951
tree.add_reference(subtree)
1667
1952
tree.commit('a revision')
1668
1953
tree.branch.create_checkout('target')
1669
self.failUnlessExists('target')
1670
self.failUnlessExists('target/subtree')
1954
self.assertPathExists('target')
1955
self.assertPathExists('target/subtree')
1672
1957
def test_file_conflict_handling(self):
1673
1958
"""Ensure that when building trees, conflict handling is done"""
1674
1959
source = self.make_branch_and_tree('source')
1675
1960
target = self.make_branch_and_tree('target')
1676
1961
self.build_tree(['source/file', 'target/file'])
1677
source.add('file', 'new-file')
1962
source.add('file', b'new-file')
1678
1963
source.commit('added file')
1679
1964
build_tree(source.basis_tree(), target)
1680
self.assertEqual([DuplicateEntry('Moved existing file to',
1681
'file.moved', 'file', None, 'new-file')],
1966
[DuplicateEntry('Moved existing file to', 'file.moved',
1967
'file', None, 'new-file')],
1683
1969
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())
1970
with open('target2/file', 'wb') as target_file, \
1971
open('source/file', 'rb') as source_file:
1972
target_file.write(source_file.read())
1693
1973
build_tree(source.basis_tree(), target2)
1694
1974
self.assertEqual([], target2.conflicts())
1970
2274
self.assertEqualStat(source_stat, target_stat)
1972
2276
def test_case_insensitive_build_tree_inventory(self):
1973
if (tests.CaseInsensitiveFilesystemFeature.available()
1974
or tests.CaseInsCasePresFilenameFeature.available()):
2277
if (features.CaseInsensitiveFilesystemFeature.available()
2278
or features.CaseInsCasePresFilenameFeature.available()):
1975
2279
raise tests.UnavailableFeature('Fully case sensitive filesystem')
1976
2280
source = self.make_branch_and_tree('source')
1977
2281
self.build_tree(['source/file', 'source/FILE'])
1978
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2282
source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
1979
2283
source.commit('added files')
1980
2284
# Don't try this at home, kids!
1981
2285
# Force the tree to report that it is case insensitive
1982
2286
target = self.make_branch_and_tree('target')
1983
2287
target.case_sensitive = False
1984
2288
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'))
2289
self.assertEqual('file.moved', target.id2path(b'lower-id'))
2290
self.assertEqual('FILE', target.id2path(b'upper-id'))
2292
def test_build_tree_observes_sha(self):
2293
source = self.make_branch_and_tree('source')
2294
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2295
source.add(['file1', 'dir', 'dir/file2'],
2296
[b'file1-id', b'dir-id', b'file2-id'])
2297
source.commit('new files')
2298
target = self.make_branch_and_tree('target')
2300
self.addCleanup(target.unlock)
2301
# We make use of the fact that DirState caches its cutoff time. So we
2302
# set the 'safe' time to one minute in the future.
2303
state = target.current_dirstate()
2304
state._cutoff_time = time.time() + 60
2305
build_tree(source.basis_tree(), target)
2306
entry1_sha = osutils.sha_file_by_name('source/file1')
2307
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2308
# entry[1] is the state information, entry[1][0] is the state of the
2309
# working tree, entry[1][0][1] is the sha value for the current working
2311
entry1 = state._get_entry(0, path_utf8=b'file1')
2312
self.assertEqual(entry1_sha, entry1[1][0][1])
2313
# The 'size' field must also be set.
2314
self.assertEqual(25, entry1[1][0][2])
2315
entry1_state = entry1[1][0]
2316
entry2 = state._get_entry(0, path_utf8=b'dir/file2')
2317
self.assertEqual(entry2_sha, entry2[1][0][1])
2318
self.assertEqual(29, entry2[1][0][2])
2319
entry2_state = entry2[1][0]
2320
# Now, make sure that we don't have to re-read the content. The
2321
# packed_stat should match exactly.
2322
self.assertEqual(entry1_sha, target.get_file_sha1('file1'))
2323
self.assertEqual(entry2_sha, target.get_file_sha1('dir/file2'))
2324
self.assertEqual(entry1_state, entry1[1][0])
2325
self.assertEqual(entry2_state, entry2[1][0])
1989
2328
class TestCommitTransform(tests.TestCaseWithTransport):
2043
2382
tt = TransformPreview(branch.basis_tree())
2044
2383
self.addCleanup(tt.finalize)
2045
2384
e = self.assertRaises(ValueError, tt.commit, branch,
2046
'my message', ['rev1b-id'])
2385
'my message', [b'rev1b-id'])
2047
2386
self.assertEqual('Cannot supply merge parents for first commit.',
2049
2388
self.assertEqual(_mod_revision.NULL_REVISION, branch.last_revision())
2051
2390
def test_add_files(self):
2052
2391
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')
2392
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2393
trans_id = tt.new_directory('dir', tt.root, b'dir-id')
2055
2394
if SymlinkFeature.available():
2056
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2057
rev = tt.commit(branch, 'message')
2395
tt.new_symlink('symlink', trans_id, 'target', b'symlink-id')
2396
tt.commit(branch, 'message')
2058
2397
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'))
2398
self.assertEqual('file', tree.id2path(b'file-id'))
2399
self.assertEqual(b'contents', tree.get_file_text('file'))
2400
self.assertEqual('dir', tree.id2path(b'dir-id'))
2062
2401
if SymlinkFeature.available():
2063
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2064
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2402
self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
2403
self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
2066
2405
def test_add_unversioned(self):
2067
2406
branch, tt = self.get_branch_and_transform()
2068
tt.new_file('file', tt.root, 'contents')
2407
tt.new_file('file', tt.root, [b'contents'])
2069
2408
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2070
2409
'message', strict=True)
2072
2411
def test_modify_strict(self):
2073
2412
branch, tt = self.get_branch_and_transform()
2074
tt.new_file('file', tt.root, 'contents', 'file-id')
2413
tt.new_file('file', tt.root, [b'contents'], b'file-id')
2075
2414
tt.commit(branch, 'message', strict=True)
2076
2415
tt = TransformPreview(branch.basis_tree())
2077
2416
self.addCleanup(tt.finalize)
2078
trans_id = tt.trans_id_file_id('file-id')
2417
trans_id = tt.trans_id_file_id(b'file-id')
2079
2418
tt.delete_contents(trans_id)
2080
tt.create_file('contents', trans_id)
2419
tt.create_file([b'contents'], trans_id)
2081
2420
tt.commit(branch, 'message', strict=True)
2083
2422
def test_commit_malformed(self):
2086
2425
In this case, we are adding a file without adding its parent.
2088
2427
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')
2428
parent_id = tt.trans_id_file_id(b'parent-id')
2429
tt.new_file('file', parent_id, [b'contents'], b'file-id')
2091
2430
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~')
2433
def test_commit_rich_revision_data(self):
2434
branch, tt = self.get_branch_and_transform()
2435
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2436
committer='me <me@example.com>',
2437
revprops={u'foo': 'bar'}, revision_id=b'revid-1',
2438
authors=['Author1 <author1@example.com>',
2439
'Author2 <author2@example.com>',
2441
self.assertEqual(b'revid-1', rev_id)
2442
revision = branch.repository.get_revision(rev_id)
2443
self.assertEqual(1, revision.timestamp)
2444
self.assertEqual(43201, revision.timezone)
2445
self.assertEqual('me <me@example.com>', revision.committer)
2446
self.assertEqual(['Author1 <author1@example.com>',
2447
'Author2 <author2@example.com>'],
2448
revision.get_apparent_authors())
2449
del revision.properties['authors']
2450
self.assertEqual({'foo': 'bar',
2451
'branch-nick': 'tree'},
2452
revision.properties)
2454
def test_no_explicit_revprops(self):
2455
branch, tt = self.get_branch_and_transform()
2456
rev_id = tt.commit(branch, 'message', authors=[
2457
'Author1 <author1@example.com>',
2458
'Author2 <author2@example.com>', ])
2459
revision = branch.repository.get_revision(rev_id)
2460
self.assertEqual(['Author1 <author1@example.com>',
2461
'Author2 <author2@example.com>'],
2462
revision.get_apparent_authors())
2463
self.assertEqual('tree', revision.properties['branch-nick'])
2128
2466
class TestFileMover(tests.TestCaseWithTransport):
2240
2578
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2579
self.assertRaises(Bogus, tt.apply,
2242
2580
_mover=self.ExceptionFileMover(bad_target='d'))
2243
self.failUnlessExists('a')
2244
self.failUnlessExists('a/b')
2246
def test_resolve_no_parent(self):
2581
self.assertPathExists('a')
2582
self.assertPathExists('a/b')
2585
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2586
"""Ensure treetransform creation errors can be safely cleaned up after"""
2588
def _override_globals_in_method(self, instance, method_name, globals):
2589
"""Replace method on instance with one with updated globals"""
2591
func = getattr(instance, method_name).__func__
2592
new_globals = dict(func.__globals__)
2593
new_globals.update(globals)
2594
new_func = types.FunctionType(func.__code__, new_globals,
2595
func.__name__, func.__defaults__)
2597
setattr(instance, method_name,
2598
types.MethodType(new_func, instance))
2600
setattr(instance, method_name,
2601
types.MethodType(new_func, instance, instance.__class__))
2602
self.addCleanup(delattr, instance, method_name)
2605
def _fake_open_raises_before(name, mode):
2606
"""Like open() but raises before doing anything"""
2610
def _fake_open_raises_after(name, mode):
2611
"""Like open() but raises after creating file without returning"""
2612
open(name, mode).close()
2615
def create_transform_and_root_trans_id(self):
2616
"""Setup a transform creating a file in limbo"""
2617
tree = self.make_branch_and_tree('.')
2618
tt = TreeTransform(tree)
2619
return tt, tt.create_path("a", tt.root)
2621
def create_transform_and_subdir_trans_id(self):
2622
"""Setup a transform creating a directory containing a file in limbo"""
2623
tree = self.make_branch_and_tree('.')
2624
tt = TreeTransform(tree)
2625
d_trans_id = tt.create_path("d", tt.root)
2626
tt.create_directory(d_trans_id)
2627
f_trans_id = tt.create_path("a", d_trans_id)
2628
tt.adjust_path("a", d_trans_id, f_trans_id)
2629
return tt, f_trans_id
2631
def test_root_create_file_open_raises_before_creation(self):
2632
tt, trans_id = self.create_transform_and_root_trans_id()
2633
self._override_globals_in_method(
2634
tt, "create_file", {"open": self._fake_open_raises_before})
2635
self.assertRaises(RuntimeError, tt.create_file,
2636
[b"contents"], trans_id)
2637
path = tt._limbo_name(trans_id)
2638
self.assertPathDoesNotExist(path)
2640
self.assertPathDoesNotExist(tt._limbodir)
2642
def test_root_create_file_open_raises_after_creation(self):
2643
tt, trans_id = self.create_transform_and_root_trans_id()
2644
self._override_globals_in_method(
2645
tt, "create_file", {"open": self._fake_open_raises_after})
2646
self.assertRaises(RuntimeError, tt.create_file,
2647
[b"contents"], trans_id)
2648
path = tt._limbo_name(trans_id)
2649
self.assertPathExists(path)
2651
self.assertPathDoesNotExist(path)
2652
self.assertPathDoesNotExist(tt._limbodir)
2654
def test_subdir_create_file_open_raises_before_creation(self):
2655
tt, trans_id = self.create_transform_and_subdir_trans_id()
2656
self._override_globals_in_method(
2657
tt, "create_file", {"open": self._fake_open_raises_before})
2658
self.assertRaises(RuntimeError, tt.create_file,
2659
[b"contents"], trans_id)
2660
path = tt._limbo_name(trans_id)
2661
self.assertPathDoesNotExist(path)
2663
self.assertPathDoesNotExist(tt._limbodir)
2665
def test_subdir_create_file_open_raises_after_creation(self):
2666
tt, trans_id = self.create_transform_and_subdir_trans_id()
2667
self._override_globals_in_method(
2668
tt, "create_file", {"open": self._fake_open_raises_after})
2669
self.assertRaises(RuntimeError, tt.create_file,
2670
[b"contents"], trans_id)
2671
path = tt._limbo_name(trans_id)
2672
self.assertPathExists(path)
2674
self.assertPathDoesNotExist(path)
2675
self.assertPathDoesNotExist(tt._limbodir)
2677
def test_rename_in_limbo_rename_raises_after_rename(self):
2678
tt, trans_id = self.create_transform_and_root_trans_id()
2679
parent1 = tt.new_directory('parent1', tt.root)
2680
child1 = tt.new_file('child1', parent1, [b'contents'])
2681
parent2 = tt.new_directory('parent2', tt.root)
2683
class FakeOSModule(object):
2684
def rename(self, old, new):
2687
self._override_globals_in_method(tt, "_rename_in_limbo",
2688
{"os": FakeOSModule()})
2690
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2691
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2692
self.assertPathExists(path)
2694
self.assertPathDoesNotExist(path)
2695
self.assertPathDoesNotExist(tt._limbodir)
2697
def test_rename_in_limbo_rename_raises_before_rename(self):
2698
tt, trans_id = self.create_transform_and_root_trans_id()
2699
parent1 = tt.new_directory('parent1', tt.root)
2700
child1 = tt.new_file('child1', parent1, [b'contents'])
2701
parent2 = tt.new_directory('parent2', tt.root)
2703
class FakeOSModule(object):
2704
def rename(self, old, new):
2706
self._override_globals_in_method(tt, "_rename_in_limbo",
2707
{"os": FakeOSModule()})
2709
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2710
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2711
self.assertPathExists(path)
2713
self.assertPathDoesNotExist(path)
2714
self.assertPathDoesNotExist(tt._limbodir)
2717
class TestTransformMissingParent(tests.TestCaseWithTransport):
2719
def make_tt_with_versioned_dir(self):
2247
2720
wt = self.make_branch_and_tree('.')
2721
self.build_tree(['dir/', ])
2722
wt.add(['dir'], [b'dir-id'])
2723
wt.commit('Create dir')
2248
2724
tt = TreeTransform(wt)
2249
2725
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))
2728
def test_resolve_create_parent_for_versioned_file(self):
2729
wt, tt = self.make_tt_with_versioned_dir()
2730
dir_tid = tt.trans_id_tree_path('dir')
2731
tt.new_file('file', dir_tid, [b'Contents'], file_id=b'file-id')
2732
tt.delete_contents(dir_tid)
2733
tt.unversion_file(dir_tid)
2734
conflicts = resolve_conflicts(tt)
2735
# one conflict for the missing directory, one for the unversioned
2737
self.assertLength(2, conflicts)
2739
def test_non_versioned_file_create_conflict(self):
2740
wt, tt = self.make_tt_with_versioned_dir()
2741
dir_tid = tt.trans_id_tree_path('dir')
2742
tt.new_file('file', dir_tid, [b'Contents'])
2743
tt.delete_contents(dir_tid)
2744
tt.unversion_file(dir_tid)
2745
conflicts = resolve_conflicts(tt)
2746
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2747
self.assertLength(1, conflicts)
2748
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2752
A_ENTRY = (b'a-id', ('a', 'a'), True, (True, True),
2753
(b'TREE_ROOT', b'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2755
ROOT_ENTRY = (b'TREE_ROOT', ('', ''), False, (True, True), (None, None),
2756
('', ''), ('directory', 'directory'), (False, False))
2262
2759
class TestTransformPreview(tests.TestCaseWithTransport):
2264
2761
def create_tree(self):
2265
2762
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')
2763
self.build_tree_contents([('a', b'content 1')])
2764
tree.set_root_id(b'TREE_ROOT')
2765
tree.add('a', b'a-id')
2766
tree.commit('rev1', rev_id=b'rev1')
2767
return tree.branch.repository.revision_tree(b'rev1')
2272
2769
def get_empty_preview(self):
2273
2770
repository = self.make_repository('repo')
2291
2788
revision_tree = self.create_tree()
2292
2789
preview = TransformPreview(revision_tree)
2293
2790
self.addCleanup(preview.finalize)
2294
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2791
preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2295
2792
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')
2793
self.assertEqual(preview_tree.kind('file2'), 'file')
2794
with preview_tree.get_file('file2') as f:
2795
self.assertEqual(f.read(), b'content B\n')
2300
2797
def test_diff_preview_tree(self):
2301
2798
revision_tree = self.create_tree()
2302
2799
preview = TransformPreview(revision_tree)
2303
2800
self.addCleanup(preview.finalize)
2304
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2801
preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2305
2802
preview_tree = preview.get_preview_tree()
2307
2804
show_diff_trees(revision_tree, preview_tree, out)
2308
2805
lines = out.getvalue().splitlines()
2309
self.assertEqual(lines[0], "=== added file 'file2'")
2806
self.assertEqual(lines[0], b"=== added file 'file2'")
2310
2807
# 3 lines of diff administrivia
2311
self.assertEqual(lines[4], "+content B")
2808
self.assertEqual(lines[4], b"+content B")
2313
2810
def test_transform_conflicts(self):
2314
2811
revision_tree = self.create_tree()
2315
2812
preview = TransformPreview(revision_tree)
2316
2813
self.addCleanup(preview.finalize)
2317
preview.new_file('a', preview.root, 'content 2')
2814
preview.new_file('a', preview.root, [b'content 2'])
2318
2815
resolve_conflicts(preview)
2319
trans_id = preview.trans_id_file_id('a-id')
2816
trans_id = preview.trans_id_file_id(b'a-id')
2320
2817
self.assertEqual('a.moved', preview.final_name(trans_id))
2322
2819
def get_tree_and_preview_tree(self):
2323
2820
revision_tree = self.create_tree()
2324
2821
preview = TransformPreview(revision_tree)
2325
2822
self.addCleanup(preview.finalize)
2326
a_trans_id = preview.trans_id_file_id('a-id')
2823
a_trans_id = preview.trans_id_file_id(b'a-id')
2327
2824
preview.delete_contents(a_trans_id)
2328
preview.create_file('b content', a_trans_id)
2825
preview.create_file([b'b content'], a_trans_id)
2329
2826
preview_tree = preview.get_preview_tree()
2330
2827
return revision_tree, preview_tree
2332
2829
def test_iter_changes(self):
2333
2830
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)))
2831
root = revision_tree.get_root_id()
2832
self.assertEqual([(b'a-id', ('a', 'a'), True, (True, True),
2833
(root, root), ('a', 'a'), ('file', 'file'),
2835
list(preview_tree.iter_changes(revision_tree)))
2340
2837
def test_include_unchanged_succeeds(self):
2341
2838
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2342
2839
changes = preview_tree.iter_changes(revision_tree,
2343
2840
include_unchanged=True)
2344
root = revision_tree.inventory.root.file_id
2346
2841
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2348
2843
def test_specific_files(self):
2349
2844
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2350
2845
changes = preview_tree.iter_changes(revision_tree,
2351
2846
specific_files=[''])
2352
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2847
self.assertEqual([A_ENTRY], list(changes))
2354
2849
def test_want_unversioned(self):
2355
2850
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2356
2851
changes = preview_tree.iter_changes(revision_tree,
2357
2852
want_unversioned=True)
2358
self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2853
self.assertEqual([A_ENTRY], list(changes))
2360
2855
def test_ignore_extra_trees_no_specific_files(self):
2361
2856
# extra_trees is harmless without specific_files, so we'll silently
2377
2872
revision_tree = self.create_tree()
2378
2873
preview = TransformPreview(revision_tree)
2379
2874
self.addCleanup(preview.finalize)
2380
preview.new_file('file', preview.root, 'contents', 'file-id')
2381
preview.new_directory('directory', preview.root, 'dir-id')
2875
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2876
preview.new_directory('directory', preview.root, b'dir-id')
2382
2877
preview_tree = preview.get_preview_tree()
2383
self.assertEqual('file', preview_tree.kind('file-id'))
2384
self.assertEqual('directory', preview_tree.kind('dir-id'))
2878
self.assertEqual('file', preview_tree.kind('file'))
2879
self.assertEqual('directory', preview_tree.kind('directory'))
2386
2881
def test_get_file_mtime(self):
2387
2882
preview = self.get_empty_preview()
2388
file_trans_id = preview.new_file('file', preview.root, 'contents',
2883
file_trans_id = preview.new_file('file', preview.root, [b'contents'],
2390
2885
limbo_path = preview._limbo_name(file_trans_id)
2391
2886
preview_tree = preview.get_preview_tree()
2392
2887
self.assertEqual(os.stat(limbo_path).st_mtime,
2393
preview_tree.get_file_mtime('file-id'))
2888
preview_tree.get_file_mtime('file'))
2395
2890
def test_get_file_mtime_renamed(self):
2396
2891
work_tree = self.make_branch_and_tree('tree')
2397
2892
self.build_tree(['tree/file'])
2398
work_tree.add('file', 'file-id')
2893
work_tree.add('file', b'file-id')
2399
2894
preview = TransformPreview(work_tree)
2400
2895
self.addCleanup(preview.finalize)
2401
file_trans_id = preview.trans_id_tree_file_id('file-id')
2896
file_trans_id = preview.trans_id_tree_path('file')
2402
2897
preview.adjust_path('renamed', preview.root, file_trans_id)
2403
2898
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')
2899
preview_mtime = preview_tree.get_file_mtime('renamed')
2900
work_mtime = work_tree.get_file_mtime('file')
2902
def test_get_file_size(self):
2903
work_tree = self.make_branch_and_tree('tree')
2904
self.build_tree_contents([('tree/old', b'old')])
2905
work_tree.add('old', b'old-id')
2906
preview = TransformPreview(work_tree)
2907
self.addCleanup(preview.finalize)
2908
preview.new_file('name', preview.root, [b'contents'], b'new-id',
2910
tree = preview.get_preview_tree()
2911
self.assertEqual(len('old'), tree.get_file_size('old'))
2912
self.assertEqual(len('contents'), tree.get_file_size('name'))
2407
2914
def test_get_file(self):
2408
2915
preview = self.get_empty_preview()
2409
preview.new_file('file', preview.root, 'contents', 'file-id')
2916
preview.new_file('file', preview.root, [b'contents'], b'file-id')
2410
2917
preview_tree = preview.get_preview_tree()
2411
tree_file = preview_tree.get_file('file-id')
2413
self.assertEqual('contents', tree_file.read())
2918
with preview_tree.get_file('file') as tree_file:
2919
self.assertEqual(b'contents', tree_file.read())
2417
2921
def test_get_symlink_target(self):
2418
2922
self.requireFeature(SymlinkFeature)
2419
2923
preview = self.get_empty_preview()
2420
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2924
preview.new_symlink('symlink', preview.root, 'target', b'symlink-id')
2421
2925
preview_tree = preview.get_preview_tree()
2422
2926
self.assertEqual('target',
2423
preview_tree.get_symlink_target('symlink-id'))
2927
preview_tree.get_symlink_target('symlink'))
2425
2929
def test_all_file_ids(self):
2426
2930
tree = self.make_branch_and_tree('tree')
2427
2931
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2428
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2932
tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
2429
2933
preview = TransformPreview(tree)
2430
2934
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')
2935
preview.unversion_file(preview.trans_id_file_id(b'b-id'))
2936
c_trans_id = preview.trans_id_file_id(b'c-id')
2433
2937
preview.unversion_file(c_trans_id)
2434
preview.version_file('c-id', c_trans_id)
2938
preview.version_file(b'c-id', c_trans_id)
2435
2939
preview_tree = preview.get_preview_tree()
2436
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2940
self.assertEqual({b'a-id', b'c-id', tree.get_root_id()},
2437
2941
preview_tree.all_file_ids())
2439
2943
def test_path2id_deleted_unchanged(self):
2440
2944
tree = self.make_branch_and_tree('tree')
2441
2945
self.build_tree(['tree/unchanged', 'tree/deleted'])
2442
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2946
tree.add(['unchanged', 'deleted'], [b'unchanged-id', b'deleted-id'])
2443
2947
preview = TransformPreview(tree)
2444
2948
self.addCleanup(preview.finalize)
2445
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2949
preview.unversion_file(preview.trans_id_file_id(b'deleted-id'))
2446
2950
preview_tree = preview.get_preview_tree()
2447
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2448
self.assertIs(None, preview_tree.path2id('deleted'))
2951
self.assertEqual(b'unchanged-id', preview_tree.path2id('unchanged'))
2952
self.assertFalse(preview_tree.is_versioned('deleted'))
2450
2954
def test_path2id_created(self):
2451
2955
tree = self.make_branch_and_tree('tree')
2452
2956
self.build_tree(['tree/unchanged'])
2453
tree.add(['unchanged'], ['unchanged-id'])
2957
tree.add(['unchanged'], [b'unchanged-id'])
2454
2958
preview = TransformPreview(tree)
2455
2959
self.addCleanup(preview.finalize)
2456
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2457
'contents', 'new-id')
2960
preview.new_file('new', preview.trans_id_file_id(b'unchanged-id'),
2961
[b'contents'], b'new-id')
2458
2962
preview_tree = preview.get_preview_tree()
2459
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2963
self.assertEqual(b'new-id', preview_tree.path2id('unchanged/new'))
2461
2965
def test_path2id_moved(self):
2462
2966
tree = self.make_branch_and_tree('tree')
2463
2967
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2464
2968
tree.add(['old_parent', 'old_parent/child'],
2465
['old_parent-id', 'child-id'])
2969
[b'old_parent-id', b'child-id'])
2466
2970
preview = TransformPreview(tree)
2467
2971
self.addCleanup(preview.finalize)
2468
2972
new_parent = preview.new_directory('new_parent', preview.root,
2470
2974
preview.adjust_path('child', new_parent,
2471
preview.trans_id_file_id('child-id'))
2975
preview.trans_id_file_id(b'child-id'))
2472
2976
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'))
2977
self.assertFalse(preview_tree.is_versioned('old_parent/child'))
2978
self.assertEqual(b'child-id', preview_tree.path2id('new_parent/child'))
2476
2980
def test_path2id_renamed_parent(self):
2477
2981
tree = self.make_branch_and_tree('tree')
2478
2982
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2479
2983
tree.add(['old_name', 'old_name/child'],
2480
['parent-id', 'child-id'])
2984
[b'parent-id', b'child-id'])
2481
2985
preview = TransformPreview(tree)
2482
2986
self.addCleanup(preview.finalize)
2483
2987
preview.adjust_path('new_name', preview.root,
2484
preview.trans_id_file_id('parent-id'))
2988
preview.trans_id_file_id(b'parent-id'))
2485
2989
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'))
2990
self.assertFalse(preview_tree.is_versioned('old_name/child'))
2991
self.assertEqual(b'child-id', preview_tree.path2id('new_name/child'))
2489
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2993
def assertMatchingIterEntries(self, tt, specific_files=None):
2490
2994
preview_tree = tt.get_preview_tree()
2491
2995
preview_result = list(preview_tree.iter_entries_by_dir(
2996
specific_files=specific_files))
2493
2997
tree = tt._tree
2495
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
2999
actual_result = list(tree.iter_entries_by_dir(
3000
specific_files=specific_files))
2496
3001
self.assertEqual(actual_result, preview_result)
2498
3003
def test_iter_entries_by_dir_new(self):
2499
3004
tree = self.make_branch_and_tree('tree')
2500
3005
tt = TreeTransform(tree)
2501
tt.new_file('new', tt.root, 'contents', 'new-id')
3006
tt.new_file('new', tt.root, [b'contents'], b'new-id')
2502
3007
self.assertMatchingIterEntries(tt)
2504
3009
def test_iter_entries_by_dir_deleted(self):
2505
3010
tree = self.make_branch_and_tree('tree')
2506
3011
self.build_tree(['tree/deleted'])
2507
tree.add('deleted', 'deleted-id')
3012
tree.add('deleted', b'deleted-id')
2508
3013
tt = TreeTransform(tree)
2509
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
3014
tt.delete_contents(tt.trans_id_file_id(b'deleted-id'))
2510
3015
self.assertMatchingIterEntries(tt)
2512
3017
def test_iter_entries_by_dir_unversioned(self):
2513
3018
tree = self.make_branch_and_tree('tree')
2514
3019
self.build_tree(['tree/removed'])
2515
tree.add('removed', 'removed-id')
3020
tree.add('removed', b'removed-id')
2516
3021
tt = TreeTransform(tree)
2517
tt.unversion_file(tt.trans_id_file_id('removed-id'))
3022
tt.unversion_file(tt.trans_id_file_id(b'removed-id'))
2518
3023
self.assertMatchingIterEntries(tt)
2520
3025
def test_iter_entries_by_dir_moved(self):
2521
3026
tree = self.make_branch_and_tree('tree')
2522
3027
self.build_tree(['tree/moved', 'tree/new_parent/'])
2523
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
3028
tree.add(['moved', 'new_parent'], [b'moved-id', b'new_parent-id'])
2524
3029
tt = TreeTransform(tree)
2525
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2526
tt.trans_id_file_id('moved-id'))
3030
tt.adjust_path('moved', tt.trans_id_file_id(b'new_parent-id'),
3031
tt.trans_id_file_id(b'moved-id'))
2527
3032
self.assertMatchingIterEntries(tt)
2529
def test_iter_entries_by_dir_specific_file_ids(self):
3034
def test_iter_entries_by_dir_specific_files(self):
2530
3035
tree = self.make_branch_and_tree('tree')
2531
tree.set_root_id('tree-root-id')
3036
tree.set_root_id(b'tree-root-id')
2532
3037
self.build_tree(['tree/parent/', 'tree/parent/child'])
2533
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
3038
tree.add(['parent', 'parent/child'], [b'parent-id', b'child-id'])
2534
3039
tt = TreeTransform(tree)
2535
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
3040
self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2537
3042
def test_symlink_content_summary(self):
2538
3043
self.requireFeature(SymlinkFeature)
2539
3044
preview = self.get_empty_preview()
2540
preview.new_symlink('path', preview.root, 'target', 'path-id')
3045
preview.new_symlink('path', preview.root, 'target', b'path-id')
2541
3046
summary = preview.get_preview_tree().path_content_summary('path')
2542
3047
self.assertEqual(('symlink', None, None, 'target'), summary)
2597
3103
def test_dir_content_summary(self):
2598
3104
preview = self.get_empty_preview()
2599
preview.new_directory('path', preview.root, 'path-id')
3105
preview.new_directory('path', preview.root, b'path-id')
2600
3106
summary = preview.get_preview_tree().path_content_summary('path')
2601
3107
self.assertEqual(('directory', None, None, None), summary)
2603
3109
def test_tree_content_summary(self):
2604
3110
preview = self.get_empty_preview()
2605
path = preview.new_directory('path', preview.root, 'path-id')
2606
preview.set_tree_reference('rev-1', path)
3111
path = preview.new_directory('path', preview.root, b'path-id')
3112
preview.set_tree_reference(b'rev-1', path)
2607
3113
summary = preview.get_preview_tree().path_content_summary('path')
2608
3114
self.assertEqual(4, len(summary))
2609
3115
self.assertEqual('tree-reference', summary[0])
2611
3117
def test_annotate(self):
2612
3118
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')])
3119
self.build_tree_contents([('tree/file', b'a\n')])
3120
tree.add('file', b'file-id')
3121
tree.commit('a', rev_id=b'one')
3122
self.build_tree_contents([('tree/file', b'a\nb\n')])
2617
3123
preview = TransformPreview(tree)
2618
3124
self.addCleanup(preview.finalize)
2619
file_trans_id = preview.trans_id_file_id('file-id')
3125
file_trans_id = preview.trans_id_file_id(b'file-id')
2620
3126
preview.delete_contents(file_trans_id)
2621
preview.create_file('a\nb\nc\n', file_trans_id)
3127
preview.create_file([b'a\nb\nc\n'], file_trans_id)
2622
3128
preview_tree = preview.get_preview_tree()
2628
annotation = preview_tree.annotate_iter('file-id', 'me:')
3134
annotation = preview_tree.annotate_iter(
3135
'file', default_revision=b'me:')
2629
3136
self.assertEqual(expected, annotation)
2631
3138
def test_annotate_missing(self):
2632
3139
preview = self.get_empty_preview()
2633
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3140
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2634
3141
preview_tree = preview.get_preview_tree()
2640
annotation = preview_tree.annotate_iter('file-id', 'me:')
3147
annotation = preview_tree.annotate_iter(
3148
'file', default_revision=b'me:')
2641
3149
self.assertEqual(expected, annotation)
2643
3151
def test_annotate_rename(self):
2644
3152
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')
3153
self.build_tree_contents([('tree/file', b'a\n')])
3154
tree.add('file', b'file-id')
3155
tree.commit('a', rev_id=b'one')
2648
3156
preview = TransformPreview(tree)
2649
3157
self.addCleanup(preview.finalize)
2650
file_trans_id = preview.trans_id_file_id('file-id')
3158
file_trans_id = preview.trans_id_file_id(b'file-id')
2651
3159
preview.adjust_path('newname', preview.root, file_trans_id)
2652
3160
preview_tree = preview.get_preview_tree()
2656
annotation = preview_tree.annotate_iter('file-id', 'me:')
3164
annotation = preview_tree.annotate_iter(
3165
'file', default_revision=b'me:')
2657
3166
self.assertEqual(expected, annotation)
2659
3168
def test_annotate_deleted(self):
2660
3169
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')])
3170
self.build_tree_contents([('tree/file', b'a\n')])
3171
tree.add('file', b'file-id')
3172
tree.commit('a', rev_id=b'one')
3173
self.build_tree_contents([('tree/file', b'a\nb\n')])
2665
3174
preview = TransformPreview(tree)
2666
3175
self.addCleanup(preview.finalize)
2667
file_trans_id = preview.trans_id_file_id('file-id')
3176
file_trans_id = preview.trans_id_file_id(b'file-id')
2668
3177
preview.delete_contents(file_trans_id)
2669
3178
preview_tree = preview.get_preview_tree()
2670
annotation = preview_tree.annotate_iter('file-id', 'me:')
3179
annotation = preview_tree.annotate_iter(
3180
'file', default_revision=b'me:')
2671
3181
self.assertIs(None, annotation)
2673
3183
def test_stored_kind(self):
2674
3184
preview = self.get_empty_preview()
2675
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3185
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
2676
3186
preview_tree = preview.get_preview_tree()
2677
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3187
self.assertEqual('file', preview_tree.stored_kind('file'))
2679
3189
def test_is_executable(self):
2680
3190
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'))
3191
preview.new_file('file', preview.root, [b'a\nb\nc\n'], b'file-id')
3192
preview.set_executability(True, preview.trans_id_file_id(b'file-id'))
2683
3193
preview_tree = preview.get_preview_tree()
2684
self.assertEqual(True, preview_tree.is_executable('file-id'))
3194
self.assertEqual(True, preview_tree.is_executable('file'))
2686
3196
def test_get_set_parent_ids(self):
2687
3197
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2688
3198
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())
3199
preview_tree.set_parent_ids([b'rev-1'])
3200
self.assertEqual([b'rev-1'], preview_tree.get_parent_ids())
2692
3202
def test_plan_file_merge(self):
2693
3203
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')
3204
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3205
work_a.add('file', b'file-id')
2696
3206
base_id = work_a.commit('base version')
2697
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3207
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2698
3208
preview = TransformPreview(work_a)
2699
3209
self.addCleanup(preview.finalize)
2700
trans_id = preview.trans_id_file_id('file-id')
3210
trans_id = preview.trans_id_file_id(b'file-id')
2701
3211
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')])
3212
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3213
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2704
3214
tree_a = preview.get_preview_tree()
2705
3215
tree_a.set_parent_ids([base_id])
2706
3216
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)))
3217
('killed-a', b'a\n'),
3218
('killed-b', b'b\n'),
3219
('unchanged', b'c\n'),
3220
('unchanged', b'd\n'),
3223
], list(tree_a.plan_file_merge(b'file-id', tree_b)))
2715
3225
def test_plan_file_merge_revision_tree(self):
2716
3226
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')
3227
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3228
work_a.add('file', b'file-id')
2719
3229
base_id = work_a.commit('base version')
2720
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3230
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2721
3231
preview = TransformPreview(work_a.basis_tree())
2722
3232
self.addCleanup(preview.finalize)
2723
trans_id = preview.trans_id_file_id('file-id')
3233
trans_id = preview.trans_id_file_id(b'file-id')
2724
3234
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')])
3235
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3236
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2727
3237
tree_a = preview.get_preview_tree()
2728
3238
tree_a.set_parent_ids([base_id])
2729
3239
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)))
3240
('killed-a', b'a\n'),
3241
('killed-b', b'b\n'),
3242
('unchanged', b'c\n'),
3243
('unchanged', b'd\n'),
3246
], list(tree_a.plan_file_merge(b'file-id', tree_b)))
2738
3248
def test_walkdirs(self):
2739
3249
preview = self.get_empty_preview()
2740
root = preview.new_directory('', ROOT_PARENT, 'tree-root')
3250
preview.new_directory('', ROOT_PARENT, b'tree-root')
2741
3251
# FIXME: new_directory should mark root.
2742
3252
preview.fixup_new_roots()
2743
3253
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')])]
3254
preview.new_file('a', preview.root, [b'contents'], b'a-id')
3255
expected = [(('', b'tree-root'),
3256
[('a', 'a', 'file', None, b'a-id', 'file')])]
2748
3257
self.assertEqual(expected, list(preview_tree.walkdirs()))
2750
3259
def test_extras(self):
2788
3297
tt = merger.make_merger().make_preview_transform()
2789
3298
self.addCleanup(tt.finalize)
2790
3299
final_tree = tt.get_preview_tree()
2791
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3302
final_tree.get_file_text(final_tree.id2path(b'file-id')))
2793
3304
def test_merge_preview_into_workingtree(self):
2794
3305
tree = self.make_branch_and_tree('tree')
2795
tree.set_root_id('TREE_ROOT')
3306
tree.set_root_id(b'TREE_ROOT')
2796
3307
tt = TransformPreview(tree)
2797
3308
self.addCleanup(tt.finalize)
2798
tt.new_file('name', tt.root, 'content', 'file-id')
3309
tt.new_file('name', tt.root, [b'content'], b'file-id')
2799
3310
tree2 = self.make_branch_and_tree('tree2')
2800
tree2.set_root_id('TREE_ROOT')
3311
tree2.set_root_id(b'TREE_ROOT')
2801
3312
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
None, tree.basis_tree())
2803
3314
merger.merge_type = Merge3Merger
2804
3315
merger.do_merge()
2806
3317
def test_merge_preview_into_workingtree_handles_conflicts(self):
2807
3318
tree = self.make_branch_and_tree('tree')
2808
self.build_tree_contents([('tree/foo', 'bar')])
2809
tree.add('foo', 'foo-id')
3319
self.build_tree_contents([('tree/foo', b'bar')])
3320
tree.add('foo', b'foo-id')
2810
3321
tree.commit('foo')
2811
3322
tt = TransformPreview(tree)
2812
3323
self.addCleanup(tt.finalize)
2813
trans_id = tt.trans_id_file_id('foo-id')
3324
trans_id = tt.trans_id_file_id(b'foo-id')
2814
3325
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')])
3326
tt.create_file([b'baz'], trans_id)
3327
tree2 = tree.controldir.sprout('tree2').open_workingtree()
3328
self.build_tree_contents([('tree2/foo', b'qux')])
2819
3329
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
pb, tree.basis_tree())
2821
3331
merger.merge_type = Merge3Merger
2822
3332
merger.do_merge()
3334
def test_has_filename(self):
3335
wt = self.make_branch_and_tree('tree')
3336
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3337
tt = TransformPreview(wt)
3338
removed_id = tt.trans_id_tree_path('removed')
3339
tt.delete_contents(removed_id)
3340
tt.new_file('new', tt.root, [b'contents'])
3341
modified_id = tt.trans_id_tree_path('modified')
3342
tt.delete_contents(modified_id)
3343
tt.create_file([b'modified-contents'], modified_id)
3344
self.addCleanup(tt.finalize)
3345
tree = tt.get_preview_tree()
3346
self.assertTrue(tree.has_filename('unmodified'))
3347
self.assertFalse(tree.has_filename('not-present'))
3348
self.assertFalse(tree.has_filename('removed'))
3349
self.assertTrue(tree.has_filename('new'))
3350
self.assertTrue(tree.has_filename('modified'))
2824
3352
def test_is_executable(self):
2825
3353
tree = self.make_branch_and_tree('tree')
2826
3354
preview = TransformPreview(tree)
2827
3355
self.addCleanup(preview.finalize)
2828
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3356
preview.new_file('foo', preview.root, [b'bar'], b'baz-id')
2829
3357
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'))
3358
self.assertEqual(False, preview_tree.is_executable('tree/foo'))
2834
3360
def test_commit_preview_tree(self):
2835
3361
tree = self.make_branch_and_tree('tree')
3112
3638
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3114
3640
def test_get_parents_lines(self):
3115
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3116
LINES_TWO = 'z\nbb\nx\ndd\n'
3641
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3117
3642
tree = self.make_branch_and_tree('tree')
3118
3643
self.build_tree_contents([('tree/file', LINES_ONE)])
3119
tree.add('file', 'file-id')
3644
tree.add('file', b'file-id')
3120
3645
tt = self.get_preview(tree)
3121
3646
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))
3647
self.assertEqual(([b'aa\n', b'bb\n', b'cc\n', b'dd\n'],),
3648
tt._get_parents_lines(trans_id))
3125
3650
def test_get_parents_texts(self):
3126
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3127
LINES_TWO = 'z\nbb\nx\ndd\n'
3651
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3128
3652
tree = self.make_branch_and_tree('tree')
3129
3653
self.build_tree_contents([('tree/file', LINES_ONE)])
3130
tree.add('file', 'file-id')
3654
tree.add('file', b'file-id')
3131
3655
tt = self.get_preview(tree)
3132
3656
trans_id = tt.trans_id_tree_path('file')
3133
3657
self.assertEqual((LINES_ONE,),
3134
tt._get_parents_texts(trans_id))
3658
tt._get_parents_texts(trans_id))
3661
class TestOrphan(tests.TestCaseWithTransport):
3663
def test_no_orphan_for_transform_preview(self):
3664
tree = self.make_branch_and_tree('tree')
3665
tt = transform.TransformPreview(tree)
3666
self.addCleanup(tt.finalize)
3667
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3669
def _set_orphan_policy(self, wt, policy):
3670
wt.branch.get_config_stack().set('transform.orphan_policy',
3673
def _prepare_orphan(self, wt):
3674
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3675
wt.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
3676
wt.commit('add dir and file ignoring foo')
3677
tt = transform.TreeTransform(wt)
3678
self.addCleanup(tt.finalize)
3679
# dir and bar are deleted
3680
dir_tid = tt.trans_id_tree_path('dir')
3681
file_tid = tt.trans_id_tree_path('dir/file')
3682
orphan_tid = tt.trans_id_tree_path('dir/foo')
3683
tt.delete_contents(file_tid)
3684
tt.unversion_file(file_tid)
3685
tt.delete_contents(dir_tid)
3686
tt.unversion_file(dir_tid)
3687
# There should be a conflict because dir still contain foo
3688
raw_conflicts = tt.find_conflicts()
3689
self.assertLength(1, raw_conflicts)
3690
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3691
return tt, orphan_tid
3693
def test_new_orphan_created(self):
3694
wt = self.make_branch_and_tree('.')
3695
self._set_orphan_policy(wt, 'move')
3696
tt, orphan_tid = self._prepare_orphan(wt)
3700
warnings.append(args[0] % args[1:])
3701
self.overrideAttr(trace, 'warning', warning)
3702
remaining_conflicts = resolve_conflicts(tt)
3703
self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
3705
# Yeah for resolved conflicts !
3706
self.assertLength(0, remaining_conflicts)
3707
# We have a new orphan
3708
self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
3709
self.assertEqual('brz-orphans',
3710
tt.final_name(tt.final_parent(orphan_tid)))
3712
def test_never_orphan(self):
3713
wt = self.make_branch_and_tree('.')
3714
self._set_orphan_policy(wt, 'conflict')
3715
tt, orphan_tid = self._prepare_orphan(wt)
3716
remaining_conflicts = resolve_conflicts(tt)
3717
self.assertLength(1, remaining_conflicts)
3718
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3719
remaining_conflicts.pop())
3721
def test_orphan_error(self):
3722
def bogus_orphan(tt, orphan_id, parent_id):
3723
raise transform.OrphaningError(tt.final_name(orphan_id),
3724
tt.final_name(parent_id))
3725
transform.orphaning_registry.register('bogus', bogus_orphan,
3726
'Raise an error when orphaning')
3727
wt = self.make_branch_and_tree('.')
3728
self._set_orphan_policy(wt, 'bogus')
3729
tt, orphan_tid = self._prepare_orphan(wt)
3730
remaining_conflicts = resolve_conflicts(tt)
3731
self.assertLength(1, remaining_conflicts)
3732
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3733
remaining_conflicts.pop())
3735
def test_unknown_orphan_policy(self):
3736
wt = self.make_branch_and_tree('.')
3737
# Set a fictional policy nobody ever implemented
3738
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3739
tt, orphan_tid = self._prepare_orphan(wt)
3743
warnings.append(args[0] % args[1:])
3744
self.overrideAttr(trace, 'warning', warning)
3745
remaining_conflicts = resolve_conflicts(tt)
3746
# We fallback to the default policy which create a conflict
3747
self.assertLength(1, remaining_conflicts)
3748
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3749
remaining_conflicts.pop())
3750
self.assertLength(1, warnings)
3751
self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3754
class TestTransformHooks(tests.TestCaseWithTransport):
3757
super(TestTransformHooks, self).setUp()
3758
self.wt = self.make_branch_and_tree('.')
3761
def get_transform(self):
3762
transform = TreeTransform(self.wt)
3763
self.addCleanup(transform.finalize)
3764
return transform, transform.root
3766
def test_pre_commit_hooks(self):
3769
def record_pre_transform(tree, tt):
3770
calls.append((tree, tt))
3771
MutableTree.hooks.install_named_hook(
3772
'pre_transform', record_pre_transform, "Pre transform")
3773
transform, root = self.get_transform()
3774
old_root_id = transform.tree_file_id(root)
3776
self.assertEqual(old_root_id, self.wt.get_root_id())
3777
self.assertEqual([(self.wt, transform)], calls)
3779
def test_post_commit_hooks(self):
3782
def record_post_transform(tree, tt):
3783
calls.append((tree, tt))
3784
MutableTree.hooks.install_named_hook(
3785
'post_transform', record_post_transform, "Post transform")
3786
transform, root = self.get_transform()
3787
old_root_id = transform.tree_file_id(root)
3789
self.assertEqual(old_root_id, self.wt.get_root_id())
3790
self.assertEqual([(self.wt, transform)], calls)
3793
class TestLinkTree(tests.TestCaseWithTransport):
3795
_test_needs_features = [HardlinkFeature]
3798
tests.TestCaseWithTransport.setUp(self)
3799
self.parent_tree = self.make_branch_and_tree('parent')
3800
self.parent_tree.lock_write()
3801
self.addCleanup(self.parent_tree.unlock)
3802
self.build_tree_contents([('parent/foo', b'bar')])
3803
self.parent_tree.add('foo')
3804
self.parent_tree.commit('added foo')
3805
child_controldir = self.parent_tree.controldir.sprout('child')
3806
self.child_tree = child_controldir.open_workingtree()
3808
def hardlinked(self):
3809
parent_stat = os.lstat(self.parent_tree.abspath('foo'))
3810
child_stat = os.lstat(self.child_tree.abspath('foo'))
3811
return parent_stat.st_ino == child_stat.st_ino
3813
def test_link_fails_if_modified(self):
3814
"""If the file to be linked has modified text, don't link."""
3815
self.build_tree_contents([('child/foo', b'baz')])
3816
transform.link_tree(self.child_tree, self.parent_tree)
3817
self.assertFalse(self.hardlinked())
3819
def test_link_fails_if_execute_bit_changed(self):
3820
"""If the file to be linked has modified execute bit, don't link."""
3821
tt = TreeTransform(self.child_tree)
3823
trans_id = tt.trans_id_tree_path('foo')
3824
tt.set_executability(True, trans_id)
3828
transform.link_tree(self.child_tree, self.parent_tree)
3829
self.assertFalse(self.hardlinked())
3831
def test_link_succeeds_if_unmodified(self):
3832
"""If the file to be linked is unmodified, link"""
3833
transform.link_tree(self.child_tree, self.parent_tree)
3834
self.assertTrue(self.hardlinked())
added
removed
breezy/tests/test_transform.py
