Merge lp:~jelmer/brz/merge-3.2 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.2.

Merge lp:brz/3.2.

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

=== modified file '.github/workflows/pythonpackage.yml'
--- .github/workflows/pythonpackage.yml	2020-11-19 01:58:47 +0000
+++ .github/workflows/pythonpackage.yml	2021-09-23 15:16:28 +0000
@@ -33,7 +33,7 @@
         run: |
           python -m pip install --upgrade pip
           pip install -U pip setuptools
-          pip install -U pip coverage codecov flake8 testtools paramiko fastimport configobj cython testscenarios six docutils $TEST_REQUIRE sphinx sphinx_epytext launchpadlib patiencediff pyinotify git+https://github.com/dulwich/dulwich
+          pip install -U pip coverage codecov flake8 testtools paramiko fastbencode fastimport configobj cython testscenarios six docutils $TEST_REQUIRE sphinx sphinx_epytext launchpadlib patiencediff pyinotify git+https://github.com/dulwich/dulwich
       - name: Build docs
         run: |
           make docs PYTHON=python

=== removed file 'README_BDIST_RPM'
=== modified file 'breezy/controldir.py'
--- breezy/controldir.py	2021-08-29 20:05:31 +0000
+++ breezy/controldir.py	2021-09-23 15:16:28 +0000
@@ -773,7 +773,7 @@
         return klass.open_containing_from_transport(transport)
 
     @classmethod
