← 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: Canonical.com Patch Queue Manager
  • Date: 2011-05-11 15:04:23 UTC
  • mfrom: (5848.1.1 2.4-cython-first)
  • Revision ID: pqm@pqm.ubuntu.com-20110511150423-tpm1ablukqalkvim
(jameinel) Default to using Cython for compiling code,
 rather than Pyrex. (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
34
34
    transform,
35
35
    urlutils,
36
36
    )
 
37
from bzrlib.bzrdir import BzrDir
37
38
from bzrlib.conflicts import (
38
39
    DeletingParent,
39
40
    DuplicateEntry,
43
44
    ParentLoop,
44
45
    UnversionedParent,
45
46
)
46
 
from bzrlib.controldir import ControlDir
47
47
from bzrlib.diff import show_diff_trees
48
48
from bzrlib.errors import (
49
49
    DuplicateKey,
60
60
    pathjoin,
61
61
)
62
62
from bzrlib.merge import Merge3Merger, Merger
63
 
from bzrlib.mutabletree import MutableTree
64
63
from bzrlib.tests import (
65
64
    features,
 
65
    HardlinkFeature,
 
66
    SymlinkFeature,
66
67
    TestCaseInTempDir,
67
68
    TestSkipped,
68
 
    )
69
 
from bzrlib.tests.features import (
70
 
    HardlinkFeature,
71
 
    SymlinkFeature,
72
 
    )
 
69
)
73
70
from bzrlib.transform import (
74
71
    build_tree,
75
72
    create_from_tree,
88
85
 
89
86
    def setUp(self):
90
87
        super(TestTreeTransform, self).setUp()
91
 
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
 
88
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
92
89
        os.chdir('..')
93
90
 
94
91
    def get_transform(self):
288
285
        new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
289
286
        self.assertRaises(ValueError, transform.fixup_new_roots)
290
287
 
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
 
 
353
288
    def test_hardlink(self):
354
289
        self.requireFeature(HardlinkFeature)
355
290
        transform, root = self.get_transform()
399
334
        tree.lock_read()
400
335
        self.addCleanup(tree.unlock)
401
336
        self.assertEqual('subtree-revision',
402
 
                         tree.root_inventory['subtree-id'].reference_revision)
 
337
                         tree.inventory['subtree-id'].reference_revision)
403
338
 
404
339
    def test_conflicts(self):
405
340
        transform, root = self.get_transform()
456
391
        newtip = transform2.new_file('tip', oz_id, 'other', 'tip-id')
457
392
        result = transform2.find_conflicts()
458
393
        fp = FinalPaths(transform2)
459
 
        self.assertTrue('oz/tip' in transform2._tree_path_ids)
 
394
        self.assert_('oz/tip' in transform2._tree_path_ids)
460
395
        self.assertEqual(fp.get_path(newtip), pathjoin('oz', 'tip'))
461
396
        self.assertEqual(len(result), 2)
462
397
        self.assertEqual((result[0][0], result[0][1]),
782
717
                            'wizard2', 'behind_curtain')
783
718
 
784
719
    def test_symlinks_unicode(self):
785
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
720
        self.requireFeature(tests.UnicodeFilenameFeature)
