65
75
self._transaction = None
66
76
self._lock_mode = None
68
77
self._transport = transport
71
class GitDir(bzrdir.BzrDir):
78
if LockWarner is None:
82
self._lock_warner = LockWarner(repr(self))
85
class GitDirConfig(object):
87
def get_default_stack_on(self):
90
def set_default_stack_on(self, value):
91
raise bzr_errors.BzrError("Cannot set configuration")
94
class GitControlDirFormat(ControlDirFormat):
96
_lock_class = lockable_files.TransportLock
98
colocated_branches = True
99
fixed_components = True
101
def __eq__(self, other):
102
return type(self) == type(other)
104
def is_supported(self):
107
def network_name(self):
111
class GitDir(ControlDir):
72
112
"""An adapter to the '.git' dir used by git."""
74
114
def is_supported(self):
117
def can_convert_format(self):
120
def break_lock(self):
77
123
def cloning_metadir(self, stacked=False):
124
return format_registry.make_bzrdir("default")
126
def checkout_metadir(self, stacked=False):
127
return format_registry.make_bzrdir("default")
129
def _branch_name_to_ref(self, name):
130
raise NotImplementedError(self._branch_name_to_ref)
132
def get_config(self):
133
return GitDirConfig()
135
def _available_backup_name(self, base):
136
return osutils.available_backup_name(base, self.root_transport.has)
138
def sprout(self, url, revision_id=None, force_new_repo=False,
139
recurse='down', possible_transports=None,
140
accelerator_tree=None, hardlink=False, stacked=False,
141
source_branch=None, create_tree_if_local=True):
142
from bzrlib.repository import InterRepository
143
from bzrlib.transport.local import LocalTransport
144
from bzrlib.transport import get_transport
145
target_transport = get_transport(url, possible_transports)
146
target_transport.ensure_base()
147
cloning_format = self.cloning_metadir()
148
# Create/update the result branch
149
result = cloning_format.initialize_on_transport(target_transport)
150
source_branch = self.open_branch()
151
source_repository = self.find_repository()
153
result_repo = result.find_repository()
154
except bzr_errors.NoRepositoryPresent:
155
result_repo = result.create_repository()
156
target_is_empty = True
158
target_is_empty = None # Unknown
79
return bzrlib.bzrdir.format_registry.make_bzrdir("pack-0.92")
81
return bzrlib.bzrdir.format_registry.make_bzrdir("1.6")
160
raise bzr_errors.IncompatibleRepositories(source_repository, result_repo)
161
interrepo = InterRepository.get(source_repository, result_repo)
163
if revision_id is not None:
164
determine_wants = interrepo.get_determine_wants_revids(
165
[revision_id], include_tags=True)
167
determine_wants = interrepo.determine_wants_all
168
interrepo.fetch_objects(determine_wants=determine_wants,
169
mapping=source_branch.mapping)
170
result_branch = source_branch.sprout(result,
171
revision_id=revision_id, repository=result_repo)
172
if (create_tree_if_local and isinstance(target_transport, LocalTransport)
173
and (result_repo is None or result_repo.make_working_trees())):
174
wt = result.create_workingtree(accelerator_tree=accelerator_tree,
175
hardlink=hardlink, from_branch=result_branch)
178
if wt.path2id('') is None:
180
wt.set_root_id(self.open_workingtree.get_root_id())
181
except bzr_errors.NoWorkingTree:
187
def clone_on_transport(self, transport, revision_id=None,
188
force_new_repo=False, preserve_stacking=False, stacked_on=None,
189
create_prefix=False, use_existing_dir=True, no_tree=False):
190
"""See ControlDir.clone_on_transport."""
191
from bzrlib.repository import InterRepository
192
from bzrlib.plugins.git.mapping import default_mapping
194
format = BareLocalGitControlDirFormat()
196
format = LocalGitControlDirFormat()
197
(target_repo, target_controldir, stacking, repo_policy) = format.initialize_on_transport_ex(transport, use_existing_dir=use_existing_dir, create_prefix=create_prefix, force_new_repo=force_new_repo)
198
target_git_repo = target_repo._git
199
source_repo = self.open_repository()
200
source_git_repo = source_repo._git
201
interrepo = InterRepository.get(source_repo, target_repo)
202
if revision_id is not None:
203
determine_wants = interrepo.get_determine_wants_revids([revision_id], include_tags=True)
205
determine_wants = interrepo.determine_wants_all
206
(pack_hint, _, refs) = interrepo.fetch_objects(determine_wants,
207
mapping=default_mapping)
208
for name, val in refs.iteritems():
209
target_git_repo.refs[name] = val
210
lockfiles = GitLockableFiles(transport, GitLock())
211
return self.__class__(transport, lockfiles, target_git_repo, format)
213
def find_repository(self):
214
"""Find the repository that should be used.
216
This does not require a branch as we use it to find the repo for
217
new branches as well as to hook existing branches up to their
220
return self.open_repository()
223
class LocalGitControlDirFormat(GitControlDirFormat):
224
"""The .git directory control format."""
229
def _known_formats(self):
230
return set([LocalGitControlDirFormat()])
233
def repository_format(self):
234
from bzrlib.plugins.git.repository import GitRepositoryFormat
235
return GitRepositoryFormat()
237
def get_branch_format(self):
238
from bzrlib.plugins.git.branch import GitBranchFormat
239
return GitBranchFormat()
241
def open(self, transport, _found=None):
242
"""Open this directory.
245
from bzrlib.plugins.git.transportgit import TransportRepo
246
gitrepo = TransportRepo(transport)
247
lockfiles = GitLockableFiles(transport, GitLock())
248
return LocalGitDir(transport, lockfiles, gitrepo, self)
250
def get_format_description(self):
251
return "Local Git Repository"
253
def initialize_on_transport(self, transport):
254
from bzrlib.plugins.git.transportgit import TransportRepo
255
TransportRepo.init(transport, bare=self.bare)
256
return self.open(transport)
258
def initialize_on_transport_ex(self, transport, use_existing_dir=False,
259
create_prefix=False, force_new_repo=False, stacked_on=None,
260
stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
261
shared_repo=False, vfs_only=False):
262
def make_directory(transport):
265
def redirected(transport, e, redirection_notice):
266
trace.note(redirection_notice)
267
return transport._redirected_to(e.source, e.target)
269
transport = do_catching_redirections(make_directory, transport,
271
except bzr_errors.FileExists:
272
if not use_existing_dir:
274
except bzr_errors.NoSuchFile:
275
if not create_prefix:
277
transport.create_prefix()
278
controldir = self.initialize_on_transport(transport)
279
repository = controldir.open_repository()
280
repository.lock_write()
281
return (repository, controldir, False, CreateRepository(controldir))
283
def is_supported(self):
287
class BareLocalGitControlDirFormat(LocalGitControlDirFormat):
290
supports_workingtrees = False
292
def get_format_description(self):
293
return "Local Git Repository (bare)"
84
296
class LocalGitDir(GitDir):
85
297
"""An adapter to the '.git' dir used by git."""
87
_gitrepository_class = repository.LocalGitRepository
299
def _get_gitrepository_class(self):
300
from bzrlib.plugins.git.repository import LocalGitRepository
301
return LocalGitRepository
303
_gitrepository_class = property(_get_gitrepository_class)
306
def user_transport(self):
307
return self.root_transport
310
def control_transport(self):
311
return self.transport
89
313
def __init__(self, transport, lockfiles, gitrepo, format):
90
314
self._format = format
91
315
self.root_transport = transport
316
self._mode_check_done = False
92
317
self._git = gitrepo
94
319
self.transport = transport
96
321
self.transport = transport.clone('.git')
97
322
self._lockfiles = lockfiles
99
def get_branch_transport(self, branch_format):
323
self._mode_check_done = None
325
def _branch_name_to_ref(self, name):
326
from bzrlib.plugins.git.refs import branch_name_to_ref
327
ref = branch_name_to_ref(name, None)
329
from dulwich.repo import SYMREF
330
refcontents = self._git.refs.read_ref(ref)
331
if refcontents.startswith(SYMREF):
332
ref = refcontents[len(SYMREF):]
335
def is_control_filename(self, filename):
336
return (filename == '.git' or filename.startswith('.git/'))
338
def get_branch_transport(self, branch_format, name=None):
100
339
if branch_format is None:
101
340
return self.transport
102
if isinstance(branch_format, LocalGitBzrDirFormat):
103
return self.transport
104
raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
106
get_repository_transport = get_branch_transport
107
get_workingtree_transport = get_branch_transport
109
def open_branch(self, ignored=None):
341
if isinstance(branch_format, LocalGitControlDirFormat):
342
return self.transport
343
raise bzr_errors.IncompatibleFormat(branch_format, self._format)
345
def get_repository_transport(self, format):
347
return self.transport
348
if isinstance(format, LocalGitControlDirFormat):
349
return self.transport
350
raise bzr_errors.IncompatibleFormat(format, self._format)
352
def get_workingtree_transport(self, format):
354
return self.transport
355
if isinstance(format, LocalGitControlDirFormat):
356
return self.transport
357
raise bzr_errors.IncompatibleFormat(format, self._format)
359
def open_branch(self, name=None, unsupported=False, ignore_fallbacks=None):
110
360
"""'create' a branch for this dir."""
111
361
repo = self.open_repository()
112
return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
114
def open_repository(self, shared=False):
362
from bzrlib.plugins.git.branch import LocalGitBranch
363
return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
366
def destroy_branch(self, name=None):
367
refname = self._branch_name_to_ref(name)
368
if not refname in self._git.refs:
369
raise bzr_errors.NotBranchError(self.root_transport.base,
371
del self._git.refs[refname]
373
def destroy_repository(self):
374
raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
376
def destroy_workingtree(self):
377
raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
379
def needs_format_conversion(self, format=None):
380
return not isinstance(self._format, format.__class__)
382
def list_branches(self):
384
for name in self._git.get_refs():
385
if name.startswith("refs/heads/"):
386
ret.append(self.open_branch(name=name))
389
def open_repository(self):
115
390
"""'open' a repository for this dir."""
116
391
return self._gitrepository_class(self, self._lockfiles)
118
393
def open_workingtree(self, recommend_upgrade=True):
120
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
121
raise errors.bzr_errors.NoWorkingTree(loc)
123
return workingtree.GitWorkingTree(self, self.open_repository(),
394
if not self._git.bare:
395
from dulwich.errors import NoIndexPresent
396
repo = self.open_repository()
398
index = repo._git.open_index()
399
except NoIndexPresent:
402
from bzrlib.plugins.git.workingtree import GitWorkingTree
404
branch = self.open_branch()
405
except bzr_errors.NotBranchError:
408
return GitWorkingTree(self, repo, branch, index)
409
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
410
raise bzr_errors.NoWorkingTree(loc)
126
412
def create_repository(self, shared=False):
413
from bzrlib.plugins.git.repository import GitRepositoryFormat
415
raise bzr_errors.IncompatibleFormat(GitRepositoryFormat(), self._format)
127
416
return self.open_repository()
130
class GitBzrDirFormat(bzrdir.BzrDirFormat):
131
_lock_class = TransportLock
133
def is_supported(self):
137
class LocalGitBzrDirFormat(GitBzrDirFormat):
138
"""The .git directory control format."""
140
_gitdir_class = LocalGitDir
143
def _known_formats(self):
144
return set([LocalGitBzrDirFormat()])
146
def open(self, transport, _found=None):
147
"""Open this directory.
150
from bzrlib.plugins.git import git
151
# we dont grok readonly - git isn't integrated with transport.
153
if url.startswith('readonly+'):
154
url = url[len('readonly+'):]
157
gitrepo = git.repo.Repo(transport.local_abspath("."))
158
except errors.bzr_errors.NotLocalUrl:
159
raise errors.bzr_errors.NotBranchError(path=transport.base)
160
lockfiles = GitLockableFiles(transport, GitLock())
161
return self._gitdir_class(transport, lockfiles, gitrepo, self)
164
def probe_transport(klass, transport):
165
"""Our format is present if the transport ends in '.not/'."""
166
from bzrlib.plugins.git import git
167
# little ugly, but works
169
# delegate to the main opening code. This pays a double rtt cost at the
170
# moment, so perhaps we want probe_transport to return the opened thing
171
# rather than an openener ? or we could return a curried thing with the
172
# dir to open already instantiated ? Needs more thought.
174
format.open(transport)
176
except git.errors.NotGitRepository, e:
177
raise errors.bzr_errors.NotBranchError(path=transport.base)
178
raise errors.bzr_errors.NotBranchError(path=transport.base)
180
def get_format_description(self):
181
return "Local Git Repository"
183
def get_format_string(self):
184
return "Local Git Repository"
186
def initialize_on_transport(self, transport):
187
from bzrlib.transport.local import LocalTransport
188
from bzrlib.plugins.git import git
190
if not isinstance(transport, LocalTransport):
191
raise NotImplementedError(self.initialize,
192
"Can't create Git Repositories/branches on "
193
"non-local transports")
195
git.repo.Repo.create(transport.local_abspath("."))
196
return self.open(transport)
198
def is_supported(self):
202
class RemoteGitBzrDirFormat(GitBzrDirFormat):
203
"""The .git directory control format."""
206
def _known_formats(self):
207
return set([RemoteGitBzrDirFormat()])
209
def open(self, transport, _found=None):
210
"""Open this directory.
213
from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
214
if not isinstance(transport, GitSmartTransport):
215
raise errors.bzr_errors.NotBranchError(transport.base)
216
# we dont grok readonly - git isn't integrated with transport.
218
if url.startswith('readonly+'):
219
url = url[len('readonly+'):]
221
lockfiles = GitLockableFiles(transport, GitLock())
222
return RemoteGitDir(transport, lockfiles, self)
225
def probe_transport(klass, transport):
226
"""Our format is present if the transport ends in '.not/'."""
227
# little ugly, but works
229
from bzrlib.plugins.git.remote import GitSmartTransport
230
if not isinstance(transport, GitSmartTransport):
231
raise errors.bzr_errors.NotBranchError(transport.base)
232
# The only way to know a path exists and contains a valid repository
233
# is to do a request against it:
235
transport.fetch_pack(lambda x: [], None, lambda x: None,
236
lambda x: mutter("git: %s" % x))
237
except GitProtocolException, e:
238
raise errors.bzr_errors.NotBranchError(path=transport.base)
241
raise errors.bzr_errors.NotBranchError(path=transport.base)
243
def get_format_description(self):
244
return "Remote Git Repository"
246
def get_format_string(self):
247
return "Remote Git Repository"
249
def initialize_on_transport(self, transport):
250
raise errors.bzr_errors.UninitializableFormat(self)
418
def create_branch(self, name=None, repository=None):
419
refname = self._branch_name_to_ref(name)
420
from dulwich.protocol import ZERO_SHA
421
self._git.refs[refname or "HEAD"] = ZERO_SHA
422
return self.open_branch(name)
424
def backup_bzrdir(self):
426
self.root_transport.copy_tree(".git", ".git.backup")
427
return (self.root_transport.abspath(".git"),
428
self.root_transport.abspath(".git.backup"))
430
raise bzr_errors.BzrError("Unable to backup bare repositories")
432
def create_workingtree(self, revision_id=None, from_branch=None,
433
accelerator_tree=None, hardlink=False):
435
raise bzr_errors.UnsupportedOperation(self.create_workingtree, self)
436
from dulwich.index import write_index
437
from dulwich.pack import SHA1Writer
438
f = open(self.transport.local_abspath("index"), 'w+')
444
return self.open_workingtree()
446
def _find_or_create_repository(self, force_new_repo=None):
447
return self.create_repository(shared=False)
449
def _find_creation_modes(self):
450
"""Determine the appropriate modes for files and directories.
452
They're always set to be consistent with the base directory,
453
assuming that this transport allows setting modes.
455
# TODO: Do we need or want an option (maybe a config setting) to turn
456
# this off or override it for particular locations? -- mbp 20080512
457
if self._mode_check_done:
459
self._mode_check_done = True
461
st = self.transport.stat('.')
462
except bzr_errors.TransportNotPossible:
463
self._dir_mode = None
464
self._file_mode = None
466
# Check the directory mode, but also make sure the created
467
# directories and files are read-write for this user. This is
468
# mostly a workaround for filesystems which lie about being able to
469
# write to a directory (cygwin & win32)
470
if (st.st_mode & 07777 == 00000):
471
# FTP allows stat but does not return dir/file modes
472
self._dir_mode = None
473
self._file_mode = None
475
self._dir_mode = (st.st_mode & 07777) | 00700
476
# Remove the sticky and execute bits for files
477
self._file_mode = self._dir_mode & ~07111
479
def _get_file_mode(self):
480
"""Return Unix mode for newly created files, or None.
482
if not self._mode_check_done:
483
self._find_creation_modes()
484
return self._file_mode
486
def _get_dir_mode(self):
487
"""Return Unix mode for newly created directories, or None.
489
if not self._mode_check_done:
490
self._find_creation_modes()
491
return self._dir_mode
added
removed
dir.py
