14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
from StringIO import StringIO
29
28
revision as _mod_revision,
34
from bzrlib.bzrdir import BzrDir
35
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
36
UnversionedParent, ParentLoop, DeletingParent,
38
from bzrlib.diff import show_diff_trees
39
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
40
ReusingTransform, CantMoveRoot,
41
PathsNotVersionedError, ExistingLimbo,
42
ExistingPendingDeletion, ImmortalLimbo,
43
ImmortalPendingDeletion, LockError)
44
from bzrlib.osutils import file_kind, pathjoin
45
from bzrlib.merge import Merge3Merger, Merger
46
from bzrlib.tests import (
35
from ..conflicts import (
44
from ..controldir import ControlDir
45
from ..diff import show_diff_trees
46
from ..errors import (
49
ExistingPendingDeletion,
51
ImmortalPendingDeletion,
56
from ..osutils import (
60
from ..merge import Merge3Merger, Merger
61
from ..mutabletree import MutableTree
62
from ..sixish import (
71
from .features import (
53
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths,
54
resolve_conflicts, cook_conflicts,
55
build_tree, get_backup_name,
56
_FileMover, resolve_checkout,
57
TransformPreview, create_from_tree)
75
from ..transform import (
60
89
class TestTreeTransform(tests.TestCaseWithTransport):
63
92
super(TestTreeTransform, self).setUp()
64
self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
93
self.wt = self.make_branch_and_tree('.', format='development-subtree')
67
96
def get_transform(self):
120
159
transform.create_directory(oz_id)
121
160
transform.version_file('ozzie', oz_id)
122
161
trans_id2 = transform.create_path('name2', root)
123
transform.create_file('contents', trans_id2)
162
transform.create_file([b'contents'], trans_id2)
124
163
transform.set_executability(False, trans_id2)
125
164
transform.version_file('my_pretties2', trans_id2)
126
165
modified_paths = transform.apply().modified_paths
127
self.assertEqual('contents', self.wt.get_file_byname('name').read())
166
self.assertEqual('contents', self.wt.get_file('name').read())
128
167
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
self.assertIs(self.wt.is_executable('name'), True)
169
self.assertIs(self.wt.is_executable('name2'), False)
131
170
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
132
171
self.assertEqual(len(modified_paths), 3)
133
tree_mod_paths = [self.wt.id2abspath(f) for f in
172
tree_mod_paths = [self.wt.abspath(self.wt.id2path(f)) for f in
134
173
('ozzie', 'my_pretties', 'my_pretties2')]
135
174
self.assertSubset(tree_mod_paths, modified_paths)
136
175
# is it safe to finalize repeatedly?
137
176
transform.finalize()
138
177
transform.finalize()
179
def test_apply_informs_tree_of_observed_sha1(self):
180
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
181
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
184
orig = self.wt._observed_sha1
185
def _observed_sha1(*args):
188
self.wt._observed_sha1 = _observed_sha1
190
self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
193
def test_create_file_caches_sha1(self):
194
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
195
trans_id = trans.create_path('file1', root)
196
trans.create_file(contents, trans_id, sha1=sha1)
197
st_val = osutils.lstat(trans._limbo_name(trans_id))
198
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
199
self.assertEqual(o_sha1, sha1)
200
self.assertEqualStat(o_st_val, st_val)
202
def test__apply_insertions_updates_sha1(self):
203
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
204
trans_id = trans.create_path('file1', root)
205
trans.create_file(contents, trans_id, sha1=sha1)
206
st_val = osutils.lstat(trans._limbo_name(trans_id))
207
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
208
self.assertEqual(o_sha1, sha1)
209
self.assertEqualStat(o_st_val, st_val)
210
creation_mtime = trans._creation_mtime + 10.0
211
# We fake a time difference from when the file was created until now it
212
# is being renamed by using os.utime. Note that the change we actually
213
# want to see is the real ctime change from 'os.rename()', but as long
214
# as we observe a new stat value, we should be fine.
215
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
217
new_st_val = osutils.lstat(self.wt.abspath('file1'))
218
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
219
self.assertEqual(o_sha1, sha1)
220
self.assertEqualStat(o_st_val, new_st_val)
221
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
223
def test_new_file_caches_sha1(self):
224
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
225
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
227
st_val = osutils.lstat(trans._limbo_name(trans_id))
228
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
229
self.assertEqual(o_sha1, sha1)
230
self.assertEqualStat(o_st_val, st_val)
232
def test_cancel_creation_removes_observed_sha1(self):
233
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
234
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
236
self.assertTrue(trans_id in trans._observed_sha1s)
237
trans.cancel_creation(trans_id)
238
self.assertFalse(trans_id in trans._observed_sha1s)
140
240
def test_create_files_same_timestamp(self):
141
241
transform, root = self.get_transform()
142
242
self.wt.lock_tree_write()
163
263
def test_change_root_id(self):
164
264
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')
265
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
266
transform.new_directory('', ROOT_PARENT, b'new-root-id')
167
267
transform.delete_contents(root)
168
268
transform.unversion_file(root)
169
269
transform.fixup_new_roots()
170
270
transform.apply()
171
self.assertEqual('new-root-id', self.wt.get_root_id())
271
self.assertEqual(b'new-root-id', self.wt.get_root_id())
173
273
def test_change_root_id_add_files(self):
174
274
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')
275
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
276
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
177
277
transform.new_file('file', new_trans_id, ['new-contents\n'],
179
279
transform.delete_contents(root)
180
280
transform.unversion_file(root)
181
281
transform.fixup_new_roots()
182
282
transform.apply()
183
self.assertEqual('new-root-id', self.wt.get_root_id())
184
self.assertEqual('new-file-id', self.wt.path2id('file'))
283
self.assertEqual(b'new-root-id', self.wt.get_root_id())
284
self.assertEqual(b'new-file-id', self.wt.path2id('file'))
185
285
self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
187
287
def test_add_two_roots(self):
188
288
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)
289
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
290
new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
291
self.assertRaises(ValueError, transform.fixup_new_roots)
293
def test_retain_existing_root(self):
294
tt, root = self.get_transform()
296
tt.new_directory('', ROOT_PARENT, b'new-root-id')
298
self.assertNotEqual(b'new-root-id', tt.final_file_id(tt.root))
300
def test_retain_existing_root_added_file(self):
301
tt, root = self.get_transform()
302
new_trans_id = tt.new_directory('', ROOT_PARENT, b'new-root-id')
303
child = tt.new_directory('child', new_trans_id, b'child-id')
305
self.assertEqual(tt.root, tt.final_parent(child))
307
def test_add_unversioned_root(self):
308
transform, root = self.get_transform()
309
new_trans_id = transform.new_directory('', ROOT_PARENT, None)
310
transform.delete_contents(transform.root)
311
transform.fixup_new_roots()
312
self.assertNotIn(transform.root, transform._new_id)
314
def test_remove_root_fixup(self):
315
transform, root = self.get_transform()
316
old_root_id = self.wt.get_root_id()
317
self.assertNotEqual(b'new-root-id', old_root_id)
318
transform.delete_contents(root)
319
transform.unversion_file(root)
320
transform.fixup_new_roots()
322
self.assertEqual(old_root_id, self.wt.get_root_id())
324
transform, root = self.get_transform()
325
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
326
new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
327
self.assertRaises(ValueError, transform.fixup_new_roots)
329
def test_fixup_new_roots_permits_empty_tree(self):
330
transform, root = self.get_transform()
331
transform.delete_contents(root)
332
transform.unversion_file(root)
333
transform.fixup_new_roots()
334
self.assertIs(None, transform.final_kind(root))
335
self.assertIs(None, transform.final_file_id(root))
337
def test_apply_retains_root_directory(self):
338
# Do not attempt to delete the physical root directory, because that
340
transform, root = self.get_transform()
342
transform.delete_contents(root)
343
e = self.assertRaises(AssertionError, self.assertRaises,
344
errors.TransformRenameFailed,
346
self.assertContainsRe('TransformRenameFailed not raised', str(e))
348
def test_apply_retains_file_id(self):
349
transform, root = self.get_transform()
350
old_root_id = transform.tree_file_id(root)
351
transform.unversion_file(root)
353
self.assertEqual(old_root_id, self.wt.get_root_id())
193
355
def test_hardlink(self):
194
356
self.requireFeature(HardlinkFeature)
195
357
transform, root = self.get_transform()
196
transform.new_file('file1', root, 'contents')
358
transform.new_file('file1', root, b'contents')
197
359
transform.apply()
198
360
target = self.make_branch_and_tree('target')
199
361
target_transform = TreeTransform(target)
200
362
trans_id = target_transform.create_path('file1', target_transform.root)
201
363
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
202
364
target_transform.apply()
203
self.failUnlessExists('target/file1')
365
self.assertPathExists('target/file1')
204
366
source_stat = os.stat(self.wt.abspath('file1'))
205
367
target_stat = os.stat('target/file1')
206
368
self.assertEqual(source_stat, target_stat)
209
371
transform, root = self.get_transform()
210
372
self.wt.lock_tree_write()
211
373
self.addCleanup(self.wt.unlock)
212
trans_id = transform.new_file('name', root, 'contents',
374
trans_id = transform.new_file('name', root, b'contents',
213
375
'my_pretties', True)
214
376
oz = transform.new_directory('oz', root, 'oz-id')
215
377
dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
216
toto = transform.new_file('toto', dorothy, 'toto-contents',
378
toto = transform.new_file('toto', dorothy, b'toto-contents',
217
379
'toto-id', False)
219
381
self.assertEqual(len(transform.find_conflicts()), 0)
220
382
transform.apply()
221
383
self.assertRaises(ReusingTransform, transform.find_conflicts)
222
self.assertEqual('contents', file(self.wt.abspath('name')).read())
384
with open(self.wt.abspath('name'), 'r') as f:
385
self.assertEqual('contents', f.read())
223
386
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
224
self.assertIs(self.wt.is_executable('my_pretties'), True)
387
self.assertIs(self.wt.is_executable('name'), True)
225
388
self.assertEqual(self.wt.path2id('oz'), 'oz-id')
226
389
self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
227
390
self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
229
392
self.assertEqual('toto-contents',
230
self.wt.get_file_byname('oz/dorothy/toto').read())
231
self.assertIs(self.wt.is_executable('toto-id'), False)
393
self.wt.get_file('oz/dorothy/toto').read())
394
self.assertIs(self.wt.is_executable('oz/dorothy/toto'), False)
233
396
def test_tree_reference(self):
234
397
transform, root = self.get_transform()
383
547
tree.case_sensitive = False
384
548
transform = TreeTransform(tree)
385
549
self.addCleanup(transform.finalize)
386
transform.new_file('file', transform.root, 'content')
387
transform.new_file('FiLe', transform.root, 'content')
550
transform.new_file('file', transform.root, b'content')
551
transform.new_file('FiLe', transform.root, b'content')
388
552
resolve_conflicts(transform,
389
553
pass_func=lambda t, c: resolve_checkout(t, c, []))
390
554
transform.apply()
391
self.failUnlessExists('tree/file')
392
self.failUnlessExists('tree/FiLe.moved')
555
self.assertPathExists('tree/file')
556
self.assertPathExists('tree/FiLe.moved')
394
558
def test_apply_case_conflict(self):
395
559
"""Ensure that a transform with case conflicts can always be applied"""
396
560
tree = self.make_branch_and_tree('tree')
397
561
transform = TreeTransform(tree)
398
562
self.addCleanup(transform.finalize)
399
transform.new_file('file', transform.root, 'content')
400
transform.new_file('FiLe', transform.root, 'content')
563
transform.new_file('file', transform.root, b'content')
564
transform.new_file('FiLe', transform.root, b'content')
401
565
dir = transform.new_directory('dir', transform.root)
402
transform.new_file('dirfile', dir, 'content')
403
transform.new_file('dirFiLe', dir, 'content')
566
transform.new_file('dirfile', dir, b'content')
567
transform.new_file('dirFiLe', dir, b'content')
404
568
resolve_conflicts(transform)
405
569
transform.apply()
406
self.failUnlessExists('tree/file')
570
self.assertPathExists('tree/file')
407
571
if not os.path.exists('tree/FiLe.moved'):
408
self.failUnlessExists('tree/FiLe')
409
self.failUnlessExists('tree/dir/dirfile')
572
self.assertPathExists('tree/FiLe')
573
self.assertPathExists('tree/dir/dirfile')
410
574
if not os.path.exists('tree/dir/dirFiLe.moved'):
411
self.failUnlessExists('tree/dir/dirFiLe')
575
self.assertPathExists('tree/dir/dirFiLe')
413
577
def test_case_insensitive_limbo(self):
414
578
tree = self.make_branch_and_tree('tree')
463
627
create_tree, root = self.get_transform()
465
629
root = create_tree.root
466
create_tree.new_file('name1', root, 'hello1', 'name1')
467
create_tree.new_file('name2', root, 'hello2', 'name2')
630
create_tree.new_file('name1', root, b'hello1', 'name1')
631
create_tree.new_file('name2', root, b'hello2', 'name2')
468
632
ddir = create_tree.new_directory('dying_directory', root, 'ddir')
469
create_tree.new_file('dying_file', ddir, 'goodbye1', 'dfile')
470
create_tree.new_file('moving_file', ddir, 'later1', 'mfile')
471
create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
633
create_tree.new_file('dying_file', ddir, b'goodbye1', 'dfile')
634
create_tree.new_file('moving_file', ddir, b'later1', 'mfile')
635
create_tree.new_file('moving_file2', root, b'later2', 'mfile2')
472
636
create_tree.apply()
474
mangle_tree,root = self.get_transform()
638
mangle_tree, root = self.get_transform()
475
639
root = mangle_tree.root
477
name1 = mangle_tree.trans_id_tree_file_id('name1')
478
name2 = mangle_tree.trans_id_tree_file_id('name2')
641
name1 = mangle_tree.trans_id_tree_path('name1')
642
name2 = mangle_tree.trans_id_tree_path('name2')
479
643
mangle_tree.adjust_path('name2', root, name1)
480
644
mangle_tree.adjust_path('name1', root, name2)
482
646
#tests for deleting parent directories
483
ddir = mangle_tree.trans_id_tree_file_id('ddir')
647
ddir = mangle_tree.trans_id_tree_path('dying_directory')
484
648
mangle_tree.delete_contents(ddir)
485
dfile = mangle_tree.trans_id_tree_file_id('dfile')
649
dfile = mangle_tree.trans_id_tree_path('dying_directory/dying_file')
486
650
mangle_tree.delete_versioned(dfile)
487
651
mangle_tree.unversion_file(dfile)
488
mfile = mangle_tree.trans_id_tree_file_id('mfile')
652
mfile = mangle_tree.trans_id_tree_path('dying_directory/moving_file')
489
653
mangle_tree.adjust_path('mfile', root, mfile)
491
655
#tests for adding parent directories
492
656
newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
493
mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
657
mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
494
658
mangle_tree.adjust_path('mfile2', newdir, mfile2)
495
mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
659
mangle_tree.new_file('newfile', newdir, b'hello3', 'dfile')
496
660
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
497
661
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
498
662
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
499
663
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'))
664
with open(self.wt.abspath('name1'), 'r') as f:
665
self.assertEqual(f.read(), 'hello2')
666
with open(self.wt.abspath('name2'), 'r') as f:
667
self.assertEqual(f.read(), 'hello1')
668
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
503
669
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')
670
with open(mfile2_path, 'r') as f:
671
self.assertEqual(f.read(), 'later2')
672
self.assertEqual(self.wt.id2path(b'mfile2'), 'new_directory/mfile2')
673
self.assertEqual(self.wt.path2id('new_directory/mfile2'), b'mfile2')
674
newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
675
with open(newfile_path, 'r') as f:
676
self.assertEqual(f.read(), 'hello3')
677
self.assertEqual(self.wt.path2id('dying_directory'), b'ddir')
510
678
self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
511
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
679
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
513
681
def test_both_rename(self):
514
create_tree,root = self.get_transform()
682
create_tree, root = self.get_transform()
515
683
newdir = create_tree.new_directory('selftest', root, 'selftest-id')
516
create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
684
create_tree.new_file('blackbox.py', newdir, b'hello1', 'blackbox-id')
517
685
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')
686
mangle_tree, root = self.get_transform()
687
selftest = mangle_tree.trans_id_tree_path('selftest')
688
blackbox = mangle_tree.trans_id_tree_path('selftest/blackbox.py')
521
689
mangle_tree.adjust_path('test', root, selftest)
522
690
mangle_tree.adjust_path('test_too_much', root, selftest)
523
691
mangle_tree.set_executability(True, blackbox)
524
692
mangle_tree.apply()
526
694
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')
695
create_tree, root = self.get_transform()
696
breezy = create_tree.new_directory('breezy', root, 'breezy-id')
697
tests = create_tree.new_directory('tests', breezy, 'tests-id')
530
698
blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
531
create_tree.new_file('test_too_much.py', blackbox, 'hello1',
699
create_tree.new_file('test_too_much.py', blackbox, b'hello1',
532
700
'test_too_much-id')
533
701
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)
702
mangle_tree, root = self.get_transform()
703
breezy = mangle_tree.trans_id_tree_path('breezy')
704
tests = mangle_tree.trans_id_tree_path('breezy/tests')
705
test_too_much = mangle_tree.trans_id_tree_path('breezy/tests/blackbox/test_too_much.py')
706
mangle_tree.adjust_path('selftest', breezy, tests)
539
707
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
540
708
mangle_tree.set_executability(True, test_too_much)
541
709
mangle_tree.apply()
543
711
def test_both_rename3(self):
544
create_tree,root = self.get_transform()
712
create_tree, root = self.get_transform()
545
713
tests = create_tree.new_directory('tests', root, 'tests-id')
546
create_tree.new_file('test_too_much.py', tests, 'hello1',
714
create_tree.new_file('test_too_much.py', tests, b'hello1',
547
715
'test_too_much-id')
548
716
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')
717
mangle_tree, root = self.get_transform()
718
tests = mangle_tree.trans_id_tree_path('tests')
719
test_too_much = mangle_tree.trans_id_tree_path('tests/test_too_much.py')
552
720
mangle_tree.adjust_path('selftest', root, tests)
553
721
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
554
722
mangle_tree.set_executability(True, test_too_much)
753
921
def test_resolve_conflicts_wrong_existing_parent_kind(self):
754
922
tt = self.prepare_wrong_parent_kind()
755
923
raw_conflicts = resolve_conflicts(tt)
756
self.assertEqual(set([('non-directory parent', 'Created directory',
757
'new-3')]), raw_conflicts)
924
self.assertEqual({('non-directory parent', 'Created directory',
925
'new-3')}, raw_conflicts)
758
926
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
759
927
self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
760
'parent-id')], cooked_conflicts)
928
b'parent-id')], cooked_conflicts)
762
self.assertEqual(None, self.wt.path2id('parent'))
930
self.assertFalse(self.wt.is_versioned('parent'))
763
931
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
765
933
def test_resolve_conflicts_wrong_new_parent_kind(self):
766
934
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')
935
parent_id = tt.new_directory('parent', root, b'parent-id')
936
tt.new_file('child,', parent_id, b'contents2', b'file-id')
770
938
tt, root = self.get_transform()
771
939
parent_id = tt.trans_id_file_id('parent-id')
772
940
tt.delete_contents(parent_id)
773
tt.create_file('contents', parent_id)
941
tt.create_file([b'contents'], parent_id)
774
942
raw_conflicts = resolve_conflicts(tt)
775
self.assertEqual(set([('non-directory parent', 'Created directory',
776
'new-3')]), raw_conflicts)
943
self.assertEqual({('non-directory parent', 'Created directory',
944
'new-3')}, raw_conflicts)
778
self.assertEqual(None, self.wt.path2id('parent'))
946
self.assertFalse(self.wt.is_versioned('parent'))
779
947
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
781
949
def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
782
950
tt, root = self.get_transform()
783
951
parent_id = tt.new_directory('parent', root)
784
tt.new_file('child,', parent_id, 'contents2')
952
tt.new_file('child,', parent_id, b'contents2')
786
954
tt, root = self.get_transform()
787
955
parent_id = tt.trans_id_tree_path('parent')
788
956
tt.delete_contents(parent_id)
789
tt.create_file('contents', parent_id)
957
tt.create_file([b'contents'], parent_id)
790
958
resolve_conflicts(tt)
792
self.assertIs(None, self.wt.path2id('parent'))
793
self.assertIs(None, self.wt.path2id('parent.new'))
960
self.assertFalse(self.wt.is_versioned('parent'))
961
self.assertFalse(self.wt.is_versioned('parent.new'))
963
def test_resolve_conflicts_missing_parent(self):
964
wt = self.make_branch_and_tree('.')
965
tt = TreeTransform(wt)
966
self.addCleanup(tt.finalize)
967
parent = tt.trans_id_file_id('parent-id')
968
tt.new_file('file', parent, b'Contents')
969
raw_conflicts = resolve_conflicts(tt)
970
# Since the directory doesn't exist it's seen as 'missing'. So
971
# 'resolve_conflicts' create a conflict asking for it to be created.
972
self.assertLength(1, raw_conflicts)
973
self.assertEqual(('missing parent', 'Created directory', 'new-1'),
975
# apply fail since the missing directory doesn't exist
976
self.assertRaises(errors.NoFinalPath, tt.apply)
795
978
def test_moving_versioned_directories(self):
796
979
create, root = self.get_transform()
843
1064
wt = transform._tree
845
1066
self.addCleanup(wt.unlock)
846
transform.new_file('set_on_creation', root, 'Set on creation', 'soc',
1067
transform.new_file('set_on_creation', root, b'Set on creation', 'soc',
848
1069
sac = transform.new_file('set_after_creation', root,
849
1070
'Set after creation', 'sac')
850
1071
transform.set_executability(True, sac)
851
uws = transform.new_file('unset_without_set', root, 'Unset badly',
1072
uws = transform.new_file('unset_without_set', root, b'Unset badly',
853
1074
self.assertRaises(KeyError, transform.set_executability, None, uws)
854
1075
transform.apply()
855
self.assertTrue(wt.is_executable('soc'))
856
self.assertTrue(wt.is_executable('sac'))
1076
self.assertTrue(wt.is_executable('set_on_creation'))
1077
self.assertTrue(wt.is_executable('set_after_creation'))
858
1079
def test_preserve_mode(self):
859
1080
"""File mode is preserved when replacing content"""
860
1081
if sys.platform == 'win32':
861
1082
raise TestSkipped('chmod has no effect on win32')
862
1083
transform, root = self.get_transform()
863
transform.new_file('file1', root, 'contents', 'file1-id', True)
1084
transform.new_file('file1', root, b'contents', b'file1-id', True)
864
1085
transform.apply()
865
1086
self.wt.lock_write()
866
1087
self.addCleanup(self.wt.unlock)
867
self.assertTrue(self.wt.is_executable('file1-id'))
1088
self.assertTrue(self.wt.is_executable('file1'))
868
1089
transform, root = self.get_transform()
869
file1_id = transform.trans_id_tree_file_id('file1-id')
1090
file1_id = transform.trans_id_tree_path('file1')
870
1091
transform.delete_contents(file1_id)
871
transform.create_file('contents2', file1_id)
1092
transform.create_file([b'contents2'], file1_id)
872
1093
transform.apply()
873
self.assertTrue(self.wt.is_executable('file1-id'))
1094
self.assertTrue(self.wt.is_executable('file1'))
875
1096
def test__set_mode_stats_correctly(self):
876
1097
"""_set_mode stats to determine file mode."""
1382
1597
self.build_tree(['baz'])
1383
1598
tt.create_hardlink("baz", foo_trans_id)
1385
self.failUnlessExists("foo")
1386
self.failUnlessExists("baz")
1600
self.assertPathExists("foo")
1601
self.assertPathExists("baz")
1388
1603
self.addCleanup(wt.unlock)
1389
self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1604
self.assertEqual(wt.kind("foo"), "file")
1392
1606
def test_no_final_path(self):
1393
1607
transform, root = self.get_transform()
1394
1608
trans_id = transform.trans_id_file_id('foo')
1395
transform.create_file('bar', trans_id)
1609
transform.create_file([b'bar'], trans_id)
1396
1610
transform.cancel_creation(trans_id)
1397
1611
transform.apply()
1399
1613
def test_create_from_tree(self):
1400
1614
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'])
1615
self.build_tree_contents([('tree1/foo/',), ('tree1/bar', b'baz')])
1616
tree1.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
1403
1617
tree2 = self.make_branch_and_tree('tree2')
1404
1618
tt = TreeTransform(tree2)
1405
1619
foo_trans_id = tt.create_path('foo', tt.root)
1406
create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
1620
create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
1407
1621
bar_trans_id = tt.create_path('bar', tt.root)
1408
create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
1622
create_from_tree(tt, bar_trans_id, tree1, 'bar', file_id='bbar-id')
1410
1624
self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1411
1625
self.assertFileEqual('baz', 'tree2/bar')
1451
1666
return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1669
class TestInventoryAltered(tests.TestCaseWithTransport):
1671
def test_inventory_altered_unchanged(self):
1672
tree = self.make_branch_and_tree('tree')
1673
self.build_tree(['tree/foo'])
1674
tree.add('foo', b'foo-id')
1675
with TransformPreview(tree) as tt:
1676
self.assertEqual([], tt._inventory_altered())
1678
def test_inventory_altered_changed_parent_id(self):
1679
tree = self.make_branch_and_tree('tree')
1680
self.build_tree(['tree/foo'])
1681
tree.add('foo', b'foo-id')
1682
with TransformPreview(tree) as tt:
1683
tt.unversion_file(tt.root)
1684
tt.version_file(b'new-id', tt.root)
1685
foo_trans_id = tt.trans_id_tree_path('foo')
1686
foo_tuple = ('foo', foo_trans_id)
1687
root_tuple = ('', tt.root)
1688
self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
1690
def test_inventory_altered_noop_changed_parent_id(self):
1691
tree = self.make_branch_and_tree('tree')
1692
self.build_tree(['tree/foo'])
1693
tree.add('foo', b'foo-id')
1694
with TransformPreview(tree) as tt:
1695
tt.unversion_file(tt.root)
1696
tt.version_file(tree.get_root_id(), tt.root)
1697
foo_trans_id = tt.trans_id_tree_path('foo')
1698
self.assertEqual([], tt._inventory_altered())
1454
1701
class TestTransformMerge(TestCaseInTempDir):
1456
1703
def test_text_merge(self):
1457
1704
root_id = generate_ids.gen_root_id()
1458
1705
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')
1706
base.tt.new_file('a', base.root, b'a\nb\nc\nd\be\n', b'a')
1707
base.tt.new_file('b', base.root, b'b1', b'b')
1708
base.tt.new_file('c', base.root, b'c', b'c')
1709
base.tt.new_file('d', base.root, b'd', b'd')
1710
base.tt.new_file('e', base.root, b'e', b'e')
1711
base.tt.new_file('f', base.root, b'f', b'f')
1712
base.tt.new_directory('g', base.root, b'g')
1713
base.tt.new_directory('h', base.root, b'h')
1467
1714
base.tt.apply()
1468
1715
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')
1716
other.tt.new_file('a', other.root, b'y\nb\nc\nd\be\n', b'a')
1717
other.tt.new_file('b', other.root, b'b2', b'b')
1718
other.tt.new_file('c', other.root, b'c2', b'c')
1719
other.tt.new_file('d', other.root, b'd', b'd')
1720
other.tt.new_file('e', other.root, b'e2', b'e')
1721
other.tt.new_file('f', other.root, b'f', b'f')
1722
other.tt.new_file('g', other.root, b'g', b'g')
1723
other.tt.new_file('h', other.root, b'h\ni\nj\nk\n', b'h')
1724
other.tt.new_file('i', other.root, b'h\ni\nj\nk\n', b'i')
1478
1725
other.tt.apply()
1479
1726
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')
1727
this.tt.new_file('a', this.root, b'a\nb\nc\nd\bz\n', b'a')
1728
this.tt.new_file('b', this.root, b'b', b'b')
1729
this.tt.new_file('c', this.root, b'c', b'c')
1730
this.tt.new_file('d', this.root, b'd2', b'd')
1731
this.tt.new_file('e', this.root, b'e2', b'e')
1732
this.tt.new_file('f', this.root, b'f', b'f')
1733
this.tt.new_file('g', this.root, b'g', b'g')
1734
this.tt.new_file('h', this.root, b'1\n2\n3\n4\n', b'h')
1735
this.tt.new_file('i', this.root, b'1\n2\n3\n4\n', b'i')
1489
1736
this.tt.apply()
1490
1737
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1492
1739
# textual merge
1493
self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
1740
self.assertEqual(this.wt.get_file(this.wt.id2path(b'a')).read(), b'y\nb\nc\nd\bz\n')
1494
1741
# three-way text conflict
1495
self.assertEqual(this.wt.get_file('b').read(),
1742
self.assertEqual(this.wt.get_file(this.wt.id2path(b'b')).read(),
1496
1743
conflict_text('b', 'b2'))
1498
self.assertEqual(this.wt.get_file('c').read(), 'c2')
1745
self.assertEqual(this.wt.get_file(this.wt.id2path(b'c')).read(), b'c2')
1500
self.assertEqual(this.wt.get_file('d').read(), 'd2')
1747
self.assertEqual(this.wt.get_file(this.wt.id2path(b'd')).read(), b'd2')
1501
1748
# Ambigious clean merge
1502
self.assertEqual(this.wt.get_file('e').read(), 'e2')
1749
self.assertEqual(this.wt.get_file(this.wt.id2path(b'e')).read(), b'e2')
1504
self.assertEqual(this.wt.get_file('f').read(), 'f')
1751
self.assertEqual(this.wt.get_file(this.wt.id2path(b'f')).read(), b'f')
1505
1752
# Correct correct results when THIS == OTHER
1506
self.assertEqual(this.wt.get_file('g').read(), 'g')
1753
self.assertEqual(this.wt.get_file(this.wt.id2path(b'g')).read(), b'g')
1507
1754
# Text conflict when THIS & OTHER are text and BASE is dir
1508
self.assertEqual(this.wt.get_file('h').read(),
1755
self.assertEqual(this.wt.get_file(this.wt.id2path(b'h')).read(),
1509
1756
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(),
1757
self.assertEqual(this.wt.get_file('h.THIS').read(),
1759
self.assertEqual(this.wt.get_file('h.OTHER').read(),
1514
1761
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(),
1762
self.assertEqual(this.wt.get_file(this.wt.id2path(b'i')).read(),
1763
conflict_text(b'1\n2\n3\n4\n', b'h\ni\nj\nk\n'))
1764
self.assertEqual(this.wt.get_file('i.THIS').read(),
1766
self.assertEqual(this.wt.get_file('i.OTHER').read(),
1521
1768
self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1522
1769
modified = ['a', 'b', 'c', 'h', 'i']
1523
1770
merge_modified = this.wt.merge_modified()
1524
1771
self.assertSubset(merge_modified, modified)
1525
1772
self.assertEqual(len(merge_modified), len(modified))
1526
file(this.wt.id2abspath('a'), 'wb').write('booga')
1773
with open(this.wt.abspath(this.wt.id2path('a')), 'wb') as f: f.write(b'booga')
1527
1774
modified.pop(0)
1528
1775
merge_modified = this.wt.merge_modified()
1529
1776
self.assertSubset(merge_modified, modified)
1643
1890
def test_build_tree_with_symlinks(self):
1644
1891
self.requireFeature(SymlinkFeature)
1646
a = BzrDir.create_standalone_workingtree('a')
1893
a = ControlDir.create_standalone_workingtree('a')
1647
1894
os.mkdir('a/foo')
1648
file('a/foo/bar', 'wb').write('contents')
1895
with open('a/foo/bar', 'wb') as f: f.write(b'contents')
1649
1896
os.symlink('a/foo/bar', 'a/foo/baz')
1650
1897
a.add(['foo', 'foo/bar', 'foo/baz'])
1651
1898
a.commit('initial commit')
1652
b = BzrDir.create_standalone_workingtree('b')
1899
b = ControlDir.create_standalone_workingtree('b')
1653
1900
basis = a.basis_tree()
1654
1901
basis.lock_read()
1655
1902
self.addCleanup(basis.unlock)
1656
1903
build_tree(basis, b)
1657
1904
self.assertIs(os.path.isdir('b/foo'), True)
1658
self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
1905
with open('b/foo/bar', 'rb') as f:
1906
self.assertEqual(f.read(), "contents")
1659
1907
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
1661
1909
def test_build_with_references(self):
1662
1910
tree = self.make_branch_and_tree('source',
1663
format='dirstate-with-subtree')
1911
format='development-subtree')
1664
1912
subtree = self.make_branch_and_tree('source/subtree',
1665
format='dirstate-with-subtree')
1913
format='development-subtree')
1666
1914
tree.add_reference(subtree)
1667
1915
tree.commit('a revision')
1668
1916
tree.branch.create_checkout('target')
1669
self.failUnlessExists('target')
1670
self.failUnlessExists('target/subtree')
1917
self.assertPathExists('target')
1918
self.assertPathExists('target/subtree')
1672
1920
def test_file_conflict_handling(self):
1673
1921
"""Ensure that when building trees, conflict handling is done"""
1674
1922
source = self.make_branch_and_tree('source')
1675
1923
target = self.make_branch_and_tree('target')
1676
1924
self.build_tree(['source/file', 'target/file'])
1677
source.add('file', 'new-file')
1925
source.add('file', b'new-file')
1678
1926
source.commit('added file')
1679
1927
build_tree(source.basis_tree(), target)
1680
1928
self.assertEqual([DuplicateEntry('Moved existing file to',
1681
1929
'file.moved', 'file', None, 'new-file')],
1682
1930
target.conflicts())
1683
1931
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())
1932
with open('target2/file', 'wb') as target_file, \
1933
open('source/file', 'rb') as source_file:
1934
target_file.write(source_file.read())
1693
1935
build_tree(source.basis_tree(), target2)
1694
1936
self.assertEqual([], target2.conflicts())
1970
2224
self.assertEqualStat(source_stat, target_stat)
1972
2226
def test_case_insensitive_build_tree_inventory(self):
1973
if (tests.CaseInsensitiveFilesystemFeature.available()
1974
or tests.CaseInsCasePresFilenameFeature.available()):
2227
if (features.CaseInsensitiveFilesystemFeature.available()
2228
or features.CaseInsCasePresFilenameFeature.available()):
1975
2229
raise tests.UnavailableFeature('Fully case sensitive filesystem')
1976
2230
source = self.make_branch_and_tree('source')
1977
2231
self.build_tree(['source/file', 'source/FILE'])
1978
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2232
source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
1979
2233
source.commit('added files')
1980
2234
# Don't try this at home, kids!
1981
2235
# Force the tree to report that it is case insensitive
1982
2236
target = self.make_branch_and_tree('target')
1983
2237
target.case_sensitive = False
1984
2238
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'))
2239
self.assertEqual('file.moved', target.id2path(b'lower-id'))
2240
self.assertEqual('FILE', target.id2path(b'upper-id'))
2242
def test_build_tree_observes_sha(self):
2243
source = self.make_branch_and_tree('source')
2244
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2245
source.add(['file1', 'dir', 'dir/file2'],
2246
[b'file1-id', b'dir-id', b'file2-id'])
2247
source.commit('new files')
2248
target = self.make_branch_and_tree('target')
2250
self.addCleanup(target.unlock)
2251
# We make use of the fact that DirState caches its cutoff time. So we
2252
# set the 'safe' time to one minute in the future.
2253
state = target.current_dirstate()
2254
state._cutoff_time = time.time() + 60
2255
build_tree(source.basis_tree(), target)
2256
entry1_sha = osutils.sha_file_by_name('source/file1')
2257
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2258
# entry[1] is the state information, entry[1][0] is the state of the
2259
# working tree, entry[1][0][1] is the sha value for the current working
2261
entry1 = state._get_entry(0, path_utf8='file1')
2262
self.assertEqual(entry1_sha, entry1[1][0][1])
2263
# The 'size' field must also be set.
2264
self.assertEqual(25, entry1[1][0][2])
2265
entry1_state = entry1[1][0]
2266
entry2 = state._get_entry(0, path_utf8='dir/file2')
2267
self.assertEqual(entry2_sha, entry2[1][0][1])
2268
self.assertEqual(29, entry2[1][0][2])
2269
entry2_state = entry2[1][0]
2270
# Now, make sure that we don't have to re-read the content. The
2271
# packed_stat should match exactly.
2272
self.assertEqual(entry1_sha, target.get_file_sha1('file1', b'file1-id'))
2273
self.assertEqual(entry2_sha,
2274
target.get_file_sha1('dir/file2', b'file2-id'))
2275
self.assertEqual(entry1_state, entry1[1][0])
2276
self.assertEqual(entry2_state, entry2[1][0])
1989
2279
class TestCommitTransform(tests.TestCaseWithTransport):
2051
2341
def test_add_files(self):
2052
2342
branch, tt = self.get_branch_and_transform()
2053
tt.new_file('file', tt.root, 'contents', 'file-id')
2343
tt.new_file('file', tt.root, b'contents', b'file-id')
2054
2344
trans_id = tt.new_directory('dir', tt.root, 'dir-id')
2055
2345
if SymlinkFeature.available():
2056
2346
tt.new_symlink('symlink', trans_id, 'target', 'symlink-id')
2057
2347
rev = tt.commit(branch, 'message')
2058
2348
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'))
2349
self.assertEqual('file', tree.id2path(b'file-id'))
2350
self.assertEqual(b'contents', tree.get_file_text('file', b'file-id'))
2351
self.assertEqual('dir', tree.id2path(b'dir-id'))
2062
2352
if SymlinkFeature.available():
2063
self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2064
self.assertEqual('target', tree.get_symlink_target('symlink-id'))
2353
self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
2354
self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
2066
2356
def test_add_unversioned(self):
2067
2357
branch, tt = self.get_branch_and_transform()
2068
tt.new_file('file', tt.root, 'contents')
2358
tt.new_file('file', tt.root, b'contents')
2069
2359
self.assertRaises(errors.StrictCommitFailed, tt.commit, branch,
2070
2360
'message', strict=True)
2072
2362
def test_modify_strict(self):
2073
2363
branch, tt = self.get_branch_and_transform()
2074
tt.new_file('file', tt.root, 'contents', 'file-id')
2364
tt.new_file('file', tt.root, b'contents', b'file-id')
2075
2365
tt.commit(branch, 'message', strict=True)
2076
2366
tt = TransformPreview(branch.basis_tree())
2077
2367
self.addCleanup(tt.finalize)
2078
2368
trans_id = tt.trans_id_file_id('file-id')
2079
2369
tt.delete_contents(trans_id)
2080
tt.create_file('contents', trans_id)
2370
tt.create_file([b'contents'], trans_id)
2081
2371
tt.commit(branch, 'message', strict=True)
2083
2373
def test_commit_malformed(self):
2088
2378
branch, tt = self.get_branch_and_transform()
2089
2379
parent_id = tt.trans_id_file_id('parent-id')
2090
tt.new_file('file', parent_id, 'contents', 'file-id')
2380
tt.new_file('file', parent_id, b'contents', b'file-id')
2091
2381
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~')
2384
def test_commit_rich_revision_data(self):
2385
branch, tt = self.get_branch_and_transform()
2386
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2387
committer='me <me@example.com>',
2388
revprops={'foo': 'bar'}, revision_id=b'revid-1',
2389
authors=['Author1 <author1@example.com>',
2390
'Author2 <author2@example.com>',
2392
self.assertEqual('revid-1', rev_id)
2393
revision = branch.repository.get_revision(rev_id)
2394
self.assertEqual(1, revision.timestamp)
2395
self.assertEqual(43201, revision.timezone)
2396
self.assertEqual('me <me@example.com>', revision.committer)
2397
self.assertEqual(['Author1 <author1@example.com>',
2398
'Author2 <author2@example.com>'],
2399
revision.get_apparent_authors())
2400
del revision.properties['authors']
2401
self.assertEqual({'foo': 'bar',
2402
'branch-nick': 'tree'},
2403
revision.properties)
2405
def test_no_explicit_revprops(self):
2406
branch, tt = self.get_branch_and_transform()
2407
rev_id = tt.commit(branch, 'message', authors=[
2408
'Author1 <author1@example.com>',
2409
'Author2 <author2@example.com>', ])
2410
revision = branch.repository.get_revision(rev_id)
2411
self.assertEqual(['Author1 <author1@example.com>',
2412
'Author2 <author2@example.com>'],
2413
revision.get_apparent_authors())
2414
self.assertEqual('tree', revision.properties['branch-nick'])
2128
2417
class TestFileMover(tests.TestCaseWithTransport):
2240
2529
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2530
self.assertRaises(Bogus, tt.apply,
2242
2531
_mover=self.ExceptionFileMover(bad_target='d'))
2243
self.failUnlessExists('a')
2244
self.failUnlessExists('a/b')
2246
def test_resolve_no_parent(self):
2532
self.assertPathExists('a')
2533
self.assertPathExists('a/b')
2536
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2537
"""Ensure treetransform creation errors can be safely cleaned up after"""
2539
def _override_globals_in_method(self, instance, method_name, globals):
2540
"""Replace method on instance with one with updated globals"""
2542
func = getattr(instance, method_name).__func__
2543
new_globals = dict(func.__globals__)
2544
new_globals.update(globals)
2545
new_func = types.FunctionType(func.__code__, new_globals,
2546
func.__name__, func.__defaults__)
2547
setattr(instance, method_name,
2548
types.MethodType(new_func, instance, instance.__class__))
2549
self.addCleanup(delattr, instance, method_name)
2552
def _fake_open_raises_before(name, mode):
2553
"""Like open() but raises before doing anything"""
2557
def _fake_open_raises_after(name, mode):
2558
"""Like open() but raises after creating file without returning"""
2559
open(name, mode).close()
2562
def create_transform_and_root_trans_id(self):
2563
"""Setup a transform creating a file in limbo"""
2564
tree = self.make_branch_and_tree('.')
2565
tt = TreeTransform(tree)
2566
return tt, tt.create_path("a", tt.root)
2568
def create_transform_and_subdir_trans_id(self):
2569
"""Setup a transform creating a directory containing a file in limbo"""
2570
tree = self.make_branch_and_tree('.')
2571
tt = TreeTransform(tree)
2572
d_trans_id = tt.create_path("d", tt.root)
2573
tt.create_directory(d_trans_id)
2574
f_trans_id = tt.create_path("a", d_trans_id)
2575
tt.adjust_path("a", d_trans_id, f_trans_id)
2576
return tt, f_trans_id
2578
def test_root_create_file_open_raises_before_creation(self):
2579
tt, trans_id = self.create_transform_and_root_trans_id()
2580
self._override_globals_in_method(tt, "create_file",
2581
{"open": self._fake_open_raises_before})
2582
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2583
path = tt._limbo_name(trans_id)
2584
self.assertPathDoesNotExist(path)
2586
self.assertPathDoesNotExist(tt._limbodir)
2588
def test_root_create_file_open_raises_after_creation(self):
2589
tt, trans_id = self.create_transform_and_root_trans_id()
2590
self._override_globals_in_method(tt, "create_file",
2591
{"open": self._fake_open_raises_after})
2592
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2593
path = tt._limbo_name(trans_id)
2594
self.assertPathExists(path)
2596
self.assertPathDoesNotExist(path)
2597
self.assertPathDoesNotExist(tt._limbodir)
2599
def test_subdir_create_file_open_raises_before_creation(self):
2600
tt, trans_id = self.create_transform_and_subdir_trans_id()
2601
self._override_globals_in_method(tt, "create_file",
2602
{"open": self._fake_open_raises_before})
2603
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2604
path = tt._limbo_name(trans_id)
2605
self.assertPathDoesNotExist(path)
2607
self.assertPathDoesNotExist(tt._limbodir)
2609
def test_subdir_create_file_open_raises_after_creation(self):
2610
tt, trans_id = self.create_transform_and_subdir_trans_id()
2611
self._override_globals_in_method(tt, "create_file",
2612
{"open": self._fake_open_raises_after})
2613
self.assertRaises(RuntimeError, tt.create_file, [b"contents"], trans_id)
2614
path = tt._limbo_name(trans_id)
2615
self.assertPathExists(path)
2617
self.assertPathDoesNotExist(path)
2618
self.assertPathDoesNotExist(tt._limbodir)
2620
def test_rename_in_limbo_rename_raises_after_rename(self):
2621
tt, trans_id = self.create_transform_and_root_trans_id()
2622
parent1 = tt.new_directory('parent1', tt.root)
2623
child1 = tt.new_file('child1', parent1, b'contents')
2624
parent2 = tt.new_directory('parent2', tt.root)
2626
class FakeOSModule(object):
2627
def rename(self, old, new):
2630
self._override_globals_in_method(tt, "_rename_in_limbo",
2631
{"os": FakeOSModule()})
2633
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2634
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2635
self.assertPathExists(path)
2637
self.assertPathDoesNotExist(path)
2638
self.assertPathDoesNotExist(tt._limbodir)
2640
def test_rename_in_limbo_rename_raises_before_rename(self):
2641
tt, trans_id = self.create_transform_and_root_trans_id()
2642
parent1 = tt.new_directory('parent1', tt.root)
2643
child1 = tt.new_file('child1', parent1, b'contents')
2644
parent2 = tt.new_directory('parent2', tt.root)
2646
class FakeOSModule(object):
2647
def rename(self, old, new):
2649
self._override_globals_in_method(tt, "_rename_in_limbo",
2650
{"os": FakeOSModule()})
2652
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2653
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2654
self.assertPathExists(path)
2656
self.assertPathDoesNotExist(path)
2657
self.assertPathDoesNotExist(tt._limbodir)
2660
class TestTransformMissingParent(tests.TestCaseWithTransport):
2662
def make_tt_with_versioned_dir(self):
2247
2663
wt = self.make_branch_and_tree('.')
2664
self.build_tree(['dir/',])
2665
wt.add(['dir'], [b'dir-id'])
2666
wt.commit('Create dir')
2248
2667
tt = TreeTransform(wt)
2249
2668
self.addCleanup(tt.finalize)
2250
parent = tt.trans_id_file_id('parent-id')
2251
tt.new_file('file', parent, 'Contents')
2252
resolve_conflicts(tt)
2671
def test_resolve_create_parent_for_versioned_file(self):
2672
wt, tt = self.make_tt_with_versioned_dir()
2673
dir_tid = tt.trans_id_tree_path('dir')
2674
file_tid = tt.new_file('file', dir_tid, b'Contents', file_id=b'file-id')
2675
tt.delete_contents(dir_tid)
2676
tt.unversion_file(dir_tid)
2677
conflicts = resolve_conflicts(tt)
2678
# one conflict for the missing directory, one for the unversioned
2680
self.assertLength(2, conflicts)
2682
def test_non_versioned_file_create_conflict(self):
2683
wt, tt = self.make_tt_with_versioned_dir()
2684
dir_tid = tt.trans_id_tree_path('dir')
2685
tt.new_file('file', dir_tid, b'Contents')
2686
tt.delete_contents(dir_tid)
2687
tt.unversion_file(dir_tid)
2688
conflicts = resolve_conflicts(tt)
2689
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2690
self.assertLength(1, conflicts)
2691
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2255
2695
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2256
2696
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2257
2697
(False, False))
2258
2698
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
('', ''), ('directory', 'directory'), (False, None))
2699
('', ''), ('directory', 'directory'), (False, False))
2262
2702
class TestTransformPreview(tests.TestCaseWithTransport):
2264
2704
def create_tree(self):
2265
2705
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')
2706
self.build_tree_contents([('a', b'content 1')])
2707
tree.set_root_id(b'TREE_ROOT')
2708
tree.add('a', b'a-id')
2709
tree.commit('rev1', rev_id=b'rev1')
2710
return tree.branch.repository.revision_tree(b'rev1')
2272
2712
def get_empty_preview(self):
2273
2713
repository = self.make_repository('repo')
2377
2817
revision_tree = self.create_tree()
2378
2818
preview = TransformPreview(revision_tree)
2379
2819
self.addCleanup(preview.finalize)
2380
preview.new_file('file', preview.root, 'contents', 'file-id')
2820
preview.new_file('file', preview.root, b'contents', b'file-id')
2381
2821
preview.new_directory('directory', preview.root, 'dir-id')
2382
2822
preview_tree = preview.get_preview_tree()
2383
self.assertEqual('file', preview_tree.kind('file-id'))
2384
self.assertEqual('directory', preview_tree.kind('dir-id'))
2823
self.assertEqual('file', preview_tree.kind('file'))
2824
self.assertEqual('directory', preview_tree.kind('directory'))
2386
2826
def test_get_file_mtime(self):
2387
2827
preview = self.get_empty_preview()
2388
file_trans_id = preview.new_file('file', preview.root, 'contents',
2828
file_trans_id = preview.new_file('file', preview.root, b'contents',
2390
2830
limbo_path = preview._limbo_name(file_trans_id)
2391
2831
preview_tree = preview.get_preview_tree()
2392
2832
self.assertEqual(os.stat(limbo_path).st_mtime,
2393
preview_tree.get_file_mtime('file-id'))
2833
preview_tree.get_file_mtime('file', b'file-id'))
2395
2835
def test_get_file_mtime_renamed(self):
2396
2836
work_tree = self.make_branch_and_tree('tree')
2397
2837
self.build_tree(['tree/file'])
2398
work_tree.add('file', 'file-id')
2838
work_tree.add('file', b'file-id')
2399
2839
preview = TransformPreview(work_tree)
2400
2840
self.addCleanup(preview.finalize)
2401
file_trans_id = preview.trans_id_tree_file_id('file-id')
2841
file_trans_id = preview.trans_id_tree_path('file')
2402
2842
preview.adjust_path('renamed', preview.root, file_trans_id)
2403
2843
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')
2844
preview_mtime = preview_tree.get_file_mtime('renamed', b'file-id')
2845
work_mtime = work_tree.get_file_mtime('file', b'file-id')
2847
def test_get_file_size(self):
2848
work_tree = self.make_branch_and_tree('tree')
2849
self.build_tree_contents([('tree/old', b'old')])
2850
work_tree.add('old', b'old-id')
2851
preview = TransformPreview(work_tree)
2852
self.addCleanup(preview.finalize)
2853
new_id = preview.new_file('name', preview.root, b'contents', b'new-id',
2855
tree = preview.get_preview_tree()
2856
self.assertEqual(len('old'), tree.get_file_size('old'))
2857
self.assertEqual(len('contents'), tree.get_file_size('name'))
2407
2859
def test_get_file(self):
2408
2860
preview = self.get_empty_preview()
2409
preview.new_file('file', preview.root, 'contents', 'file-id')
2861
preview.new_file('file', preview.root, b'contents', b'file-id')
2410
2862
preview_tree = preview.get_preview_tree()
2411
tree_file = preview_tree.get_file('file-id')
2863
tree_file = preview_tree.get_file('file')
2413
2865
self.assertEqual('contents', tree_file.read())
2420
2872
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2421
2873
preview_tree = preview.get_preview_tree()
2422
2874
self.assertEqual('target',
2423
preview_tree.get_symlink_target('symlink-id'))
2875
preview_tree.get_symlink_target('symlink'))
2425
2877
def test_all_file_ids(self):
2426
2878
tree = self.make_branch_and_tree('tree')
2427
2879
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2428
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2880
tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
2429
2881
preview = TransformPreview(tree)
2430
2882
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')
2883
preview.unversion_file(preview.trans_id_file_id(b'b-id'))
2884
c_trans_id = preview.trans_id_file_id(b'c-id')
2433
2885
preview.unversion_file(c_trans_id)
2434
preview.version_file('c-id', c_trans_id)
2886
preview.version_file(b'c-id', c_trans_id)
2435
2887
preview_tree = preview.get_preview_tree()
2436
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2888
self.assertEqual({b'a-id', b'c-id', tree.get_root_id()},
2437
2889
preview_tree.all_file_ids())
2439
2891
def test_path2id_deleted_unchanged(self):
2440
2892
tree = self.make_branch_and_tree('tree')
2441
2893
self.build_tree(['tree/unchanged', 'tree/deleted'])
2442
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2894
tree.add(['unchanged', 'deleted'], [b'unchanged-id', b'deleted-id'])
2443
2895
preview = TransformPreview(tree)
2444
2896
self.addCleanup(preview.finalize)
2445
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2897
preview.unversion_file(preview.trans_id_file_id(b'deleted-id'))
2446
2898
preview_tree = preview.get_preview_tree()
2447
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2448
self.assertIs(None, preview_tree.path2id('deleted'))
2899
self.assertEqual(b'unchanged-id', preview_tree.path2id('unchanged'))
2900
self.assertFalse(preview_tree.is_versioned('deleted'))
2450
2902
def test_path2id_created(self):
2451
2903
tree = self.make_branch_and_tree('tree')
2452
2904
self.build_tree(['tree/unchanged'])
2453
tree.add(['unchanged'], ['unchanged-id'])
2905
tree.add(['unchanged'], [b'unchanged-id'])
2454
2906
preview = TransformPreview(tree)
2455
2907
self.addCleanup(preview.finalize)
2456
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2908
preview.new_file('new', preview.trans_id_file_id(b'unchanged-id'),
2457
2909
'contents', 'new-id')
2458
2910
preview_tree = preview.get_preview_tree()
2459
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2911
self.assertEqual(b'new-id', preview_tree.path2id('unchanged/new'))
2461
2913
def test_path2id_moved(self):
2462
2914
tree = self.make_branch_and_tree('tree')
2463
2915
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2464
2916
tree.add(['old_parent', 'old_parent/child'],
2465
['old_parent-id', 'child-id'])
2917
[b'old_parent-id', b'child-id'])
2466
2918
preview = TransformPreview(tree)
2467
2919
self.addCleanup(preview.finalize)
2468
2920
new_parent = preview.new_directory('new_parent', preview.root,
2470
2922
preview.adjust_path('child', new_parent,
2471
preview.trans_id_file_id('child-id'))
2923
preview.trans_id_file_id(b'child-id'))
2472
2924
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'))
2925
self.assertFalse(preview_tree.is_versioned('old_parent/child'))
2926
self.assertEqual(b'child-id', preview_tree.path2id('new_parent/child'))
2476
2928
def test_path2id_renamed_parent(self):
2477
2929
tree = self.make_branch_and_tree('tree')
2478
2930
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2479
2931
tree.add(['old_name', 'old_name/child'],
2480
['parent-id', 'child-id'])
2932
[b'parent-id', b'child-id'])
2481
2933
preview = TransformPreview(tree)
2482
2934
self.addCleanup(preview.finalize)
2483
2935
preview.adjust_path('new_name', preview.root,
2484
preview.trans_id_file_id('parent-id'))
2936
preview.trans_id_file_id(b'parent-id'))
2485
2937
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'))
2938
self.assertFalse(preview_tree.is_versioned('old_name/child'))
2939
self.assertEqual(b'child-id', preview_tree.path2id('new_name/child'))
2489
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2941
def assertMatchingIterEntries(self, tt, specific_files=None):
2490
2942
preview_tree = tt.get_preview_tree()
2491
2943
preview_result = list(preview_tree.iter_entries_by_dir(
2944
specific_files=specific_files))
2493
2945
tree = tt._tree
2495
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
2947
actual_result = list(tree.iter_entries_by_dir(
2948
specific_files=specific_files))
2496
2949
self.assertEqual(actual_result, preview_result)
2498
2951
def test_iter_entries_by_dir_new(self):
2499
2952
tree = self.make_branch_and_tree('tree')
2500
2953
tt = TreeTransform(tree)
2501
tt.new_file('new', tt.root, 'contents', 'new-id')
2954
tt.new_file('new', tt.root, b'contents', b'new-id')
2502
2955
self.assertMatchingIterEntries(tt)
2504
2957
def test_iter_entries_by_dir_deleted(self):
2505
2958
tree = self.make_branch_and_tree('tree')
2506
2959
self.build_tree(['tree/deleted'])
2507
tree.add('deleted', 'deleted-id')
2960
tree.add('deleted', b'deleted-id')
2508
2961
tt = TreeTransform(tree)
2509
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
2962
tt.delete_contents(tt.trans_id_file_id(b'deleted-id'))
2510
2963
self.assertMatchingIterEntries(tt)
2512
2965
def test_iter_entries_by_dir_unversioned(self):
2513
2966
tree = self.make_branch_and_tree('tree')
2514
2967
self.build_tree(['tree/removed'])
2515
tree.add('removed', 'removed-id')
2968
tree.add('removed', b'removed-id')
2516
2969
tt = TreeTransform(tree)
2517
tt.unversion_file(tt.trans_id_file_id('removed-id'))
2970
tt.unversion_file(tt.trans_id_file_id(b'removed-id'))
2518
2971
self.assertMatchingIterEntries(tt)
2520
2973
def test_iter_entries_by_dir_moved(self):
2521
2974
tree = self.make_branch_and_tree('tree')
2522
2975
self.build_tree(['tree/moved', 'tree/new_parent/'])
2523
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
2976
tree.add(['moved', 'new_parent'], [b'moved-id', b'new_parent-id'])
2524
2977
tt = TreeTransform(tree)
2525
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2526
tt.trans_id_file_id('moved-id'))
2978
tt.adjust_path('moved', tt.trans_id_file_id(b'new_parent-id'),
2979
tt.trans_id_file_id(b'moved-id'))
2527
2980
self.assertMatchingIterEntries(tt)
2529
def test_iter_entries_by_dir_specific_file_ids(self):
2982
def test_iter_entries_by_dir_specific_files(self):
2530
2983
tree = self.make_branch_and_tree('tree')
2531
tree.set_root_id('tree-root-id')
2984
tree.set_root_id(b'tree-root-id')
2532
2985
self.build_tree(['tree/parent/', 'tree/parent/child'])
2533
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
2986
tree.add(['parent', 'parent/child'], [b'parent-id', b'child-id'])
2534
2987
tt = TreeTransform(tree)
2535
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
2988
self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2537
2990
def test_symlink_content_summary(self):
2538
2991
self.requireFeature(SymlinkFeature)
2539
2992
preview = self.get_empty_preview()
2540
preview.new_symlink('path', preview.root, 'target', 'path-id')
2993
preview.new_symlink('path', preview.root, 'target', b'path-id')
2541
2994
summary = preview.get_preview_tree().path_content_summary('path')
2542
2995
self.assertEqual(('symlink', None, None, 'target'), summary)
2611
3064
def test_annotate(self):
2612
3065
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')])
3066
self.build_tree_contents([('tree/file', b'a\n')])
3067
tree.add('file', b'file-id')
3068
tree.commit('a', rev_id=b'one')
3069
self.build_tree_contents([('tree/file', b'a\nb\n')])
2617
3070
preview = TransformPreview(tree)
2618
3071
self.addCleanup(preview.finalize)
2619
file_trans_id = preview.trans_id_file_id('file-id')
3072
file_trans_id = preview.trans_id_file_id(b'file-id')
2620
3073
preview.delete_contents(file_trans_id)
2621
preview.create_file('a\nb\nc\n', file_trans_id)
3074
preview.create_file([b'a\nb\nc\n'], file_trans_id)
2622
3075
preview_tree = preview.get_preview_tree()
2624
3077
('one', 'a\n'),
2625
3078
('me:', 'b\n'),
2626
3079
('me:', 'c\n'),
2628
annotation = preview_tree.annotate_iter('file-id', 'me:')
3081
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2629
3082
self.assertEqual(expected, annotation)
2631
3084
def test_annotate_missing(self):
2632
3085
preview = self.get_empty_preview()
2633
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3086
preview.new_file('file', preview.root, b'a\nb\nc\n', 'file-id')
2634
3087
preview_tree = preview.get_preview_tree()
2636
3089
('me:', 'a\n'),
2637
3090
('me:', 'b\n'),
2638
3091
('me:', 'c\n'),
2640
annotation = preview_tree.annotate_iter('file-id', 'me:')
3093
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2641
3094
self.assertEqual(expected, annotation)
2643
3096
def test_annotate_rename(self):
2644
3097
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')
3098
self.build_tree_contents([('tree/file', b'a\n')])
3099
tree.add('file', b'file-id')
3100
tree.commit('a', rev_id=b'one')
2648
3101
preview = TransformPreview(tree)
2649
3102
self.addCleanup(preview.finalize)
2650
file_trans_id = preview.trans_id_file_id('file-id')
3103
file_trans_id = preview.trans_id_file_id(b'file-id')
2651
3104
preview.adjust_path('newname', preview.root, file_trans_id)
2652
3105
preview_tree = preview.get_preview_tree()
2654
3107
('one', 'a\n'),
2656
annotation = preview_tree.annotate_iter('file-id', 'me:')
3109
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2657
3110
self.assertEqual(expected, annotation)
2659
3112
def test_annotate_deleted(self):
2660
3113
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')])
3114
self.build_tree_contents([('tree/file', b'a\n')])
3115
tree.add('file', b'file-id')
3116
tree.commit('a', rev_id=b'one')
3117
self.build_tree_contents([('tree/file', b'a\nb\n')])
2665
3118
preview = TransformPreview(tree)
2666
3119
self.addCleanup(preview.finalize)
2667
file_trans_id = preview.trans_id_file_id('file-id')
3120
file_trans_id = preview.trans_id_file_id(b'file-id')
2668
3121
preview.delete_contents(file_trans_id)
2669
3122
preview_tree = preview.get_preview_tree()
2670
annotation = preview_tree.annotate_iter('file-id', 'me:')
3123
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2671
3124
self.assertIs(None, annotation)
2673
3126
def test_stored_kind(self):
2674
3127
preview = self.get_empty_preview()
2675
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3128
preview.new_file('file', preview.root, b'a\nb\nc\n', b'file-id')
2676
3129
preview_tree = preview.get_preview_tree()
2677
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3130
self.assertEqual('file', preview_tree.stored_kind('file'))
2679
3132
def test_is_executable(self):
2680
3133
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'))
3134
preview.new_file('file', preview.root, b'a\nb\nc\n', b'file-id')
3135
preview.set_executability(True, preview.trans_id_file_id(b'file-id'))
2683
3136
preview_tree = preview.get_preview_tree()
2684
self.assertEqual(True, preview_tree.is_executable('file-id'))
3137
self.assertEqual(True, preview_tree.is_executable('file'))
2686
3139
def test_get_set_parent_ids(self):
2687
3140
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2688
3141
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())
3142
preview_tree.set_parent_ids([b'rev-1'])
3143
self.assertEqual([b'rev-1'], preview_tree.get_parent_ids())
2692
3145
def test_plan_file_merge(self):
2693
3146
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')
3147
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3148
work_a.add('file', b'file-id')
2696
3149
base_id = work_a.commit('base version')
2697
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3150
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2698
3151
preview = TransformPreview(work_a)
2699
3152
self.addCleanup(preview.finalize)
2700
trans_id = preview.trans_id_file_id('file-id')
3153
trans_id = preview.trans_id_file_id(b'file-id')
2701
3154
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')])
3155
preview.create_file([b'b\nc\nd\ne\n'], trans_id)
3156
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2704
3157
tree_a = preview.get_preview_tree()
2705
3158
tree_a.set_parent_ids([base_id])
2706
3159
self.assertEqual([
2788
3241
tt = merger.make_merger().make_preview_transform()
2789
3242
self.addCleanup(tt.finalize)
2790
3243
final_tree = tt.get_preview_tree()
2791
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3246
final_tree.get_file_text(final_tree.id2path(b'file-id')))
2793
3248
def test_merge_preview_into_workingtree(self):
2794
3249
tree = self.make_branch_and_tree('tree')
2795
tree.set_root_id('TREE_ROOT')
3250
tree.set_root_id(b'TREE_ROOT')
2796
3251
tt = TransformPreview(tree)
2797
3252
self.addCleanup(tt.finalize)
2798
tt.new_file('name', tt.root, 'content', 'file-id')
3253
tt.new_file('name', tt.root, b'content', b'file-id')
2799
3254
tree2 = self.make_branch_and_tree('tree2')
2800
tree2.set_root_id('TREE_ROOT')
3255
tree2.set_root_id(b'TREE_ROOT')
2801
3256
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
None, tree.basis_tree())
2803
3258
merger.merge_type = Merge3Merger
2804
3259
merger.do_merge()
2806
3261
def test_merge_preview_into_workingtree_handles_conflicts(self):
2807
3262
tree = self.make_branch_and_tree('tree')
2808
self.build_tree_contents([('tree/foo', 'bar')])
2809
tree.add('foo', 'foo-id')
3263
self.build_tree_contents([('tree/foo', b'bar')])
3264
tree.add('foo', b'foo-id')
2810
3265
tree.commit('foo')
2811
3266
tt = TransformPreview(tree)
2812
3267
self.addCleanup(tt.finalize)
2813
trans_id = tt.trans_id_file_id('foo-id')
3268
trans_id = tt.trans_id_file_id(b'foo-id')
2814
3269
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')])
3270
tt.create_file([b'baz'], trans_id)
3271
tree2 = tree.controldir.sprout('tree2').open_workingtree()
3272
self.build_tree_contents([('tree2/foo', b'qux')])
2819
3273
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
pb, tree.basis_tree())
2821
3275
merger.merge_type = Merge3Merger
2822
3276
merger.do_merge()
3278
def test_has_filename(self):
3279
wt = self.make_branch_and_tree('tree')
3280
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3281
tt = TransformPreview(wt)
3282
removed_id = tt.trans_id_tree_path('removed')
3283
tt.delete_contents(removed_id)
3284
tt.new_file('new', tt.root, b'contents')
3285
modified_id = tt.trans_id_tree_path('modified')
3286
tt.delete_contents(modified_id)
3287
tt.create_file([b'modified-contents'], modified_id)
3288
self.addCleanup(tt.finalize)
3289
tree = tt.get_preview_tree()
3290
self.assertTrue(tree.has_filename('unmodified'))
3291
self.assertFalse(tree.has_filename('not-present'))
3292
self.assertFalse(tree.has_filename('removed'))
3293
self.assertTrue(tree.has_filename('new'))
3294
self.assertTrue(tree.has_filename('modified'))
2824
3296
def test_is_executable(self):
2825
3297
tree = self.make_branch_and_tree('tree')
2826
3298
preview = TransformPreview(tree)
2827
3299
self.addCleanup(preview.finalize)
2828
preview.new_file('foo', preview.root, 'bar', 'baz-id')
3300
preview.new_file('foo', preview.root, b'bar', 'baz-id')
2829
3301
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'))
3302
self.assertEqual(False, preview_tree.is_executable('tree/foo', 'baz-id'))
3303
self.assertEqual(False, preview_tree.is_executable('tree/foo'))
2834
3305
def test_commit_preview_tree(self):
2835
3306
tree = self.make_branch_and_tree('tree')
3112
3583
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3114
3585
def test_get_parents_lines(self):
3115
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3116
LINES_TWO = 'z\nbb\nx\ndd\n'
3586
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3587
LINES_TWO = b'z\nbb\nx\ndd\n'
3117
3588
tree = self.make_branch_and_tree('tree')
3118
3589
self.build_tree_contents([('tree/file', LINES_ONE)])
3119
tree.add('file', 'file-id')
3590
tree.add('file', b'file-id')
3120
3591
tt = self.get_preview(tree)
3121
3592
trans_id = tt.trans_id_tree_path('file')
3122
3593
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3123
3594
tt._get_parents_lines(trans_id))
3125
3596
def test_get_parents_texts(self):
3126
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3127
LINES_TWO = 'z\nbb\nx\ndd\n'
3597
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3598
LINES_TWO = b'z\nbb\nx\ndd\n'
3128
3599
tree = self.make_branch_and_tree('tree')
3129
3600
self.build_tree_contents([('tree/file', LINES_ONE)])
3130
tree.add('file', 'file-id')
3601
tree.add('file', b'file-id')
3131
3602
tt = self.get_preview(tree)
3132
3603
trans_id = tt.trans_id_tree_path('file')
3133
3604
self.assertEqual((LINES_ONE,),
3134
3605
tt._get_parents_texts(trans_id))
3608
class TestOrphan(tests.TestCaseWithTransport):
3610
def test_no_orphan_for_transform_preview(self):
3611
tree = self.make_branch_and_tree('tree')
3612
tt = transform.TransformPreview(tree)
3613
self.addCleanup(tt.finalize)
3614
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3616
def _set_orphan_policy(self, wt, policy):
3617
wt.branch.get_config_stack().set('transform.orphan_policy',
3620
def _prepare_orphan(self, wt):
3621
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3622
wt.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
3623
wt.commit('add dir and file ignoring foo')
3624
tt = transform.TreeTransform(wt)
3625
self.addCleanup(tt.finalize)
3626
# dir and bar are deleted
3627
dir_tid = tt.trans_id_tree_path('dir')
3628
file_tid = tt.trans_id_tree_path('dir/file')
3629
orphan_tid = tt.trans_id_tree_path('dir/foo')
3630
tt.delete_contents(file_tid)
3631
tt.unversion_file(file_tid)
3632
tt.delete_contents(dir_tid)
3633
tt.unversion_file(dir_tid)
3634
# There should be a conflict because dir still contain foo
3635
raw_conflicts = tt.find_conflicts()
3636
self.assertLength(1, raw_conflicts)
3637
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3638
return tt, orphan_tid
3640
def test_new_orphan_created(self):
3641
wt = self.make_branch_and_tree('.')
3642
self._set_orphan_policy(wt, 'move')
3643
tt, orphan_tid = self._prepare_orphan(wt)
3646
warnings.append(args[0] % args[1:])
3647
self.overrideAttr(trace, 'warning', warning)
3648
remaining_conflicts = resolve_conflicts(tt)
3649
self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
3651
# Yeah for resolved conflicts !
3652
self.assertLength(0, remaining_conflicts)
3653
# We have a new orphan
3654
self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
3655
self.assertEqual('brz-orphans',
3656
tt.final_name(tt.final_parent(orphan_tid)))
3658
def test_never_orphan(self):
3659
wt = self.make_branch_and_tree('.')
3660
self._set_orphan_policy(wt, 'conflict')
3661
tt, orphan_tid = self._prepare_orphan(wt)
3662
remaining_conflicts = resolve_conflicts(tt)
3663
self.assertLength(1, remaining_conflicts)
3664
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3665
remaining_conflicts.pop())
3667
def test_orphan_error(self):
3668
def bogus_orphan(tt, orphan_id, parent_id):
3669
raise transform.OrphaningError(tt.final_name(orphan_id),
3670
tt.final_name(parent_id))
3671
transform.orphaning_registry.register('bogus', bogus_orphan,
3672
'Raise an error when orphaning')
3673
wt = self.make_branch_and_tree('.')
3674
self._set_orphan_policy(wt, 'bogus')
3675
tt, orphan_tid = self._prepare_orphan(wt)
3676
remaining_conflicts = resolve_conflicts(tt)
3677
self.assertLength(1, remaining_conflicts)
3678
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3679
remaining_conflicts.pop())
3681
def test_unknown_orphan_policy(self):
3682
wt = self.make_branch_and_tree('.')
3683
# Set a fictional policy nobody ever implemented
3684
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3685
tt, orphan_tid = self._prepare_orphan(wt)
3688
warnings.append(args[0] % args[1:])
3689
self.overrideAttr(trace, 'warning', warning)
3690
remaining_conflicts = resolve_conflicts(tt)
3691
# We fallback to the default policy which create a conflict
3692
self.assertLength(1, remaining_conflicts)
3693
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3694
remaining_conflicts.pop())
3695
self.assertLength(1, warnings)
3696
self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3699
class TestTransformHooks(tests.TestCaseWithTransport):
3702
super(TestTransformHooks, self).setUp()
3703
self.wt = self.make_branch_and_tree('.')
3706
def get_transform(self):
3707
transform = TreeTransform(self.wt)
3708
self.addCleanup(transform.finalize)
3709
return transform, transform.root
3711
def test_pre_commit_hooks(self):
3713
def record_pre_transform(tree, tt):
3714
calls.append((tree, tt))
3715
MutableTree.hooks.install_named_hook('pre_transform',
3716
record_pre_transform, "Pre transform")
3717
transform, root = self.get_transform()
3718
old_root_id = transform.tree_file_id(root)
3720
self.assertEqual(old_root_id, self.wt.get_root_id())
3721
self.assertEqual([(self.wt, transform)], calls)
3723
def test_post_commit_hooks(self):
3725
def record_post_transform(tree, tt):
3726
calls.append((tree, tt))
3727
MutableTree.hooks.install_named_hook('post_transform',
3728
record_post_transform, "Post transform")
3729
transform, root = self.get_transform()
3730
old_root_id = transform.tree_file_id(root)
3732
self.assertEqual(old_root_id, self.wt.get_root_id())
3733
self.assertEqual([(self.wt, transform)], calls)
3736
class TestLinkTree(tests.TestCaseWithTransport):
3738
_test_needs_features = [HardlinkFeature]
3741
tests.TestCaseWithTransport.setUp(self)
3742
self.parent_tree = self.make_branch_and_tree('parent')
3743
self.parent_tree.lock_write()
3744
self.addCleanup(self.parent_tree.unlock)
3745
self.build_tree_contents([('parent/foo', b'bar')])
3746
self.parent_tree.add('foo')
3747
self.parent_tree.commit('added foo')
3748
child_controldir = self.parent_tree.controldir.sprout('child')
3749
self.child_tree = child_controldir.open_workingtree()
3751
def hardlinked(self):
3752
parent_stat = os.lstat(self.parent_tree.abspath('foo'))
3753
child_stat = os.lstat(self.child_tree.abspath('foo'))
3754
return parent_stat.st_ino == child_stat.st_ino
3756
def test_link_fails_if_modified(self):
3757
"""If the file to be linked has modified text, don't link."""
3758
self.build_tree_contents([('child/foo', b'baz')])
3759
transform.link_tree(self.child_tree, self.parent_tree)
3760
self.assertFalse(self.hardlinked())
3762
def test_link_fails_if_execute_bit_changed(self):
3763
"""If the file to be linked has modified execute bit, don't link."""
3764
tt = TreeTransform(self.child_tree)
3766
trans_id = tt.trans_id_tree_path('foo')
3767
tt.set_executability(True, trans_id)
3771
transform.link_tree(self.child_tree, self.parent_tree)
3772
self.assertFalse(self.hardlinked())
3774
def test_link_succeeds_if_unmodified(self):
3775
"""If the file to be linked is unmodified, link"""
3776
transform.link_tree(self.child_tree, self.parent_tree)
3777
self.assertTrue(self.hardlinked())
added
removed
breezy/tests/test_transform.py
