Mercurial > public > mercurial-scm > hg
comparison mercurial/sshpeer.py @ 35108:8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Adding a possibility to configure error hint to be shown in the case of problems with SSH. Example of such hint can be "Please see http://company/internalwiki/ssh.html".
Test Plan:
- Ran hg pull with broken link and verified the output has no hint by default:
```
pulling from ssh://brokenrepository.com//repo
remote: ssh: Could not resolve hostname brokenrepository.com: Name or service not known
abort: no suitable response from remote hg!
```
- Run hg pull --config ui.ssherrorhint="Please see http://company/internalwiki/ssh.html":
```
pulling from ssh://brokenrepository.com//repo
remote: ssh: Could not resolve hostname brokenrepository.com: Name or service not known
abort: no suitable response from remote hg!
(Please see http://company/internalwiki/ssh.html)
```
Differential Revision: https://phab.mercurial-scm.org/D1431
author | Zuzanna Mroczek <zuza@fb.com> |
---|---|
date | Mon, 20 Nov 2017 01:40:26 -0800 |
parents | 2844c4bd5a39 |
children | 31d21309635b |
comparison
equal
deleted
inserted
replaced
35107:b22a0d9e0a83 | 35108:8b1c887d52e7 |
---|---|
202 self._pipei = util.bufferedinputpipe(self._pipei) | 202 self._pipei = util.bufferedinputpipe(self._pipei) |
203 self._pipei = doublepipe(self.ui, self._pipei, self._pipee) | 203 self._pipei = doublepipe(self.ui, self._pipei, self._pipee) |
204 self._pipeo = doublepipe(self.ui, self._pipeo, self._pipee) | 204 self._pipeo = doublepipe(self.ui, self._pipeo, self._pipee) |
205 | 205 |
206 def badresponse(): | 206 def badresponse(): |
207 self._abort(error.RepoError(_('no suitable response from ' | 207 msg = _("no suitable response from remote hg") |
208 'remote hg'))) | 208 hint = self.ui.config("ui", "ssherrorhint") |
209 self._abort(error.RepoError(msg, hint=hint)) | |
209 | 210 |
210 try: | 211 try: |
211 # skip any noise generated by remote shell | 212 # skip any noise generated by remote shell |
212 self._callstream("hello") | 213 self._callstream("hello") |
213 r = self._callstream("between", pairs=("%s-%s" % ("0"*40, "0"*40))) | 214 r = self._callstream("between", pairs=("%s-%s" % ("0"*40, "0"*40))) |