/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

  • Committer: Jelmer Vernooij
  • Date: 2009-05-16 21:13:17 UTC
  • mto: (0.200.527 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090516211317-a0s14tsrf2qusapf
Fix tests.

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
 
from info import (
31
 
    bzr_compatible_versions,
32
 
    bzr_plugin_version as version_info,
33
 
    dulwich_minimum_version,
34
 
    )
 
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, 1, 'final', 0)
35
34
 
36
35
if version_info[3] == 'final':
37
36
    version_string = '%d.%d.%d' % version_info[:3]
39
38
    version_string = '%d.%d.%d%s%d' % version_info
40
39
__version__ = version_string
41
40
 
42
 
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
 
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)
43
45
 
44
46
 
45
47
from bzrlib import (
 
48
    bzrdir,
46
49
    errors as bzr_errors,
47
50
    osutils,
48
51
    )
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
52
from bzrlib.foreign import (
71
53
    foreign_vcs_registry,
72
54
    )
73
 
from bzrlib.help_topics import (
74
 
    topic_registry,
75
 
    )
76
55
from bzrlib.lockable_files import (
77
56
    TransportLock,
78
57
    )
83
62
from bzrlib.commands import (
84
63
    plugin_cmds,
85
64
    )
 
65
from bzrlib.trace import (
 
66
    warning,
 
67
    )
86
68
from bzrlib.version_info_formats.format_rio import (
87
69
    RioVersionInfoBuilder,
88
70
    )
89
 
from bzrlib.send import (
90
 
    format_registry as send_format_registry,
91
 
    )
92
71
 
93
72
 
94
73
if getattr(sys, "frozen", None):
95
74
    # 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
 
 
 
75
    sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib')))
112
76
 
113
77
_versions_checked = False
114
78
def lazy_check_versions():
115
79
    global _versions_checked
116
80
    if _versions_checked:
117
81
        return
118
 
    import_dulwich()
119
82
    _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,
 
83
    try:
 
84
        from dulwich import __version__ as dulwich_version
 
85
    except ImportError:
 
86
        raise ImportError("bzr-git: Please install dulwich, https://launchpad.net/dulwich")
 
87
    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)
 
90
 
 
91
bzrdir.format_registry.register_lazy('git', 
 
92
    "bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
 
93
    help='GIT repository.', native=False, experimental=True,
130
94
    )
131
95
 
132
96
from bzrlib.revisionspec import revspec_registry
133
 
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
 
97
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec", 
134
98
    "RevisionSpec_git")
135
99
 
136
 
try:
137
 
    from bzrlib.revisionspec import dwim_revspecs
138
 
except ImportError:
139
 
    pass
140
 
else:
141
 
    from bzrlib.plugins.git.revspec import RevisionSpec_git
142
 
    dwim_revspecs.append(RevisionSpec_git)
143
 
 
144
 
 
145
 
class GitControlDirFormat(ControlDirFormat):
146
 
 
 
100
 
 
101
class GitBzrDirFormat(bzrdir.BzrDirFormat):
147
102
    _lock_class = TransportLock
148
103
 
149
 
    colocated_branches = True
150
 
 
151
 
    def __eq__(self, other):
152
 
        return type(self) == type(other)
153
 
 
154
104
    def is_supported(self):
155
105
        return True
156
106
 
157
 
    def network_name(self):
158
 
        return "git"
159
 
 
160
 
 
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):
 
107
 
 
108
class LocalGitBzrDirFormat(GitBzrDirFormat):
188
109
    """The .git directory control format."""
189
110
 
190
 
    bare = False
191
 
 
192
111
    @classmethod
193
112
    def _known_formats(self):
194
 
        return set([LocalGitControlDirFormat()])
 
113
        return set([LocalGitBzrDirFormat()])
195
114
 
196
115
    def open(self, transport, _found=None):
197
116
        """Open this directory.
198
117
 
199
118
        """
200
 
        lazy_check_versions()
201
 
        from bzrlib.plugins.git.transportgit import TransportRepo
202
 
        gitrepo = TransportRepo(transport)
 
119
        import dulwich as git
 
120
        # we dont grok readonly - git isn't integrated with transport.
 
121
        url = transport.base
 
122
        if url.startswith('readonly+'):
 
123
            url = url[len('readonly+'):]
 
124
 
 
125
        try:
 
126
            gitrepo = git.repo.Repo(transport.local_abspath(".").encode(osutils._fs_enc))
 
127
        except bzr_errors.NotLocalUrl:
 
128
            raise bzr_errors.NotBranchError(path=transport.base)
203
129
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
204
130
        lockfiles = GitLockableFiles(transport, GitLock())
205
131
        return LocalGitDir(transport, lockfiles, gitrepo, self)
206
132
 
207
133
    @classmethod
208
134
    def probe_transport(klass, transport):
209
 
        prober = LocalGitProber()
210
 
        return prober.probe_transport(transport)
 
135
        """Our format is present if the transport ends in '.not/'."""
 
136
        from bzrlib.transport.local import LocalTransport
 
137
 
 
138
        if not isinstance(transport, LocalTransport):
 
139
            raise bzr_errors.NotBranchError(path=transport.base)
 
140
 
 
141
        # This should quickly filter out most things that are not 
 
142
        # git repositories, saving us the trouble from loading dulwich.
 
143
        if not transport.has(".git") and not transport.has("objects"):
 
144
            raise bzr_errors.NotBranchError(path=transport.base)
 