786
721
        self._test_symlinks(u'\N{Euro Sign}wizard',
787
722
                            u'wizard-targ\N{Euro Sign}t',
788
723
                            u'\N{Euro Sign}wizard2',
801
736
        os.symlink = None
802
737
        try:
803
738
            err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
804
 
            self.assertEqual(
 
739
            self.assertEquals(
805
740
                "Unable to create symlink 'foo' on this platform",
806
741
                str(err))
807
742
        finally:
876
811
        raw_conflicts = resolve_conflicts(tt)
877
812
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
878
813
        tt.finalize()
879
 
        conflicts_s = [unicode(c) for c in cooked_conflicts]
 
814
        conflicts_s = [str(c) for c in cooked_conflicts]
880
815
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
881
816
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
882
817
                                         'Moved existing file to '
1477
1412
        # The rename will fail because the target directory is not empty (but
1478
1413
        # raises FileExists anyway).
1479
1414
        err = self.assertRaises(errors.FileExists, tt_helper)
1480
 
        self.assertEndsWith(err.path, "/baz")
 
1415
        self.assertContainsRe(str(err),
 
1416
            "^File exists: .+/baz")
1481
1417
 
1482
1418
    def test_two_directories_clash(self):
1483
1419
        def tt_helper():
1495
1431
                wt.unlock()
1496
1432
                raise
1497
1433
        err = self.assertRaises(errors.FileExists, tt_helper)
1498
 
        self.assertEndsWith(err.path, "/foo")
 
1434
        self.assertContainsRe(str(err),
 
1435
            "^File exists: .+/foo")
1499
1436
 
1500
1437
    def test_two_directories_clash_finalize(self):
1501
1438
        def tt_helper():
1513
1450
                tt.finalize()
1514
1451
                raise
1515
1452
        err = self.assertRaises(errors.FileExists, tt_helper)
1516
 
        self.assertEndsWith(err.path, "/foo")
 
1453
        self.assertContainsRe(str(err),
 
1454
            "^File exists: .+/foo")
1517
1455
 
1518
1456
    def test_file_to_directory(self):
1519
1457
        wt = self.make_branch_and_tree('.')
1532
1470
        self.assertPathExists("foo/bar")
1533
1471
        wt.lock_read()
1534
1472
        try:
1535
 
            self.assertEqual(wt.kind(wt.path2id("foo")), "directory")
 
1473
            self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
 
1474
                    "directory")
1536
1475
        finally:
1537
1476
            wt.unlock()
1538
1477
        wt.commit("two")
1554
1493
        self.assertPathExists("foo")
1555
1494
        wt.lock_read()
1556
1495
        self.addCleanup(wt.unlock)
1557
 
        self.assertEqual(wt.kind(wt.path2id("foo")), "symlink")
 
1496
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
 
1497
                "symlink")
1558
1498
 
1559
1499
    def test_dir_to_file(self):
1560
1500
        wt = self.make_branch_and_tree('.')
1572
1512
        self.assertPathExists("foo")
1573
1513
        wt.lock_read()
1574
1514
        self.addCleanup(wt.unlock)
1575
 
        self.assertEqual(wt.kind(wt.path2id("foo")), "file")
 
1515
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
 
1516
                "file")
1576
1517
 
1577
1518
    def test_dir_to_hardlink(self):
1578
1519
        self.requireFeature(HardlinkFeature)
1593
1534
        self.assertPathExists("baz")
1594
1535
        wt.lock_read()
1595
1536
        self.addCleanup(wt.unlock)
1596
 
        self.assertEqual(wt.kind(wt.path2id("foo")), "file")
 
1537
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
 
1538
                "file")
1597
1539
 
1598
1540
    def test_no_final_path(self):
1599
1541
        transform, root = self.get_transform()
1645
1587
    def __init__(self, dirname, root_id):
1646
1588
        self.name = dirname
1647
1589
        os.mkdir(dirname)
1648
 
        self.wt = ControlDir.create_standalone_workingtree(dirname)
 
1590
        self.wt = BzrDir.create_standalone_workingtree(dirname)
1649
1591
        self.wt.set_root_id(root_id)
1650
1592
        self.b = self.wt.branch
1651
1593
        self.tt = TreeTransform(self.wt)
1657
1599
    return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1658
1600
 
1659
1601
 
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
 
 
1692
1602
class TestTransformMerge(TestCaseInTempDir):
1693
1603
 
1694
1604
    def test_text_merge(self):
1761
1671
        merge_modified = this.wt.merge_modified()
1762
1672
        self.assertSubset(merge_modified, modified)
1763
1673
        self.assertEqual(len(merge_modified), len(modified))
1764
 
        with file(this.wt.id2abspath('a'), 'wb') as f: f.write('booga')
 
1674
        file(this.wt.id2abspath('a'), 'wb').write('booga')
1765
1675
        modified.pop(0)
1766
1676
        merge_modified = this.wt.merge_modified()
