Merge lp:~jelmer/brz/git-http-username into lp:brz

[Jelmer Vernooij]

Strip username from URLs before passing them to httplib.

This fixes access to Git HTTP repositories with authentication, such as bitbucket.

[Martin Packman (gz)]

Thanks! Should have a test that passes in a username.

review: Approve

[Jelmer Vernooij (jelmer)]

Thanks. There is a long outstanding bug report about testing git over HTTP.

On 14 February 2019 11:53:08 GMT, Martin Packman <email address hidden> wrote:
>Review: Approve
>
>Thanks! Should have a test that passes in a username.
>--
>https://code.launchpad.net/~jelmer/brz/git-http-username/+merge/363182
>You are the owner of lp:~jelmer/brz/git-http-username.

--
Sent from my Android device with K-9 Mail. Please excuse my brevity.

=== modified file 'breezy/git/__init__.py'
--- breezy/git/__init__.py	2018-11-16 12:25:18 +0000
+++ breezy/git/__init__.py	2019-02-14 19:10:58 +0000
@@ -145,10 +145,17 @@
 class RemoteGitProber(Prober):
 
     def probe_http_transport(self, transport):
+        # This function intentionally doesn't use any of the support code under
+        # breezy.git, since it's called for every repository that's
+        # accessed over HTTP, whether it's Git, Bzr or something else.
+        # Importing Dulwich and the other support code adds unnecessray slowdowns.
         from .. import urlutils
         base_url, _ = urlutils.split_segment_parameters(
             transport.external_url())
-        url = urlutils.join(base_url, "info/refs") + "?service=git-upload-pack"
+        url = urlutils.URL.from_string(base_url)
+        url.user = url.quoted_user = None
+        url.password = url.quoted_password = None
+        url = urlutils.join(str(url), "info/refs") + "?service=git-upload-pack"
         from ..transport.http import Request
         headers = {"Content-Type": "application/x-git-upload-pack-request",
                    "Accept": "application/x-git-upload-pack-result",

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2019-02-01 16:56:56 +0000
+++ breezy/git/remote.py	2019-02-14 19:10:58 +0000
@@ -660,8 +660,10 @@
 
     def __init__(self, transport, *args, **kwargs):
         self.transport = transport
-        super(BzrGitHttpClient, self).__init__(
-            transport.external_url(), *args, **kwargs)
+        url = urlutils.URL.from_string(transport.external_url())
+        url.user = url.quoted_user = None
+        url.password = url.quoted_password = None
+        super(BzrGitHttpClient, self).__init__(str(url), *args, **kwargs)
 
     def _http_request(self, url, headers=None, data=None,
                       allow_compression=False):