/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: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

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