145
 
 
146
        import dulwich as git
 
147
        format = klass()
 
148
        try:
 
149
            format.open(transport)
 
150
            return format
 
151
        except git.errors.NotGitRepository, e:
 
152
            raise bzr_errors.NotBranchError(path=transport.base)
 
153
        raise bzr_errors.NotBranchError(path=transport.base)
211
154
 
212
155
    def get_format_description(self):
213
156
        return "Local Git Repository"
214
157
 
 
158
    def get_format_string(self):
 
159
        return "Local Git Repository"
 
160
 
215
161
    def initialize_on_transport(self, transport):
216
162
        from bzrlib.transport.local import LocalTransport
217
163
 
218
164
        if not isinstance(transport, LocalTransport):
219
 
            raise NotImplementedError(self.initialize,
 
165
            raise NotImplementedError(self.initialize, 
220
166
                "Can't create Git Repositories/branches on "
221
167
                "non-local transports")
222
 
        lazy_check_versions()
 
168
 
223
169
        from dulwich.repo import Repo
224
 
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
225
 
            bare=self.bare)
 
170
        Repo.create(transport.local_abspath(".").encode(osutils._fs_enc)) 
226
171
        return self.open(transport)
227
172
 
228
173
    def is_supported(self):
229
174
        return True
230
175
 
231
176
 
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):
 
177
class RemoteGitBzrDirFormat(GitBzrDirFormat):
262
178
    """The .git directory control format."""
263
179
 
264
 
    supports_workingtrees = False
265
 
 
266
180
    @classmethod
267
181
    def _known_formats(self):
268
 
        return set([RemoteGitControlDirFormat()])
 
182
        return set([RemoteGitBzrDirFormat()])
269
183
 
270
184
    def open(self, transport, _found=None):
271
185
        """Open this directory.
275
189
        url = transport.base
276
190
        if url.startswith('readonly+'):
277
191
            url = url[len('readonly+'):]
278
 
        if (not url.startswith("git://") and not url.startswith("git+")):
 
192
        if (not url.startswith("git://") and 
 
193
            not url.startswith("git+")):
279
194
            raise bzr_errors.NotBranchError(transport.base)
280
195
        from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
281
196
        if not isinstance(transport, GitSmartTransport):
287
202
    @classmethod
288
203
    def probe_transport(klass, transport):
289
204
        """Our format is present if the transport ends in '.not/'."""
290
 
        prober = RemoteGitProber()
291
 
        return prober.probe_transport(transport)
 
205
        url = transport.base
 
206
        if url.startswith('readonly+'):
 
207
            url = url[len('readonly+'):]
 
208
        if (not url.startswith("git://") and 
 
209
            not url.startswith("git+")):
 
210
            raise bzr_errors.NotBranchError(transport.base)
 
211
        # little ugly, but works
 
212
        format = klass()
 
213
        from bzrlib.plugins.git.remote import GitSmartTransport
 
214
        if not isinstance(transport, GitSmartTransport):
 
215
            raise bzr_errors.NotBranchError(transport.base)
 
216
        return format
292
217
 
293
218
    def get_format_description(self):
294
219
        return "Remote Git Repository"
295
220
 
 
221
    def get_format_string(self):
 
222
        return "Remote Git Repository"
 
223
 
296
224
    def initialize_on_transport(self, transport):
297
225
        raise bzr_errors.UninitializableFormat(self)
298
226
 
299
227
 
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)
 
228
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
 
229
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
310
230
 
311
 
register_transport_proto('git://',
 
231
register_transport_proto('git://', 
312
232
        help="Access using the Git smart server protocol.")
313
 
register_transport_proto('git+ssh://',
 
233
register_transport_proto('git+ssh://', 
314
234
        help="Access using the Git smart server protocol over SSH.")
315
235
 
316
236
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
318
238
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
319
239
                        'SSHGitSmartTransport')
320
240
 
321
 
foreign_vcs_registry.register_lazy("git",
 
241
foreign_vcs_registry.register_lazy("git", 
322
242
    "bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
323
243
 
 
244
plugin_cmds.register_lazy("cmd_git_serve", [], "bzrlib.plugins.git.commands")
324
245
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
325
 
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
 
246
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"], 
326
247
    "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
248
 
330
249
def update_stanza(rev, stanza):
331
250
    mapping = getattr(rev, "mapping", None)
337
256
if rio_hooks is not None:
338
257
    rio_hooks.install_named_hook('revision', update_stanza, None)
339
258
 
340
 
 
341
 
from bzrlib.transport import transport_server_registry
342
 
transport_server_registry.register_lazy('git',
343
 
    'bzrlib.plugins.git.server',
344
 
    'serve_git',
345
 
    'Git Smart server protocol over TCP. (default port: 9418)')
346
 
 
347
 
 
348
 
from bzrlib.repository import (
349
 
    network_format_registry as repository_network_format_registry,
350
 
    )
351
 
repository_network_format_registry.register_lazy('git',
352
 
    'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
353
 
 
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)
363
 
 
364
 
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
365
 
                                   'send_git', 'Git am-style diff format')
366
 
 
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')
 
259
def get_rich_root_format(stacked=False):
 
260
    if stacked:
 
261
        return bzrdir.format_registry.make_bzrdir("1.9-rich-root")
 
262
    else:
 
263
        return bzrdir.format_registry.make_bzrdir("default-rich-root")
378
264
 
379
265
def test_suite():
380
266
    from bzrlib.plugins.git import tests