/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1852.16.5 by John Arbash Meinel
[merge] bzr.dev 2255, resolve conflicts, update copyrights
1
# Copyright (C) 2006, 2007 Canonical Ltd
1852.15.9 by Robert Collins
Add missing test script.
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1852.15.9 by Robert Collins
Add missing test script.
16
17
"""Tests for the extra cases that WorkingTree.walkdirs can encounter."""
18
19
import os
20
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
21
from breezy import transform
22
from breezy.tests.features import SymlinkFeature
23
from breezy.tests.per_workingtree import TestCaseWithWorkingTree
1852.15.9 by Robert Collins
Add missing test script.
24
25
# tests to write:
26
# type mismatches - file to link, dir, dir to file, link, link to file, dir
27
2457.2.5 by Marius Kruger
move DirBlock out of TestWalkdirs as per review comment
28
class DirBlock:
2457.2.6 by Marius Kruger
add DirBlock comment
29
    """Object representation of the tuples returned by dirstate."""
2457.2.5 by Marius Kruger
move DirBlock out of TestWalkdirs as per review comment
30
31
    def __init__(self, tree, file_path, file_name=None, id=None,
32
                 inventory_kind=None, stat=None, disk_kind='unknown'):
33
        self.file_path = file_path
34
        self.abspath = tree.abspath(file_path)
35
        self.relpath = tree.relpath(file_path)
3376.2.11 by Martin Pool
Compare to None using is/is not not ==
36
        if file_name is None:
2457.2.5 by Marius Kruger
move DirBlock out of TestWalkdirs as per review comment
37
           file_name = os.path.split(file_path)[-1]
38
           if len(file_name) == 0:
39
               file_name = os.path.split(file_path)[-2]
40
        self.file_name = file_name
41
        self.id = id
42
        self.inventory_kind = inventory_kind
43
        self.stat = stat
44
        self.disk_kind = disk_kind
45
46
    def as_tuple(self):
47
         return (self.relpath, self.file_name, self.disk_kind,
48
                 self.stat, self.id, self.inventory_kind)
49
50
    def as_dir_tuple(self):
51
         return (self.relpath, self.id)
52
53
    def __str__(self):
54
        return """
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
55
file_path      = %r
56
abspath        = %r
57
relpath        = %r
58
file_name      = %r
59
id             = %r
60
inventory_kind = %r
61
stat           = %r
62
disk_kind      = %r""" % (self.file_path, self.abspath, self.relpath,
2457.2.5 by Marius Kruger
move DirBlock out of TestWalkdirs as per review comment
63
        self.file_name, self.id, self.inventory_kind, self.stat,
64
        self.disk_kind)
65
66
67
class TestWalkdirs(TestCaseWithWorkingTree):
68
69
    added='added'
70
    missing='missing'
71
    unknown='unknown'
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
72
73
    def get_tree(self, file_status, prefix=None):
1852.15.9 by Robert Collins
Add missing test script.
74
        tree = self.make_branch_and_tree('.')
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
75
        dirblocks = []
76
        paths = [
77
            file_status + ' file',
78
            file_status + ' dir/',
79
            file_status + ' dir/a file',
80
            file_status + ' empty dir/',
81
            ]
82
        self.build_tree(paths)
83
84
        def add_dirblock(path, kind):
2457.2.5 by Marius Kruger
move DirBlock out of TestWalkdirs as per review comment
85
            dirblock = DirBlock(tree, path)
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
86
            if file_status != self.unknown:
87
                dirblock.inventory_kind = kind
88
            if file_status != self.missing:
89
                dirblock.disk_kind = kind
90
                dirblock.stat = os.lstat(dirblock.relpath)
91
            dirblocks.append(dirblock)
92
93
        add_dirblock(paths[0], 'file')
94
        add_dirblock(paths[1], 'directory')
95
        add_dirblock(paths[2], 'file')
96
        add_dirblock(paths[3], 'directory')
97
98
        if file_status != self.unknown:
6829.2.1 by Jelmer Vernooij
Avoid passing in file_ids/revision_ids in a few more places.
99
            tree.add(paths)
100
            for dirblock in dirblocks:
101
                if file_status != self.unknown:
102
                    dirblock.id = tree.path2id(dirblock.relpath)
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
103
104
        if file_status == self.missing:
105
            # now make the files be missing
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
106
            tree.controldir.root_transport.delete(dirblocks[0].relpath)
107
            tree.controldir.root_transport.delete_tree(dirblocks[1].relpath)
108
            tree.controldir.root_transport.delete_tree(dirblocks[3].relpath)
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
109
1852.15.9 by Robert Collins
Add missing test script.
110
        expected_dirblocks = [
2255.2.47 by Robert Collins
Adjust walkdirs tests to talk a lock around walk_dirs.
111
            (('', tree.path2id('')),
6883.18.1 by Jelmer Vernooij
Support walkdirs when used for trees without versioned directories.
112
             ([dirblocks[1].as_tuple(), dirblocks[3].as_tuple()]
113
                 if (tree.has_versioned_directories() or file_status != self.missing) else []) +
114
             [dirblocks[0].as_tuple()]
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
115
            ),
116
            (dirblocks[1].as_dir_tuple(),
117
             [dirblocks[2].as_tuple()]
118
            ),
6862.5.1 by Jelmer Vernooij
Fix walkdirs tests for formats without versioned directories.
119
            ]
