~bzr-pqm/bzr/bzr.dev

2255.7.83 by John Arbash Meinel
Update some obvious copyright headers to include 2007.
1
# Copyright (C) 2006, 2007 Canonical Ltd
1551.9.21 by Aaron Bentley
Fix copyright statements
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
17
from bzrlib import (
18
    errors,
2255.2.180 by Martin Pool
merge dirstate
19
    tests,
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
20
    )
2338.4.4 by Marien Zwart
Increase test coverage.
21
from bzrlib.tests import TestSkipped
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
22
from bzrlib.tests.tree_implementations import TestCaseWithTree
23
24
class TestAnnotate(TestCaseWithTree):
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
25
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
26
    def test_annotate(self):
27
        work_tree = self.make_branch_and_tree('wt')
28
        tree = self.get_tree_no_parents_abc_content(work_tree)
29
        tree_revision = getattr(tree, 'get_revision_id', lambda: 'current:')()
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
30
        tree.lock_read()
31
        try:
32
            for revision, line in tree.annotate_iter('a-id'):
33
                self.assertEqual('contents of a\n', line)
34
                self.assertEqual(tree_revision, revision)
35
        finally:
36
            tree.unlock()
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
37
38
39
class TestReference(TestCaseWithTree):
40
41
    def skip_if_no_reference(self, tree):
42
        if not getattr(tree, 'supports_tree_reference', lambda: False)():
43
            raise tests.TestSkipped('Tree references not supported')
44
2100.3.27 by Aaron Bentley
Enable nested commits
45
    def create_nested(self):
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
46
        work_tree = self.make_branch_and_tree('wt')
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
47
        work_tree.lock_write()
48
        try:
49
            self.skip_if_no_reference(work_tree)
50
            subtree = self.make_branch_and_tree('wt/subtree')
51
            subtree.set_root_id('sub-root')
52
            subtree.commit('foo', rev_id='sub-1')
53
            work_tree.add_reference(subtree)
54
        finally:
55
            work_tree.unlock()
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
56
        tree = self._convert_tree(work_tree)
57
        self.skip_if_no_reference(tree)
2100.3.27 by Aaron Bentley
Enable nested commits
58
        return tree
59
60
    def test_get_reference_revision(self):
61
        tree = self.create_nested()
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
62
        path = tree.id2path('sub-root')
2255.2.226 by Robert Collins
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.
63
        self.assertEqual('sub-1', tree.get_reference_revision('sub-root', path))
2100.3.27 by Aaron Bentley
Enable nested commits
64
2255.2.226 by Robert Collins
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.
65
    def test_iter_references(self):
2100.3.27 by Aaron Bentley
Enable nested commits
66
        tree = self.create_nested()
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
67
        tree.lock_read()
2255.2.226 by Robert Collins
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.
68
        self.addCleanup(tree.unlock)
69
        entry = tree.inventory['sub-root']
70
        self.assertEqual([(tree.abspath('subtree'), 'sub-root')],
71
            list(tree.iter_references()))
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
72
73
    def test_get_root_id(self):
74
        # trees should return some kind of root id; it can be none
75
        tree = self.make_branch_and_tree('tree')
76
        root_id = tree.get_root_id()
77
        if root_id is not None:
78
            self.assertIsInstance(root_id, str)
2255.2.180 by Martin Pool
merge dirstate
79
80
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
81
class TestFileIds(TestCaseWithTree):
82
83
    def test_id2path(self):
84
        # translate from file-id back to path
85
        work_tree = self.make_branch_and_tree('wt')
86
        tree = self.get_tree_no_parents_abc_content(work_tree)
87
        tree.lock_read()
88
        try:
89
            self.assertEqual(u'a', tree.id2path('a-id'))
90
            # other ids give an error- don't return None for this case
91
            self.assertRaises(errors.NoSuchId, tree.id2path, 'a')
92
        finally:
93
            tree.unlock()