/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 brzlib/tests/blackbox/test_annotate.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/blackbox/test_annotate.py
20
20
 
21
21
These check that it behaves properly when it's invoked through the regular
22
22
command-line interface. This doesn't actually run a new interpreter but
23
 
rather starts again from the run_brz function.
 
23
rather starts again from the run_bzr function.
24
24
"""
25
25
 
26
26
 
27
 
from breezy import (
 
27
from brzlib import (
28
28
    config,
29
29
    tests,
30
30
    )
31
31
 
32
 
from breezy.tests.matchers import ContainsNoVfsCalls
33
 
from breezy.urlutils import joinpath
 
32
from brzlib.tests.matchers import ContainsNoVfsCalls
 
33
from brzlib.urlutils import joinpath
34
34
 
35
 
from ..test_bedding import override_whoami
36
35
 
37
36
class TestAnnotate(tests.TestCaseWithTransport):
38
37
 
40
39
        super(TestAnnotate, self).setUp()
41
40
        wt = self.make_branch_and_tree('.')
42
41
        b = wt.branch
43
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'),
44
 
                                  ('nomail.txt', b'nomail\n')])
 
42
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
 
43
                                  ('nomail.txt', 'nomail\n')])
45
44
        wt.add(['hello.txt'])
46
45
        self.revision_id_1 = wt.commit('add hello',
47
 
                                       committer='test@user',
48
 
                                       timestamp=1165960000.00, timezone=0)
 
46
                              committer='test@user',
 
47
                              timestamp=1165960000.00, timezone=0)
49
48
        wt.add(['nomail.txt'])
50
49
        self.revision_id_2 = wt.commit('add nomail',
51
 
                                       committer='no mail',
52
 
                                       timestamp=1165970000.00, timezone=0)
53
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'
54
 
                                                b'your helicopter\n')])
 
50
                              committer='no mail',
 
51
                              timestamp=1165970000.00, timezone=0)
 
52
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
 
53
                                                'your helicopter\n')])
55
54
        self.revision_id_3 = wt.commit('mod hello',
56
 
                                       committer='user@test',
57
 
                                       timestamp=1166040000.00, timezone=0)
58
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'
59
 
                                                b'your helicopter\n'
60
 
                                                b'all of\n'
61
 
                                                b'our helicopters\n'
62
 
                                   )])
 
55
                              committer='user@test',
 
56
                              timestamp=1166040000.00, timezone=0)
 
57
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
 
58
                                                'your helicopter\n'
 
59
                                                'all of\n'
 
60
                                                'our helicopters\n'
 
61
                                  )])
63
62
        self.revision_id_4 = wt.commit('mod hello',
64
 
                                       committer='user@test',
65
 
                                       timestamp=1166050000.00, timezone=0)
 
63
                              committer='user@test',
 
64
                              timestamp=1166050000.00, timezone=0)
66
65
 
67
66
    def test_help_annotate(self):
68
67
        """Annotate command exists"""
109
108
%*s | your helicopter
110
109
%*s | all of
111
110
%*s | our helicopters
112
 
''' % (max_len, self.revision_id_1.decode('utf-8'),
113
 
            max_len, self.revision_id_3.decode('utf-8'),
114
 
            max_len, self.revision_id_4.decode('utf-8'),
115
 
            max_len, '',
116
 
       ), out)
 
111
''' % (max_len, self.revision_id_1,
 
112
       max_len, self.revision_id_3,
 
113
       max_len, self.revision_id_4,
 
114
       max_len, '',
 
115
      )
 
116
, out)
117
117
 
118
118
    def test_no_mail(self):
119
119
        out, err = self.run_bzr('annotate nomail.txt')
147
147
        out, err = self.run_bzr('annotate hello.txt -r1..2',
148
148
                                retcode=3)
149
149
        self.assertEqual('', out)
150
 
        self.assertEqual('brz: ERROR: brz annotate --revision takes'
 
150
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
151
151
                         ' exactly one revision identifier\n',
152
152
                         err)
153
153
 
159
159
        """Create a tree with a locally edited file."""
160
160
        tree = self.make_branch_and_tree(relpath)
161
161
        file_relpath = joinpath(relpath, 'file')
162
 
        self.build_tree_contents([(file_relpath, b'foo\ngam\n')])
 
162
        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
163
163
        tree.add('file')
164
 
        tree.commit('add file', committer="test@host", rev_id=b"rev1")
165
 
        self.build_tree_contents([(file_relpath, b'foo\nbar\ngam\n')])
 
164
        tree.commit('add file', committer="test@host", rev_id="rev1")
 
165
        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
166
166
        return tree
167
167
 
168
168
    def test_annotate_cmd_revspec_branch(self):
178
178
 
179
179
    def test_annotate_edited_file(self):
180
180
        tree = self._setup_edited_file()
181
 
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
 
181
        self.overrideEnv('BZR_EMAIL', 'current@host2')
182
182
        out, err = self.run_bzr('annotate file')
183
183
        self.assertEqual(
184
184
            '1   test@ho | foo\n'
188
188
 
189
189
    def test_annotate_edited_file_no_default(self):
190
190
        # Ensure that when no username is available annotate still works.
191
 
        override_whoami(self)
 
191
        self.overrideEnv('EMAIL', None)
 
192
        self.overrideEnv('BZR_EMAIL', None)
 
193
        # Also, make sure that it's not inferred from mailname.
 
194
        self.overrideAttr(config, '_auto_user_id',
 
195
            lambda: (None, None))
192
196
        tree = self._setup_edited_file()
193
197
        out, err = self.run_bzr('annotate file')
194
198
        self.assertEqual(
199
203
 
200
204
    def test_annotate_edited_file_show_ids(self):
201
205
        tree = self._setup_edited_file()
202
 
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
 
206
        self.overrideEnv('BZR_EMAIL', 'current@host2')
203
207
        out, err = self.run_bzr('annotate file --show-ids')
204
208
        self.assertEqual(
205
209
            '    rev1 | foo\n'
210
214
    def _create_merged_file(self):
211
215
        """Create a file with a pending merge and local edit."""
212
216
        tree = self.make_branch_and_tree('.')
213
 
        self.build_tree_contents([('file', b'foo\ngam\n')])
 
217
        self.build_tree_contents([('file', 'foo\ngam\n')])
214
218
        tree.add('file')
215
 
        tree.commit('add file', rev_id=b"rev1", committer="test@host")
 
219
        tree.commit('add file', rev_id="rev1", committer="test@host")
216
220
        # right side
217
 
        self.build_tree_contents([('file', b'foo\nbar\ngam\n')])
218
 
        tree.commit("right", rev_id=b"rev1.1.1", committer="test@host")
219
 
        tree.pull(tree.branch, True, b"rev1")
 
221
        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
 
222
        tree.commit("right", rev_id="rev1.1.1", committer="test@host")
 
223
        tree.pull(tree.branch, True, "rev1")
220
224
        # left side
221
 
        self.build_tree_contents([('file', b'foo\nbaz\ngam\n')])
222
 
        tree.commit("left", rev_id=b"rev2", committer="test@host")
 
225
        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
 
226
        tree.commit("left", rev_id="rev2", committer="test@host")
223
227
        # merge
224
 
        tree.merge_from_branch(tree.branch, b"rev1.1.1")
 
228
        tree.merge_from_branch(tree.branch, "rev1.1.1")
225
229
        # edit the file to be 'resolved' and have a further local edit
226
 
        self.build_tree_contents([('file', b'local\nfoo\nbar\nbaz\ngam\n')])
 
230
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
227
231
        return tree
228
232
 
229
233
    def test_annotated_edited_merged_file_revnos(self):
252
256
 
253
257
    def test_annotate_empty_file(self):
254
258
        tree = self.make_branch_and_tree('.')
255
 
        self.build_tree_contents([('empty', b'')])
 
259
        self.build_tree_contents([('empty', '')])
256
260
        tree.add('empty')
257
261
        tree.commit('add empty file')
258
262
        out, err = self.run_bzr(['annotate', 'empty'])
260
264
 
261
265
    def test_annotate_removed_file(self):
262
266
        tree = self.make_branch_and_tree('.')
263
 
        self.build_tree_contents([('empty', b'')])
 
267
        self.build_tree_contents([('empty', '')])
264
268
        tree.add('empty')
265
269
        tree.commit('add empty file')
266
270
        # delete the file.
271
275
 
272
276
    def test_annotate_empty_file_show_ids(self):
273
277
        tree = self.make_branch_and_tree('.')
274
 
        self.build_tree_contents([('empty', b'')])
 
278
        self.build_tree_contents([('empty', '')])
275
279
        tree.add('empty')
276
280
        tree.commit('add empty file')
277
281
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
284
288
        tree.commit('add a file')
285
289
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
286
290
        self.assertEqual('', out)
287
 
        self.assertEqual("brz: ERROR: doesnotexist is not versioned.\n", err)
 
291
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
288
292
 
289
293
    def test_annotate_without_workingtree(self):
290
294
        tree = self.make_branch_and_tree('.')
291
 
        self.build_tree_contents([('empty', b'')])
 
295
        self.build_tree_contents([('empty', '')])
292
296
        tree.add('empty')
293
297
        tree.commit('add empty file')
294
 
        bzrdir = tree.branch.controldir
 
298
        bzrdir = tree.branch.bzrdir
295
299
        bzrdir.destroy_workingtree()
296
300
        self.assertFalse(bzrdir.has_workingtree())
297
301
        out, err = self.run_bzr(['annotate', 'empty'])
300
304
    def test_annotate_directory(self):
301
305
        """Test --directory option"""
302
306
        wt = self.make_branch_and_tree('a')
303
 
        self.build_tree_contents([('a/hello.txt', b'my helicopter\n')])
 
307
        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
304
308
        wt.add(['hello.txt'])
305
309
        wt.commit('commit', committer='test@user')
306
310
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
312
316
    def test_simple_annotate(self):
313
317
        self.setup_smart_server_with_call_log()
314
318
        wt = self.make_branch_and_tree('branch')
315
 
        self.build_tree_contents([('branch/hello.txt', b'my helicopter\n')])
 
319
        self.build_tree_contents([('branch/hello.txt', 'my helicopter\n')])
316
320
        wt.add(['hello.txt'])
317
321
        wt.commit('commit', committer='test@user')
318
322
        self.reset_smart_call_log()
319
323
        out, err = self.run_bzr(['annotate', "-d", self.get_url('branch'),
320
 
                                 "hello.txt"])
 
324
            "hello.txt"])
321
325
        # This figure represent the amount of work to perform this use case. It
322
326
        # is entirely ok to reduce this number if a test fails due to rpc_count
323
327
        # being too low. If rpc_count increases, more network roundtrips have
324
328
        # become necessary for this use case. Please do not adjust this number
325
329
        # upwards without agreement from bzr's network support maintainers.
326
 
        self.assertLength(9, self.hpss_calls)
 
330
        self.assertLength(16, self.hpss_calls)
327
331
        self.assertLength(1, self.hpss_connections)
328
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
332
        self.expectFailure("annotate accesses inventories, which require VFS access",
 
333
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)