/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2020-09-02 16:35:18 UTC
  • mto: (7490.40.109 work)
  • mto: This revision was merged to the branch mainline in revision 7526.
  • Revision ID: jelmer@jelmer.uk-20200902163518-sy9f4unbboljphgu
Handle duplicate directories entries for git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_ls.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""External tests of 'bzr ls'"""
18
 
 
19
 
import os
20
 
 
21
 
from bzrlib import ignores
22
 
from bzrlib.tests import TestCaseWithTransport
23
 
 
24
 
 
25
 
class TestLS(TestCaseWithTransport):
 
17
"""External tests of 'brz ls'"""
 
18
 
 
19
from breezy import (
 
20
    ignores,
 
21
    tests,
 
22
    )
 
23
 
 
24
 
 
25
class TestLS(tests.TestCaseWithTransport):
26
26
 
27
27
    def setUp(self):
28
28
        super(TestLS, self).setUp()
32
32
 
33
33
        self.wt = self.make_branch_and_tree('.')
34
34
        self.build_tree_contents([
35
 
                                 ('.bzrignore', '*.pyo\n'),
36
 
                                 ('a', 'hello\n'),
 
35
                                 ('.bzrignore', b'*.pyo\n'),
 
36
                                 ('a', b'hello\n'),
37
37
                                 ])
38
38
 
39
 
    def ls_equals(self, value, args=None, recursive=True):
 
39
    def ls_equals(self, value, args=None, recursive=True, working_dir=None):
40
40
        command = 'ls'
41
41
        if args is not None:
42
42
            command += ' ' + args
43
43
        if recursive:
44
44
            command += ' -R'
45
 
        out, err = self.run_bzr(command)
 
45
        out, err = self.run_bzr(command, working_dir=working_dir)
46
46
        self.assertEqual('', err)
47
47
        self.assertEqualDiff(value, out)
48
48
 
52
52
                           'ls --verbose --null')
53
53
 
54
54
    def test_ls_basic(self):
55
 
        """Test the abilities of 'bzr ls'"""
 
55
        """Test the abilities of 'brz ls'"""
56
56
        self.ls_equals('.bzrignore\na\n')
57
57
        self.ls_equals('.bzrignore\na\n', './')
58
58
        self.ls_equals('?        .bzrignore\n'
84
84
        self.build_tree(['subdir/'])
85
85
        self.ls_equals('?        .bzrignore\n'
86
86
                       'V        a\n'
87
 
                       '?        subdir/\n'
88
 
                       , '--verbose')
 
87
                       '?        subdir/\n', '--verbose')
89
88
        self.build_tree(['subdir/b'])
90
89
        self.wt.add(['subdir/', 'subdir/b', '.bzrignore'])
91
90
        self.ls_equals('V        .bzrignore\n'
92
91
                       'V        a\n'
93
92
                       'V        subdir/\n'
94
 
                       'V        subdir/b\n'
95
 
                       , '--verbose')
 
93
                       'V        subdir/b\n', '--verbose')
96
94
 
97
95
    def test_show_ids(self):
98
96
        self.build_tree(['subdir/'])
99
 
        self.wt.add(['a', 'subdir'], ['a-id', 'subdir-id'])
 
97
        self.wt.add(['a', 'subdir'], [b'a-id', b'subdir-id'])
100
98
        self.ls_equals(
101
99
            '.bzrignore                                         \n'
102
100
            'a                                                  a-id\n'
117
115
 
118
116
        self.ls_equals('.bzrignore\n'
119
117
                       'a\n'
120
 
                       'subdir/\n'
121
 
                       , recursive=False)
 
118
                       'subdir/\n', recursive=False)
122
119
 
123
120
        self.ls_equals('V        .bzrignore\n'
124
121
                       'V        a\n'
125
 
                       'V        subdir/\n'
126
 
                       , '--verbose', recursive=False)
 
122
                       'V        subdir/\n', '--verbose', recursive=False)
127
123
 
128
124
        # Check what happens in a sub-directory
129
 
        os.chdir('subdir')
130
 
        self.ls_equals('b\n')
131
 
        self.ls_equals('b\0'
132
 
                  , '--null')
133
 
        self.ls_equals('subdir/b\n'
134
 
                       , '--from-root')
135
 
        self.ls_equals('subdir/b\0'
136
 
                       , '--from-root --null')
137
 
        self.ls_equals('subdir/b\n'
138
 
                       , '--from-root', recursive=False)
 
125
        self.ls_equals('b\n', working_dir='subdir')
 
126
        self.ls_equals('b\0', '--null', working_dir='subdir')
 
127
        self.ls_equals('subdir/b\n', '--from-root', working_dir='subdir')
 
128
        self.ls_equals('subdir/b\0', '--from-root --null',
 
129
                       working_dir='subdir')
 
130
        self.ls_equals('subdir/b\n', '--from-root', recursive=False,
 
131
                       working_dir='subdir')
139
132
 
140
133
    def test_ls_path(self):
141
134
        """If a path is specified, files are listed with that prefix"""
142
135
        self.build_tree(['subdir/', 'subdir/b'])
143
136
        self.wt.add(['subdir', 'subdir/b'])
144
 
        self.ls_equals('subdir/b\n' ,
 
137
        self.ls_equals('subdir/b\n',
145
138
                       'subdir')
146
 
        os.chdir('subdir')
147
139
        self.ls_equals('../.bzrignore\n'
148
140
                       '../a\n'
149
141
                       '../subdir/\n'
150
 
                       '../subdir/b\n' ,
151
 
                       '..')
 
142
                       '../subdir/b\n',
 
143
                       '..', working_dir='subdir')
152
144
        self.ls_equals('../.bzrignore\0'
153
145
                       '../a\0'
154
146
                       '../subdir\0'
155
 
                       '../subdir/b\0' ,
156
 
                       '.. --null')
 
147
                       '../subdir/b\0',
 
148
                       '.. --null', working_dir='subdir')
157
149
        self.ls_equals('?        ../.bzrignore\n'
158
150
                       '?        ../a\n'
159
151
                       'V        ../subdir/\n'
160
 
                       'V        ../subdir/b\n' ,
161
 
                       '.. --verbose')
 
152
                       'V        ../subdir/b\n',
 
153
                       '.. --verbose', working_dir='subdir')
162
154
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
163
 
                           'ls --from-root ..')
 
155
                           'ls --from-root ..', working_dir='subdir')
164
156
 
165
157
    def test_ls_revision(self):
166
158
        self.wt.add(['a'])
170
162
 
171
163
        # Check what happens when we supply a specific revision
172
164
        self.ls_equals('a\n', '--revision 1')
173
 
        self.ls_equals('V        a\n'
174
 
                       , '--verbose --revision 1')
 
165
        self.ls_equals('V        a\n', '--verbose --revision 1')
175
166
 
176
 
        os.chdir('subdir')
177
 
        self.ls_equals('', '--revision 1')
 
167
        self.ls_equals('', '--revision 1', working_dir='subdir')
178
168
 
179
169
    def test_ls_branch(self):
180
170
        """If a branch is specified, files are listed from it"""
205
195
                       'V        a\n'
206
196
                       '?        blah.py\n'
207
197
                       'I        blah.pyo\n'
208
 
                       'I        user-ignore\n'
209
 
                       , '--verbose')
 
198
                       'I        user-ignore\n', '--verbose')
210
199
        self.ls_equals('blah.pyo\n'
211
 
                       'user-ignore\n'
212
 
                       , '--ignored')
213
 
        self.ls_equals('blah.py\n'
214
 
                       , '--unknown')
215
 
        self.ls_equals('.bzrignore\n'
216
 
                       'a\n'
217
 
                       , '--versioned')
218
 
        self.ls_equals('.bzrignore\n'
219
 
                       'a\n'
220
 
                       , '-V')
 
200
                       'user-ignore\n', '--ignored')
 
201
        self.ls_equals('blah.py\n', '--unknown')
 
202
        self.ls_equals('.bzrignore\n'
 
203
                       'a\n', '--versioned')
 
204
        self.ls_equals('.bzrignore\n'
 
205
                       'a\n', '-V')
221
206
 
222
207
    def test_kinds(self):
223
208
        self.build_tree(['subdir/'])
235
220
                       '%s/a\n'
236
221
                       % (self.test_dir, self.test_dir),
237
222
                       self.test_dir, recursive=False)
 
223
 
 
224
    def test_ls_directory(self):
 
225
        """Test --directory option"""
 
226
        self.wt = self.make_branch_and_tree('dir')
 
227
        self.build_tree(['dir/sub/', 'dir/sub/file'])
 
228
        self.wt.add(['sub', 'sub/file'])
 
229
        self.wt.commit('commit')
 
230
        self.ls_equals('sub/\nsub/file\n', '--directory=dir')
 
231
        self.ls_equals('sub/file\n', '-d dir sub')