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