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 |
)
|
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
21 |
from bzrlib.tests.tree_implementations import TestCaseWithTree |
22 |
||
23 |
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 |
24 |
|
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
25 |
def test_annotate(self): |
26 |
work_tree = self.make_branch_and_tree('wt') |
|
27 |
tree = self.get_tree_no_parents_abc_content(work_tree) |
|
28 |
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 |
29 |
tree.lock_read() |
30 |
try: |
|
31 |
for revision, line in tree.annotate_iter('a-id'): |
|
32 |
self.assertEqual('contents of a\n', line) |
|
33 |
self.assertEqual(tree_revision, revision) |
|
34 |
finally: |
|
35 |
tree.unlock() |
|
2100.3.20
by Aaron Bentley
Implement tree comparison for tree references |
36 |
|
37 |
||
38 |
class TestReference(TestCaseWithTree): |
|
39 |
||
40 |
def skip_if_no_reference(self, tree): |
|
41 |
if not getattr(tree, 'supports_tree_reference', lambda: False)(): |
|
42 |
raise tests.TestSkipped('Tree references not supported') |
|
43 |
||
2100.3.27
by Aaron Bentley
Enable nested commits |
44 |
def create_nested(self): |
2100.3.20
by Aaron Bentley
Implement tree comparison for tree references |
45 |
work_tree = self.make_branch_and_tree('wt') |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
46 |
work_tree.lock_write() |
47 |
try: |
|
48 |
self.skip_if_no_reference(work_tree) |
|
49 |
subtree = self.make_branch_and_tree('wt/subtree') |
|
50 |
subtree.set_root_id('sub-root') |
|
51 |
subtree.commit('foo', rev_id='sub-1') |
|
52 |
work_tree.add_reference(subtree) |
|
53 |
finally: |
|
54 |
work_tree.unlock() |
|
2100.3.20
by Aaron Bentley
Implement tree comparison for tree references |
55 |
tree = self._convert_tree(work_tree) |
56 |
self.skip_if_no_reference(tree) |
|
2100.3.27
by Aaron Bentley
Enable nested commits |
57 |
return tree |
58 |
||
59 |
def test_get_reference_revision(self): |
|
60 |
tree = self.create_nested() |
|
2100.3.20
by Aaron Bentley
Implement tree comparison for tree references |
61 |
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. |
62 |
self.assertEqual('sub-1', tree.get_reference_revision('sub-root', path)) |
2100.3.27
by Aaron Bentley
Enable nested commits |
63 |
|
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. |
64 |
def test_iter_references(self): |
2100.3.27
by Aaron Bentley
Enable nested commits |
65 |
tree = self.create_nested() |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
66 |
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. |
67 |
self.addCleanup(tree.unlock) |
68 |
entry = tree.inventory['sub-root'] |
|
69 |
self.assertEqual([(tree.abspath('subtree'), 'sub-root')], |
|
70 |
list(tree.iter_references())) |
|
2255.2.166
by Martin Pool
(broken) Add Tree.get_root_id() & test |
71 |
|
72 |
def test_get_root_id(self): |
|
73 |
# trees should return some kind of root id; it can be none
|
|
74 |
tree = self.make_branch_and_tree('tree') |
|
75 |
root_id = tree.get_root_id() |
|
76 |
if root_id is not None: |
|
77 |
self.assertIsInstance(root_id, str) |
|
2255.2.180
by Martin Pool
merge dirstate |
78 |
|
79 |
||
2255.11.5
by Martin Pool
Tree.id2path should raise NoSuchId, not return None. |
80 |
class TestFileIds(TestCaseWithTree): |
81 |
||
82 |
def test_id2path(self): |
|
83 |
# translate from file-id back to path
|
|
84 |
work_tree = self.make_branch_and_tree('wt') |
|
85 |
tree = self.get_tree_no_parents_abc_content(work_tree) |
|
86 |
tree.lock_read() |
|
87 |
try: |
|
88 |
self.assertEqual(u'a', tree.id2path('a-id')) |
|
89 |
# other ids give an error- don't return None for this case
|
|
90 |
self.assertRaises(errors.NoSuchId, tree.id2path, 'a') |
|
91 |
finally: |
|
92 |
tree.unlock() |