Mercurial > public > mercurial-scm > hg-stable

diff mercurial/dispatch.py @ 27628:707d66afce21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: make InterventionRequired take a hint
author timeless <timeless@mozdev.org>
date Wed, 23 Dec 2015 08:52:52 +0000
parents b3376fba4ab9
children 6822f9382b4c
line wrap: on
line diff
--- a/mercurial/dispatch.py	Thu Dec 24 20:41:17 2015 +0000
+++ b/mercurial/dispatch.py	Wed Dec 23 08:52:52 2015 +0000
@@ -270,6 +270,8 @@
                 commands.help_(ui, 'shortlist')
     except error.InterventionRequired as inst:
         ui.warn("%s\n" % inst)
+        if inst.hint:
+            ui.warn(_("(%s)\n") % inst.hint)
         return 1
     except error.Abort as inst:
         ui.warn(_("abort: %s\n") % inst)