/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

Import gettext.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
41
41
 
42
42
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
43
43
 
 
44
try:
 
45
    from bzrlib.i18n import load_plugin_translations
 
46
except ImportError: # No translations for bzr < 2.5
 
47
    gettext = lambda x: x
 
48
else:
 
49
    translation = load_plugin_translations("bzr-git")
 
50
    gettext = translation.gettext
44
51
 
45
52
from bzrlib import (
46
53
    errors as bzr_errors,
47
 
    osutils,
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
 
54
    trace,
 
55
    )
 
56
 
 
57
from bzrlib.controldir import (
 
58
    ControlDirFormat,
 
59
    Prober,
 
60
    format_registry,
 
61
    network_format_registry as controldir_network_format_registry,
 
62
    )
69
63
 
70
64
from bzrlib.foreign import (
71
65
    foreign_vcs_registry,
73
67
from bzrlib.help_topics import (
74
68
    topic_registry,
75
69
    )
76
 
from bzrlib.lockable_files import (
77
 
    TransportLock,
78
 
    )
79
70
from bzrlib.transport import (
80
71
    register_lazy_transport,
81
72
    register_transport_proto,
83
74
from bzrlib.commands import (
84
75
    plugin_cmds,
85
76
    )
86
 
from bzrlib.version_info_formats.format_rio import (
87
 
    RioVersionInfoBuilder,
88
 
    )
89
77
from bzrlib.send import (
90
78
    format_registry as send_format_registry,
91
79
    )
133
121
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
134
122
    "RevisionSpec_git")
135
123
 
136
 
try:
137
 
    from bzrlib.revisionspec import dwim_revspecs
138
 
except ImportError:
139
 
    pass
140
 
else:
 
124
from bzrlib.revisionspec import dwim_revspecs, RevisionSpec_dwim
 
125
if getattr(RevisionSpec_dwim, "append_possible_lazy_revspec", None):
 
126
    RevisionSpec_dwim.append_possible_lazy_revspec(
 
127
        "bzrlib.plugins.git.revspec", "RevisionSpec_git")
 
128
else: # bzr < 2.4
141
129
    from bzrlib.plugins.git.revspec import RevisionSpec_git
142
130
    dwim_revspecs.append(RevisionSpec_git)
143
131
 
144
132
 
145
 
class GitControlDirFormat(ControlDirFormat):
146
 
 
147
 
    _lock_class = TransportLock
148
 
 
149
 
    colocated_branches = True
150
 
 
151
 
    def __eq__(self, other):
152
 
        return type(self) == type(other)
153
 
 
154
 
    def is_supported(self):
155
 
        return True
156
 
 
157
 
    def network_name(self):
158
 
        return "git"
159
 
 
160
 
 
161
133
class LocalGitProber(Prober):
162
134
 
163
135
    def probe_transport(self, transport):
164
136
        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:
 
137
            external_url = transport.external_url()
 
138
        except bzr_errors.InProcessTransport:
 
139
            raise bzr_errors.NotBranchError(path=transport.base)
 
140
        if (external_url.startswith("http:") or
 
141
            external_url.startswith("https:")):
 
142
            # Already handled by RemoteGitProber
169
143
            raise bzr_errors.NotBranchError(path=transport.base)
170
144
        from bzrlib import urlutils
171
145
        if urlutils.split(transport.base)[1] == ".git":
172
146
            raise bzr_errors.NotBranchError(path=transport.base)
 
147
        if not transport.has_any(['objects', '.git/objects']):
 
148
            raise bzr_errors.NotBranchError(path=transport.base)
173
149
        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)
 
150
        from bzrlib.plugins.git.dir import (
 
151
            BareLocalGitControlDirFormat,
 
152
            LocalGitControlDirFormat,
 
153
            )
 
154
        if transport.has_any(['.git/objects']):
 
155
            return LocalGitControlDirFormat()
 
156
        if transport.has('info') and transport.has('objects'):
 
157
            return BareLocalGitControlDirFormat()
 
158
        raise bzr_errors.NotBranchError(path=transport.base)
 
159
 
 
160
    @classmethod
 
161
    def known_formats(cls):
 
162
        from bzrlib.plugins.git.dir import (
 
163
            BareLocalGitControlDirFormat,
 
164
            LocalGitControlDirFormat,
 
165
            )
 
166
        return set([BareLocalGitControlDirFormat(), LocalGitControlDirFormat()])
 
167
 
 
168
 
 
169
class RemoteGitProber(Prober):
 
170
 
 
171
    def probe_http_transport(self, transport):
 
172
        from bzrlib import urlutils
 
173
        url = urlutils.join(transport.external_url(), "info/refs") + "?service=git-upload-pack"
 
174
        from bzrlib.transport.http._urllib import HttpTransport_urllib, Request
 
175
        if isinstance(transport, HttpTransport_urllib):
 
176
            req = Request('GET', url, accepted_errors=[200, 403, 404, 405],
 
177
                          headers={"Content-Type": "application/x-git-upload-pack-request"})
 
178
            req.follow_redirections = True
 
179
            resp = transport._perform(req)
 
180
            if resp.code == 404:
 
181
                raise bzr_errors.NotBranchError(transport.base)
 
182
            headers = resp.headers
180
183
        else:
181
 
            if gitrepo.bare:
182
 
                return BareLocalGitControlDirFormat()
 
184
            try:
 
185
                from bzrlib.transport.http._pycurl import PyCurlTransport
 
186
            except bzr_errors.DependencyNotPresent:
 
187
                raise bzr_errors.NotBranchError(transport.base)
183
188
            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)
211
 
 
212
 
    def get_format_description(self):
213
 
        return "Local Git Repository"
214
 
 
215
 
    def initialize_on_transport(self, transport):
216
 
        from bzrlib.transport.local import LocalTransport
217
 
 
218
 
        if not isinstance(transport, LocalTransport):
219
 
            raise NotImplementedError(self.initialize,
220
 
                "Can't create Git Repositories/branches on "
221
 
                "non-local transports")
222
 
        lazy_check_versions()
223
 
        from dulwich.repo import Repo
224
 
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
225
 
            bare=self.bare)
226
 
        return self.open(transport)
227
 
 
228
 
    def is_supported(self):
229
 
        return True
230
 
 
231
 
 
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):
 
189
                import pycurl
 
190
                from cStringIO import StringIO
 
191
                if isinstance(transport, PyCurlTransport):
 
192
                    conn = transport._get_curl()
 
193
                    conn.setopt(pycurl.URL, url)
 
194
                    transport._set_curl_options(conn)
 
195
                    conn.setopt(pycurl.HTTPGET, 1)
 
196
                    header = StringIO()
 
197
                    data = StringIO()
 
198
                    conn.setopt(pycurl.HEADERFUNCTION, header.write)
 
199
                    conn.setopt(pycurl.WRITEFUNCTION, data.write)
 
200
                    transport._curl_perform(conn, header,
 
201
                        ["Content-Type: application/x-git-upload-pack-request"])
 
202
                    code = conn.getinfo(pycurl.HTTP_CODE)
 
203
                    if code == 404:
 
204
                        raise bzr_errors.NotBranchError(transport.base)
 
205
                    if code != 200:
 
206
                        raise bzr_errors.InvalidHttpResponse(transport._path,
 
207
                            str(code))
 
208
                    headers = transport._parse_headers(header)
 
209
                else:
 
210
                    raise bzr_errors.NotBranchError(transport.base)
 
211
        ct = headers.getheader("Content-Type")
 
212
        if ct is None:
 
213
            raise bzr_errors.NotBranchError(transport.base)
 
214
        if ct.startswith("application/x-git"):
 
