Mercurial > hg-stable

diff mercurial/dispatch.py @ 25242:8de7d1d937b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: allow a 'hint' to OutOfBandError This will be useful when changing the behavior of OutOfBandError for ssh in the next changeset.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 20 May 2015 18:17:40 -0500
parents 670c1df688fd
children 0f2dcbccf9c9
line wrap: on
line diff
--- a/mercurial/dispatch.py	Thu May 21 14:30:22 2015 -0500
+++ b/mercurial/dispatch.py	Wed May 20 18:17:40 2015 -0500
@@ -193,8 +193,15 @@
             ui.warn(_("hg: %s\n") % inst.args[1])
             commands.help_(ui, 'shortlist')
     except error.OutOfBandError, inst:
-        ui.warn(_("abort: remote error:\n"))
-        ui.warn(''.join(inst.args))
+        if inst.args:
+            msg = _("abort: remote error:\n")
+        else:
+            msg = _("abort: remote error\n")
+        ui.warn(msg)
+        if inst.args:
+            ui.warn(''.join(inst.args))
+        if inst.hint:
+            ui.warn('(%s)\n' % inst.hint)
     except error.RepoError, inst:
         ui.warn(_("abort: %s!\n") % inst)
         if inst.hint: