/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 support for older versions of Dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
43
43
 
44
44
 
45
45
from bzrlib import (
 
46
    bzrdir,
46
47
    errors as bzr_errors,
47
48
    osutils,
48
49
    )
49
 
try:
50
 
    from bzrlib.controldir import (
51
 
        ControlDirFormat,
52
 
        ControlDir,
53
 
        Prober,
54
 
        format_registry,
55
 
        )
56
 
except ImportError:
57
 
    # bzr < 2.3
58
 
    from bzrlib.bzrdir import (
59
 
        BzrDirFormat,
60
 
        BzrDir,
61
 
        format_registry,
62
 
        )
63
 
    ControlDir = BzrDir
64
 
    ControlDirFormat = BzrDirFormat
65
 
    Prober = object
66
 
    has_controldir = False
67
 
else:
68
 
    has_controldir = True
69
 
 
70
50
from bzrlib.foreign import (
71
51
    foreign_vcs_registry,
72
52
    )
73
 
from bzrlib.help_topics import (
74
 
    topic_registry,
75
 
    )
76
53
from bzrlib.lockable_files import (
77
54
    TransportLock,
78
55
    )
93
70
 
94
71
if getattr(sys, "frozen", None):
95
72
    # allow import additional libs from ./_lib for bzr.exe only
96
 
    sys.path.append(os.path.normpath(
97
 
        os.path.join(os.path.dirname(__file__), '_lib')))
98
 
 
99
 
 
100
 
def import_dulwich():
101
 
    try:
102
 
        from dulwich import __version__ as dulwich_version
103
 
    except ImportError:
104
 
        raise bzr_errors.DependencyNotPresent("dulwich",
105
 
            "bzr-git: Please install dulwich, https://launchpad.net/dulwich")
106
 
    else:
107
 
        if dulwich_version < dulwich_minimum_version:
108
 
            raise bzr_errors.DependencyNotPresent("dulwich",
109
 
                "bzr-git: Dulwich is too old; at least %d.%d.%d is required" %
110
 
                    dulwich_minimum_version)
111
 
 
 
73
    sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib')))
112
74
 
113
75
_versions_checked = False
114
76
def lazy_check_versions():
115
77
    global _versions_checked
116
78
    if _versions_checked:
117
79
        return
118
 
    import_dulwich()
119
80
    _versions_checked = True
120
 
 
121
 
format_registry.register_lazy('git',
122
 
    "bzrlib.plugins.git.dir", "LocalGitControlDirFormat",
123
 
    help='GIT repository.', native=False, experimental=False,
124
 
    )
125
 
 
126
 
format_registry.register_lazy('git-bare',
127
 
    "bzrlib.plugins.git.dir", "BareLocalGitControlDirFormat",
128
 
    help='Bare GIT repository (no working tree).', native=False,
129
 
    experimental=False,
 
81
    try:
 
82
        from dulwich import __version__ as dulwich_version
 
83
    except ImportError:
 
84
        raise bzr_errors.DependencyNotPresent("dulwich", "bzr-git: Please install dulwich, https://launchpad.net/dulwich")
 
85
    else:
 
86
        if dulwich_version < dulwich_minimum_version:
 
87
            raise bzr_errors.DependencyNotPresent("dulwich", "bzr-git: Dulwich is too old; at least %d.%d.%d is required" % dulwich_minimum_version)
 
88
 
 
89
bzrdir.format_registry.register_lazy('git', 
 
90
    "bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
 
91
    help='GIT repository.', native=False, experimental=True,
130
92
    )
131
93
 
132
94
from bzrlib.revisionspec import revspec_registry
133
 
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
 
95
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec", 
134
96
    "RevisionSpec_git")
135
97
 
136
98
try:
142
104
    dwim_revspecs.append(RevisionSpec_git)
143
105
 
144
106
 
145
 
class GitControlDirFormat(ControlDirFormat):
 
107
class GitBzrDirFormat(bzrdir.BzrDirFormat):
146
108
 
147
109
    _lock_class = TransportLock
148
110
 
149
 
    colocated_branches = True
150
 
 
151
 
    def __eq__(self, other):
152
 
        return type(self) == type(other)
153
 
 
154
111
    def is_supported(self):
155
112
        return True
156
113
 
158
115
        return "git"
159
116
 
160
117
 
161
 
class LocalGitProber(Prober):
162
 
 
163
 
    def probe_transport(self, transport):
164
 
        try:
165
 
            if not transport.has_any(['info/refs', '.git/branches',
166
 
                                      'branches']):
167
 
                raise bzr_errors.NotBranchError(path=transport.base)
168
 
        except bzr_errors.NoSuchFile:
169
 
            raise bzr_errors.NotBranchError(path=transport.base)
170
 
        from bzrlib import urlutils
171
 
        if urlutils.split(transport.base)[1] == ".git":
172
 
            raise bzr_errors.NotBranchError(path=transport.base)
173
 
        lazy_check_versions()
174
 
        import dulwich
175
 
        from bzrlib.plugins.git.transportgit import TransportRepo
176
 
        try:
177
 
            gitrepo = TransportRepo(transport)
178
 
        except dulwich.errors.NotGitRepository, e:
179
 
            raise bzr_errors.NotBranchError(path=transport.base)
180
 
        else:
181
 
            if gitrepo.bare:
182
 
                return BareLocalGitControlDirFormat()
183
 
            else:
184
 
                return LocalGitControlDirFormat()
185
 
 
186
 
 
187
 
class LocalGitControlDirFormat(GitControlDirFormat):
 
118
class LocalGitBzrDirFormat(GitBzrDirFormat):
188
119
    """The .git directory control format."""
189
120
 
190
 
    bare = False
191
 
 
192
121
    @classmethod
193
122
    def _known_formats(self):
194
 
        return set([LocalGitControlDirFormat()])
 
123
        return set([LocalGitBzrDirFormat()])
195
124
 
196
125
    def open(self, transport, _found=None):
197
126
        """Open this directory.
198
127
 
199
128
        """
200
129
        lazy_check_versions()
201
 
        from bzrlib.plugins.git.transportgit import TransportRepo
202
 
        gitrepo = TransportRepo(transport)
 
130
        import dulwich
 
131
        # we dont grok readonly - git isn't integrated with transport.
 
132
        url = transport.base
 
133
        if url.startswith('readonly+'):
 
134
            url = url[len('readonly+'):]
 
135
 
 
136
        try:
 
137
            gitrepo = dulwich.repo.Repo(transport.local_abspath(".").encode(osutils._fs_enc))
 
138
        except bzr_errors.NotLocalUrl:
 
139
            raise bzr_errors.NotBranchError(path=transport.base)
203
140
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
204
141
        lockfiles = GitLockableFiles(transport, GitLock())
205
142
        return LocalGitDir(transport, lockfiles, gitrepo, self)
206
143
 
207
144
    @classmethod
208
145
    def probe_transport(klass, transport):
209
 
        prober = LocalGitProber()
210
 
        return prober.probe_transport(transport)
 
146
        """Our format is present if the transport ends in '.not/'."""
 
147
        from bzrlib.transport.local import LocalTransport
 
148
 
 
149
        if not isinstance(transport, LocalTransport):
 
150
            raise bzr_errors.NotBranchError(path=transport.base)
 
151
 
 
152
        # This should quickly filter out most things that are not 
 
153
        # git repositories, saving us the trouble from loading dulwich.
 
154
        if not transport.has(".git") and not transport.has("objects"):
 
155
            raise bzr_errors.NotBranchError(path=transport.base)
 
156
 
 
157
        lazy_check_versions()
 
158
        import dulwich
 
159
        format = klass()
 
160
        try:
 
161
            format.open(transport)
 
162
            return format
 
163
        except dulwich.errors.NotGitRepository, e:
 
164
            raise bzr_errors.NotBranchError(path=transport.base)
 
165
        raise bzr_errors.NotBranchError(path=transport.base)
211
166
 
