/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): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

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.urlutils import joinpath
 
33
 
 
34
from ..test_bedding import override_whoami
 
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
 
                              committer='test@user',
46
 
                              timestamp=1165960000.00, timezone=0)
 
46
                                       committer='test@user',
 
47
                                       timestamp=1165960000.00, timezone=0)
47
48
        wt.add(['nomail.txt'])
48
49
        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')])
 
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')])
53
54
        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
 
                                  )])
 
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
                                   )])
61
62
        self.revision_id_4 = wt.commit('mod hello',
62
 
                              committer='user@test',
63
 
                              timestamp=1166050000.00, timezone=0)
 
63
                                       committer='user@test',
 
64
                                       timestamp=1166050000.00, timezone=0)
64
65
 
65
66
    def test_help_annotate(self):
66
67
        """Annotate command exists"""
107
108
%*s | your helicopter
108
109
%*s | all of
109
110
%*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)
 
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)
116
116
 
117
117
    def test_no_mail(self):
118
118
        out, err = self.run_bzr('annotate nomail.txt')
146
146
        out, err = self.run_bzr('annotate hello.txt -r1..2',
147
147
                                retcode=3)
148
148
        self.assertEqual('', out)
149
 
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
 
149
        self.assertEqual('brz: ERROR: brz annotate --revision takes'
150
150
                         ' exactly one revision identifier\n',
151
151
                         err)
152
152
 
153
153
 
154
 
class TestSimpleAnnotate(TestCaseWithTransport):
 
154
class TestSimpleAnnotate(tests.TestCaseWithTransport):
155
155
    """Annotate tests with no complex setup."""
156
156
 
157
157
    def _setup_edited_file(self, relpath='.'):
158
158
        """Create a tree with a locally edited file."""
159
159
        tree = self.make_branch_and_tree(relpath)
160
160
        file_relpath = joinpath(relpath, 'file')
161
 
        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
 
161
        self.build_tree_contents([(file_relpath, b'foo\ngam\n')])
162
162
        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')
 
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):
169
168
        tree = self._setup_edited_file('trunk')
170
169
        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')
 
170
        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
 
171
                                working_dir='work')
173
172
        self.assertEqual('', err)
