22
19
"""A GIT branch and repository format implementation for bzr."""
30
# versions ending in 'exp' mean experimental mappings
31
# versions ending in 'dev' mean development version
32
# versions ending in 'final' mean release (well tested, etc)
33
version_info = (0, 3, 3, 'dev', 0)
35
if version_info[3] == 'final':
36
version_string = '%d.%d.%d' % version_info[:3]
38
version_string = '%d.%d.%d%s%d' % version_info
39
__version__ = version_string
41
MINIMUM_DULWICH_VERSION = (0, 3, 1)
42
COMPATIBLE_BZR_VERSIONS = [(1, 14, 0), (1, 15, 0)]
44
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
52
from bzrlib.foreign import (
55
from bzrlib.lockable_files import (
58
from bzrlib.transport import (
59
register_lazy_transport,
60
register_transport_proto,
62
from bzrlib.commands import (
65
from bzrlib.trace import (
68
from bzrlib.version_info_formats.format_rio import (
69
RioVersionInfoBuilder,
73
if getattr(sys, "frozen", None):
74
# allow import additional libs from ./_lib for bzr.exe only
75
sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib')))
77
_versions_checked = False
78
def lazy_check_versions():
79
global _versions_checked
82
_versions_checked = True
84
from dulwich import __version__ as dulwich_version
86
raise ImportError("bzr-git: Please install dulwich, https://launchpad.net/dulwich")
88
if dulwich_version < MINIMUM_DULWICH_VERSION:
89
raise ImportError("bzr-git: Dulwich is too old; at least %d.%d.%d is required" % MINIMUM_DULWICH_VERSION)
91
bzrdir.format_registry.register_lazy('git',
92
"bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
93
help='GIT repository.', native=False, experimental=True,
96
from bzrlib.revisionspec import revspec_registry
97
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
101
class GitBzrDirFormat(bzrdir.BzrDirFormat):
102
_lock_class = TransportLock
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
104
83
def is_supported(self):
107
def network_name(self):
111
class LocalGitBzrDirFormat(GitBzrDirFormat):
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):
112
96
"""The .git directory control format."""
115
99
def _known_formats(self):
116
return set([LocalGitBzrDirFormat()])
100
return set([GitBzrDirFormat()])
118
def open(self, transport, _found=None):
102
def open(self, transport, _create=False, _found=None):
119
103
"""Open this directory.
105
:param _create: create the git dir on the fly. private to GitDirFormat.
122
import dulwich as git
123
107
# we dont grok readonly - git isn't integrated with transport.
124
108
url = transport.base
125
109
if url.startswith('readonly+'):
126
110
url = url[len('readonly+'):]
129
gitrepo = git.repo.Repo(transport.local_abspath(".").encode(osutils._fs_enc))
130
except bzr_errors.NotLocalUrl:
131
raise bzr_errors.NotBranchError(path=transport.base)
132
from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
133
lockfiles = GitLockableFiles(transport, GitLock())
134
return LocalGitDir(transport, lockfiles, gitrepo, 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)
137
118
def probe_transport(klass, transport):
138
119
"""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
import dulwich as git
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.
152
130
format.open(transport)
154
except git.errors.NotGitRepository, e:
155
raise bzr_errors.NotBranchError(path=transport.base)
156
raise bzr_errors.NotBranchError(path=transport.base)
158
def get_format_description(self):
159
return "Local Git Repository"
161
def get_format_string(self):
162
return "Local Git Repository"
164
def initialize_on_transport(self, transport):
165
from bzrlib.transport.local import LocalTransport
167
if not isinstance(transport, LocalTransport):
168
raise NotImplementedError(self.initialize,
169
"Can't create Git Repositories/branches on "
170
"non-local transports")
172
from dulwich.repo import Repo
173
Repo.create(transport.local_abspath(".").encode(osutils._fs_enc))
174
return self.open(transport)
176
def is_supported(self):
180
class RemoteGitBzrDirFormat(GitBzrDirFormat):
181
"""The .git directory control format."""
184
def _known_formats(self):
185
return set([RemoteGitBzrDirFormat()])
187
def open(self, transport, _found=None):
188
"""Open this directory.
191
# we dont grok readonly - git isn't integrated with transport.
193
if url.startswith('readonly+'):
194
url = url[len('readonly+'):]
195
if (not url.startswith("git://") and
196
not url.startswith("git+")):
197
raise bzr_errors.NotBranchError(transport.base)
198
from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
199
if not isinstance(transport, GitSmartTransport):
200
raise bzr_errors.NotBranchError(transport.base)
201
from bzrlib.plugins.git.dir import GitLockableFiles, GitLock
202
lockfiles = GitLockableFiles(transport, GitLock())
203
return RemoteGitDir(transport, lockfiles, self)
206
def probe_transport(klass, transport):
207
"""Our format is present if the transport ends in '.not/'."""
209
if url.startswith('readonly+'):
210
url = url[len('readonly+'):]
211
if (not url.startswith("git://") and
212
not url.startswith("git+")):
213
raise bzr_errors.NotBranchError(transport.base)
214
# little ugly, but works
216
from bzrlib.plugins.git.remote import GitSmartTransport
217
if not isinstance(transport, GitSmartTransport):
218
raise bzr_errors.NotBranchError(transport.base)
221
def get_format_description(self):
222
return "Remote Git Repository"
224
def get_format_string(self):
225
return "Remote Git Repository"
227
def initialize_on_transport(self, transport):
228
raise bzr_errors.UninitializableFormat(self)
231
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
232
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
234
register_transport_proto('git://',
235
help="Access using the Git smart server protocol.")
236
register_transport_proto('git+ssh://',
237
help="Access using the Git smart server protocol over SSH.")
239
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
240
'TCPGitSmartTransport')
241
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
242
'SSHGitSmartTransport')
244
foreign_vcs_registry.register_lazy("git",
245
"bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
247
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
248
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
249
"bzrlib.plugins.git.commands")
251
def update_stanza(rev, stanza):
252
mapping = getattr(rev, "mapping", None)
253
if mapping is not None and mapping.revid_prefix.startswith("git-"):
254
stanza.add("git-commit", rev.foreign_revid)
257
rio_hooks = getattr(RioVersionInfoBuilder, "hooks", None)
258
if rio_hooks is not None:
259
rio_hooks.install_named_hook('revision', update_stanza, None)
263
from bzrlib.transport import transport_server_registry
267
transport_server_registry.register_lazy('git',
268
'bzrlib.plugins.git.server',
270
'Git Smart server protocol over TCP. (default port: 9418)')
273
from bzrlib.repository import network_format_registry as repository_network_format_registry
274
repository_network_format_registry.register_lazy('git',
275
'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
277
from bzrlib.bzrdir import network_format_registry as bzrdir_network_format_registry
278
bzrdir_network_format_registry.register('git', GitBzrDirFormat)
281
def get_rich_root_format(stacked=False):
283
return bzrdir.format_registry.make_bzrdir("1.9-rich-root")
285
return bzrdir.format_registry.make_bzrdir("default-rich-root")
288
from bzrlib.plugins.git import tests
289
return tests.test_suite()
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