6883.18.1 by Jelmer Vernooij
Support walkdirs when used for trees without versioned directories.
120
        if (tree.has_versioned_directories() or
121
            file_status != self.missing):
122
            expected_dirblocks.append(
123
                (dirblocks[3].as_dir_tuple(),
124
                 []
125
                ))
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
126
        if prefix:
127
            expected_dirblocks = [e for e in expected_dirblocks
128
                if len(e) > 0 and len(e[0]) > 0 and e[0][0] == prefix]
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
129
        return tree, expected_dirblocks
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
130
2457.2.7 by Marius Kruger
extract method as per review request
131
    def _test_walkdir(self, file_status, prefix=""):
132
        result = []
133
        tree, expected_dirblocks = self.get_tree(file_status, prefix)
134
        tree.lock_read()
135
        for dirinfo, dirblock in tree.walkdirs(prefix):
136
            result.append((dirinfo, list(dirblock)))
137
        tree.unlock()
138
139
        # check each return value for debugging ease.
140
        for pos, item in enumerate(expected_dirblocks):
141
            result_pos = []
142
            if len(result) > pos:
143
                result_pos = result[pos]
144
            self.assertEqual(item, result_pos)
145
        self.assertEqual(expected_dirblocks, result)
146
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
147
    def test_walkdir_unknowns(self):
148
        """unknown files and directories should be reported by walkdirs."""
2457.2.7 by Marius Kruger
extract method as per review request
149
        self._test_walkdir(self.unknown)
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
150
151
    def test_walkdir_from_unknown_dir(self):
152
        """Doing a walkdir when the requested prefix is unknown but on disk."""
2457.2.7 by Marius Kruger
extract method as per review request
153
        self._test_walkdir(self.unknown, 'unknown dir')
154
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
155
    def test_walkdir_missings(self):
156
        """missing files and directories should be reported by walkdirs."""
2457.2.7 by Marius Kruger
extract method as per review request
157
        self._test_walkdir(self.missing)
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
158
159
    def test_walkdir_from_dir(self):
160
        """Doing a walkdir when the requested prefix is known and on disk."""
2457.2.7 by Marius Kruger
extract method as per review request
161
        self._test_walkdir(self.added, 'added dir')
2457.2.1 by Marius Kruger
* Fix workingtree.walkdirs to support getting a prefix which specifies an empty directory.
162
163
    def test_walkdir_from_empty_dir(self):
164
        """Doing a walkdir when the requested prefix is empty dir."""
2457.2.7 by Marius Kruger
extract method as per review request
165
        self._test_walkdir(self.added, 'added empty dir')
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
166
167
    def test_walkdir_from_missing_dir(self):
168
        """Doing a walkdir when the requested prefix is missing but on disk."""
2457.2.7 by Marius Kruger
extract method as per review request
169
        self._test_walkdir(self.missing, 'missing dir')
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
170
171
    def test_walkdirs_type_changes(self):
172
        """Walkdir shows the actual kinds on disk and the recorded kinds."""
2949.5.1 by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate
173
        self.requireFeature(SymlinkFeature)
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
174
        tree = self.make_branch_and_tree('.')
175
        paths = ['file1', 'file2', 'dir1/', 'dir2/']
176
        self.build_tree(paths)
6816.1.1 by Jelmer Vernooij
Avoid passing in file ids.
177
        tree.add(paths)
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
178
        tt = transform.TreeTransform(tree)
179
        root_transaction_id = tt.trans_id_tree_path('')
180
        tt.new_symlink('link1',
181
            root_transaction_id, 'link-target', 'link1')
182
        tt.new_symlink('link2',
183
            root_transaction_id, 'link-target', 'link2')
184
        tt.apply()
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
185
        tree.controldir.root_transport.delete_tree('dir1')
186
        tree.controldir.root_transport.delete_tree('dir2')
187
        tree.controldir.root_transport.delete('file1')
188
        tree.controldir.root_transport.delete('file2')
189
        tree.controldir.root_transport.delete('link1')
190
        tree.controldir.root_transport.delete('link2')
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
191
        changed_paths = ['dir1', 'file1/', 'link1', 'link2/']
192
        self.build_tree(changed_paths)
193
        os.symlink('target', 'dir2')
194
        os.symlink('target', 'file2')
195
        dir1_stat = os.lstat('dir1')
196
        dir2_stat = os.lstat('dir2')
197
        file1_stat = os.lstat('file1')
198
        file2_stat = os.lstat('file2')
199
        link1_stat = os.lstat('link1')
200
        link2_stat = os.lstat('link2')
