/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
    )
70
93
 
71
94
if getattr(sys, "frozen", None):
72
95
    # allow import additional libs from ./_lib for bzr.exe only
73
 
    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
 
74
112
 
75
113
_versions_checked = False
76
114
def lazy_check_versions():
77
115
    global _versions_checked
78
116
    if _versions_checked:
79
117
        return
 
118
    import_dulwich()
80
119
    _versions_checked = True
81
 
    try:
82
 
        from dulwich import __version__ as dulwich_version
83
 
    except ImportError:
84
 
        raise bzr_errors.DependencyNotPresent("dulwich",
85
 
            "bzr-git: Please install dulwich, https://launchpad.net/dulwich")
86
 
    else:
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)
89
 
 
90
 
bzrdir.format_registry.register_lazy('git',
91
 
    "bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
92
 
    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,
93
130
    )
94
131
 
95
132
from bzrlib.revisionspec import revspec_registry
105
142
    dwim_revspecs.append(RevisionSpec_git)
106
143
 
107
144
 
108
 
class GitBzrDirFormat(bzrdir.BzrDirFormat):
 
145
class GitControlDirFormat(ControlDirFormat):
109
146
 
110
147
    _lock_class = TransportLock
111
148
 
 
149
    colocated_branches = True
 
150
 
 
151
    def __eq__(self, other):
 
152
        return type(self) == type(other)
 
153
 
112
154
    def is_supported(self):
113
155
        return True
114
156
 
116
158
        return "git"
117
159
 
118
160
 
119
 
class LocalGitBzrDirFormat(GitBzrDirFormat):
120
 
    """The .git directory control format."""
121
 
 
122
 
    @classmethod
123
 
    def _known_formats(self):
124
 
        return set([LocalGitBzrDirFormat()])
125
 
 
126
 
    def open(self, transport, _found=None):
127
 
        """Open this directory.
128
 
 
129
 
        """
130
 
        lazy_check_versions()
131
 
        # we dont grok readonly - git isn't integrated with transport.
132
 
        from bzrlib.transport.local import LocalTransport
133
 
        if isinstance(transport, LocalTransport):
134
 
            import dulwich
135
 
            gitrepo = dulwich.repo.Repo(transport.local_abspath(".").encode(osutils._fs_enc))
136
 
        else:
137
 
            from bzrlib.plugins.git.transportgit import TransportRepo
138
 
            gitrepo = TransportRepo(transport)
139
 
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
140
 
        lockfiles = GitLockableFiles(transport, GitLock())
141
 
        return LocalGitDir(transport, lockfiles, gitrepo, self)
142
 
 
143
 
    @classmethod
144
 
    def probe_transport(klass, transport):
 
161
class LocalGitProber(Prober):
 
162
 
 
163
    def probe_transport(self, transport):
145
164
        try:
146
 
            if not (transport.has('info/refs') or 
147
 
                    transport.has('.git/branches') or 
148
 
                    transport.has('branches')):
 
165
            if not transport.has_any(['info/refs', '.git/branches',
 
166
                                      'branches']):
149
167
                raise bzr_errors.NotBranchError(path=transport.base)
150
168
        except bzr_errors.NoSuchFile:
151
169
            raise bzr_errors.NotBranchError(path=transport.base)
154
172
            raise bzr_errors.NotBranchError(path=transport.base)
155
173
        lazy_check_versions()
156
174
        import dulwich
157
 
        format = klass()
 
175
        from bzrlib.plugins.git.transportgit import TransportRepo
158
176
        try:
159
 
            format.open(transport)
160
 
            return format
 
177
            gitrepo = TransportRepo(transport)
161
178
        except dulwich.errors.NotGitRepository, e:
162
179
            raise bzr_errors.NotBranchError(path=transport.base)
163
 
        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):
 
188
    """The .git directory control format."""
 
189
 
 
190
    bare = False
 
191
 
 
192
    @classmethod
 
193
    def _known_formats(self):
 
194
        return set([LocalGitControlDirFormat()])
 
195
 
 
196
    def open(self, transport, _found=None):
 
197
        """Open this directory.
 
198
 
 
199
        """
 
