~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2006-2010 Canonical Ltd
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
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
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
16
17
"""Tests for handling of ignore files"""
18
19
from cStringIO import StringIO
20
21
from bzrlib import config, errors, ignores
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
22
from bzrlib.tests import TestCase, TestCaseInTempDir, TestCaseWithTransport
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
23
24
25
class TestParseIgnoreFile(TestCase):
26
27
    def test_parse_fancy(self):
28
        ignored = ignores.parse_ignore_file(StringIO(
29
                './rootdir\n'
30
                'randomfile*\n'
31
                'path/from/ro?t\n'
32
                'unicode\xc2\xb5\n' # u'\xb5'.encode('utf8')
33
                'dos\r\n'
34
                '\n' # empty line
35
                '#comment\n'
36
                ' xx \n' # whitespace
4948.5.4 by John Whitley
bzrlib.globbing.normalize_pattern needed fix to avoid mangling ignore
37
                '!RE:^\.z.*\n'
4948.5.6 by John Whitley
A trial implementation of '!!' syntax for double-negative ignore exclusions.
38
                '!!./.zcompdump\n'
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
39
                ))
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
40
        self.assertEqual(set(['./rootdir',
1836.1.25 by John Arbash Meinel
cleanups suggested by Martin.
41
                          'randomfile*',
42
                          'path/from/ro?t',
43
                          u'unicode\xb5',
44
                          'dos',
45
                          ' xx ',
4948.5.4 by John Whitley
bzrlib.globbing.normalize_pattern needed fix to avoid mangling ignore
46
                          '!RE:^\.z.*',
4948.5.6 by John Whitley
A trial implementation of '!!' syntax for double-negative ignore exclusions.
47
                          '!!./.zcompdump',
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
48
                         ]), ignored)
1836.1.25 by John Arbash Meinel
cleanups suggested by Martin.
49
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
50
    def test_parse_empty(self):
51
        ignored = ignores.parse_ignore_file(StringIO(''))
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
52
        self.assertEqual(set([]), ignored)
5119.1.4 by Jason Spashett
Add test for parsing non utf8
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)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
65
66
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
67
class TestUserIgnores(TestCaseInTempDir):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
68
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
69
    def test_create_if_missing(self):
70
        # $HOME should be set to '.'
71
        ignore_path = config.user_ignore_config_filename()
72
        self.failIfExists(ignore_path)
73
        user_ignores = ignores.get_user_ignores()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
74
        self.assertEqual(set(ignores.USER_DEFAULTS), user_ignores)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
75
76
        self.failUnlessExists(ignore_path)
77
        f = open(ignore_path, 'rb')
78
        try:
79
            entries = ignores.parse_ignore_file(f)
80
        finally:
81
            f.close()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
82
        self.assertEqual(set(ignores.USER_DEFAULTS), entries)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
83
84
    def test_use_existing(self):
85
        patterns = ['*.o', '*.py[co]', u'\xe5*']
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
86
        ignores._set_user_ignores(patterns)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
87
88
        user_ignores = ignores.get_user_ignores()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
89
        self.assertEqual(set(patterns), user_ignores)
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
90
91
    def test_use_empty(self):
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
92
        ignores._set_user_ignores([])
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
93
        ignore_path = config.user_ignore_config_filename()
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
94
        self.check_file_contents(ignore_path, '')
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
95
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
96
        self.assertEqual(set([]), ignores.get_user_ignores())
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
97
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
98
    def test_set(self):
99
        patterns = ['*.py[co]', '*.py[oc]']
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
100
        ignores._set_user_ignores(patterns)
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
101
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
102
        self.assertEqual(set(patterns), ignores.get_user_ignores())
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
103
104
        patterns = ['vim', '*.swp']
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
105
        ignores._set_user_ignores(patterns)
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
106
        self.assertEqual(set(patterns), ignores.get_user_ignores())
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
107
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
108
    def test_add(self):
109
        """Test that adding will not duplicate ignores"""
110
        # Create an empty file
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
111
        ignores._set_user_ignores([])
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
112
113
        patterns = ['foo', './bar', u'b\xe5z']
114
        added = ignores.add_unique_user_ignores(patterns)
115
        self.assertEqual(patterns, added)
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
116
        self.assertEqual(set(patterns), ignores.get_user_ignores())
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
117
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
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
2298.8.3 by Kent Gibson
Extended test cases to test bug 86451.
123
        in_patterns = ['foo/', 'bar/', 'baz\\']
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
124
        added = ignores.add_unique_user_ignores(in_patterns)
2298.8.3 by Kent Gibson
Extended test cases to test bug 86451.
125
        out_patterns = [ x.rstrip('/\\') for x in in_patterns ]
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
126
        self.assertEqual(out_patterns, added)
127
        self.assertEqual(set(out_patterns), ignores.get_user_ignores())
128
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
129
    def test_add_unique(self):
130
        """Test that adding will not duplicate ignores"""
2298.8.3 by Kent Gibson
Extended test cases to test bug 86451.
131
        ignores._set_user_ignores(
132
            ['foo', './bar', u'b\xe5z', 'dir1/', 'dir3\\'])
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
133
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
134
        added = ignores.add_unique_user_ignores(
2298.8.3 by Kent Gibson
Extended test cases to test bug 86451.
135
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/', 'dir3\\'])
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
136
        self.assertEqual(['xxx', 'dir2'], added)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
137
        self.assertEqual(set(['foo', './bar', u'b\xe5z',
2298.8.3 by Kent Gibson
Extended test cases to test bug 86451.
138
                              'xxx', 'dir1', 'dir2', 'dir3']),
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
139
                         ignores.get_user_ignores())
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
140
141
142
class TestRuntimeIgnores(TestCase):
143
144
    def setUp(self):
145
        TestCase.setUp(self)
146
147
        # For the purposes of these tests, we must have no
148
        # runtime ignores
4985.1.5 by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity
149
        self.overrideAttr(ignores, '_runtime_ignores', set())
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
150
151
    def test_add(self):
152
        """Test that we can add an entry to the list."""
153
        self.assertEqual(set(), ignores.get_runtime_ignores())
154
155
        ignores.add_runtime_ignores(['foo'])
156
        self.assertEqual(set(['foo']), ignores.get_runtime_ignores())
157
158
    def test_add_duplicate(self):
159
        """Adding the same ignore twice shouldn't add a new entry."""
160
        ignores.add_runtime_ignores(['foo', 'bar'])
161
        self.assertEqual(set(['foo', 'bar']), ignores.get_runtime_ignores())
162
163
        ignores.add_runtime_ignores(['bar'])
164
        self.assertEqual(set(['foo', 'bar']), ignores.get_runtime_ignores())
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
165
166
167
class TestTreeIgnores(TestCaseWithTransport):
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
168
    
169
    def assertPatternsEquals(self, patterns):
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
170
        contents = open(".bzrignore", 'rU').read().strip().split('\n')
171
        self.assertEquals(sorted(patterns), sorted(contents))
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
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"))
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
177
        self.assertPatternsEquals(["myentry"])
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
178
179
    def test_add_to_existing(self):
180
        tree = self.make_branch_and_tree(".")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
181
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
182
        tree.add([".bzrignore"])
183
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
184
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
185
186
    def test_adds_ending_newline(self):
187
        tree = self.make_branch_and_tree(".")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
188
        self.build_tree_contents([('.bzrignore', "myentry1")])
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
189
        tree.add([".bzrignore"])
190
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
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'))
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
196
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
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"])
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
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"])