/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 tests/test_repository.py

Eliminate (duplicate) git_ prefix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_repository.py
21
21
from bzrlib import (
22
22
    errors,
23
23
    inventory,
24
 
    repository,
25
24
    revision,
26
25
    )
 
26
from bzrlib.repository import Repository
27
27
 
28
28
from bzrlib.plugins.git import tests
29
29
from bzrlib.plugins.git import (
30
 
    git_dir,
31
 
    git_repository,
 
30
    dir,
 
31
    repository,
32
32
    ids,
33
33
    )
34
34
 
41
41
    def test_open_existing(self):
42
42
        tests.run_git('init')
43
43
 
44
 
        repo = repository.Repository.open('.')
45
 
        self.assertIsInstance(repo, git_repository.GitRepository)
 
44
        repo = Repository.open('.')
 
45
        self.assertIsInstance(repo, repository.GitRepository)
46
46
 
47
47
    def test_has_git_repo(self):
48
48
        tests.run_git('init')
49
49
 
50
 
        repo = repository.Repository.open('.')
 
50
        repo = Repository.open('.')
51
51
        self.assertIsInstance(repo._git, git.repo.Repo)
52
52
 
53
53
    def test_get_revision(self):
63
63
 
64
64
        # Get the corresponding Revision object.
65
65
        revid = ids.convert_revision_id_git_to_bzr(commit_id)
66
 
        repo = repository.Repository.open('.')
 
66
        repo = Repository.open('.')
67
67
        rev = repo.get_revision(revid)
68
68
        self.assertIsInstance(rev, revision.Revision)
69
69
 
83
83
    def test_revision_tree(self):
84
84
        commit_id = self.simple_commit()
85
85
        revid = ids.convert_revision_id_git_to_bzr(commit_id)
86
 
        repo = repository.Repository.open('.')
 
86
        repo = Repository.open('.')
87
87
        tree = repo.revision_tree(revid)
88
88
        self.assertEquals(tree.get_revision_id(), revid)
89
89
        self.assertEquals("text\n", tree.get_file_text(tree.path2id("data")))
96
96
 
97
97
        # Get the corresponding Inventory object.
98
98
        revid = ids.convert_revision_id_git_to_bzr(commit_id)
99
 
        repo = repository.Repository.open('.')
 
99
        repo = Repository.open('.')
100
100
        inv = repo.get_inventory(revid)
101
101
        self.assertIsInstance(inv, inventory.Inventory)
102
102
        printed_inv = '\n'.join(
126
126
    def setUp(self):
127
127
        tests.TestCaseWithTransport.setUp(self)
128
128
        git.repo.Repo.create(self.test_dir)
129
 
        self.git_repo = repository.Repository.open(self.test_dir)
 
129
        self.git_repo = Repository.open(self.test_dir)
130
130
 
131
131
    def test_supports_rich_root(self):
132
132
        # GitRepository.supports_rich_root is False, at least for now.
172
172
 
173
173
    def setUp(self):
174
174
        super(GitRepositoryFormat, self).setUp()
175
 
        self.format = git_repository.GitFormat()
 
175
        self.format = repository.GitFormat()
176
176
 
177
177
    def test_get_format_description(self):
178
178
        self.assertEquals("Git Repository", self.format.get_format_description())