1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
# Copyright (C) 2006 by Canonical Development Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""test the functions in bzrlib/delta.py"""
from bzrlib import delta, revision, transform
from bzrlib.tests import TestCaseWithTransport
class TestCompareTrees(TestCaseWithTransport):
def setUp(self):
TestCaseWithTransport.setUp(self)
self.tree = self.make_branch_and_tree('tree')
files = ['a', 'b/', 'b/c']
self.build_tree(['tree/' + f for f in files])
self.tree.add(files, ['a-id', 'b-id', 'c-id'])
self.tree.commit('initial tree')
def test_revision_tree_against_empty(self):
empty_tree = self.tree.branch.repository.revision_tree(
revision.NULL_REVISION)
d = delta.compare_trees(empty_tree, self.tree.basis_tree())
self.assertEqual([('a', 'a-id', 'file'),
('b', 'b-id', 'directory'),
('b/c', 'c-id', 'file'),
], d.added)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.modified)
d = delta.compare_trees(self.tree.basis_tree(), empty_tree)
self.assertEqual([], d.added)
self.assertEqual([('a', 'a-id', 'file'),
('b', 'b-id', 'directory'),
('b/c', 'c-id', 'file'),
], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.modified)
def test_tree_modified(self):
open('tree/a', 'wb').write('foobar\n')
d = delta.compare_trees(self.tree.basis_tree(), self.tree)
self.assertEqual([], d.added)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([('a', 'a-id', 'file', True, False)], d.modified)
def test_tree_meta_modified(self):
tt = transform.TreeTransform(self.tree)
trans_id = tt.trans_id_tree_path('b/c')
tt.set_executability(True, trans_id)
tt.apply()
d = delta.compare_trees(self.tree.basis_tree(), self.tree)
self.assertEqual([], d.added)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([('b/c', 'c-id', 'file', False, True)], d.modified)
def test_tree_renamed(self):
self.tree.rename_one('a', 'd')
d = delta.compare_trees(self.tree.basis_tree(), self.tree)
self.assertEqual([], d.added)
self.assertEqual([], d.removed)
self.assertEqual([('a', 'd', 'a-id', 'file', False, False)], d.renamed)
self.assertEqual([], d.modified)
def test_tree_renamed_modified(self):
self.tree.rename_one('a', 'd')
open('tree/d', 'wb').write('bar\n')
d = delta.compare_trees(self.tree.basis_tree(), self.tree)
self.assertEqual([], d.added)
self.assertEqual([], d.removed)
self.assertEqual([('a', 'd', 'a-id', 'file', True, False)], d.renamed)
self.assertEqual([], d.modified)
def test_tree_renamed_meta_modified(self):
tt = transform.TreeTransform(self.tree)
trans_id = tt.trans_id_tree_path('b/c')
parent_trans_id = tt.trans_id_tree_path('')
tt.adjust_path('e', parent_trans_id, trans_id)
tt.set_executability(True, trans_id)
tt.apply()
d = delta.compare_trees(self.tree.basis_tree(), self.tree)
self.assertEqual([], d.added)
self.assertEqual([], d.removed)
self.assertEqual([('b/c', 'e', 'c-id', 'file', False, True)], d.renamed)
self.assertEqual([], d.modified)
def test_subset_file(self):
empty_tree = self.tree.branch.repository.revision_tree(
revision.NULL_REVISION)
d = delta.compare_trees(empty_tree, self.tree.basis_tree(),
specific_files=['a'])
self.assertEqual([('a', 'a-id', 'file')], d.added)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.modified)
def test_subset_multiple(self):
empty_tree = self.tree.branch.repository.revision_tree(
revision.NULL_REVISION)
d = delta.compare_trees(empty_tree, self.tree,
specific_files=['a', 'b/c'])
self.assertEqual([('a', 'a-id', 'file'),
('b/c', 'c-id', 'file'),
], d.added)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.modified)
def test_subset_dir(self):
"""Restricting to a directory checks the dir, and all children."""
empty_tree = self.tree.branch.repository.revision_tree(
revision.NULL_REVISION)
d = delta.compare_trees(empty_tree, self.tree,
specific_files=['b'])
self.assertEqual([('b', 'b-id', 'directory'),
('b/c', 'c-id', 'file'),
], d.added)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.modified)
def test_unknown(self):
self.build_tree(['tree/unknown'])
# Unknowns are not reported by compare_trees
d = delta.compare_trees(self.tree.basis_tree(), self.tree)
self.assertEqual([], d.added)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.modified)
def test_unknown_specific_file(self):
self.build_tree(['tree/unknown'])
empty_tree = self.tree.branch.repository.revision_tree(
revision.NULL_REVISION)
# If a specific_files list is present, even if none of the
# files are versioned, only paths that are present in the list
# should be compared
d = delta.compare_trees(empty_tree, self.tree,
specific_files=['unknown'])
self.assertEqual([], d.added)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.modified)
|