/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: INADA Naoki
  • Date: 2011-05-05 09:15:34 UTC
  • mto: (5830.3.3 i18n-msgfmt)
  • mto: This revision was merged to the branch mainline in revision 5873.
  • Revision ID: songofacandy@gmail.com-20110505091534-7sv835xpofwrmpt4
Add update-pot command to Makefile and tools/bzrgettext script that
extracts help text from bzr commands.

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
 
27
from bzrlib import tests
 
28
 
 
29
from bzrlib.config import extract_email_address
 
30
from bzrlib.urlutils import joinpath
 
31
 
36
32
 
37
33
class TestAnnotate(tests.TestCaseWithTransport):
38
34
 
40
36
        super(TestAnnotate, self).setUp()
41
37
        wt = self.make_branch_and_tree('.')
42
38
        b = wt.branch
43
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'),
44
 
                                  ('nomail.txt', b'nomail\n')])
 
39
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
 
40
                                  ('nomail.txt', 'nomail\n')])
45
41
        wt.add(['hello.txt'])
46
42
        self.revision_id_1 = wt.commit('add hello',
47
 
                                       committer='test@user',
48
 
                                       timestamp=1165960000.00, timezone=0)
 
43
                              committer='test@user',
 
44
                              timestamp=1165960000.00, timezone=0)
49
45
        wt.add(['nomail.txt'])
50
46
        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')])
 
47
                              committer='no mail',
 
48
                              timestamp=1165970000.00, timezone=0)
 
49
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
 
50
                                                'your helicopter\n')])
55
51
        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
 
                                   )])
 
52
                              committer='user@test',
 
53
                              timestamp=1166040000.00, timezone=0)
 
54
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
 
55
                                                'your helicopter\n'
 
56
                                                'all of\n'
 
57
                                                'our helicopters\n'
 
58
                                  )])
63
59
        self.revision_id_4 = wt.commit('mod hello',
64
 
                                       committer='user@test',
65
 
                                       timestamp=1166050000.00, timezone=0)
 
60
                              committer='user@test',
 
61
                              timestamp=1166050000.00, timezone=0)
66
62
 
67
63
    def test_help_annotate(self):
68
64
        """Annotate command exists"""
109
105
%*s | your helicopter
110
106
%*s | all of
111
107
%*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)
 
