178
179
def test_annotate_edited_file(self):
179
180
tree = self._setup_edited_file()
180
tree.branch.get_config().set_user_option('email', 'current@host2')
181
self.overrideEnv('BZR_EMAIL', 'current@host2')
181
182
out, err = self.run_bzr('annotate file')
182
183
self.assertEqual(
183
184
'1 test@ho | foo\n'
203
204
def test_annotate_edited_file_show_ids(self):
204
205
tree = self._setup_edited_file()
205
tree.branch.get_config().set_user_option('email', 'current@host2')
206
self.overrideEnv('BZR_EMAIL', 'current@host2')
206
207
out, err = self.run_bzr('annotate file --show-ids')
207
208
self.assertEqual(
307
308
wt.commit('commit', committer='test@user')
308
309
out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
309
310
self.assertEqualDiff('1 test@us | my helicopter\n', out)
313
class TestSmartServerAnnotate(tests.TestCaseWithTransport):
315
def test_simple_annotate(self):
316
self.setup_smart_server_with_call_log()
317
wt = self.make_branch_and_tree('branch')
318
self.build_tree_contents([('branch/hello.txt', 'my helicopter\n')])
319
wt.add(['hello.txt'])
320
wt.commit('commit', committer='test@user')
321
self.reset_smart_call_log()
322
out, err = self.run_bzr(['annotate', "-d", self.get_url('branch'),
324
# This figure represent the amount of work to perform this use case. It
325
# is entirely ok to reduce this number if a test fails due to rpc_count
326
# being too low. If rpc_count increases, more network roundtrips have
327
# become necessary for this use case. Please do not adjust this number
328
# upwards without agreement from bzr's network support maintainers.
329
self.assertLength(16, self.hpss_calls)
330
self.assertLength(1, self.hpss_connections)
331
self.expectFailure("annotate accesses inventories, which require VFS access",
332
self.assertThat, self.hpss_calls, ContainsNoVfsCalls)