212
167
    def get_format_description(self):
213
168
        return "Local Git Repository"
214
169
 
 
170
    def get_format_string(self):
 
171
        return "Local Git Repository"
 
172
 
215
173
    def initialize_on_transport(self, transport):
216
174
        from bzrlib.transport.local import LocalTransport
217
175
 
221
179
                "non-local transports")
222
180
        lazy_check_versions()
223
181
        from dulwich.repo import Repo
224
 
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
225
 
            bare=self.bare)
 
182
        Repo.create(transport.local_abspath(".").encode(osutils._fs_enc))
226
183
        return self.open(transport)
227
184
 
228
185
    def is_supported(self):
229
186
        return True
230
187
 
231
188
 
232
 
class BareLocalGitControlDirFormat(LocalGitControlDirFormat):
233
 
 
234
 
    bare = True
235
 
    supports_workingtrees = False
236
 
 
237
 
    @classmethod
238
 
    def _known_formats(self):
239
 
        return set([RemoteGitControlDirFormat()])
240
 
 
241
 
    def get_format_description(self):
242
 
        return "Local Git Repository (bare)"
243
 
 
244
 
 
245
 
class RemoteGitProber(Prober):
246
 
 
247
 
    def probe_transport(self, transport):
248
 
        url = transport.base
249
 
        if url.startswith('readonly+'):
250
 
            url = url[len('readonly+'):]
251
 
        if (not url.startswith("git://") and not url.startswith("git+")):
252
 
            raise bzr_errors.NotBranchError(transport.base)
253
 
        # little ugly, but works
254
 
        from bzrlib.plugins.git.remote import GitSmartTransport
255
 
        if not isinstance(transport, GitSmartTransport):
256
 
            raise bzr_errors.NotBranchError(transport.base)
257
 
        return RemoteGitControlDirFormat()
258
 
 
259
 
 
260
 
 
261
 
class RemoteGitControlDirFormat(GitControlDirFormat):
 
189
class RemoteGitBzrDirFormat(GitBzrDirFormat):
262
190
    """The .git directory control format."""
263
191
 
264
 
    supports_workingtrees = False
265
 
 
266
192
    @classmethod
267
193
    def _known_formats(self):
268
 
        return set([RemoteGitControlDirFormat()])
 
194
        return set([RemoteGitBzrDirFormat()])
269
195
 
270
196
    def open(self, transport, _found=None):
