118
118
added = ignores.add_unique_user_ignores(
119
119
['xxx', './bar', 'xxx', 'dir1/', 'dir2/', 'dir3\\'])
120
120
self.assertEqual(['xxx', 'dir2'], added)
121
self.assertEqual(set(['foo', './bar', u'b\xe5z',
121
self.assertEqual(set(['foo', './bar', u'b\xe5z',
122
122
'xxx', 'dir1', 'dir2', 'dir3']),
123
123
ignores.get_user_ignores())
158
158
tree = self.make_branch_and_tree(".")
159
159
ignores.tree_ignores_add_patterns(tree, ["myentry"])
160
160
self.assertTrue(tree.has_filename(".bzrignore"))
161
self.assertEquals("myentry\n",
161
self.assertEquals("myentry\n",
162
162
open(".bzrignore", 'r').read())
164
164
def test_add_to_existing(self):
165
165
tree = self.make_branch_and_tree(".")
166
self.build_tree_contents([('.bzrignore', "myentry1\n")])
166
self.build_tree_contents([('.bzrignore', "myentry1\n")])
167
167
tree.add([".bzrignore"])
168
168
ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
169
self.assertEquals("myentry1\nmyentry2\nfoo\n",
169
self.assertEquals("myentry1\nmyentry2\nfoo\n",
170
170
open(".bzrignore", 'r').read())
172
172
def test_adds_ending_newline(self):
173
173
tree = self.make_branch_and_tree(".")
174
self.build_tree_contents([('.bzrignore', "myentry1")])
174
self.build_tree_contents([('.bzrignore', "myentry1")])
175
175
tree.add([".bzrignore"])
176
176
ignores.tree_ignores_add_patterns(tree, ["myentry2"])
177
self.assertEquals("myentry1\nmyentry2\n",
177
self.assertEquals("myentry1\nmyentry2\n",
178
178
open(".bzrignore", 'r').read())