215
            from bzrlib.plugins.git.remote import RemoteGitControlDirFormat
 
216
            return RemoteGitControlDirFormat()
 
217
        else:
 
218
            from bzrlib.plugins.git.dir import (
 
219
                BareLocalGitControlDirFormat,
 
220
                )
 
221
            return BareLocalGitControlDirFormat()
246
222
 
247
223
    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+")):
 
224
        try:
 
225
            external_url = transport.external_url()
 
226
        except bzr_errors.InProcessTransport:
 
227
            raise bzr_errors.NotBranchError(path=transport.base)
 
228
 
 
229
        if (external_url.startswith("http:") or
 
230
            external_url.startswith("https:")):
 
231
            return self.probe_http_transport(transport)
 
232
 
 
233
        if (not external_url.startswith("git://") and
 
234
            not external_url.startswith("git+")):
252
235
            raise bzr_errors.NotBranchError(transport.base)
 
236
 
253
237
        # 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):
262
 
    """The .git directory control format."""
263
 
 
264
 
    supports_workingtrees = False
 
238
        from bzrlib.plugins.git.remote import (
 
239
            GitSmartTransport,
 
240
            RemoteGitControlDirFormat,
 
241
            )
 
242
        if isinstance(transport, GitSmartTransport):
 
243
            return RemoteGitControlDirFormat()
 
244
        raise bzr_errors.NotBranchError(path=transport.base)
265
245
 
266
246
    @classmethod
267
 
    def _known_formats(self):
 
247
    def known_formats(cls):
 
248
        from bzrlib.plugins.git.remote import RemoteGitControlDirFormat
268
249
        return set([RemoteGitControlDirFormat()])
269
250
 
270
 
    def open(self, transport, _found=None):
271
 
        """Open this directory.
272
 
 
273
 
        """
274
 
        # we dont grok readonly - git isn't integrated with transport.
275
 
        url = transport.base
276
 
        if url.startswith('readonly+'):
277
 
            url = url[len('readonly+'):]
278
 
        if (not url.startswith("git://") and not url.startswith("git+")):
279
 
            raise bzr_errors.NotBranchError(transport.base)
280
 
        from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
281
 
        if not isinstance(transport, GitSmartTransport):
282
 
            raise bzr_errors.NotBranchError(transport.base)
283
 
        from bzrlib.plugins.git.dir import GitLockableFiles, GitLock
284
 
        lockfiles = GitLockableFiles(transport, GitLock())
285
 
        return RemoteGitDir(transport, lockfiles, self)
286
 
 
287
 
    @classmethod
288
 
    def probe_transport(klass, transport):
289
 
        """Our format is present if the transport ends in '.not/'."""
290
 
        prober = RemoteGitProber()
291
 
        return prober.probe_transport(transport)
292
 
 
293
 
    def get_format_description(self):
294
 
        return "Remote Git Repository"
295
 
 
296
 
    def initialize_on_transport(self, transport):
297
 
        raise bzr_errors.UninitializableFormat(self)
298
 
 
299
 
 
300
 
if has_controldir:
 
251
 
 
252
if not getattr(Prober, "known_formats", None): # bzr < 2.4
 
253
    from bzrlib.plugins.git.dir import (
 
254
        LocalGitControlDirFormat, BareLocalGitControlDirFormat,
 
255
        )
 
256
    from bzrlib.plugins.git.remote import RemoteGitControlDirFormat
301
257
    ControlDirFormat.register_format(LocalGitControlDirFormat())
302
258
    ControlDirFormat.register_format(BareLocalGitControlDirFormat())
303
259
    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
    # Provide RevisionTree.get_file_revision, so various parts of bzr-svn
 
261
    # can avoid inventories.
 
262
    from bzrlib.revisiontree import RevisionTree
 
263
    def get_file_revision(tree, file_id, path=None):
 
264
        return tree.inventory[file_id].revision
 
