/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

Remove invalid comments.

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