58
def validate_token(self, token):
48
62
class GitLockableFiles(lockable_files.LockableFiles):
49
63
"""Git specific lockable files abstraction."""
51
def __init__(self, lock):
65
def __init__(self, transport, lock):
53
67
self._transaction = None
54
68
self._lock_mode = None
55
69
self._lock_count = 0
70
self._transport = transport
58
73
class GitDir(bzrdir.BzrDir):
59
74
"""An adapter to the '.git' dir used by git."""
61
def __init__(self, transport, lockfiles, format):
76
def is_supported(self):
79
def cloning_metadir(self, stacked=False):
80
return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
83
class LocalGitDir(GitDir):
84
"""An adapter to the '.git' dir used by git."""
86
_gitrepository_class = repository.LocalGitRepository
88
def __init__(self, transport, lockfiles, gitrepo, format):
62
89
self._format = format
63
90
self.root_transport = transport
64
self.transport = transport.clone('.git')
93
self.transport = transport
95
self.transport = transport.clone('.git')
65
96
self._lockfiles = lockfiles
67
98
def get_branch_transport(self, branch_format):
68
99
if branch_format is None:
69
100
return self.transport
70
if isinstance(branch_format, GitBzrDirFormat):
101
if isinstance(branch_format, LocalGitBzrDirFormat):
71
102
return self.transport
72
103
raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
74
105
get_repository_transport = get_branch_transport
75
106
get_workingtree_transport = get_branch_transport
77
def is_supported(self):
80
108
def open_branch(self, ignored=None):
81
"""'crate' a branch for this dir."""
82
return git_branch.GitBranch(self, self._lockfiles)
109
"""'create' a branch for this dir."""
110
repo = self.open_repository()
111
return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
84
113
def open_repository(self, shared=False):
85
114
"""'open' a repository for this dir."""
86
return git_repository.GitRepository(self, self._lockfiles)
115
return self._gitrepository_class(self, self._lockfiles)
88
def open_workingtree(self):
117
def open_workingtree(self, recommend_upgrade=True):
118
if (not self._git.bare and
119
os.path.exists(os.path.join(self._git.controldir(), "index"))):
120
return workingtree.GitWorkingTree(self, self.open_repository(),
89
122
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
90
123
raise errors.bzr_errors.NoWorkingTree(loc)
93
class GitBzrDirFormat(bzrdir.BzrDirFormat):
94
"""The .git directory control format."""
97
def _known_formats(self):
98
return set([GitBzrDirFormat()])
100
def open(self, transport, _create=False, _found=None):
101
"""Open this directory.
103
:param _create: create the git dir on the fly. private to GitDirFormat.
105
# we dont grok readonly - git isn't integrated with transport.
107
if url.startswith('readonly+'):
108
url = url[len('readonly+'):]
109
path = urlutils.local_path_from_url(url)
110
if not transport.has('.git'):
111
raise errors.bzr_errors.NotBranchError(path=transport.base)
112
lockfiles = GitLockableFiles(GitLock())
113
return GitDir(transport, lockfiles, self)
116
def probe_transport(klass, transport):
117
"""Our format is present if the transport ends in '.not/'."""
118
# little ugly, but works
120
# delegate to the main opening code. This pays a double rtt cost at the
121
# moment, so perhaps we want probe_transport to return the opened thing
122
# rather than an openener ? or we could return a curried thing with the
123
# dir to open already instantiated ? Needs more thought.
125
format.open(transport)
128
raise errors.bzr_errors.NotBranchError(path=transport.base)
129
raise errors.bzr_errors.NotBranchError(path=transport.base)
132
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)
125
def create_repository(self, shared=False):
126
return self.open_repository()
added
removed
dir.py