1767
1677
        self.assertSubset(merge_modified, modified)
1881
1791
    def test_build_tree_with_symlinks(self):
1882
1792
        self.requireFeature(SymlinkFeature)
1883
1793
        os.mkdir('a')
1884
 
        a = ControlDir.create_standalone_workingtree('a')
 
1794
        a = BzrDir.create_standalone_workingtree('a')
1885
1795
        os.mkdir('a/foo')
1886
 
        with file('a/foo/bar', 'wb') as f: f.write('contents')
 
1796
        file('a/foo/bar', 'wb').write('contents')
1887
1797
        os.symlink('a/foo/bar', 'a/foo/baz')
1888
1798
        a.add(['foo', 'foo/bar', 'foo/baz'])
1889
1799
        a.commit('initial commit')
1890
 
        b = ControlDir.create_standalone_workingtree('b')
 
1800
        b = BzrDir.create_standalone_workingtree('b')
1891
1801
        basis = a.basis_tree()
1892
1802
        basis.lock_read()
1893
1803
        self.addCleanup(basis.unlock)
1898
1808
 
1899
1809
    def test_build_with_references(self):
1900
1810
        tree = self.make_branch_and_tree('source',
1901
 
            format='development-subtree')
 
1811
            format='dirstate-with-subtree')
1902
1812
        subtree = self.make_branch_and_tree('source/subtree',
1903
 
            format='development-subtree')
 
1813
            format='dirstate-with-subtree')
1904
1814
        tree.add_reference(subtree)
1905
1815
        tree.commit('a revision')
1906
1816
        tree.branch.create_checkout('target')
2184
2094
        def rot13(chunks, context=None):
2185
2095
            return [''.join(chunks).encode('rot13')]
2186
2096
        rot13filter = filters.ContentFilter(rot13, rot13)
2187
 
        filters.filter_stacks_registry.register(
2188
 
            'rot13', {'yes': [rot13filter]}.get)
 
2097
        filters.register_filter_stack_map('rot13', {'yes': [rot13filter]}.get)
2189
2098
        os.mkdir(self.test_home_dir + '/.bazaar')
2190
2099
        rules_filename = self.test_home_dir + '/.bazaar/rules'
2191
2100
        f = open(rules_filename, 'wb')
2221
2130
        self.assertEqualStat(source_stat, target_stat)
2222
2131
 
2223
2132
    def test_case_insensitive_build_tree_inventory(self):
2224
 
        if (features.CaseInsensitiveFilesystemFeature.available()
2225
 
            or features.CaseInsCasePresFilenameFeature.available()):
 
2133
        if (tests.CaseInsensitiveFilesystemFeature.available()
 
2134
            or tests.CaseInsCasePresFilenameFeature.available()):
2226
2135
            raise tests.UnavailableFeature('Fully case sensitive filesystem')
2227
2136
        source = self.make_branch_and_tree('source')
2228
2137
        self.build_tree(['source/file', 'source/FILE'])
2411
2320
        self.assertEqual('tree', revision.properties['branch-nick'])
2412
2321
 
2413
2322
 
 
2323
class TestBackupName(tests.TestCase):
 
2324
 
 
2325
    def test_deprecations(self):
 
2326
        class MockTransform(object):
 
2327
 
 
2328
            def has_named_child(self, by_parent, parent_id, name):
 
2329
                return name in by_parent.get(parent_id, [])
 
2330
 
 
2331
        class MockEntry(object):
 
2332
 
 
2333
            def __init__(self):
 
2334
                object.__init__(self)
 
2335
                self.name = "name"
 
2336
 
 
2337
        tt = MockTransform()
 
