/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 dir.py

Eliminate (duplicate) git_ prefix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
28
28
lazy_import(globals(), """
29
29
from bzrlib.plugins.git import (
30
30
    errors,
31
 
    git_branch,
32
 
    git_repository,
33
 
    git_workingtree,
 
31
    branch,
 
32
    repository,
 
33
    workingtree,
34
34
    )
35
35
""")
36
36
 
64
64
class GitDir(bzrdir.BzrDir):
65
65
    """An adapter to the '.git' dir used by git."""
66
66
 
67
 
    _gitrepository_class = git_repository.GitRepository
 
67
    _gitrepository_class = repository.GitRepository
68
68
 
69
69
    def __init__(self, transport, lockfiles, gitrepo, format):
70
70
        self._format = format
96
96
            head = None
97
97
        else:
98
98
            head = repo._git.heads[0].commit.id
99
 
        return git_branch.GitBranch(self, repo, head, 
 
99
        return branch.GitBranch(self, repo, head, 
100
100
                                    self.root_transport.base, self._lockfiles)
101
101
 
102
102
    def open_repository(self, shared=False):
108
108
            loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
109
109
            raise errors.bzr_errors.NoWorkingTree(loc)
110
110
        else:
111
 
            return git_workingtree.GitWorkingTree(self, self.open_repository(), 
 
111
            return workingtree.GitWorkingTree(self, self.open_repository(), 
112
112
                                                  self.open_branch())
113
113
 
114
114
    def cloning_metadir(self):