← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_ignore.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ignore.py
47
47
        self.run_bzr_error(('bzr: ERROR: NAME_PATTERN should not '
48
48
                            'be an absolute path\n',),
49
49
                           'ignore /crud')
50
 
        
 
50
 
51
51
    def test_ignore_directories(self):
52
52
        """ignoring a directory should ignore directory tree.
53
53
 
93
93
        self.run_bzr('ignore garh')
94
94
        self.assertEquals(list(tree.unknowns()), [])
95
95
        self.check_file_contents('.bzrignore', '*.blah\ngarh\n')
96
 
       
 
96
 
97
97
    def test_ignore_multiple_arguments(self):
98
98
        """'ignore' works with multiple arguments"""
99
99
        tree = self.make_branch_and_tree('.')
122
122
 
123
123
        # test a single versioned file
124
124
        out, err = self.run_bzr('ignore a')
125
 
        self.assertEqual(out, 
 
125
        self.assertEqual(out,
126
126
                         "Warning: the following files are version controlled"\
127
127
                         " and match your ignore pattern:\na\n")
128
128
 
133
133
        # test wildcards
134
134
        tree.add('b')
135
135
        out, err = self.run_bzr('ignore *')
136
 
        self.assertEqual(out, 
 
136
        self.assertEqual(out,
137
137
                         "Warning: the following files are version controlled"\
138
138
                         " and match your ignore pattern:\n.bzrignore\na\nb\n")
139
139
 
146
146
        # If only the given pattern is used then only 'b' should match in
147
147
        # this case.
148
148
        out, err = self.run_bzr('ignore b')
149
 
        self.assertEqual(out, 
 
149
        self.assertEqual(out,
150
150
                         "Warning: the following files are version controlled"\
151
151
                         " and match your ignore pattern:\nb\n")