← 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: Martin Pool
  • Date: 2005-04-28 07:24:55 UTC
  • Revision ID: mbp@sourcefrog.net-20050428072453-7b99afa993a1e549
todo

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
1
 
# Copyright (C) 2006-2012 Canonical Ltd
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
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
16
 
 
17
 
"""External tests of 'bzr ls'"""
18
 
 
19
 
from bzrlib import (
20
 
    ignores,
21
 
    tests,
22
 
    )
23
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
24
 
 
25
 
 
26
 
class TestLS(tests.TestCaseWithTransport):
27
 
 
28
 
    def setUp(self):
29
 
        super(TestLS, self).setUp()
30
 
 
31
 
        # Create a simple branch that can be used in testing
32
 
        ignores._set_user_ignores(['user-ignore'])
33
 
 
34
 
        self.wt = self.make_branch_and_tree('.')
35
 
        self.build_tree_contents([
36
 
                                 ('.bzrignore', '*.pyo\n'),
37
 
                                 ('a', 'hello\n'),
38
 
                                 ])
39
 
 
40
 
    def ls_equals(self, value, args=None, recursive=True, working_dir=None):
41
 
        command = 'ls'
42
 
        if args is not None:
43
 
            command += ' ' + args
44
 
        if recursive:
45
 
            command += ' -R'
46
 
        out, err = self.run_bzr(command, working_dir=working_dir)
47
 
        self.assertEqual('', err)
48
 
        self.assertEqualDiff(value, out)
49
 
 
50
 
    def test_ls_null_verbose(self):
51
 
        # Can't supply both
52
 
        self.run_bzr_error(['Cannot set both --verbose and --null'],
53
 
                           'ls --verbose --null')
54
 
 
55
 
    def test_ls_basic(self):
56
 
        """Test the abilities of 'bzr ls'"""
57
 
        self.ls_equals('.bzrignore\na\n')
58
 
        self.ls_equals('.bzrignore\na\n', './')
59
 
        self.ls_equals('?        .bzrignore\n'
60
 
                       '?        a\n',
61
 
                       '--verbose')
62
 
        self.ls_equals('.bzrignore\n'
63
 
                       'a\n',
64
 
                       '--unknown')
65
 
        self.ls_equals('', '--ignored')
66
 
        self.ls_equals('', '--versioned')
67
 
        self.ls_equals('', '-V')
68
 
        self.ls_equals('.bzrignore\n'
69
 
                       'a\n',
70
 
                       '--unknown --ignored --versioned')
71
 
        self.ls_equals('.bzrignore\n'
72
 
                       'a\n',
73
 
                       '--unknown --ignored -V')
74
 
        self.ls_equals('', '--ignored --versioned')
75
 
        self.ls_equals('', '--ignored -V')
76
 
        self.ls_equals('.bzrignore\0a\0', '--null')
77
 
 
78
 
    def test_ls_added(self):
79
 
        self.wt.add(['a'])
80
 
        self.ls_equals('?        .bzrignore\n'
81
 
                       'V        a\n',
82
 
                       '--verbose')
83
 
        self.wt.commit('add')
84
 
 
85
 
        self.build_tree(['subdir/'])
86
 
        self.ls_equals('?        .bzrignore\n'
87
 
                       'V        a\n'
88
 
                       '?        subdir/\n'
89
 
                       , '--verbose')
90
 
        self.build_tree(['subdir/b'])
91
 
        self.wt.add(['subdir/', 'subdir/b', '.bzrignore'])
92
 
        self.ls_equals('V        .bzrignore\n'
93
 
                       'V        a\n'
94
 
                       'V        subdir/\n'
95
 
                       'V        subdir/b\n'
96
 
                       , '--verbose')
97
 
 
98
 
    def test_show_ids(self):
99
 
        self.build_tree(['subdir/'])
100
 
        self.wt.add(['a', 'subdir'], ['a-id', 'subdir-id'])
101
 
        self.ls_equals(
102
 
            '.bzrignore                                         \n'
103
 
            'a                                                  a-id\n'
104
 
            'subdir/                                            subdir-id\n',
105
 
            '--show-ids')
106
 
        self.ls_equals(
107
 
            '?        .bzrignore\n'
108
 
            'V        a                                         a-id\n'
109
 
            'V        subdir/                                   subdir-id\n',
110
 
            '--show-ids --verbose')
111
 
        self.ls_equals('.bzrignore\0\0'
112
 
                       'a\0a-id\0'
113
 
                       'subdir\0subdir-id\0', '--show-ids --null')
114
 
 
115
 
    def test_ls_no_recursive(self):
116
 
        self.build_tree(['subdir/', 'subdir/b'])
117
 
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
118
 
 
119
 
        self.ls_equals('.bzrignore\n'
120
 
                       'a\n'
121
 
                       'subdir/\n'
122
 
                       , recursive=False)
123
 
 
124
 
        self.ls_equals('V        .bzrignore\n'
125
 
                       'V        a\n'
126
 
                       'V        subdir/\n'
127
 
                       , '--verbose', recursive=False)
128
 
 
129
 
        # Check what happens in a sub-directory
130
 
        self.ls_equals('b\n', working_dir='subdir')
131
 
        self.ls_equals('b\0', '--null', working_dir='subdir')
132
 
        self.ls_equals('subdir/b\n', '--from-root', working_dir='subdir')
133
 
        self.ls_equals('subdir/b\0', '--from-root --null',
134
 
                       working_dir='subdir')
135
 
        self.ls_equals('subdir/b\n', '--from-root', recursive=False,
136
 
                       working_dir='subdir')
137
 
 
138
 
    def test_ls_path(self):
139
 
        """If a path is specified, files are listed with that prefix"""
