/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to __init__.py

Fix compatibility with newer versions of Dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
27
27
import bzrlib
28
28
import bzrlib.api
29
29
 
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)
 
30
from info import (
 
31
    bzr_compatible_versions,
 
32
    bzr_plugin_version as version_info,
 
33
    dulwich_minimum_version,
 
34
    )
34
35
 
35
36
if version_info[3] == 'final':
36
37
    version_string = '%d.%d.%d' % version_info[:3]
38
39
    version_string = '%d.%d.%d%s%d' % version_info
39
40
__version__ = version_string
40
41
 
41
 
MINIMUM_DULWICH_VERSION = (0, 3, 1)
42
 
COMPATIBLE_BZR_VERSIONS = [(1, 14, 0), (1, 15, 0)]
43
 
 
44
 
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
 
42
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
45
43
 
46
44
 
47
45
from bzrlib import (
62
60
from bzrlib.commands import (
63
61
    plugin_cmds,
64
62
    )
65
 
from bzrlib.trace import (
66
 
    warning,
67
 
    )
68
63
from bzrlib.version_info_formats.format_rio import (
69
64
    RioVersionInfoBuilder,
70
65
    )
 
66
from bzrlib.send import (
 
67
    format_registry as send_format_registry,
 
68
    )
71
69
 
72
70
 
73
71
if getattr(sys, "frozen", None):
83
81
    try:
84
82
        from dulwich import __version__ as dulwich_version
85
83
    except ImportError:
86
 
        raise ImportError("bzr-git: Please install dulwich, https://launchpad.net/dulwich")
 
84
        raise bzr_errors.DependencyNotPresent("dulwich",
 
85
            "bzr-git: Please install dulwich, https://launchpad.net/dulwich")
87
86
    else:
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)
 
87
        if dulwich_version < dulwich_minimum_version:
 
88
            raise bzr_errors.DependencyNotPresent("dulwich", "bzr-git: Dulwich is too old; at least %d.%d.%d is required" % dulwich_minimum_version)
90
89
 
91
 
bzrdir.format_registry.register_lazy('git', 
 
90
bzrdir.format_registry.register_lazy('git',
92
91
    "bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
93
92
    help='GIT repository.', native=False, experimental=True,
94
93
    )
95
94
 
96
95
from bzrlib.revisionspec import revspec_registry
97
 
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec", 
 
96
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
98
97
    "RevisionSpec_git")
99
98
 
 
99
try:
 
100
    from bzrlib.revisionspec import dwim_revspecs
 
101
except ImportError:
 
102
    pass
 
103
else:
 
104
    from bzrlib.plugins.git.revspec import RevisionSpec_git
 
105
    dwim_revspecs.append(RevisionSpec_git)
 
106
 
100
107
 
101
108
class GitBzrDirFormat(bzrdir.BzrDirFormat):
 
109
 
102
110
    _lock_class = TransportLock
103
111
 
 
112
    colocated_branches = True
 
113
 
104
114
    def is_supported(self):
105
115
        return True
106
116
 
119
129
        """Open this directory.
120
130
 
121
131
        """
122
 
        import dulwich as git
 
132
        lazy_check_versions()
123
133
        # we dont grok readonly - git isn't integrated with transport.
124
 
        url = transport.base
125
 
        if url.startswith('readonly+'):
126
 
            url = url[len('readonly+'):]
127
 
 
128
 
        try:
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)
 
134
        from bzrlib.transport.local import LocalTransport
 
135
        if isinstance(transport, LocalTransport):
 
136
            import dulwich
 
137
            gitrepo = dulwich.repo.Repo(transport.local_abspath(".").encode(osutils._fs_enc))
 
138
        else:
 
139
            from bzrlib.plugins.git.transportgit import TransportRepo
 
140
            gitrepo = TransportRepo(transport)
132
141
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
133
142
        lockfiles = GitLockableFiles(transport, GitLock())
134
143
        return LocalGitDir(transport, lockfiles, gitrepo, self)
135
144
 
136
145
    @classmethod
137
146
    def probe_transport(klass, transport):
138
 
        """Our format is present if the transport ends in '.not/'."""
139
 
        from bzrlib.transport.local import LocalTransport
140
 
 
141
 
        if not isinstance(transport, LocalTransport):
142
 
            raise bzr_errors.NotBranchError(path=transport.base)
143
 
 
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)
148
 
 
149
 
        import dulwich as git
 
147
        try:
 
148
            if not (transport.has('info/refs') or 
 
149
                    transport.has('.git/branches') or 
 
150
                    transport.has('branches')):
 
151
                raise bzr_errors.NotBranchError(path=transport.base)
 
152
        except bzr_errors.NoSuchFile:
 
153
            raise bzr_errors.NotBranchError(path=transport.base)
 
154
        from bzrlib import urlutils
 
