1
=== modified file 'breezy/git/remote.py'
2
--- breezy/git/remote.py	2022-10-28 18:05:19 +0000
3
+++ breezy/git/remote.py	2022-11-15 16:32:03 +0000
4
@@ -48,6 +48,7 @@
5
48
    NotLocalUrl,
48
    NotLocalUrl,
6
49
    PermissionDenied,
49
    PermissionDenied,
7
50
    TransportError,
50
    TransportError,
8
51
    UnexpectedHttpStatus,
9
51
    UninitializableFormat,
52
    UninitializableFormat,
10
52
    )
53
    )
11
53
from ..revision import NULL_REVISION
54
from ..revision import NULL_REVISION
12
@@ -229,6 +230,10 @@
13
229
        return ConnectionReset(message)
230
        return ConnectionReset(message)
14
230
    if message == 'The remote server unexpectedly closed the connection.':
231
    if message == 'The remote server unexpectedly closed the connection.':
15
231
        return TransportError(message)
232
        return TransportError(message)
16
233
    m = re.match(r'unexpected http resp ([0-9]+) for (.*)', message)
17
234
    if m:
18
235
        # TODO(jelmer): Have dulwich raise an exception and look at that instead?
19
236
        return UnexpectedHttpStatus(path=m.group(2), code=int(m.group(1)), extra=message)
20
232
    if message == 'protected branch hook declined':
237
    if message == 'protected branch hook declined':
21
233
        return ProtectedBranchHookDeclined(msg=message)
238
        return ProtectedBranchHookDeclined(msg=message)
22
234
    # Don't know, just return it to the user as-is
239
    # Don't know, just return it to the user as-is
23
235
240
24
=== modified file 'breezy/git/tests/test_remote.py'
25
--- breezy/git/tests/test_remote.py	2022-11-13 18:35:58 +0000
26
+++ breezy/git/tests/test_remote.py	2022-11-15 16:32:03 +0000
27
@@ -31,6 +31,7 @@
28
31
    NoSuchTag,
31
    NoSuchTag,
29
32
    PermissionDenied,
32
    PermissionDenied,
30
33
    TransportError,
33
    TransportError,
31
34
    UnexpectedHttpStatus,
32
34
    )
35
    )
33
35
36
34
36
from ...tests import (
37
from ...tests import (
35
@@ -202,6 +203,18 @@
36
202
                RemoteGitError(
203
                RemoteGitError(
37
203
                    '[Errno 104] Connection reset by peer')))
204
                    '[Errno 104] Connection reset by peer')))
38
204
205
39
206
    def test_http_unexpected(self):
40
207
        self.assertEqual(
41
208
            UnexpectedHttpStatus(
42
209
                    'https://example.com/bigint.git/git-upload-pack',
43
210
                    403, extra=('unexpected http resp 403 for '
44
211
                                'https://example.com/bigint.git/git-upload-pack')),
45
212
            parse_git_error(
46
213
                'url',
47
214
                RemoteGitError(
48
215
                    'unexpected http resp 403 for '
49
216
                    'https://example.com/bigint.git/git-upload-pack')))
50
217
51
205
218
52
206
class ParseHangupTests(TestCase):
219
class ParseHangupTests(TestCase):
53
207
220
54
208
221
55
=== modified file 'breezy/repository.py'
56
--- breezy/repository.py	2022-11-13 20:26:24 +0000
57
+++ breezy/repository.py	2022-11-15 16:32:03 +0000
58
@@ -1627,6 +1627,11 @@
59
1627
        if source.supports_rich_root() != target.supports_rich_root():
1627
        if source.supports_rich_root() != target.supports_rich_root():
60
1628
            raise errors.IncompatibleRepositories(source, target,
1628
            raise errors.IncompatibleRepositories(source, target,
61
1629
                                                  "different rich-root support")
1629
                                                  "different rich-root support")
62
1630
        if not hasattr(source, '_serializer') or not hasattr(target, '_serializer'):
63
1631
            if source != target:
64
1632
                raise errors.IncompatibleRepositories(source, target, "different formats")
65
1633
            return
66
1634
67
1630
        if source._serializer != target._serializer:
1635
        if source._serializer != target._serializer:
68
1631
            raise errors.IncompatibleRepositories(source, target,
1636
            raise errors.IncompatibleRepositories(source, target,
69
1632
                                                  "different serializers")
1637
                                                  "different serializers")
Status:	Merged
Approved by:	Jelmer Vernooij on 2022-11-15
Approved revision:	7728
Merged at revision:	7670
Proposed branch:	lp:~jelmer/brz/git-unexpected-http-response
Merge into:	lp:brz
Diff against target:	69 lines (+23/-0) 3 files modified breezy/git/remote.py (+5/-0) breezy/git/tests/test_remote.py (+13/-0) breezy/repository.py (+5/-0)
To merge this branch:	bzr merge lp:~jelmer/brz/git-unexpected-http-response
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij			Approve on 2022-11-15
Review via email: mp+433058@code.launchpad.net