2338
        name1 = self.applyDeprecated(
 
2339
            symbol_versioning.deprecated_in((2, 3, 0)),
 
2340
            transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
 
2341
        self.assertEqual('name.~1~', name1)
 
2342
        name2 = self.applyDeprecated(
 
2343
            symbol_versioning.deprecated_in((2, 3, 0)),
 
2344
            transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
 
2345
        self.assertEqual('name.~2~', name2)
 
2346
 
 
2347
 
2414
2348
class TestFileMover(tests.TestCaseWithTransport):
2415
2349
 
2416
2350
    def test_file_mover(self):
2530
2464
        self.assertPathExists('a/b')
2531
2465
 
2532
2466
 
2533
 
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2534
 
    """Ensure treetransform creation errors can be safely cleaned up after"""
2535
 
 
2536
 
    def _override_globals_in_method(self, instance, method_name, globals):
2537
 
        """Replace method on instance with one with updated globals"""
2538
 
        import types
2539
 
        func = getattr(instance, method_name).im_func
2540
 
        new_globals = dict(func.func_globals)
2541
 
        new_globals.update(globals)
2542
 
        new_func = types.FunctionType(func.func_code, new_globals,
2543
 
            func.func_name, func.func_defaults)
2544
 
        setattr(instance, method_name,
2545
 
            types.MethodType(new_func, instance, instance.__class__))
2546
 
        self.addCleanup(delattr, instance, method_name)
2547
 
 
2548
 
    @staticmethod
2549
 
    def _fake_open_raises_before(name, mode):
2550
 
        """Like open() but raises before doing anything"""
2551
 
        raise RuntimeError
2552
 
 
2553
 
    @staticmethod
2554
 
    def _fake_open_raises_after(name, mode):
2555
 
        """Like open() but raises after creating file without returning"""
2556
 
        open(name, mode).close()
2557
 
        raise RuntimeError
2558
 
 
2559
 
    def create_transform_and_root_trans_id(self):
2560
 
        """Setup a transform creating a file in limbo"""
2561
 
        tree = self.make_branch_and_tree('.')
2562
 
        tt = TreeTransform(tree)
2563
 
        return tt, tt.create_path("a", tt.root)
2564
 
 
2565
 
    def create_transform_and_subdir_trans_id(self):
2566
 
        """Setup a transform creating a directory containing a file in limbo"""
2567
 
        tree = self.make_branch_and_tree('.')
2568
 
        tt = TreeTransform(tree)
2569
 
        d_trans_id = tt.create_path("d", tt.root)
2570
 
        tt.create_directory(d_trans_id)
2571
 
        f_trans_id = tt.create_path("a", d_trans_id)
2572
 
        tt.adjust_path("a", d_trans_id, f_trans_id)
2573
 
        return tt, f_trans_id
2574
 
 
2575
 
    def test_root_create_file_open_raises_before_creation(self):
2576
 
        tt, trans_id = self.create_transform_and_root_trans_id()
2577
 
        self._override_globals_in_method(tt, "create_file",
2578
 
            {"open": self._fake_open_raises_before})
2579
 
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2580
 
        path = tt._limbo_name(trans_id)
2581
 
        self.assertPathDoesNotExist(path)
2582
 
        tt.finalize()
2583
 
        self.assertPathDoesNotExist(tt._limbodir)
2584
 
 
2585
 
    def test_root_create_file_open_raises_after_creation(self):
2586
 
        tt, trans_id = self.create_transform_and_root_trans_id()
2587
 
        self._override_globals_in_method(tt, "create_file",
2588
 
            {"open": self._fake_open_raises_after})
2589
 
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2590
 
        path = tt._limbo_name(trans_id)
2591
 
        self.assertPathExists(path)
2592
 
        tt.finalize()
2593
 
        self.assertPathDoesNotExist(path)
2594
 
        self.assertPathDoesNotExist(tt._limbodir)
2595
 
 
2596
 
    def test_subdir_create_file_open_raises_before_creation(self):
2597
 
        tt, trans_id = self.create_transform_and_subdir_trans_id()
2598
 
        self._override_globals_in_method(tt, "create_file",
2599
 
            {"open": self._fake_open_raises_before})
2600
 
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2601
 
        path = tt._limbo_name(trans_id)
2602
 
        self.assertPathDoesNotExist(path)
2603
 
        tt.finalize()
2604
 
        self.assertPathDoesNotExist(tt._limbodir)
2605
 
 
2606
 
    def test_subdir_create_file_open_raises_after_creation(self):
2607
 
        tt, trans_id = self.create_transform_and_subdir_trans_id()
2608
 
        self._override_globals_in_method(tt, "create_file",
2609
 
            {"open": self._fake_open_raises_after})
2610
 
        self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2611
 
        path = tt._limbo_name(trans_id)
2612
 
        self.assertPathExists(path)
2613
 
        tt.finalize()
2614
 
        self.assertPathDoesNotExist(path)
2615
 
        self.assertPathDoesNotExist(tt._limbodir)
2616
 
 
2617
 
    def test_rename_in_limbo_rename_raises_after_rename(self):
2618
 
        tt, trans_id = self.create_transform_and_root_trans_id()
2619
 
        parent1 = tt.new_directory('parent1', tt.root)
2620
 
        child1 = tt.new_file('child1', parent1, 'contents')
2621
 
        parent2 = tt.new_directory('parent2', tt.root)
2622
 
 
2623
 
        class FakeOSModule(object):
2624
 
            def rename(self, old, new):
2625
 
                os.rename(old, new)
2626
 
                raise RuntimeError
2627
 
        self._override_globals_in_method(tt, "_rename_in_limbo",
2628
 
            {"os": FakeOSModule()})
2629
 
        self.assertRaises(
2630
 
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
2631
 
        path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2632
 
        self.assertPathExists(path)
2633
 
        tt.finalize()
2634
 
        self.assertPathDoesNotExist(path)
2635
 
        self.assertPathDoesNotExist(tt._limbodir)
2636
 
 
2637
 
    def test_rename_in_limbo_rename_raises_before_rename(self):
2638
 
        tt, trans_id = self.create_transform_and_root_trans_id()
2639
 
        parent1 = tt.new_directory('parent1', tt.root)
2640
 
        child1 = tt.new_file('child1', parent1, 'contents')
2641
 
        parent2 = tt.new_directory('parent2', tt.root)
2642
 
 
2643
 
        class FakeOSModule(object):
2644
 
            def rename(self, old, new):
2645
 
                raise RuntimeError
2646
 
        self._override_globals_in_method(tt, "_rename_in_limbo",
2647
 
            {"os": FakeOSModule()})
2648
 
        self.assertRaises(
2649
 
            RuntimeError, tt.adjust_path, "child1", parent2, child1)
2650
 
        path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2651
 
        self.assertPathExists(path)
2652
 
        tt.finalize()
2653
 
        self.assertPathDoesNotExist(path)
2654
 
        self.assertPathDoesNotExist(tt._limbodir)
2655
 
 
2656
 
 
2657
2467
class TestTransformMissingParent(tests.TestCaseWithTransport):
2658
2468
 
2659
2469
    def make_tt_with_versioned_dir(self):
2768
2578
 
2769
2579
    def test_iter_changes(self):
2770
2580
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2771
 
        root = revision_tree.get_root_id()
 
2581
        root = revision_tree.inventory.root.file_id
2772
2582
        self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2773
2583
                          (root, root), ('a', 'a'), ('file', 'file'),
2774
2584
                          (False, False))],
2778
2588
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2779
2589
        changes = preview_tree.iter_changes(revision_tree,
2780
2590
                                            include_unchanged=True)
2781
 
        root = revision_tree.get_root_id()
 
2591
        root = revision_tree.inventory.root.file_id
2782
2592
 
2783
2593
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2784
2594
 
3316
3126
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
3317
3127
 
3318
3128
    def test_ascii_limbo_paths(self):
3319
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
3129
        self.requireFeature(tests.UnicodeFilenameFeature)
3320
3130
        branch = self.make_branch('any')
3321
3131
        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
3322
3132
        tt = TransformPreview(tree)
3339
3149
 
3340
3150
class TestSerializeTransform(tests.TestCaseWithTransport):
3341
3151
 
3342
 
    _test_needs_features = [features.UnicodeFilenameFeature]
 
3152
    _test_needs_features = [tests.UnicodeFilenameFeature]
3343
3153
 
3344
3154
    def get_preview(self, tree=None):
3345
3155
        if tree is None:
3420
3230
        return self.make_records(attribs, contents)
3421
3231
 
3422
3232
    def test_serialize_symlink_creation(self):
3423
 
        self.requireFeature(features.SymlinkFeature)
 
3233
        self.requireFeature(tests.SymlinkFeature)
3424
3234
        tt = self.get_preview()
3425
3235
        tt.new_symlink(u'foo\u1234', tt.root, u'bar\u1234')
3426
3236
        self.assertSerializesTo(self.symlink_creation_records(), tt)
3427
3237
 
3428
3238
    def test_deserialize_symlink_creation(self):
3429
 
        self.requireFeature(features.SymlinkFeature)
 
3239
        self.requireFeature(tests.SymlinkFeature)
3430
3240
        tt = self.get_preview()
3431
3241
        tt.deserialize(iter(self.symlink_creation_records()))
3432
3242
        abspath = tt._limbo_name('new-1')
3610
3420
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3611
3421
 
3612
3422
    def _set_orphan_policy(self, wt, policy):
3613
 
        wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
 
3423
        wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
3614
3424
                                               policy)
