56
def validate_token(self, token):
60
57
class GitLockableFiles(lockable_files.LockableFiles):
61
58
"""Git specific lockable files abstraction."""
63
def __init__(self, transport, lock):
60
def __init__(self, lock):
65
62
self._transaction = None
66
63
self._lock_mode = None
67
64
self._lock_count = 0
68
self._transport = transport
71
67
class GitDir(bzrdir.BzrDir):
72
68
"""An adapter to the '.git' dir used by git."""
74
def is_supported(self):
77
def cloning_metadir(self, stacked=False):
78
return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
81
class LocalGitDir(GitDir):
82
"""An adapter to the '.git' dir used by git."""
84
_gitrepository_class = repository.LocalGitRepository
70
_gitrepository_class = repository.GitRepository
86
72
def __init__(self, transport, lockfiles, gitrepo, format):
87
73
self._format = format
96
82
def get_branch_transport(self, branch_format):
97
83
if branch_format is None:
98
84
return self.transport
99
if isinstance(branch_format, LocalGitBzrDirFormat):
85
if isinstance(branch_format, GitBzrDirFormat):
100
86
return self.transport
101
87
raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
103
89
get_repository_transport = get_branch_transport
104
90
get_workingtree_transport = get_branch_transport
92
def is_supported(self):
106
95
def open_branch(self, ignored=None):
107
96
"""'create' a branch for this dir."""
108
97
repo = self.open_repository()
109
return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
98
if repo._git.heads == []:
101
head = repo._git.head()
102
return branch.GitBranch(self, repo, head,
103
self.root_transport.base, self._lockfiles)
111
105
def open_repository(self, shared=False):
112
106
"""'open' a repository for this dir."""
120
114
return workingtree.GitWorkingTree(self, self.open_repository(),
121
115
self.open_branch())
117
def cloning_metadir(self, stacked=False):
119
return bzrlib.bzrdir.format_registry.make_bzrdir("pack-0.92")
121
return bzrlib.bzrdir.format_registry.make_bzrdir("1.6")
123
123
def create_repository(self, shared=False):
124
124
return self.open_repository()
127
127
class GitBzrDirFormat(bzrdir.BzrDirFormat):
128
"""The .git directory control format."""
130
_gitdir_class = GitDir
128
131
_lock_class = TransportLock
130
def is_supported(self):
134
class LocalGitBzrDirFormat(GitBzrDirFormat):
135
"""The .git directory control format."""
137
_gitdir_class = LocalGitDir
140
134
def _known_formats(self):
141
return set([LocalGitBzrDirFormat()])
135
return set([GitBzrDirFormat()])
143
137
def open(self, transport, _found=None):
144
138
"""Open this directory.
154
148
gitrepo = git.repo.Repo(transport.local_abspath("."))
155
149
except errors.bzr_errors.NotLocalUrl:
156
150
raise errors.bzr_errors.NotBranchError(path=transport.base)
157
lockfiles = GitLockableFiles(transport, GitLock())
151
lockfiles = GitLockableFiles(GitLock())
158
152
return self._gitdir_class(transport, lockfiles, gitrepo, self)
161
155
def probe_transport(klass, transport):
162
156
"""Our format is present if the transport ends in '.not/'."""
163
from bzrlib.plugins.git import git
164
157
# little ugly, but works
166
159
# delegate to the main opening code. This pays a double rtt cost at the
192
185
git.repo.Repo.create(transport.local_abspath("."))
193
186
return self.open(transport)
195
def is_supported(self):
199
class RemoteGitBzrDirFormat(GitBzrDirFormat):
200
"""The .git directory control format."""
203
def _known_formats(self):
204
return set([RemoteGitBzrDirFormat()])
206
def open(self, transport, _found=None):
207
"""Open this directory.
210
from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
211
if not isinstance(transport, GitSmartTransport):
212
raise errors.bzr_errors.NotBranchError(transport.base)
213
# we dont grok readonly - git isn't integrated with transport.
215
if url.startswith('readonly+'):
216
url = url[len('readonly+'):]
218
lockfiles = GitLockableFiles(transport, GitLock())
219
return RemoteGitDir(transport, lockfiles, self)
222
def probe_transport(klass, transport):
223
"""Our format is present if the transport ends in '.not/'."""
224
# little ugly, but works
226
from bzrlib.plugins.git.remote import GitSmartTransport
227
if not isinstance(transport, GitSmartTransport):
228
raise errors.bzr_errors.NotBranchError(transport.base)
229
# The only way to know a path exists and contains a valid repository
230
# is to do a request against it:
232
transport.fetch_pack(lambda x: [], None, lambda x: None,
233
lambda x: mutter("git: %s" % x))
234
except GitProtocolException, e:
235
raise errors.bzr_errors.NotBranchError(path=transport.base)
238
raise errors.bzr_errors.NotBranchError(path=transport.base)
240
def get_format_description(self):
241
return "Remote Git Repository"
243
def get_format_string(self):
244
return "Remote Git Repository"
246
def initialize_on_transport(self, transport):
247
raise errors.bzr_errors.UninitializableFormat(self)
189
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)
added
removed
dir.py
