/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 bzrlib/tests/blackbox/test_annotate.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/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_brz function.
 
23
rather starts again from the run_bzr function.
24
24
"""
25
25
 
26
26
 
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
 
from ..test_bedding import override_whoami
36
 
 
37
 
class TestAnnotate(tests.TestCaseWithTransport):
 
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):
38
36
 
39
37
    def setUp(self):
40
38
        super(TestAnnotate, self).setUp()
41
39
        wt = self.make_branch_and_tree('.')
42
40
        b = wt.branch
43
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'),
44
 
                                  ('nomail.txt', b'nomail\n')])
 
41
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
 
42
                                  ('nomail.txt', 'nomail\n')])
45
43
        wt.add(['hello.txt'])
46
44
        self.revision_id_1 = wt.commit('add hello',
47
 
                                       committer='test@user',
48
 
                                       timestamp=1165960000.00, timezone=0)
 
45
                              committer='test@user',
 
46
                              timestamp=1165960000.00, timezone=0)
49
47
        wt.add(['nomail.txt'])
50
48
        self.revision_id_2 = wt.commit('add nomail',
51
 
                                       committer='no mail',
52
 
                                       timestamp=1165970000.00, timezone=0)
53
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'
54
 
                                                b'your helicopter\n')])
 
49
                              committer='no mail',
 
50
                              timestamp=1165970000.00, timezone=0)
 
51
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
 
52
                                                'your helicopter\n')])
55
53
        self.revision_id_3 = wt.commit('mod hello',
56
 
                                       committer='user@test',
57
 
                                       timestamp=1166040000.00, timezone=0)
58
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'
59
 
                                                b'your helicopter\n'
60
 
                                                b'all of\n'
61
 
                                                b'our helicopters\n'
62
 
                                   )])
 
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
                                  )])
63
61
        self.revision_id_4 = wt.commit('mod hello',
64
 
                                       committer='user@test',
65
 
                                       timestamp=1166050000.00, timezone=0)
 
62
                              committer='user@test',
 
63
                              timestamp=1166050000.00, timezone=0)
66
64
 
67
65
    def test_help_annotate(self):
68
66
        """Annotate command exists"""
109
107
%*s | your helicopter
110
108
%*s | all of
111
109
%*s | our helicopters
112
 
''' % (max_len, self.revision_id_1.decode('utf-8'),
113
 
            max_len, self.revision_id_3.decode('utf-8'),
114
 
            max_len, self.revision_id_4.decode('utf-8'),
115
 
            max_len, '',
116
 
       ), out)
 
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)
117
116
 
118
117
    def test_no_mail(self):
119
118
        out, err = self.run_bzr('annotate nomail.txt')
147
146
        out, err = self.run_bzr('annotate hello.txt -r1..2',
148
147
                                retcode=3)
149
148
        self.assertEqual('', out)
150
 
        self.assertEqual('brz: ERROR: brz annotate --revision takes'
 
149
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
151
150
                         ' exactly one revision identifier\n',
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='.'):
159
158
        """Create a tree with a locally edited file."""
160
159
        tree = self.make_branch_and_tree(relpath)
161
160
        file_relpath = joinpath(relpath, 'file')
162
 
        self.build_tree_contents([(file_relpath, b'foo\ngam\n')])
 
161
        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
163
162
        tree.add('file')
164
 
        tree.commit('add file', committer="test@host", rev_id=b"rev1")
165
 
        self.build_tree_contents([(file_relpath, b'foo\nbar\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')
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('BRZ_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
 
        override_whoami(self)
192
 
        tree = self._setup_edited_file()
193
 
        out, err = self.run_bzr('annotate file')
194
 
        self.assertEqual(
195
 
            '1   test@ho | foo\n'
196
 
            '2?  local u | bar\n'
197
 
            '1   test@ho | gam\n',
198
 
            out)
199
 
 
200
188
    def test_annotate_edited_file_show_ids(self):
201
189
        tree = self._setup_edited_file()
202
 
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
203
190
        out, err = self.run_bzr('annotate file --show-ids')
204
191
        self.assertEqual(
205
192
            '    rev1 | foo\n'
210
197
    def _create_merged_file(self):
211
198
        """Create a file with a pending merge and local edit."""
212
199
        tree = self.make_branch_and_tree('.')
213
 
        self.build_tree_contents([('file', b'foo\ngam\n')])
 
200
        self.build_tree_contents([('file', 'foo\ngam\n')])
214
201
        tree.add('file')
215
 
        tree.commit('add file', rev_id=b"rev1", committer="test@host")
 
202
        tree.commit('add file', rev_id="rev1", committer="test@host")
216
203
        # right side
217
 
        self.build_tree_contents([('file', b'foo\nbar\ngam\n')])
218
 
        tree.commit("right", rev_id=b"rev1.1.1", committer="test@host")
219
 
        tree.pull(tree.branch, True, b"rev1")
 
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")
220
207
        # left side
221
 
        self.build_tree_contents([('file', b'foo\nbaz\ngam\n')])
222
 
        tree.commit("left", rev_id=b"rev2", committer="test@host")
 
208
        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
 
209
        tree.commit("left", rev_id="rev2", committer="test@host")
223
210
        # merge
224
 
        tree.merge_from_branch(tree.branch, b"rev1.1.1")
 
211
        tree.merge_from_branch(tree.branch, "rev1.1.1")
225
212
        # edit the file to be 'resolved' and have a further local edit
226
 
        self.build_tree_contents([('file', b'local\nfoo\nbar\nbaz\ngam\n')])
227
 
        return tree
 
213
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
228
214
 
229
215
    def test_annotated_edited_merged_file_revnos(self):
230
 
        wt = self._create_merged_file()
231
 
        out, err = self.run_bzr(['annotate', 'file'])
232
 
        email = config.extract_email_address(
233
 
            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())
234
219
        self.assertEqual(
235
220
            '3?    %-7s | local\n'
236
221
            '1     test@ho | foo\n'
241
226
 
242
227
    def test_annotated_edited_merged_file_ids(self):
243
228
        self._create_merged_file()
244
 
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
 
229
        out, err = self.run_bzr('annotate file --show-ids')
245
230
        self.assertEqual(
246
231
            'current: | local\n'
247
232
            '    rev1 | foo\n'
251
236
            out)
252
237
 
253
238
    def test_annotate_empty_file(self):
254
 
        tree = self.make_branch_and_tree('.')
255
 
        self.build_tree_contents([('empty', b'')])
 
239
        tree = self.make_branch_and_tree('tree')
 
240
        self.build_tree_contents([('tree/empty', '')])
256
241
        tree.add('empty')
257
242
        tree.commit('add empty file')
258
 
        out, err = self.run_bzr(['annotate', 'empty'])
259
 
        self.assertEqual('', out)
260
243
 
261
 
    def test_annotate_removed_file(self):
262
 
        tree = self.make_branch_and_tree('.')
263
 
        self.build_tree_contents([('empty', b'')])
264
 
        tree.add('empty')
265
 
        tree.commit('add empty file')
266
 
        # delete the file.
267
 
        tree.remove('empty')
268
 
        tree.commit('remove empty file')
269
 
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
 
244
        os.chdir('tree')
 
245
        out, err = self.run_bzr('annotate empty')
270
246
        self.assertEqual('', out)
271
247
 
272
248
    def test_annotate_empty_file_show_ids(self):
273
 
        tree = self.make_branch_and_tree('.')
274
 
        self.build_tree_contents([('empty', b'')])
 
249
        tree = self.make_branch_and_tree('tree')
 
250
        self.build_tree_contents([('tree/empty', '')])
275
251
        tree.add('empty')
276
252
        tree.commit('add empty file')
 
253
 
 
254
        os.chdir('tree')
277
255
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
278
256
        self.assertEqual('', out)
279
257
 
280
258
    def test_annotate_nonexistant_file(self):
281
 
        tree = self.make_branch_and_tree('.')
282
 
        self.build_tree(['file'])
 
259
        tree = self.make_branch_and_tree('tree')
 
260
        self.build_tree(['tree/file'])
283
261
        tree.add(['file'])
284
262
        tree.commit('add a file')
285
 
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
 
263
 
 
264
        os.chdir('tree')
 
265
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
286
266
        self.assertEqual('', out)
287
 
        self.assertEqual("brz: ERROR: doesnotexist is not versioned.\n", err)
 
267
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
288
268
 
289
269
    def test_annotate_without_workingtree(self):
290
 
        tree = self.make_branch_and_tree('.')
291
 
        self.build_tree_contents([('empty', b'')])
 
270
        tree = self.make_branch_and_tree('branch')
 
271
        self.build_tree_contents([('branch/empty', '')])
292
272
        tree.add('empty')
293
273
        tree.commit('add empty file')
294
 
        bzrdir = tree.branch.controldir
 
274
        bzrdir = tree.branch.bzrdir
295
275
        bzrdir.destroy_workingtree()
296
276
        self.assertFalse(bzrdir.has_workingtree())
297
 
        out, err = self.run_bzr(['annotate', 'empty'])
 
277
 
 
278
        os.chdir('branch')
 
279
        out, err = self.run_bzr('annotate empty')
298
280
        self.assertEqual('', out)
299
 
 
300
 
    def test_annotate_directory(self):
301
 
        """Test --directory option"""
302
 
        wt = self.make_branch_and_tree('a')
303
 
        self.build_tree_contents([('a/hello.txt', b'my helicopter\n')])
304
 
        wt.add(['hello.txt'])
305
 
        wt.commit('commit', committer='test@user')
306
 
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
307
 
        self.assertEqualDiff('1   test@us | my helicopter\n', out)
308
 
 
309
 
 
310
 
class TestSmartServerAnnotate(tests.TestCaseWithTransport):
311
 
 
312
 
    def test_simple_annotate(self):
313
 
        self.setup_smart_server_with_call_log()
314
 
        wt = self.make_branch_and_tree('branch')
315
 
        self.build_tree_contents([('branch/hello.txt', b'my helicopter\n')])
316
 
        wt.add(['hello.txt'])
317
 
        wt.commit('commit', committer='test@user')
318
 
        self.reset_smart_call_log()
319
 
        out, err = self.run_bzr(['annotate', "-d", self.get_url('branch'),
320
 
                                 "hello.txt"])
321
 
        # This figure represent the amount of work to perform this use case. It
322
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
323
 
        # being too low. If rpc_count increases, more network roundtrips have
324
 
        # become necessary for this use case. Please do not adjust this number
325
 
        # upwards without agreement from bzr's network support maintainers.
326
 
        self.assertLength(9, self.hpss_calls)
327
 
        self.assertLength(1, self.hpss_connections)
328
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)