← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_annotate.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
24
24
"""
25
25
 
26
26
 
27
 
from bzrlib import (
28
 
    config,
29
 
    tests,
30
 
    )
 
27
import os
31
28
 
32
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
 
29
from bzrlib.branch import Branch
 
30
from bzrlib.config import extract_email_address
 
31
from bzrlib.tests import TestCaseWithTransport
33
32
from bzrlib.urlutils import joinpath
34
33
 
35
34
 
36
 
class TestAnnotate(tests.TestCaseWithTransport):
 
35
class TestAnnotate(TestCaseWithTransport):
37
36
 
38
37
    def setUp(self):
39
38
        super(TestAnnotate, self).setUp()
152
151
                         err)
153
152
 
154
153
 
155
 
class TestSimpleAnnotate(tests.TestCaseWithTransport):
 
154
class TestSimpleAnnotate(TestCaseWithTransport):
156
155
    """Annotate tests with no complex setup."""
157
156
 
158
157
    def _setup_edited_file(self, relpath='.'):
163
162
        tree.add('file')
164
163
        tree.commit('add file', committer="test@host", rev_id="rev1")
165
164
        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
 
165
        tree.branch.get_config().set_user_option('email', 'current@host2')
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
 
        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
172
 
                                working_dir='work')
 
171
        os.chdir('work')
 
172
        out, err = self.run_bzr('annotate file -r branch:../trunk')
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('BZR_EMAIL', 'current@host2')
182
181
        out, err = self.run_bzr('annotate file')
183
182
        self.assertEqual(
184
183
            '1   test@ho | foo\n'
186
185
            '1   test@ho | gam\n',
187
186
            out)
188
187
 
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('BZR_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
 
            '1   test@ho | foo\n'
200
 
            '2?  local u | bar\n'
201
 
            '1   test@ho | gam\n',
202
 
            out)
203
 
 
204
188
    def test_annotate_edited_file_show_ids(self):
205
189
        tree = self._setup_edited_file()
206
 
        self.overrideEnv('BZR_EMAIL', 'current@host2')
207
190
        out, err = self.run_bzr('annotate file --show-ids')
208
191
        self.assertEqual(
209
192
            '    rev1 | foo\n'
228
211
        tree.merge_from_branch(tree.branch, "rev1.1.1")
229
212
        # edit the file to be 'resolved' and have a further local edit
230
213
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
231
 
        return tree
232
214
 
233
215
    def test_annotated_edited_merged_file_revnos(self):
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'))
 
216
        self._create_merged_file()
 
217
        out, err = self.run_bzr('annotate file')
 
218
        email = extract_email_address(Branch.open('.').get_config().username())
238
219
        self.assertEqual(
239
220
            '3?    %-7s | local\n'
240
221
            '1     test@ho | foo\n'
245
226
 
246
227
    def test_annotated_edited_merged_file_ids(self):
247
228
        self._create_merged_file()
248
 
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
 
229
        out, err = self.run_bzr('annotate file --show-ids')
249
230
        self.assertEqual(
250
231
            'current: | local\n'
251
232
            '    rev1 | foo\n'
255
236
            out)
256
237
 
257
238
    def test_annotate_empty_file(self):
258
 
        tree = self.make_branch_and_tree('.')
259
 
        self.build_tree_contents([('empty', '')])
 
239
        tree = self.make_branch_and_tree('tree')
 
240
        self.build_tree_contents([('tree/empty', '')])
260
241
        tree.add('empty')
261
242
        tree.commit('add empty file')
262
 
        out, err = self.run_bzr(['annotate', 'empty'])
263
 
        self.assertEqual('', out)
264
243
 
265
 
    def test_annotate_removed_file(self):
266
 
        tree = self.make_branch_and_tree('.')
267
 
        self.build_tree_contents([('empty', '')])
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'])
 
244
        os.chdir('tree')
 
245
        out, err = self.run_bzr('annotate empty')
274
246
        self.assertEqual('', out)
275
247
 
276
248
    def test_annotate_empty_file_show_ids(self):
277
 
        tree = self.make_branch_and_tree('.')
278
 
        self.build_tree_contents([('empty', '')])
 
249
        tree = self.make_branch_and_tree('tree')
 
250
        self.build_tree_contents([('tree/empty', '')])
279
251
        tree.add('empty')
280
252
        tree.commit('add empty file')
 
253
 
 
254
        os.chdir('tree')
281
255
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
282
256
        self.assertEqual('', out)
283
257
 
284
258
    def test_annotate_nonexistant_file(self):
285
 
        tree = self.make_branch_and_tree('.')
286
 
        self.build_tree(['file'])
 
259
        tree = self.make_branch_and_tree('tree')
 
260
        self.build_tree(['tree/file'])
287
261
        tree.add(['file'])
288
262
        tree.commit('add a file')
289
 
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
 
263
 
 
264
        os.chdir('tree')
 
265
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
290
266
        self.assertEqual('', out)
291
267
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
292
268
 
293
269
    def test_annotate_without_workingtree(self):
294
 
        tree = self.make_branch_and_tree('.')
295
 
        self.build_tree_contents([('empty', '')])
 
270
        tree = self.make_branch_and_tree('branch')
 
271
        self.build_tree_contents([('branch/empty', '')])
296
272
        tree.add('empty')
297
273
        tree.commit('add empty file')
298
274
        bzrdir = tree.branch.bzrdir
299
275
        bzrdir.destroy_workingtree()
300
276
        self.assertFalse(bzrdir.has_workingtree())
301
 
        out, err = self.run_bzr(['annotate', 'empty'])
 
277
 
 
278
        os.chdir('branch')
 
279
        out, err = self.run_bzr('annotate empty')
302
280
        self.assertEqual('', out)
303
281
 
304
282
    def test_annotate_directory(self):
307
285
        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
308
286
        wt.add(['hello.txt'])
309
287
        wt.commit('commit', committer='test@user')
310
 
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
 
288
        out, err = self.run_bzr('annotate -d a hello.txt')
311
289
        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', '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(16, self.hpss_calls)
331
 
        self.assertLength(1, self.hpss_connections)
332
 
        self.expectFailure("annotate accesses inventories, which require VFS access",
333
 
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)