equal
deleted
inserted
replaced
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: |
154 except error.InterventionRequired, inst: |
155 ui.warn("%s\n" % inst) |
155 ui.warn("%s\n" % inst) |
|
156 return 1 |
156 except util.Abort, inst: |
157 except util.Abort, inst: |
157 ui.warn(_("abort: %s\n") % inst) |
158 ui.warn(_("abort: %s\n") % inst) |
158 if inst.hint: |
159 if inst.hint: |
159 ui.warn(_("(%s)\n") % inst.hint) |
160 ui.warn(_("(%s)\n") % inst.hint) |
160 except ImportError, inst: |
161 except ImportError, inst: |