← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
60
60
    pathjoin,
61
61
)
62
62
from bzrlib.merge import Merge3Merger, Merger
 
63
from bzrlib.mutabletree import MutableTree
63
64
from bzrlib.tests import (
64
65
    features,
 
66
    TestCaseInTempDir,
 
67
    TestSkipped,
 
68
    )
 
69
from bzrlib.tests.features import (
65
70
    HardlinkFeature,
66
71
    SymlinkFeature,
67
 
    TestCaseInTempDir,
68
 
    TestSkipped,
69
 
)
 
72
    )
70
73
from bzrlib.transform import (
71
74
    build_tree,
72
75
    create_from_tree,
85
88
 
86
89
    def setUp(self):
87
90
        super(TestTreeTransform, self).setUp()
88
 
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
91
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
89
92
        os.chdir('..')
90
93
 
91
94
    def get_transform(self):
93
96
        self.addCleanup(transform.finalize)
94
97
        return transform, transform.root
95
98
 
 
99
    def get_transform_for_sha1_test(self):
 
100
        trans, root = self.get_transform()
 
101
        self.wt.lock_tree_write()
 
102
        self.addCleanup(self.wt.unlock)
 
103
        contents = ['just some content\n']
 
104
        sha1 = osutils.sha_strings(contents)
 
105
        # Roll back the clock
 
106
        trans._creation_mtime = time.time() - 20.0
 
107
        return trans, root, contents, sha1
 
108
 
96
109
    def test_existing_limbo(self):
97
110
        transform, root = self.get_transform()
98
111
        limbo_name = transform._limbodir
161
174
        transform.finalize()
162
175
        transform.finalize()
163
176
 
 
177
    def test_apply_informs_tree_of_observed_sha1(self):
 
178
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
179
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
180
                                  sha1=sha1)
 
181
        calls = []
 
182
        orig = self.wt._observed_sha1
 
183
        def _observed_sha1(*args):
 
184
            calls.append(args)
 
185
            orig(*args)
 
186
        self.wt._observed_sha1 = _observed_sha1
 
187
        trans.apply()
 
188
        self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
 
189
                         calls)
 
190
 
 
191
    def test_create_file_caches_sha1(self):
 
192
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
193
        trans_id = trans.create_path('file1', root)
 
194
        trans.create_file(contents, trans_id, sha1=sha1)
 
195
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
196
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
197
        self.assertEqual(o_sha1, sha1)
 
198
        self.assertEqualStat(o_st_val, st_val)
 
199
 
 
200
    def test__apply_insertions_updates_sha1(self):
 
201
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
202
        trans_id = trans.create_path('file1', root)
 
203
        trans.create_file(contents, trans_id, sha1=sha1)
 
204
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
205
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
206
        self.assertEqual(o_sha1, sha1)
 
207
        self.assertEqualStat(o_st_val, st_val)
 
208
        creation_mtime = trans._creation_mtime + 10.0
 
209
        # We fake a time difference from when the file was created until now it
 
210
        # is being renamed by using os.utime. Note that the change we actually
 
211
        # want to see is the real ctime change from 'os.rename()', but as long
 
212
        # as we observe a new stat value, we should be fine.
 
213
        os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
 
214
        trans.apply()
 
215
        new_st_val = osutils.lstat(self.wt.abspath('file1'))
 
216
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
217
        self.assertEqual(o_sha1, sha1)
 
218
        self.assertEqualStat(o_st_val, new_st_val)
 
219
        self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
 
220
 
 
221
    def test_new_file_caches_sha1(self):
 
222
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
223
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
224
                                  sha1=sha1)
 
225
        st_val = osutils.lstat(trans._limbo_name(trans_id))
 
226
        o_sha1, o_st_val = trans._observed_sha1s[trans_id]
 
227
        self.assertEqual(o_sha1, sha1)
 
228
        self.assertEqualStat(o_st_val, st_val)
 
229
 
 
230
    def test_cancel_creation_removes_observed_sha1(self):
 
231
        trans, root, contents, sha1 = self.get_transform_for_sha1_test()
 
232
        trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
 
233
                                  sha1=sha1)
 
234
        self.assertTrue(trans_id in trans._observed_sha1s)
 
235
        trans.cancel_creation(trans_id)
 
236
        self.assertFalse(trans_id in trans._observed_sha1s)
 
237
 
164
238
    def test_create_files_same_timestamp(self):
165
239
        transform, root = self.get_transform()
166
240
        self.wt.lock_tree_write()
214
288
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
215
289
        self.assertRaises(ValueError, transform.fixup_new_roots)
216
290
 
 
291
    def test_retain_existing_root(self):
 
292
        tt, root = self.get_transform()
 
293
        with tt:
 
294
            tt.new_directory('', ROOT_PARENT, 'new-root-id')
 
295
            tt.fixup_new_roots()
 
296
            self.assertNotEqual('new-root-id', tt.final_file_id(tt.root))
 
297
 
 
298
    def test_retain_existing_root_added_file(self):
 
299
        tt, root = self.get_transform()
 
300
        new_trans_id = tt.new_directory('', ROOT_PARENT, 'new-root-id')
 
301
        child = tt.new_directory('child', new_trans_id, 'child-id')
 
302
        tt.fixup_new_roots()
 
303
        self.assertEqual(tt.root, tt.final_parent(child))
 
304
 
 
305
    def test_add_unversioned_root(self):
 
306
        transform, root = self.get_transform()
 
307
        new_trans_id = transform.new_directory('', ROOT_PARENT, None)
 
308
        transform.delete_contents(transform.root)
 
