← 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: Jelmer Vernooij
  • Date: 2011-10-14 13:56:45 UTC
  • mfrom: (6215 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111014135645-phc3q3y21k2ks0s2
Merge bzr.dev.

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
28
 
 
29
 
from bzrlib.branch import Branch
30
 
from bzrlib.config import extract_email_address
31
 
from bzrlib.tests import TestCaseWithTransport
32
 
 
33
 
 
34
 
class TestAnnotate(TestCaseWithTransport):
 
27
from bzrlib import (
 
28
    config,
 
29
    tests,
 
30
    )
 
31
 
 
32
from bzrlib.urlutils import joinpath
 
33
 
 
34
 
 
35
class TestAnnotate(tests.TestCaseWithTransport):
35
36
 
36
37
    def setUp(self):
37
38
        super(TestAnnotate, self).setUp()
139
140
        out, err = self.run_bzr('annotate hello.txt -r 10',
140
141
                                retcode=3)
141
142
        self.assertEqual('', out)
142
 
        self.assertContainsRe(err, 'Requested revision: \'10\' does not exist')
 
143
        self.assertContainsRe(err, "Requested revision: '10' does not exist")
143
144
 
144
145
    def test_annotate_cmd_two_revisions(self):
145
146
        out, err = self.run_bzr('annotate hello.txt -r1..2',
150
151
                         err)
151
152
 
152
153
 
153
 
class TestSimpleAnnotate(TestCaseWithTransport):
 
154
class TestSimpleAnnotate(tests.TestCaseWithTransport):
154
155
    """Annotate tests with no complex setup."""
155
156
 
156
 
    def _setup_edited_file(self):
 
157
    def _setup_edited_file(self, relpath='.'):
157
158
        """Create a tree with a locally edited file."""
158
 
        tree = self.make_branch_and_tree('.')
159
 
        self.build_tree_contents([('file', 'foo\ngam\n')])
 
159
        tree = self.make_branch_and_tree(relpath)
 
160
        file_relpath = joinpath(relpath, 'file')
 
161
        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
160
162
        tree.add('file')
161
163
        tree.commit('add file', committer="test@host", rev_id="rev1")
162
 
        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
163
 
        tree.branch.get_config().set_user_option('email', 'current@host2')
 
164
        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
 
165
        return tree
 
166
 
 
167
    def test_annotate_cmd_revspec_branch(self):
 
168
        tree = self._setup_edited_file('trunk')
 
169
        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')
 
172
        self.assertEqual('', err)
 
173
        self.assertEqual(
 
174
            '1   test@ho | foo\n'
 
175
            '            | gam\n',
 
176
            out)
164
177
 
165
178
    def test_annotate_edited_file(self):
166
179
        tree = self._setup_edited_file()
 
180
        tree.branch.get_config().set_user_option('email', 'current@host2')
167
181
        out, err = self.run_bzr('annotate file')
168
182
        self.assertEqual(
169
183
            '1   test@ho | foo\n'
171
185
            '1   test@ho | gam\n',
172
186
            out)
173
187
 
 
188
    def test_annotate_edited_file_no_default(self):
 
189
        # Ensure that when no username is available annotate still works.
 
190
        self.overrideEnv('EMAIL', None)
 
191
        self.overrideEnv('BZR_EMAIL', None)
 
192
        # Also, make sure that it's not inferred from mailname.
 
193
        self.overrideAttr(config, '_auto_user_id',
 
194
            lambda: (None, None))
 
195
        tree = self._setup_edited_file()
 
196
        out, err = self.run_bzr('annotate file')
 
197
        self.assertEqual(
 
198
            '1   test@ho | foo\n'
 
199
            '2?  local u | bar\n'
 
200
            '1   test@ho | gam\n',
 
201
            out)
 
202
 
174
203
    def test_annotate_edited_file_show_ids(self):
175
204
        tree = self._setup_edited_file()
 
205
        tree.branch.get_config().set_user_option('email', 'current@host2')
176
206
        out, err = self.run_bzr('annotate file --show-ids')
177
207
        self.assertEqual(
178
208
            '    rev1 | foo\n'
197
227
        tree.merge_from_branch(tree.branch, "rev1.1.1")
198
228
        # edit the file to be 'resolved' and have a further local edit
199
229
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
 
230
        return tree
200
231
 
201
232
    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())
 
233
        wt = self._create_merged_file()
 
234
        out, err = self.run_bzr(['annotate', 'file'])
 
235
        email = config.extract_email_address(wt.branch.get_config().username())
205
236
        self.assertEqual(
206
237
            '3?    %-7s | local\n'
207
238
            '1     test@ho | foo\n'
212
243
 
213
244
    def test_annotated_edited_merged_file_ids(self):
214
245
        self._create_merged_file()
215
 
        out, err = self.run_bzr('annotate file --show-ids')
 
246
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
216
247
        self.assertEqual(
217
248
            'current: | local\n'
218
249
            '    rev1 | foo\n'
222
253
            out)
223
254
 
224
255
    def test_annotate_empty_file(self):
225
 
        tree = self.make_branch_and_tree('tree')
226
 
        self.build_tree_contents([('tree/empty', '')])
 
256
        tree = self.make_branch_and_tree('.')
 
257
        self.build_tree_contents([('empty', '')])
227
258
        tree.add('empty')
228
259
        tree.commit('add empty file')
 
260
        out, err = self.run_bzr(['annotate', 'empty'])
 
261
        self.assertEqual('', out)
229
262
 
230
 
        os.chdir('tree')
231
 
        out, err = self.run_bzr('annotate empty')
 
263
    def test_annotate_removed_file(self):
 
264
        tree = self.make_branch_and_tree('.')
 
265
        self.build_tree_contents([('empty', '')])
 
266
        tree.add('empty')
 
267
        tree.commit('add empty file')
 
268
        # delete the file.
 
269
        tree.remove('empty')
 
270
        tree.commit('remove empty file')
 
271
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
232
272
        self.assertEqual('', out)
233
273
 
234
274
    def test_annotate_empty_file_show_ids(self):
235
 
        tree = self.make_branch_and_tree('tree')
236
 
        self.build_tree_contents([('tree/empty', '')])
 
275
        tree = self.make_branch_and_tree('.')
 
276
        self.build_tree_contents([('empty', '')])
237
277
        tree.add('empty')
238
278
        tree.commit('add empty file')
239
 
 
240
 
        os.chdir('tree')
241
279
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
242
280
        self.assertEqual('', out)
243
281
 
244
282
    def test_annotate_nonexistant_file(self):
245
 
        tree = self.make_branch_and_tree('tree')
246
 
        self.build_tree(['tree/file'])
 
283
        tree = self.make_branch_and_tree('.')
 
284
        self.build_tree(['file'])
247
285
        tree.add(['file'])
248
286
        tree.commit('add a file')
249
 
 
250
 
        os.chdir('tree')
251
 
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
 
287
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
252
288
        self.assertEqual('', out)
253
289
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
254
290
 
255
291
    def test_annotate_without_workingtree(self):
256
 
        tree = self.make_branch_and_tree('branch')
257
 
        self.build_tree_contents([('branch/empty', '')])
 
292
        tree = self.make_branch_and_tree('.')
 
293
        self.build_tree_contents([('empty', '')])
258
294
        tree.add('empty')
259
295
        tree.commit('add empty file')
260
296
        bzrdir = tree.branch.bzrdir
261
297
        bzrdir.destroy_workingtree()
262
298
        self.assertFalse(bzrdir.has_workingtree())
 
299
        out, err = self.run_bzr(['annotate', 'empty'])
 
300
        self.assertEqual('', out)
263
301
 
264
 
        os.chdir('branch')
265
 
        out, err = self.run_bzr('annotate empty')
266
 
        self.assertEqual('', out)
 
302
    def test_annotate_directory(self):
 
303
        """Test --directory option"""
 
304
        wt = self.make_branch_and_tree('a')
 
305
        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
 
306
        wt.add(['hello.txt'])
 
307
        wt.commit('commit', committer='test@user')
 
308
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
 
309
        self.assertEqualDiff('1   test@us | my helicopter\n', out)