Mercurial > hg
comparison mercurial/dispatch.py @ 11683:757f39fa1162
dispatch: write Abort hint to stderr too
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 26 Jul 2010 22:28:37 +0200 |
| parents | 4d9b4725acac |
| children | b6360a113478 |
comparison
equal
deleted
inserted
replaced
| 11682:f54ec9c70877 | 11683:757f39fa1162 |
|---|---|
| 22 if '--traceback' in args: | 22 if '--traceback' in args: |
| 23 u.setconfig('ui', 'traceback', 'on') | 23 u.setconfig('ui', 'traceback', 'on') |
| 24 except util.Abort, inst: | 24 except util.Abort, inst: |
| 25 sys.stderr.write(_("abort: %s\n") % inst) | 25 sys.stderr.write(_("abort: %s\n") % inst) |
| 26 if inst.hint: | 26 if inst.hint: |
| 27 sys.stdout.write(_("(%s)\n") % inst.hint) | 27 sys.stderr.write(_("(%s)\n") % inst.hint) |
| 28 return -1 | 28 return -1 |
| 29 except error.ParseError, inst: | 29 except error.ParseError, inst: |
| 30 if len(inst.args) > 1: | 30 if len(inst.args) > 1: |
| 31 sys.stderr.write(_("hg: parse error at %s: %s\n") % | 31 sys.stderr.write(_("hg: parse error at %s: %s\n") % |
| 32 (inst.args[1], inst.args[0])) | 32 (inst.args[1], inst.args[0])) |
| 117 except error.UnknownCommand: | 117 except error.UnknownCommand: |
| 118 commands.help_(ui, 'shortlist') | 118 commands.help_(ui, 'shortlist') |
| 119 except util.Abort, inst: | 119 except util.Abort, inst: |
| 120 ui.warn(_("abort: %s\n") % inst) | 120 ui.warn(_("abort: %s\n") % inst) |
| 121 if inst.hint: | 121 if inst.hint: |
| 122 ui.status(_("(%s)\n") % inst.hint) | 122 ui.warn(_("(%s)\n") % inst.hint) |
| 123 except ImportError, inst: | 123 except ImportError, inst: |
| 124 ui.warn(_("abort: %s!\n") % inst) | 124 ui.warn(_("abort: %s!\n") % inst) |
| 125 m = str(inst).split()[-1] | 125 m = str(inst).split()[-1] |
| 126 if m in "mpatch bdiff".split(): | 126 if m in "mpatch bdiff".split(): |
| 127 ui.warn(_("(did you forget to compile extensions?)\n")) | 127 ui.warn(_("(did you forget to compile extensions?)\n")) |