/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_is_ignored.py

First attempt to merge .dev and resolve the conflicts (but tests are 
failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_is_ignored.py
1
 
# (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
30
30
        self.build_tree_contents([
31
31
            ('.bzrignore', './rootdir\n'
32
32
                           'randomfile*\n'
 
33
                           '*bar\n'
 
34
                           '?foo\n'
 
35
                           '*.~*\n'
 
36
                           'dir1/*f1\n'
 
37
                           'dir1/?f2\n'
33
38
                           'path/from/ro?t\n'
34
39
                           'unicode\xc2\xb5\n' # u'\xb5'.encode('utf8')
35
40
                           'dos\r\n'
63
68
        self.assertEqual('dos', tree.is_ignored('dos'))
64
69
        self.assertEqual(None, tree.is_ignored('dosfoo'))
65
70
 
 
71
        self.assertEqual('*bar', tree.is_ignored('foobar'))
 
72
        self.assertEqual('*bar', tree.is_ignored(r'foo\nbar'))
 
73
        self.assertEqual('*bar', tree.is_ignored('bar'))
 
74
        self.assertEqual('*bar', tree.is_ignored('.bar'))
 
75
 
 
76
        self.assertEqual('?foo', tree.is_ignored('afoo'))
 
77
        self.assertEqual('?foo', tree.is_ignored('.foo'))
 
78
 
 
79
        self.assertEqual('*.~*', tree.is_ignored('blah.py.~1~'))
 
80
 
 
81
        self.assertEqual('dir1/*f1', tree.is_ignored('dir1/foof1'))
 
82
        self.assertEqual('dir1/*f1', tree.is_ignored('dir1/f1'))
 
83
        self.assertEqual('dir1/*f1', tree.is_ignored('dir1/.f1'))
 
84
 
 
85
        self.assertEqual('dir1/?f2', tree.is_ignored('dir1/ff2'))
 
86
        self.assertEqual('dir1/?f2', tree.is_ignored('dir1/.f2'))
 
87
 
66
88
        # Blank lines and comments should be ignored
67
89
        self.assertEqual(None, tree.is_ignored(''))
68
90
        self.assertEqual(None, tree.is_ignored('test/'))
142
164
        self.assertEqual('*.py[co]', tree.is_ignored('foo.pyc'))
143
165
        self.assertEqual('./.shelf', tree.is_ignored('.shelf'))
144
166
        self.assertEqual('./rootdir', tree.is_ignored('rootdir'))
 
167
        self.assertEqual('*.swp', tree.is_ignored('foo.py.swp'))
145
168
        self.assertEqual('*.swp', tree.is_ignored('.foo.py.swp'))
146
169
        self.assertEqual(None, tree.is_ignored('.foo.py.swo'))
147
170
 
148
 
    def test_DEFAULT_IGNORE(self):
149
 
        tree = self.make_branch_and_tree('.')
150
 
        # It used to be possible for plugins to modify DEFAULT_IGNORE
151
 
        # directly, and get their working files to be ignored.
152
 
        # It is still possible to do so, but this is deprecated.
153
 
 
154
 
        # No configured ignores
155
 
        self.build_tree_contents([('.bzrignore', '')])
156
 
        ignores._set_user_ignores([])
157
 
 
158
 
        self.assertEqual(None, tree.is_ignored('foo.pyc'))
159
 
 
160
 
        # Must reset the list so that it reads a new one
161
 
        tree._ignoreset = None
162
 
 
163
 
        # use list.append() to get around the deprecation warnings
164
 
        list.append(bzrlib.DEFAULT_IGNORE, '*.py[co]')
165
 
        try:
166
 
            self.assertEqual('*.py[co]', tree.is_ignored('foo.pyc'))
167
 
        finally:
168
 
            list.remove(bzrlib.DEFAULT_IGNORE, '*.py[co]')
169
 
 
170
171
    def test_runtime_ignores(self):
171
172
        tree = self.make_branch_and_tree('.')
172
173
        self.build_tree_contents([('.bzrignore', '')])
177
178
            ignores._runtime_ignores = set()
178
179
            self.assertEqual(None, tree.is_ignored('foobar.py'))
179
180
 
180
 
            tree._ignoreset = None
 
181
            tree._flush_ignore_list_cache()
181
182
            ignores.add_runtime_ignores(['./foobar.py'])
182
183
            self.assertEqual(set(['./foobar.py']), ignores.get_runtime_ignores())
183
184
            self.assertEqual('./foobar.py', tree.is_ignored('foobar.py'))
184
185
        finally:
185
186
            ignores._runtime_ignores = orig_runtime
 
187
 
 
188
    def test_ignore_caching(self):
 
189
        tree = self.make_branch_and_tree('.')
 
190
        self.build_tree(['ignoreme'])
 
191
 
 
192
        self.assertEqual(None, tree.is_ignored('ignoreme'))
 
193
 
 
194
        # Bug #129694 specifically references WorkingTree.unknowns()
 
195
        tree.unknowns()
 
196
 
 
197
        self.build_tree_contents([('.bzrignore', 'ignoreme')])
 
198
        self.assertEqual('ignoreme', tree.is_ignored('ignoreme'))