Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
authorMartin Geisler <mg@lazybytes.net>
Sat, 01 May 2010 16:15:27 +0200
changeset 11054 355a7535bcac
parent 11051 bf7e63fedca1 (current diff)
parent 11053 59d0d715fbfa (diff)
child 11055 a869a6a42c9e
Merge with stable
hgext/relink.py file | annotate | diff | comparison | revisions
mercurial/dispatch.py file | annotate | diff | comparison | revisions 
--- 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():
hg-stable