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 (
70
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)
74
from ..transform import (
60
88
class TestTreeTransform(tests.TestCaseWithTransport):
63
91
super(TestTreeTransform, self).setUp()
64
self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
92
self.wt = self.make_branch_and_tree('.', format='development-subtree')
67
95
def get_transform(self):
124
162
transform.set_executability(False, trans_id2)
125
163
transform.version_file('my_pretties2', trans_id2)
126
164
modified_paths = transform.apply().modified_paths
127
self.assertEqual('contents', self.wt.get_file_byname('name').read())
165
self.assertEqual('contents', self.wt.get_file('name').read())
128
166
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)
167
self.assertIs(self.wt.is_executable('name'), True)
168
self.assertIs(self.wt.is_executable('name2'), False)
131
169
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
132
170
self.assertEqual(len(modified_paths), 3)
133
tree_mod_paths = [self.wt.id2abspath(f) for f in
171
tree_mod_paths = [self.wt.abspath(self.wt.id2path(f)) for f in
134
172
('ozzie', 'my_pretties', 'my_pretties2')]
135
173
self.assertSubset(tree_mod_paths, modified_paths)
136
174
# is it safe to finalize repeatedly?
137
175
transform.finalize()
138
176
transform.finalize()
178
def test_apply_informs_tree_of_observed_sha1(self):
179
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
180
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
183
orig = self.wt._observed_sha1
184
def _observed_sha1(*args):
187
self.wt._observed_sha1 = _observed_sha1
189
self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
192
def test_create_file_caches_sha1(self):
193
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
194
trans_id = trans.create_path('file1', root)
195
trans.create_file(contents, trans_id, sha1=sha1)
196
st_val = osutils.lstat(trans._limbo_name(trans_id))
197
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
198
self.assertEqual(o_sha1, sha1)
199
self.assertEqualStat(o_st_val, st_val)
201
def test__apply_insertions_updates_sha1(self):
202
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
203
trans_id = trans.create_path('file1', root)
204
trans.create_file(contents, trans_id, sha1=sha1)
205
st_val = osutils.lstat(trans._limbo_name(trans_id))
206
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
207
self.assertEqual(o_sha1, sha1)
208
self.assertEqualStat(o_st_val, st_val)
209
creation_mtime = trans._creation_mtime + 10.0
210
# We fake a time difference from when the file was created until now it
211
# is being renamed by using os.utime. Note that the change we actually
212
# want to see is the real ctime change from 'os.rename()', but as long
213
# as we observe a new stat value, we should be fine.
214
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
216
new_st_val = osutils.lstat(self.wt.abspath('file1'))
217
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
218
self.assertEqual(o_sha1, sha1)
219
self.assertEqualStat(o_st_val, new_st_val)
220
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
222
def test_new_file_caches_sha1(self):
223
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
224
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
226
st_val = osutils.lstat(trans._limbo_name(trans_id))
227
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
228
self.assertEqual(o_sha1, sha1)
229
self.assertEqualStat(o_st_val, st_val)
231
def test_cancel_creation_removes_observed_sha1(self):
232
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
233
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
235
self.assertTrue(trans_id in trans._observed_sha1s)
236
trans.cancel_creation(trans_id)
237
self.assertFalse(trans_id in trans._observed_sha1s)
140
239
def test_create_files_same_timestamp(self):
141
240
transform, root = self.get_transform()
142
241
self.wt.lock_tree_write()
163
262
def test_change_root_id(self):
164
263
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')
264
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
265
transform.new_directory('', ROOT_PARENT, b'new-root-id')
167
266
transform.delete_contents(root)
168
267
transform.unversion_file(root)
169
268
transform.fixup_new_roots()
170
269
transform.apply()
171
self.assertEqual('new-root-id', self.wt.get_root_id())
270
self.assertEqual(b'new-root-id', self.wt.get_root_id())
173
272
def test_change_root_id_add_files(self):
174
273
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')
274
self.assertNotEqual(b'new-root-id', self.wt.get_root_id())
275
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
177
276
transform.new_file('file', new_trans_id, ['new-contents\n'],
179
278
transform.delete_contents(root)
180
279
transform.unversion_file(root)
181
280
transform.fixup_new_roots()
182
281
transform.apply()
183
self.assertEqual('new-root-id', self.wt.get_root_id())
184
self.assertEqual('new-file-id', self.wt.path2id('file'))
282
self.assertEqual(b'new-root-id', self.wt.get_root_id())
283
self.assertEqual(b'new-file-id', self.wt.path2id('file'))
185
284
self.assertFileEqual('new-contents\n', self.wt.abspath('file'))
187
286
def test_add_two_roots(self):
188
287
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)
288
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
289
new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
290
self.assertRaises(ValueError, transform.fixup_new_roots)
292
def test_retain_existing_root(self):
293
tt, root = self.get_transform()
295
tt.new_directory('', ROOT_PARENT, b'new-root-id')
297
self.assertNotEqual(b'new-root-id', tt.final_file_id(tt.root))
299
def test_retain_existing_root_added_file(self):
300
tt, root = self.get_transform()
301
new_trans_id = tt.new_directory('', ROOT_PARENT, b'new-root-id')
302
child = tt.new_directory('child', new_trans_id, b'child-id')
304
self.assertEqual(tt.root, tt.final_parent(child))
306
def test_add_unversioned_root(self):
307
transform, root = self.get_transform()
308
new_trans_id = transform.new_directory('', ROOT_PARENT, None)
309
transform.delete_contents(transform.root)
310
transform.fixup_new_roots()
311
self.assertNotIn(transform.root, transform._new_id)
313
def test_remove_root_fixup(self):
314
transform, root = self.get_transform()
315
old_root_id = self.wt.get_root_id()
316
self.assertNotEqual(b'new-root-id', old_root_id)
317
transform.delete_contents(root)
318
transform.unversion_file(root)
319
transform.fixup_new_roots()
321
self.assertEqual(old_root_id, self.wt.get_root_id())
323
transform, root = self.get_transform()
324
new_trans_id = transform.new_directory('', ROOT_PARENT, b'new-root-id')
325
new_trans_id = transform.new_directory('', ROOT_PARENT, b'alt-root-id')
326
self.assertRaises(ValueError, transform.fixup_new_roots)
328
def test_fixup_new_roots_permits_empty_tree(self):
329
transform, root = self.get_transform()
330
transform.delete_contents(root)
331
transform.unversion_file(root)
332
transform.fixup_new_roots()
333
self.assertIs(None, transform.final_kind(root))
334
self.assertIs(None, transform.final_file_id(root))
336
def test_apply_retains_root_directory(self):
337
# Do not attempt to delete the physical root directory, because that
339
transform, root = self.get_transform()
341
transform.delete_contents(root)
342
e = self.assertRaises(AssertionError, self.assertRaises,
343
errors.TransformRenameFailed,
345
self.assertContainsRe('TransformRenameFailed not raised', str(e))
347
def test_apply_retains_file_id(self):
348
transform, root = self.get_transform()
349
old_root_id = transform.tree_file_id(root)
350
transform.unversion_file(root)
352
self.assertEqual(old_root_id, self.wt.get_root_id())
193
354
def test_hardlink(self):
194
355
self.requireFeature(HardlinkFeature)
471
632
create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
472
633
create_tree.apply()
474
mangle_tree,root = self.get_transform()
635
mangle_tree, root = self.get_transform()
475
636
root = mangle_tree.root
477
name1 = mangle_tree.trans_id_tree_file_id('name1')
478
name2 = mangle_tree.trans_id_tree_file_id('name2')
638
name1 = mangle_tree.trans_id_tree_path('name1')
639
name2 = mangle_tree.trans_id_tree_path('name2')
479
640
mangle_tree.adjust_path('name2', root, name1)
480
641
mangle_tree.adjust_path('name1', root, name2)
482
643
#tests for deleting parent directories
483
ddir = mangle_tree.trans_id_tree_file_id('ddir')
644
ddir = mangle_tree.trans_id_tree_path('dying_directory')
484
645
mangle_tree.delete_contents(ddir)
485
dfile = mangle_tree.trans_id_tree_file_id('dfile')
646
dfile = mangle_tree.trans_id_tree_path('dying_directory/dying_file')
486
647
mangle_tree.delete_versioned(dfile)
487
648
mangle_tree.unversion_file(dfile)
488
mfile = mangle_tree.trans_id_tree_file_id('mfile')
649
mfile = mangle_tree.trans_id_tree_path('dying_directory/moving_file')
489
650
mangle_tree.adjust_path('mfile', root, mfile)
491
652
#tests for adding parent directories
492
653
newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
493
mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
654
mfile2 = mangle_tree.trans_id_tree_path('moving_file2')
494
655
mangle_tree.adjust_path('mfile2', newdir, mfile2)
495
656
mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
496
657
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
499
660
mangle_tree.apply()
500
661
self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
501
662
self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
502
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
663
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
503
664
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
504
665
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'))
666
self.assertEqual(self.wt.id2path(b'mfile2'), 'new_directory/mfile2')
667
self.assertEqual(self.wt.path2id('new_directory/mfile2'), b'mfile2')
668
newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
508
669
self.assertEqual(file(newfile_path).read(), 'hello3')
509
self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
670
self.assertEqual(self.wt.path2id('dying_directory'), b'ddir')
510
671
self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
511
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
672
mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
513
674
def test_both_rename(self):
514
create_tree,root = self.get_transform()
675
create_tree, root = self.get_transform()
515
676
newdir = create_tree.new_directory('selftest', root, 'selftest-id')
516
677
create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
517
678
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')
679
mangle_tree, root = self.get_transform()
680
selftest = mangle_tree.trans_id_tree_path('selftest')
681
blackbox = mangle_tree.trans_id_tree_path('selftest/blackbox.py')
521
682
mangle_tree.adjust_path('test', root, selftest)
522
683
mangle_tree.adjust_path('test_too_much', root, selftest)
523
684
mangle_tree.set_executability(True, blackbox)
524
685
mangle_tree.apply()
526
687
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')
688
create_tree, root = self.get_transform()
689
breezy = create_tree.new_directory('breezy', root, 'breezy-id')
690
tests = create_tree.new_directory('tests', breezy, 'tests-id')
530
691
blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
531
692
create_tree.new_file('test_too_much.py', blackbox, 'hello1',
532
693
'test_too_much-id')
533
694
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)
695
mangle_tree, root = self.get_transform()
696
breezy = mangle_tree.trans_id_tree_path('breezy')
697
tests = mangle_tree.trans_id_tree_path('breezy/tests')
698
test_too_much = mangle_tree.trans_id_tree_path('breezy/tests/blackbox/test_too_much.py')
699
mangle_tree.adjust_path('selftest', breezy, tests)
539
700
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
540
701
mangle_tree.set_executability(True, test_too_much)
541
702
mangle_tree.apply()
543
704
def test_both_rename3(self):
544
create_tree,root = self.get_transform()
705
create_tree, root = self.get_transform()
545
706
tests = create_tree.new_directory('tests', root, 'tests-id')
546
707
create_tree.new_file('test_too_much.py', tests, 'hello1',
547
708
'test_too_much-id')
548
709
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')
710
mangle_tree, root = self.get_transform()
711
tests = mangle_tree.trans_id_tree_path('tests')
712
test_too_much = mangle_tree.trans_id_tree_path('tests/test_too_much.py')
552
713
mangle_tree.adjust_path('selftest', root, tests)
553
714
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
554
715
mangle_tree.set_executability(True, test_too_much)
753
914
def test_resolve_conflicts_wrong_existing_parent_kind(self):
754
915
tt = self.prepare_wrong_parent_kind()
755
916
raw_conflicts = resolve_conflicts(tt)
756
self.assertEqual(set([('non-directory parent', 'Created directory',
757
'new-3')]), raw_conflicts)
917
self.assertEqual({('non-directory parent', 'Created directory',
918
'new-3')}, raw_conflicts)
758
919
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
759
920
self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
760
'parent-id')], cooked_conflicts)
921
b'parent-id')], cooked_conflicts)
762
self.assertEqual(None, self.wt.path2id('parent'))
923
self.assertFalse(self.wt.is_versioned('parent'))
763
924
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
765
926
def test_resolve_conflicts_wrong_new_parent_kind(self):
766
927
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')
928
parent_id = tt.new_directory('parent', root, b'parent-id')
929
tt.new_file('child,', parent_id, 'contents2', b'file-id')
770
931
tt, root = self.get_transform()
771
932
parent_id = tt.trans_id_file_id('parent-id')
772
933
tt.delete_contents(parent_id)
773
934
tt.create_file('contents', parent_id)
774
935
raw_conflicts = resolve_conflicts(tt)
775
self.assertEqual(set([('non-directory parent', 'Created directory',
776
'new-3')]), raw_conflicts)
936
self.assertEqual({('non-directory parent', 'Created directory',
937
'new-3')}, raw_conflicts)
778
self.assertEqual(None, self.wt.path2id('parent'))
939
self.assertFalse(self.wt.is_versioned('parent'))
779
940
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
781
942
def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
830
1006
rename.set_executability(True, myfile)
1009
def test_rename_fails(self):
1010
self.requireFeature(features.not_running_as_root)
1011
# see https://bugs.launchpad.net/bzr/+bug/491763
1012
create, root_id = self.get_transform()
1013
first_dir = create.new_directory('first-dir', root_id, 'first-id')
1014
myfile = create.new_file('myfile', root_id, 'myfile-text',
1017
if os.name == "posix" and sys.platform != "cygwin":
1018
# posix filesystems fail on renaming if the readonly bit is set
1019
osutils.make_readonly(self.wt.abspath('first-dir'))
1020
elif os.name == "nt":
1021
# windows filesystems fail on renaming open files
1022
self.addCleanup(file(self.wt.abspath('myfile')).close)
1024
self.skipTest("Can't force a permissions error on rename")
1025
# now transform to rename
1026
rename_transform, root_id = self.get_transform()
1027
file_trans_id = rename_transform.trans_id_file_id('myfile-id')
1028
dir_id = rename_transform.trans_id_file_id('first-id')
1029
rename_transform.adjust_path('newname', dir_id, file_trans_id)
1030
e = self.assertRaises(errors.TransformRenameFailed,
1031
rename_transform.apply)
1032
# On nix looks like:
1033
# "Failed to rename .../work/.bzr/checkout/limbo/new-1
1034
# to .../first-dir/newname: [Errno 13] Permission denied"
1035
# On windows looks like:
1036
# "Failed to rename .../work/myfile to
1037
# .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
1038
# This test isn't concerned with exactly what the error looks like,
1039
# and the strerror will vary across OS and locales, but the assert
1040
# that the exeception attributes are what we expect
1041
self.assertEqual(e.errno, errno.EACCES)
1042
if os.name == "posix":
1043
self.assertEndsWith(e.to_path, "/first-dir/newname")
1045
self.assertEqual(os.path.basename(e.from_path), "myfile")
833
1047
def test_set_executability_order(self):
834
1048
"""Ensure that executability behaves the same, no matter what order.
1451
1659
return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1662
class TestInventoryAltered(tests.TestCaseWithTransport):
1664
def test_inventory_altered_unchanged(self):
1665
tree = self.make_branch_and_tree('tree')
1666
self.build_tree(['tree/foo'])
1667
tree.add('foo', b'foo-id')
1668
with TransformPreview(tree) as tt:
1669
self.assertEqual([], tt._inventory_altered())
1671
def test_inventory_altered_changed_parent_id(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
tt.unversion_file(tt.root)
1677
tt.version_file(b'new-id', tt.root)
1678
foo_trans_id = tt.trans_id_tree_path('foo')
1679
foo_tuple = ('foo', foo_trans_id)
1680
root_tuple = ('', tt.root)
1681
self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
1683
def test_inventory_altered_noop_changed_parent_id(self):
1684
tree = self.make_branch_and_tree('tree')
1685
self.build_tree(['tree/foo'])
1686
tree.add('foo', b'foo-id')
1687
with TransformPreview(tree) as tt:
1688
tt.unversion_file(tt.root)
1689
tt.version_file(tree.get_root_id(), tt.root)
1690
foo_trans_id = tt.trans_id_tree_path('foo')
1691
self.assertEqual([], tt._inventory_altered())
1454
1694
class TestTransformMerge(TestCaseInTempDir):
1456
1696
def test_text_merge(self):
1490
1730
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
1492
1732
# textual merge
1493
self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
1733
self.assertEqual(this.wt.get_file(this.wt.id2path(b'a')).read(), 'y\nb\nc\nd\bz\n')
1494
1734
# three-way text conflict
1495
self.assertEqual(this.wt.get_file('b').read(),
1735
self.assertEqual(this.wt.get_file(this.wt.id2path(b'b')).read(),
1496
1736
conflict_text('b', 'b2'))
1498
self.assertEqual(this.wt.get_file('c').read(), 'c2')
1738
self.assertEqual(this.wt.get_file(this.wt.id2path(b'c')).read(), 'c2')
1500
self.assertEqual(this.wt.get_file('d').read(), 'd2')
1740
self.assertEqual(this.wt.get_file(this.wt.id2path(b'd')).read(), 'd2')
1501
1741
# Ambigious clean merge
1502
self.assertEqual(this.wt.get_file('e').read(), 'e2')
1742
self.assertEqual(this.wt.get_file(this.wt.id2path(b'e')).read(), 'e2')
1504
self.assertEqual(this.wt.get_file('f').read(), 'f')
1744
self.assertEqual(this.wt.get_file(this.wt.id2path(b'f')).read(), 'f')
1505
1745
# Correct correct results when THIS == OTHER
1506
self.assertEqual(this.wt.get_file('g').read(), 'g')
1746
self.assertEqual(this.wt.get_file(this.wt.id2path(b'g')).read(), 'g')
1507
1747
# Text conflict when THIS & OTHER are text and BASE is dir
1508
self.assertEqual(this.wt.get_file('h').read(),
1748
self.assertEqual(this.wt.get_file(this.wt.id2path(b'h')).read(),
1509
1749
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1510
self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
1750
self.assertEqual(this.wt.get_file('h.THIS').read(),
1511
1751
'1\n2\n3\n4\n')
1512
self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
1752
self.assertEqual(this.wt.get_file('h.OTHER').read(),
1513
1753
'h\ni\nj\nk\n')
1514
1754
self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
1515
self.assertEqual(this.wt.get_file('i').read(),
1755
self.assertEqual(this.wt.get_file(this.wt.id2path(b'i')).read(),
1516
1756
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
1517
self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
1757
self.assertEqual(this.wt.get_file('i.THIS').read(),
1518
1758
'1\n2\n3\n4\n')
1519
self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
1759
self.assertEqual(this.wt.get_file('i.OTHER').read(),
1520
1760
'h\ni\nj\nk\n')
1521
1761
self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
1522
1762
modified = ['a', 'b', 'c', 'h', 'i']
1523
1763
merge_modified = this.wt.merge_modified()
1524
1764
self.assertSubset(merge_modified, modified)
1525
1765
self.assertEqual(len(merge_modified), len(modified))
1526
file(this.wt.id2abspath('a'), 'wb').write('booga')
1766
with file(this.wt.abspath(this.wt.id2path('a')), 'wb') as f: f.write('booga')
1527
1767
modified.pop(0)
1528
1768
merge_modified = this.wt.merge_modified()
1529
1769
self.assertSubset(merge_modified, modified)
1970
2223
self.assertEqualStat(source_stat, target_stat)
1972
2225
def test_case_insensitive_build_tree_inventory(self):
1973
if (tests.CaseInsensitiveFilesystemFeature.available()
1974
or tests.CaseInsCasePresFilenameFeature.available()):
2226
if (features.CaseInsensitiveFilesystemFeature.available()
2227
or features.CaseInsCasePresFilenameFeature.available()):
1975
2228
raise tests.UnavailableFeature('Fully case sensitive filesystem')
1976
2229
source = self.make_branch_and_tree('source')
1977
2230
self.build_tree(['source/file', 'source/FILE'])
1978
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
2231
source.add(['file', 'FILE'], [b'lower-id', b'upper-id'])
1979
2232
source.commit('added files')
1980
2233
# Don't try this at home, kids!
1981
2234
# Force the tree to report that it is case insensitive
1982
2235
target = self.make_branch_and_tree('target')
1983
2236
target.case_sensitive = False
1984
2237
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'))
2238
self.assertEqual('file.moved', target.id2path(b'lower-id'))
2239
self.assertEqual('FILE', target.id2path(b'upper-id'))
2241
def test_build_tree_observes_sha(self):
2242
source = self.make_branch_and_tree('source')
2243
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2244
source.add(['file1', 'dir', 'dir/file2'],
2245
[b'file1-id', b'dir-id', b'file2-id'])
2246
source.commit('new files')
2247
target = self.make_branch_and_tree('target')
2249
self.addCleanup(target.unlock)
2250
# We make use of the fact that DirState caches its cutoff time. So we
2251
# set the 'safe' time to one minute in the future.
2252
state = target.current_dirstate()
2253
state._cutoff_time = time.time() + 60
2254
build_tree(source.basis_tree(), target)
2255
entry1_sha = osutils.sha_file_by_name('source/file1')
2256
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2257
# entry[1] is the state information, entry[1][0] is the state of the
2258
# working tree, entry[1][0][1] is the sha value for the current working
2260
entry1 = state._get_entry(0, path_utf8='file1')
2261
self.assertEqual(entry1_sha, entry1[1][0][1])
2262
# The 'size' field must also be set.
2263
self.assertEqual(25, entry1[1][0][2])
2264
entry1_state = entry1[1][0]
2265
entry2 = state._get_entry(0, path_utf8='dir/file2')
2266
self.assertEqual(entry2_sha, entry2[1][0][1])
2267
self.assertEqual(29, entry2[1][0][2])
2268
entry2_state = entry2[1][0]
2269
# Now, make sure that we don't have to re-read the content. The
2270
# packed_stat should match exactly.
2271
self.assertEqual(entry1_sha, target.get_file_sha1('file1', b'file1-id'))
2272
self.assertEqual(entry2_sha,
2273
target.get_file_sha1('dir/file2', b'file2-id'))
2274
self.assertEqual(entry1_state, entry1[1][0])
2275
self.assertEqual(entry2_state, entry2[1][0])
1989
2278
class TestCommitTransform(tests.TestCaseWithTransport):
2088
2377
branch, tt = self.get_branch_and_transform()
2089
2378
parent_id = tt.trans_id_file_id('parent-id')
2090
tt.new_file('file', parent_id, 'contents', 'file-id')
2379
tt.new_file('file', parent_id, 'contents', b'file-id')
2091
2380
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~')
2383
def test_commit_rich_revision_data(self):
2384
branch, tt = self.get_branch_and_transform()
2385
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2386
committer='me <me@example.com>',
2387
revprops={'foo': 'bar'}, revision_id='revid-1',
2388
authors=['Author1 <author1@example.com>',
2389
'Author2 <author2@example.com>',
2391
self.assertEqual('revid-1', rev_id)
2392
revision = branch.repository.get_revision(rev_id)
2393
self.assertEqual(1, revision.timestamp)
2394
self.assertEqual(43201, revision.timezone)
2395
self.assertEqual('me <me@example.com>', revision.committer)
2396
self.assertEqual(['Author1 <author1@example.com>',
2397
'Author2 <author2@example.com>'],
2398
revision.get_apparent_authors())
2399
del revision.properties['authors']
2400
self.assertEqual({'foo': 'bar',
2401
'branch-nick': 'tree'},
2402
revision.properties)
2404
def test_no_explicit_revprops(self):
2405
branch, tt = self.get_branch_and_transform()
2406
rev_id = tt.commit(branch, 'message', authors=[
2407
'Author1 <author1@example.com>',
2408
'Author2 <author2@example.com>', ])
2409
revision = branch.repository.get_revision(rev_id)
2410
self.assertEqual(['Author1 <author1@example.com>',
2411
'Author2 <author2@example.com>'],
2412
revision.get_apparent_authors())
2413
self.assertEqual('tree', revision.properties['branch-nick'])
2128
2416
class TestFileMover(tests.TestCaseWithTransport):
2131
2419
self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2132
2420
mover = _FileMover()
2133
2421
mover.rename('a', 'q')
2134
self.failUnlessExists('q')
2135
self.failIfExists('a')
2136
self.failUnlessExists('q/b')
2137
self.failUnlessExists('c')
2138
self.failUnlessExists('c/d')
2422
self.assertPathExists('q')
2423
self.assertPathDoesNotExist('a')
2424
self.assertPathExists('q/b')
2425
self.assertPathExists('c')
2426
self.assertPathExists('c/d')
2140
2428
def test_pre_delete_rollback(self):
2141
2429
self.build_tree(['a/'])
2142
2430
mover = _FileMover()
2143
2431
mover.pre_delete('a', 'q')
2144
self.failUnlessExists('q')
2145
self.failIfExists('a')
2432
self.assertPathExists('q')
2433
self.assertPathDoesNotExist('a')
2146
2434
mover.rollback()
2147
self.failIfExists('q')
2148
self.failUnlessExists('a')
2435
self.assertPathDoesNotExist('q')
2436
self.assertPathExists('a')
2150
2438
def test_apply_deletions(self):
2151
2439
self.build_tree(['a/', 'b/'])
2152
2440
mover = _FileMover()
2153
2441
mover.pre_delete('a', 'q')
2154
2442
mover.pre_delete('b', 'r')
2155
self.failUnlessExists('q')
2156
self.failUnlessExists('r')
2157
self.failIfExists('a')
2158
self.failIfExists('b')
2443
self.assertPathExists('q')
2444
self.assertPathExists('r')
2445
self.assertPathDoesNotExist('a')
2446
self.assertPathDoesNotExist('b')
2159
2447
mover.apply_deletions()
2160
self.failIfExists('q')
2161
self.failIfExists('r')
2162
self.failIfExists('a')
2163
self.failIfExists('b')
2448
self.assertPathDoesNotExist('q')
2449
self.assertPathDoesNotExist('r')
2450
self.assertPathDoesNotExist('a')
2451
self.assertPathDoesNotExist('b')
2165
2453
def test_file_mover_rollback(self):
2166
2454
self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2240
2528
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2241
2529
self.assertRaises(Bogus, tt.apply,
2242
2530
_mover=self.ExceptionFileMover(bad_target='d'))
2243
self.failUnlessExists('a')
2244
self.failUnlessExists('a/b')
2246
def test_resolve_no_parent(self):
2531
self.assertPathExists('a')
2532
self.assertPathExists('a/b')
2535
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2536
"""Ensure treetransform creation errors can be safely cleaned up after"""
2538
def _override_globals_in_method(self, instance, method_name, globals):
2539
"""Replace method on instance with one with updated globals"""
2541
func = getattr(instance, method_name).__func__
2542
new_globals = dict(func.__globals__)
2543
new_globals.update(globals)
2544
new_func = types.FunctionType(func.__code__, new_globals,
2545
func.__name__, func.__defaults__)
2546
setattr(instance, method_name,
2547
types.MethodType(new_func, instance, instance.__class__))
2548
self.addCleanup(delattr, instance, method_name)
2551
def _fake_open_raises_before(name, mode):
2552
"""Like open() but raises before doing anything"""
2556
def _fake_open_raises_after(name, mode):
2557
"""Like open() but raises after creating file without returning"""
2558
open(name, mode).close()
2561
def create_transform_and_root_trans_id(self):
2562
"""Setup a transform creating a file in limbo"""
2563
tree = self.make_branch_and_tree('.')
2564
tt = TreeTransform(tree)
2565
return tt, tt.create_path("a", tt.root)
2567
def create_transform_and_subdir_trans_id(self):
2568
"""Setup a transform creating a directory containing a file in limbo"""
2569
tree = self.make_branch_and_tree('.')
2570
tt = TreeTransform(tree)
2571
d_trans_id = tt.create_path("d", tt.root)
2572
tt.create_directory(d_trans_id)
2573
f_trans_id = tt.create_path("a", d_trans_id)
2574
tt.adjust_path("a", d_trans_id, f_trans_id)
2575
return tt, f_trans_id
2577
def test_root_create_file_open_raises_before_creation(self):
2578
tt, trans_id = self.create_transform_and_root_trans_id()
2579
self._override_globals_in_method(tt, "create_file",
2580
{"open": self._fake_open_raises_before})
2581
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2582
path = tt._limbo_name(trans_id)
2583
self.assertPathDoesNotExist(path)
2585
self.assertPathDoesNotExist(tt._limbodir)
2587
def test_root_create_file_open_raises_after_creation(self):
2588
tt, trans_id = self.create_transform_and_root_trans_id()
2589
self._override_globals_in_method(tt, "create_file",
2590
{"open": self._fake_open_raises_after})
2591
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2592
path = tt._limbo_name(trans_id)
2593
self.assertPathExists(path)
2595
self.assertPathDoesNotExist(path)
2596
self.assertPathDoesNotExist(tt._limbodir)
2598
def test_subdir_create_file_open_raises_before_creation(self):
2599
tt, trans_id = self.create_transform_and_subdir_trans_id()
2600
self._override_globals_in_method(tt, "create_file",
2601
{"open": self._fake_open_raises_before})
2602
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2603
path = tt._limbo_name(trans_id)
2604
self.assertPathDoesNotExist(path)
2606
self.assertPathDoesNotExist(tt._limbodir)
2608
def test_subdir_create_file_open_raises_after_creation(self):
2609
tt, trans_id = self.create_transform_and_subdir_trans_id()
2610
self._override_globals_in_method(tt, "create_file",
2611
{"open": self._fake_open_raises_after})
2612
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2613
path = tt._limbo_name(trans_id)
2614
self.assertPathExists(path)
2616
self.assertPathDoesNotExist(path)
2617
self.assertPathDoesNotExist(tt._limbodir)
2619
def test_rename_in_limbo_rename_raises_after_rename(self):
2620
tt, trans_id = self.create_transform_and_root_trans_id()
2621
parent1 = tt.new_directory('parent1', tt.root)
2622
child1 = tt.new_file('child1', parent1, 'contents')
2623
parent2 = tt.new_directory('parent2', tt.root)
2625
class FakeOSModule(object):
2626
def rename(self, old, new):
2629
self._override_globals_in_method(tt, "_rename_in_limbo",
2630
{"os": FakeOSModule()})
2632
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2633
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2634
self.assertPathExists(path)
2636
self.assertPathDoesNotExist(path)
2637
self.assertPathDoesNotExist(tt._limbodir)
2639
def test_rename_in_limbo_rename_raises_before_rename(self):
2640
tt, trans_id = self.create_transform_and_root_trans_id()
2641
parent1 = tt.new_directory('parent1', tt.root)
2642
child1 = tt.new_file('child1', parent1, 'contents')
2643
parent2 = tt.new_directory('parent2', tt.root)
2645
class FakeOSModule(object):
2646
def rename(self, old, new):
2648
self._override_globals_in_method(tt, "_rename_in_limbo",
2649
{"os": FakeOSModule()})
2651
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2652
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2653
self.assertPathExists(path)
2655
self.assertPathDoesNotExist(path)
2656
self.assertPathDoesNotExist(tt._limbodir)
2659
class TestTransformMissingParent(tests.TestCaseWithTransport):
2661
def make_tt_with_versioned_dir(self):
2247
2662
wt = self.make_branch_and_tree('.')
2663
self.build_tree(['dir/',])
2664
wt.add(['dir'], [b'dir-id'])
2665
wt.commit('Create dir')
2248
2666
tt = TreeTransform(wt)
2249
2667
self.addCleanup(tt.finalize)
2250
parent = tt.trans_id_file_id('parent-id')
2251
tt.new_file('file', parent, 'Contents')
2252
resolve_conflicts(tt)
2670
def test_resolve_create_parent_for_versioned_file(self):
2671
wt, tt = self.make_tt_with_versioned_dir()
2672
dir_tid = tt.trans_id_tree_path('dir')
2673
file_tid = tt.new_file('file', dir_tid, 'Contents', file_id=b'file-id')
2674
tt.delete_contents(dir_tid)
2675
tt.unversion_file(dir_tid)
2676
conflicts = resolve_conflicts(tt)
2677
# one conflict for the missing directory, one for the unversioned
2679
self.assertLength(2, conflicts)
2681
def test_non_versioned_file_create_conflict(self):
2682
wt, tt = self.make_tt_with_versioned_dir()
2683
dir_tid = tt.trans_id_tree_path('dir')
2684
tt.new_file('file', dir_tid, 'Contents')
2685
tt.delete_contents(dir_tid)
2686
tt.unversion_file(dir_tid)
2687
conflicts = resolve_conflicts(tt)
2688
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2689
self.assertLength(1, conflicts)
2690
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2255
2694
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2256
2695
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2257
2696
(False, False))
2258
2697
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2259
('', ''), ('directory', 'directory'), (False, None))
2698
('', ''), ('directory', 'directory'), (False, False))
2262
2701
class TestTransformPreview(tests.TestCaseWithTransport):
2264
2703
def create_tree(self):
2265
2704
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')
2705
self.build_tree_contents([('a', b'content 1')])
2706
tree.set_root_id(b'TREE_ROOT')
2707
tree.add('a', b'a-id')
2708
tree.commit('rev1', rev_id=b'rev1')
2270
2709
return tree.branch.repository.revision_tree('rev1')
2272
2711
def get_empty_preview(self):
2377
2816
revision_tree = self.create_tree()
2378
2817
preview = TransformPreview(revision_tree)
2379
2818
self.addCleanup(preview.finalize)
2380
preview.new_file('file', preview.root, 'contents', 'file-id')
2819
preview.new_file('file', preview.root, 'contents', b'file-id')
2381
2820
preview.new_directory('directory', preview.root, 'dir-id')
2382
2821
preview_tree = preview.get_preview_tree()
2383
self.assertEqual('file', preview_tree.kind('file-id'))
2384
self.assertEqual('directory', preview_tree.kind('dir-id'))
2822
self.assertEqual('file', preview_tree.kind('file'))
2823
self.assertEqual('directory', preview_tree.kind('directory'))
2386
2825
def test_get_file_mtime(self):
2387
2826
preview = self.get_empty_preview()
2388
2827
file_trans_id = preview.new_file('file', preview.root, 'contents',
2390
2829
limbo_path = preview._limbo_name(file_trans_id)
2391
2830
preview_tree = preview.get_preview_tree()
2392
2831
self.assertEqual(os.stat(limbo_path).st_mtime,
2393
preview_tree.get_file_mtime('file-id'))
2832
preview_tree.get_file_mtime('file', b'file-id'))
2395
2834
def test_get_file_mtime_renamed(self):
2396
2835
work_tree = self.make_branch_and_tree('tree')
2397
2836
self.build_tree(['tree/file'])
2398
work_tree.add('file', 'file-id')
2837
work_tree.add('file', b'file-id')
2399
2838
preview = TransformPreview(work_tree)
2400
2839
self.addCleanup(preview.finalize)
2401
file_trans_id = preview.trans_id_tree_file_id('file-id')
2840
file_trans_id = preview.trans_id_tree_path('file')
2402
2841
preview.adjust_path('renamed', preview.root, file_trans_id)
2403
2842
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')
2843
preview_mtime = preview_tree.get_file_mtime('renamed', b'file-id')
2844
work_mtime = work_tree.get_file_mtime('file', b'file-id')
2846
def test_get_file_size(self):
2847
work_tree = self.make_branch_and_tree('tree')
2848
self.build_tree_contents([('tree/old', b'old')])
2849
work_tree.add('old', b'old-id')
2850
preview = TransformPreview(work_tree)
2851
self.addCleanup(preview.finalize)
2852
new_id = preview.new_file('name', preview.root, 'contents', b'new-id',
2854
tree = preview.get_preview_tree()
2855
self.assertEqual(len('old'), tree.get_file_size('old'))
2856
self.assertEqual(len('contents'), tree.get_file_size('name'))
2407
2858
def test_get_file(self):
2408
2859
preview = self.get_empty_preview()
2409
preview.new_file('file', preview.root, 'contents', 'file-id')
2860
preview.new_file('file', preview.root, 'contents', b'file-id')
2410
2861
preview_tree = preview.get_preview_tree()
2411
tree_file = preview_tree.get_file('file-id')
2862
tree_file = preview_tree.get_file('file')
2413
2864
self.assertEqual('contents', tree_file.read())
2420
2871
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2421
2872
preview_tree = preview.get_preview_tree()
2422
2873
self.assertEqual('target',
2423
preview_tree.get_symlink_target('symlink-id'))
2874
preview_tree.get_symlink_target('symlink'))
2425
2876
def test_all_file_ids(self):
2426
2877
tree = self.make_branch_and_tree('tree')
2427
2878
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
2428
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
2879
tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
2429
2880
preview = TransformPreview(tree)
2430
2881
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')
2882
preview.unversion_file(preview.trans_id_file_id(b'b-id'))
2883
c_trans_id = preview.trans_id_file_id(b'c-id')
2433
2884
preview.unversion_file(c_trans_id)
2434
preview.version_file('c-id', c_trans_id)
2885
preview.version_file(b'c-id', c_trans_id)
2435
2886
preview_tree = preview.get_preview_tree()
2436
self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
2887
self.assertEqual({b'a-id', b'c-id', tree.get_root_id()},
2437
2888
preview_tree.all_file_ids())
2439
2890
def test_path2id_deleted_unchanged(self):
2440
2891
tree = self.make_branch_and_tree('tree')
2441
2892
self.build_tree(['tree/unchanged', 'tree/deleted'])
2442
tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
2893
tree.add(['unchanged', 'deleted'], [b'unchanged-id', b'deleted-id'])
2443
2894
preview = TransformPreview(tree)
2444
2895
self.addCleanup(preview.finalize)
2445
preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2896
preview.unversion_file(preview.trans_id_file_id(b'deleted-id'))
2446
2897
preview_tree = preview.get_preview_tree()
2447
self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2448
self.assertIs(None, preview_tree.path2id('deleted'))
2898
self.assertEqual(b'unchanged-id', preview_tree.path2id('unchanged'))
2899
self.assertFalse(preview_tree.is_versioned('deleted'))
2450
2901
def test_path2id_created(self):
2451
2902
tree = self.make_branch_and_tree('tree')
2452
2903
self.build_tree(['tree/unchanged'])
2453
tree.add(['unchanged'], ['unchanged-id'])
2904
tree.add(['unchanged'], [b'unchanged-id'])
2454
2905
preview = TransformPreview(tree)
2455
2906
self.addCleanup(preview.finalize)
2456
preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
2907
preview.new_file('new', preview.trans_id_file_id(b'unchanged-id'),
2457
2908
'contents', 'new-id')
2458
2909
preview_tree = preview.get_preview_tree()
2459
self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
2910
self.assertEqual(b'new-id', preview_tree.path2id('unchanged/new'))
2461
2912
def test_path2id_moved(self):
2462
2913
tree = self.make_branch_and_tree('tree')
2463
2914
self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
2464
2915
tree.add(['old_parent', 'old_parent/child'],
2465
['old_parent-id', 'child-id'])
2916
[b'old_parent-id', b'child-id'])
2466
2917
preview = TransformPreview(tree)
2467
2918
self.addCleanup(preview.finalize)
2468
2919
new_parent = preview.new_directory('new_parent', preview.root,
2470
2921
preview.adjust_path('child', new_parent,
2471
preview.trans_id_file_id('child-id'))
2922
preview.trans_id_file_id(b'child-id'))
2472
2923
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'))
2924
self.assertFalse(preview_tree.is_versioned('old_parent/child'))
2925
self.assertEqual(b'child-id', preview_tree.path2id('new_parent/child'))
2476
2927
def test_path2id_renamed_parent(self):
2477
2928
tree = self.make_branch_and_tree('tree')
2478
2929
self.build_tree(['tree/old_name/', 'tree/old_name/child'])
2479
2930
tree.add(['old_name', 'old_name/child'],
2480
['parent-id', 'child-id'])
2931
[b'parent-id', b'child-id'])
2481
2932
preview = TransformPreview(tree)
2482
2933
self.addCleanup(preview.finalize)
2483
2934
preview.adjust_path('new_name', preview.root,
2484
preview.trans_id_file_id('parent-id'))
2935
preview.trans_id_file_id(b'parent-id'))
2485
2936
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'))
2937
self.assertFalse(preview_tree.is_versioned('old_name/child'))
2938
self.assertEqual(b'child-id', preview_tree.path2id('new_name/child'))
2489
def assertMatchingIterEntries(self, tt, specific_file_ids=None):
2940
def assertMatchingIterEntries(self, tt, specific_files=None):
2490
2941
preview_tree = tt.get_preview_tree()
2491
2942
preview_result = list(preview_tree.iter_entries_by_dir(
2943
specific_files=specific_files))
2493
2944
tree = tt._tree
2495
actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
2946
actual_result = list(tree.iter_entries_by_dir(
2947
specific_files=specific_files))
2496
2948
self.assertEqual(actual_result, preview_result)
2498
2950
def test_iter_entries_by_dir_new(self):
2499
2951
tree = self.make_branch_and_tree('tree')
2500
2952
tt = TreeTransform(tree)
2501
tt.new_file('new', tt.root, 'contents', 'new-id')
2953
tt.new_file('new', tt.root, 'contents', b'new-id')
2502
2954
self.assertMatchingIterEntries(tt)
2504
2956
def test_iter_entries_by_dir_deleted(self):
2505
2957
tree = self.make_branch_and_tree('tree')
2506
2958
self.build_tree(['tree/deleted'])
2507
tree.add('deleted', 'deleted-id')
2959
tree.add('deleted', b'deleted-id')
2508
2960
tt = TreeTransform(tree)
2509
tt.delete_contents(tt.trans_id_file_id('deleted-id'))
2961
tt.delete_contents(tt.trans_id_file_id(b'deleted-id'))
2510
2962
self.assertMatchingIterEntries(tt)
2512
2964
def test_iter_entries_by_dir_unversioned(self):
2513
2965
tree = self.make_branch_and_tree('tree')
2514
2966
self.build_tree(['tree/removed'])
2515
tree.add('removed', 'removed-id')
2967
tree.add('removed', b'removed-id')
2516
2968
tt = TreeTransform(tree)
2517
tt.unversion_file(tt.trans_id_file_id('removed-id'))
2969
tt.unversion_file(tt.trans_id_file_id(b'removed-id'))
2518
2970
self.assertMatchingIterEntries(tt)
2520
2972
def test_iter_entries_by_dir_moved(self):
2521
2973
tree = self.make_branch_and_tree('tree')
2522
2974
self.build_tree(['tree/moved', 'tree/new_parent/'])
2523
tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
2975
tree.add(['moved', 'new_parent'], [b'moved-id', b'new_parent-id'])
2524
2976
tt = TreeTransform(tree)
2525
tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
2526
tt.trans_id_file_id('moved-id'))
2977
tt.adjust_path('moved', tt.trans_id_file_id(b'new_parent-id'),
2978
tt.trans_id_file_id(b'moved-id'))
2527
2979
self.assertMatchingIterEntries(tt)
2529
def test_iter_entries_by_dir_specific_file_ids(self):
2981
def test_iter_entries_by_dir_specific_files(self):
2530
2982
tree = self.make_branch_and_tree('tree')
2531
tree.set_root_id('tree-root-id')
2983
tree.set_root_id(b'tree-root-id')
2532
2984
self.build_tree(['tree/parent/', 'tree/parent/child'])
2533
tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
2985
tree.add(['parent', 'parent/child'], [b'parent-id', b'child-id'])
2534
2986
tt = TreeTransform(tree)
2535
self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
2987
self.assertMatchingIterEntries(tt, ['', 'parent/child'])
2537
2989
def test_symlink_content_summary(self):
2538
2990
self.requireFeature(SymlinkFeature)
2539
2991
preview = self.get_empty_preview()
2540
preview.new_symlink('path', preview.root, 'target', 'path-id')
2992
preview.new_symlink('path', preview.root, 'target', b'path-id')
2541
2993
summary = preview.get_preview_tree().path_content_summary('path')
2542
2994
self.assertEqual(('symlink', None, None, 'target'), summary)
2625
3077
('me:', 'b\n'),
2626
3078
('me:', 'c\n'),
2628
annotation = preview_tree.annotate_iter('file-id', 'me:')
3080
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2629
3081
self.assertEqual(expected, annotation)
2631
3083
def test_annotate_missing(self):
2632
3084
preview = self.get_empty_preview()
2633
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3085
preview.new_file('file', preview.root, 'a\nb\nc\n', b'file-id')
2634
3086
preview_tree = preview.get_preview_tree()
2636
3088
('me:', 'a\n'),
2637
3089
('me:', 'b\n'),
2638
3090
('me:', 'c\n'),
2640
annotation = preview_tree.annotate_iter('file-id', 'me:')
3092
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2641
3093
self.assertEqual(expected, annotation)
2643
3095
def test_annotate_rename(self):
2644
3096
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')
3097
self.build_tree_contents([('tree/file', b'a\n')])
3098
tree.add('file', b'file-id')
3099
tree.commit('a', rev_id=b'one')
2648
3100
preview = TransformPreview(tree)
2649
3101
self.addCleanup(preview.finalize)
2650
file_trans_id = preview.trans_id_file_id('file-id')
3102
file_trans_id = preview.trans_id_file_id(b'file-id')
2651
3103
preview.adjust_path('newname', preview.root, file_trans_id)
2652
3104
preview_tree = preview.get_preview_tree()
2654
3106
('one', 'a\n'),
2656
annotation = preview_tree.annotate_iter('file-id', 'me:')
3108
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2657
3109
self.assertEqual(expected, annotation)
2659
3111
def test_annotate_deleted(self):
2660
3112
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')])
3113
self.build_tree_contents([('tree/file', b'a\n')])
3114
tree.add('file', b'file-id')
3115
tree.commit('a', rev_id=b'one')
3116
self.build_tree_contents([('tree/file', b'a\nb\n')])
2665
3117
preview = TransformPreview(tree)
2666
3118
self.addCleanup(preview.finalize)
2667
file_trans_id = preview.trans_id_file_id('file-id')
3119
file_trans_id = preview.trans_id_file_id(b'file-id')
2668
3120
preview.delete_contents(file_trans_id)
2669
3121
preview_tree = preview.get_preview_tree()
2670
annotation = preview_tree.annotate_iter('file-id', 'me:')
3122
annotation = preview_tree.annotate_iter('file', default_revision=b'me:')
2671
3123
self.assertIs(None, annotation)
2673
3125
def test_stored_kind(self):
2674
3126
preview = self.get_empty_preview()
2675
preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3127
preview.new_file('file', preview.root, 'a\nb\nc\n', b'file-id')
2676
3128
preview_tree = preview.get_preview_tree()
2677
self.assertEqual('file', preview_tree.stored_kind('file-id'))
3129
self.assertEqual('file', preview_tree.stored_kind('file'))
2679
3131
def test_is_executable(self):
2680
3132
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'))
3133
preview.new_file('file', preview.root, 'a\nb\nc\n', b'file-id')
3134
preview.set_executability(True, preview.trans_id_file_id(b'file-id'))
2683
3135
preview_tree = preview.get_preview_tree()
2684
self.assertEqual(True, preview_tree.is_executable('file-id'))
3136
self.assertEqual(True, preview_tree.is_executable('file'))
2686
3138
def test_get_set_parent_ids(self):
2687
3139
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2688
3140
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())
3141
preview_tree.set_parent_ids([b'rev-1'])
3142
self.assertEqual([b'rev-1'], preview_tree.get_parent_ids())
2692
3144
def test_plan_file_merge(self):
2693
3145
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')
3146
self.build_tree_contents([('wta/file', b'a\nb\nc\nd\n')])
3147
work_a.add('file', b'file-id')
2696
3148
base_id = work_a.commit('base version')
2697
tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
3149
tree_b = work_a.controldir.sprout('wtb').open_workingtree()
2698
3150
preview = TransformPreview(work_a)
2699
3151
self.addCleanup(preview.finalize)
2700
trans_id = preview.trans_id_file_id('file-id')
3152
trans_id = preview.trans_id_file_id(b'file-id')
2701
3153
preview.delete_contents(trans_id)
2702
3154
preview.create_file('b\nc\nd\ne\n', trans_id)
2703
self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
3155
self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
2704
3156
tree_a = preview.get_preview_tree()
2705
3157
tree_a.set_parent_ids([base_id])
2706
3158
self.assertEqual([
2788
3240
tt = merger.make_merger().make_preview_transform()
2789
3241
self.addCleanup(tt.finalize)
2790
3242
final_tree = tt.get_preview_tree()
2791
self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
3245
final_tree.get_file_text(final_tree.id2path(b'file-id')))
2793
3247
def test_merge_preview_into_workingtree(self):
2794
3248
tree = self.make_branch_and_tree('tree')
2795
tree.set_root_id('TREE_ROOT')
3249
tree.set_root_id(b'TREE_ROOT')
2796
3250
tt = TransformPreview(tree)
2797
3251
self.addCleanup(tt.finalize)
2798
tt.new_file('name', tt.root, 'content', 'file-id')
3252
tt.new_file('name', tt.root, 'content', b'file-id')
2799
3253
tree2 = self.make_branch_and_tree('tree2')
2800
tree2.set_root_id('TREE_ROOT')
3254
tree2.set_root_id(b'TREE_ROOT')
2801
3255
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
None, tree.basis_tree())
2803
3257
merger.merge_type = Merge3Merger
2804
3258
merger.do_merge()
2806
3260
def test_merge_preview_into_workingtree_handles_conflicts(self):
2807
3261
tree = self.make_branch_and_tree('tree')
2808
self.build_tree_contents([('tree/foo', 'bar')])
2809
tree.add('foo', 'foo-id')
3262
self.build_tree_contents([('tree/foo', b'bar')])
3263
tree.add('foo', b'foo-id')
2810
3264
tree.commit('foo')
2811
3265
tt = TransformPreview(tree)
2812
3266
self.addCleanup(tt.finalize)
2813
trans_id = tt.trans_id_file_id('foo-id')
3267
trans_id = tt.trans_id_file_id(b'foo-id')
2814
3268
tt.delete_contents(trans_id)
2815
3269
tt.create_file('baz', trans_id)
2816
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2817
self.build_tree_contents([('tree2/foo', 'qux')])
3270
tree2 = tree.controldir.sprout('tree2').open_workingtree()
3271
self.build_tree_contents([('tree2/foo', b'qux')])
2819
3272
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
pb, tree.basis_tree())
2821
3274
merger.merge_type = Merge3Merger
2822
3275
merger.do_merge()
3277
def test_has_filename(self):
3278
wt = self.make_branch_and_tree('tree')
3279
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3280
tt = TransformPreview(wt)
3281
removed_id = tt.trans_id_tree_path('removed')
3282
tt.delete_contents(removed_id)
3283
tt.new_file('new', tt.root, 'contents')
3284
modified_id = tt.trans_id_tree_path('modified')
3285
tt.delete_contents(modified_id)
3286
tt.create_file('modified-contents', modified_id)
3287
self.addCleanup(tt.finalize)
3288
tree = tt.get_preview_tree()
3289
self.assertTrue(tree.has_filename('unmodified'))
3290
self.assertFalse(tree.has_filename('not-present'))
3291
self.assertFalse(tree.has_filename('removed'))
3292
self.assertTrue(tree.has_filename('new'))
3293
self.assertTrue(tree.has_filename('modified'))
2824
3295
def test_is_executable(self):
2825
3296
tree = self.make_branch_and_tree('tree')
2826
3297
preview = TransformPreview(tree)
2827
3298
self.addCleanup(preview.finalize)
2828
3299
preview.new_file('foo', preview.root, 'bar', 'baz-id')
2829
3300
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'))
3301
self.assertEqual(False, preview_tree.is_executable('tree/foo', 'baz-id'))
3302
self.assertEqual(False, preview_tree.is_executable('tree/foo'))
2834
3304
def test_commit_preview_tree(self):
2835
3305
tree = self.make_branch_and_tree('tree')
3112
3582
self.assertFileEqual(LINES, tt._limbo_name('new-1'))
3114
3584
def test_get_parents_lines(self):
3115
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3116
LINES_TWO = 'z\nbb\nx\ndd\n'
3585
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3586
LINES_TWO = b'z\nbb\nx\ndd\n'
3117
3587
tree = self.make_branch_and_tree('tree')
3118
3588
self.build_tree_contents([('tree/file', LINES_ONE)])
3119
tree.add('file', 'file-id')
3589
tree.add('file', b'file-id')
3120
3590
tt = self.get_preview(tree)
3121
3591
trans_id = tt.trans_id_tree_path('file')
3122
3592
self.assertEqual((['aa\n', 'bb\n', 'cc\n', 'dd\n'],),
3123
3593
tt._get_parents_lines(trans_id))
3125
3595
def test_get_parents_texts(self):
3126
LINES_ONE = 'aa\nbb\ncc\ndd\n'
3127
LINES_TWO = 'z\nbb\nx\ndd\n'
3596
LINES_ONE = b'aa\nbb\ncc\ndd\n'
3597
LINES_TWO = b'z\nbb\nx\ndd\n'
3128
3598
tree = self.make_branch_and_tree('tree')
3129
3599
self.build_tree_contents([('tree/file', LINES_ONE)])
3130
tree.add('file', 'file-id')
3600
tree.add('file', b'file-id')
3131
3601
tt = self.get_preview(tree)
3132
3602
trans_id = tt.trans_id_tree_path('file')
3133
3603
self.assertEqual((LINES_ONE,),
3134
3604
tt._get_parents_texts(trans_id))
3607
class TestOrphan(tests.TestCaseWithTransport):
3609
def test_no_orphan_for_transform_preview(self):
3610
tree = self.make_branch_and_tree('tree')
3611
tt = transform.TransformPreview(tree)
3612
self.addCleanup(tt.finalize)
3613
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3615
def _set_orphan_policy(self, wt, policy):
3616
wt.branch.get_config_stack().set('transform.orphan_policy',
3619
def _prepare_orphan(self, wt):
3620
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3621
wt.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
3622
wt.commit('add dir and file ignoring foo')
3623
tt = transform.TreeTransform(wt)
3624
self.addCleanup(tt.finalize)
3625
# dir and bar are deleted
3626
dir_tid = tt.trans_id_tree_path('dir')
3627
file_tid = tt.trans_id_tree_path('dir/file')
3628
orphan_tid = tt.trans_id_tree_path('dir/foo')
3629
tt.delete_contents(file_tid)
3630
tt.unversion_file(file_tid)
3631
tt.delete_contents(dir_tid)
3632
tt.unversion_file(dir_tid)
3633
# There should be a conflict because dir still contain foo
3634
raw_conflicts = tt.find_conflicts()
3635
self.assertLength(1, raw_conflicts)
3636
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3637
return tt, orphan_tid
3639
def test_new_orphan_created(self):
3640
wt = self.make_branch_and_tree('.')
3641
self._set_orphan_policy(wt, 'move')
3642
tt, orphan_tid = self._prepare_orphan(wt)
3645
warnings.append(args[0] % args[1:])
3646
self.overrideAttr(trace, 'warning', warning)
3647
remaining_conflicts = resolve_conflicts(tt)
3648
self.assertEqual(['dir/foo has been orphaned in brz-orphans'],
3650
# Yeah for resolved conflicts !
3651
self.assertLength(0, remaining_conflicts)
3652
# We have a new orphan
3653
self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
3654
self.assertEqual('brz-orphans',
3655
tt.final_name(tt.final_parent(orphan_tid)))
3657
def test_never_orphan(self):
3658
wt = self.make_branch_and_tree('.')
3659
self._set_orphan_policy(wt, 'conflict')
3660
tt, orphan_tid = self._prepare_orphan(wt)
3661
remaining_conflicts = resolve_conflicts(tt)
3662
self.assertLength(1, remaining_conflicts)
3663
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3664
remaining_conflicts.pop())
3666
def test_orphan_error(self):
3667
def bogus_orphan(tt, orphan_id, parent_id):
3668
raise transform.OrphaningError(tt.final_name(orphan_id),
3669
tt.final_name(parent_id))
3670
transform.orphaning_registry.register('bogus', bogus_orphan,
3671
'Raise an error when orphaning')
3672
wt = self.make_branch_and_tree('.')
3673
self._set_orphan_policy(wt, 'bogus')
3674
tt, orphan_tid = self._prepare_orphan(wt)
3675
remaining_conflicts = resolve_conflicts(tt)
3676
self.assertLength(1, remaining_conflicts)
3677
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3678
remaining_conflicts.pop())
3680
def test_unknown_orphan_policy(self):
3681
wt = self.make_branch_and_tree('.')
3682
# Set a fictional policy nobody ever implemented
3683
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3684
tt, orphan_tid = self._prepare_orphan(wt)
3687
warnings.append(args[0] % args[1:])
3688
self.overrideAttr(trace, 'warning', warning)
3689
remaining_conflicts = resolve_conflicts(tt)
3690
# We fallback to the default policy which create a conflict
3691
self.assertLength(1, remaining_conflicts)
3692
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3693
remaining_conflicts.pop())
3694
self.assertLength(1, warnings)
3695
self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3698
class TestTransformHooks(tests.TestCaseWithTransport):
3701
super(TestTransformHooks, self).setUp()
3702
self.wt = self.make_branch_and_tree('.')
3705
def get_transform(self):
3706
transform = TreeTransform(self.wt)
3707
self.addCleanup(transform.finalize)
3708
return transform, transform.root
3710
def test_pre_commit_hooks(self):
3712
def record_pre_transform(tree, tt):
3713
calls.append((tree, tt))
3714
MutableTree.hooks.install_named_hook('pre_transform',
3715
record_pre_transform, "Pre transform")
3716
transform, root = self.get_transform()
3717
old_root_id = transform.tree_file_id(root)
3719
self.assertEqual(old_root_id, self.wt.get_root_id())
3720
self.assertEqual([(self.wt, transform)], calls)
3722
def test_post_commit_hooks(self):
3724
def record_post_transform(tree, tt):
3725
calls.append((tree, tt))
3726
MutableTree.hooks.install_named_hook('post_transform',
3727
record_post_transform, "Post transform")
3728
transform, root = self.get_transform()
3729
old_root_id = transform.tree_file_id(root)
3731
self.assertEqual(old_root_id, self.wt.get_root_id())
3732
self.assertEqual([(self.wt, transform)], calls)
3735
class TestLinkTree(tests.TestCaseWithTransport):
3737
_test_needs_features = [HardlinkFeature]
3740
tests.TestCaseWithTransport.setUp(self)
3741
self.parent_tree = self.make_branch_and_tree('parent')
3742
self.parent_tree.lock_write()
3743
self.addCleanup(self.parent_tree.unlock)
3744
self.build_tree_contents([('parent/foo', b'bar')])
3745
self.parent_tree.add('foo')
3746
self.parent_tree.commit('added foo')
3747
child_controldir = self.parent_tree.controldir.sprout('child')
3748
self.child_tree = child_controldir.open_workingtree()
3750
def hardlinked(self):
3751
parent_stat = os.lstat(self.parent_tree.abspath('foo'))
3752
child_stat = os.lstat(self.child_tree.abspath('foo'))
3753
return parent_stat.st_ino == child_stat.st_ino
3755
def test_link_fails_if_modified(self):
3756
"""If the file to be linked has modified text, don't link."""
3757
self.build_tree_contents([('child/foo', b'baz')])
3758
transform.link_tree(self.child_tree, self.parent_tree)
3759
self.assertFalse(self.hardlinked())
3761
def test_link_fails_if_execute_bit_changed(self):
3762
"""If the file to be linked has modified execute bit, don't link."""
3763
tt = TreeTransform(self.child_tree)
3765
trans_id = tt.trans_id_tree_path('foo')
3766
tt.set_executability(True, trans_id)
3770
transform.link_tree(self.child_tree, self.parent_tree)
3771
self.assertFalse(self.hardlinked())
3773
def test_link_succeeds_if_unmodified(self):
3774
"""If the file to be linked is unmodified, link"""
3775
transform.link_tree(self.child_tree, self.parent_tree)
3776
self.assertTrue(self.hardlinked())
added
removed
breezy/tests/test_transform.py
