~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()
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
31
        self.addCleanup(tree.unlock)
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
        tree_revision = getattr(tree, 'get_revision_id', lambda: 'random:')()
36
        for revision, line in tree.annotate_iter('a-id', 'random:'):
37
            self.assertEqual('contents of a\n', line)
38
            self.assertEqual(tree_revision, revision)
39
40
1551.15.52 by Aaron Bentley
Tweak from review comments
41
class TestPlanFileMerge(TestCaseWithTree):
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
42
1551.15.52 by Aaron Bentley
Tweak from review comments
43
    def test_plan_file_merge(self):
1551.15.48 by Aaron Bentley
Add tests for annotate and plan_merge
44
        work_a = self.make_branch_and_tree('wta')
45
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
46
        work_a.add('file', 'file-id')
47
        work_a.commit('base version')
48
        work_b = work_a.bzrdir.sprout('wtb').open_workingtree()
49
        self.build_tree_contents([('wta/file', 'b\nc\nd\ne\n')])
50
        tree_a = self.workingtree_to_test_tree(work_a)
51
        tree_a.lock_read()
52
        self.addCleanup(tree_a.unlock)
53
        self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
54
        tree_b = self.workingtree_to_test_tree(work_b)
55
        tree_b.lock_read()
56
        self.addCleanup(tree_b.unlock)
57
        self.assertEqual([
58
            ('killed-b', 'b\n'),
59
            ('killed-a', 'a\n'),
60
            ('unchanged', 'c\n'),
61
            ('unchanged', 'd\n'),
62
            ('new-a', 'e\n'),
63
            ('new-b', 'f\n'),
1551.15.52 by Aaron Bentley
Tweak from review comments
64
        ], list(tree_a.plan_file_merge('file-id', tree_b)))
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
65
66
67
class TestReference(TestCaseWithTree):
68
69
    def skip_if_no_reference(self, tree):
70
        if not getattr(tree, 'supports_tree_reference', lambda: False)():
71
            raise tests.TestSkipped('Tree references not supported')
72
2100.3.27 by Aaron Bentley
Enable nested commits
73
    def create_nested(self):
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
74
        work_tree = self.make_branch_and_tree('wt')
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
75
        work_tree.lock_write()
76
        try:
77
            self.skip_if_no_reference(work_tree)
78
            subtree = self.make_branch_and_tree('wt/subtree')
79
            subtree.set_root_id('sub-root')
80
            subtree.commit('foo', rev_id='sub-1')
81
            work_tree.add_reference(subtree)
82
        finally:
83
            work_tree.unlock()
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
84
        tree = self._convert_tree(work_tree)
85
        self.skip_if_no_reference(tree)
2100.3.27 by Aaron Bentley
Enable nested commits
86
        return tree
87
88
    def test_get_reference_revision(self):
89
        tree = self.create_nested()
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
90
        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.
91
        self.assertEqual('sub-1', tree.get_reference_revision('sub-root', path))
2100.3.27 by Aaron Bentley
Enable nested commits
92
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.
93
    def test_iter_references(self):
2100.3.27 by Aaron Bentley
Enable nested commits
94
        tree = self.create_nested()
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
95
        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.
96
        self.addCleanup(tree.unlock)
97
        entry = tree.inventory['sub-root']
98
        self.assertEqual([(tree.abspath('subtree'), 'sub-root')],
99
            list(tree.iter_references()))
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
100
101
    def test_get_root_id(self):
102
        # trees should return some kind of root id; it can be none
103
        tree = self.make_branch_and_tree('tree')
104
        root_id = tree.get_root_id()
105
        if root_id is not None:
106
            self.assertIsInstance(root_id, str)
2255.2.180 by Martin Pool
merge dirstate
107
108
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
109
class TestFileIds(TestCaseWithTree):
110
111
    def test_id2path(self):
112
        # translate from file-id back to path
113
        work_tree = self.make_branch_and_tree('wt')
114
        tree = self.get_tree_no_parents_abc_content(work_tree)
115
        tree.lock_read()
116
        try:
117
            self.assertEqual(u'a', tree.id2path('a-id'))
118
            # other ids give an error- don't return None for this case
119
            self.assertRaises(errors.NoSuchId, tree.id2path, 'a')
120
        finally:
121
            tree.unlock()