← 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: Martin Pool
  • Date: 2006-08-10 01:16:16 UTC
  • mto: (1904.1.2 0.9)
  • mto: This revision was merged to the branch mainline in revision 1913.
  • Revision ID: mbp@sourcefrog.net-20060810011616-d74881eba696e746
compare_trees is deprecated in 0.9 not 0.10

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