174
173
        self.assertEqual(
175
174
            '1   test@ho | foo\n'
178
177
 
179
178
    def test_annotate_edited_file(self):
180
179
        tree = self._setup_edited_file()
 
180
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
181
181
        out, err = self.run_bzr('annotate file')
182
182
        self.assertEqual(
183
183
            '1   test@ho | foo\n'
185
185
            '1   test@ho | gam\n',
186
186
            out)
187
187
 
 
188
    def test_annotate_edited_file_no_default(self):
 
189
        # Ensure that when no username is available annotate still works.
 
190
        override_whoami(self)
 
191
        tree = self._setup_edited_file()
 
192
        out, err = self.run_bzr('annotate file')
 
193
        self.assertEqual(
 
194
            '1   test@ho | foo\n'
 
195
            '2?  local u | bar\n'
 
196
            '1   test@ho | gam\n',
 
197
            out)
 
198
 
188
199
    def test_annotate_edited_file_show_ids(self):
189
200
        tree = self._setup_edited_file()
 
201
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
190
202
        out, err = self.run_bzr('annotate file --show-ids')
191
203
        self.assertEqual(
192
204
            '    rev1 | foo\n'
197
209
    def _create_merged_file(self):
198
210
        """Create a file with a pending merge and local edit."""
199
211
        tree = self.make_branch_and_tree('.')
200
 
        self.build_tree_contents([('file', 'foo\ngam\n')])
 
212
        self.build_tree_contents([('file', b'foo\ngam\n')])
201
213
        tree.add('file')
202
 
        tree.commit('add file', rev_id="rev1", committer="test@host")
 
214
        tree.commit('add file', rev_id=b"rev1", committer="test@host")
203
215
        # 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")
 
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")
207
219
        # left side
208
 
        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
209
 
        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")
210
222
        # merge
211
 
        tree.merge_from_branch(tree.branch, "rev1.1.1")
 
223
        tree.merge_from_branch(tree.branch, b"rev1.1.1")
212
224
        # edit the file to be 'resolved' and have a further local edit
213
 
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
 
225
        self.build_tree_contents([('file', b'local\nfoo\nbar\nbaz\ngam\n')])
 
226
        return tree
214
227
 
215
228
    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())
 
229
        wt = self._create_merged_file()
 
230
        out, err = self.run_bzr(['annotate', 'file'])
 
231
        email = config.extract_email_address(
 
232
            wt.branch.get_config_stack().get('email'))
219
233
        self.assertEqual(
220
234
            '3?    %-7s | local\n'
221
235
            '1     test@ho | foo\n'
226
240
 
227
241
    def test_annotated_edited_merged_file_ids(self):
228
242
        self._create_merged_file()
229
 
        out, err = self.run_bzr('annotate file --show-ids')
 
243
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
230
244
        self.assertEqual(
231
245
            'current: | local\n'
232
246
            '    rev1 | foo\n'
236
250
            out)
237
251
 
238
252
    def test_annotate_empty_file(self):
239
 
        tree = self.make_branch_and_tree('tree')
240
 
        self.build_tree_contents([('tree/empty', '')])
 
253
        tree = self.make_branch_and_tree('.')
 
254
        self.build_tree_contents([('empty', b'')])
241
255
        tree.add('empty')
242
256
        tree.commit('add empty file')
 
257
        out, err = self.run_bzr(['annotate', 'empty'])
 
258
        self.assertEqual('', out)
243
259
 
244
 
        os.chdir('tree')
245
 
        out, err = self.run_bzr('annotate empty')
 
260
    def test_annotate_removed_file(self):
 
261
        tree = self.make_branch_and_tree('.')
 
262
        self.build_tree_contents([('empty', b'')])
 
263
        tree.add('empty')
 
264
        tree.commit('add empty file')
 
265
        # delete the file.
 
266
        tree.remove('empty')
 
267
        tree.commit('remove empty file')
 
268
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
246
269
        self.assertEqual('', out)
247
270
 
248
271
    def test_annotate_empty_file_show_ids(self):
249
 
        tree = self.make_branch_and_tree('tree')
250
 
        self.build_tree_contents([('tree/empty', '')])
 
272
        tree = self.make_branch_and_tree('.')
 
273
        self.build_tree_contents([('empty', b'')])
251
274
        tree.add('empty')
252
275
        tree.commit('add empty file')
253
 
 
254
 
        os.chdir('tree')
255
276
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
256
277
        self.assertEqual('', out)
257
278
 
258
279
    def test_annotate_nonexistant_file(self):
259
 
        tree = self.make_branch_and_tree('tree')
260
 
        self.build_tree(['tree/file'])
 
280
        tree = self.make_branch_and_tree('.')
 
281
        self.build_tree(['file'])
261
282
        tree.add(['file'])
262
283
        tree.commit('add a file')
263
 
 
264
 
        os.chdir('tree')
265
 
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
 
284
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
266
285
        self.assertEqual('', out)
267
 
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
 
286
        self.assertEqual("brz: ERROR: doesnotexist is not versioned.\n", err)
268
287
 
269
288
    def test_annotate_without_workingtree(self):
270
 
        tree = self.make_branch_and_tree('branch')
271
 
        self.build_tree_contents([('branch/empty', '')])
 
289
        tree = self.make_branch_and_tree('.')
 
290
        self.build_tree_contents([('empty', b'')])
272
291
        tree.add('empty')
273
292
        tree.commit('add empty file')
274
 
        bzrdir = tree.branch.bzrdir
 
293
        bzrdir = tree.branch.controldir
275
294
        bzrdir.destroy_workingtree()
276
295
        self.assertFalse(bzrdir.has_workingtree())
 
296
        out, err = self.run_bzr(['annotate', 'empty'])
 
297
        self.assertEqual('', out)
277
298
 
278
 
        os.chdir('branch')
279
 
        out, err = self.run_bzr('annotate empty')
280
 
        self.assertEqual('', out)
 
299
    def test_annotate_directory(self):
 
300
        """Test --directory option"""
 
301
        wt = self.make_branch_and_tree('a')
 
302
        self.build_tree_contents([('a/hello.txt', b'my helicopter\n')])
 
303
        wt.add(['hello.txt'])
 
304
        wt.commit('commit', committer='test@user')
 
305
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
 
306
        self.assertEqualDiff('1   test@us | my helicopter\n', out)