/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_annotate.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_annotate.py
32
32
from breezy.tests.matchers import ContainsNoVfsCalls
33
33
from breezy.urlutils import joinpath
34
34
 
 
35
from ..test_bedding import override_whoami
35
36
 
36
37
class TestAnnotate(tests.TestCaseWithTransport):
37
38
 
39
40
        super(TestAnnotate, self).setUp()
40
41
        wt = self.make_branch_and_tree('.')
41
42
        b = wt.branch
42
 
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
43
 
                                  ('nomail.txt', 'nomail\n')])
 
43
        self.build_tree_contents([('hello.txt', b'my helicopter\n'),
 
44
                                  ('nomail.txt', b'nomail\n')])
44
45
        wt.add(['hello.txt'])
45
46
        self.revision_id_1 = wt.commit('add hello',
46
 
                              committer='test@user',
47
 
                              timestamp=1165960000.00, timezone=0)
 
47
                                       committer='test@user',
 
48
                                       timestamp=1165960000.00, timezone=0)
48
49
        wt.add(['nomail.txt'])
49
50
        self.revision_id_2 = wt.commit('add nomail',
50
 
                              committer='no mail',
51
 
                              timestamp=1165970000.00, timezone=0)
52
 
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
53
 
                                                'your helicopter\n')])
 
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')])
54
55
        self.revision_id_3 = wt.commit('mod hello',
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
 
                                  )])
 
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
                                   )])
62
63
        self.revision_id_4 = wt.commit('mod hello',
63
 
                              committer='user@test',
64
 
                              timestamp=1166050000.00, timezone=0)
 
64
                                       committer='user@test',
 
65
                                       timestamp=1166050000.00, timezone=0)
65
66
 
66
67
    def test_help_annotate(self):
67
68
        """Annotate command exists"""
108
109
%*s | your helicopter
109
110
%*s | all of
110
111
%*s | our helicopters
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)
 
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)
117
117
 
118
118
    def test_no_mail(self):
119
119
        out, err = self.run_bzr('annotate nomail.txt')
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, 'foo\ngam\n')])
 
162
        self.build_tree_contents([(file_relpath, b'foo\ngam\n')])
163
163
        tree.add('file')
164
 
        tree.commit('add file', committer="test@host", rev_id="rev1")
165
 
        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
 
164
        tree.commit('add file', committer="test@host", rev_id=b"rev1")
 
165
        self.build_tree_contents([(file_relpath, b'foo\nbar\ngam\n')])
166
166
        return tree
167
167
 
168
168
    def test_annotate_cmd_revspec_branch(self):
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
 
        self.overrideEnv('EMAIL', None)
192
 
        self.overrideEnv('BRZ_EMAIL', None)
193
 
        # Also, make sure that it's not inferred from mailname.
194
 
        self.overrideAttr(config, '_auto_user_id',
195
 
            lambda: (None, None))
 
191
        override_whoami(self)
196
192
        tree = self._setup_edited_file()
197
193
        out, err = self.run_bzr('annotate file')
198
194
        self.assertEqual(
214
210
    def _create_merged_file(self):
215
211
        """Create a file with a pending merge and local edit."""
216
212
        tree = self.make_branch_and_tree('.')
217
 
        self.build_tree_contents([('file', 'foo\ngam\n')])
 
213
        self.build_tree_contents([('file', b'foo\ngam\n')])
218
214
        tree.add('file')
219
 
        tree.commit('add file', rev_id="rev1", committer="test@host")
 
215
        tree.commit('add file', rev_id=b"rev1", committer="test@host")
220
216
        # right side
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")
 
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")
224
220
        # left side
225
 
        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
226
 
        tree.commit("left", rev_id="rev2", committer="test@host")
 
221
        self.build_tree_contents([('file', b'foo\nbaz\ngam\n')])
 
222
        tree.commit("left", rev_id=b"rev2", committer="test@host")
227
223
        # merge
228
 
        tree.merge_from_branch(tree.branch, "rev1.1.1")
 
224
        tree.merge_from_branch(tree.branch, b"rev1.1.1")
229
225
        # edit the file to be 'resolved' and have a further local edit
230
 
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
 
226
        self.build_tree_contents([('file', b'local\nfoo\nbar\nbaz\ngam\n')])
231
227
        return tree
232
228
 
233
229
    def test_annotated_edited_merged_file_revnos(self):
256
252
 
257
253
    def test_annotate_empty_file(self):
258
254
        tree = self.make_branch_and_tree('.')
259
 
        self.build_tree_contents([('empty', '')])
 
255
        self.build_tree_contents([('empty', b'')])
260
256
        tree.add('empty')
261
257
        tree.commit('add empty file')
262
258
        out, err = self.run_bzr(['annotate', 'empty'])
264
260
 
265
261
    def test_annotate_removed_file(self):
266
262
        tree = self.make_branch_and_tree('.')
267
 
        self.build_tree_contents([('empty', '')])
 
263
        self.build_tree_contents([('empty', b'')])
268
264
        tree.add('empty')
269
265
        tree.commit('add empty file')
270
266
        # delete the file.
275
271
 
276
272
    def test_annotate_empty_file_show_ids(self):
277
273
        tree = self.make_branch_and_tree('.')
278
 
        self.build_tree_contents([('empty', '')])
 
274
        self.build_tree_contents([('empty', b'')])
279
275
        tree.add('empty')
280
276
        tree.commit('add empty file')
281
277
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
292
288
 
293
289
    def test_annotate_without_workingtree(self):
294
290
        tree = self.make_branch_and_tree('.')
295
 
        self.build_tree_contents([('empty', '')])
 
291
        self.build_tree_contents([('empty', b'')])
296
292
        tree.add('empty')
297
293
        tree.commit('add empty file')
298
294
        bzrdir = tree.branch.controldir
304
300
    def test_annotate_directory(self):
305
301
        """Test --directory option"""
306
302
        wt = self.make_branch_and_tree('a')
307
 
        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
 
303
        self.build_tree_contents([('a/hello.txt', b'my helicopter\n')])
308
304
        wt.add(['hello.txt'])
309
305
        wt.commit('commit', committer='test@user')
310
306
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
316
312
    def test_simple_annotate(self):
317
313
        self.setup_smart_server_with_call_log()
318
314
        wt = self.make_branch_and_tree('branch')
319
 
        self.build_tree_contents([('branch/hello.txt', 'my helicopter\n')])
 
315
        self.build_tree_contents([('branch/hello.txt', b'my helicopter\n')])
320
316
        wt.add(['hello.txt'])
321
317
        wt.commit('commit', committer='test@user')
322
318
        self.reset_smart_call_log()
323
319
        out, err = self.run_bzr(['annotate', "-d", self.get_url('branch'),
324
 
            "hello.txt"])
 
320
                                 "hello.txt"])
325
321
        # This figure represent the amount of work to perform this use case. It
326
322
        # is entirely ok to reduce this number if a test fails due to rpc_count
327
323
        # being too low. If rpc_count increases, more network roundtrips have
328
324
        # become necessary for this use case. Please do not adjust this number
329
325
        # upwards without agreement from bzr's network support maintainers.
330
 
        self.assertLength(16, self.hpss_calls)
 
326
        self.assertLength(9, self.hpss_calls)
331
327
        self.assertLength(1, self.hpss_connections)
332
 
        self.expectFailure("annotate accesses inventories, which require VFS access",
333
 
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)
 
328
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)