139
140
def test_annotate_cmd_unknown_revision(self):
140
141
out, err = self.run_bzr('annotate hello.txt -r 10',
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")
145
146
def test_annotate_cmd_two_revisions(self):
146
147
out, err = self.run_bzr('annotate hello.txt -r1..2',
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',
154
class TestSimpleAnnotate(TestCaseWithTransport):
155
class TestSimpleAnnotate(tests.TestCaseWithTransport):
155
156
"""Annotate tests with no complex setup."""
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')])
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')])
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)
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'],
173
self.assertEqual(b'', err)
174
174
self.assertEqual(
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',
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')
200
b'2? local u | bar\n'
201
b'1 test@ho | gam\n',
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(
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')])
202
tree.commit('add file', rev_id="rev1", committer="test@host")
219
tree.commit('add file', rev_id=b"rev1", committer="test@host")
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")
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")
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')])
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(
222
'1.1.1 test@ho | bar\n'
224
'1 test@ho | gam\n' % email[:7],
241
b'1.1.1 test@ho | bar\n'
243
b'1 test@ho | gam\n' % email[:7],
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(
250
b'current: | local\n'
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)
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'')])
269
tree.commit('add empty file')
272
tree.commit('remove empty file')
273
out, err = self.run_bzr(['annotate', '-r1', 'empty'])
274
self.assertEqual(b'', out)
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')
255
281
out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
256
self.assertEqual('', out)
282
self.assertEqual(b'', out)
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')
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)
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())
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)
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)
314
class TestSmartServerAnnotate(tests.TestCaseWithTransport):
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'),
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)