← 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: 2009-04-09 20:23:07 UTC
  • mfrom: (4265.1.4 bbc-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20090409202307-n0depb16qepoe21o
(jam) Change _fetch_uses_deltas = False for CHK repos until we can
        write a better fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
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
31
        ignores._set_user_ignores(['user-ignore'])
32
32
 
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
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'"""
57
62
                       '--unknown')
58
63
        self.ls_equals('', '--ignored')
59
64
        self.ls_equals('', '--versioned')
60
 
        self.ls_equals('.bzrignore\n'
61
 
                       'a\n',
62
 
                       '--unknown', '--ignored', '--versioned')
63
 
        self.ls_equals('', '--ignored', '--versioned')
 
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')
64
74
        self.ls_equals('.bzrignore\0a\0', '--null')
65
75
 
66
76
    def test_ls_added(self):
69
79
                       'V        a\n',
70
80
                       '--verbose')
71
81
        self.wt.commit('add')
72
 
        
 
82
 
73
83
        self.build_tree(['subdir/'])
74
84
        self.ls_equals('?        .bzrignore\n'
75
85
                       'V        a\n'
89
99
        self.ls_equals(
90
100
            '.bzrignore                                         \n'
91
101
            'a                                                  a-id\n'
92
 
            'subdir                                             subdir-id\n', 
 
102
            'subdir/                                            subdir-id\n',
93
103
            '--show-ids')
94
104
        self.ls_equals(
95
105
            '?        .bzrignore\n'
96
106
            'V        a                                         a-id\n'
97
 
            'V        subdir/                                   subdir-id\n', 
98
 
            '--show-ids', '--verbose')
 
107
            'V        subdir/                                   subdir-id\n',
 
108
            '--show-ids --verbose')
99
109
        self.ls_equals('.bzrignore\0\0'
100
110
                       'a\0a-id\0'
101
 
                       'subdir\0subdir-id\0', '--show-ids', '--null')
 
111
                       'subdir\0subdir-id\0', '--show-ids --null')
102
112
 
103
 
    def test_ls_recursive(self):
 
113
    def test_ls_no_recursive(self):
104
114
        self.build_tree(['subdir/', 'subdir/b'])
105
115
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
106
116
 
107
117
        self.ls_equals('.bzrignore\n'
108
118
                       'a\n'
109
 
                       'subdir\n'
110
 
                       , '--non-recursive')
 
119
                       'subdir/\n'
 
120
                       , recursive=False)
111
121
 
112
122
        self.ls_equals('V        .bzrignore\n'
113
123
                       'V        a\n'
114
124
                       'V        subdir/\n'
115
 
                       , '--verbose', '--non-recursive')
 
125
                       , '--verbose', recursive=False)
116
126
 
117
127
        # Check what happens in a sub-directory
118
128
        os.chdir('subdir')
121
131
                  , '--null')
122
132
        self.ls_equals('.bzrignore\n'
123
133
                       'a\n'
124
 
                       'subdir\n'
 
134
                       'subdir/\n'
125
135
                       'subdir/b\n'
126
136
                       , '--from-root')
127
137
        self.ls_equals('.bzrignore\0'
128
138
                       'a\0'
129
139
                       'subdir\0'
130
140
                       'subdir/b\0'
131
 
                       , '--from-root', '--null')
 
141
                       , '--from-root --null')
132
142
        self.ls_equals('.bzrignore\n'
133
143
                       'a\n'
134
 
                       'subdir\n'
135
 
                       , '--from-root', '--non-recursive')
 
144
                       'subdir/\n'
 
145
                       , '--from-root', recursive=False)
136
146
 
137
147
    def test_ls_path(self):
138
148
        """If a path is specified, files are listed with that prefix"""
143
153
        os.chdir('subdir')
144
154
        self.ls_equals('../.bzrignore\n'
145
155
                       '../a\n'
146
 
                       '../subdir\n'
 
156
                       '../subdir/\n'
147
157
                       '../subdir/b\n' ,
148
158
                       '..')
149
159
        self.ls_equals('../.bzrignore\0'
150
160
                       '../a\0'
151
161
                       '../subdir\0'
152
162
                       '../subdir/b\0' ,
153
 
                       '..', '--null')
 
163
                       '.. --null')
154
164
        self.ls_equals('?        ../.bzrignore\n'
155
165
                       '?        ../a\n'
156
166
                       'V        ../subdir/\n'
157
167
                       'V        ../subdir/b\n' ,
158
 
                       '..', '--verbose')
159
 
        self.run_bzr_error('cannot specify both --from-root and PATH', 'ls',
160
 
                           '--from-root', '..')
 
168
                       '.. --verbose')
 
169
        self.run_bzr_error('cannot specify both --from-root and PATH',
 
170
                           'ls --from-root ..')
161
171
 
162
172
    def test_ls_revision(self):
163
173
        self.wt.add(['a'])
166
176
        self.build_tree(['subdir/'])
167
177
 
168
178
        # Check what happens when we supply a specific revision
169
 
        self.ls_equals('a\n', '--revision', '1')
 
179
        self.ls_equals('a\n', '--revision 1')
170
180
        self.ls_equals('V        a\n'
171
 
                       , '--verbose', '--revision', '1')
 
181
                       , '--verbose --revision 1')
172
182
 
173
183
        os.chdir('subdir')
174
 
        self.ls_equals('', '--revision', '1')
 
184
        self.ls_equals('', '--revision 1')
175
185
 
176
186
    def test_ls_branch(self):
177
187
        """If a branch is specified, files are listed from it"""
180
190
        self.wt.commit('committing')
181
191
        branch = self.make_branch('branchdir')
182
192
        branch.pull(self.wt.branch)
183
 
        self.ls_equals('branchdir/subdir\n'
 
193
        self.ls_equals('branchdir/subdir/\n'
184
194
                       'branchdir/subdir/b\n',
185
195
                       'branchdir')
186
 
        self.ls_equals('branchdir/subdir\n'
 
196
        self.ls_equals('branchdir/subdir/\n'
187
197
                       'branchdir/subdir/b\n',
188
 
                       'branchdir', '--revision', '1')
 
198
                       'branchdir --revision 1')
189
199
 
190
200
    def test_ls_ignored(self):
191
201
        # Now try to do ignored files.
212
222
        self.ls_equals('.bzrignore\n'
213
223
                       'a\n'
214
224
                       , '--versioned')
 
225
        self.ls_equals('.bzrignore\n'
 
226
                       'a\n'
 
227
                       , '-V')
215
228
 
216
229
    def test_kinds(self):
217
230
        self.build_tree(['subdir/'])
218
 
        self.ls_equals('.bzrignore\n' 
219
 
                       'a\n', 
 
231
        self.ls_equals('.bzrignore\n'
 
232
                       'a\n',
220
233
                       '--kind=file')
221
 
        self.ls_equals('subdir\n',
 
234
        self.ls_equals('subdir/\n',
222
235
                       '--kind=directory')
223
236
        self.ls_equals('',
224
237
                       '--kind=symlink')
225
 
        self.run_bzr_error('invalid kind specified', 'ls', '--kind=pile')
 
238
        self.run_bzr_error('invalid kind specified', 'ls --kind=pile')
 
239
 
 
240
    def test_ls_path_nonrecursive(self):
 
241
        self.ls_equals('%s/.bzrignore\n'
 
242
                       '%s/a\n'
 
243
                       % (self.test_dir, self.test_dir),
 
244
                       self.test_dir, recursive=False)