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 (
57
from bzrlib.bzrdir import (
63
ControlDirFormat = BzrDirFormat
65
from bzrlib.foreign import (
68
from bzrlib.help_topics import (
71
from bzrlib.lockable_files import (
74
from bzrlib.transport import (
75
register_lazy_transport,
76
register_transport_proto,
78
from bzrlib.commands import (
81
from bzrlib.version_info_formats.format_rio import (
82
RioVersionInfoBuilder,
84
from bzrlib.send import (
85
format_registry as send_format_registry,
89
if getattr(sys, "frozen", None):
90
# allow import additional libs from ./_lib for bzr.exe only
91
sys.path.append(os.path.normpath(
92
os.path.join(os.path.dirname(__file__), '_lib')))
97
from dulwich import __version__ as dulwich_version
99
raise bzr_errors.DependencyNotPresent("dulwich",
100
"bzr-git: Please install dulwich, https://launchpad.net/dulwich")
102
if dulwich_version < dulwich_minimum_version:
103
raise bzr_errors.DependencyNotPresent("dulwich",
104
"bzr-git: Dulwich is too old; at least %d.%d.%d is required" %
105
dulwich_minimum_version)
108
_versions_checked = False
109
def lazy_check_versions():
110
global _versions_checked
111
if _versions_checked:
114
_versions_checked = True
116
format_registry.register_lazy('git',
117
"bzrlib.plugins.git.dir", "LocalGitControlDirFormat",
118
help='GIT repository.', native=False, experimental=True,
121
from bzrlib.revisionspec import revspec_registry
122
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
126
from bzrlib.revisionspec import dwim_revspecs
130
from bzrlib.plugins.git.revspec import RevisionSpec_git
131
dwim_revspecs.append(RevisionSpec_git)
134
class GitControlDirFormat(ControlDirFormat):
136
_lock_class = TransportLock
138
colocated_branches = True
140
def __eq__(self, other):
141
return type(self) == type(other)
143
def is_supported(self):
146
def network_name(self):
150
class LocalGitControlDirFormat(GitControlDirFormat):
151
"""The .git directory control format."""
154
def _known_formats(self):
155
return set([LocalGitControlDirFormat()])
157
def open(self, transport, _found=None):
158
"""Open this directory.
161
lazy_check_versions()
162
from bzrlib.plugins.git.transportgit import TransportRepo
163
gitrepo = TransportRepo(transport)
164
from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
165
lockfiles = GitLockableFiles(transport, GitLock())
166
return LocalGitDir(transport, lockfiles, gitrepo, self)
169
def probe_transport(klass, transport):
171
if not transport.has_any(['info/refs', '.git/branches',
173
raise bzr_errors.NotBranchError(path=transport.base)
174
except bzr_errors.NoSuchFile:
175
raise bzr_errors.NotBranchError(path=transport.base)
176
from bzrlib import urlutils
177
if urlutils.split(transport.base)[1] == ".git":
178
raise bzr_errors.NotBranchError(path=transport.base)
179
lazy_check_versions()
183
format.open(transport)
185
except dulwich.errors.NotGitRepository, e:
186
raise bzr_errors.NotBranchError(path=transport.base)
187
raise bzr_errors.NotBranchError(path=transport.base)
189
def get_format_description(self):
190
return "Local Git Repository"
192
def get_format_string(self):
193
return "Local Git Repository"
195
def initialize_on_transport(self, transport):
196
from bzrlib.transport.local import LocalTransport
198
if not isinstance(transport, LocalTransport):
199
raise NotImplementedError(self.initialize,
200
"Can't create Git Repositories/branches on "
201
"non-local transports")
202
lazy_check_versions()
203
from dulwich.repo import Repo
204
Repo.init(transport.local_abspath(".").encode(osutils._fs_enc))
205
return self.open(transport)
207
def is_supported(self):
211
class RemoteGitControlDirFormat(GitControlDirFormat):
212
"""The .git directory control format."""
215
def _known_formats(self):
216
return set([RemoteGitControlDirFormat()])
218
def open(self, transport, _found=None):
219
"""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.
222
107
# we dont grok readonly - git isn't integrated with transport.
223
108
url = transport.base
224
109
if url.startswith('readonly+'):
225
110
url = url[len('readonly+'):]
226
if (not url.startswith("git://") and not url.startswith("git+")):
227
raise bzr_errors.NotBranchError(transport.base)
228
from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
229
if not isinstance(transport, GitSmartTransport):
230
raise bzr_errors.NotBranchError(transport.base)
231
from bzrlib.plugins.git.dir import GitLockableFiles, GitLock
232
lockfiles = GitLockableFiles(transport, GitLock())
233
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)
236
118
def probe_transport(klass, transport):
237
119
"""Our format is present if the transport ends in '.not/'."""
239
if url.startswith('readonly+'):
240
url = url[len('readonly+'):]
241
if (not url.startswith("git://") and not url.startswith("git+")):
242
raise bzr_errors.NotBranchError(transport.base)
243
120
# little ugly, but works
245
from bzrlib.plugins.git.remote import GitSmartTransport
246
if not isinstance(transport, GitSmartTransport):
247
raise bzr_errors.NotBranchError(transport.base)
250
def get_format_description(self):
251
return "Remote Git Repository"
253
def get_format_string(self):
254
return "Remote Git Repository"
256
def initialize_on_transport(self, transport):
257
raise bzr_errors.UninitializableFormat(self)
260
ControlDirFormat.register_control_format(LocalGitControlDirFormat)
261
ControlDirFormat.register_control_format(RemoteGitControlDirFormat)
263
register_transport_proto('git://',
264
help="Access using the Git smart server protocol.")
265
register_transport_proto('git+ssh://',
266
help="Access using the Git smart server protocol over SSH.")
268
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
269
'TCPGitSmartTransport')
270
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
271
'SSHGitSmartTransport')
273
foreign_vcs_registry.register_lazy("git",
274
"bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
276
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
277
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
278
"bzrlib.plugins.git.commands")
279
plugin_cmds.register_lazy("cmd_git_refs", [], "bzrlib.plugins.git.commands")
280
plugin_cmds.register_lazy("cmd_git_apply", [], "bzrlib.plugins.git.commands")
282
def update_stanza(rev, stanza):
283
mapping = getattr(rev, "mapping", None)
284
if mapping is not None and mapping.revid_prefix.startswith("git-"):
285
stanza.add("git-commit", rev.foreign_revid)
288
rio_hooks = getattr(RioVersionInfoBuilder, "hooks", None)
289
if rio_hooks is not None:
290
rio_hooks.install_named_hook('revision', update_stanza, None)
293
from bzrlib.transport import transport_server_registry
294
transport_server_registry.register_lazy('git',
295
'bzrlib.plugins.git.server',
297
'Git Smart server protocol over TCP. (default port: 9418)')
300
from bzrlib.repository import (
301
network_format_registry as repository_network_format_registry,
303
repository_network_format_registry.register_lazy('git',
304
'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
306
from bzrlib.bzrdir import (
307
network_format_registry as bzrdir_network_format_registry,
309
bzrdir_network_format_registry.register('git', GitControlDirFormat)
311
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
312
'send_git', 'Git am-style diff format')
314
topic_registry.register_lazy('git',
315
'bzrlib.plugins.git.help',
316
'help_git', 'Using Bazaar with Git')
319
from bzrlib.diff import format_registry as diff_format_registry
323
diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
324
'GitDiffTree', 'Git am-style diff format')
327
from bzrlib.plugins.git import tests
328
return tests.test_suite()
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