Merge lp:~jelmer/brz/git-host-key-verification into lp:brz/3.2

[Jelmer Vernooij]

Special case some more Git error messages.

Special case some more Git error messages.

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2022-01-16 17:15:16 +0000
+++ breezy/git/remote.py	2022-02-18 17:09:50 +0000
@@ -35,6 +35,7 @@
 from ..errors import (
     AlreadyBranchError,
     BzrError,
+    ConnectionReset,
     DivergedBranches,
     InProcessTransport,
     InvalidRevisionId,
@@ -44,6 +45,7 @@
     NotBranchError,
     NotLocalUrl,
     PermissionDenied,
+    TransportError,
     UninitializableFormat,
     )
 from ..revision import NULL_REVISION
@@ -215,6 +217,10 @@
     m = re.match(r'Permission to ([^ ]+) denied to ([^ ]+)\.', message)
     if m:
         return PermissionDenied(m.group(1), 'denied to %s' % m.group(2))
+    if message == 'Host key verification failed.':
+        return TransportError('Host key verification failed')
+    if message == '[Errno 104] Connection reset by peer':
+        return ConnectionReset(message)
     # Don't know, just return it to the user as-is
     return RemoteGitError(message)
 
 
=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2022-01-24 20:22:05 +0000
+++ breezy/git/tests/test_remote.py	2022-02-18 17:09:50 +0000
@@ -23,10 +23,12 @@
 
 from ...controldir import ControlDir
 from ...errors import (
+    ConnectionReset,
     DivergedBranches,
     NotBranchError,
     NoSuchTag,
     PermissionDenied,
+    TransportError,
     )
 
 from ...tests import (
@@ -164,6 +166,22 @@
                     'GitLab: You are not allowed to push code to '
                     'protected branches on this project.')))
 
+    def test_host_key_verification(self):
+        self.assertEqual(
+            TransportError('Host key verification failed'),
+            parse_git_error(
+                'url',
+                RemoteGitError(
+                    'Host key verification failed.')))
+
+    def test_connection_reset_by_peer(self):
+        self.assertEqual(
+            ConnectionReset('[Errno 104] Connection reset by peer'),
+            parse_git_error(
+                'url',
+                RemoteGitError(
+                    '[Errno 104] Connection reset by peer')))
+
 
 class ParseHangupTests(TestCase):