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
_gitrepository_class = git_repository.GitRepository
63
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):
64
89
self._format = format
65
90
self.root_transport = transport
66
self.transport = transport.clone('.git')
93
self.transport = transport
95
self.transport = transport.clone('.git')
67
96
self._lockfiles = lockfiles
69
98
def get_branch_transport(self, branch_format):
70
99
if branch_format is None:
71
100
return self.transport
72
if isinstance(branch_format, GitBzrDirFormat):
101
if isinstance(branch_format, LocalGitBzrDirFormat):
73
102
return self.transport
74
103
raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
76
105
get_repository_transport = get_branch_transport
77
106
get_workingtree_transport = get_branch_transport
79
def is_supported(self):
82
108
def open_branch(self, ignored=None):
83
"""'crate' a branch for this dir."""
84
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)
86
113
def open_repository(self, shared=False):
87
114
"""'open' a repository for this dir."""
88
115
return self._gitrepository_class(self, self._lockfiles)
90
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(),
91
122
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
92
123
raise errors.bzr_errors.NoWorkingTree(loc)
94
def cloning_metadir(self):
95
return bzrdir.BzrDirFormat.get_default_format()
98
class GitBzrDirFormat(bzrdir.BzrDirFormat):
99
"""The .git directory control format."""
101
_gitdir_class = GitDir
104
def _known_formats(self):
105
return set([GitBzrDirFormat()])
107
def open(self, transport, _create=False, _found=None):
108
"""Open this directory.
110
:param _create: create the git dir on the fly. private to GitDirFormat.
112
# we dont grok readonly - git isn't integrated with transport.
114
if url.startswith('readonly+'):
115
url = url[len('readonly+'):]
116
if not transport.has('.git'):
117
raise errors.bzr_errors.NotBranchError(path=transport.base)
118
lockfiles = GitLockableFiles(GitLock())
119
return self._gitdir_class(transport, lockfiles, self)
122
def probe_transport(klass, transport):
123
"""Our format is present if the transport ends in '.not/'."""
124
# little ugly, but works
126
# delegate to the main opening code. This pays a double rtt cost at the
127
# moment, so perhaps we want probe_transport to return the opened thing
128
# rather than an openener ? or we could return a curried thing with the
129
# dir to open already instantiated ? Needs more thought.
131
format.open(transport)
134
raise errors.bzr_errors.NotBranchError(path=transport.base)
135
raise errors.bzr_errors.NotBranchError(path=transport.base)
138
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)
125
def create_repository(self, shared=False):
126
return self.open_repository()
added
removed
dir.py
