22
22
"""A GIT branch and repository format implementation for bzr."""
31
bzr_compatible_versions,
32
bzr_plugin_version as version_info,
33
dulwich_minimum_version,
36
if version_info[3] == 'final':
37
version_string = '%d.%d.%d' % version_info[:3]
39
version_string = '%d.%d.%d%s%d' % version_info
40
__version__ = version_string
42
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
50
from bzrlib.controldir import (
58
from bzrlib.bzrdir import (
64
ControlDirFormat = BzrDirFormat
66
has_controldir = False
70
from bzrlib.foreign import (
73
from bzrlib.help_topics import (
76
from bzrlib.lockable_files import (
79
from bzrlib.transport import (
80
register_lazy_transport,
81
register_transport_proto,
83
from bzrlib.commands import (
86
from bzrlib.version_info_formats.format_rio import (
87
RioVersionInfoBuilder,
89
from bzrlib.send import (
90
format_registry as send_format_registry,
94
if getattr(sys, "frozen", None):
95
# 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)
26
from bzrlib import bzrdir
27
from bzrlib.foreign import foreign_vcs_registry
28
from bzrlib.lockable_files import TransportLock
29
from bzrlib.transport import register_lazy_transport
30
from bzrlib.commands import Command, register_command
31
from bzrlib.option import Option
32
from bzrlib.trace import warning
34
MINIMUM_DULWICH_VERSION = (0, 1, 0)
35
COMPATIBLE_BZR_VERSIONS = [(1, 12, 0)]
113
37
_versions_checked = False
114
38
def lazy_check_versions():
115
39
global _versions_checked
116
40
if _versions_checked:
119
42
_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,
132
from bzrlib.revisionspec import revspec_registry
133
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
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):
44
from dulwich import __version__ as dulwich_version
46
warning("Please install dulwich, https://launchpad.net/dulwich")
49
if dulwich_version < MINIMUM_DULWICH_VERSION:
50
warning("Dulwich is too old; at least %d.%d.%d is required" % MINIMUM_DULWICH_VERSION)
53
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
55
bzrdir.format_registry.register_lazy('git',
56
"bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
57
help='GIT repository.', native=False, experimental=True,
60
class GitBzrDirFormat(bzrdir.BzrDirFormat):
147
61
_lock_class = TransportLock
149
colocated_branches = True
151
def __eq__(self, other):
152
return type(self) == type(other)
154
63
def is_supported(self):
157
def network_name(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):
67
class LocalGitBzrDirFormat(GitBzrDirFormat):
188
68
"""The .git directory control format."""
193
71
def _known_formats(self):
194
return set([LocalGitControlDirFormat()])
72
return set([LocalGitBzrDirFormat()])
196
74
def open(self, transport, _found=None):
197
75
"""Open this directory.
200
lazy_check_versions()
201
from bzrlib.plugins.git.transportgit import TransportRepo
202
gitrepo = TransportRepo(transport)
79
# we dont grok readonly - git isn't integrated with transport.
81
if url.startswith('readonly+'):
82
url = url[len('readonly+'):]
85
gitrepo = git.repo.Repo(transport.local_abspath("."))
86
except errors.bzr_errors.NotLocalUrl:
87
raise errors.bzr_errors.NotBranchError(path=transport.base)
203
88
from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
204
89
lockfiles = GitLockableFiles(transport, GitLock())
205
90
return LocalGitDir(transport, lockfiles, gitrepo, self)
208
93
def probe_transport(klass, transport):
209
prober = LocalGitProber()
210
return prober.probe_transport(transport)
94
"""Our format is present if the transport ends in '.not/'."""
95
from bzrlib.transport.local import LocalTransport
97
if not isinstance(transport, LocalTransport):
98
raise errors.bzr_errors.NotBranchError(path=transport.base)
100
# This should quickly filter out most things that are not
101
# git repositories, saving us the trouble from loading dulwich.
102
if not transport.has(".git") and not transport.has("objects"):
103
raise errors.bzr_errors.NotBranchError(path=transport.base)
105
import dulwich as git
108
format.open(transport)
110
except git.errors.NotGitRepository, e:
111
raise errors.bzr_errors.NotBranchError(path=transport.base)
112
raise errors.bzr_errors.NotBranchError(path=transport.base)
212
114
def get_format_description(self):
213
115
return "Local Git Repository"
117
def get_format_string(self):
118
return "Local Git Repository"
215
120
def initialize_on_transport(self, transport):
216
121
from bzrlib.transport.local import LocalTransport
218
123
if not isinstance(transport, LocalTransport):
219
raise NotImplementedError(self.initialize,
124
raise NotImplementedError(self.initialize,
220
125
"Can't create Git Repositories/branches on "
221
126
"non-local transports")
222
lazy_check_versions()
223
128
from dulwich.repo import Repo
224
Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
129
Repo.create(transport.local_abspath("."))
226
130
return self.open(transport)
228
132
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):
136
class RemoteGitBzrDirFormat(GitBzrDirFormat):
262
137
"""The .git directory control format."""
264
supports_workingtrees = False
267
140
def _known_formats(self):
268
return set([RemoteGitControlDirFormat()])
141
return set([RemoteGitBzrDirFormat()])
270
143
def open(self, transport, _found=None):
271
144
"""Open this directory.
274
# we dont grok readonly - git isn't integrated with transport.
276
if url.startswith('readonly+'):
277
url = url[len('readonly+'):]
278
if (not url.startswith("git://") and not url.startswith("git+")):
279
raise bzr_errors.NotBranchError(transport.base)
280
147
from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
281
148
if not isinstance(transport, GitSmartTransport):
282
raise bzr_errors.NotBranchError(transport.base)
149
raise errors.bzr_errors.NotBranchError(transport.base)
150
# we dont grok readonly - git isn't integrated with transport.
152
if url.startswith('readonly+'):
153
url = url[len('readonly+'):]
283
155
from bzrlib.plugins.git.dir import GitLockableFiles, GitLock
284
156
lockfiles = GitLockableFiles(transport, GitLock())
285
157
return RemoteGitDir(transport, lockfiles, self)
288
160
def probe_transport(klass, transport):
289
161
"""Our format is present if the transport ends in '.not/'."""
290
prober = RemoteGitProber()
291
return prober.probe_transport(transport)
162
# little ugly, but works
164
from bzrlib.plugins.git.remote import GitSmartTransport
165
if not isinstance(transport, GitSmartTransport):
166
raise errors.bzr_errors.NotBranchError(transport.base)
167
# The only way to know a path exists and contains a valid repository
168
# is to do a request against it:
170
transport.fetch_pack(lambda x: [], None, lambda x: None,
171
lambda x: mutter("git: %s" % x))
172
except errors.git_errors.GitProtocolError:
173
raise errors.bzr_errors.NotBranchError(path=transport.base)
176
raise errors.bzr_errors.NotBranchError(path=transport.base)
293
178
def get_format_description(self):
294
179
return "Remote Git Repository"
181
def get_format_string(self):
182
return "Remote Git Repository"
296
184
def initialize_on_transport(self, transport):
297
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)
311
register_transport_proto('git://',
312
help="Access using the Git smart server protocol.")
313
register_transport_proto('git+ssh://',
314
help="Access using the Git smart server protocol over SSH.")
185
raise errors.bzr_errors.UninitializableFormat(self)
188
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
189
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
316
191
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
317
'TCPGitSmartTransport')
318
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
319
'SSHGitSmartTransport')
321
foreign_vcs_registry.register_lazy("git",
322
"bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
324
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
325
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
326
"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
def update_stanza(rev, stanza):
331
mapping = getattr(rev, "mapping", None)
332
if mapping is not None and mapping.revid_prefix.startswith("git-"):
333
stanza.add("git-commit", rev.foreign_revid)
336
rio_hooks = getattr(RioVersionInfoBuilder, "hooks", None)
337
if rio_hooks is not None:
338
rio_hooks.install_named_hook('revision', update_stanza, None)
341
from bzrlib.transport import transport_server_registry
342
transport_server_registry.register_lazy('git',
343
'bzrlib.plugins.git.server',
345
'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',
352
'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)
364
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
365
'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')
194
foreign_vcs_registry.register_lazy("git",
195
"bzrlib.plugins.git.mapping",
197
"Stupid content tracker")
200
class cmd_git_serve(Command):
201
"""Provide access to a Bazaar branch using the git protocol.
203
This command is experimental and doesn't do much yet.
207
help='serve contents of directory',
211
def run(self, directory=None):
212
lazy_check_versions()
213
from dulwich.server import TCPGitServer
214
from bzrlib.plugins.git.server import BzrBackend
215
from bzrlib.trace import warning
218
warning("server support in bzr-git is experimental.")
220
if directory is None:
221
directory = os.getcwd()
223
backend = BzrBackend(directory)
225
server = TCPGitServer(backend, 'localhost')
226
server.serve_forever()
228
register_command(cmd_git_serve)
231
class cmd_git_import(Command):
232
"""Import all branches from a git repository.
236
takes_args = ["src_location", "dest_location"]
238
def run(self, src_location, dest_location):
239
from bzrlib.bzrdir import BzrDir, format_registry
240
from bzrlib.errors import NoRepositoryPresent, NotBranchError
241
from bzrlib.repository import Repository
242
source_repo = Repository.open(src_location)
243
format = format_registry.make_bzrdir('rich-root-pack')
245
target_bzrdir = BzrDir.open(dest_location)
246
except NotBranchError:
247
target_bzrdir = BzrDir.create(dest_location, format=format)
249
target_repo = target_bzrdir.open_repository()
250
except NoRepositoryPresent:
251
target_repo = target_bzrdir.create_repository(shared=True)
253
target_repo.fetch(source_repo)
254
for name, ref in source_repo._git.heads().iteritems():
255
head_loc = os.path.join(dest_location, name)
257
head_bzrdir = BzrDir.open(head_loc)
258
except NotBranchError:
259
head_bzrdir = BzrDir.create(head_loc, format=format)
261
head_branch = head_bzrdir.open_branch()
262
except NotBranchError:
263
head_branch = head_bzrdir.create_branch()
264
head_branch.generate_revision_history(source_repo.get_mapping().revision_id_foreign_to_bzr(ref))
267
register_command(cmd_git_import)
379
270
def test_suite():
380
271
from bzrlib.plugins.git import tests