Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dispatch.py @ 11696:708291e9389c
Merge with crew
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 27 Jul 2010 16:03:42 -0500 |
| parents | ee8f36a6c766 b6360a113478 |
| children | aae1dd12fce6 |
line wrap: on
line diff
--- a/mercurial/dispatch.py Tue Jul 27 14:43:40 2010 +0200 +++ b/mercurial/dispatch.py Tue Jul 27 16:03:42 2010 -0500 @@ -24,7 +24,7 @@ except util.Abort, inst: sys.stderr.write(_("abort: %s\n") % inst) if inst.hint: - sys.stdout.write(_("(%s)\n") % inst.hint) + sys.stderr.write(_("(%s)\n") % inst.hint) return -1 except error.ParseError, inst: if len(inst.args) > 1: @@ -119,7 +119,7 @@ except util.Abort, inst: ui.warn(_("abort: %s\n") % inst) if inst.hint: - ui.status(_("(%s)\n") % inst.hint) + ui.warn(_("(%s)\n") % inst.hint) except ImportError, inst: ui.warn(_("abort: %s!\n") % inst) m = str(inst).split()[-1]