← 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: John Arbash Meinel
  • Date: 2009-10-02 20:32:50 UTC
  • mto: (4679.6.1 2.1-export-c-api)
  • mto: This revision was merged to the branch mainline in revision 4735.
  • Revision ID: john@arbash-meinel.com-20091002203250-q6iv6o2mwjqp4g53
Add __iter__ support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
1
 
# Copyright (C) 2006 by 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""External tests of 'bzr ls'"""
18
18
 
26
26
 
27
27
    def setUp(self):
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(['./.bazaar', 'user-ignore'])
 
31
        ignores._set_user_ignores(['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):
40
 
        out, err = self.run_bzr('ls', *args)
 
39
    def ls_equals(self, value, args=None, recursive=True):
 
40
        command = 'ls'
 
41
        if args is not None:
 
42
            command += ' ' + args
 
43
        if recursive:
 
44
            command += ' -R'
 
45
        out, err = self.run_bzr(command)
41
46
        self.assertEqual('', err)
42
 
        self.assertEqual(value, out)
 
47
        self.assertEqualDiff(value, out)
43
48
 
44
49
    def test_ls_null_verbose(self):
45
50
        # Can't supply both
46
51
        self.run_bzr_error(['Cannot set both --verbose and --null'],
47
 
                           'ls', '--verbose', '--null')
 
52
                           'ls --verbose --null')
48
53
 
49
54
    def test_ls_basic(self):
50
55
        """Test the abilities of 'bzr ls'"""
51
 
        self.ls_equals('.bazaar\n.bzrignore\na\n')
52
 
        self.ls_equals('I        .bazaar/\n'
53
 
                       '?        .bzrignore\n'
 
56
        self.ls_equals('.bzrignore\na\n')
 
57
        self.ls_equals('?        .bzrignore\n'
54
58
                       '?        a\n',
55
59
                       '--verbose')
56
60
        self.ls_equals('.bzrignore\n'
57
61
                       'a\n',
58
62
                       '--unknown')
59
 
        self.ls_equals('.bazaar\n', '--ignored')
 
63
        self.ls_equals('', '--ignored')
60
64
        self.ls_equals('', '--versioned')
61
 
        self.ls_equals('.bazaar\n'
62
 
                       '.bzrignore\n'
63
 
                       'a\n',
64
 
                       '--unknown', '--ignored', '--versioned')
65
 
        self.ls_equals('.bazaar\n', '--ignored', '--versioned')
66
 
        self.ls_equals('.bazaar\0.bzrignore\0a\0', '--null')
 
65
        self.ls_equals('', '-V')
 
66
        self.ls_equals('.bzrignore\n'
 
67
                       'a\n',
 
68
                       '--unknown --ignored --versioned')
 
69
        self.ls_equals('.bzrignore\n'
 
70
                       'a\n',
 
71
                       '--unknown --ignored -V')
 
72
        self.ls_equals('', '--ignored --versioned')
 
73
        self.ls_equals('', '--ignored -V')
 
74
        self.ls_equals('.bzrignore\0a\0', '--null')
67
75
 
68
76
    def test_ls_added(self):
69
77
        self.wt.add(['a'])
70
 
        self.ls_equals('I        .bazaar/\n'
71
 
                       '?        .bzrignore\n'
 
78
        self.ls_equals('?        .bzrignore\n'
72
79
                       'V        a\n',
73
80
                       '--verbose')
74
81
        self.wt.commit('add')
75
 
        
 
82
 
76
83
        self.build_tree(['subdir/'])
77
 
        self.ls_equals('I        .bazaar/\n'
78
 
                       '?        .bzrignore\n'
 
84
        self.ls_equals('?        .bzrignore\n'
79
85
                       'V        a\n'
80
86
                       '?        subdir/\n'
81
87
                       , '--verbose')
82
88
        self.build_tree(['subdir/b'])
83
89
        self.wt.add(['subdir/', 'subdir/b', '.bzrignore'])
84
 
        self.ls_equals('I        .bazaar/\n'
85
 
                       'V        .bzrignore\n'
 
90
        self.ls_equals('V        .bzrignore\n'
86
91
                       'V        a\n'
87
92
                       'V        subdir/\n'
88
93
                       'V        subdir/b\n'
89
94
                       , '--verbose')
90
95
 
91
 
    def test_ls_recursive(self):
 
96
    def test_show_ids(self):
 
97
        self.build_tree(['subdir/'])
 
98
        self.wt.add(['a', 'subdir'], ['a-id', 'subdir-id'])
 
99
        self.ls_equals(
 
100
            '.bzrignore                                         \n'
 
101
            'a                                                  a-id\n'
 
102
            'subdir/                                            subdir-id\n',
 
103
            '--show-ids')
 
104
        self.ls_equals(
 
105
            '?        .bzrignore\n'
 
106
            'V        a                                         a-id\n'
 
107
            'V        subdir/                                   subdir-id\n',
 
108
            '--show-ids --verbose')
 
109
        self.ls_equals('.bzrignore\0\0'
 
110
                       'a\0a-id\0'
 
111
                       'subdir\0subdir-id\0', '--show-ids --null')
 
112
 
 
113
    def test_ls_no_recursive(self):
92
114
        self.build_tree(['subdir/', 'subdir/b'])
93
115
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
94
116
 
95
 
        self.ls_equals('.bazaar\n'
96
 
                       '.bzrignore\n'
 
117
        self.ls_equals('.bzrignore\n'
97
118
                       'a\n'
98
 
                       'subdir\n'
99
 
                       , '--non-recursive')
 
119
                       'subdir/\n'
 
120
                       , recursive=False)
100
121
 
101
 
        self.ls_equals('I        .bazaar/\n'
102
 
                       'V        .bzrignore\n'
 
122
        self.ls_equals('V        .bzrignore\n'
103
123
                       'V        a\n'
104
124
                       'V        subdir/\n'
105
 
                       , '--verbose', '--non-recursive')
 
125
                       , '--verbose', recursive=False)
106
126
 
107
127
        # Check what happens in a sub-directory
108
128
        os.chdir('subdir')
109
129
        self.ls_equals('b\n')
110
130
        self.ls_equals('b\0'
111
131
                  , '--null')
112
 
        self.ls_equals('.bazaar\n'
113
 
                       '.bzrignore\n'
114
 
                       'a\n'
115
 
                       'subdir\n'
116
 
                       'subdir/b\n'
 
132
        self.ls_equals('subdir/b\n'
117
133
                       , '--from-root')
118
 
        self.ls_equals('.bazaar\0'
119
 
                       '.bzrignore\0'
120
 
                       'a\0'
121
 
                       'subdir\0'
122
 
                       'subdir/b\0'
123
 
                       , '--from-root', '--null')
124
 
        self.ls_equals('.bazaar\n'
125
 
                       '.bzrignore\n'
126
 
                       'a\n'
127
 
                       'subdir\n'
128
 
                       , '--from-root', '--non-recursive')
 
134
        self.ls_equals('subdir/b\0'
 
135
                       , '--from-root --null')
 
136
        self.ls_equals('subdir/b\n'
 
137
                       , '--from-root', recursive=False)
 
138
 
 
139
    def test_ls_path(self):
 
140
        """If a path is specified, files are listed with that prefix"""
 
141
        self.build_tree(['subdir/', 'subdir/b'])
 
142
        self.wt.add(['subdir', 'subdir/b'])
 
143
        self.ls_equals('subdir/b\n' ,
 
144
                       'subdir')
 
145
        os.chdir('subdir')
 
146
        self.ls_equals('../.bzrignore\n'
 
147
                       '../a\n'
 
148
                       '../subdir/\n'
 
149
                       '../subdir/b\n' ,
 
150
                       '..')
 
151
        self.ls_equals('../.bzrignore\0'
 
152
                       '../a\0'
 
153
                       '../subdir\0'
 
154
                       '../subdir/b\0' ,
 
155
                       '.. --null')
 
156
        self.ls_equals('?        ../.bzrignore\n'
 
157
                       '?        ../a\n'
 
158
                       'V        ../subdir/\n'
 
159
                       'V        ../subdir/b\n' ,
 
160
                       '.. --verbose')
 
161
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
 
162
                           'ls --from-root ..')
129
163
 
130
164
    def test_ls_revision(self):
131
165
        self.wt.add(['a'])
134
168
        self.build_tree(['subdir/'])
135
169
 
136
170
        # Check what happens when we supply a specific revision
137
 
        self.ls_equals('a\n', '--revision', '1')
 
171
        self.ls_equals('a\n', '--revision 1')
138
172
        self.ls_equals('V        a\n'
139
 
                       , '--verbose', '--revision', '1')
 
173
                       , '--verbose --revision 1')
140
174
 
141
175
        os.chdir('subdir')
142
 
        self.ls_equals('', '--revision', '1')
 
176
        self.ls_equals('', '--revision 1')
 
177
 
 
178
    def test_ls_branch(self):
 
179
        """If a branch is specified, files are listed from it"""
 
180
        self.build_tree(['subdir/', 'subdir/b'])
 
181
        self.wt.add(['subdir', 'subdir/b'])
 
182
        self.wt.commit('committing')
 
183
        branch = self.make_branch('branchdir')
 
184
        branch.pull(self.wt.branch)
 
185
        self.ls_equals('branchdir/subdir/\n'
 
186
                       'branchdir/subdir/b\n',
 
187
                       'branchdir')
 
188
        self.ls_equals('branchdir/subdir/\n'
 
189
                       'branchdir/subdir/b\n',
 
190
                       'branchdir --revision 1')
143
191
 
144
192
    def test_ls_ignored(self):
145
193
        # Now try to do ignored files.
146
194
        self.wt.add(['a', '.bzrignore'])
147
195
 
148
196
        self.build_tree(['blah.py', 'blah.pyo', 'user-ignore'])
149
 
        self.ls_equals('.bazaar\n'
150
 
                       '.bzrignore\n'
 
197
        self.ls_equals('.bzrignore\n'
151
198
                       'a\n'
152
199
                       'blah.py\n'
153
200
                       'blah.pyo\n'
154
201
                       'user-ignore\n'
155
202
                       )
156
 
        self.ls_equals('I        .bazaar/\n'
157
 
                       'V        .bzrignore\n'
 
203
        self.ls_equals('V        .bzrignore\n'
158
204
                       'V        a\n'
159
205
                       '?        blah.py\n'
160
206
                       'I        blah.pyo\n'
161
207
                       'I        user-ignore\n'
162
208
                       , '--verbose')
163
 
        self.ls_equals('.bazaar\n'
164
 
                       'blah.pyo\n'
 
209
        self.ls_equals('blah.pyo\n'
165
210
                       'user-ignore\n'
166
211
                       , '--ignored')
167
212
        self.ls_equals('blah.py\n'
169
214
        self.ls_equals('.bzrignore\n'
170
215
                       'a\n'
171
216
                       , '--versioned')
172
 
 
 
217
        self.ls_equals('.bzrignore\n'
 
218
                       'a\n'
 
219
                       , '-V')
 
220
 
 
221
    def test_kinds(self):
 
222
        self.build_tree(['subdir/'])
 
223
        self.ls_equals('.bzrignore\n'
 
224
                       'a\n',
 
225
                       '--kind=file')
 
226
        self.ls_equals('subdir/\n',
 
227
                       '--kind=directory')
 
228
        self.ls_equals('',
 
229
                       '--kind=symlink')
 
230
        self.run_bzr_error(['invalid kind specified'], 'ls --kind=pile')
 
231
 
 
232
    def test_ls_path_nonrecursive(self):
 
233
        self.ls_equals('%s/.bzrignore\n'
 
234
                       '%s/a\n'
 
235
                       % (self.test_dir, self.test_dir),
 
236
                       self.test_dir, recursive=False)