108
''' % (max_len, self.revision_id_1,
 
109
       max_len, self.revision_id_3,
 
110
       max_len, self.revision_id_4,
 
111
       max_len, '',
 
112
      )
 
113
, out)
117
114
 
118
115
    def test_no_mail(self):
119
116
        out, err = self.run_bzr('annotate nomail.txt')
147
144
        out, err = self.run_bzr('annotate hello.txt -r1..2',
148
145
                                retcode=3)
149
146
        self.assertEqual('', out)
150
 
        self.assertEqual('brz: ERROR: brz annotate --revision takes'
 
147
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
151
148
                         ' exactly one revision identifier\n',
152
149
                         err)
153
150
 
159
156
        """Create a tree with a locally edited file."""
160
157
        tree = self.make_branch_and_tree(relpath)
161
158
        file_relpath = joinpath(relpath, 'file')
162
 
        self.build_tree_contents([(file_relpath, b'foo\ngam\n')])
 
159
        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
163
160
        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')])
 
161
        tree.commit('add file', committer="test@host", rev_id="rev1")
 
162
        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
 
163
        tree.branch.get_config().set_user_option('email', 'current@host2')
166
164
        return tree
167
165
 
168
166
    def test_annotate_cmd_revspec_branch(self):
178
176
 
179
177
    def test_annotate_edited_file(self):
180
178
        tree = self._setup_edited_file()
181
 
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
182
179
        out, err = self.run_bzr('annotate file')
183
180
        self.assertEqual(
184
181
            '1   test@ho | foo\n'
186
183
            '1   test@ho | gam\n',
187
184
            out)
188
185
 
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
186
    def test_annotate_edited_file_show_ids(self):
201
187
        tree = self._setup_edited_file()
202
 
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
203
188
        out, err = self.run_bzr('annotate file --show-ids')
204
189
        self.assertEqual(
205
190
            '    rev1 | foo\n'
210
195
    def _create_merged_file(self):
211
196
        """Create a file with a pending merge and local edit."""
212
197
        tree = self.make_branch_and_tree('.')
213
 
        self.build_tree_contents([('file', b'foo\ngam\n')])
 
198
        self.build_tree_contents([('file', 'foo\ngam\n')])
214
199
        tree.add('file')
215
 
        tree.commit('add file', rev_id=b"rev1", committer="test@host")
 
200
        tree.commit('add file', rev_id="rev1", committer="test@host")
216
201
        # 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")
 
202
        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
 
203
        tree.commit("right", rev_id="rev1.1.1", committer="test@host")
 
204
        tree.pull(tree.branch, True, "rev1")
220
205
        # left side
221
 
        self.build_tree_contents([('file', b'foo\nbaz\ngam\n')])
222
 
        tree.commit("left", rev_id=b"rev2", committer="test@host")
 
206
        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
 
207
        tree.commit("left", rev_id="rev2", committer="test@host")
223
208
        # merge
224
 
        tree.merge_from_branch(tree.branch, b"rev1.1.1")
 
209
        tree.merge_from_branch(tree.branch, "rev1.1.1")
225
210
        # 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')])
 
211
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
227
212
        return tree
228
213
 
229
214
    def test_annotated_edited_merged_file_revnos(self):
230
215
        wt = self._create_merged_file()
231
216
        out, err = self.run_bzr(['annotate', 'file'])
232
 
        email = config.extract_email_address(
233
 
            wt.branch.get_config_stack().get('email'))
 
217
        email = extract_email_address(wt.branch.get_config().username())
234
218
        self.assertEqual(
235
219
            '3?    %-7s | local\n'
236
220
            '1     test@ho | foo\n'
252
236
 
253
237
    def test_annotate_empty_file(self):
254
238
        tree = self.make_branch_and_tree('.')
255
 
        self.build_tree_contents([('empty', b'')])
 
239
        self.build_tree_contents([('empty', '')])
256
240
        tree.add('empty')
257
241
        tree.commit('add empty file')
258
242
        out, err = self.run_bzr(['annotate', 'empty'])
260
244
 
261
245
    def test_annotate_removed_file(self):
262
246
        tree = self.make_branch_and_tree('.')
263
 
        self.build_tree_contents([('empty', b'')])
 
247
        self.build_tree_contents([('empty', '')])
264
248
        tree.add('empty')
265
249
        tree.commit('add empty file')
266
250
        # delete the file.
271
255
 
272
256
    def test_annotate_empty_file_show_ids(self):
273
257
        tree = self.make_branch_and_tree('.')
274
 
        self.build_tree_contents([('empty', b'')])
 
258
        self.build_tree_contents([('empty', '')])
275
259
        tree.add('empty')
276
260
        tree.commit('add empty file')
277
261
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
284
268
        tree.commit('add a file')
285
269
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
286
270
        self.assertEqual('', out)
287
 
        self.assertEqual("brz: ERROR: doesnotexist is not versioned.\n", err)
 
271
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
288
272
 
289
273
    def test_annotate_without_workingtree(self):
290
274
        tree = self.make_branch_and_tree('.')
291
 
        self.build_tree_contents([('empty', b'')])
 
275
        self.build_tree_contents([('empty', '')])
292
276
        tree.add('empty')
293
277
        tree.commit('add empty file')
294
 
        bzrdir = tree.branch.controldir
 
278
        bzrdir = tree.branch.bzrdir
295
279
        bzrdir.destroy_workingtree()
296
280
        self.assertFalse(bzrdir.has_workingtree())
297
281
        out, err = self.run_bzr(['annotate', 'empty'])
300
284
    def test_annotate_directory(self):
301
285
        """Test --directory option"""
302
286
        wt = self.make_branch_and_tree('a')
303
 
        self.build_tree_contents([('a/hello.txt', b'my helicopter\n')])
 
287
        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
304
288
        wt.add(['hello.txt'])
305
289
        wt.commit('commit', committer='test@user')
306
290
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
307
291
        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)