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

[Jelmer Vernooij]

Fix Git HTTP support.

Fix Git HTTP support.

This was broken after the recent changes to the HTTP API. Unfortunately we still don't have good tests for Git over HTTP.

[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/337/

=== modified file 'breezy/git/__init__.py'
--- breezy/git/__init__.py	2019-05-20 02:22:53 +0000
+++ breezy/git/__init__.py	2019-06-08 16:03:01 +0000
@@ -164,19 +164,18 @@
         if host == "github.com":
             # GitHub requires we lie.
             # https://github.com/dulwich/dulwich/issues/562
-            req.add_header("User-Agent", user_agent_for_github())
+            headers["User-Agent"] = user_agent_for_github()
         elif host == "bazaar.launchpad.net":
             # Don't attempt Git probes against bazaar.launchpad.net; pad.lv/1744830
             raise brz_errors.NotBranchError(transport.base)
         resp = transport.request('GET', url, headers=headers)
         if resp.status in (404, 405):
             raise brz_errors.NotBranchError(transport.base)
-        else:
-            raise errors.InvalidHttpResponse(
+        elif resp.status != 200:
+            raise brz_errors.InvalidHttpResponse(
                 url, 'Unable to handle http code %d' % resp.status)
 
-        headers = resp.headers
-        ct = headers.get("Content-Type")
+        ct = resp.getheader("Content-Type")
         if ct is None:
             raise brz_errors.NotBranchError(transport.base)
         if ct.startswith("application/x-git"):

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2019-06-06 22:22:47 +0000
+++ breezy/git/remote.py	2019-06-08 16:03:01 +0000
@@ -698,6 +698,7 @@
 
         response = self.transport.request(
             ('GET' if data is None else 'POST'),
+            url,
             body=data,
             headers=headers, retries=8)
 
@@ -721,15 +722,15 @@
 
             def __init__(self, response):
                 self._response = response
-                self.status = response.code
+                self.status = response.status
                 self.content_type = response.getheader("Content-Type")
-                self.redirect_location = response.geturl()
+                self.redirect_location = response._actual.geturl()
 
             def readlines(self):
                 return self._response.readlines()
 
             def close(self):
-                self._response.close()
+                pass
 
         return WrapResponse(response), read
 

=== modified file 'breezy/plugins/propose/github.py'
--- breezy/plugins/propose/github.py	2019-06-03 23:26:04 +0000
+++ breezy/plugins/propose/github.py	2019-06-08 16:03:01 +0000
@@ -27,7 +27,6 @@
     MergeProposalBuilder,
     MergeProposalExists,
     PrerequisiteBranchUnsupported,
-    CommitMessageUnsupported,
     UnsupportedHoster,
     )
 

=== modified file 'breezy/transport/http/__init__.py'
--- breezy/transport/http/__init__.py	2019-05-28 23:08:46 +0000
+++ breezy/transport/http/__init__.py	2019-06-08 16:03:01 +0000
@@ -2305,7 +2305,7 @@
             headers={'Content-Type': 'application/octet-stream'})
         if response.status not in (200, 403):
             raise errors.InvalidHttpResponse(
-                url, 'Unexpected status %d' % response.status)
+                abspath, 'Unexpected status %d' % response.status)
         code = response.status
         data = handle_response(
             abspath, code, response.getheader, response)