140
 
        self.build_tree(['subdir/', 'subdir/b'])
141
 
        self.wt.add(['subdir', 'subdir/b'])
142
 
        self.ls_equals('subdir/b\n' ,
143
 
                       'subdir')
144
 
        self.ls_equals('../.bzrignore\n'
145
 
                       '../a\n'
146
 
                       '../subdir/\n'
147
 
                       '../subdir/b\n' ,
148
 
                       '..', working_dir='subdir')
149
 
        self.ls_equals('../.bzrignore\0'
150
 
                       '../a\0'
151
 
                       '../subdir\0'
152
 
                       '../subdir/b\0' ,
153
 
                       '.. --null', working_dir='subdir')
154
 
        self.ls_equals('?        ../.bzrignore\n'
155
 
                       '?        ../a\n'
156
 
                       'V        ../subdir/\n'
157
 
                       'V        ../subdir/b\n' ,
158
 
                       '.. --verbose', working_dir='subdir')
159
 
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
160
 
                           'ls --from-root ..', working_dir='subdir')
161
 
 
162
 
    def test_ls_revision(self):
163
 
        self.wt.add(['a'])
164
 
        self.wt.commit('add')
165
 
 
166
 
        self.build_tree(['subdir/'])
167
 
 
168
 
        # Check what happens when we supply a specific revision
169
 
        self.ls_equals('a\n', '--revision 1')
170
 
        self.ls_equals('V        a\n'
171
 
                       , '--verbose --revision 1')
172
 
 
173
 
        self.ls_equals('', '--revision 1', working_dir='subdir')
174
 
 
175
 
    def test_ls_branch(self):
176
 
        """If a branch is specified, files are listed from it"""
177
 
        self.build_tree(['subdir/', 'subdir/b'])
178
 
        self.wt.add(['subdir', 'subdir/b'])
179
 
        self.wt.commit('committing')
180
 
        branch = self.make_branch('branchdir')
181
 
        branch.pull(self.wt.branch)
182
 
        self.ls_equals('branchdir/subdir/\n'
183
 
                       'branchdir/subdir/b\n',
184
 
                       'branchdir')
185
 
        self.ls_equals('branchdir/subdir/\n'
186
 
                       'branchdir/subdir/b\n',
187
 
                       'branchdir --revision 1')
188
 
 
189
 
    def test_ls_ignored(self):
190
 
        # Now try to do ignored files.
191
 
        self.wt.add(['a', '.bzrignore'])
192
 
 
193
 
        self.build_tree(['blah.py', 'blah.pyo', 'user-ignore'])
194
 
        self.ls_equals('.bzrignore\n'
195
 
                       'a\n'
196
 
                       'blah.py\n'
197
 
                       'blah.pyo\n'
198
 
                       'user-ignore\n'
199
 
                       )
200
 
        self.ls_equals('V        .bzrignore\n'
201
 
                       'V        a\n'
202
 
                       '?        blah.py\n'
203
 
                       'I        blah.pyo\n'
204
 
                       'I        user-ignore\n'
205
 
                       , '--verbose')
206
 
        self.ls_equals('blah.pyo\n'
207
 
                       'user-ignore\n'
208
 
                       , '--ignored')
209
 
        self.ls_equals('blah.py\n'
210
 
                       , '--unknown')
211
 
        self.ls_equals('.bzrignore\n'
212
 
                       'a\n'
213
 
                       , '--versioned')
214
 
        self.ls_equals('.bzrignore\n'
215
 
                       'a\n'
216
 
                       , '-V')
217
 
 
218
 
    def test_kinds(self):
219
 
        self.build_tree(['subdir/'])
220
 
        self.ls_equals('.bzrignore\n'
221
 
                       'a\n',
222
 
                       '--kind=file')
223
 
        self.ls_equals('subdir/\n',
224
 
                       '--kind=directory')
225
 
        self.ls_equals('',
226
 
                       '--kind=symlink')
227
 
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
228
 
 
229
 
    def test_ls_path_nonrecursive(self):
230
 
        self.ls_equals('%s/.bzrignore\n'
231
 
                       '%s/a\n'
232
 
                       % (self.test_dir, self.test_dir),
233
 
                       self.test_dir, recursive=False)
234
 
 
235
 
    def test_ls_directory(self):
236
 
        """Test --directory option"""
237
 
        self.wt = self.make_branch_and_tree('dir')
238
 
        self.build_tree(['dir/sub/', 'dir/sub/file'])
239
 
        self.wt.add(['sub', 'sub/file'])
240
 
        self.wt.commit('commit')
241
 
        self.ls_equals('sub/\nsub/file\n', '--directory=dir')
242
 
        self.ls_equals('sub/file\n', '-d dir sub')
243
 
 
244
 
 
245
 
class TestSmartServerLs(tests.TestCaseWithTransport):
246
 
 
247
 
    def test_simple_ls(self):
248
 
        self.setup_smart_server_with_call_log()
249
 
        t = self.make_branch_and_tree('branch')
250
 
        self.build_tree_contents([('branch/foo', 'thecontents')])
251
 
        t.add("foo")
252
 
        t.commit("message")
253
 
        self.reset_smart_call_log()
254
 
        out, err = self.run_bzr(['ls', self.get_url('branch')])
255
 
        # This figure represent the amount of work to perform this use case. It
256
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
257
 
        # being too low. If rpc_count increases, more network roundtrips have
258
 
        # become necessary for this use case. Please do not adjust this number
259
 
        # upwards without agreement from bzr's network support maintainers.
260
 
        self.assertLength(6, self.hpss_calls)
261
 
        self.assertLength(1, self.hpss_connections)
262
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)