Show More
@@ -16,9 +16,6 b' import struct' | |||
|
16 | 16 | import weakref |
|
17 | 17 | |
|
18 | 18 | from .i18n import _ |
|
19 | from .thirdparty import ( | |
|
20 | cbor, | |
|
21 | ) | |
|
22 | 19 | from . import ( |
|
23 | 20 | bundle2, |
|
24 | 21 | error, |
@@ -35,6 +32,7 b' from . import (' | |||
|
35 | 32 | wireprotov2server, |
|
36 | 33 | ) |
|
37 | 34 | from .utils import ( |
|
35 | cborutil, | |
|
38 | 36 | interfaceutil, |
|
39 | 37 | stringutil, |
|
40 | 38 | ) |
@@ -913,8 +911,8 b' def performhandshake(ui, url, opener, re' | |||
|
913 | 911 | if advertisev2: |
|
914 | 912 | if ct == 'application/mercurial-cbor': |
|
915 | 913 | try: |
|
916 |
info = cbor. |
|
|
917 | except cbor.CBORDecodeError: | |
|
914 | info = cborutil.decodeall(rawdata)[0] | |
|
915 | except cborutil.CBORDecodeError: | |
|
918 | 916 | raise error.Abort(_('error decoding CBOR from remote server'), |
|
919 | 917 | hint=_('try again and consider contacting ' |
|
920 | 918 | 'the server operator')) |
General Comments 0
You need to be logged in to leave comments.
Login now