Show More
@@ -10,6 +10,7 b' from __future__ import absolute_import' | |||||
10 | import json |
|
10 | import json | |
11 | import os |
|
11 | import os | |
12 | import re |
|
12 | import re | |
|
13 | import socket | |||
13 |
|
14 | |||
14 | from mercurial.i18n import _ |
|
15 | from mercurial.i18n import _ | |
15 |
|
16 | |||
@@ -286,7 +287,7 b' class _gitlfsremote(object):' | |||||
286 | self._basictransfer(obj, action, localstore) |
|
287 | self._basictransfer(obj, action, localstore) | |
287 | yield 1, obj.get('oid') |
|
288 | yield 1, obj.get('oid') | |
288 | break |
|
289 | break | |
289 |
except |
|
290 | except socket.error as ex: | |
290 | if retry > 0: |
|
291 | if retry > 0: | |
291 | if self.ui.verbose: |
|
292 | if self.ui.verbose: | |
292 | self.ui.write( |
|
293 | self.ui.write( |
@@ -146,12 +146,7 b' Test a corrupted file upload' | |||||
146 | pushing to ../repo1 |
|
146 | pushing to ../repo1 | |
147 | searching for changes |
|
147 | searching for changes | |
148 | lfs: uploading e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0 (17 bytes) |
|
148 | lfs: uploading e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0 (17 bytes) | |
149 |
|
|
149 | abort: HTTP error: HTTP Error 500: Internal Server Error (oid=e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0, action=upload)! | |
150 | lfs: failed: LfsRemoteError('HTTP error: HTTP Error 404: Not Found (oid=e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0, action=upload)',) (remaining retry 4) |
|
|||
151 | lfs: failed: LfsRemoteError('HTTP error: HTTP Error 404: Not Found (oid=e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0, action=upload)',) (remaining retry 3) |
|
|||
152 | lfs: failed: LfsRemoteError('HTTP error: HTTP Error 404: Not Found (oid=e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0, action=upload)',) (remaining retry 2) |
|
|||
153 | lfs: failed: LfsRemoteError('HTTP error: HTTP Error 404: Not Found (oid=e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0, action=upload)',) (remaining retry 1) |
|
|||
154 | abort: HTTP error: HTTP Error 404: Not Found (oid=e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0, action=upload)! |
|
|||
155 | [255] |
|
150 | [255] | |
156 |
|
151 | |||
157 | Check error message when the remote missed a blob: |
|
152 | Check error message when the remote missed a blob: |
General Comments 0
You need to be logged in to leave comments.
Login now