← 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: INADA Naoki
  • Date: 2011-05-18 06:01:08 UTC
  • mto: This revision was merged to the branch mainline in revision 5894.
  • Revision ID: songofacandy@gmail.com-20110518060108-86t2kffcrzu0nf6i
Update Japanese docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
24
24
"""
25
25
 
26
26
 
27
 
import os
 
27
from bzrlib import tests
28
28
 
29
 
from bzrlib.branch import Branch
30
29
from bzrlib.config import extract_email_address
31
 
from bzrlib.tests import TestCaseWithTransport
32
 
 
33
 
 
34
 
class TestAnnotate(TestCaseWithTransport):
 
30
from bzrlib.urlutils import joinpath
 
31
 
 
32
 
 
33
class TestAnnotate(tests.TestCaseWithTransport):
35
34
 
36
35
    def setUp(self):
37
36
        super(TestAnnotate, self).setUp()
139
138
        out, err = self.run_bzr('annotate hello.txt -r 10',
140
139
                                retcode=3)
141
140
        self.assertEqual('', out)
142
 
        self.assertContainsRe(err, 'Requested revision: \'10\' does not exist')
 
141
        self.assertContainsRe(err, "Requested revision: '10' does not exist")
143
142
 
144
143
    def test_annotate_cmd_two_revisions(self):
145
144
        out, err = self.run_bzr('annotate hello.txt -r1..2',
150
149
                         err)
151
150
 
152
151
 
153
 
class TestSimpleAnnotate(TestCaseWithTransport):
 
152
class TestSimpleAnnotate(tests.TestCaseWithTransport):
154
153
    """Annotate tests with no complex setup."""
155
154
 
156
 
    def _setup_edited_file(self):
 
155
    def _setup_edited_file(self, relpath='.'):
157
156
        """Create a tree with a locally edited file."""
158
 
        tree = self.make_branch_and_tree('.')
159
 
        self.build_tree_contents([('file', 'foo\ngam\n')])
 
157
        tree = self.make_branch_and_tree(relpath)
 
158
        file_relpath = joinpath(relpath, 'file')
 
159
        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
160
160
        tree.add('file')
161
161
        tree.commit('add file', committer="test@host", rev_id="rev1")
162
 
        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
 
162
        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
163
163
        tree.branch.get_config().set_user_option('email', 'current@host2')
 
164
        return tree
 
165
 
 
166
    def test_annotate_cmd_revspec_branch(self):
 
167
        tree = self._setup_edited_file('trunk')
 
168
        tree.branch.create_checkout(self.get_url('work'), lightweight=True)
 
169
        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
 
170
                                working_dir='work')
 
171
        self.assertEqual('', err)
 
172
        self.assertEqual(
 
173
            '1   test@ho | foo\n'
 
174
            '            | gam\n',
 
175
            out)
164
176
 
165
177
    def test_annotate_edited_file(self):
166
178
        tree = self._setup_edited_file()
197
209
        tree.merge_from_branch(tree.branch, "rev1.1.1")
198
210
        # edit the file to be 'resolved' and have a further local edit
199
211
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
 
212
        return tree
200
213
 
201
214
    def test_annotated_edited_merged_file_revnos(self):
202
 
        self._create_merged_file()
203
 
        out, err = self.run_bzr('annotate file')
204
 
        email = extract_email_address(Branch.open('.').get_config().username())
 
215
        wt = self._create_merged_file()
 
216
        out, err = self.run_bzr(['annotate', 'file'])
 
217
        email = extract_email_address(wt.branch.get_config().username())
205
218
        self.assertEqual(
206
219
            '3?    %-7s | local\n'
207
220
            '1     test@ho | foo\n'
212
225
 
213
226
    def test_annotated_edited_merged_file_ids(self):
214
227
        self._create_merged_file()
215
 
        out, err = self.run_bzr('annotate file --show-ids')
 
228
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
216
229
        self.assertEqual(
217
230
            'current: | local\n'
218
231
            '    rev1 | foo\n'
222
235
            out)
223
236
 
224
237
    def test_annotate_empty_file(self):
225
 
        tree = self.make_branch_and_tree('tree')
226
 
        self.build_tree_contents([('tree/empty', '')])
 
238
        tree = self.make_branch_and_tree('.')
 
239
        self.build_tree_contents([('empty', '')])
227
240
        tree.add('empty')
228
241
        tree.commit('add empty file')
 
242
        out, err = self.run_bzr(['annotate', 'empty'])
 
243
        self.assertEqual('', out)
229
244
 
230
 
        os.chdir('tree')
231
 
        out, err = self.run_bzr('annotate empty')
 
245
    def test_annotate_removed_file(self):
 
246
        tree = self.make_branch_and_tree('.')
 
247
        self.build_tree_contents([('empty', '')])
 
248
        tree.add('empty')
 
249
        tree.commit('add empty file')
 
250
        # delete the file.
 
251
        tree.remove('empty')
 
252
        tree.commit('remove empty file')
 
253
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
232
254
        self.assertEqual('', out)
233
255
 
234
256
    def test_annotate_empty_file_show_ids(self):
235
 
        tree = self.make_branch_and_tree('tree')
236
 
        self.build_tree_contents([('tree/empty', '')])
 
257
        tree = self.make_branch_and_tree('.')
 
258
        self.build_tree_contents([('empty', '')])
237
259
        tree.add('empty')
238
260
        tree.commit('add empty file')
239
 
 
240
 
        os.chdir('tree')
241
261
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
242
262
        self.assertEqual('', out)
243
263
 
244
264
    def test_annotate_nonexistant_file(self):
245
 
        tree = self.make_branch_and_tree('tree')
246
 
        self.build_tree(['tree/file'])
 
265
        tree = self.make_branch_and_tree('.')
 
266
        self.build_tree(['file'])
247
267
        tree.add(['file'])
248
268
        tree.commit('add a file')
249
 
 
250
 
        os.chdir('tree')
251
 
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
 
269
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
252
270
        self.assertEqual('', out)
253
271
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
254
272
 
255
273
    def test_annotate_without_workingtree(self):
256
 
        tree = self.make_branch_and_tree('branch')
257
 
        self.build_tree_contents([('branch/empty', '')])
 
274
        tree = self.make_branch_and_tree('.')
 
275
        self.build_tree_contents([('empty', '')])
258
276
        tree.add('empty')
259
277
        tree.commit('add empty file')
260
278
        bzrdir = tree.branch.bzrdir
261
279
        bzrdir.destroy_workingtree()
262
280
        self.assertFalse(bzrdir.has_workingtree())
 
281
        out, err = self.run_bzr(['annotate', 'empty'])
 
282
        self.assertEqual('', out)
263
283
 
264
 
        os.chdir('branch')
265
 
        out, err = self.run_bzr('annotate empty')
266
 
        self.assertEqual('', out)
 
284
    def test_annotate_directory(self):
 
285
        """Test --directory option"""
 
286
        wt = self.make_branch_and_tree('a')
 
287
        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
 
288
        wt.add(['hello.txt'])
 
289
        wt.commit('commit', committer='test@user')
 
290
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
 
291
        self.assertEqualDiff('1   test@us | my helicopter\n', out)