/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-11 08:36:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511083616-b8fjb19zomwupid0
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.

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.urlutils import joinpath
33
 
 
34
 
from ..test_bedding import override_whoami
35
 
 
36
 
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):
37
36
 
38
37
    def setUp(self):
39
38
        super(TestAnnotate, self).setUp()
40
39
        wt = self.make_branch_and_tree('.')
41
40
        b = wt.branch
42
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'),
43
 
                                  ('nomail.txt', b'nomail\n')])
 
41
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
 
42
                                  ('nomail.txt', 'nomail\n')])
44
43
        wt.add(['hello.txt'])
45
44
        self.revision_id_1 = wt.commit('add hello',
46
 
                                       committer='test@user',
47
 
                                       timestamp=1165960000.00, timezone=0)
 
45
                              committer='test@user',
 
46
                              timestamp=1165960000.00, timezone=0)
48
47
        wt.add(['nomail.txt'])
49
48
        self.revision_id_2 = wt.commit('add nomail',
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')])
 
49
                              committer='no mail',
 
50
                              timestamp=1165970000.00, timezone=0)
 
51
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
 
52
                                                'your helicopter\n')])
54
53
        self.revision_id_3 = wt.commit('mod hello',
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
 
                                   )])
 
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
                                  )])
62
61
        self.revision_id_4 = wt.commit('mod hello',
63
 
                                       committer='user@test',
64
 
                                       timestamp=1166050000.00, timezone=0)
 
62
                              committer='user@test',
 
63
                              timestamp=1166050000.00, timezone=0)
65
64
 
66
65
    def test_help_annotate(self):
67
66
        """Annotate command exists"""
108
107
%*s | your helicopter
109
108
%*s | all of
110
109
%*s | our helicopters
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)
 
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)
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('brz: ERROR: brz annotate --revision takes'
 
149
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
150
150
                         ' exactly one revision identifier\n',
151
151
                         err)
152
152
 
153
153
 
154
 
class TestSimpleAnnotate(tests.TestCaseWithTransport):
 
154
class TestSimpleAnnotate(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, b'foo\ngam\n')])
 
161
        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
162
162
        tree.add('file')
163
 
        tree.commit('add file', committer="test@host", rev_id=b"rev1")
164
 
        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')
165
166
        return tree
166
167
 
167
168
    def test_annotate_cmd_revspec_branch(self):
168
169
        tree = self._setup_edited_file('trunk')
169
170
        tree.branch.create_checkout(self.get_url('work'), lightweight=True)
170
 
        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
171
 
                                working_dir='work')
 
171
        os.chdir('work')
 
172
        out, err = self.run_bzr('annotate file -r branch:../trunk')
172
173
        self.assertEqual('', err)
173
174
        self.assertEqual(
174
175
            '1   test@ho | foo\n'
177
178
 
178
179
    def test_annotate_edited_file(self):
179
180
        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
 
 
199
188
    def test_annotate_edited_file_show_ids(self):
200
189
        tree = self._setup_edited_file()
201
 
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
202
190
        out, err = self.run_bzr('annotate file --show-ids')
203
191
        self.assertEqual(
204
192
            '    rev1 | foo\n'
209
197
    def _create_merged_file(self):
210
198
        """Create a file with a pending merge and local edit."""
211
199
        tree = self.make_branch_and_tree('.')
212
 
        self.build_tree_contents([('file', b'foo\ngam\n')])
 
200
        self.build_tree_contents([('file', 'foo\ngam\n')])
213
201
        tree.add('file')
214
 
        tree.commit('add file', rev_id=b"rev1", committer="test@host")
 
202
        tree.commit('add file', rev_id="rev1", committer="test@host")
215
203
        # right side
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")
 
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")
219
207
        # left side
220
 
        self.build_tree_contents([('file', b'foo\nbaz\ngam\n')])
221
 
        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")
222
210
        # merge
223
 
        tree.merge_from_branch(tree.branch, b"rev1.1.1")
 
211
        tree.merge_from_branch(tree.branch, "rev1.1.1")
224
212
        # edit the file to be 'resolved' and have a further local edit
225
 
        self.build_tree_contents([('file', b'local\nfoo\nbar\nbaz\ngam\n')])
226
 
        return tree
 
213
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
227
214
 
228
215
    def test_annotated_edited_merged_file_revnos(self):
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'))
 
216
        self._create_merged_file()
 
217
        out, err = self.run_bzr('annotate file')
 
218
        email = extract_email_address(Branch.open('.').get_config().username())
233
219
        self.assertEqual(
234
220
            '3?    %-7s | local\n'
235
221
            '1     test@ho | foo\n'
240
226
 
241
227
    def test_annotated_edited_merged_file_ids(self):
242
228
        self._create_merged_file()
243
 
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
 
229
        out, err = self.run_bzr('annotate file --show-ids')
244
230
        self.assertEqual(
245
231
            'current: | local\n'
246
232
            '    rev1 | foo\n'
250
236
            out)
251
237
 
252
238
    def test_annotate_empty_file(self):
253
 
        tree = self.make_branch_and_tree('.')
254
 
        self.build_tree_contents([('empty', b'')])
 
239
        tree = self.make_branch_and_tree('tree')
 
240
        self.build_tree_contents([('tree/empty', '')])
255
241
        tree.add('empty')
256
242
        tree.commit('add empty file')
257
 
        out, err = self.run_bzr(['annotate', 'empty'])
258
 
        self.assertEqual('', out)
259
243
 
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'])
 
244
        os.chdir('tree')
 
245
        out, err = self.run_bzr('annotate empty')
269
246
        self.assertEqual('', out)
270
247
 
271
248
    def test_annotate_empty_file_show_ids(self):
272
 
        tree = self.make_branch_and_tree('.')
273
 
        self.build_tree_contents([('empty', b'')])
 
249
        tree = self.make_branch_and_tree('tree')
 
250
        self.build_tree_contents([('tree/empty', '')])
274
251
        tree.add('empty')
275
252
        tree.commit('add empty file')
 
253
 
 
254
        os.chdir('tree')
276
255
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
277
256
        self.assertEqual('', out)
278
257
 
279
258
    def test_annotate_nonexistant_file(self):
280
 
        tree = self.make_branch_and_tree('.')
281
 
        self.build_tree(['file'])
 
259
        tree = self.make_branch_and_tree('tree')
 
260
        self.build_tree(['tree/file'])
282
261
        tree.add(['file'])
283
262
        tree.commit('add a file')
284
 
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
 
263
 
 
264
        os.chdir('tree')
 
265
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
285
266
        self.assertEqual('', out)
286
 
        self.assertEqual("brz: ERROR: doesnotexist is not versioned.\n", err)
 
267
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
287
268
 
288
269
    def test_annotate_without_workingtree(self):
289
 
        tree = self.make_branch_and_tree('.')
290
 
        self.build_tree_contents([('empty', b'')])
 
270
        tree = self.make_branch_and_tree('branch')
 
271
        self.build_tree_contents([('branch/empty', '')])
291
272
        tree.add('empty')
292
273
        tree.commit('add empty file')
293
 
        bzrdir = tree.branch.controldir
 
274
        bzrdir = tree.branch.bzrdir
294
275
        bzrdir.destroy_workingtree()
295
276
        self.assertFalse(bzrdir.has_workingtree())
296
 
        out, err = self.run_bzr(['annotate', 'empty'])
 
277
 
 
278
        os.chdir('branch')
 
279
        out, err = self.run_bzr('annotate empty')
297
280
        self.assertEqual('', out)
298
 
 
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)