← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.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., 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
"""External tests of 'bzr ls'"""
18
18
 
26
26
 
27
27
    def setUp(self):
28
28
        super(TestLS, self).setUp()
29
 
 
 
29
        
30
30
        # Create a simple branch that can be used in testing
31
31
        ignores._set_user_ignores(['user-ignore'])
32
32
 
36
36
                                 ('a', 'hello\n'),
37
37
                                 ])
38
38
 
39
 
    def ls_equals(self, value, args=None, recursive=True):
 
39
    def ls_equals(self, value, args=None):
40
40
        command = 'ls'
41
41
        if args is not None:
42
42
            command += ' ' + args
43
 
        if recursive:
44
 
            command += ' -R'
45
43
        out, err = self.run_bzr(command)
46
44
        self.assertEqual('', err)
47
45
        self.assertEqualDiff(value, out)
79
77
                       'V        a\n',
80
78
                       '--verbose')
81
79
        self.wt.commit('add')
82
 
 
 
80
        
83
81
        self.build_tree(['subdir/'])
84
82
        self.ls_equals('?        .bzrignore\n'
85
83
                       'V        a\n'
99
97
        self.ls_equals(
100
98
            '.bzrignore                                         \n'
101
99
            'a                                                  a-id\n'
102
 
            'subdir/                                            subdir-id\n',
 
100
            'subdir                                             subdir-id\n', 
103
101
            '--show-ids')
104
102
        self.ls_equals(
105
103
            '?        .bzrignore\n'
106
104
            'V        a                                         a-id\n'
107
 
            'V        subdir/                                   subdir-id\n',
 
105
            'V        subdir/                                   subdir-id\n', 
108
106
            '--show-ids --verbose')
109
107
        self.ls_equals('.bzrignore\0\0'
110
108
                       'a\0a-id\0'
111
109
                       'subdir\0subdir-id\0', '--show-ids --null')
112
110
 
113
 
    def test_ls_no_recursive(self):
 
111
    def test_ls_recursive(self):
114
112
        self.build_tree(['subdir/', 'subdir/b'])
115
113
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
116
114
 
117
115
        self.ls_equals('.bzrignore\n'
118
116
                       'a\n'
119
 
                       'subdir/\n'
120
 
                       , recursive=False)
 
117
                       'subdir\n'
 
118
                       , '--non-recursive')
121
119
 
122
120
        self.ls_equals('V        .bzrignore\n'
123
121
                       'V        a\n'
124
122
                       'V        subdir/\n'
125
 
                       , '--verbose', recursive=False)
 
123
                       , '--verbose --non-recursive')
126
124
 
127
125
        # Check what happens in a sub-directory
128
126
        os.chdir('subdir')
129
127
        self.ls_equals('b\n')
130
128
        self.ls_equals('b\0'
131
129
                  , '--null')
132
 
        self.ls_equals('subdir/b\n'
 
130
        self.ls_equals('.bzrignore\n'
 
131
                       'a\n'
 
132
                       'subdir\n'
 
133
                       'subdir/b\n'
133
134
                       , '--from-root')
134
 
        self.ls_equals('subdir/b\0'
 
135
        self.ls_equals('.bzrignore\0'
 
136
                       'a\0'
 
137
                       'subdir\0'
 
138
                       'subdir/b\0'
135
139
                       , '--from-root --null')
136
 
        self.ls_equals('subdir/b\n'
137
 
                       , '--from-root', recursive=False)
 
140
        self.ls_equals('.bzrignore\n'
 
141
                       'a\n'
 
142
                       'subdir\n'
 
143
                       , '--from-root --non-recursive')
138
144
 
139
145
    def test_ls_path(self):
140
146
        """If a path is specified, files are listed with that prefix"""
145
151
        os.chdir('subdir')
146
152
        self.ls_equals('../.bzrignore\n'
147
153
                       '../a\n'
148
 
                       '../subdir/\n'
 
154
                       '../subdir\n'
149
155
                       '../subdir/b\n' ,
150
156
                       '..')
151
157
        self.ls_equals('../.bzrignore\0'
158
164
                       'V        ../subdir/\n'
159
165
                       'V        ../subdir/b\n' ,
160
166
                       '.. --verbose')
161
 
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
 
167
        self.run_bzr_error('cannot specify both --from-root and PATH',
162
168
                           'ls --from-root ..')
163
169
 
164
170
    def test_ls_revision(self):
182
188
        self.wt.commit('committing')
183
189
        branch = self.make_branch('branchdir')
184
190
        branch.pull(self.wt.branch)
185
 
        self.ls_equals('branchdir/subdir/\n'
 
191
        self.ls_equals('branchdir/subdir\n'
186
192
                       'branchdir/subdir/b\n',
187
193
                       'branchdir')
188
 
        self.ls_equals('branchdir/subdir/\n'
 
194
        self.ls_equals('branchdir/subdir\n'
189
195
                       'branchdir/subdir/b\n',
190
196
                       'branchdir --revision 1')
191
197
 
220
226
 
221
227
    def test_kinds(self):
222
228
        self.build_tree(['subdir/'])
223
 
        self.ls_equals('.bzrignore\n'
224
 
                       'a\n',
 
229
        self.ls_equals('.bzrignore\n' 
 
230
                       'a\n', 
225
231
                       '--kind=file')
226
 
        self.ls_equals('subdir/\n',
 
232
        self.ls_equals('subdir\n',
227
233
                       '--kind=directory')
228
234
        self.ls_equals('',
229
235
                       '--kind=symlink')
230
 
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
231
 
 
232
 
    def test_ls_path_nonrecursive(self):
233
 
        self.ls_equals('%s/.bzrignore\n'
234
 
                       '%s/a\n'
235
 
                       % (self.test_dir, self.test_dir),
236
 
                       self.test_dir, recursive=False)
 
236
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')