← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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
 
21
from bzrlib import ignores, osutils
22
22
from bzrlib.tests import TestCaseWithTransport
23
23
 
24
24
 
36
36
                                 ('a', 'hello\n'),
37
37
                                 ])
38
38
 
39
 
    def ls_equals(self, value, args=None):
 
39
    def ls_equals(self, value, args=None, recursive=True):
40
40
        command = 'ls'
41
41
        if args is not None:
42
42
            command += ' ' + args
 
43
        if recursive:
 
44
            command += ' -R'
43
45
        out, err = self.run_bzr(command)
44
46
        self.assertEqual('', err)
45
47
        self.assertEqualDiff(value, out)
52
54
    def test_ls_basic(self):
53
55
        """Test the abilities of 'bzr ls'"""
54
56
        self.ls_equals('.bzrignore\na\n')
 
57
        self.ls_equals('.bzrignore\na\n', './')
55
58
        self.ls_equals('?        .bzrignore\n'
56
59
                       '?        a\n',
57
60
                       '--verbose')
108
111
                       'a\0a-id\0'
109
112
                       'subdir\0subdir-id\0', '--show-ids --null')
110
113
 
111
 
    def test_ls_recursive(self):
 
114
    def test_ls_no_recursive(self):
112
115
        self.build_tree(['subdir/', 'subdir/b'])
113
116
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
114
117
 
115
118
        self.ls_equals('.bzrignore\n'
116
119
                       'a\n'
117
120
                       'subdir/\n'
118
 
                       , '--non-recursive')
 
121
                       , recursive=False)
119
122
 
120
123
        self.ls_equals('V        .bzrignore\n'
121
124
                       'V        a\n'
122
125
                       'V        subdir/\n'
123
 
                       , '--verbose --non-recursive')
 
126
                       , '--verbose', recursive=False)
124
127
 
125
128
        # Check what happens in a sub-directory
126
129
        os.chdir('subdir')
127
130
        self.ls_equals('b\n')
128
131
        self.ls_equals('b\0'
129
132
                  , '--null')
130
 
        self.ls_equals('.bzrignore\n'
131
 
                       'a\n'
132
 
                       'subdir/\n'
133
 
                       'subdir/b\n'
 
133
        self.ls_equals('subdir/b\n'
134
134
                       , '--from-root')
135
 
        self.ls_equals('.bzrignore\0'
136
 
                       'a\0'
137
 
                       'subdir\0'
138
 
                       'subdir/b\0'
 
135
        self.ls_equals('subdir/b\0'
139
136
                       , '--from-root --null')
140
 
        self.ls_equals('.bzrignore\n'
141
 
                       'a\n'
142
 
                       'subdir/\n'
143
 
                       , '--from-root --non-recursive')
 
137
        self.ls_equals('subdir/b\n'
 
138
                       , '--from-root', recursive=False)
144
139
 
145
140
    def test_ls_path(self):
146
141
        """If a path is specified, files are listed with that prefix"""
164
159
                       'V        ../subdir/\n'
165
160
                       'V        ../subdir/b\n' ,
166
161
                       '.. --verbose')
167
 
        self.run_bzr_error('cannot specify both --from-root and PATH',
 
162
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
168
163
                           'ls --from-root ..')
169
164
 
170
165
    def test_ls_revision(self):
233
228
                       '--kind=directory')
234
229
        self.ls_equals('',
235
230
                       '--kind=symlink')
236
 
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')
 
231
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
 
232
 
 
233
    def test_ls_path_nonrecursive(self):
 
234
        self.ls_equals('%s/.bzrignore\n'
 
235
                       '%s/a\n'
 
236
                       % (self.test_dir, self.test_dir),
 
237
                       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')