-    def open_containing_from_transport(klass, a_transport):
+    def open_containing_from_transport(klass, a_transport, probers=None):
         """Open an existing branch which contains a_transport.base.
 
         This probes for a branch at a_transport, and searches upwards from there.
@@ -791,7 +791,7 @@
         url = a_transport.base
         while True:
             try:
-                result = klass.open_from_transport(a_transport)
+                result = klass.open_from_transport(a_transport, probers=probers)
                 return result, urlutils.unescape(a_transport.relpath(url))
             except errors.NotBranchError:
                 pass

=== modified file 'breezy/errors.py'
--- breezy/errors.py	2020-08-10 15:00:17 +0000
+++ breezy/errors.py	2021-09-23 15:16:28 +0000
@@ -1269,7 +1269,7 @@
 
     _fmt = "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
 
-    def __init__(self, path, msg, orig_error=None):
+    def __init__(self, path, msg, orig_error=None, headers=None):
         self.path = path
         if orig_error is None:
             orig_error = ''
@@ -1277,6 +1277,7 @@
             # This is reached for obscure and unusual errors so we want to
             # preserve as much info as possible to ease debug.
             orig_error = ': %r' % (orig_error,)
+        self.headers = headers
         TransportError.__init__(self, msg, orig_error=orig_error)
 
 
@@ -1284,7 +1285,7 @@
 
     _fmt = "Unexpected HTTP status %(code)d for %(path)s: %(extra)s"
 
-    def __init__(self, path, code, extra=None):
+    def __init__(self, path, code, extra=None, headers=None):
         self.path = path
         self.code = code
         self.extra = extra or ''
@@ -1292,7 +1293,7 @@
         if extra is not None:
             full_msg += ': ' + extra
         InvalidHttpResponse.__init__(
-            self, path, full_msg)
+            self, path, full_msg, headers=headers)
 
 
 class BadHttpRequest(UnexpectedHttpStatus):

=== modified file 'breezy/git/__init__.py'
--- breezy/git/__init__.py	2020-11-16 22:17:09 +0000
+++ breezy/git/__init__.py	2021-09-23 15:16:28 +0000
@@ -185,7 +185,8 @@
             # hgweb :(
             raise brz_errors.NotBranchError(transport.base)
         elif resp.status != 200:
-            raise brz_errors.UnexpectedHttpStatus(url, resp.status)
+            raise brz_errors.UnexpectedHttpStatus(
+                url, resp.status, headers=resp.getheaders())
 
         ct = resp.getheader("Content-Type")
         if ct and ct.startswith("application/x-git"):

=== modified file 'breezy/plugins/github/hoster.py'
--- breezy/plugins/github/hoster.py	2021-05-02 15:07:21 +0000
+++ breezy/plugins/github/hoster.py	2021-09-23 15:16:28 +0000
@@ -168,7 +168,8 @@
         if response.status == 422:
             raise ValidationFailed(json.loads(response.text))
         if response.status != 200:
-            raise UnexpectedHttpStatus(self._pr['url'], response.status)
+            raise UnexpectedHttpStatus(
+                self._pr['url'], response.status, headers=response.getheaders())
         self._pr = json.loads(response.text)
 
     def set_description(self, description):
@@ -205,7 +206,8 @@
         if response.status == 422:
             raise ValidationFailed(json.loads(response.text))
         if response.status != 200:
-            raise UnexpectedHttpStatus(self._pr['url'], response.status)
+            raise UnexpectedHttpStatus(
+                self._pr['url'], response.status, headers=response.getheaders())
 
     def get_merged_by(self):
         merged_by = self._pr.get('merged_by')
@@ -228,7 +230,7 @@
             raise ValidationFailed(json.loads(response.text))
         if response.status != 201:
             raise UnexpectedHttpStatus(
-                self._pr['comments_url'], response.status)
+                self._pr['comments_url'], response.status, headers=response.getheaders())
         json.loads(response.text)
 
 
@@ -295,7 +297,8 @@
             raise NoSuchProject(path)
         if response.status == 200:
             return json.loads(response.text)
-        raise UnexpectedHttpStatus(path, response.status)
+        raise UnexpectedHttpStatus(
+            path, response.status, headers=response.getheaders())
 
     def _get_repo_pulls(self, path, head=None, state=None):
         path = path + '?'
@@ -311,7 +314,7 @@
             raise NoSuchProject(path)
         if response.status == 200:
             return json.loads(response.text)
-        raise UnexpectedHttpStatus(path, response.status)
+        raise UnexpectedHttpStatus(path, response.status, headers=response.getheaders())
 
     def _create_pull(self, path, title, head, base, body=None, labels=None,
                      assignee=None, draft=False, maintainer_can_modify=False):
@@ -336,14 +339,14 @@
         if response.status == 422:
             raise ValidationFailed(json.loads(response.text))
         if response.status != 201:
-            raise UnexpectedHttpStatus(path, response.status)
+            raise UnexpectedHttpStatus(path, response.status, headers=response.getheaders())
         return json.loads(response.text)
 
     def _get_user_by_email(self, email):
         path = 'search/users?q=%s+in:email' % email
         response = self._api_request('GET', path)
         if response.status != 200:
-            raise UnexpectedHttpStatus(path, response.status)
+            raise UnexpectedHttpStatus(path, response.status, headers=response.getheaders())
         ret = json.loads(response.text)
         if ret['total_count'] == 0:
             raise KeyError('no user with email %s' % email)
@@ -358,14 +361,14 @@
             path = 'user'
         response = self._api_request('GET', path)
         if response.status != 200:
-            raise UnexpectedHttpStatus(path, response.status)
+            raise UnexpectedHttpStatus(path, response.status, headers=response.getheaders())
         return json.loads(response.text)
 
     def _get_organization(self, name):
         path = 'orgs/%s' % name
         response = self._api_request('GET', path)
         if response.status != 200:
-            raise UnexpectedHttpStatus(path, response.status)
+            raise UnexpectedHttpStatus(path, response.status, headers=response.getheaders())
         return json.loads(response.text)
 
     def _list_paged(self, path, parameters=None, per_page=None):
@@ -384,7 +387,7 @@
                 ';'.join(['%s=%s' % (k, urlutils.quote(v))
                           for (k, v) in parameters.items()]))
             if response.status != 200:
-                raise UnexpectedHttpStatus(path, response.status)
+                raise UnexpectedHttpStatus(path, response.status, headers=response.getheaders())
             data = json.loads(response.text)
             for entry in data['items']:
                 i += 1
@@ -402,7 +405,7 @@
             path += '?organization=%s' % owner
         response = self._api_request('POST', path)
         if response.status != 202:
-            raise UnexpectedHttpStatus(path, response.status)
+            raise UnexpectedHttpStatus(path, response.status, headers=response.getheaders())
         return json.loads(response.text)
 
     @property
@@ -558,7 +561,7 @@
             url = issue['pull_request']['url']
             response = self._api_request('GET', url)
             if response.status != 200:
-                raise UnexpectedHttpStatus(url, response.status)
+                raise UnexpectedHttpStatus(url, response.status, headers=response.getheaders())
             yield GitHubMergeProposal(self, json.loads(response.text))
 
     def get_proposal_by_url(self, url):
@@ -571,7 +574,8 @@
             path = '/user/repos'
         response = self._api_request('GET', path)
         if response.status != 200:
-            raise UnexpectedHttpStatus(self.transport.user_url, response.status)
+            raise UnexpectedHttpStatus(
+                self.transport.user_url, response.status, headers=response.getheaders())
         for project in json.loads(response.text):
             if not project['fork']:
                 continue
@@ -586,7 +590,7 @@
             return
         if response.status == 200:
             return json.loads(response.text)
-        raise UnexpectedHttpStatus(path, response.status)
+        raise UnexpectedHttpStatus(path, response.status, headers=response.getheaders())
 
     def get_current_user(self):
         if self._token is not None:

=== modified file 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/gitlab/hoster.py	2021-05-02 15:07:21 +0000
+++ breezy/plugins/gitlab/hoster.py	2021-09-23 15:16:28 +0000
@@ -232,7 +232,8 @@
 
 def _unexpected_status(path, response):
     raise errors.UnexpectedHttpStatus(
-        path, response.status, response.data.decode('utf-8', 'replace'))
+        path, response.status, response.data.decode('utf-8', 'replace'),
+        headers=response.getheaders())
 
 
 class GitLabMergeProposal(MergeProposal):

=== modified file 'breezy/transport/http/response.py'
--- breezy/transport/http/response.py	2020-07-18 23:14:00 +0000
+++ breezy/transport/http/response.py	2021-09-23 15:16:28 +0000
@@ -218,7 +218,8 @@
         if content_range is None:
             raise errors.InvalidHttpResponse(
                 self._path,
-                'Content-Range header missing in a multi-part response')
+                'Content-Range header missing in a multi-part response',
+                headers=self._headers)
         self.set_range_from_header(content_range)
 
     def set_range_from_header(self, content_range):

=== modified file 'breezy/transport/http/urllib.py'
--- breezy/transport/http/urllib.py	2021-05-02 15:07:21 +0000
+++ breezy/transport/http/urllib.py	2021-09-23 15:16:28 +0000
@@ -1732,7 +1732,8 @@
         else:
             raise errors.UnexpectedHttpStatus(
                 req.get_full_url(), code,
-                'Unable to handle http code: %s' % msg)
+                'Unable to handle http code: %s' % msg,
+                headers=hdrs)
 
 
 class Opener(object):
@@ -1983,7 +1984,7 @@
             else:
                 raise errors.BadHttpRequest(abspath, response.reason)
         elif response.status not in (200, 206):
-            raise errors.UnexpectedHttpStatus(abspath, response.status)
+            raise errors.UnexpectedHttpStatus(abspath, response.status, headers=response.getheaders())
 
         data = handle_response(
             abspath, response.status, response.getheader, response)
@@ -2214,7 +2215,7 @@
             'POST', abspath, body=body_bytes,
             headers={'Content-Type': 'application/octet-stream'})
         if response.status not in (200, 403):
-            raise errors.UnexpectedHttpStatus(abspath, response.status)
+            raise errors.UnexpectedHttpStatus(abspath, response.status, headers=response.getheaders())
         code = response.status
         data = handle_response(
             abspath, code, response.getheader, response)
@@ -2228,7 +2229,7 @@
         abspath = self._remote_path(relpath)
         response = self.request('HEAD', abspath)
         if response.status not in (200, 404):
-            raise errors.UnexpectedHttpStatus(abspath, response.status)
+            raise errors.UnexpectedHttpStatus(abspath, response.status, headers=response.getheaders())
 
         return response
 
@@ -2457,7 +2458,8 @@
         if resp.status in (403, 405):
             raise errors.InvalidHttpResponse(
                 abspath,
-                "OPTIONS not supported or forbidden for remote URL")
+                "OPTIONS not supported or forbidden for remote URL",
+                headers=resp.getheaders())
         return resp.getheaders()