271
197
        """Open this directory.
275
201
        url = transport.base
276
202
        if url.startswith('readonly+'):
277
203
            url = url[len('readonly+'):]
278
 
        if (not url.startswith("git://") and not url.startswith("git+")):
 
204
        if (not url.startswith("git://") and 
 
205
            not url.startswith("git+")):
279
206
            raise bzr_errors.NotBranchError(transport.base)
280
207
        from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
281
208
        if not isinstance(transport, GitSmartTransport):
287
214
    @classmethod
288
215
    def probe_transport(klass, transport):
289
216
        """Our format is present if the transport ends in '.not/'."""
290
 
        prober = RemoteGitProber()
291
 
        return prober.probe_transport(transport)
 
217
        url = transport.base
 
218
        if url.startswith('readonly+'):
 
219
            url = url[len('readonly+'):]
 
220
        if (not url.startswith("git://") and 
 
221
            not url.startswith("git+")):
 
222
            raise bzr_errors.NotBranchError(transport.base)
 
223
        # little ugly, but works
 
224
        format = klass()
 
225
        from bzrlib.plugins.git.remote import GitSmartTransport
 
226
        if not isinstance(transport, GitSmartTransport):
 
227
            raise bzr_errors.NotBranchError(transport.base)
 
228
        return format
292
229
 
293
230
    def get_format_description(self):
294
231
        return "Remote Git Repository"
295
232
 
 
233
    def get_format_string(self):
 
234
        return "Remote Git Repository"
 
235
 
296
236
    def initialize_on_transport(self, transport):
297
237
        raise bzr_errors.UninitializableFormat(self)
298
238
 
299
239
 
300
 
if has_controldir:
301
 
    ControlDirFormat.register_format(LocalGitControlDirFormat())
302
 
    ControlDirFormat.register_format(BareLocalGitControlDirFormat())
303
 
    ControlDirFormat.register_format(RemoteGitControlDirFormat())
304
 
    ControlDirFormat.register_prober(LocalGitProber)
305
 
    ControlDirFormat.register_prober(RemoteGitProber)
306
 
else:
307
 
    ControlDirFormat.register_control_format(LocalGitControlDirFormat)
308
 
    ControlDirFormat.register_control_format(BareLocalGitControlDirFormat)
309
 
    ControlDirFormat.register_control_format(RemoteGitControlDirFormat)
 
240
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
 
241
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
310
242
 
311
 
register_transport_proto('git://',
 
243
register_transport_proto('git://', 
312
244
        help="Access using the Git smart server protocol.")
313
 
register_transport_proto('git+ssh://',
 
245
register_transport_proto('git+ssh://', 
314
246
        help="Access using the Git smart server protocol over SSH.")
315
247
 
316
248
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
318
250
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
319
251
                        'SSHGitSmartTransport')
320
252
 
321
 
foreign_vcs_registry.register_lazy("git",
 
253
foreign_vcs_registry.register_lazy("git", 
322
254
    "bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
323
255
 
324
256
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
325
 
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
 
257
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"], 
326
258
    "bzrlib.plugins.git.commands")
327
 
plugin_cmds.register_lazy("cmd_git_refs", [], "bzrlib.plugins.git.commands")
328
 
plugin_cmds.register_lazy("cmd_git_apply", [], "bzrlib.plugins.git.commands")
329
259
 
330
260
def update_stanza(rev, stanza):
331
261
    mapping = getattr(rev, "mapping", None)
340
270
 
341
271
from bzrlib.transport import transport_server_registry
342
272
transport_server_registry.register_lazy('git',
343
 
    'bzrlib.plugins.git.server',
 
273
    'bzrlib.plugins.git.server', 
344
274
    'serve_git',
345
275
    'Git Smart server protocol over TCP. (default port: 9418)')
346
276
 
347
277
 
348
 
from bzrlib.repository import (
349
 
    network_format_registry as repository_network_format_registry,
350
 
    )
351
 
repository_network_format_registry.register_lazy('git',
 
278
from bzrlib.repository import network_format_registry as repository_network_format_registry
 
279
repository_network_format_registry.register_lazy('git', 
352
280
    'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
353
281
 
354
 
try:
355
 
    from bzrlib.controldir import (
356
 
        network_format_registry as controldir_network_format_registry,
357
 
        )
358
 
except ImportError:
359
 
    from bzrlib.bzrdir import (
360
 
        network_format_registry as controldir_network_format_registry,
361
 
        )
362
 
controldir_network_format_registry.register('git', GitControlDirFormat)
 
282
from bzrlib.bzrdir import network_format_registry as bzrdir_network_format_registry
 
283
bzrdir_network_format_registry.register('git', GitBzrDirFormat)
 
284
 
 
285
 
 
286
def get_rich_root_format(stacked=False):
 
287
    if stacked:
 
288
        return bzrdir.format_registry.make_bzrdir("1.9-rich-root")
 
289
    else:
 
290
        return bzrdir.format_registry.make_bzrdir("default-rich-root")
363
291
 
364
292
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
365
293
                                   'send_git', 'Git am-style diff format')
366
294
 
367
 
topic_registry.register_lazy('git',
368
 
                             'bzrlib.plugins.git.help',
369
 
                             'help_git', 'Using Bazaar with Git')
370
 
 
371
 
try:
372
 
    from bzrlib.diff import format_registry as diff_format_registry
373
 
except ImportError:
374
 
    pass
375
 
else:
376
 
    diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
377
 
        'GitDiffTree', 'Git am-style diff format')
378
 
 
379
295
def test_suite():
380
296
    from bzrlib.plugins.git import tests
381
297
    return tests.test_suite()