265
    RevisionTree.get_file_revision = get_file_revision
 
266
 
 
267
ControlDirFormat.register_prober(LocalGitProber)
 
268
ControlDirFormat._server_probers.insert(0, RemoteGitProber)
310
269
 
311
270
register_transport_proto('git://',
312
271
        help="Access using the Git smart server protocol.")
319
278
                        'SSHGitSmartTransport')
320
279
 
321
280
foreign_vcs_registry.register_lazy("git",
322
 
    "bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
 
281
    "bzrlib.plugins.git.mapping", "foreign_vcs_git", "Stupid content tracker")
323
282
 
324
283
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
325
284
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
327
286
plugin_cmds.register_lazy("cmd_git_refs", [], "bzrlib.plugins.git.commands")
328
287
plugin_cmds.register_lazy("cmd_git_apply", [], "bzrlib.plugins.git.commands")
329
288
 
 
289
def extract_git_foreign_revid(rev):
 
290
    try:
 
291
        foreign_revid = rev.foreign_revid
 
292
    except AttributeError:
 
293
        from bzrlib.plugins.git.mapping import mapping_registry
 
294
        foreign_revid, mapping = \
 
295
            mapping_registry.parse_revision_id(rev.revision_id)
 
296
        return foreign_revid
 
297
    else:
 
298
        from bzrlib.plugins.git.mapping import foreign_vcs_git
 
299
        if rev.mapping.vcs == foreign_vcs_git:
 
300
            return foreign_revid
 
301
        else:
 
302
            raise bzr_errors.InvalidRevisionId(rev.revision_id, None)
 
303
 
 
304
 
330
305
def update_stanza(rev, stanza):
331
306
    mapping = getattr(rev, "mapping", None)
332
 
    if mapping is not None and mapping.revid_prefix.startswith("git-"):
333
 
        stanza.add("git-commit", rev.foreign_revid)
334
 
 
335
 
 
336
 
rio_hooks = getattr(RioVersionInfoBuilder, "hooks", None)
337
 
if rio_hooks is not None:
338
 
    rio_hooks.install_named_hook('revision', update_stanza, None)
 
307
    try:
 
308
        git_commit = extract_git_foreign_revid(rev)
 
309
    except bzr_errors.InvalidRevisionId:
 
310
        pass
 
311
    else:
 
312
        stanza.add("git-commit", git_commit)
 
313
 
 
314
try:
 
315
    from bzrlib.hooks import install_lazy_named_hook
 
316
except ImportError: # Compatibility with bzr < 2.4
 
317
    from bzrlib.version_info_formats.format_rio import (
 
318
        RioVersionInfoBuilder,
 
319
        )
 
320
    RioVersionInfoBuilder.hooks.install_named_hook('revision', update_stanza,
 
321
        "git commits")
 
322
else:
 
323
    install_lazy_named_hook("bzrlib.version_info_formats.format_rio",
 
324
        "RioVersionInfoBuilder.hooks", "revision", update_stanza,
 
325
        "git commits")
339
326
 
340
327
 
341
328
from bzrlib.transport import transport_server_registry
346
333
 
347
334
 
348
335
from bzrlib.repository import (
 
336
    format_registry as repository_format_registry,
349
337
    network_format_registry as repository_network_format_registry,
350
338
    )
351
339
repository_network_format_registry.register_lazy('git',
352
340
    'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
353
341
 
354
342
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)
 
343
    register_extra_lazy_repository_format = getattr(repository_format_registry,
 
344
        "register_extra_lazy")
 
345
except AttributeError: # bzr < 2.4
 
346
    pass
 
347
else:
 
348
    register_extra_lazy_repository_format('bzrlib.plugins.git.repository',
 
349
        'GitRepositoryFormat')
 
350
 
 
351
from bzrlib.branch import (
 
352
    network_format_registry as branch_network_format_registry,
 
353
    )
 