3615
3425
 
3616
3426
    def _prepare_orphan(self, wt):
3642
3452
            warnings.append(args[0] % args[1:])
3643
3453
        self.overrideAttr(trace, 'warning', warning)
3644
3454
        remaining_conflicts = resolve_conflicts(tt)
3645
 
        self.assertEqual(['dir/foo has been orphaned in bzr-orphans'],
 
3455
        self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
3646
3456
                          warnings)
3647
3457
        # Yeah for resolved conflicts !
3648
3458
        self.assertLength(0, remaining_conflicts)
3649
3459
        # We have a new orphan
3650
 
        self.assertEqual('foo.~1~', tt.final_name(orphan_tid))
3651
 
        self.assertEqual('bzr-orphans',
 
3460
        self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
 
3461
        self.assertEquals('bzr-orphans',
3652
3462
                          tt.final_name(tt.final_parent(orphan_tid)))
3653
3463
 
3654
3464
    def test_never_orphan(self):
3689
3499
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3690
3500
                         remaining_conflicts.pop())
3691
3501
        self.assertLength(1, warnings)
3692
 
        self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
3693
 
 
3694
 
 
3695
 
class TestTransformHooks(tests.TestCaseWithTransport):
3696
 
 
3697
 
    def setUp(self):
3698
 
        super(TestTransformHooks, self).setUp()
