Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dispatch.py @ 11054:355a7535bcac
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 01 May 2010 16:15:27 +0200 |
| parents | 8d5f5122a732 59d0d715fbfa |
| children | 385b95d10410 |
line wrap: on
line diff
--- a/mercurial/dispatch.py Thu Apr 29 22:14:14 2010 -0500 +++ b/mercurial/dispatch.py Sat May 01 16:15:27 2010 +0200 @@ -105,8 +105,8 @@ except util.Abort, inst: ui.warn(_("abort: %s\n") % inst) except ImportError, inst: + ui.warn(_("abort: %s!\n") % inst) m = str(inst).split()[-1] - ui.warn(_("abort: could not import module %s!\n") % m) if m in "mpatch bdiff".split(): ui.warn(_("(did you forget to compile extensions?)\n")) elif m in "zlib".split():