22
19
"""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)
113
_versions_checked = False
114
def lazy_check_versions():
115
global _versions_checked
116
if _versions_checked:
119
_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):
147
_lock_class = TransportLock
149
colocated_branches = True
151
def __eq__(self, other):
152
return type(self) == type(other)
154
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):
188
"""The .git directory control format."""
193
def _known_formats(self):
194
return set([LocalGitControlDirFormat()])
196
def open(self, transport, _found=None):
197
"""Open this directory.
200
lazy_check_versions()
201
from bzrlib.plugins.git.transportgit import TransportRepo
202
gitrepo = TransportRepo(transport)
203
from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
204
lockfiles = GitLockableFiles(transport, GitLock())
205
return LocalGitDir(transport, lockfiles, gitrepo, self)
208
def probe_transport(klass, transport):
209
prober = LocalGitProber()
210
return prober.probe_transport(transport)
212
def get_format_description(self):
213
return "Local Git Repository"
215
def initialize_on_transport(self, transport):
216
from bzrlib.transport.local import LocalTransport
218
if not isinstance(transport, LocalTransport):
219
raise NotImplementedError(self.initialize,
220
"Can't create Git Repositories/branches on "
221
"non-local transports")
222
lazy_check_versions()
223
from dulwich.repo import Repo
224
Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
226
return self.open(transport)
228
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):
262
"""The .git directory control format."""
264
supports_workingtrees = False
267
def _known_formats(self):
268
return set([RemoteGitControlDirFormat()])
270
def open(self, transport, _found=None):
271
"""Open this directory.
23
import stgit.git as git
25
from bzrlib.decorators import *
28
import bzrlib.errors as errors
29
import bzrlib.repository
30
from bzrlib.revision import Revision
33
def gitrevid_from_bzr(revision_id):
34
return revision_id[4:]
37
def bzrrevid_from_git(revision_id):
38
return "git:" + revision_id
41
class GitLock(object):
42
"""A lock that thunks through to Git."""
54
class GitLockableFiles(bzrlib.lockable_files.LockableFiles):
55
"""Git specific lockable files abstraction."""
57
def __init__(self, lock):
59
self._transaction = None
60
self._lock_mode = None
64
class GitDir(bzrlib.bzrdir.BzrDir):
65
"""An adapter to the '.git' dir used by git."""
67
def __init__(self, transport, lockfiles, format):
69
self.root_transport = transport
70
self.transport = transport.clone('.git')
71
self._lockfiles = lockfiles
73
def get_branch_transport(self, branch_format):
74
if branch_format is None:
76
if isinstance(branch_format, GitBzrDirFormat):
78
raise errors.IncompatibleFormat(branch_format, self._format)
80
get_repository_transport = get_branch_transport
81
get_workingtree_transport = get_branch_transport
83
def is_supported(self):
86
def open_branch(self, ignored=None):
87
"""'crate' a branch for this dir."""
88
return GitBranch(self, self._lockfiles)
90
def open_repository(self, shared=False):
91
"""'open' a repository for this dir."""
92
return GitRepository(self._gitrepo, self, self._lockfiles)
95
class GitBzrDirFormat(bzrlib.bzrdir.BzrDirFormat):
96
"""The .git directory control format."""
99
def _known_formats(self):
100
return set([GitBzrDirFormat()])
102
def open(self, transport, _create=False, _found=None):
103
"""Open this directory.
105
:param _create: create the git dir on the fly. private to GitDirFormat.
274
107
# we dont grok readonly - git isn't integrated with transport.
275
108
url = transport.base
276
109
if url.startswith('readonly+'):
277
110
url = url[len('readonly+'):]
278
if (not url.startswith("git://") and not url.startswith("git+")):
279
raise bzr_errors.NotBranchError(transport.base)
280
from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
281
if not isinstance(transport, GitSmartTransport):
282
raise bzr_errors.NotBranchError(transport.base)
283
from bzrlib.plugins.git.dir import GitLockableFiles, GitLock
284
lockfiles = GitLockableFiles(transport, GitLock())
285
return RemoteGitDir(transport, lockfiles, self)
111
if url.startswith('file://'):
112
url = url[len('file://'):]
113
url = url.encode('utf8')
114
lockfiles = GitLockableFiles(GitLock())
115
return GitDir(transport, lockfiles, self)
288
118
def probe_transport(klass, transport):
289
119
"""Our format is present if the transport ends in '.not/'."""
290
prober = RemoteGitProber()
291
return prober.probe_transport(transport)
293
def get_format_description(self):
294
return "Remote Git Repository"
296
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.")
316
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')
380
from bzrlib.plugins.git import tests
381
return tests.test_suite()
120
# little ugly, but works
122
# try a manual probe first, its a little faster perhaps ?
123
if transport.has('.git'):
125
# delegate to the main opening code. This pays a double rtt cost at the
126
# moment, so perhaps we want probe_transport to return the opened thing
127
# rather than an openener ? or we could return a curried thing with the
128
# dir to open already instantiated ? Needs more thought.
130
format.open(transport)
133
raise errors.NotBranchError(path=transport.base)
134
raise errors.NotBranchError(path=transport.base)
137
bzrlib.bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)
140
class GitBranch(bzrlib.branch.Branch):
141
"""An adapter to git repositories for bzr Branch objects."""
143
def __init__(self, gitdir, lockfiles):
145
self.control_files = lockfiles
146
self.repository = GitRepository(gitdir, lockfiles)
147
self.base = gitdir.root_transport.base
149
def lock_write(self):
150
self.control_files.lock_write()
153
def last_revision(self):
154
# perhaps should escape this ?
155
return bzrrevid_from_git(git.get_head())
158
self.control_files.lock_read()
161
self.control_files.unlock()
164
class GitRepository(bzrlib.repository.Repository):
165
"""An adapter to git repositories for bzr."""
167
def __init__(self, gitdir, lockfiles):
169
self.control_files = lockfiles
171
def get_revision(self, revision_id):
172
raw = stgit.git._output_lines('git-rev-list --header --max-count=1 %s' % gitrevid_from_bzr(revision_id))
173
# first field is the rev itself.
174
# then its 'field value'
180
for field in raw[1:]:
181
#if field.startswith('author '):
182
# committer = field[7:]
183
if field.startswith('parent '):
184
parents.append(bzrrevid_from_git(field.split()[1]))
185
elif field.startswith('committer '):
186
commit_fields = field.split()
187
if committer is None:
188
committer = ' '.join(commit_fields[1:-3])
189
timestamp = commit_fields[-2]
190
timezone = commit_fields[-1]
197
result = Revision(revision_id)
198
result.parent_ids = parents
200
result.inventory_sha1 = ""
201
result.timezone = timezone and int(timezone)
202
result.timestamp = float(timestamp)
203
result.committer = committer