← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

[merge] jam-integration 1527, including branch-formats, help text, misc bug fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
33
33
from bzrlib.branch import Branch
34
34
from bzrlib.errors import BzrCommandError
35
35
from bzrlib.osutils import has_symlinks
36
 
from bzrlib.tests import TestCaseInTempDir, BzrTestBase
 
36
from bzrlib.tests import TestCaseWithTransport
37
37
from bzrlib.annotate import annotate_file
38
38
 
39
39
 
40
 
class TestAnnotate(TestCaseInTempDir):
 
40
class TestAnnotate(TestCaseWithTransport):
 
41
 
41
42
    def setUp(self):
42
43
        super(TestAnnotate, self).setUp()
43
 
        b = Branch.initialize(u'.')
 
44
        wt = self.make_branch_and_tree('.')
 
45
        b = wt.branch
44
46
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
45
47
                                  ('nomail.txt', 'nomail\n')])
46
 
        b.working_tree().add(['hello.txt'])
47
 
        b.working_tree().commit('add hello', 
 
48
        wt.add(['hello.txt'])
 
49
        wt.commit('add hello', 
48
50
                                committer='test@user')
49
 
        b.working_tree().add(['nomail.txt'])
50
 
        b.working_tree().commit('add nomail', committer='no mail')
 
51
        wt.add(['nomail.txt'])
 
52
        wt.commit('add nomail', committer='no mail')
51
53
 
52
54
    def test_help_annotate(self):
53
55
        """Annotate command exists"""