← 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: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for handling of ignore files"""
18
18
 
49
49
 
50
50
 
51
51
class TestUserIgnores(TestCaseInTempDir):
52
 
    
 
52
 
53
53
    def test_create_if_missing(self):
54
54
        # $HOME should be set to '.'
55
55
        ignore_path = config.user_ignore_config_filename()
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())
124
124
 
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())
163
163
 
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())
171
171
 
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())
179
179