/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: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

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
 
 
36
class TestAnnotate(tests.TestCaseWithTransport):
36
37
 
37
38
    def setUp(self):
38
39
        super(TestAnnotate, self).setUp()
39
40
        wt = self.make_branch_and_tree('.')
40
41
        b = wt.branch
41
 
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
42
 
                                  ('nomail.txt', 'nomail\n')])
 
42
        self.build_tree_contents([('hello.txt', b'my helicopter\n'),
 
43
                                  ('nomail.txt', b'nomail\n')])
43
44
        wt.add(['hello.txt'])
44
45
        self.revision_id_1 = wt.commit('add hello',
45
46
                              committer='test@user',
48
49
        self.revision_id_2 = wt.commit('add nomail',
49
50
                              committer='no mail',
50
51
                              timestamp=1165970000.00, timezone=0)
51
 
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
52
 
                                                'your helicopter\n')])
 
52
        self.build_tree_contents([('hello.txt', b'my helicopter\n'
 
53
                                                b'your helicopter\n')])
53
54
        self.revision_id_3 = wt.commit('mod hello',
54
55
                              committer='user@test',
55
56
                              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'
 
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'
60
61
                                  )])
61
62
        self.revision_id_4 = wt.commit('mod hello',
62
63
                              committer='user@test',
68
69
 
69
70
    def test_annotate_cmd(self):
70
71
        out, err = self.run_bzr('annotate hello.txt')
71
 
        self.assertEqual('', err)
72
 
        self.assertEqualDiff('''\
 
72
        self.assertEqual(b'', err)
 
73
        self.assertEqualDiff(b'''\
73
74
1   test@us | my helicopter
74
75
3   user@te | your helicopter
75
76
4   user@te | all of
78
79
 
79
80
    def test_annotate_cmd_full(self):
80
81
        out, err = self.run_bzr('annotate hello.txt --all')
81
 
        self.assertEqual('', err)
82
 
        self.assertEqualDiff('''\
 
82
        self.assertEqual(b'', err)
 
83
        self.assertEqualDiff(b'''\
83
84
1   test@us | my helicopter
84
85
3   user@te | your helicopter
85
86
4   user@te | all of
88
89
 
89
90
    def test_annotate_cmd_long(self):
90
91
        out, err = self.run_bzr('annotate hello.txt --long')
91
 
        self.assertEqual('', err)
92
 
        self.assertEqualDiff('''\
 
92
        self.assertEqual(b'', err)
 
93
        self.assertEqualDiff(b'''\
93
94
1   test@user 20061212 | my helicopter
94
95
3   user@test 20061213 | your helicopter
95
96
4   user@test 20061213 | all of
101
102
        max_len = max([len(self.revision_id_1),
102
103
                       len(self.revision_id_3),
103
104
                       len(self.revision_id_4)])
104
 
        self.assertEqual('', err)
105
 
        self.assertEqualDiff('''\
 
105
        self.assertEqual(b'', err)
 
106
        self.assertEqualDiff(b'''\
106
107
%*s | my helicopter
107
108
%*s | your helicopter
108
109
%*s | all of
110
111
''' % (max_len, self.revision_id_1,
111
112
       max_len, self.revision_id_3,
112
113
       max_len, self.revision_id_4,
113
 
       max_len, '',
 
114
       max_len, b'',
114
115
      )
115
116
, out)
116
117
 
117
118
    def test_no_mail(self):
118
119
        out, err = self.run_bzr('annotate nomail.txt')
119
 
        self.assertEqual('', err)
120
 
        self.assertEqualDiff('''\
 
120
        self.assertEqual(b'', err)
 
121
        self.assertEqualDiff(b'''\
121
122
2   no mail | nomail
122
123
''', out)
123
124
 
124
125
    def test_annotate_cmd_revision(self):
125
126
        out, err = self.run_bzr('annotate hello.txt -r1')
126
 
        self.assertEqual('', err)
127
 
        self.assertEqualDiff('''\
 
127
        self.assertEqual(b'', err)
 
128
        self.assertEqualDiff(b'''\
128
129
1   test@us | my helicopter
129
130
''', out)
130
131
 
131
132
    def test_annotate_cmd_revision3(self):
132
133
        out, err = self.run_bzr('annotate hello.txt -r3')
133
 
        self.assertEqual('', err)
134
 
        self.assertEqualDiff('''\
 
134
        self.assertEqual(b'', err)
 
135
        self.assertEqualDiff(b'''\
135
136
1   test@us | my helicopter
136
137
3   user@te | your helicopter
137
138
''', out)
139
140
    def test_annotate_cmd_unknown_revision(self):
140
141
        out, err = self.run_bzr('annotate hello.txt -r 10',
141
142
                                retcode=3)
142
 
        self.assertEqual('', out)
143
 
        self.assertContainsRe(err, "Requested revision: '10' does not exist")
 
143
        self.assertEqual(b'', out)
 
144
        self.assertContainsRe(err, b"Requested revision: '10' does not exist")
144
145
 
145
146
    def test_annotate_cmd_two_revisions(self):
146
147
        out, err = self.run_bzr('annotate hello.txt -r1..2',
147
148
                                retcode=3)
148
 
        self.assertEqual('', out)
149
 
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
150
 
                         ' exactly one revision identifier\n',
 
149
        self.assertEqual(b'', out)
 
150
        self.assertEqual(b'brz: ERROR: brz annotate --revision takes'
 
151
                         b' 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')
173
 
        self.assertEqual('', err)
 
171
        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
 
172
                                working_dir='work')
 
173
        self.assertEqual(b'', err)
174
174
        self.assertEqual(
175
 
            '1   test@ho | foo\n'
176
 
            '            | gam\n',
 
175
            b'1   test@ho | foo\n'
 
176
            b'            | gam\n',
177
177
            out)
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
        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))
 
196
        tree = self._setup_edited_file()
 
197
        out, err = self.run_bzr('annotate file')
 
198
        self.assertEqual(
 
199
            b'1   test@ho | foo\n'
 
200
            b'2?  local u | bar\n'
 
201
            b'1   test@ho | gam\n',
 
202
            out)
 
203
 
188
204
    def test_annotate_edited_file_show_ids(self):
189
205
        tree = self._setup_edited_file()
 
206
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
190
207
        out, err = self.run_bzr('annotate file --show-ids')
191
208
        self.assertEqual(
192
 
            '    rev1 | foo\n'
193
 
            'current: | bar\n'
194
 
            '    rev1 | gam\n',
 
209
            b'    rev1 | foo\n'
 
210
            b'current: | bar\n'
 
211
            b'    rev1 | gam\n',
195
212
            out)
196
213
 
197
214
    def _create_merged_file(self):
198
215
        """Create a file with a pending merge and local edit."""
199
216
        tree = self.make_branch_and_tree('.')
200
 
        self.build_tree_contents([('file', 'foo\ngam\n')])
 
217
        self.build_tree_contents([('file', b'foo\ngam\n')])
201
218
        tree.add('file')
202
 
        tree.commit('add file', rev_id="rev1", committer="test@host")
 
219
        tree.commit('add file', rev_id=b"rev1", committer="test@host")
203
220
        # 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")
 
221
        self.build_tree_contents([('file', b'foo\nbar\ngam\n')])
 
222
        tree.commit("right", rev_id=b"rev1.1.1", committer="test@host")
 
223
        tree.pull(tree.branch, True, b"rev1")
207
224
        # left side
208
 
        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
209
 
        tree.commit("left", rev_id="rev2", committer="test@host")
 
225
        self.build_tree_contents([('file', b'foo\nbaz\ngam\n')])
 
226
        tree.commit("left", rev_id=b"rev2", committer="test@host")
210
227
        # merge
211
 
        tree.merge_from_branch(tree.branch, "rev1.1.1")
 
228
        tree.merge_from_branch(tree.branch, b"rev1.1.1")
212
229
        # edit the file to be 'resolved' and have a further local edit
213
 
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
 
230
        self.build_tree_contents([('file', b'local\nfoo\nbar\nbaz\ngam\n')])
 
231
        return tree
214
232
 
215
233
    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())
 
234
        wt = self._create_merged_file()
 
235
        out, err = self.run_bzr(['annotate', 'file'])
 
236
        email = config.extract_email_address(
 
237
            wt.branch.get_config_stack().get('email'))
219
238
        self.assertEqual(
220
 
            '3?    %-7s | local\n'
221
 
            '1     test@ho | foo\n'
222
 
            '1.1.1 test@ho | bar\n'
223
 
            '2     test@ho | baz\n'
224
 
            '1     test@ho | gam\n' % email[:7],
 
239
            b'3?    %-7s | local\n'
 
240
            b'1     test@ho | foo\n'
 
241
            b'1.1.1 test@ho | bar\n'
 
242
            b'2     test@ho | baz\n'
 
243
            b'1     test@ho | gam\n' % email[:7],
225
244
            out)
226
245
 
227
246
    def test_annotated_edited_merged_file_ids(self):
228
247
        self._create_merged_file()
229
 
        out, err = self.run_bzr('annotate file --show-ids')
 
248
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
230
249
        self.assertEqual(
231
 
            'current: | local\n'
232
 
            '    rev1 | foo\n'
233
 
            'rev1.1.1 | bar\n'
234
 
            '    rev2 | baz\n'
235
 
            '    rev1 | gam\n',
 
250
            b'current: | local\n'
 
251
            b'    rev1 | foo\n'
 
252
            b'rev1.1.1 | bar\n'
 
253
            b'    rev2 | baz\n'
 
254
            b'    rev1 | gam\n',
236
255
            out)
237
256
 
238
257
    def test_annotate_empty_file(self):
239
 
        tree = self.make_branch_and_tree('tree')
240
 
        self.build_tree_contents([('tree/empty', '')])
 
258
        tree = self.make_branch_and_tree('.')
 
259
        self.build_tree_contents([('empty', b'')])
241
260
        tree.add('empty')
242
261
        tree.commit('add empty file')
 
262
        out, err = self.run_bzr(['annotate', 'empty'])
 
263
        self.assertEqual(b'', out)
243
264
 
244
 
        os.chdir('tree')
245
 
        out, err = self.run_bzr('annotate empty')
246
 
        self.assertEqual('', out)
 
265
    def test_annotate_removed_file(self):
 
266
        tree = self.make_branch_and_tree('.')
 
267
        self.build_tree_contents([('empty', b'')])
 
268
        tree.add('empty')
 
269
        tree.commit('add empty file')
 
270
        # delete the file.
 
271
        tree.remove('empty')
 
272
        tree.commit('remove empty file')
 
273
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
 
274
        self.assertEqual(b'', out)
247
275
 
248
276
    def test_annotate_empty_file_show_ids(self):
249
 
        tree = self.make_branch_and_tree('tree')
250
 
        self.build_tree_contents([('tree/empty', '')])
 
277
        tree = self.make_branch_and_tree('.')
 
278
        self.build_tree_contents([('empty', b'')])
251
279
        tree.add('empty')
252
280
        tree.commit('add empty file')
253
 
 
254
 
        os.chdir('tree')
255
281
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
256
 
        self.assertEqual('', out)
 
282
        self.assertEqual(b'', out)
257
283
 
258
284
    def test_annotate_nonexistant_file(self):
259
 
        tree = self.make_branch_and_tree('tree')
260
 
        self.build_tree(['tree/file'])
 
285
        tree = self.make_branch_and_tree('.')
 
286
        self.build_tree(['file'])
261
287
        tree.add(['file'])
262
288
        tree.commit('add a file')
263
 
 
264
 
        os.chdir('tree')
265
 
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
266
 
        self.assertEqual('', out)
267
 
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
 
289
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
 
290
        self.assertEqual(b'', out)
 
291
        self.assertEqual(b"brz: ERROR: doesnotexist is not versioned.\n", err)
268
292
 
269
293
    def test_annotate_without_workingtree(self):
270
 
        tree = self.make_branch_and_tree('branch')
271
 
        self.build_tree_contents([('branch/empty', '')])
 
294
        tree = self.make_branch_and_tree('.')
 
295
        self.build_tree_contents([('empty', b'')])
272
296
        tree.add('empty')
273
297
        tree.commit('add empty file')
274
 
        bzrdir = tree.branch.bzrdir
 
298
        bzrdir = tree.branch.controldir
275
299
        bzrdir.destroy_workingtree()
276
300
        self.assertFalse(bzrdir.has_workingtree())
277
 
 
278
 
        os.chdir('branch')
279
 
        out, err = self.run_bzr('annotate empty')
280
 
        self.assertEqual('', out)
 
301
        out, err = self.run_bzr(['annotate', 'empty'])
 
302
        self.assertEqual(b'', out)
 
303
 
 
304
    def test_annotate_directory(self):
 
305
        """Test --directory option"""
 
306
        wt = self.make_branch_and_tree('a')
 
307
        self.build_tree_contents([('a/hello.txt', b'my helicopter\n')])
 
308
        wt.add(['hello.txt'])
 
309
        wt.commit('commit', committer='test@user')
 
310
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
 
311
        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', b'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(9, self.hpss_calls)
 
331
        self.assertLength(1, self.hpss_connections)
 
332
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)