/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 bzrlib/tests/blackbox/test_ls.py

merge bzr.dev.

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=None):
 
39
    def ls_equals(self, value, args=None, recursive=True):
40
40
        command = 'ls'
41
41
        if args is not None:
42
42
            command += ' ' + args
 
43
        if recursive:
 
44
            command += ' -R'
43
45
        out, err = self.run_bzr(command)
44
46
        self.assertEqual('', err)
45
47
        self.assertEqualDiff(value, out)
60
62
                       '--unknown')
61
63
        self.ls_equals('', '--ignored')
62
64
        self.ls_equals('', '--versioned')
 
65
        self.ls_equals('', '-V')
63
66
        self.ls_equals('.bzrignore\n'
64
67
                       'a\n',
65
68
                       '--unknown --ignored --versioned')
 
69
        self.ls_equals('.bzrignore\n'
 
70
                       'a\n',
 
71
                       '--unknown --ignored -V')
66
72
        self.ls_equals('', '--ignored --versioned')
 
73
        self.ls_equals('', '--ignored -V')
67
74
        self.ls_equals('.bzrignore\0a\0', '--null')
68
75
 
69
76
    def test_ls_added(self):
72
79
                       'V        a\n',
73
80
                       '--verbose')
74
81
        self.wt.commit('add')
75
 
        
 
82
 
76
83
        self.build_tree(['subdir/'])
77
84
        self.ls_equals('?        .bzrignore\n'
78
85
                       'V        a\n'
92
99
        self.ls_equals(
93
100
            '.bzrignore                                         \n'
94
101
            'a                                                  a-id\n'
95
 
            'subdir                                             subdir-id\n', 
 
102
            'subdir/                                            subdir-id\n',
96
103
            '--show-ids')
97
104
        self.ls_equals(
98
105
            '?        .bzrignore\n'
99
106
            'V        a                                         a-id\n'
100
 
            'V        subdir/                                   subdir-id\n', 
 
107
            'V        subdir/                                   subdir-id\n',
101
108
            '--show-ids --verbose')
102
109
        self.ls_equals('.bzrignore\0\0'
103
110
                       'a\0a-id\0'
104
111
                       'subdir\0subdir-id\0', '--show-ids --null')
105
112
 
106
 
    def test_ls_recursive(self):
 
113
    def test_ls_no_recursive(self):
107
114
        self.build_tree(['subdir/', 'subdir/b'])
108
115
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
109
116
 
110
117
        self.ls_equals('.bzrignore\n'
111
118
                       'a\n'
112
 
                       'subdir\n'
113
 
                       , '--non-recursive')
 
119
                       'subdir/\n'
 
120
                       , recursive=False)
114
121
 
115
122
        self.ls_equals('V        .bzrignore\n'
116
123
                       'V        a\n'
117
124
                       'V        subdir/\n'
118
 
                       , '--verbose --non-recursive')
 
125
                       , '--verbose', recursive=False)
119
126
 
120
127
        # Check what happens in a sub-directory
121
128
        os.chdir('subdir')
124
131
                  , '--null')
125
132
        self.ls_equals('.bzrignore\n'
126
133
                       'a\n'
127
 
                       'subdir\n'
 
134
                       'subdir/\n'
128
135
                       'subdir/b\n'
129
136
                       , '--from-root')
130
137
        self.ls_equals('.bzrignore\0'
134
141
                       , '--from-root --null')
135
142
        self.ls_equals('.bzrignore\n'
136
143
                       'a\n'
137
 
                       'subdir\n'
138
 
                       , '--from-root --non-recursive')
 
144
                       'subdir/\n'
 
145
                       , '--from-root', recursive=False)
139
146
 
140
147
    def test_ls_path(self):
141
148
        """If a path is specified, files are listed with that prefix"""
146
153
        os.chdir('subdir')
147
154
        self.ls_equals('../.bzrignore\n'
148
155
                       '../a\n'
149
 
                       '../subdir\n'
 
156
                       '../subdir/\n'
150
157
                       '../subdir/b\n' ,
151
158
                       '..')
152
159
        self.ls_equals('../.bzrignore\0'
159
166
                       'V        ../subdir/\n'
160
167
                       'V        ../subdir/b\n' ,
161
168
                       '.. --verbose')
162
 
        self.run_bzr_error('cannot specify both --from-root and PATH',
 
169
        self.run_bzr_error(['cannot specify both --from-root and PATH'],
163
170
                           'ls --from-root ..')
164
171
 
165
172
    def test_ls_revision(self):
183
190
        self.wt.commit('committing')
184
191
        branch = self.make_branch('branchdir')
185
192
        branch.pull(self.wt.branch)
186
 
        self.ls_equals('branchdir/subdir\n'
 
193
        self.ls_equals('branchdir/subdir/\n'
187
194
                       'branchdir/subdir/b\n',
188
195
                       'branchdir')
189
 
        self.ls_equals('branchdir/subdir\n'
 
196
        self.ls_equals('branchdir/subdir/\n'
190
197
                       'branchdir/subdir/b\n',
191
198
                       'branchdir --revision 1')
192
199
 
215
222
        self.ls_equals('.bzrignore\n'
216
223
                       'a\n'
217
224
                       , '--versioned')
 
225
        self.ls_equals('.bzrignore\n'
 
226
                       'a\n'
 
227
                       , '-V')
218
228
 
219
229
    def test_kinds(self):
220
230
        self.build_tree(['subdir/'])
221
 
        self.ls_equals('.bzrignore\n' 
222
 
                       'a\n', 
 
231
        self.ls_equals('.bzrignore\n'
 
232
                       'a\n',
223
233
                       '--kind=file')
224
 
        self.ls_equals('subdir\n',
 
234
        self.ls_equals('subdir/\n',
225
235
                       '--kind=directory')
226
236
        self.ls_equals('',
227
237
                       '--kind=symlink')
228
 
        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)