155
        if urlutils.split(transport.base)[1] == ".git":
 
156
            raise bzr_errors.NotBranchError(path=transport.base)
 
157
        lazy_check_versions()
 
158
        import dulwich
150
159
        format = klass()
151
160
        try:
152
161
            format.open(transport)
153
162
            return format
154
 
        except git.errors.NotGitRepository, e:
 
163
        except dulwich.errors.NotGitRepository, e:
155
164
            raise bzr_errors.NotBranchError(path=transport.base)
156
165
        raise bzr_errors.NotBranchError(path=transport.base)
157
166
 
165
174
        from bzrlib.transport.local import LocalTransport
166
175
 
167
176
        if not isinstance(transport, LocalTransport):
168
 
            raise NotImplementedError(self.initialize, 
 
177
            raise NotImplementedError(self.initialize,
169
178
                "Can't create Git Repositories/branches on "
170
179
                "non-local transports")
171
 
 
 
180
        lazy_check_versions()
172
181
        from dulwich.repo import Repo
173
 
        Repo.create(transport.local_abspath(".").encode(osutils._fs_enc)) 
 
182
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc))
174
183
        return self.open(transport)
175
184
 
176
185
    def is_supported(self):
192
201
        url = transport.base
193
202
        if url.startswith('readonly+'):
194
203
            url = url[len('readonly+'):]
195
 
        if (not url.startswith("git://") and 
196
 
            not url.startswith("git+")):
 
204
        if (not url.startswith("git://") and not url.startswith("git+")):
197
205
            raise bzr_errors.NotBranchError(transport.base)
198
206
        from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
199
207
        if not isinstance(transport, GitSmartTransport):
208
216
        url = transport.base
209
217
        if url.startswith('readonly+'):
210
218
            url = url[len('readonly+'):]
211
 
        if (not url.startswith("git://") and 
212
 
            not url.startswith("git+")):
 
219
        if (not url.startswith("git://") and not url.startswith("git+")):
213
220
            raise bzr_errors.NotBranchError(transport.base)
214
221
        # little ugly, but works
215
222
        format = klass()
231
238
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
232
239
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
233
240
 
234
 
register_transport_proto('git://', 
 
241
register_transport_proto('git://',
235
242
        help="Access using the Git smart server protocol.")
236
 
register_transport_proto('git+ssh://', 
 
243
register_transport_proto('git+ssh://',
237
244
        help="Access using the Git smart server protocol over SSH.")
238
245
 
239
246
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
241
248
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
242
249
                        'SSHGitSmartTransport')
243
250
 
244
 
foreign_vcs_registry.register_lazy("git", 
 
251
foreign_vcs_registry.register_lazy("git",
245
252
    "bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
246
253
 
247
254
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
248
 
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"], 
 
255
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
249
256
    "bzrlib.plugins.git.commands")
 
257
plugin_cmds.register_lazy("cmd_git_refs", [], "bzrlib.plugins.git.commands")
 
258
plugin_cmds.register_lazy("cmd_git_apply", [], "bzrlib.plugins.git.commands")
250
259
 
251
260
def update_stanza(rev, stanza):
252
261
    mapping = getattr(rev, "mapping", None)
259
268
    rio_hooks.install_named_hook('revision', update_stanza, None)
260
269
 
261
270
 
262
 
try:
263
 
    from bzrlib.transport import transport_server_registry
264
 
except ImportError:
265
 
    pass
266
 
else:
267
 
    transport_server_registry.register_lazy('git',
268
 
        'bzrlib.plugins.git.server', 
269
 
        'serve_git',
270
 
        'Git Smart server protocol over TCP. (default port: 9418)')
 
271
from bzrlib.transport import transport_server_registry
 
272
transport_server_registry.register_lazy('git',
 
273
    'bzrlib.plugins.git.server',
 
274
    'serve_git',
 
275
    'Git Smart server protocol over TCP. (default port: 9418)')
271
276
 
272
277
 
273
278
from bzrlib.repository import network_format_registry as repository_network_format_registry
274
 
repository_network_format_registry.register_lazy('git', 
 
279
repository_network_format_registry.register_lazy('git',
275
280
    'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
276
281
 
277
282
from bzrlib.bzrdir import network_format_registry as bzrdir_network_format_registry
284
289
    else:
285
290
        return bzrdir.format_registry.make_bzrdir("default-rich-root")
286
291
 
 
292
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
 
293
                                   'send_git', 'Git am-style diff format')
 
294
 
 
295
try:
 
296
    from bzrlib.diff import format_registry as diff_format_registry
 
297
except ImportError:
 
298
    pass
 
299
else:
 
300
    diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
 
301
        'GitDiffTree', 'Git am-style diff format')
 
302
 
287
303
def test_suite():
288
304
    from bzrlib.plugins.git import tests
289
305
    return tests.test_suite()