Merge lp:~jelmer/brz/apply-instead-of into lp:brz

[Jelmer Vernooij]

Support insteadOf / pushInsteadOf in git config.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/917/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/918/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/919/

=== modified file 'breezy/git/__init__.py'
--- breezy/git/__init__.py	2021-08-19 16:05:04 +0000
+++ breezy/git/__init__.py	2022-06-30 18:36:20 +0000
@@ -286,6 +286,24 @@
     "RioVersionInfoBuilder.hooks", "revision", update_stanza,
     "git commits")
 
+
+def rewrite_instead_of(location, purpose):
+    try:
+        from dulwich.config import apply_instead_of, StackedConfig
+    except ImportError:
+        # Version of dulwich too old (<< 0.20.44)
+        return location
+
+    config = StackedConfig.default()
+
+    return apply_instead_of(config, location, push=(purpose == "push"))
+
+
+from ..location import hooks as location_hooks
+location_hooks.install_named_hook(
+    "rewrite_location", rewrite_instead_of,
+    "apply Git insteadOf / pushInsteadOf")
+
 transport_server_registry.register_lazy(
     'git', __name__ + '.server', 'serve_git',
     'Git Smart server protocol over TCP. (default port: 9418)')

=== modified file 'breezy/location.py'
--- breezy/location.py	2022-01-09 13:12:27 +0000
+++ breezy/location.py	2022-06-30 18:36:20 +0000
@@ -35,6 +35,10 @@
             'rewrite_url',
             "Possibly rewrite a URL. Called with a URL to rewrite and the "
             "purpose of the URL.", (3, 0))
+        self.add_hook(
+            'rewrite_location',
+            "Possibly rewrite a location. Called with a location string to "
+            "rewrite and the purpose of the URL.", (3, 2))
 
 
 hooks = LocationHooks()
@@ -129,6 +133,9 @@
     if not isinstance(location, str):
         raise AssertionError("location not a byte or unicode string")
 
+    for hook in hooks['rewrite_location']:
+        location = hook(location, purpose=purpose)
+
     if location.startswith(':pserver:') or location.startswith(':extssh:'):
         return cvs_to_url(location)