94
71
if getattr(sys, "frozen", None):
95
72
# allow import additional libs from ./_lib for bzr.exe only
96
sys.path.append(os.path.normpath(
97
os.path.join(os.path.dirname(__file__), '_lib')))
100
def import_dulwich():
102
from dulwich import __version__ as dulwich_version
104
raise bzr_errors.DependencyNotPresent("dulwich",
105
"bzr-git: Please install dulwich, https://launchpad.net/dulwich")
107
if dulwich_version < dulwich_minimum_version:
108
raise bzr_errors.DependencyNotPresent("dulwich",
109
"bzr-git: Dulwich is too old; at least %d.%d.%d is required" %
110
dulwich_minimum_version)
73
sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib')))
113
75
_versions_checked = False
114
76
def lazy_check_versions():
115
77
global _versions_checked
116
78
if _versions_checked:
119
80
_versions_checked = True
121
format_registry.register_lazy('git',
122
"bzrlib.plugins.git.dir", "LocalGitControlDirFormat",
123
help='GIT repository.', native=False, experimental=False,
126
format_registry.register_lazy('git-bare',
127
"bzrlib.plugins.git.dir", "BareLocalGitControlDirFormat",
128
help='Bare GIT repository (no working tree).', native=False,
82
from dulwich import __version__ as dulwich_version
84
raise bzr_errors.DependencyNotPresent("dulwich", "bzr-git: Please install dulwich, https://launchpad.net/dulwich")
86
if dulwich_version < dulwich_minimum_version:
87
raise bzr_errors.DependencyNotPresent("dulwich", "bzr-git: Dulwich is too old; at least %d.%d.%d is required" % dulwich_minimum_version)
89
bzrdir.format_registry.register_lazy('git',
90
"bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
91
help='GIT repository.', native=False, experimental=True,
132
94
from bzrlib.revisionspec import revspec_registry
133
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
95
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
134
96
"RevisionSpec_git")
137
from bzrlib.revisionspec import dwim_revspecs
141
from bzrlib.plugins.git.revspec import RevisionSpec_git
142
dwim_revspecs.append(RevisionSpec_git)
145
class GitControlDirFormat(ControlDirFormat):
99
class GitBzrDirFormat(bzrdir.BzrDirFormat):
147
101
_lock_class = TransportLock
149
colocated_branches = True
151
def __eq__(self, other):
152
return type(self) == type(other)
154
103
def is_supported(self):
161
class LocalGitProber(Prober):
163
def probe_transport(self, transport):
165
if not transport.has_any(['info/refs', '.git/branches',
167
raise bzr_errors.NotBranchError(path=transport.base)
168
except bzr_errors.NoSuchFile:
169
raise bzr_errors.NotBranchError(path=transport.base)
170
from bzrlib import urlutils
171
if urlutils.split(transport.base)[1] == ".git":
172
raise bzr_errors.NotBranchError(path=transport.base)
173
lazy_check_versions()
175
from bzrlib.plugins.git.transportgit import TransportRepo
177
gitrepo = TransportRepo(transport)
178
except dulwich.errors.NotGitRepository, e:
179
raise bzr_errors.NotBranchError(path=transport.base)
182
return BareLocalGitControlDirFormat()
184
return LocalGitControlDirFormat()
187
class LocalGitControlDirFormat(GitControlDirFormat):
110
class LocalGitBzrDirFormat(GitBzrDirFormat):
188
111
"""The .git directory control format."""
193
114
def _known_formats(self):
194
return set([LocalGitControlDirFormat()])
115
return set([LocalGitBzrDirFormat()])
196
117
def open(self, transport, _found=None):
197
118
"""Open this directory.
200
121
lazy_check_versions()
201
from bzrlib.plugins.git.transportgit import TransportRepo
202
gitrepo = TransportRepo(transport)
123
# we dont grok readonly - git isn't integrated with transport.
125
if url.startswith('readonly+'):
126
url = url[len('readonly+'):]
129
gitrepo = dulwich.repo.Repo(transport.local_abspath(".").encode(osutils._fs_enc))
130
except bzr_errors.NotLocalUrl:
131
raise bzr_errors.NotBranchError(path=transport.base)
203
132
from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
204
133
lockfiles = GitLockableFiles(transport, GitLock())
205
134
return LocalGitDir(transport, lockfiles, gitrepo, self)
208
137
def probe_transport(klass, transport):
209
prober = LocalGitProber()
210
return prober.probe_transport(transport)
138
"""Our format is present if the transport ends in '.not/'."""
139
from bzrlib.transport.local import LocalTransport
141
if not isinstance(transport, LocalTransport):
142
raise bzr_errors.NotBranchError(path=transport.base)
144
# This should quickly filter out most things that are not
145
# git repositories, saving us the trouble from loading dulwich.
146
if not transport.has(".git") and not transport.has("objects"):
147
raise bzr_errors.NotBranchError(path=transport.base)
149
lazy_check_versions()
153
format.open(transport)
155
except dulwich.errors.NotGitRepository, e:
156
raise bzr_errors.NotBranchError(path=transport.base)
157
raise bzr_errors.NotBranchError(path=transport.base)
212
159
def get_format_description(self):
213
160
return "Local Git Repository"
162
def get_format_string(self):
163
return "Local Git Repository"
215
165
def initialize_on_transport(self, transport):
216
166
from bzrlib.transport.local import LocalTransport
218
168
if not isinstance(transport, LocalTransport):
219
raise NotImplementedError(self.initialize,
169
raise NotImplementedError(self.initialize,
220
170
"Can't create Git Repositories/branches on "
221
171
"non-local transports")
222
173
lazy_check_versions()
223
174
from dulwich.repo import Repo
224
Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
175
Repo.create(transport.local_abspath(".").encode(osutils._fs_enc))
226
176
return self.open(transport)
228
178
def is_supported(self):
232
class BareLocalGitControlDirFormat(LocalGitControlDirFormat):
235
supports_workingtrees = False
238
def _known_formats(self):
239
return set([RemoteGitControlDirFormat()])
241
def get_format_description(self):
242
return "Local Git Repository (bare)"
245
class RemoteGitProber(Prober):
247
def probe_transport(self, transport):
249
if url.startswith('readonly+'):
250
url = url[len('readonly+'):]
251
if (not url.startswith("git://") and not url.startswith("git+")):
252
raise bzr_errors.NotBranchError(transport.base)
253
# little ugly, but works
254
from bzrlib.plugins.git.remote import GitSmartTransport
255
if not isinstance(transport, GitSmartTransport):
256
raise bzr_errors.NotBranchError(transport.base)
257
return RemoteGitControlDirFormat()
261
class RemoteGitControlDirFormat(GitControlDirFormat):
182
class RemoteGitBzrDirFormat(GitBzrDirFormat):
262
183
"""The .git directory control format."""
264
supports_workingtrees = False
267
186
def _known_formats(self):
268
return set([RemoteGitControlDirFormat()])
187
return set([RemoteGitBzrDirFormat()])
270
189
def open(self, transport, _found=None):
271
190
"""Open this directory.
288
208
def probe_transport(klass, transport):
289
209
"""Our format is present if the transport ends in '.not/'."""
290
prober = RemoteGitProber()
291
return prober.probe_transport(transport)
211
if url.startswith('readonly+'):
212
url = url[len('readonly+'):]
213
if (not url.startswith("git://") and
214
not url.startswith("git+")):
215
raise bzr_errors.NotBranchError(transport.base)
216
# little ugly, but works
218
from bzrlib.plugins.git.remote import GitSmartTransport
219
if not isinstance(transport, GitSmartTransport):
220
raise bzr_errors.NotBranchError(transport.base)
293
223
def get_format_description(self):
294
224
return "Remote Git Repository"
226
def get_format_string(self):
227
return "Remote Git Repository"
296
229
def initialize_on_transport(self, transport):
297
230
raise bzr_errors.UninitializableFormat(self)
301
ControlDirFormat.register_format(LocalGitControlDirFormat())
302
ControlDirFormat.register_format(BareLocalGitControlDirFormat())
303
ControlDirFormat.register_format(RemoteGitControlDirFormat())
304
ControlDirFormat.register_prober(LocalGitProber)
305
ControlDirFormat.register_prober(RemoteGitProber)
307
ControlDirFormat.register_control_format(LocalGitControlDirFormat)
308
ControlDirFormat.register_control_format(BareLocalGitControlDirFormat)
309
ControlDirFormat.register_control_format(RemoteGitControlDirFormat)
233
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
234
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
311
register_transport_proto('git://',
236
register_transport_proto('git://',
312
237
help="Access using the Git smart server protocol.")
313
register_transport_proto('git+ssh://',
238
register_transport_proto('git+ssh://',
314
239
help="Access using the Git smart server protocol over SSH.")
316
241
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
318
243
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
319
244
'SSHGitSmartTransport')
321
foreign_vcs_registry.register_lazy("git",
246
foreign_vcs_registry.register_lazy("git",
322
247
"bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
324
249
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
325
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
250
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
326
251
"bzrlib.plugins.git.commands")
327
plugin_cmds.register_lazy("cmd_git_refs", [], "bzrlib.plugins.git.commands")
328
plugin_cmds.register_lazy("cmd_git_apply", [], "bzrlib.plugins.git.commands")
330
253
def update_stanza(rev, stanza):
331
254
mapping = getattr(rev, "mapping", None)
341
264
from bzrlib.transport import transport_server_registry
342
265
transport_server_registry.register_lazy('git',
343
'bzrlib.plugins.git.server',
266
'bzrlib.plugins.git.server',
345
268
'Git Smart server protocol over TCP. (default port: 9418)')
348
from bzrlib.repository import (
349
network_format_registry as repository_network_format_registry,
351
repository_network_format_registry.register_lazy('git',
271
from bzrlib.repository import network_format_registry as repository_network_format_registry
272
repository_network_format_registry.register_lazy('git',
352
273
'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
355
from bzrlib.controldir import (
356
network_format_registry as controldir_network_format_registry,
359
from bzrlib.bzrdir import (
360
network_format_registry as controldir_network_format_registry,
362
controldir_network_format_registry.register('git', GitControlDirFormat)
275
from bzrlib.bzrdir import network_format_registry as bzrdir_network_format_registry
276
bzrdir_network_format_registry.register('git', GitBzrDirFormat)
279
def get_rich_root_format(stacked=False):
281
return bzrdir.format_registry.make_bzrdir("1.9-rich-root")
283
return bzrdir.format_registry.make_bzrdir("default-rich-root")
364
285
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
365
286
'send_git', 'Git am-style diff format')
367
topic_registry.register_lazy('git',
368
'bzrlib.plugins.git.help',
369
'help_git', 'Using Bazaar with Git')
372
from bzrlib.diff import format_registry as diff_format_registry
376
diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
377
'GitDiffTree', 'Git am-style diff format')
379
288
def test_suite():
380
289
from bzrlib.plugins.git import tests
381
290
return tests.test_suite()