65
73
self._transaction = None
66
74
self._lock_mode = None
68
75
self._transport = transport
71
class GitDir(bzrdir.BzrDir):
76
if LockWarner is None:
80
self._lock_warner = LockWarner(repr(self))
83
class GitDir(ControlDir):
72
84
"""An adapter to the '.git' dir used by git."""
74
86
def is_supported(self):
89
def can_convert_format(self):
77
92
def cloning_metadir(self, stacked=False):
78
return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
93
return format_registry.make_bzrdir("default")
95
def _branch_name_to_ref(self, name):
96
raise NotImplementedError(self._branch_name_to_ref)
98
if bzrlib_version >= (2, 2):
99
def open_branch(self, name=None, unsupported=False,
100
ignore_fallbacks=None):
101
return self._open_branch(name=name,
102
ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
104
def open_branch(self, ignore_fallbacks=None, unsupported=False):
105
return self._open_branch(name=None,
106
ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
81
109
class LocalGitDir(GitDir):
82
110
"""An adapter to the '.git' dir used by git."""
84
_gitrepository_class = repository.LocalGitRepository
112
def _get_gitrepository_class(self):
113
from bzrlib.plugins.git.repository import LocalGitRepository
114
return LocalGitRepository
116
_gitrepository_class = property(_get_gitrepository_class)
119
def user_transport(self):
120
return self.root_transport
123
def control_transport(self):
124
return self.transport
86
126
def __init__(self, transport, lockfiles, gitrepo, format):
87
127
self._format = format
88
128
self.root_transport = transport
129
self._mode_check_done = False
89
130
self._git = gitrepo
91
132
self.transport = transport
93
134
self.transport = transport.clone('.git')
94
135
self._lockfiles = lockfiles
96
def get_branch_transport(self, branch_format):
136
self._mode_check_done = None
138
def _branch_name_to_ref(self, name):
139
from bzrlib.plugins.git.refs import branch_name_to_ref
140
ref = branch_name_to_ref(name, None)
142
from dulwich.repo import SYMREF
143
refcontents = self._git.refs.read_ref(ref)
144
if refcontents.startswith(SYMREF):
145
ref = refcontents[len(SYMREF):]
148
def is_control_filename(self, filename):
149
return filename == '.git' or filename.startswith('.git/')
151
def get_branch_transport(self, branch_format, name=None):
97
152
if branch_format is None:
98
153
return self.transport
99
if isinstance(branch_format, LocalGitBzrDirFormat):
100
return self.transport
101
raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
103
get_repository_transport = get_branch_transport
104
get_workingtree_transport = get_branch_transport
106
def open_branch(self, ignored=None):
154
if isinstance(branch_format, LocalGitControlDirFormat):
155
return self.transport
156
raise bzr_errors.IncompatibleFormat(branch_format, self._format)
158
def get_repository_transport(self, format):
160
return self.transport
161
if isinstance(format, LocalGitControlDirFormat):
162
return self.transport
163
raise bzr_errors.IncompatibleFormat(format, self._format)
165
def get_workingtree_transport(self, format):
167
return self.transport
168
if isinstance(format, LocalGitControlDirFormat):
169
return self.transport
170
raise bzr_errors.IncompatibleFormat(format, self._format)
172
def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
107
173
"""'create' a branch for this dir."""
108
174
repo = self.open_repository()
109
return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
175
from bzrlib.plugins.git.branch import LocalGitBranch
176
return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
179
def destroy_branch(self, name=None):
180
refname = self._branch_name_to_ref(name)
181
if not refname in self._git.refs:
182
raise bzr_errors.NotBranchError(self.root_transport.base,
184
del self._git.refs[refname]
186
def destroy_repository(self):
187
raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
189
def destroy_workingtree(self):
190
raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
192
def needs_format_conversion(self, format=None):
193
return not isinstance(self._format, format.__class__)
195
def list_branches(self):
197
for name in self._git.get_refs():
198
if name.startswith("refs/heads/"):
199
ret.append(self.open_branch(name=name))
111
202
def open_repository(self, shared=False):
112
203
"""'open' a repository for this dir."""
113
204
return self._gitrepository_class(self, self._lockfiles)
115
206
def open_workingtree(self, recommend_upgrade=True):
117
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
118
raise errors.bzr_errors.NoWorkingTree(loc)
120
return workingtree.GitWorkingTree(self, self.open_repository(),
207
if not self._git.bare:
208
from dulwich.errors import NoIndexPresent
209
repo = self.open_repository()
211
index = repo._git.open_index()
212
except NoIndexPresent:
215
from bzrlib.plugins.git.workingtree import GitWorkingTree
217
branch = self.open_branch()
218
except bzr_errors.NotBranchError:
221
return GitWorkingTree(self, repo, branch, index)
222
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
223
raise bzr_errors.NoWorkingTree(loc)
123
225
def create_repository(self, shared=False):
124
226
return self.open_repository()
127
class GitBzrDirFormat(bzrdir.BzrDirFormat):
128
_lock_class = TransportLock
130
def is_supported(self):
134
class LocalGitBzrDirFormat(GitBzrDirFormat):
135
"""The .git directory control format."""
137
_gitdir_class = LocalGitDir
140
def _known_formats(self):
141
return set([LocalGitBzrDirFormat()])
143
def open(self, transport, _found=None):
144
"""Open this directory.
147
from bzrlib.plugins.git import git
148
# we dont grok readonly - git isn't integrated with transport.
150
if url.startswith('readonly+'):
151
url = url[len('readonly+'):]
154
gitrepo = git.repo.Repo(transport.local_abspath("."))
155
except errors.bzr_errors.NotLocalUrl:
156
raise errors.bzr_errors.NotBranchError(path=transport.base)
157
lockfiles = GitLockableFiles(transport, GitLock())
158
return self._gitdir_class(transport, lockfiles, gitrepo, self)
161
def probe_transport(klass, transport):
162
"""Our format is present if the transport ends in '.not/'."""
163
from bzrlib.plugins.git import git
164
# little ugly, but works
166
# delegate to the main opening code. This pays a double rtt cost at the
167
# moment, so perhaps we want probe_transport to return the opened thing
168
# rather than an openener ? or we could return a curried thing with the
169
# dir to open already instantiated ? Needs more thought.
171
format.open(transport)
173
except git.errors.NotGitRepository, e:
174
raise errors.bzr_errors.NotBranchError(path=transport.base)
175
raise errors.bzr_errors.NotBranchError(path=transport.base)
177
def get_format_description(self):
178
return "Local Git Repository"
180
def get_format_string(self):
181
return "Local Git Repository"
183
def initialize_on_transport(self, transport):
184
from bzrlib.transport.local import LocalTransport
185
from bzrlib.plugins.git import git
187
if not isinstance(transport, LocalTransport):
188
raise NotImplementedError(self.initialize,
189
"Can't create Git Repositories/branches on "
190
"non-local transports")
192
git.repo.Repo.create(transport.local_abspath("."))
193
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 errors.git_errors.GitProtocolError:
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)
228
def create_branch(self, name=None):
229
refname = self._branch_name_to_ref(name)
230
from dulwich.protocol import ZERO_SHA
231
self._git.refs[refname or "HEAD"] = ZERO_SHA
232
return self.open_branch(name)
234
def backup_bzrdir(self):
236
self.root_transport.copy_tree(".git", ".git.backup")
237
return (self.root_transport.abspath(".git"),
238
self.root_transport.abspath(".git.backup"))
240
raise bzr_errors.BzrError("Unable to backup bare repositories")
242
def create_workingtree(self, revision_id=None, from_branch=None,
243
accelerator_tree=None, hardlink=False):
245
raise bzr_errors.BzrError("Can't create working tree in a bare repo")
246
from dulwich.index import write_index
247
from dulwich.pack import SHA1Writer
248
f = open(self.transport.local_abspath("index"), 'w+')
254
return self.open_workingtree()
256
def find_repository(self):
257
"""Find the repository that should be used.
259
This does not require a branch as we use it to find the repo for
260
new branches as well as to hook existing branches up to their
263
return self.open_repository()
265
def _find_creation_modes(self):
266
"""Determine the appropriate modes for files and directories.
268
They're always set to be consistent with the base directory,
269
assuming that this transport allows setting modes.
271
# TODO: Do we need or want an option (maybe a config setting) to turn
272
# this off or override it for particular locations? -- mbp 20080512
273
if self._mode_check_done:
275
self._mode_check_done = True
277
st = self.transport.stat('.')
278
except TransportNotPossible:
279
self._dir_mode = None
280
self._file_mode = None
282
# Check the directory mode, but also make sure the created
283
# directories and files are read-write for this user. This is
284
# mostly a workaround for filesystems which lie about being able to
285
# write to a directory (cygwin & win32)
286
if (st.st_mode & 07777 == 00000):
287
# FTP allows stat but does not return dir/file modes
288
self._dir_mode = None
289
self._file_mode = None
291
self._dir_mode = (st.st_mode & 07777) | 00700
292
# Remove the sticky and execute bits for files
293
self._file_mode = self._dir_mode & ~07111
295
def _get_file_mode(self):
296
"""Return Unix mode for newly created files, or None.
298
if not self._mode_check_done:
299
self._find_creation_modes()
300
return self._file_mode
302
def _get_dir_mode(self):
303
"""Return Unix mode for newly created directories, or None.
305
if not self._mode_check_done:
306
self._find_creation_modes()
307
return self._dir_mode
added
removed
dir.py