309
        transform.fixup_new_roots()
 
310
        self.assertNotIn(transform.root, transform._new_id)
 
311
 
 
312
    def test_remove_root_fixup(self):
 
313
        transform, root = self.get_transform()
 
314
        old_root_id = self.wt.get_root_id()
 
315
        self.assertNotEqual('new-root-id', old_root_id)
 
316
        transform.delete_contents(root)
 
317
        transform.unversion_file(root)
 
318
        transform.fixup_new_roots()
 
319
        transform.apply()
 
320
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
321
 
 
322
        transform, root = self.get_transform()
 
323
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
 
324
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
 
325
        self.assertRaises(ValueError, transform.fixup_new_roots)
 
326
 
 
327
    def test_fixup_new_roots_permits_empty_tree(self):
 
328
        transform, root = self.get_transform()
 
329
        transform.delete_contents(root)
 
330
        transform.unversion_file(root)
 
331
        transform.fixup_new_roots()
 
332
        self.assertIs(None, transform.final_kind(root))
 
333
        self.assertIs(None, transform.final_file_id(root))
 
334
 
 
335
    def test_apply_retains_root_directory(self):
 
336
        # Do not attempt to delete the physical root directory, because that
 
337
        # is impossible.
 
338
        transform, root = self.get_transform()
 
339
        with transform:
 
340
            transform.delete_contents(root)
 
341
            e = self.assertRaises(AssertionError, self.assertRaises,
 
342
                                  errors.TransformRenameFailed,
 
343
                                  transform.apply)
 
344
        self.assertContainsRe('TransformRenameFailed not raised', str(e))
 
345
 
 
346
    def test_apply_retains_file_id(self):
 
347
        transform, root = self.get_transform()
 
348
        old_root_id = transform.tree_file_id(root)
 
349
        transform.unversion_file(root)
 
350
        transform.apply()
 
351
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
352
 
217
353
    def test_hardlink(self):
218
354
        self.requireFeature(HardlinkFeature)
219
355
        transform, root = self.get_transform()
224
360
        trans_id = target_transform.create_path('file1', target_transform.root)
225
361
        target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
226
362
        target_transform.apply()
227
 
        self.failUnlessExists('target/file1')
 
363
        self.assertPathExists('target/file1')
228
364
        source_stat = os.stat(self.wt.abspath('file1'))
229
365
        target_stat = os.stat('target/file1')
230
366
        self.assertEqual(source_stat, target_stat)
263
399
        tree.lock_read()
264
400
        self.addCleanup(tree.unlock)
265
401
        self.assertEqual('subtree-revision',
266
 
                         tree.inventory['subtree-id'].reference_revision)
 
402
                         tree.root_inventory['subtree-id'].reference_revision)
267
403
 
268
404
    def test_conflicts(self):
269
405
        transform, root = self.get_transform()
396
532
        transform.new_file('FiLe', transform.root, 'content')
397
533
        resolve_conflicts(transform)
398
534
        transform.apply()
399
 
        self.failUnlessExists('tree/file')
400
 
        self.failUnlessExists('tree/FiLe.moved')
 
535
        self.assertPathExists('tree/file')
 
536
        self.assertPathExists('tree/FiLe.moved')
401
537
 
402
538
    def test_resolve_checkout_case_conflict(self):
403
539
        tree = self.make_branch_and_tree('tree')
412
548
        resolve_conflicts(transform,
413
549
                          pass_func=lambda t, c: resolve_checkout(t, c, []))
414
550
        transform.apply()
415
 
        self.failUnlessExists('tree/file')
416
 
        self.failUnlessExists('tree/FiLe.moved')
 
551
        self.assertPathExists('tree/file')
 
552
        self.assertPathExists('tree/FiLe.moved')
417
553
 
418
554
    def test_apply_case_conflict(self):
419
555
        """Ensure that a transform with case conflicts can always be applied"""
427
563
        transform.new_file('dirFiLe', dir, 'content')
428
564
        resolve_conflicts(transform)
429
565
        transform.apply()
430
 
        self.failUnlessExists('tree/file')
 
566
        self.assertPathExists('tree/file')
431
567
        if not os.path.exists('tree/FiLe.moved'):
432
 
            self.failUnlessExists('tree/FiLe')
433
 
        self.failUnlessExists('tree/dir/dirfile')
 
568
            self.assertPathExists('tree/FiLe')
 
569
        self.assertPathExists('tree/dir/dirfile')
434
570
        if not os.path.exists('tree/dir/dirFiLe.moved'):
435
 
            self.failUnlessExists('tree/dir/dirFiLe')
 
571
            self.assertPathExists('tree/dir/dirFiLe')
436
572
 
437
573
    def test_case_insensitive_limbo(self):
438
574
        tree = self.make_branch_and_tree('tree')
646
782
                            'wizard2', 'behind_curtain')
647
783
 
648
784
    def test_symlinks_unicode(self):
649
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
785
        self.requireFeature(features.UnicodeFilenameFeature)
