← 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: 2006-08-17 07:52:09 UTC
  • mfrom: (1910.3.4 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20060817075209-e85a1f9e05ff8b87
(andrew) Trivial fixes to NotImplemented errors.

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 by 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
28
28
        super(TestLS, self).setUp()
29
29
        
30
30
        # Create a simple branch that can be used in testing
31
 
        ignores._set_user_ignores(['user-ignore'])
 
31
        ignores._set_user_ignores(['./.bazaar', 'user-ignore'])
32
32
 
33
33
        self.wt = self.make_branch_and_tree('.')
34
34
        self.build_tree_contents([
36
36
                                 ('a', 'hello\n'),
37
37
                                 ])
38
38
 
39
 
    def ls_equals(self, value, args=None):
40
 
        command = 'ls'
41
 
        if args is not None:
42
 
            command += ' ' + args
43
 
        out, err = self.run_bzr(command)
 
39
    def ls_equals(self, value, *args):
 
40
        out, err = self.run_bzr('ls', *args)
44
41
        self.assertEqual('', err)
45
 
        self.assertEqualDiff(value, out)
 
42
        self.assertEqual(value, out)
46
43
 
47
44
    def test_ls_null_verbose(self):
48
45
        # Can't supply both
49
46
        self.run_bzr_error(['Cannot set both --verbose and --null'],
50
 
                           'ls --verbose --null')
 
47
                           'ls', '--verbose', '--null')
51
48
 
52
49
    def test_ls_basic(self):
53
50
        """Test the abilities of 'bzr ls'"""
54
 
        self.ls_equals('.bzrignore\na\n')
