22
19
"""A GIT branch and repository format implementation for bzr."""
33
from bzrlib.foreign import (
36
from bzrlib.lockable_files import (
39
from bzrlib.transport import (
40
register_lazy_transport,
41
register_transport_proto,
43
from bzrlib.commands import (
46
from bzrlib.trace import (
50
# versions ending in 'exp' mean experimental mappings
51
# versions ending in 'dev' mean development version
52
# versions ending in 'final' mean release (well tested, etc)
53
version_info = (0, 2, 0, 'dev', 0)
55
if version_info[3] == 'final':
56
version_string = '%d.%d.%d' % version_info[:3]
58
version_string = '%d.%d.%d%s%d' % version_info
59
__version__ = version_string
61
MINIMUM_DULWICH_VERSION = (0, 1, 1)
62
COMPATIBLE_BZR_VERSIONS = [(1, 13, 0)]
64
if getattr(sys, "frozen", None):
65
# allow import additional libs from ./_lib for bzr.exe only
66
sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib')))
68
_versions_checked = False
69
def lazy_check_versions():
70
global _versions_checked
73
_versions_checked = True
75
from dulwich import __version__ as dulwich_version
77
raise ImportError("bzr-git: Please install dulwich, https://launchpad.net/dulwich")
79
if dulwich_version < MINIMUM_DULWICH_VERSION:
80
raise ImportError("bzr-git: Dulwich is too old; at least %d.%d.%d is required" % MINIMUM_DULWICH_VERSION)
82
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
84
bzrdir.format_registry.register_lazy('git',
85
"bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
86
help='GIT repository.', native=False, experimental=True,
89
from bzrlib.revisionspec import revspec_registry
90
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
93
class GitBzrDirFormat(bzrdir.BzrDirFormat):
94
_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
96
83
def is_supported(self):
100
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):
101
96
"""The .git directory control format."""
104
99
def _known_formats(self):
105
return set([LocalGitBzrDirFormat()])
100
return set([GitBzrDirFormat()])
107
def open(self, transport, _found=None):
102
def open(self, transport, _create=False, _found=None):
108
103
"""Open this directory.
105
:param _create: create the git dir on the fly. private to GitDirFormat.
111
import dulwich as git
112
107
# we dont grok readonly - git isn't integrated with transport.
113
108
url = transport.base
114
109
if url.startswith('readonly+'):
115
110
url = url[len('readonly+'):]
118
gitrepo = git.repo.Repo(transport.local_abspath("."))
119
except bzr_errors.NotLocalUrl:
120
raise bzr_errors.NotBranchError(path=transport.base)
121
from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
122
lockfiles = GitLockableFiles(transport, GitLock())
123
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)
126
118
def probe_transport(klass, transport):
127
119
"""Our format is present if the transport ends in '.not/'."""
128
from bzrlib.transport.local import LocalTransport
130
if not isinstance(transport, LocalTransport):
131
raise bzr_errors.NotBranchError(path=transport.base)
133
# This should quickly filter out most things that are not
134
# git repositories, saving us the trouble from loading dulwich.
135
if not transport.has(".git") and not transport.has("objects"):
136
raise bzr_errors.NotBranchError(path=transport.base)
138
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.
141
130
format.open(transport)
143
except git.errors.NotGitRepository, e:
144
raise bzr_errors.NotBranchError(path=transport.base)
145
raise bzr_errors.NotBranchError(path=transport.base)
147
def get_format_description(self):
148
return "Local Git Repository"
150
def get_format_string(self):
151
return "Local Git Repository"
153
def initialize_on_transport(self, transport):
154
from bzrlib.transport.local import LocalTransport
156
if not isinstance(transport, LocalTransport):
157
raise NotImplementedError(self.initialize,
158
"Can't create Git Repositories/branches on "
159
"non-local transports")
161
from dulwich.repo import Repo
162
Repo.create(transport.local_abspath("."))
163
return self.open(transport)
165
def is_supported(self):
169
class RemoteGitBzrDirFormat(GitBzrDirFormat):
170
"""The .git directory control format."""
173
def _known_formats(self):
174
return set([RemoteGitBzrDirFormat()])
176
def open(self, transport, _found=None):
177
"""Open this directory.
180
# we dont grok readonly - git isn't integrated with transport.
182
if url.startswith('readonly+'):
183
url = url[len('readonly+'):]
184
if (not url.startswith("git://") and
185
not url.startswith("git+")):
186
raise bzr_errors.NotBranchError(transport.base)
187
from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
188
if not isinstance(transport, GitSmartTransport):
189
raise bzr_errors.NotBranchError(transport.base)
190
from bzrlib.plugins.git.dir import GitLockableFiles, GitLock
191
lockfiles = GitLockableFiles(transport, GitLock())
192
return RemoteGitDir(transport, lockfiles, self)
195
def probe_transport(klass, transport):
196
"""Our format is present if the transport ends in '.not/'."""
198
if url.startswith('readonly+'):
199
url = url[len('readonly+'):]
200
if (not url.startswith("git://") and
201
not url.startswith("git+")):
202
raise bzr_errors.NotBranchError(transport.base)
203
# little ugly, but works
205
from bzrlib.plugins.git.remote import GitSmartTransport
206
if not isinstance(transport, GitSmartTransport):
207
raise bzr_errors.NotBranchError(transport.base)
208
# The only way to know a path exists and contains a valid repository
209
# is to do a request against it:
211
transport.fetch_pack(lambda x: [], None, lambda x: None,
212
lambda x: mutter("git: %s" % x))
213
except errors.git_errors.GitProtocolError:
214
raise bzr_errors.NotBranchError(path=transport.base)
217
raise bzr_errors.NotBranchError(path=transport.base)
219
def get_format_description(self):
220
return "Remote Git Repository"
222
def get_format_string(self):
223
return "Remote Git Repository"
225
def initialize_on_transport(self, transport):
226
raise bzr_errors.UninitializableFormat(self)
229
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
230
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
232
register_transport_proto('git://',
233
help="Access using the Git smart server protocol.")
234
register_transport_proto('git+ssh://',
235
help="Access using the Git smart server protocol over SSH.")
237
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
238
'TCPGitSmartTransport')
240
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
241
'SSHGitSmartTransport')
243
foreign_vcs_registry.register_lazy("git",
244
"bzrlib.plugins.git.mapping",
246
"Stupid content tracker")
248
plugin_cmds.register_lazy("cmd_git_serve", [], "bzrlib.plugins.git.commands")
249
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
251
def get_rich_root_format():
253
return bzrdir.format_registry.make_bzrdir("default-rich-root")
255
return bzrdir.format_registry.make_bzrdir("1.9-rich-root")
258
from bzrlib.plugins.git import tests
259
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