bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
1878.2.1
by John Arbash Meinel
adding some direct tests for compare_trees |
1 |
# Copyright (C) 2006 by Canonical Development Ltd
|
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 |
||
17 |
"""test the functions in bzrlib/delta.py"""
|
|
18 |
||
19 |
from bzrlib import delta, revision, transform |
|
20 |
from bzrlib.tests import TestCaseWithTransport |
|
21 |
||
22 |
||
23 |
class TestCompareTrees(TestCaseWithTransport): |
|
24 |
||
25 |
def setUp(self): |
|
26 |
TestCaseWithTransport.setUp(self) |
|
27 |
self.tree = self.make_branch_and_tree('tree') |
|
28 |
files = ['a', 'b/', 'b/c'] |
|
29 |
self.build_tree(['tree/' + f for f in files]) |
|
30 |
self.tree.add(files, ['a-id', 'b-id', 'c-id']) |
|
31 |
self.tree.commit('initial tree') |
|
32 |
||
33 |
def test_revision_tree_against_empty(self): |
|
34 |
empty_tree = self.tree.branch.repository.revision_tree( |
|
35 |
revision.NULL_REVISION) |
|
36 |
d = delta.compare_trees(empty_tree, self.tree.basis_tree()) |
|
37 |
self.assertEqual([('a', 'a-id', 'file'), |
|
38 |
('b', 'b-id', 'directory'), |
|
39 |
('b/c', 'c-id', 'file'), |
|
40 |
], d.added) |
|
41 |
self.assertEqual([], d.removed) |
|
42 |
self.assertEqual([], d.renamed) |
|
43 |
self.assertEqual([], d.modified) |
|
44 |
||
45 |
d = delta.compare_trees(self.tree.basis_tree(), empty_tree) |
|
46 |
self.assertEqual([], d.added) |
|
47 |
self.assertEqual([('a', 'a-id', 'file'), |
|
48 |
('b', 'b-id', 'directory'), |
|
49 |
('b/c', 'c-id', 'file'), |
|
50 |
], d.removed) |
|
51 |
self.assertEqual([], d.renamed) |
|
52 |
self.assertEqual([], d.modified) |
|
53 |
||
54 |
def test_tree_modified(self): |
|
55 |
open('tree/a', 'wb').write('foobar\n') |
|
56 |
||
57 |
d = delta.compare_trees(self.tree.basis_tree(), self.tree) |
|
58 |
self.assertEqual([], d.added) |
|
59 |
self.assertEqual([], d.removed) |
|
60 |
self.assertEqual([], d.renamed) |
|
61 |
self.assertEqual([('a', 'a-id', 'file', True, False)], d.modified) |
|
62 |
||
63 |
def test_tree_meta_modified(self): |
|
64 |
tt = transform.TreeTransform(self.tree) |
|
65 |
trans_id = tt.trans_id_tree_path('b/c') |
|
66 |
tt.set_executability(True, trans_id) |
|
67 |
tt.apply() |
|
68 |
||
69 |
d = delta.compare_trees(self.tree.basis_tree(), self.tree) |
|
70 |
||
71 |
self.assertEqual([], d.added) |
|
72 |
self.assertEqual([], d.removed) |
|
73 |
self.assertEqual([], d.renamed) |
|
74 |
self.assertEqual([('b/c', 'c-id', 'file', False, True)], d.modified) |
|
75 |
||
76 |
def test_tree_renamed(self): |
|
77 |
self.tree.rename_one('a', 'd') |
|
78 |
||
79 |
d = delta.compare_trees(self.tree.basis_tree(), self.tree) |
|
80 |
||
81 |
self.assertEqual([], d.added) |
|
82 |
self.assertEqual([], d.removed) |
|
83 |
self.assertEqual([('a', 'd', 'a-id', 'file', False, False)], d.renamed) |
|
84 |
self.assertEqual([], d.modified) |
|
85 |
||
86 |
def test_tree_renamed_modified(self): |
|
87 |
self.tree.rename_one('a', 'd') |
|
88 |
open('tree/d', 'wb').write('bar\n') |
|
89 |
||
90 |
d = delta.compare_trees(self.tree.basis_tree(), self.tree) |
|
91 |
||
92 |
self.assertEqual([], d.added) |
|
93 |
self.assertEqual([], d.removed) |
|
94 |
self.assertEqual([('a', 'd', 'a-id', 'file', True, False)], d.renamed) |
|
95 |
self.assertEqual([], d.modified) |
|
96 |
||
97 |
def test_tree_renamed_meta_modified(self): |
|
98 |
tt = transform.TreeTransform(self.tree) |
|
99 |
trans_id = tt.trans_id_tree_path('b/c') |
|
100 |
parent_trans_id = tt.trans_id_tree_path('') |
|
101 |
tt.adjust_path('e', parent_trans_id, trans_id) |
|
102 |
tt.set_executability(True, trans_id) |
|
103 |
tt.apply() |
|
104 |
||
105 |
d = delta.compare_trees(self.tree.basis_tree(), self.tree) |
|
106 |
||
107 |
self.assertEqual([], d.added) |
|
108 |
self.assertEqual([], d.removed) |
|
109 |
self.assertEqual([('b/c', 'e', 'c-id', 'file', False, True)], d.renamed) |
|
110 |
self.assertEqual([], d.modified) |
|
|
1878.2.2
by John Arbash Meinel
Add a bunch of direct (passing) tests for compare_trees |
111 |
|
112 |
def test_subset_file(self): |
|
113 |
empty_tree = self.tree.branch.repository.revision_tree( |
|
114 |
revision.NULL_REVISION) |
|
115 |
||
116 |
d = delta.compare_trees(empty_tree, self.tree.basis_tree(), |
|
117 |
specific_files=['a']) |
|
118 |
self.assertEqual([('a', 'a-id', 'file')], d.added) |
|
119 |
self.assertEqual([], d.removed) |
|
120 |
self.assertEqual([], d.renamed) |
|
121 |
self.assertEqual([], d.modified) |
|
122 |
||
123 |
def test_subset_multiple(self): |
|
124 |
empty_tree = self.tree.branch.repository.revision_tree( |
|
125 |
revision.NULL_REVISION) |
|
126 |
||
127 |
d = delta.compare_trees(empty_tree, self.tree, |
|
128 |
specific_files=['a', 'b/c']) |
|
129 |
self.assertEqual([('a', 'a-id', 'file'), |
|
130 |
('b/c', 'c-id', 'file'), |
|
131 |
], d.added) |
|
132 |
self.assertEqual([], d.removed) |
|
133 |
self.assertEqual([], d.renamed) |
|
134 |
self.assertEqual([], d.modified) |
|
135 |
||
136 |
def test_subset_dir(self): |
|
137 |
"""Restricting to a directory checks the dir, and all children.""" |
|
138 |
empty_tree = self.tree.branch.repository.revision_tree( |
|
139 |
revision.NULL_REVISION) |
|
140 |
||
141 |
d = delta.compare_trees(empty_tree, self.tree, |
|
142 |
specific_files=['b']) |
|
143 |
self.assertEqual([('b', 'b-id', 'directory'), |
|
144 |
('b/c', 'c-id', 'file'), |
|
145 |
], d.added) |
|
146 |
self.assertEqual([], d.removed) |
|
147 |
self.assertEqual([], d.renamed) |
|
148 |
self.assertEqual([], d.modified) |
|
149 |
||
150 |
def test_unknown(self): |
|
151 |
self.build_tree(['tree/unknown']) |
|
152 |
# Unknowns are not reported by compare_trees
|
|
153 |
d = delta.compare_trees(self.tree.basis_tree(), self.tree) |
|
154 |
self.assertEqual([], d.added) |
|
155 |
self.assertEqual([], d.removed) |
|
156 |
self.assertEqual([], d.renamed) |
|
157 |
self.assertEqual([], d.modified) |
|
|
1878.2.3
by John Arbash Meinel
Add a test and fix for bug #53638 |
158 |
|
159 |
def test_unknown_specific_file(self): |
|
160 |
self.build_tree(['tree/unknown']) |
|
161 |
empty_tree = self.tree.branch.repository.revision_tree( |
|
162 |
revision.NULL_REVISION) |
|
163 |
||
164 |
# If a specific_files list is present, even if none of the
|
|
165 |
# files are versioned, only paths that are present in the list
|
|
166 |
# should be compared
|
|
167 |
d = delta.compare_trees(empty_tree, self.tree, |
|
168 |
specific_files=['unknown']) |
|
169 |
self.assertEqual([], d.added) |
|
170 |
self.assertEqual([], d.removed) |
|
171 |
self.assertEqual([], d.renamed) |
|
172 |
self.assertEqual([], d.modified) |