Show More
@@ -1637,8 +1637,10 b' def _maybeapplyclonebundle(pullop):' | |||||
1637 | repo.ui.warn(_('falling back to normal clone\n')) |
|
1637 | repo.ui.warn(_('falling back to normal clone\n')) | |
1638 | else: |
|
1638 | else: | |
1639 | raise error.Abort(_('error applying bundle'), |
|
1639 | raise error.Abort(_('error applying bundle'), | |
1640 |
hint=_('consider contacting |
|
1640 | hint=_('if this error persists, consider contacting ' | |
1641 |
'operator |
|
1641 | 'the server operator or disable clone ' | |
|
1642 | 'bundles via ' | |||
|
1643 | '"--config experimental.clonebundles=false"')) | |||
1642 |
|
1644 | |||
1643 | def parseclonebundlesmanifest(repo, s): |
|
1645 | def parseclonebundlesmanifest(repo, s): | |
1644 | """Parses the raw text of a clone bundles manifest. |
|
1646 | """Parses the raw text of a clone bundles manifest. |
@@ -71,7 +71,7 b' Manifest file with invalid URL aborts' | |||||
71 | applying clone bundle from http://does.not.exist/bundle.hg |
|
71 | applying clone bundle from http://does.not.exist/bundle.hg | |
72 | error fetching bundle: [Errno -2] Name or service not known |
|
72 | error fetching bundle: [Errno -2] Name or service not known | |
73 | abort: error applying bundle |
|
73 | abort: error applying bundle | |
74 | (consider contacting the server operator if this error persists) |
|
74 | (if this error persists, consider contacting the server operator or disable clone bundles via "--config experimental.clonebundles=false") | |
75 | [255] |
|
75 | [255] | |
76 |
|
76 | |||
77 | Server is not running aborts |
|
77 | Server is not running aborts | |
@@ -81,7 +81,7 b' Server is not running aborts' | |||||
81 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg |
|
81 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg | |
82 | error fetching bundle: [Errno 111] Connection refused |
|
82 | error fetching bundle: [Errno 111] Connection refused | |
83 | abort: error applying bundle |
|
83 | abort: error applying bundle | |
84 | (consider contacting the server operator if this error persists) |
|
84 | (if this error persists, consider contacting the server operator or disable clone bundles via "--config experimental.clonebundles=false") | |
85 | [255] |
|
85 | [255] | |
86 |
|
86 | |||
87 | Server returns 404 |
|
87 | Server returns 404 | |
@@ -92,7 +92,7 b' Server returns 404' | |||||
92 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg |
|
92 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg | |
93 | HTTP error fetching bundle: HTTP Error 404: File not found |
|
93 | HTTP error fetching bundle: HTTP Error 404: File not found | |
94 | abort: error applying bundle |
|
94 | abort: error applying bundle | |
95 | (consider contacting the server operator if this error persists) |
|
95 | (if this error persists, consider contacting the server operator or disable clone bundles via "--config experimental.clonebundles=false") | |
96 | [255] |
|
96 | [255] | |
97 |
|
97 | |||
98 | We can override failure to fall back to regular clone |
|
98 | We can override failure to fall back to regular clone |
General Comments 0
You need to be logged in to leave comments.
Login now