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

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_ls.py
33
33
 
34
34
        self.wt = self.make_branch_and_tree('.')
35
35
        self.build_tree_contents([
36
 
                                 ('.bzrignore', '*.pyo\n'),
37
 
                                 ('a', 'hello\n'),
 
36
                                 ('.bzrignore', b'*.pyo\n'),
 
37
                                 ('a', b'hello\n'),
38
38
                                 ])
39
39
 
40
40
    def ls_equals(self, value, args=None, recursive=True, working_dir=None):
85
85
        self.build_tree(['subdir/'])
86
86
        self.ls_equals('?        .bzrignore\n'
87
87
                       'V        a\n'
88
 
                       '?        subdir/\n'
89
 
                       , '--verbose')
 
88
                       '?        subdir/\n', '--verbose')
90
89
        self.build_tree(['subdir/b'])
91
90
        self.wt.add(['subdir/', 'subdir/b', '.bzrignore'])
92
91
        self.ls_equals('V        .bzrignore\n'
93
92
                       'V        a\n'
94
93
                       'V        subdir/\n'
95
 
                       'V        subdir/b\n'
96
 
                       , '--verbose')
 
94
                       'V        subdir/b\n', '--verbose')
97
95
 
98
96
    def test_show_ids(self):
99
97
        self.build_tree(['subdir/'])
100
 
        self.wt.add(['a', 'subdir'], ['a-id', 'subdir-id'])
 
98
        self.wt.add(['a', 'subdir'], [b'a-id', b'subdir-id'])
101
99
        self.ls_equals(
102
100
            '.bzrignore                                         \n'
103
101
            'a                                                  a-id\n'
118
116
 
119
117
        self.ls_equals('.bzrignore\n'
120
118
                       'a\n'
121
 
                       'subdir/\n'
122
 
                       , recursive=False)
 
119
                       'subdir/\n', recursive=False)
123
120
 
124
121
        self.ls_equals('V        .bzrignore\n'
125
122
                       'V        a\n'
126
 
                       'V        subdir/\n'
127
 
                       , '--verbose', recursive=False)
 
123
                       'V        subdir/\n', '--verbose', recursive=False)
128
124
 
129
125
        # Check what happens in a sub-directory
130
126
        self.ls_equals('b\n', working_dir='subdir')
167
163
 
168
164
        # Check what happens when we supply a specific revision
169
165
        self.ls_equals('a\n', '--revision 1')
170
 
        self.ls_equals('V        a\n'
171
 
                       , '--verbose --revision 1')
 
166
        self.ls_equals('V        a\n', '--verbose --revision 1')
172
167
 
173
168
        self.ls_equals('', '--revision 1', working_dir='subdir')
174
169
 
201
196
                       'V        a\n'
202
197
                       '?        blah.py\n'
203
198
                       'I        blah.pyo\n'
204
 
                       'I        user-ignore\n'
205
 
                       , '--verbose')
 
199
                       'I        user-ignore\n', '--verbose')
206
200
        self.ls_equals('blah.pyo\n'
207
 
                       'user-ignore\n'
208
 
                       , '--ignored')
209
 
        self.ls_equals('blah.py\n'
210
 
                       , '--unknown')
211
 
        self.ls_equals('.bzrignore\n'
212
 
                       'a\n'
213
 
                       , '--versioned')
214
 
        self.ls_equals('.bzrignore\n'
215
 
                       'a\n'
216
 
                       , '-V')
 
201
                       'user-ignore\n', '--ignored')
 
202
        self.ls_equals('blah.py\n', '--unknown')
 
203
        self.ls_equals('.bzrignore\n'
 
204
                       'a\n', '--versioned')
 
205
        self.ls_equals('.bzrignore\n'
 
206
                       'a\n', '-V')
217
207
 
218
208
    def test_kinds(self):
219
209
        self.build_tree(['subdir/'])
247
237
    def test_simple_ls(self):
248
238
        self.setup_smart_server_with_call_log()
249
239
        t = self.make_branch_and_tree('branch')
250
 
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
240
        self.build_tree_contents([('branch/foo', b'thecontents')])
251
241
        t.add("foo")
252
242
        t.commit("message")
253
243
        self.reset_smart_call_log()