58
def validate_token(self, token):
51
62
class GitLockableFiles(lockable_files.LockableFiles):
52
63
"""Git specific lockable files abstraction."""
54
def __init__(self, lock):
65
def __init__(self, transport, lock):
56
67
self._transaction = None
57
68
self._lock_mode = None
58
69
self._lock_count = 0
70
self._transport = transport
61
73
class GitDir(bzrdir.BzrDir):
62
74
"""An adapter to the '.git' dir used by git."""
64
_gitrepository_class = git_repository.GitRepository
66
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):
67
89
self._format = format
68
90
self.root_transport = transport
69
self.transport = transport.clone('.git')
93
self.transport = transport
95
self.transport = transport.clone('.git')
70
96
self._lockfiles = lockfiles
72
98
def get_branch_transport(self, branch_format):
73
99
if branch_format is None:
74
100
return self.transport
75
if isinstance(branch_format, GitBzrDirFormat):
101
if isinstance(branch_format, LocalGitBzrDirFormat):
76
102
return self.transport
77
103
raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
79
105
get_repository_transport = get_branch_transport
80
106
get_workingtree_transport = get_branch_transport
82
def is_supported(self):
85
108
def open_branch(self, ignored=None):
86
109
"""'create' a branch for this dir."""
87
110
repo = self.open_repository()
88
if repo._git.heads == []:
91
head = repo._git.heads[0].commit.id
92
return git_branch.GitBranch(self, repo, head,
93
self.root_transport.base, self._lockfiles)
111
return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
95
113
def open_repository(self, shared=False):
96
114
"""'open' a repository for this dir."""
97
115
return self._gitrepository_class(self, self._lockfiles)
99
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(),
100
122
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
101
123
raise errors.bzr_errors.NoWorkingTree(loc)
103
def cloning_metadir(self):
104
return bzrdir.BzrDirFormat.get_default_format()
107
class GitBzrDirFormat(bzrdir.BzrDirFormat):
108
"""The .git directory control format."""
110
_gitdir_class = GitDir
113
def _known_formats(self):
114
return set([GitBzrDirFormat()])
116
def open(self, transport, _create=False, _found=None):
117
"""Open this directory.
119
:param _create: create the git dir on the fly. private to GitDirFormat.
121
# we dont grok readonly - git isn't integrated with transport.
123
if url.startswith('readonly+'):
124
url = url[len('readonly+'):]
125
if not transport.has('.git'):
126
raise errors.bzr_errors.NotBranchError(path=transport.base)
127
lockfiles = GitLockableFiles(GitLock())
128
return self._gitdir_class(transport, lockfiles, self)
131
def probe_transport(klass, transport):
132
"""Our format is present if the transport ends in '.not/'."""
133
# little ugly, but works
135
# delegate to the main opening code. This pays a double rtt cost at the
136
# moment, so perhaps we want probe_transport to return the opened thing
137
# rather than an openener ? or we could return a curried thing with the
138
# dir to open already instantiated ? Needs more thought.
140
format.open(transport)
143
raise errors.bzr_errors.NotBranchError(path=transport.base)
144
raise errors.bzr_errors.NotBranchError(path=transport.base)
146
def get_format_description(self):
147
return "Local Git Repository"
150
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)
125
def create_repository(self, shared=False):
126
return self.open_repository()
added
removed
dir.py