354
branch_network_format_registry.register_lazy('git',
 
355
    'bzrlib.plugins.git.branch', 'GitBranchFormat')
 
356
 
 
357
try:
 
358
    from bzrlib.branch import (
 
359
        format_registry as branch_format_registry,
 
360
        )
 
361
except ImportError: # bzr < 2.4
 
362
    pass
 
363
else:
 
364
    branch_format_registry.register_extra_lazy(
 
365
        'bzrlib.plugins.git.branch',
 
366
        'GitBranchFormat',
 
367
        )
 
368
 
 
369
try:
 
370
    from bzrlib.workingtree import (
 
371
        format_registry as workingtree_format_registry,
 
372
        )
 
373
except ImportError: # bzr < 2.4
 
374
    pass
 
375
else:
 
376
    workingtree_format_registry.register_extra_lazy(
 
377
        'bzrlib.plugins.git.workingtree',
 
378
        'GitWorkingTreeFormat',
 
379
        )
 
380
 
 
381
controldir_network_format_registry.register_lazy('git',
 
382
    "bzrlib.plugins.git.dir", "GitControlDirFormat")
363
383
 
364
384
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
365
385
                                   'send_git', 'Git am-style diff format')
366
386
 
367
 
topic_registry.register_lazy('git',
368
 
                             'bzrlib.plugins.git.help',
369
 
                             'help_git', 'Using Bazaar with Git')
 
387
topic_registry.register_lazy('git', 'bzrlib.plugins.git.help', 'help_git',
 
388
    'Using Bazaar with Git')
 
389
 
 
390
from bzrlib.diff import format_registry as diff_format_registry
 
391
diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
 
392
    'GitDiffTree', 'Git am-style diff format')
 
393
 
 
394
 
 
395
def update_git_cache(repository, revid):
 
396
    """Update the git cache after a local commit."""
 
397
    if getattr(repository, "_git", None) is not None:
 
398
        return # No need to update cache for git repositories
 
399
 
 
400
    if not repository.control_transport.has("git"):
 
401
        return # No existing cache, don't bother updating
 
402
    try:
 
403
        lazy_check_versions()
 
404
    except bzr_errors.DependencyNotPresent, e:
 
405
        # dulwich is probably missing. silently ignore
 
406
        trace.mutter("not updating git map for %r: %s",
 
407
            repository, e)
 
408
 
 
409
    from bzrlib.plugins.git.object_store import BazaarObjectStore
 
410
    store = BazaarObjectStore(repository)
 
411
    store.lock_write()
 
412
    try:
 
413
        parent_revisions = set(repository.get_parent_map([revid])[revid])
 
414
        missing_revisions = store._missing_revisions(parent_revisions)
 
415
        if not missing_revisions:
 
416
            # Only update if the cache was up to date previously
 
417
            store._update_sha_map_revision(revid)
 
418
    finally:
 
419
        store.unlock()
 
420
 
 
421
 
 
422
def post_commit_update_cache(local_branch, master_branch, old_revno, old_revid,
 
423
        new_revno, new_revid):
 
424
    if local_branch is not None:
 
425
        update_git_cache(local_branch.repository, new_revid)
 
426
    update_git_cache(master_branch.repository, new_revid)
 
427
 
370
428
 
371
429
try:
372
 
    from bzrlib.diff import format_registry as diff_format_registry
373
 
except ImportError:
 
430
    from bzrlib.hooks import install_lazy_named_hook
 
431
except ImportError: # Compatibility with bzr < 2.4
374
432
    pass
375
433
else:
376
 
    diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
377
 
        'GitDiffTree', 'Git am-style diff format')
 
434
    install_lazy_named_hook("bzrlib.branch",
 
435
        "Branch.hooks", "post_commit", post_commit_update_cache,
 
436
        "git cache")
 
437
 
378
438
 
379
439
def test_suite():
380
440
    from bzrlib.plugins.git import tests