/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

Some more test fixes.

Show diffs side-by-side

added added

removed removed

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