Mercurial Mercurial > mercurial / 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.
When failing to load an extension, show where Hg tried to load it from.
authorJesse Glick <jesse.glick@sun.com>
Mon, 03 Mar 2008 12:46:57 -0500
changeset 6204 f8a86ea7521b
parent 6203 3a75fcc96dac
child 6205 b193a6e59131
When failing to load an extension, show where Hg tried to load it from.
mercurial/extensions.py file | annotate | diff | comparison | revisions
tests/test-bad-extension file | annotate | diff | comparison | revisions
tests/test-bad-extension.out file | annotate | diff | comparison | revisions 
--- a/mercurial/extensions.py	Sun Mar 02 23:32:13 2008 +0100
+++ b/mercurial/extensions.py	Mon Mar 03 12:46:57 2008 -0500
@@ -78,8 +78,12 @@
         except (util.SignalInterrupt, KeyboardInterrupt):
             raise
         except Exception, inst:
-            ui.warn(_("*** failed to import extension %s: %s\n") %
-                    (name, inst))
+            if path:
+                ui.warn(_("*** failed to import extension %s from %s: %s\n")
+                        % (name, path, inst))
+            else:
+                ui.warn(_("*** failed to import extension %s: %s\n")
+                        % (name, inst))
             if ui.print_exc():
                 return 1
 
--- a/tests/test-bad-extension	Sun Mar 02 23:32:13 2008 +0100
+++ b/tests/test-bad-extension	Mon Mar 03 12:46:57 2008 -0500
@@ -7,5 +7,7 @@
 echo "gpg =" >> $HGRCPATH
 echo "hgext.gpg =" >> $HGRCPATH
 echo "badext = $abspath" >> $HGRCPATH
+echo "badext2 =" >> $HGRCPATH
 
-hg -q help help
+hg -q help help 2>&1 | python -c \
+  "import sys; sys.stdout.write(sys.stdin.read().replace('$abspath', '.../badext.py'))"
--- a/tests/test-bad-extension.out	Sun Mar 02 23:32:13 2008 +0100
+++ b/tests/test-bad-extension.out	Mon Mar 03 12:46:57 2008 -0500
@@ -1,4 +1,5 @@
-*** failed to import extension badext: bit bucket overflow
+*** failed to import extension badext from .../badext.py: bit bucket overflow
+*** failed to import extension badext2: No module named badext2
 hg help [COMMAND]
 
 show help for a command, extension, or list of commands
mercurial