Merge lp:~jelmer/brz/pre-receive-hook into lp:brz/3.1

[Jelmer Vernooij]

git: Handle pre-receive hook declined errors.

git: Handle pre-receive hook declined errors.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2020-07-28 02:32:04 +0000
+++ breezy/git/remote.py	2020-08-01 21:59:28 +0000
@@ -211,6 +211,8 @@
         return PermissionDenied(url, message)
     if message.endswith(' does not appear to be a git repository'):
         return NotBranchError(url, message)
+    if message == 'pre-receive hook declined':
+        return PermissionDenied(url, message)
     if re.match('(.+) is not a valid repository name',
                 message.splitlines()[0]):
         return NotBranchError(url, message)

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2020-07-15 22:39:05 +0000
+++ breezy/git/tests/test_remote.py	2020-08-01 21:59:28 +0000
@@ -137,6 +137,14 @@
         self.assertEqual(e.path, 'porridge/gaduhistory.git')
         self.assertEqual(e.extra, ': denied to jelmer')
 
+    def test_pre_receive_hook_declined(self):
+        e = parse_git_error(
+            "url",
+            'pre-receive hook declined')
+        self.assertIsInstance(e, PermissionDenied)
+        self.assertEqual(e.path, "url")
+        self.assertEqual(e.extra, ': pre-receive hook declined')
+
     def test_invalid_repo_name(self):
         e = parse_git_error(
             "url",