200
        lazy_check_versions()
 
201
        from bzrlib.plugins.git.transportgit import TransportRepo
 
202
        gitrepo = TransportRepo(transport)
 
203
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
 
204
        lockfiles = GitLockableFiles(transport, GitLock())
 
205
        return LocalGitDir(transport, lockfiles, gitrepo, self)
 
206
 
 
207
    @classmethod
 
208
    def probe_transport(klass, transport):
 
209
        prober = LocalGitProber()
 
210
        return prober.probe_transport(transport)
164
211
 
165
212
    def get_format_description(self):
166
213
        return "Local Git Repository"
167
214
 
168
 
    def get_format_string(self):
169
 
        return "Local Git Repository"
170
 
 
171
215
    def initialize_on_transport(self, transport):
172
216
        from bzrlib.transport.local import LocalTransport
173
217
 
177
221
                "non-local transports")
178
222
        lazy_check_versions()
179
223
        from dulwich.repo import Repo
180
 
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc))
 
224
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
 
225
            bare=self.bare)
181
226
        return self.open(transport)
182
227
 
183
228
    def is_supported(self):
184
229
        return True
185
230
 
186
231
 
187
 
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):
188
262
    """The .git directory control format."""
189
263
 
 
264
    supports_workingtrees = False
 
265
 
190
266
    @classmethod
191
267
    def _known_formats(self):
192
 
        return set([RemoteGitBzrDirFormat()])
 
268
        return set([RemoteGitControlDirFormat()])
193
269
 
194
270
    def open(self, transport, _found=None):
195
271
        """Open this directory.
211
287
    @classmethod
212
288
    def probe_transport(klass, transport):
213
289
        """Our format is present if the transport ends in '.not/'."""
214
 
        url = transport.base
215
 
        if url.startswith('readonly+'):
216
 
            url = url[len('readonly+'):]
217
 
        if (not url.startswith("git://") and not url.startswith("git+")):
218
 
            raise bzr_errors.NotBranchError(transport.base)
219
 
        # little ugly, but works
220
 
        format = klass()
221
 
        from bzrlib.plugins.git.remote import GitSmartTransport
222
 
        if not isinstance(transport, GitSmartTransport):
223
 
            raise bzr_errors.NotBranchError(transport.base)
224
 
        return format
 
290
        prober = RemoteGitProber()
 
291
        return prober.probe_transport(transport)
225
292
 
226
293
    def get_format_description(self):
227
294
        return "Remote Git Repository"
228
295
 
229
 
    def get_format_string(self):
230
 
        return "Remote Git Repository"
231
 
 
232
296
    def initialize_on_transport(self, transport):
233
297
        raise bzr_errors.UninitializableFormat(self)
234
298
 
235
299
 
236
 
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
237
 
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)
238
310
 
239
311
register_transport_proto('git://',
240
312
        help="Access using the Git smart server protocol.")
252
324
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
253
325
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
254
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")
255
329
 
256
330
def update_stanza(rev, stanza):
257
331
    mapping = getattr(rev, "mapping", None)
271
345
    'Git Smart server protocol over TCP. (default port: 9418)')
272
346
 
273
347
 
274
 
from bzrlib.repository import network_format_registry as repository_network_format_registry
 
348
from bzrlib.repository import (
 
349
    network_format_registry as repository_network_format_registry,
 
350
    )
275
351
repository_network_format_registry.register_lazy('git',
276
352
    'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
277
353
 
278
 
from bzrlib.bzrdir import network_format_registry as bzrdir_network_format_registry
279
 
bzrdir_network_format_registry.register('git', GitBzrDirFormat)
280
 
 
281
 
 
282
 
def get_rich_root_format(stacked=False):
283
 
    if stacked:
284
 
        return bzrdir.format_registry.make_bzrdir("1.9-rich-root")
285
 
    else:
286
 
        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)
287
363
 
288
364
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
289
365
                                   'send_git', 'Git am-style diff format')
290
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')
 
378
 
291
379
def test_suite():
292
380
    from bzrlib.plugins.git import tests
293
381
    return tests.test_suite()