/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

Rename BzrDir to ControlDir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
50
50
    from bzrlib.controldir import (
51
51
        ControlDirFormat,
52
52
        ControlDir,
53
 
        Prober,
54
53
        format_registry,
55
54
        )
56
55
except ImportError:
62
61
        )
63
62
    ControlDir = BzrDir
64
63
    ControlDirFormat = BzrDirFormat
65
 
    Prober = object
66
 
    has_controldir = False
67
 
else:
68
 
    has_controldir = True
69
64
 
70
65
from bzrlib.foreign import (
71
66
    foreign_vcs_registry,
120
115
 
121
116
format_registry.register_lazy('git',
122
117
    "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,
 
118
    help='GIT repository.', native=False, experimental=True,
130
119
    )
131
120
 
132
121
from bzrlib.revisionspec import revspec_registry
158
147
        return "git"
159
148
 
160
149
 
161
 
class LocalGitProber(Prober):
162
 
 
163
 
    def probe_transport(self, transport):
 
150
class LocalGitControlDirFormat(GitControlDirFormat):
 
151
    """The .git directory control format."""
 
152
 
 
153
    @classmethod
 
154
    def _known_formats(self):
 
155
        return set([LocalGitControlDirFormat()])
 
156
 
 
157
    def open(self, transport, _found=None):
 
158
        """Open this directory.
 
159
 
 
160
        """
 
161
        lazy_check_versions()
 
162
        from bzrlib.plugins.git.transportgit import TransportRepo
 
163
        gitrepo = TransportRepo(transport)
 
164
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
 
165
        lockfiles = GitLockableFiles(transport, GitLock())
 
166
        return LocalGitDir(transport, lockfiles, gitrepo, self)
 
167
 
 
168
    @classmethod
 
169
    def probe_transport(klass, transport):
164
170
        try:
165
171
            if not transport.has_any(['info/refs', '.git/branches',
166
172
                                      'branches']):
172
178
            raise bzr_errors.NotBranchError(path=transport.base)
173
179
        lazy_check_versions()
174
180
        import dulwich
175
 
        from bzrlib.plugins.git.transportgit import TransportRepo
 
181
        format = klass()
176
182
        try:
177
 
            gitrepo = TransportRepo(transport)
 
183
            format.open(transport)
 
184
            return format
178
185
        except dulwich.errors.NotGitRepository, e:
179
186
            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)
 
187
        raise bzr_errors.NotBranchError(path=transport.base)
211
188
 
212
189
    def get_format_description(self):
213
190
        return "Local Git Repository"
214
191
 
 
192
    def get_format_string(self):
 
193
        return "Local Git Repository"
 
194
 
215
195
    def initialize_on_transport(self, transport):
216
196
        from bzrlib.transport.local import LocalTransport
217
197
 
221
201
                "non-local transports")
222
202
        lazy_check_versions()
223
203
        from dulwich.repo import Repo
224
 
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
225
 
            bare=self.bare)
 
204
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc))
226
205
        return self.open(transport)
227
206
 
228
207
    def is_supported(self):
229
208
        return True
230
209
 
231
210
 
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
211
class RemoteGitControlDirFormat(GitControlDirFormat):
262
212
    """The .git directory control format."""
263
213
 
264
 
    supports_workingtrees = False
265
 
 
266
214
    @classmethod
267
215
    def _known_formats(self):
268
216
        return set([RemoteGitControlDirFormat()])
287
235
    @classmethod
288
236
    def probe_transport(klass, transport):
289
237
        """Our format is present if the transport ends in '.not/'."""
290
 
        prober = RemoteGitProber()
291
 
        return prober.probe_transport(transport)
 
238
        url = transport.base
 
239
        if url.startswith('readonly+'):
 
240
            url = url[len('readonly+'):]
 
241
        if (not url.startswith("git://") and not url.startswith("git+")):
 
242
            raise bzr_errors.NotBranchError(transport.base)
 
243
        # little ugly, but works
 
244
        format = klass()
 
245
        from bzrlib.plugins.git.remote import GitSmartTransport
 
246
        if not isinstance(transport, GitSmartTransport):
 
247
            raise bzr_errors.NotBranchError(transport.base)
 
248
        return format
292
249
 
293
250
    def get_format_description(self):
294
251
        return "Remote Git Repository"
295
252
 
 
253
    def get_format_string(self):
 
254
        return "Remote Git Repository"
 
255
 
296
256
    def initialize_on_transport(self, transport):
297
257
        raise bzr_errors.UninitializableFormat(self)
298
258
 
299
259
 
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)
 
260
ControlDirFormat.register_control_format(LocalGitControlDirFormat)
 
261
ControlDirFormat.register_control_format(RemoteGitControlDirFormat)
310
262
 
311
263
register_transport_proto('git://',
312
264
        help="Access using the Git smart server protocol.")
351
303
repository_network_format_registry.register_lazy('git',
352
304
    'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
353
305
 
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)
 
306
from bzrlib.bzrdir import (
 
307
    network_format_registry as bzrdir_network_format_registry,
 
308
    )
 
309
bzrdir_network_format_registry.register('git', GitControlDirFormat)
363
310
 
364
311
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
365
312
                                   'send_git', 'Git am-style diff format')