/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

More work on roundtrip push support.

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, 1, 'final', 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 (
48
 
    bzrdir,
49
46
    errors as bzr_errors,
50
47
    osutils,
51
48
    )
 
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
 
52
70
from bzrlib.foreign import (
53
71
    foreign_vcs_registry,
54
72
    )
 
73
from bzrlib.help_topics import (
 
74
    topic_registry,
 
75
    )
55
76
from bzrlib.lockable_files import (
56
77
    TransportLock,
57
78
    )
62
83
from bzrlib.commands import (
63
84
    plugin_cmds,
64
85
    )
65
 
from bzrlib.trace import (
66
 
    warning,
67
 
    )
68
86
from bzrlib.version_info_formats.format_rio import (
69
87
    RioVersionInfoBuilder,
70
88
    )
 
89
from bzrlib.send import (
 
90
    format_registry as send_format_registry,
 
91
    )
71
92
 
72
93
 
73
94
if getattr(sys, "frozen", None):
74
95
    # allow import additional libs from ./_lib for bzr.exe only
75
 
    sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib')))
 
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
 
76
112
 
77
113
_versions_checked = False
78
114
def lazy_check_versions():
79
115
    global _versions_checked
80
116
    if _versions_checked:
81
117
        return
 
118
    import_dulwich()
82
119
    _versions_checked = True
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,
 
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,
94
130
    )
95
131
 
96
132
from bzrlib.revisionspec import revspec_registry
97
 
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec", 
 
133
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
98
134
    "RevisionSpec_git")
99
135
 
100
 
 
101
 
class GitBzrDirFormat(bzrdir.BzrDirFormat):
 
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
 
102
147
    _lock_class = TransportLock
103
148
 
 
149
    colocated_branches = True
 
150
 
 
151
    def __eq__(self, other):
 
152
        return type(self) == type(other)
 
153
 
104
154
    def is_supported(self):
105
155
        return True
106
156
 
107
 
 
108
 
class LocalGitBzrDirFormat(GitBzrDirFormat):
 
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):
109
188
    """The .git directory control format."""
110
189
 
 
190
    bare = False
 
191
 
111
192
    @classmethod
112
193
    def _known_formats(self):
113
 
        return set([LocalGitBzrDirFormat()])
 
194
        return set([LocalGitControlDirFormat()])
114
195
 
115
196
    def open(self, transport, _found=None):
116
197
        """Open this directory.
117
198
 
118
199
        """
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)
 
200
        lazy_check_versions()
 
201
        from bzrlib.plugins.git.transportgit import TransportRepo
 
202
        gitrepo = TransportRepo(transport)
129
203
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
130
204
        lockfiles = GitLockableFiles(transport, GitLock())
131
205
        return LocalGitDir(transport, lockfiles, gitrepo, self)
132
206
 
133
207
    @classmethod
134
208
    def probe_transport(klass, 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)
 
209
        prober = LocalGitProber()
 
210
        return prober.probe_transport(transport)
154
211
 
155
212
    def get_format_description(self):
156
213
        return "Local Git Repository"
157
214
 
158
 
    def get_format_string(self):
159
 
        return "Local Git Repository"
160
 
 
161
215
    def initialize_on_transport(self, transport):
162
216
        from bzrlib.transport.local import LocalTransport
163
217
 
164
218
        if not isinstance(transport, LocalTransport):
165
 
            raise NotImplementedError(self.initialize, 
 
219
            raise NotImplementedError(self.initialize,
166
220
                "Can't create Git Repositories/branches on "
167
221
                "non-local transports")
168
 
 
 
222
        lazy_check_versions()
169
223
        from dulwich.repo import Repo
170
 
        Repo.create(transport.local_abspath(".").encode(osutils._fs_enc)) 
 
224
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
 
225
            bare=self.bare)
171
226
        return self.open(transport)
172
227
 
173
228
    def is_supported(self):
174
229
        return True
175
230
 
176
231
 
177
 
class RemoteGitBzrDirFormat(GitBzrDirFormat):
 
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):
178
262
    """The .git directory control format."""
179
263
 
 
264
    supports_workingtrees = False
 
265
 
180
266
    @classmethod
181
267
    def _known_formats(self):
182
 
        return set([RemoteGitBzrDirFormat()])
 
268
        return set([RemoteGitControlDirFormat()])
183
269
 
184
270
    def open(self, transport, _found=None):
185
271
        """Open this directory.
189
275
        url = transport.base
190
276
        if url.startswith('readonly+'):
191
277
            url = url[len('readonly+'):]
192
 
        if (not url.startswith("git://") and 
193
 
            not url.startswith("git+")):
 
278
        if (not url.startswith("git://") and not url.startswith("git+")):
194
279
            raise bzr_errors.NotBranchError(transport.base)
195
280
        from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
196
281
        if not isinstance(transport, GitSmartTransport):
202
287
    @classmethod
203
288
    def probe_transport(klass, transport):
204
289
        """Our format is present if the transport ends in '.not/'."""
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
 
290
        prober = RemoteGitProber()
 
291
        return prober.probe_transport(transport)
217
292
 
218
293
    def get_format_description(self):
219
294
        return "Remote Git Repository"
220
295
 
221
 
    def get_format_string(self):
222
 
        return "Remote Git Repository"
223
 
 
224
296
    def initialize_on_transport(self, transport):
225
297
        raise bzr_errors.UninitializableFormat(self)
226
298
 
227
299
 
228
 
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
229
 
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
 
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)
230
310
 
231
 
register_transport_proto('git://', 
 
311
register_transport_proto('git://',
232
312
        help="Access using the Git smart server protocol.")
233
 
register_transport_proto('git+ssh://', 
 
313
register_transport_proto('git+ssh://',
234
314
        help="Access using the Git smart server protocol over SSH.")
235
315
 
236
316
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
238
318
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
239
319
                        'SSHGitSmartTransport')
240
320
 
241
 
foreign_vcs_registry.register_lazy("git", 
 
321
foreign_vcs_registry.register_lazy("git",
242
322
    "bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
243
323
 
244
 
plugin_cmds.register_lazy("cmd_git_serve", [], "bzrlib.plugins.git.commands")
245
324
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
246
 
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"], 
 
325
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
247
326
    "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")
248
329
 
249
330
def update_stanza(rev, stanza):
250
331
    mapping = getattr(rev, "mapping", None)
256
337
if rio_hooks is not None:
257
338
    rio_hooks.install_named_hook('revision', update_stanza, None)
258
339
 
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")
 
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')
264
378
 
265
379
def test_suite():
266
380
    from bzrlib.plugins.git import tests