Merge lp:~jelmer/brz/git-unexpected-http-response into lp:brz/3.3

[Jelmer Vernooij]

Handle http unexpected errors from git

Handle http unexpected errors from git

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2022-10-28 18:05:19 +0000
+++ breezy/git/remote.py	2022-11-15 16:31:08 +0000
@@ -48,6 +48,7 @@
     NotLocalUrl,
     PermissionDenied,
     TransportError,
+    UnexpectedHttpStatus,
     UninitializableFormat,
     )
 from ..revision import NULL_REVISION
@@ -229,6 +230,10 @@
         return ConnectionReset(message)
     if message == 'The remote server unexpectedly closed the connection.':
         return TransportError(message)
+    m = re.match(r'unexpected http resp ([0-9]+) for (.*)', message)
+    if m:
+        # TODO(jelmer): Have dulwich raise an exception and look at that instead?
+        return UnexpectedHttpStatus(path=m.group(2), code=int(m.group(1)), extra=message)
     if message == 'protected branch hook declined':
         return ProtectedBranchHookDeclined(msg=message)
     # Don't know, just return it to the user as-is
 
=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2022-11-13 18:35:58 +0000
+++ breezy/git/tests/test_remote.py	2022-11-15 16:31:08 +0000
@@ -31,6 +31,7 @@
     NoSuchTag,
     PermissionDenied,
     TransportError,
+    UnexpectedHttpStatus,
     )
 
 from ...tests import (
@@ -202,6 +203,18 @@
                 RemoteGitError(
                     '[Errno 104] Connection reset by peer')))
 
+    def test_http_unexpected(self):
+        self.assertEqual(
+            UnexpectedHttpStatus(
+                    'https://example.com/bigint.git/git-upload-pack',
+                    403, extra=('unexpected http resp 403 for '
+                                'https://example.com/bigint.git/git-upload-pack')),
+            parse_git_error(
+                'url',
+                RemoteGitError(
+                    'unexpected http resp 403 for '
+                    'https://example.com/bigint.git/git-upload-pack')))
+
 
 class ParseHangupTests(TestCase):
 
 
=== modified file 'breezy/repository.py'
--- breezy/repository.py	2022-11-13 20:26:24 +0000
+++ breezy/repository.py	2022-11-15 16:31:08 +0000
@@ -1627,6 +1627,11 @@
         if source.supports_rich_root() != target.supports_rich_root():
             raise errors.IncompatibleRepositories(source, target,
                                                   "different rich-root support")
+        if not hasattr(source, '_serializer') or not hasattr(target, '_serializer'):
+            if source != target:
+                raise errors.IncompatibleRepositories(source, target, "different formats")
+            return
+
         if source._serializer != target._serializer:
             raise errors.IncompatibleRepositories(source, target,
                                                   "different serializers")