55
 
        self.ls_equals('?        .bzrignore\n'
 
51
        self.ls_equals('.bazaar\n.bzrignore\na\n')
 
52
        self.ls_equals('I        .bazaar/\n'
 
53
                       '?        .bzrignore\n'
56
54
                       '?        a\n',
57
55
                       '--verbose')
58
56
        self.ls_equals('.bzrignore\n'
59
57
                       'a\n',
60
58
                       '--unknown')
61
 
        self.ls_equals('', '--ignored')
 
59
        self.ls_equals('.bazaar\n', '--ignored')
62
60
        self.ls_equals('', '--versioned')
63
 
        self.ls_equals('.bzrignore\n'
 
61
        self.ls_equals('.bazaar\n'
 
62
                       '.bzrignore\n'
64
63
                       'a\n',
65
 
                       '--unknown --ignored --versioned')
66
 
        self.ls_equals('', '--ignored --versioned')
67
 
        self.ls_equals('.bzrignore\0a\0', '--null')
 
64
                       '--unknown', '--ignored', '--versioned')
 
65
        self.ls_equals('.bazaar\n', '--ignored', '--versioned')
 
66
        self.ls_equals('.bazaar\0.bzrignore\0a\0', '--null')
68
67
 
69
68
    def test_ls_added(self):
70
69
        self.wt.add(['a'])
71
 
        self.ls_equals('?        .bzrignore\n'
 
70
        self.ls_equals('I        .bazaar/\n'
 
71
                       '?        .bzrignore\n'
72
72
                       'V        a\n',
73
73
                       '--verbose')
74
74
        self.wt.commit('add')
75
75
        
76
76
        self.build_tree(['subdir/'])
77
 
        self.ls_equals('?        .bzrignore\n'
 
77
        self.ls_equals('I        .bazaar/\n'
 
78
                       '?        .bzrignore\n'
78
79
                       'V        a\n'
79
80
                       '?        subdir/\n'
80
81
                       , '--verbose')
81
82
        self.build_tree(['subdir/b'])
82
83
        self.wt.add(['subdir/', 'subdir/b', '.bzrignore'])
83
 
        self.ls_equals('V        .bzrignore\n'
 
84
        self.ls_equals('I        .bazaar/\n'
 
85
                       'V        .bzrignore\n'
84
86
                       'V        a\n'
85
87
                       'V        subdir/\n'
86
88
                       'V        subdir/b\n'
87
89
                       , '--verbose')
88
90
 
89
 
    def test_show_ids(self):
90
 
        self.build_tree(['subdir/'])
91
 
        self.wt.add(['a', 'subdir'], ['a-id', 'subdir-id'])
92
 
        self.ls_equals(
93
 
            '.bzrignore                                         \n'
94
 
            'a                                                  a-id\n'
95
 
            'subdir                                             subdir-id\n', 
96
 
            '--show-ids')
97
 
        self.ls_equals(
98
 
            '?        .bzrignore\n'
99
 
            'V        a                                         a-id\n'
100
 
            'V        subdir/                                   subdir-id\n', 
101
 
            '--show-ids --verbose')
102
 
        self.ls_equals('.bzrignore\0\0'
103
 
                       'a\0a-id\0'
104
 
                       'subdir\0subdir-id\0', '--show-ids --null')
105
 
 
106
91
    def test_ls_recursive(self):
107
92
        self.build_tree(['subdir/', 'subdir/b'])
108
93
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
109
94
 
110
 
        self.ls_equals('.bzrignore\n'
 
95
        self.ls_equals('.bazaar\n'
 
96
                       '.bzrignore\n'
111
97
                       'a\n'
112
98
                       'subdir\n'
113
99
                       , '--non-recursive')
114
100
 
115
 
        self.ls_equals('V        .bzrignore\n'
 
101
        self.ls_equals('I        .bazaar/\n'
 
102
                       'V        .bzrignore\n'
116
103
                       'V        a\n'
117
104
                       'V        subdir/\n'
118
 
                       , '--verbose --non-recursive')
 
105
                       , '--verbose', '--non-recursive')
119
106
 
120
107
        # Check what happens in a sub-directory
121
108
        os.chdir('subdir')
122
109
        self.ls_equals('b\n')
123
110
        self.ls_equals('b\0'
124
111
                  , '--null')
125
 
        self.ls_equals('.bzrignore\n'
 
112
        self.ls_equals('.bazaar\n'
 
113
                       '.bzrignore\n'
126
114
                       'a\n'
127
115
                       'subdir\n'
128
116
                       'subdir/b\n'
129
117
                       , '--from-root')
130
 
        self.ls_equals('.bzrignore\0'
 
118
        self.ls_equals('.bazaar\0'
 
119
                       '.bzrignore\0'
131
120
                       'a\0'
132
121
                       'subdir\0'
133
122
                       'subdir/b\0'
134
 
                       , '--from-root --null')
135
 
        self.ls_equals('.bzrignore\n'
 
123
                       , '--from-root', '--null')
 
124
        self.ls_equals('.bazaar\n'
 
125
                       '.bzrignore\n'
136
126
                       'a\n'
137
127
                       'subdir\n'
138
 
                       , '--from-root --non-recursive')
139
 
 
140
 
    def test_ls_path(self):
141
 
        """If a path is specified, files are listed with that prefix"""
142
 
        self.build_tree(['subdir/', 'subdir/b'])
143
 
        self.wt.add(['subdir', 'subdir/b'])
144
 
        self.ls_equals('subdir/b\n' ,
145
 
                       'subdir')
146
 
        os.chdir('subdir')
147
 
        self.ls_equals('../.bzrignore\n'
148
 
                       '../a\n'
149
 
                       '../subdir\n'
150
 
                       '../subdir/b\n' ,
151
 
                       '..')
152
 
        self.ls_equals('../.bzrignore\0'
153
 
                       '../a\0'
154
 
                       '../subdir\0'
155
 
                       '../subdir/b\0' ,
156
 
                       '.. --null')
157
 
        self.ls_equals('?        ../.bzrignore\n'
158
 
                       '?        ../a\n'
159
 
                       'V        ../subdir/\n'
160
 
                       'V        ../subdir/b\n' ,
161
 
                       '.. --verbose')
162
 
        self.run_bzr_error('cannot specify both --from-root and PATH',
163
 
                           'ls --from-root ..')
 
128
                       , '--from-root', '--non-recursive')
164
129
 
165
130
    def test_ls_revision(self):
166
131
        self.wt.add(['a'])
169
134
        self.build_tree(['subdir/'])
170
135
 
171
136
        # Check what happens when we supply a specific revision
172
 
        self.ls_equals('a\n', '--revision 1')
 
137
        self.ls_equals('a\n', '--revision', '1')
173
138
        self.ls_equals('V        a\n'
174
 
                       , '--verbose --revision 1')
 
139
                       , '--verbose', '--revision', '1')
175
140
 
176
141
        os.chdir('subdir')
177
 
        self.ls_equals('', '--revision 1')
178
 
 
179
 
    def test_ls_branch(self):
180
 
        """If a branch is specified, files are listed from it"""
181
 
        self.build_tree(['subdir/', 'subdir/b'])
182
 
        self.wt.add(['subdir', 'subdir/b'])
183
 
        self.wt.commit('committing')
184
 
        branch = self.make_branch('branchdir')
185
 
        branch.pull(self.wt.branch)
186
 
        self.ls_equals('branchdir/subdir\n'
187
 
                       'branchdir/subdir/b\n',
188
 
                       'branchdir')
189
 
        self.ls_equals('branchdir/subdir\n'
190
 
                       'branchdir/subdir/b\n',
191
 
                       'branchdir --revision 1')
 
142
        self.ls_equals('', '--revision', '1')
192
143
 
193
144
    def test_ls_ignored(self):
194
145
        # Now try to do ignored files.
195
146
        self.wt.add(['a', '.bzrignore'])
196
147
 
197
148
        self.build_tree(['blah.py', 'blah.pyo', 'user-ignore'])
198
 
        self.ls_equals('.bzrignore\n'
 
149
        self.ls_equals('.bazaar\n'
 
150
                       '.bzrignore\n'
199
151
                       'a\n'
200
152
                       'blah.py\n'
201
153
                       'blah.pyo\n'
202
154
                       'user-ignore\n'
203
155
                       )
204
 
        self.ls_equals('V        .bzrignore\n'
 
156
        self.ls_equals('I        .bazaar/\n'
 
157
                       'V        .bzrignore\n'
205
158
                       'V        a\n'
206
159
                       '?        blah.py\n'
207
160
                       'I        blah.pyo\n'
208
161
                       'I        user-ignore\n'
209
162
                       , '--verbose')
210
 
        self.ls_equals('blah.pyo\n'
 
163
        self.ls_equals('.bazaar\n'
 
164
                       'blah.pyo\n'
211
165
                       'user-ignore\n'
212
166
                       , '--ignored')
213
167
        self.ls_equals('blah.py\n'
216
170
                       'a\n'
217
171
                       , '--versioned')
218
172
 
219
 
    def test_kinds(self):
220
 
        self.build_tree(['subdir/'])
221
 
        self.ls_equals('.bzrignore\n' 
222
 
                       'a\n', 
223
 
                       '--kind=file')
224
 
        self.ls_equals('subdir\n',
225
 
                       '--kind=directory')
226
 
        self.ls_equals('',
227
 
                       '--kind=symlink')
228
 
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')