71
80
self._lock_warner = LockWarner(repr(self))
74
class GitDir(bzrdir.BzrDir):
83
class GitDir(ControlDir):
75
84
"""An adapter to the '.git' dir used by git."""
77
86
def is_supported(self):
89
def can_convert_format(self):
80
92
def cloning_metadir(self, stacked=False):
81
return get_rich_root_format(stacked)
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)
84
109
class LocalGitDir(GitDir):
85
110
"""An adapter to the '.git' dir used by git."""
87
_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
89
126
def __init__(self, transport, lockfiles, gitrepo, format):
90
127
self._format = format
91
128
self.root_transport = transport
129
self._mode_check_done = False
92
130
self._git = gitrepo
94
132
self.transport = transport
97
135
self._lockfiles = lockfiles
98
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):]
100
148
def is_control_filename(self, filename):
101
149
return filename == '.git' or filename.startswith('.git/')
103
def get_branch_transport(self, branch_format):
151
def get_branch_transport(self, branch_format, name=None):
104
152
if branch_format is None:
105
153
return self.transport
106
if isinstance(branch_format, LocalGitBzrDirFormat):
107
return self.transport
108
raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
110
get_repository_transport = get_branch_transport
111
get_workingtree_transport = get_branch_transport
113
def open_branch(self, ignore_fallbacks=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):
114
173
"""'create' a branch for this dir."""
115
174
repo = self.open_repository()
116
return branch.LocalGitBranch(self, repo, "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))
118
202
def open_repository(self, shared=False):
119
203
"""'open' a repository for this dir."""
120
204
return self._gitrepository_class(self, self._lockfiles)
122
206
def open_workingtree(self, recommend_upgrade=True):
123
if not self._git.bare and self._git.has_index():
124
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)
126
222
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
127
raise errors.bzr_errors.NoWorkingTree(loc)
223
raise bzr_errors.NoWorkingTree(loc)
129
225
def create_repository(self, shared=False):
130
226
return self.open_repository()
132
def create_branch(self):
133
return self.open_branch()
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)
135
234
def backup_bzrdir(self):
136
235
if self._git.bare:
138
237
return (self.root_transport.abspath(".git"),
139
238
self.root_transport.abspath(".git.backup"))
141
raise errors.bzr_errors.BzrError("Unable to backup bare repositories")
240
raise bzr_errors.BzrError("Unable to backup bare repositories")
143
242
def create_workingtree(self, revision_id=None, from_branch=None,
144
243
accelerator_tree=None, hardlink=False):
145
244
if self._git.bare:
146
raise errors.bzr_errors.BzrError("Can't create working tree in a bare repo")
245
raise bzr_errors.BzrError("Can't create working tree in a bare repo")
147
246
from dulwich.index import write_index
148
write_index(self.root_transport.abspath(".git/index"), [])
247
from dulwich.pack import SHA1Writer
248
f = open(self.transport.local_abspath("index"), 'w+')
149
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