← 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: Jelmer Vernooij
  • Date: 2009-05-01 14:29:06 UTC
  • mto: This revision was merged to the branch mainline in revision 4321.
  • Revision ID: jelmer@samba.org-20090501142906-7zj8hcpp9igzuyi4
Add repository argument to 'repository' info hook, per Roberts review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib import ignores, osutils
 
21
from bzrlib import ignores
22
22
from bzrlib.tests import TestCaseWithTransport
23
23
 
24
24
 
54
54
    def test_ls_basic(self):
55
55
        """Test the abilities of 'bzr ls'"""
56
56
        self.ls_equals('.bzrignore\na\n')
57
 
        self.ls_equals('.bzrignore\na\n', './')
58
57
        self.ls_equals('?        .bzrignore\n'
59
58
                       '?        a\n',
60
59
                       '--verbose')
130
129
        self.ls_equals('b\n')
131
130
        self.ls_equals('b\0'
132
131
                  , '--null')
133
 
        self.ls_equals('subdir/b\n'
 
132
        self.ls_equals('.bzrignore\n'
 
133
                       'a\n'
 
134
                       'subdir/\n'
 
135
                       'subdir/b\n'
134
136
                       , '--from-root')
135
 
        self.ls_equals('subdir/b\0'
 
137
        self.ls_equals('.bzrignore\0'
 
138
                       'a\0'
 
139
                       'subdir\0'
 
140
                       'subdir/b\0'
136
141
                       , '--from-root --null')
137
 
        self.ls_equals('subdir/b\n'
 
142
        self.ls_equals('.bzrignore\n'
 
143
                       'a\n'
 
144
                       'subdir/\n'
138
145
                       , '--from-root', recursive=False)
139
146
 
140
147
    def test_ls_path(self):
159
166
                       'V        ../subdir/\n'
160
167
                       'V        ../subdir/b\n' ,
161
168
                       '.. --verbose')
162
 
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
 
169
        self.run_bzr_error('cannot specify both --from-root and PATH',
163
170
                           'ls --from-root ..')
164
171
 
165
172
    def test_ls_revision(self):
228
235
                       '--kind=directory')
229
236
        self.ls_equals('',
230
237
                       '--kind=symlink')
231
 
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
 
238
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')
232
239
 
233
240
    def test_ls_path_nonrecursive(self):
234
241
        self.ls_equals('%s/.bzrignore\n'
235
242
                       '%s/a\n'
236
243
                       % (self.test_dir, self.test_dir),
237
244
                       self.test_dir, recursive=False)
238
 
 
239
 
    def test_ls_directory(self):
240
 
        """Test --directory option"""
241
 
        self.wt = self.make_branch_and_tree('dir')
242
 
        self.build_tree(['dir/sub/', 'dir/sub/file'])
243
 
        self.wt.add(['sub', 'sub/file'])
244
 
        self.wt.commit('commit')
245
 
        self.ls_equals('sub/\nsub/file\n', '--directory=dir')
246
 
        self.ls_equals('sub/file\n', '-d dir sub')