3699
 
        self.wt = self.make_branch_and_tree('.')
3700
 
        os.chdir('..')
3701
 
 
3702
 
    def get_transform(self):
3703
 
        transform = TreeTransform(self.wt)
3704
 
        self.addCleanup(transform.finalize)
3705
 
        return transform, transform.root
3706
 
 
3707
 
    def test_pre_commit_hooks(self):
3708
 
        calls = []
3709
 
        def record_pre_transform(tree, tt):
3710
 
            calls.append((tree, tt))
3711
 
        MutableTree.hooks.install_named_hook('pre_transform',
3712
 
            record_pre_transform, "Pre transform")
3713
 
        transform, root = self.get_transform()
3714
 
        old_root_id = transform.tree_file_id(root)
3715
 
        transform.apply()
3716
 
        self.assertEqual(old_root_id, self.wt.get_root_id())
3717
 
        self.assertEqual([(self.wt, transform)], calls)
3718
 
 
3719
 
    def test_post_commit_hooks(self):
3720
 
        calls = []
3721
 
        def record_post_transform(tree, tt):
3722
 
            calls.append((tree, tt))
3723
 
        MutableTree.hooks.install_named_hook('post_transform',
3724
 
            record_post_transform, "Post transform")
3725
 
        transform, root = self.get_transform()
3726
 
        old_root_id = transform.tree_file_id(root)
3727
 
        transform.apply()
3728
 
        self.assertEqual(old_root_id, self.wt.get_root_id())
3729
 
        self.assertEqual([(self.wt, transform)], calls)
 
3502
        self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')