D1431: sshpeer: making the ssh error message configurable
zuza (Zuzanna Mroczek)
phabricator at mercurial-scm.org
Wed Nov 15 21:18:45 EST 2017
zuza updated this revision to Diff 3548.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1431?vs=3542&id=3548
REVISION DETAIL
https://phab.mercurial-scm.org/D1431
AFFECTED FILES
mercurial/sshpeer.py
tests/test-ssh.t
CHANGE DETAILS
diff --git a/tests/test-ssh.t b/tests/test-ssh.t
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -578,3 +578,19 @@
remote: abort: this is an exercise
abort: pull failed on remote
[255]
+
+abort with default error message when there is a ssh problem when pulling
+
+ $ hg pull ssh://brokenrepository
+ pulling from ssh://brokenrepository/
+ remote: ssh: Could not resolve hostname brokenrepository: Name or service not known
+ abort: no suitable response from remote hg!
+ [255]
+
+abort with configured error message when there is a ssh problem when pulling
+
+ $ hg pull ssh://brokenrepository --config ssh.errormessage="SSH error"
+ pulling from ssh://brokenrepository/
+ remote: ssh: Could not resolve hostname brokenrepository: Name or service not known
+ abort: SSH error!
+ [255]
diff --git a/mercurial/sshpeer.py b/mercurial/sshpeer.py
--- a/mercurial/sshpeer.py
+++ b/mercurial/sshpeer.py
@@ -204,8 +204,9 @@
self._pipeo = doublepipe(self.ui, self._pipeo, self._pipee)
def badresponse():
- self._abort(error.RepoError(_('no suitable response from '
- 'remote hg')))
+ msg = self.ui.config("ssh", "errormessage",
+ _("no suitable response from remote hg"))
+ self._abort(error.RepoError(msg))
try:
# skip any noise generated by remote shell
To: zuza, #hg-reviewers, durham, mitrandir
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list