mercurial/dispatch.py
changeset 18932 7b4b9e8ea12e
parent 18758 6aca4d1c744e
child 18935 e5d9441ec281
equal deleted inserted replaced
18931:3c224e0949de 18932:7b4b9e8ea12e
   149             # check if the command is in a disabled extension
   149             # check if the command is in a disabled extension
   150             # (but don't check for extensions themselves)
   150             # (but don't check for extensions themselves)
   151             commands.help_(ui, inst.args[0], unknowncmd=True)
   151             commands.help_(ui, inst.args[0], unknowncmd=True)
   152         except error.UnknownCommand:
   152         except error.UnknownCommand:
   153             commands.help_(ui, 'shortlist')
   153             commands.help_(ui, 'shortlist')
       
   154     except error.InterventionRequired, inst:
       
   155         ui.warn("%s\n" % inst)
   154     except util.Abort, inst:
   156     except util.Abort, inst:
   155         ui.warn(_("abort: %s\n") % inst)
   157         ui.warn(_("abort: %s\n") % inst)
   156         if inst.hint:
   158         if inst.hint:
   157             ui.warn(_("(%s)\n") % inst.hint)
   159             ui.warn(_("(%s)\n") % inst.hint)
   158     except ImportError, inst:
   160     except ImportError, inst: