/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-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

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
 
import os
28
 
 
29
 
from bzrlib.branch import Branch
30
 
from bzrlib.config import extract_email_address
31
 
from bzrlib.tests import TestCaseWithTransport
32
 
from bzrlib.urlutils import joinpath
33
 
 
34
 
 
35
 
class TestAnnotate(TestCaseWithTransport):
 
27
from breezy import (
 
28
    config,
 
29
    tests,
 
30
    )
 
31
 
 
32
from breezy.tests.matchers import ContainsNoVfsCalls
 
33
from breezy.urlutils import joinpath
 
34
 
 
35
from ..test_bedding import override_whoami
 
36
 
 
37
class TestAnnotate(tests.TestCaseWithTransport):
36
38
 
37
39
    def setUp(self):
38
40
        super(TestAnnotate, self).setUp()
39
41
        wt = self.make_branch_and_tree('.')
40
42
        b = wt.branch
41
 
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
42
 
                                  ('nomail.txt', 'nomail\n')])
 
43
        self.build_tree_contents([('hello.txt', b'my helicopter\n'),
 
44
                                  ('nomail.txt', b'nomail\n')])
43
45
        wt.add(['hello.txt'])
44
46
        self.revision_id_1 = wt.commit('add hello',
45
 
                              committer='test@user',
46
 
                              timestamp=1165960000.00, timezone=0)
 
47
                                       committer='test@user',
 
48
                                       timestamp=1165960000.00, timezone=0)
47
49
        wt.add(['nomail.txt'])
48
50
        self.revision_id_2 = wt.commit('add nomail',
49
 
                              committer='no mail',
50
 
                              timestamp=1165970000.00, timezone=0)
51
 
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
52
 
                                                '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')])
53
55
        self.revision_id_3 = wt.commit('mod hello',
54
 
                              committer='user@test',
55
 
                              timestamp=1166040000.00, timezone=0)
56
 
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
57
 
                                                'your helicopter\n'
58
 
                                                'all of\n'
59
 
                                                'our helicopters\n'
60
 
                                  )])
 
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
                                   )])
61
63
        self.revision_id_4 = wt.commit('mod hello',
62
 
                              committer='user@test',
63
 
                              timestamp=1166050000.00, timezone=0)
 
64
                                       committer='user@test',
 
65
                                       timestamp=1166050000.00, timezone=0)
64
66
 
65
67
    def test_help_annotate(self):
66
68
        """Annotate command exists"""
107
109
%*s | your helicopter
108
110
%*s | all of
109
111
%*s | our helicopters
110
 
''' % (max_len, self.revision_id_1,
111
 
       max_len, self.revision_id_3,
112
 
       max_len, self.revision_id_4,
113
 
       max_len, '',
114
 
      )
115
 
, 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)
116
117
 
117
118
    def test_no_mail(self):
118
119
        out, err = self.run_bzr('annotate nomail.txt')
146
147
        out, err = self.run_bzr('annotate hello.txt -r1..2',
147
148
                                retcode=3)
148
149
        self.assertEqual('', out)
149
 
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
 
150
        self.assertEqual('brz: ERROR: brz annotate --revision takes'
150
151
                         ' exactly one revision identifier\n',
151
152
                         err)
152
153
 
153
154
 
154
 
class TestSimpleAnnotate(TestCaseWithTransport):
 
155
class TestSimpleAnnotate(tests.TestCaseWithTransport):
155
156
    """Annotate tests with no complex setup."""
156
157
 
157
158
    def _setup_edited_file(self, relpath='.'):
158
159
        """Create a tree with a locally edited file."""
159
160
        tree = self.make_branch_and_tree(relpath)
160
161
        file_relpath = joinpath(relpath, 'file')
161
 
        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
 
162
        self.build_tree_contents([(file_relpath, b'foo\ngam\n')])
162
163
        tree.add('file')
163
 
        tree.commit('add file', committer="test@host", rev_id="rev1")
164
 
        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
165
 
        tree.branch.get_config().set_user_option('email', 'current@host2')
 
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):
169
169
        tree = self._setup_edited_file('trunk')
170
170
        tree.branch.create_checkout(self.get_url('work'), lightweight=True)
171
 
        os.chdir('work')
172
 
        out, err = self.run_bzr('annotate file -r branch:../trunk')
 
171
        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
 
172
                                working_dir='work')
173
173
        self.assertEqual('', err)
174
174
        self.assertEqual(
175
175
            '1   test@ho | foo\n'
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
182
        out, err = self.run_bzr('annotate file')
182
183
        self.assertEqual(
183
184
            '1   test@ho | foo\n'
185
186
            '1   test@ho | gam\n',
186
187
            out)
187
188
 
 
189
    def test_annotate_edited_file_no_default(self):
 
190
        # Ensure that when no username is available annotate still works.
 
191
        override_whoami(self)
 
192
        tree = self._setup_edited_file()
 
193
        out, err = self.run_bzr('annotate file')
 
194
        self.assertEqual(
 
195
            '1   test@ho | foo\n'
 
196
            '2?  local u | bar\n'
 
197
            '1   test@ho | gam\n',
 
198
            out)
 
199
 
188
200
    def test_annotate_edited_file_show_ids(self):
189
201
        tree = self._setup_edited_file()
 
202
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
190
203
        out, err = self.run_bzr('annotate file --show-ids')
191
204
        self.assertEqual(
192
205
            '    rev1 | foo\n'
197
210
    def _create_merged_file(self):
198
211
        """Create a file with a pending merge and local edit."""
199
212
        tree = self.make_branch_and_tree('.')
200
 
        self.build_tree_contents([('file', 'foo\ngam\n')])
 
213
        self.build_tree_contents([('file', b'foo\ngam\n')])
201
214
        tree.add('file')
202
 
        tree.commit('add file', rev_id="rev1", committer="test@host")
 
215
        tree.commit('add file', rev_id=b"rev1", committer="test@host")
203
216
        # right side
204
 
        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
205
 
        tree.commit("right", rev_id="rev1.1.1", committer="test@host")
206
 
        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")
207
220
        # left side
208
 
        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
209
 
        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")
210
223
        # merge
211
 
        tree.merge_from_branch(tree.branch, "rev1.1.1")
 
224
        tree.merge_from_branch(tree.branch, b"rev1.1.1")
212
225
        # edit the file to be 'resolved' and have a further local edit
213
 
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
 
226
        self.build_tree_contents([('file', b'local\nfoo\nbar\nbaz\ngam\n')])
 
227
        return tree
214
228
 
215
229
    def test_annotated_edited_merged_file_revnos(self):
216
 
        self._create_merged_file()
217
 
        out, err = self.run_bzr('annotate file')
218
 
        email = extract_email_address(Branch.open('.').get_config().username())
 
230
        wt = self._create_merged_file()
 
231
        out, err = self.run_bzr(['annotate', 'file'])
 
232
        email = config.extract_email_address(
 
233
            wt.branch.get_config_stack().get('email'))
219
234
        self.assertEqual(
220
235
            '3?    %-7s | local\n'
221
236
            '1     test@ho | foo\n'
226
241
 
227
242
    def test_annotated_edited_merged_file_ids(self):
228
243
        self._create_merged_file()
229
 
        out, err = self.run_bzr('annotate file --show-ids')
 
244
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
230
245
        self.assertEqual(
231
246
            'current: | local\n'
232
247
            '    rev1 | foo\n'
236
251
            out)
237
252
 
238
253
    def test_annotate_empty_file(self):
239
 
        tree = self.make_branch_and_tree('tree')
240
 
        self.build_tree_contents([('tree/empty', '')])
 
254
        tree = self.make_branch_and_tree('.')
 
255
        self.build_tree_contents([('empty', b'')])
241
256
        tree.add('empty')
242
257
        tree.commit('add empty file')
 
258
        out, err = self.run_bzr(['annotate', 'empty'])
 
259
        self.assertEqual('', out)
243
260
 
244
 
        os.chdir('tree')
245
 
        out, err = self.run_bzr('annotate empty')
 
261
    def test_annotate_removed_file(self):
 
262
        tree = self.make_branch_and_tree('.')
 
263
        self.build_tree_contents([('empty', b'')])
 
264
        tree.add('empty')
 
265
        tree.commit('add empty file')
 
266
        # delete the file.
 
267
        tree.remove('empty')
 
268
        tree.commit('remove empty file')
 
269
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
246
270
        self.assertEqual('', out)
247
271
 
248
272
    def test_annotate_empty_file_show_ids(self):
249
 
        tree = self.make_branch_and_tree('tree')
250
 
        self.build_tree_contents([('tree/empty', '')])
 
273
        tree = self.make_branch_and_tree('.')
 
274
        self.build_tree_contents([('empty', b'')])
251
275
        tree.add('empty')
252
276
        tree.commit('add empty file')
253
 
 
254
 
        os.chdir('tree')
255
277
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
256
278
        self.assertEqual('', out)
257
279
 
258
280
    def test_annotate_nonexistant_file(self):
259
 
        tree = self.make_branch_and_tree('tree')
260
 
        self.build_tree(['tree/file'])
 
281
        tree = self.make_branch_and_tree('.')
 
282
        self.build_tree(['file'])
261
283
        tree.add(['file'])
262
284
        tree.commit('add a file')
263
 
 
264
 
        os.chdir('tree')
265
 
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
 
285
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
266
286
        self.assertEqual('', out)
267
 
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
 
287
        self.assertEqual("brz: ERROR: doesnotexist is not versioned.\n", err)
268
288
 
269
289
    def test_annotate_without_workingtree(self):
270
 
        tree = self.make_branch_and_tree('branch')
271
 
        self.build_tree_contents([('branch/empty', '')])
 
290
        tree = self.make_branch_and_tree('.')
 
291
        self.build_tree_contents([('empty', b'')])
272
292
        tree.add('empty')
273
293
        tree.commit('add empty file')
274
 
        bzrdir = tree.branch.bzrdir
 
294
        bzrdir = tree.branch.controldir
275
295
        bzrdir.destroy_workingtree()
276
296
        self.assertFalse(bzrdir.has_workingtree())
277
 
 
278
 
        os.chdir('branch')
279
 
        out, err = self.run_bzr('annotate empty')
 
297
        out, err = self.run_bzr(['annotate', 'empty'])
280
298
        self.assertEqual('', out)
 
299
 
 
300
    def test_annotate_directory(self):
 
301
        """Test --directory option"""
 
302
        wt = self.make_branch_and_tree('a')
 
303
        self.build_tree_contents([('a/hello.txt', b'my helicopter\n')])
 
304
        wt.add(['hello.txt'])
 
305
        wt.commit('commit', committer='test@user')
 
306
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
 
307
        self.assertEqualDiff('1   test@us | my helicopter\n', out)
 
308
 
 
309
 
 
310
class TestSmartServerAnnotate(tests.TestCaseWithTransport):
 
311
 
 
312
    def test_simple_annotate(self):
 
313
        self.setup_smart_server_with_call_log()
 
314
        wt = self.make_branch_and_tree('branch')
 
315
        self.build_tree_contents([('branch/hello.txt', b'my helicopter\n')])
 
316
        wt.add(['hello.txt'])
 
317
        wt.commit('commit', committer='test@user')
 
318
        self.reset_smart_call_log()
 
319
        out, err = self.run_bzr(['annotate', "-d", self.get_url('branch'),
 
320
                                 "hello.txt"])
 
321
        # This figure represent the amount of work to perform this use case. It
 
322
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
323
        # being too low. If rpc_count increases, more network roundtrips have
 
324
        # become necessary for this use case. Please do not adjust this number
 
325
        # upwards without agreement from bzr's network support maintainers.
 
326
        self.assertLength(9, self.hpss_calls)
 
327
        self.assertLength(1, self.hpss_connections)
 
328
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)