← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ignores.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-08-31 06:06:38 UTC
  • mfrom: (1966.1.2 build-resolver)
  • Revision ID: pqm@pqm.ubuntu.com-20060831060638-bfc0303de36a40a8
Behave reasonably when creating a checkout in a directory with files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 by Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for handling of ignore files"""
18
18
 
19
19
from cStringIO import StringIO
20
20
 
21
21
from bzrlib import config, errors, ignores
22
 
from bzrlib.tests import TestCase, TestCaseInTempDir, TestCaseWithTransport
 
22
from bzrlib.tests import TestCase, TestCaseInTempDir
23
23
 
24
24
 
25
25
class TestParseIgnoreFile(TestCase):
34
34
                '\n' # empty line
35
35
                '#comment\n'
36
36
                ' xx \n' # whitespace
37
 
                '!RE:^\.z.*\n'
38
 
                '!!./.zcompdump\n'
39
37
                ))
40
38
        self.assertEqual(set(['./rootdir',
41
39
                          'randomfile*',
43
41
                          u'unicode\xb5',
44
42
                          'dos',
45
43
                          ' xx ',
46
 
                          '!RE:^\.z.*',
47
 
                          '!!./.zcompdump',
48
44
                         ]), ignored)
49
45
 
50
46
    def test_parse_empty(self):
51
47
        ignored = ignores.parse_ignore_file(StringIO(''))
52
48
        self.assertEqual(set([]), ignored)
53
 
        
54
 
    def test_parse_non_utf8(self):
55
 
        """Lines with non utf 8 characters should be discarded."""
56
 
        ignored = ignores.parse_ignore_file(StringIO(
57
 
                'utf8filename_a\n'
58
 
                'invalid utf8\x80\n'
59
 
                'utf8filename_b\n'
60
 
                ))
61
 
        self.assertEqual(set([
62
 
                        'utf8filename_a',
63
 
                        'utf8filename_b',
64
 
                       ]), ignored)
65
49
 
66
50
 
67
51
class TestUserIgnores(TestCaseInTempDir):
68
 
 
 
52
    
69
53
    def test_create_if_missing(self):
70
54
        # $HOME should be set to '.'
71
55
        ignore_path = config.user_ignore_config_filename()
115
99
        self.assertEqual(patterns, added)
116
100
        self.assertEqual(set(patterns), ignores.get_user_ignores())
117
101
 
118
 
    def test_add_directory(self):
119
 
        """Test that adding a directory will strip any trailing slash"""
120
 
        # Create an empty file
121
 
        ignores._set_user_ignores([])
122
 
 
123
 
        in_patterns = ['foo/', 'bar/', 'baz\\']
124
 
        added = ignores.add_unique_user_ignores(in_patterns)
125
 
        out_patterns = [ x.rstrip('/\\') for x in in_patterns ]
126
 
        self.assertEqual(out_patterns, added)
127
 
        self.assertEqual(set(out_patterns), ignores.get_user_ignores())
128
 
 
129
102
    def test_add_unique(self):
130
103
        """Test that adding will not duplicate ignores"""
131
 
        ignores._set_user_ignores(
132
 
            ['foo', './bar', u'b\xe5z', 'dir1/', 'dir3\\'])
 
104
        ignores._set_user_ignores(['foo', './bar', u'b\xe5z'])
133
105
 
134
 
        added = ignores.add_unique_user_ignores(
135
 
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/', 'dir3\\'])
136
 
        self.assertEqual(['xxx', 'dir2'], added)
137
 
        self.assertEqual(set(['foo', './bar', u'b\xe5z',
138
 
                              'xxx', 'dir1', 'dir2', 'dir3']),
 
106
        added = ignores.add_unique_user_ignores(['xxx', './bar', 'xxx'])
 
107
        self.assertEqual(['xxx'], added)
 
108
        self.assertEqual(set(['foo', './bar', u'b\xe5z', 'xxx']),
139
109
                         ignores.get_user_ignores())
140
110
 
141
111
 
144
114
    def setUp(self):
145
115
        TestCase.setUp(self)
146
116
 
 
117
        orig = ignores._runtime_ignores
 
118
        def restore():
 
119
            ignores._runtime_ignores = orig
 
120
        self.addCleanup(restore)
147
121
        # For the purposes of these tests, we must have no
148
122
        # runtime ignores
149
 
        self.overrideAttr(ignores, '_runtime_ignores', set())
 
123
        ignores._runtime_ignores = set()
150
124
 
151
125
    def test_add(self):
152
126
        """Test that we can add an entry to the list."""
162
136
 
163
137
        ignores.add_runtime_ignores(['bar'])
164
138
        self.assertEqual(set(['foo', 'bar']), ignores.get_runtime_ignores())
165
 
 
166
 
 
167
 
class TestTreeIgnores(TestCaseWithTransport):
168
 
    
169
 
    def assertPatternsEquals(self, patterns):
170
 
        contents = open(".bzrignore", 'rU').read().strip().split('\n')
171
 
        self.assertEquals(sorted(patterns), sorted(contents))
172
 
 
173
 
    def test_new_file(self):
174
 
        tree = self.make_branch_and_tree(".")
175
 
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
176
 
        self.assertTrue(tree.has_filename(".bzrignore"))
177
 
        self.assertPatternsEquals(["myentry"])
178
 
 
179
 
    def test_add_to_existing(self):
180
 
        tree = self.make_branch_and_tree(".")
181
 
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
182
 
        tree.add([".bzrignore"])
183
 
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
184
 
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
185
 
 
186
 
    def test_adds_ending_newline(self):
187
 
        tree = self.make_branch_and_tree(".")
188
 
        self.build_tree_contents([('.bzrignore', "myentry1")])
189
 
        tree.add([".bzrignore"])
190
 
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
191
 
        self.assertPatternsEquals(["myentry1", "myentry2"])
192
 
        text = open(".bzrignore", 'r').read()
193
 
        self.assertTrue(text.endswith('\r\n') or
194
 
                        text.endswith('\n') or
195
 
                        text.endswith('\r'))
196
 
 
197
 
    def test_does_not_add_dupe(self):
198
 
        tree = self.make_branch_and_tree(".")
199
 
        self.build_tree_contents([('.bzrignore', "myentry\n")])
200
 
        tree.add([".bzrignore"])
201
 
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
202
 
        self.assertPatternsEquals(["myentry"])
203
 
 
204
 
    def test_non_ascii(self):
205
 
        tree = self.make_branch_and_tree(".")
206
 
        self.build_tree_contents([('.bzrignore',
207
 
                                   u"myentry\u1234\n".encode('utf-8'))])
208
 
        tree.add([".bzrignore"])
209
 
        ignores.tree_ignores_add_patterns(tree, [u"myentry\u5678"])
210
 
        self.assertPatternsEquals([u"myentry\u1234".encode('utf-8'),
211
 
                                   u"myentry\u5678".encode('utf-8')])
212
 
 
213
 
    def test_crlf(self):
214
 
        tree = self.make_branch_and_tree(".")
215
 
        self.build_tree_contents([('.bzrignore', "myentry1\r\n")])
216
 
        tree.add([".bzrignore"])
217
 
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
218
 
        self.assertEquals(open('.bzrignore', 'rb').read(), 'myentry1\r\nmyentry2\r\nfoo\r\n')
219
 
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])