Merge lp:~jelmer/brz/fix-git-reidrecits into lp:brz

[Jelmer Vernooij]

Fix HTTP redirects for Git repositories.

Fix HTTP redirects for Git repositories.

[Martin Packman (gz)]

Branch misspelt redirects, but attribute has it correct per the _urllib2_wrappers code.

review: Approve

=== modified file 'breezy/git/__init__.py'
--- breezy/git/__init__.py	2018-08-04 17:32:58 +0000
+++ breezy/git/__init__.py	2018-09-13 00:20:52 +0000
@@ -148,7 +148,9 @@
         base_url, _ = urlutils.split_segment_parameters(transport.external_url())
         url = urlutils.join(base_url, "info/refs") + "?service=git-upload-pack"
         from ..transport.http import Request
-        headers = {"Content-Type": "application/x-git-upload-pack-request"}
+        headers = {"Content-Type": "application/x-git-upload-pack-request",
+                   "Accept": "application/x-git-upload-pack-result",
+                   }
         req = Request('GET', url, accepted_errors=[200, 403, 404, 405],
                       headers=headers)
         (scheme, user, password, host, port, path) = urlutils.parse_url(req.get_full_url())
@@ -158,7 +160,6 @@
         elif host == "bazaar.launchpad.net":
             # Don't attempt Git probes against bazaar.launchpad.net; pad.lv/1744830
             raise bzr_errors.NotBranchError(transport.base)
-        req.follow_redirections = True
         resp = transport._perform(req)
         if resp.code in (404, 405):
             raise bzr_errors.NotBranchError(transport.base)
 
=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2018-08-04 17:32:58 +0000
+++ breezy/git/dir.py	2018-09-13 00:20:52 +0000
@@ -341,8 +341,13 @@
 
         """
         from .transportgit import TransportRepo
-        gitrepo = TransportRepo(transport, self.bare,
+        def _open(transport):
+            return TransportRepo(transport, self.bare,
                 refs_text=getattr(self, "_refs_text", None))
+        def redirected(transport, e, redirection_notice):
+            trace.note(redirection_notice)
+            return transport._redirected_to(e.source, e.target)
+        gitrepo = do_catching_redirections(_open, transport, redirected)
         if not gitrepo._controltransport.has('HEAD'):
             raise bzr_errors.NotBranchError(path=transport.base)
         return LocalGitDir(transport, gitrepo, self)
 
=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2018-09-11 19:38:39 +0000
+++ breezy/git/remote.py	2018-09-13 00:20:52 +0000
@@ -644,6 +644,7 @@
             ('GET' if data is None else 'POST'),
             url, data, headers,
             accepted_errors=[200, 404])
+        request.follow_redirections = True
 
         response = self.transport._perform(request)
 
 
=== modified file 'breezy/transport/http/__init__.py'
--- breezy/transport/http/__init__.py	2018-08-01 19:37:07 +0000
+++ breezy/transport/http/__init__.py	2018-09-13 00:20:52 +0000
@@ -611,7 +611,7 @@
         # determine the excess tail - the relative path that was in
         # the original request but not part of this transports' URL.
         excess_tail = parsed_source.path[pl:].strip("/")
-        if not target.endswith(excess_tail):
+        if not parsed_target.path.endswith(excess_tail):
             # The final part of the url has been renamed, we can't handle the
             # redirection.
             return None