22
19
"""A GIT branch and repository format implementation for bzr."""
29
from bzrlib import bzrdir, errors as bzr_errors
30
from bzrlib.foreign import foreign_vcs_registry
31
from bzrlib.lockable_files import TransportLock
32
from bzrlib.transport import register_lazy_transport
33
from bzrlib.commands import plugin_cmds
34
from bzrlib.trace import warning
36
# versions ending in 'exp' mean experimental mappings
37
# versions ending in 'dev' mean development version
38
# versions ending in 'final' mean release (well tested, etc)
39
version_info = (0, 2, 0, 'dev', 0)
41
if version_info[3] == 'final':
42
version_string = '%d.%d.%d' % version_info[:3]
44
version_string = '%d.%d.%d%s%d' % version_info
45
__version__ = version_string
47
MINIMUM_DULWICH_VERSION = (0, 1, 1)
48
COMPATIBLE_BZR_VERSIONS = [(1, 13, 0)]
50
if getattr(sys, "frozen", None):
51
# allow import additional libs from ./_lib for bzr.exe only
52
sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib')))
54
_versions_checked = False
55
def lazy_check_versions():
56
global _versions_checked
59
_versions_checked = True
61
from dulwich import __version__ as dulwich_version
63
raise ImportError("bzr-git: Please install dulwich, https://launchpad.net/dulwich")
65
if dulwich_version < MINIMUM_DULWICH_VERSION:
66
raise ImportError("bzr-git: Dulwich is too old; at least %d.%d.%d is required" % MINIMUM_DULWICH_VERSION)
68
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
70
bzrdir.format_registry.register_lazy('git',
71
"bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
72
help='GIT repository.', native=False, experimental=True,
76
from bzrlib.revisionspec import revspec_registry
77
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
81
from bzrlib.revisionspec import SPEC_TYPES
82
from bzrlib.plugins.git.revspec import RevisionSpec_git
83
SPEC_TYPES.append(RevisionSpec_git)
85
class GitBzrDirFormat(bzrdir.BzrDirFormat):
86
_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
88
83
def is_supported(self):
92
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):
93
96
"""The .git directory control format."""
96
99
def _known_formats(self):
97
return set([LocalGitBzrDirFormat()])
100
return set([GitBzrDirFormat()])
99
def open(self, transport, _found=None):
102
def open(self, transport, _create=False, _found=None):
100
103
"""Open this directory.
105
:param _create: create the git dir on the fly. private to GitDirFormat.
103
import dulwich as git
104
107
# we dont grok readonly - git isn't integrated with transport.
105
108
url = transport.base
106
109
if url.startswith('readonly+'):
107
110
url = url[len('readonly+'):]
110
gitrepo = git.repo.Repo(transport.local_abspath("."))
111
except bzr_errors.NotLocalUrl:
112
raise bzr_errors.NotBranchError(path=transport.base)
113
from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
114
lockfiles = GitLockableFiles(transport, GitLock())
115
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)
118
118
def probe_transport(klass, transport):
119
119
"""Our format is present if the transport ends in '.not/'."""
120
from bzrlib.transport.local import LocalTransport
122
if not isinstance(transport, LocalTransport):
123
raise bzr_errors.NotBranchError(path=transport.base)
125
# This should quickly filter out most things that are not
126
# git repositories, saving us the trouble from loading dulwich.
127
if not transport.has(".git") and not transport.has("objects"):
128
raise bzr_errors.NotBranchError(path=transport.base)
130
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.
133
130
format.open(transport)
135
except git.errors.NotGitRepository, e:
136
raise bzr_errors.NotBranchError(path=transport.base)
137
raise bzr_errors.NotBranchError(path=transport.base)
139
def get_format_description(self):
140
return "Local Git Repository"
142
def get_format_string(self):
143
return "Local Git Repository"
145
def initialize_on_transport(self, transport):
146
from bzrlib.transport.local import LocalTransport
148
if not isinstance(transport, LocalTransport):
149
raise NotImplementedError(self.initialize,
150
"Can't create Git Repositories/branches on "
151
"non-local transports")
153
from dulwich.repo import Repo
154
Repo.create(transport.local_abspath("."))
155
return self.open(transport)
157
def is_supported(self):
161
class RemoteGitBzrDirFormat(GitBzrDirFormat):
162
"""The .git directory control format."""
165
def _known_formats(self):
166
return set([RemoteGitBzrDirFormat()])
168
def open(self, transport, _found=None):
169
"""Open this directory.
172
from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
173
if not isinstance(transport, GitSmartTransport):
174
raise bzr_errors.NotBranchError(transport.base)
175
# we dont grok readonly - git isn't integrated with transport.
177
if url.startswith('readonly+'):
178
url = url[len('readonly+'):]
180
from bzrlib.plugins.git.dir import GitLockableFiles, GitLock
181
lockfiles = GitLockableFiles(transport, GitLock())
182
return RemoteGitDir(transport, lockfiles, self)
185
def probe_transport(klass, transport):
186
"""Our format is present if the transport ends in '.not/'."""
187
# little ugly, but works
189
from bzrlib.plugins.git.remote import GitSmartTransport
190
if not isinstance(transport, GitSmartTransport):
191
raise bzr_errors.NotBranchError(transport.base)
192
# The only way to know a path exists and contains a valid repository
193
# is to do a request against it:
195
transport.fetch_pack(lambda x: [], None, lambda x: None,
196
lambda x: mutter("git: %s" % x))
197
except errors.git_errors.GitProtocolError:
198
raise bzr_errors.NotBranchError(path=transport.base)
201
raise bzr_errors.NotBranchError(path=transport.base)
203
def get_format_description(self):
204
return "Remote Git Repository"
206
def get_format_string(self):
207
return "Remote Git Repository"
209
def initialize_on_transport(self, transport):
210
raise bzr_errors.UninitializableFormat(self)
213
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
214
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
216
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
219
foreign_vcs_registry.register_lazy("git",
220
"bzrlib.plugins.git.mapping",
222
"Stupid content tracker")
224
plugin_cmds.register_lazy("cmd_git_serve", [], "bzrlib.plugins.git.commands")
225
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
227
def get_rich_root_format():
229
return bzrdir.format_registry.make_bzrdir("default-rich-root")
231
return bzrdir.format_registry.make_bzrdir("1.9-rich-root")
234
from bzrlib.plugins.git import tests
235
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