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

Implement GitLock.peek().

Show diffs side-by-side

added added

removed removed

Lines of Context:
git_dir.py
16
16
 
17
17
"""An adapter between a Git control dir and a Bazaar BzrDir"""
18
18
 
19
 
import git, os
20
 
 
21
 
import bzrlib
22
19
from bzrlib.lazy_import import lazy_import
23
20
from bzrlib import (
24
21
    bzrdir,
27
24
    )
28
25
 
29
26
lazy_import(globals(), """
30
 
from bzrlib.lockable_files import TransportLock
31
27
from bzrlib.plugins.git import (
32
28
    errors,
33
 
    branch,
34
 
    repository,
35
 
    workingtree,
 
29
    git_branch,
 
30
    git_repository,
36
31
    )
37
32
""")
38
33
 
40
35
class GitLock(object):
41
36
    """A lock that thunks through to Git."""
42
37
 
43
 
    def lock_write(self, token=None):
 
38
    def lock_write(self):
44
39
        pass
45
40
 
46
41
    def lock_read(self):
66
61
class GitDir(bzrdir.BzrDir):
67
62
    """An adapter to the '.git' dir used by git."""
68
63
 
69
 
    _gitrepository_class = repository.GitRepository
 
64
    _gitrepository_class = git_repository.GitRepository
70
65
 
71
 
    def __init__(self, transport, lockfiles, gitrepo, format):
 
66
    def __init__(self, transport, lockfiles, format):
72
67
        self._format = format
73
68
        self.root_transport = transport
74
 
        self._git = gitrepo
75
 
        if gitrepo.bare:
76
 
            self.transport = transport
77
 
        else:
78
 
            self.transport = transport.clone('.git')
 
69
        self.transport = transport.clone('.git')
79
70
        self._lockfiles = lockfiles
80
71
 
81
72
    def get_branch_transport(self, branch_format):
98
89
            head = None
99
90
        else:
100
91
            head = repo._git.heads[0].commit.id
101
 
        return branch.GitBranch(self, repo, head, 
 
92
        return git_branch.GitBranch(self, repo, head, 
102
93
                                    self.root_transport.base, self._lockfiles)
103
94
 
104
95
    def open_repository(self, shared=False):
106
97
        return self._gitrepository_class(self, self._lockfiles)
107
98
 
108
99
    def open_workingtree(self, recommend_upgrade=True):
109
 
        if self._git.bare:
110
 
            loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
111
 
            raise errors.bzr_errors.NoWorkingTree(loc)
112
 
        else:
113
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
114
 
                                                  self.open_branch())
115
 
 
116
 
    def cloning_metadir(self, stacked=False):
117
 
        if stacked:
118
 
            return bzrlib.bzrdir.format_registry.make_bzrdir("pack-0.92")
119
 
        else:
120
 
            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6")
121
 
 
122
 
    def create_repository(self, shared=False):
123
 
        return self.open_repository()
 
100
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
 
101
        raise errors.bzr_errors.NoWorkingTree(loc)
 
102
 
 
103
    def cloning_metadir(self):
 
104
        return bzrdir.BzrDirFormat.get_default_format()
124
105
 
125
106
 
126
107
class GitBzrDirFormat(bzrdir.BzrDirFormat):
127
108
    """The .git directory control format."""
128
109
 
129
110
    _gitdir_class = GitDir
130
 
    _lock_class = TransportLock
131
111
 
132
112
    @classmethod
133
113
    def _known_formats(self):
134
114
        return set([GitBzrDirFormat()])
135
115
 
136
 
    def open(self, transport, _found=None):
 
116
    def open(self, transport, _create=False, _found=None):
137
117
        """Open this directory.
138
118
 
 
119
        :param _create: create the git dir on the fly. private to GitDirFormat.
139
120
        """
140
121
        # we dont grok readonly - git isn't integrated with transport.
141
122
        url = transport.base
142
123
        if url.startswith('readonly+'):
143
124
            url = url[len('readonly+'):]
144
 
 
145
 
        try:
146
 
            gitrepo = git.repo.Repo(transport.local_abspath("."))
147
 
        except errors.bzr_errors.NotLocalUrl:
 
125
        if not transport.has('.git'):
148
126
            raise errors.bzr_errors.NotBranchError(path=transport.base)
149
127
        lockfiles = GitLockableFiles(GitLock())
150
 
        return self._gitdir_class(transport, lockfiles, gitrepo, self)
 
128
        return self._gitdir_class(transport, lockfiles, self)
151
129
 
152
130
    @classmethod
153
131
    def probe_transport(klass, transport):
168
146
    def get_format_description(self):
169
147
        return "Local Git Repository"
170
148
 
171
 
    def get_format_string(self):
172
 
        return "Local Git Repository"
173
 
 
174
 
    def initialize_on_transport(self, transport):
175
 
        from bzrlib.transport.local import LocalTransport
176
 
 
177
 
        if not isinstance(transport, LocalTransport):
178
 
            raise NotImplementedError(self.initialize, 
179
 
                "Can't create Git Repositories/branches on "
180
 
                "non-local transports")
181
 
 
182
 
        git.repo.Repo.create(transport.local_abspath(".")) 
183
 
        return self.open(transport)
184
 
 
185
149
 
186
150
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)