← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_tree.py

  • Committer: Robert Collins
  • Date: 2007-03-06 12:28:18 UTC
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070306122818-xk0lc3l01ecl6vbc
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_tree.py
58
58
 
59
59
    def test_get_reference_revision(self):
60
60
        tree = self.create_nested()
61
 
        tree.lock_read()
62
 
        try:
63
 
            entry = tree.inventory['sub-root']
64
 
        finally:
65
 
            tree.unlock()
66
61
        path = tree.id2path('sub-root')
67
 
        self.assertEqual('sub-1', tree.get_reference_revision(entry, path))
 
62
        self.assertEqual('sub-1', tree.get_reference_revision('sub-root', path))
68
63
 
69
 
    def test_iter_reference_entries(self):
 
64
    def test_iter_references(self):
70
65
        tree = self.create_nested()
71
66
        tree.lock_read()
72
 
        try:
73
 
            entry = tree.inventory['sub-root']
74
 
        finally:
75
 
            tree.unlock()
76
 
        self.assertEqual([entry], [e for p, e in
77
 
                                   tree.iter_reference_entries()])
 
67
        self.addCleanup(tree.unlock)
 
68
        entry = tree.inventory['sub-root']
 
69
        self.assertEqual([(tree.abspath('subtree'), 'sub-root')],
 
70
            list(tree.iter_references()))
78
71
 
79
72
    def test_get_root_id(self):
80
73
        # trees should return some kind of root id; it can be none