650
786
        self._test_symlinks(u'\N{Euro Sign}wizard',
651
787
                            u'wizard-targ\N{Euro Sign}t',
652
788
                            u'\N{Euro Sign}wizard2',
740
876
        raw_conflicts = resolve_conflicts(tt)
741
877
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
742
878
        tt.finalize()
743
 
        conflicts_s = [str(c) for c in cooked_conflicts]
 
879
        conflicts_s = [unicode(c) for c in cooked_conflicts]
744
880
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
745
881
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
746
882
                                         'Moved existing file to '
1184
1320
        parent2 = transform.new_directory('parent2', root)
1185
1321
        transform.adjust_path('child1', parent2, child1)
1186
1322
        transform.apply()
1187
 
        self.failIfExists(self.wt.abspath('parent1/child1'))
1188
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1323
        self.assertPathDoesNotExist(self.wt.abspath('parent1/child1'))
 
1324
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1189
1325
        # rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1190
1326
        # no rename for child1 (counting only renames during apply)
1191
 
        self.failUnlessEqual(2, transform.rename_count)
 
1327
        self.assertEqual(2, transform.rename_count)
1192
1328
 
1193
1329
    def test_cancel_parent(self):
1194
1330
        """Cancelling a parent doesn't cause deletion of a non-empty directory
1217
1353
        parent2 = transform.new_directory('parent2', root)
1218
1354
        transform.adjust_path('child1', parent2, child1)
1219
1355
        transform.apply()
1220
 
        self.failIfExists(self.wt.abspath('parent1'))
1221
 
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
 
1356
        self.assertPathDoesNotExist(self.wt.abspath('parent1'))
 
1357
        self.assertPathExists(self.wt.abspath('parent2/child1'))
1222
1358
        # rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1223
 
        self.failUnlessEqual(2, transform.rename_count)
 
1359
        self.assertEqual(2, transform.rename_count)
1224
1360
 
1225
1361
    def test_adjust_and_cancel(self):
1226
1362
        """Make sure adjust_path keeps track of limbo children properly"""
1259
1395
        child = transform.new_directory('child', parent)
1260
1396
        transform.adjust_path('parent', root, parent)
1261
1397
        transform.apply()
1262
 
        self.failUnlessExists(self.wt.abspath('parent/child'))
 
1398
        self.assertPathExists(self.wt.abspath('parent/child'))
1263
1399
        self.assertEqual(1, transform.rename_count)
1264
1400
 
1265
1401
    def test_reuse_name(self):
1341
1477
        # The rename will fail because the target directory is not empty (but
1342
1478
        # raises FileExists anyway).
1343
1479
        err = self.assertRaises(errors.FileExists, tt_helper)
1344
 
        self.assertContainsRe(str(err),
1345
 
            "^File exists: .+/baz")
 
1480
        self.assertEndsWith(err.path, "/baz")
1346
1481
 
1347
1482
    def test_two_directories_clash(self):
1348
1483
        def tt_helper():
1360
1495
                wt.unlock()
1361
1496
                raise
1362
1497
        err = self.assertRaises(errors.FileExists, tt_helper)
1363
 
        self.assertContainsRe(str(err),
1364
 
            "^File exists: .+/foo")
 
1498
        self.assertEndsWith(err.path, "/foo")
1365
1499
 
1366
1500
    def test_two_directories_clash_finalize(self):
1367
1501
        def tt_helper():
1379
1513
                tt.finalize()
1380
1514
                raise
1381
1515
        err = self.assertRaises(errors.FileExists, tt_helper)
1382
 
        self.assertContainsRe(str(err),
1383
 
            "^File exists: .+/foo")
 
1516
        self.assertEndsWith(err.path, "/foo")
1384
1517
 
1385
1518
    def test_file_to_directory(self):
1386
1519
        wt = self.make_branch_and_tree('.')
1396
1529
        tt.create_file(["aa\n"], bar_trans_id)
1397
1530
        tt.version_file("bar-1", bar_trans_id)
1398
1531
        tt.apply()
1399
 
        self.failUnlessExists("foo/bar")
 
1532
        self.assertPathExists("foo/bar")
1400
1533
        wt.lock_read()
1401
1534
        try:
1402
 
            self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1403
 
                    "directory")
 
1535
            self.assertEqual(wt.kind(wt.path2id("foo")), "directory")
1404
1536
        finally:
1405
1537
            wt.unlock()
1406
1538
        wt.commit("two")
1419
1551
        tt.delete_contents(foo_trans_id)
1420
1552
        tt.create_symlink("bar", foo_trans_id)
1421
1553
        tt.apply()
1422
 
        self.failUnlessExists("foo")
 
1554
        self.assertPathExists("foo")
1423
1555
        wt.lock_read()
1424
1556
        self.addCleanup(wt.unlock)
1425
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1426
 
                "symlink")
 
1557
        self.assertEqual(wt.kind(wt.path2id("foo")), "symlink")
1427
1558
 
1428
1559
    def test_dir_to_file(self):
1429
1560
        wt = self.make_branch_and_tree('.')
1438
1569
        tt.delete_versioned(bar_trans_id)
1439
1570
        tt.create_file(["aa\n"], foo_trans_id)
1440
1571
        tt.apply()
1441
 
        self.failUnlessExists("foo")
 
1572
        self.assertPathExists("foo")
1442
1573
        wt.lock_read()
1443
1574
        self.addCleanup(wt.unlock)
1444
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1445
 
                "file")
 
1575
        self.assertEqual(wt.kind(wt.path2id("foo")), "file")
1446
1576
 
1447
1577
    def test_dir_to_hardlink(self):
1448
1578
        self.requireFeature(HardlinkFeature)
1459
1589
        self.build_tree(['baz'])
1460
1590
        tt.create_hardlink("baz", foo_trans_id)
1461
1591
        tt.apply()
1462
 
        self.failUnlessExists("foo")
1463
 
        self.failUnlessExists("baz")
 
1592
        self.assertPathExists("foo")
 
1593
        self.assertPathExists("baz")
1464
1594
        wt.lock_read()
1465
1595
        self.addCleanup(wt.unlock)
1466
 
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1467
 
                "file")
 
1596
        self.assertEqual(wt.kind(wt.path2id("foo")), "file")
1468
1597
 
1469
1598
    def test_no_final_path(self):
1470
1599
        transform, root = self.get_transform()
1528
1657
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1529
1658
 
1530
1659
 
 
1660
class TestInventoryAltered(tests.TestCaseWithTransport):
 
1661
 
 
1662
    def test_inventory_altered_unchanged(self):
 
1663
        tree = self.make_branch_and_tree('tree')
 
1664
        self.build_tree(['tree/foo'])
 
1665
        tree.add('foo', 'foo-id')
 
1666
        with TransformPreview(tree) as tt:
 
1667
            self.assertEqual([], tt._inventory_altered())
 
1668
 
 
1669
    def test_inventory_altered_changed_parent_id(self):
 
1670
        tree = self.make_branch_and_tree('tree')
 
1671
        self.build_tree(['tree/foo'])
 
1672
        tree.add('foo', 'foo-id')
 
1673
        with TransformPreview(tree) as tt:
 
1674
            tt.unversion_file(tt.root)
 
1675
            tt.version_file('new-id', tt.root)
 
1676
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1677
            foo_tuple = ('foo', foo_trans_id)
 
1678
            root_tuple = ('', tt.root)
 
1679
            self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
 
1680
 
 
1681
    def test_inventory_altered_noop_changed_parent_id(self):
 
1682
        tree = self.make_branch_and_tree('tree')
 
1683
        self.build_tree(['tree/foo'])
 
1684
        tree.add('foo', 'foo-id')
 
1685
        with TransformPreview(tree) as tt:
 
1686
            tt.unversion_file(tt.root)
 
1687
            tt.version_file(tree.get_root_id(), tt.root)
 
1688
            foo_trans_id = tt.trans_id_tree_file_id('foo-id')
 
1689
            self.assertEqual([], tt._inventory_altered())
 
1690
 
 
1691
 
1531
1692
class TestTransformMerge(TestCaseInTempDir):
1532
1693
 
1533
1694
    def test_text_merge(self):
1600
1761
        merge_modified = this.wt.merge_modified()
1601
1762
        self.assertSubset(merge_modified, modified)
1602
1763
        self.assertEqual(len(merge_modified), len(modified))
1603
 
        file(this.wt.id2abspath('a'), 'wb').write('booga')
 
1764
        with file(this.wt.id2abspath('a'), 'wb') as f: f.write('booga')
1604
1765
        modified.pop(0)
1605
1766
        merge_modified = this.wt.merge_modified()
1606
1767
        self.assertSubset(merge_modified, modified)
1722
1883
        os.mkdir('a')
1723
1884
        a = BzrDir.create_standalone_workingtree('a')
1724
1885
        os.mkdir('a/foo')
1725
 
        file('a/foo/bar', 'wb').write('contents')
 
1886
        with file('a/foo/bar', 'wb') as f: f.write('contents')
1726
1887
        os.symlink('a/foo/bar', 'a/foo/baz')
1727
1888
        a.add(['foo', 'foo/bar', 'foo/baz'])
1728
1889
        a.commit('initial commit')
1737
1898
 
1738
1899
    def test_build_with_references(self):
1739
1900
        tree = self.make_branch_and_tree('source',
1740
 
            format='dirstate-with-subtree')
 
1901
            format='development-subtree')
1741
1902
        subtree = self.make_branch_and_tree('source/subtree',
1742
 
            format='dirstate-with-subtree')
 
1903
            format='development-subtree')
1743
1904
        tree.add_reference(subtree)
1744
1905
        tree.commit('a revision')
1745
1906
        tree.branch.create_checkout('target')
1746
 
        self.failUnlessExists('target')
1747
 
        self.failUnlessExists('target/subtree')
 
1907
        self.assertPathExists('target')
 
1908
        self.assertPathExists('target/subtree')
1748
1909
 
1749
1910
    def test_file_conflict_handling(self):
1750
1911
        """Ensure that when building trees, conflict handling is done"""
1797
1958
        source.commit('added file')
1798
1959
        build_tree(source.basis_tree(), target)
1799
1960
        self.assertEqual([], target.conflicts())
1800
 
        self.failUnlessExists('target/dir1/file')
 
1961
        self.assertPathExists('target/dir1/file')
1801
1962
 
1802
1963
        # Ensure contents are merged
1803
1964
        target = self.make_branch_and_tree('target2')
1804
1965
        self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1805
1966
        build_tree(source.basis_tree(), target)
1806
1967
        self.assertEqual([], target.conflicts())
1807
 
        self.failUnlessExists('target2/dir1/file2')
1808
 
        self.failUnlessExists('target2/dir1/file')
 
1968
        self.assertPathExists('target2/dir1/file2')
 
1969
        self.assertPathExists('target2/dir1/file')
1809
1970
 
1810
1971
        # Ensure new contents are suppressed for existing branches
1811
1972
        target = self.make_branch_and_tree('target3')
1812
1973
        self.make_branch('target3/dir1')
1813
1974
        self.build_tree(['target3/dir1/file2'])
1814
1975
        build_tree(source.basis_tree(), target)
1815
 
        self.failIfExists('target3/dir1/file')
1816
 
        self.failUnlessExists('target3/dir1/file2')
1817
 
        self.failUnlessExists('target3/dir1.diverted/file')
 
1976
        self.assertPathDoesNotExist('target3/dir1/file')
 
1977
        self.assertPathExists('target3/dir1/file2')
 
1978
        self.assertPathExists('target3/dir1.diverted/file')
1818
1979
        self.assertEqual([DuplicateEntry('Diverted to',
1819
1980
            'dir1.diverted', 'dir1', 'new-dir1', None)],
1820
1981
            target.conflicts())
1823
1984
        self.build_tree(['target4/dir1/'])
1824
1985
        self.make_branch('target4/dir1/file')
1825
1986
        build_tree(source.basis_tree(), target)
1826
 
        self.failUnlessExists('target4/dir1/file')
 
1987
        self.assertPathExists('target4/dir1/file')
1827
1988
        self.assertEqual('directory', file_kind('target4/dir1/file'))
1828
 
        self.failUnlessExists('target4/dir1/file.diverted')
 
1989
        self.assertPathExists('target4/dir1/file.diverted')
1829
1990
        self.assertEqual([DuplicateEntry('Diverted to',
1830
1991
            'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1831
1992
            target.conflicts())
1899
2060
        self.addCleanup(target.unlock)
1900
2061
        self.assertEqual([], list(target.iter_changes(revision_tree)))
1901
2062
 
 
2063
    def test_build_tree_accelerator_tree_observes_sha1(self):
 
2064
        source = self.create_ab_tree()
 
2065
        sha1 = osutils.sha_string('A')
 
2066
        target = self.make_branch_and_tree('target')
 
2067
        target.lock_write()
 
2068
        self.addCleanup(target.unlock)
 
2069
        state = target.current_dirstate()
 
2070
        state._cutoff_time = time.time() + 60
 
2071
        build_tree(source.basis_tree(), target, source)
 
2072
        entry = state._get_entry(0, path_utf8='file1')
 
2073
        self.assertEqual(sha1, entry[1][0][1])
 
2074
 
1902
2075
    def test_build_tree_accelerator_tree_missing_file(self):
1903
2076
        source = self.create_ab_tree()
1904
2077
        os.unlink('source/file1')
2047
2220
        self.assertEqualStat(source_stat, target_stat)
2048
2221
 
2049
2222
    def test_case_insensitive_build_tree_inventory(self):
2050
 
        if (tests.CaseInsensitiveFilesystemFeature.available()
2051
 
            or tests.CaseInsCasePresFilenameFeature.available()):
 
2223
        if (features.CaseInsensitiveFilesystemFeature.available()
 
2224
            or features.CaseInsCasePresFilenameFeature.available()):
2052
2225
            raise tests.UnavailableFeature('Fully case sensitive filesystem')
2053
2226
        source = self.make_branch_and_tree('source')
2054
2227
        self.build_tree(['source/file', 'source/FILE'])
2062
2235
        self.assertEqual('file.moved', target.id2path('lower-id'))
2063
2236
        self.assertEqual('FILE', target.id2path('upper-id'))
2064
2237
 
 
2238
    def test_build_tree_observes_sha(self):
 
2239
        source = self.make_branch_and_tree('source')
 
2240
        self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
 
2241
        source.add(['file1', 'dir', 'dir/file2'],
 
2242
                   ['file1-id', 'dir-id', 'file2-id'])
 
2243
        source.commit('new files')
 
2244
        target = self.make_branch_and_tree('target')
 
2245
        target.lock_write()
 
2246
        self.addCleanup(target.unlock)
 
2247
        # We make use of the fact that DirState caches its cutoff time. So we
 
2248
        # set the 'safe' time to one minute in the future.
 
2249
        state = target.current_dirstate()
 
2250
        state._cutoff_time = time.time() + 60
 
2251
        build_tree(source.basis_tree(), target)
 
2252
        entry1_sha = osutils.sha_file_by_name('source/file1')
 
2253
        entry2_sha = osutils.sha_file_by_name('source/dir/file2')
 
2254
        # entry[1] is the state information, entry[1][0] is the state of the
 
2255
        # working tree, entry[1][0][1] is the sha value for the current working
 
2256
        # tree
 
2257
        entry1 = state._get_entry(0, path_utf8='file1')
 
2258
        self.assertEqual(entry1_sha, entry1[1][0][1])
 
2259
        # The 'size' field must also be set.
 
2260
        self.assertEqual(25, entry1[1][0][2])
 
2261
        entry1_state = entry1[1][0]
 
2262
        entry2 = state._get_entry(0, path_utf8='dir/file2')
 
2263
        self.assertEqual(entry2_sha, entry2[1][0][1])
 
2264
        self.assertEqual(29, entry2[1][0][2])
 
2265
        entry2_state = entry2[1][0]
 
2266
        # Now, make sure that we don't have to re-read the content. The
 
2267
        # packed_stat should match exactly.
 
2268
        self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
 
2269
        self.assertEqual(entry2_sha,
 
2270
                         target.get_file_sha1('file2-id', 'dir/file2'))
 
2271
        self.assertEqual(entry1_state, entry1[1][0])
 
2272
        self.assertEqual(entry2_state, entry2[1][0])
 
2273
 
2065
2274
 
2066
2275
class TestCommitTransform(tests.TestCaseWithTransport):
2067
2276
 
2232
2441
        self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2233
2442
        mover = _FileMover()
2234
2443
        mover.rename('a', 'q')
2235
 
        self.failUnlessExists('q')
2236
 
        self.failIfExists('a')
2237
 
        self.failUnlessExists('q/b')
2238
 
        self.failUnlessExists('c')
2239
 
        self.failUnlessExists('c/d')
 
2444
        self.assertPathExists('q')
 
2445
        self.assertPathDoesNotExist('a')
 
2446
        self.assertPathExists('q/b')
 
2447
        self.assertPathExists('c')
 
2448
        self.assertPathExists('c/d')
2240
2449
 
2241
2450
    def test_pre_delete_rollback(self):
2242
2451
        self.build_tree(['a/'])
2243
2452
        mover = _FileMover()
2244
2453
        mover.pre_delete('a', 'q')
2245
 
        self.failUnlessExists('q')
2246
 
        self.failIfExists('a')
 
2454
        self.assertPathExists('q')
 
2455
        self.assertPathDoesNotExist('a')
2247
2456
        mover.rollback()
2248
 
        self.failIfExists('q')
2249
 
        self.failUnlessExists('a')
 
2457
        self.assertPathDoesNotExist('q')
 
2458
        self.assertPathExists('a')
2250
2459
 
2251
2460
    def test_apply_deletions(self):
2252
2461
        self.build_tree(['a/', 'b/'])
2253
2462
        mover = _FileMover()
2254
2463
        mover.pre_delete('a', 'q')
2255
2464
        mover.pre_delete('b', 'r')
2256
 
        self.failUnlessExists('q')
2257
 
        self.failUnlessExists('r')
2258
 
        self.failIfExists('a')
2259
 
        self.failIfExists('b')
 
2465
        self.assertPathExists('q')
 
2466
        self.assertPathExists('r')
 
2467
        self.assertPathDoesNotExist('a')
 
2468
        self.assertPathDoesNotExist('b')
2260
2469
        mover.apply_deletions()
2261
 
        self.failIfExists('q')
2262
 
        self.failIfExists('r')
2263
 
        self.failIfExists('a')
2264
 
        self.failIfExists('b')
 
2470
        self.assertPathDoesNotExist('q')
 
2471
        self.assertPathDoesNotExist('r')
 
2472
        self.assertPathDoesNotExist('a')
 
2473
        self.assertPathDoesNotExist('b')
2265
2474
 
2266
2475
    def test_file_mover_rollback(self):
2267
2476
        self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2272
2481
            mover.rename('a', 'c')
2273
2482
        except errors.FileExists, e:
2274
2483
            mover.rollback()
2275
 
        self.failUnlessExists('a')
2276
 
        self.failUnlessExists('c/d')
 
2484
        self.assertPathExists('a')
 
2485
        self.assertPathExists('c/d')
2277
2486
 
2278
2487
 
2279
2488
class Bogus(Exception):
2309
2518
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2310
2519
        self.assertRaises(Bogus, tt.apply,
2311
2520
                          _mover=self.ExceptionFileMover(bad_source='a'))
2312
 
        self.failUnlessExists('a')
2313
 
        self.failUnlessExists('a/b')
 
2521
        self.assertPathExists('a')
 
2522
        self.assertPathExists('a/b')
2314
2523
        tt.apply()
2315
 
        self.failUnlessExists('c')
2316
 
        self.failUnlessExists('c/d')
 
2524
        self.assertPathExists('c')
 
2525
        self.assertPathExists('c/d')
2317
2526
 
2318
2527
    def test_rollback_rename_into_place(self):
2319
2528
        tree = self.make_branch_and_tree('.')
2325
2534
        tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
2326
2535
        self.assertRaises(Bogus, tt.apply,
2327
2536
                          _mover=self.ExceptionFileMover(bad_target='c/d'))
2328
 
        self.failUnlessExists('a')
2329
 
        self.failUnlessExists('a/b')
 
2537
        self.assertPathExists('a')
 
2538
        self.assertPathExists('a/b')
2330
2539
        tt.apply()
2331
 
        self.failUnlessExists('c')
2332
 
        self.failUnlessExists('c/d')
 
2540
        self.assertPathExists('c')
 
2541
        self.assertPathExists('c/d')
2333
2542
 
2334
2543
    def test_rollback_deletion(self):
2335
2544
        tree = self.make_branch_and_tree('.')
2341
2550
        tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2342
2551
        self.assertRaises(Bogus, tt.apply,
2343
2552
                          _mover=self.ExceptionFileMover(bad_target='d'))
2344
 
        self.failUnlessExists('a')
2345
 
        self.failUnlessExists('a/b')
 
2553
        self.assertPathExists('a')
 
2554
        self.assertPathExists('a/b')
 
2555
 
 
2556
 
 
2557
class TestFinalizeRobustness(tests.TestCaseWithTransport):
 
2558
    """Ensure treetransform creation errors can be safely cleaned up after"""
 
2559
 
 
2560
    def _override_globals_in_method(self, instance, method_name, globals):
 
2561
        """Replace method on instance with one with updated globals"""
 
2562
        import types
 
2563
        func = getattr(instance, method_name).im_func
 
2564
        new_globals = dict(func.func_globals)
 
2565
        new_globals.update(globals)
 
2566
        new_func = types.FunctionType(func.func_code, new_globals,
 
2567
            func.func_name, func.func_defaults)
 
2568
        setattr(instance, method_name,
 
2569
            types.MethodType(new_func, instance, instance.__class__))
 
2570
        self.addCleanup(delattr, instance, method_name)
 
2571
 
 
2572
    @staticmethod
 
2573
    def _fake_open_raises_before(name, mode):
 
2574
        """Like open() but raises before doing anything"""
 
2575
        raise RuntimeError
 
2576
 
 
2577
    @staticmethod
 
2578
    def _fake_open_raises_after(name, mode):
 
2579
        """Like open() but raises after creating file without returning"""
 
2580
        open(name, mode).close()
 
2581
        raise RuntimeError
 
2582
 
 
2583
    def create_transform_and_root_trans_id(self):
 
2584
        """Setup a transform creating a file in limbo"""
 
2585
        tree = self.make_branch_and_tree('.')
 
2586
        tt = TreeTransform(tree)
 
2587
        return tt, tt.create_path("a", tt.root)
 
2588
 
 
2589
    def create_transform_and_subdir_trans_id(self):
 
2590
        """Setup a transform creating a directory containing a file in limbo"""
 
2591
        tree = self.make_branch_and_tree('.')
 
2592
        tt = TreeTransform(tree)
 
2593
        d_trans_id = tt.create_path("d", tt.root)
 
2594
        tt.create_directory(d_trans_id)
 
2595
        f_trans_id = tt.create_path("a", d_trans_id)
 
2596
        tt.adjust_path("a", d_trans_id, f_trans_id)
 
2597
        return tt, f_trans_id
 
2598
 
 
2599
    def test_root_create_file_open_raises_before_creation(self):
 
2600
        tt, trans_id = self.create_transform_and_root_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, ["contents"], trans_id)
 
2604
        path = tt._limbo_name(trans_id)
 
2605
        self.assertPathDoesNotExist(path)
 
2606
        tt.finalize()
 
2607
        self.assertPathDoesNotExist(tt._limbodir)
 
2608
 
 
2609
    def test_root_create_file_open_raises_after_creation(self):
 
2610
        tt, trans_id = self.create_transform_and_root_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, ["contents"], trans_id)
 
2614
        path = tt._limbo_name(trans_id)
 
2615
        self.assertPathExists(path)
 
2616
        tt.finalize()
 
2617
        self.assertPathDoesNotExist(path)
 
2618
        self.assertPathDoesNotExist(tt._limbodir)
 
2619
 
 
2620
    def test_subdir_create_file_open_raises_before_creation(self):
 
2621
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2622
        self._override_globals_in_method(tt, "create_file",
 
2623
            {"open": self._fake_open_raises_before})
 
2624
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2625
        path = tt._limbo_name(trans_id)
 
2626
        self.assertPathDoesNotExist(path)
 
2627
        tt.finalize()
 
2628
        self.assertPathDoesNotExist(tt._limbodir)
 
2629
 
 
2630
    def test_subdir_create_file_open_raises_after_creation(self):
 
2631
        tt, trans_id = self.create_transform_and_subdir_trans_id()
 
2632
        self._override_globals_in_method(tt, "create_file",
 
2633
            {"open": self._fake_open_raises_after})
 
2634
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
 
2635
        path = tt._limbo_name(trans_id)
 
2636
        self.assertPathExists(path)
 
2637
        tt.finalize()
 
2638
        self.assertPathDoesNotExist(path)
 
2639
        self.assertPathDoesNotExist(tt._limbodir)
 
2640
 
 
2641
    def test_rename_in_limbo_rename_raises_after_rename(self):
 
2642
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2643
        parent1 = tt.new_directory('parent1', tt.root)
 
2644
        child1 = tt.new_file('child1', parent1, 'contents')
 
2645
        parent2 = tt.new_directory('parent2', tt.root)
 
2646
 
 
2647
        class FakeOSModule(object):
 
2648
            def rename(self, old, new):
 
2649
                os.rename(old, new)
 
2650
                raise RuntimeError
 
2651
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2652
            {"os": FakeOSModule()})
 
2653
        self.assertRaises(
 
2654
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2655
        path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
 
2656
        self.assertPathExists(path)
 
2657
        tt.finalize()
 
2658
        self.assertPathDoesNotExist(path)
 
2659
        self.assertPathDoesNotExist(tt._limbodir)
 
2660
 
 
2661
    def test_rename_in_limbo_rename_raises_before_rename(self):
 
2662
        tt, trans_id = self.create_transform_and_root_trans_id()
 
2663
        parent1 = tt.new_directory('parent1', tt.root)
 
2664
        child1 = tt.new_file('child1', parent1, 'contents')
 
2665
        parent2 = tt.new_directory('parent2', tt.root)
 
2666
 
 
2667
        class FakeOSModule(object):
 
2668
            def rename(self, old, new):
 
2669
                raise RuntimeError
 
2670
        self._override_globals_in_method(tt, "_rename_in_limbo",
 
2671
            {"os": FakeOSModule()})
 
2672
        self.assertRaises(
 
2673
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
 
2674
        path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
 
2675
        self.assertPathExists(path)
 
2676
        tt.finalize()
 
2677
        self.assertPathDoesNotExist(path)
 
2678
        self.assertPathDoesNotExist(tt._limbodir)
2346
2679
 
2347
2680
 
2348
2681
class TestTransformMissingParent(tests.TestCaseWithTransport):
2459
2792
 
2460
2793
    def test_iter_changes(self):
2461
2794
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2462
 
        root = revision_tree.inventory.root.file_id
 
2795
        root = revision_tree.get_root_id()
2463
2796
        self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2464
2797
                          (root, root), ('a', 'a'), ('file', 'file'),
2465
2798
                          (False, False))],
2469
2802
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2470
2803
        changes = preview_tree.iter_changes(revision_tree,
2471
2804
                                            include_unchanged=True)
2472
 
        root = revision_tree.inventory.root.file_id
 
2805
        root = revision_tree.get_root_id()
2473
2806
 
2474
2807
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2475
2808
 
2532
2865
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
2533
2866
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
2534
2867
 
 
2868
    def test_get_file_size(self):
 
2869
        work_tree = self.make_branch_and_tree('tree')
 
2870
        self.build_tree_contents([('tree/old', 'old')])
 
2871
        work_tree.add('old', 'old-id')
 
2872
        preview = TransformPreview(work_tree)
 
2873
        self.addCleanup(preview.finalize)
 
2874
        new_id = preview.new_file('name', preview.root, 'contents', 'new-id',
 
2875
                                  'executable')
 
2876
        tree = preview.get_preview_tree()
 
2877
        self.assertEqual(len('old'), tree.get_file_size('old-id'))
 
2878
        self.assertEqual(len('contents'), tree.get_file_size('new-id'))
 
2879
 
2535
2880
    def test_get_file(self):
2536
2881
        preview = self.get_empty_preview()
2537
2882
        preview.new_file('file', preview.root, 'contents', 'file-id')
2949
3294
        merger.merge_type = Merge3Merger
2950
3295
        merger.do_merge()
2951
3296
 
 
3297
    def test_has_filename(self):
 
3298
        wt = self.make_branch_and_tree('tree')
 
3299
        self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
 
3300
        tt = TransformPreview(wt)
 
3301
        removed_id = tt.trans_id_tree_path('removed')
 
3302
        tt.delete_contents(removed_id)
 
3303
        tt.new_file('new', tt.root, 'contents')
 
3304
        modified_id = tt.trans_id_tree_path('modified')
 
3305
        tt.delete_contents(modified_id)
 
3306
        tt.create_file('modified-contents', modified_id)
 
3307
        self.addCleanup(tt.finalize)
 
3308
        tree = tt.get_preview_tree()
 
3309
        self.assertTrue(tree.has_filename('unmodified'))
 
3310
        self.assertFalse(tree.has_filename('not-present'))
 
3311
        self.assertFalse(tree.has_filename('removed'))
 
3312
        self.assertTrue(tree.has_filename('new'))
 
3313
        self.assertTrue(tree.has_filename('modified'))
 
3314
 
2952
3315
    def test_is_executable(self):
2953
3316
        tree = self.make_branch_and_tree('tree')
2954
3317
        preview = TransformPreview(tree)
2977
3340
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
2978
3341
 
2979
3342
    def test_ascii_limbo_paths(self):
2980
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
3343
        self.requireFeature(features.UnicodeFilenameFeature)
2981
3344
        branch = self.make_branch('any')
2982
3345
        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
2983
3346
        tt = TransformPreview(tree)
3000
3363
 
3001
3364
class TestSerializeTransform(tests.TestCaseWithTransport):
3002
3365
 
3003
 
    _test_needs_features = [tests.UnicodeFilenameFeature]
 
3366
    _test_needs_features = [features.UnicodeFilenameFeature]
3004
3367
 
3005
3368
    def get_preview(self, tree=None):
3006
3369
        if tree is None:
3081
3444
        return self.make_records(attribs, contents)
3082
3445
 
3083
3446
    def test_serialize_symlink_creation(self):
3084
 
        self.requireFeature(tests.SymlinkFeature)
 
3447
        self.requireFeature(features.SymlinkFeature)
3085
3448
        tt = self.get_preview()
3086
3449
        tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
3087
3450
        self.assertSerializesTo(self.symlink_creation_records(), tt)
3088
3451
 
3089
3452
    def test_deserialize_symlink_creation(self):
3090
 
        self.requireFeature(tests.SymlinkFeature)
 
3453
        self.requireFeature(features.SymlinkFeature)
3091
3454
        tt = self.get_preview()
3092
3455
        tt.deserialize(iter(self.symlink_creation_records()))
3093
3456
        abspath = tt._limbo_name('new-1')
3271
3634
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3272
3635
 
3273
3636
    def _set_orphan_policy(self, wt, policy):
3274
 
        wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
 
3637
        wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
3275
3638
                                               policy)
3276
3639
 
3277
3640
    def _prepare_orphan(self, wt):
3350
3713
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3351
3714
                         remaining_conflicts.pop())
3352
3715
        self.assertLength(1, warnings)
3353
 
        self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')
 
3716
        self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
 
3717
 
 
3718
 
 
3719
class TestTransformHooks(tests.TestCaseWithTransport):
 
3720
 
 
3721
    def setUp(self):
 
3722
        super(TestTransformHooks, self).setUp()
 
3723
        self.wt = self.make_branch_and_tree('.')
 
3724
        os.chdir('..')
 
3725
 
 
3726
    def get_transform(self):
 
3727
        transform = TreeTransform(self.wt)
 
3728
        self.addCleanup(transform.finalize)
 
3729
        return transform, transform.root
 
3730
 
 
3731
    def test_pre_commit_hooks(self):
 
3732
        calls = []
 
3733
        def record_pre_transform(tree, tt):
 
3734
            calls.append((tree, tt))
 
3735
        MutableTree.hooks.install_named_hook('pre_transform',
 
3736
            record_pre_transform, "Pre transform")
 
3737
        transform, root = self.get_transform()
 
3738
        old_root_id = transform.tree_file_id(root)
 
3739
        transform.apply()
 
3740
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3741
        self.assertEquals([(self.wt, transform)], calls)
 
3742
 
 
3743
    def test_post_commit_hooks(self):
 
3744
        calls = []
 
3745
        def record_post_transform(tree, tt):
 
3746
            calls.append((tree, tt))
 
3747
        MutableTree.hooks.install_named_hook('post_transform',
 
3748
            record_post_transform, "Post transform")
 
3749
        transform, root = self.get_transform()
 
3750
        old_root_id = transform.tree_file_id(root)
 
3751
        transform.apply()
 
3752
        self.assertEqual(old_root_id, self.wt.get_root_id())
 
3753
        self.assertEquals([(self.wt, transform)], calls)