/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

https://launchpad.net/bugs/400598
Avoid 'No such revision' error when encountering submodules.

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