201
        expected_dirblocks = [
2255.2.47 by Robert Collins
Adjust walkdirs tests to talk a lock around walk_dirs.
202
             (('', tree.path2id('')),
6876.3.2 by Jelmer Vernooij
Fix walkdirs for trees without versioned directories.
203
              [('dir1', 'dir1', 'file', dir1_stat, tree.path2id('dir1'),
204
                  'directory' if tree.has_versioned_directories() else None),
205
               ('dir2', 'dir2', 'symlink', dir2_stat, tree.path2id('dir2'),
206
                   'directory' if tree.has_versioned_directories() else None),
6816.1.1 by Jelmer Vernooij
Avoid passing in file ids.
207
               ('file1', 'file1', 'directory', file1_stat, tree.path2id('file1'), 'file'),
208
               ('file2', 'file2', 'symlink', file2_stat, tree.path2id('file2'), 'file'),
209
               ('link1', 'link1', 'file', link1_stat, tree.path2id('link1'), 'symlink'),
210
               ('link2', 'link2', 'directory', link2_stat, tree.path2id('link2'), 'symlink'),
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
211
              ]
6876.3.2 by Jelmer Vernooij
Fix walkdirs for trees without versioned directories.
212
             )]
213
        if tree.has_versioned_directories():
214
            expected_dirblocks.extend([
6816.1.1 by Jelmer Vernooij
Avoid passing in file ids.
215
             (('dir1', tree.path2id('dir1')),
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
216
              [
217
              ]
218
             ),
6816.1.1 by Jelmer Vernooij
Avoid passing in file ids.
219
             (('dir2', tree.path2id('dir2')),
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
220
              [
221
              ]
6876.3.2 by Jelmer Vernooij
Fix walkdirs for trees without versioned directories.
222
             )])
223
        expected_dirblocks.extend([
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
224
             (('file1', None),
225
              [
226
              ]
227
             ),
228
             (('link2', None),
229
              [
230
              ]
231
             ),
6876.3.2 by Jelmer Vernooij
Fix walkdirs for trees without versioned directories.
232
            ])
233
        with tree.lock_read():
234
            result = list(tree.walkdirs())
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
235
        # check each return value for debugging ease.
236
        for pos, item in enumerate(expected_dirblocks):
237
            self.assertEqual(item, result[pos])
238
        self.assertEqual(len(expected_dirblocks), len(result))
2408.1.4 by Alexander Belchenko
workingtree_implementations: make usage of symlinks optional
239
240
    def test_walkdirs_type_changes_wo_symlinks(self):
241
        # similar to test_walkdirs_type_changes
242
        # but don't use symlinks for safe testing on win32
243
        tree = self.make_branch_and_tree('.')
244
        paths = ['file1', 'dir1/']
245
        self.build_tree(paths)
6816.1.1 by Jelmer Vernooij
Avoid passing in file ids.
246
        tree.add(paths)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
247
        tree.controldir.root_transport.delete_tree('dir1')
248
        tree.controldir.root_transport.delete('file1')
2408.1.4 by Alexander Belchenko
workingtree_implementations: make usage of symlinks optional
249
        changed_paths = ['dir1', 'file1/']
250
        self.build_tree(changed_paths)
251
        dir1_stat = os.lstat('dir1')
252
        file1_stat = os.lstat('file1')
6861.1.1 by Jelmer Vernooij
More foreign branch test fixes.
253
        if tree.has_versioned_directories():
254
            expected_dirblocks = [
255
                 (('', tree.path2id('')),
256
                  [('dir1', 'dir1', 'file', dir1_stat, tree.path2id('dir1'), 'directory'),
257
                   ('file1', 'file1', 'directory', file1_stat, tree.path2id('file1'), 'file'),
258
                  ]
259
                 ),
260
                 (('dir1', tree.path2id('dir1')),
261
                  [
262
                  ]
263
                 ),
264
                 (('file1', None),
265
                  [
266
                  ]
267
                 ),
268
                ]
269
        else:
270
            expected_dirblocks = [
271
                 (('', tree.path2id('')),
6876.3.2 by Jelmer Vernooij
Fix walkdirs for trees without versioned directories.
272
                  [('dir1', 'dir1', 'file', dir1_stat, tree.path2id('dir1'), None),
273
                   ('file1', 'file1', 'directory', file1_stat, tree.path2id('file1'), 'file'),
6861.1.1 by Jelmer Vernooij
More foreign branch test fixes.
274
                  ]
275
                 ),
276
                 (('file1', None),
277
                  [
278
                  ]
279
                 ),
280
                ]
6876.3.2 by Jelmer Vernooij
Fix walkdirs for trees without versioned directories.
281
        with tree.lock_read():
282
            result = list(tree.walkdirs())
2408.1.4 by Alexander Belchenko
workingtree_implementations: make usage of symlinks optional
283
        # check each return value for debugging ease.
284
        for pos, item in enumerate(expected_dirblocks):
285
            self.assertEqual(item, result[pos])
286
        self.assertEqual(len(expected_dirblocks), len(result))