changeset 26216:e86d12404d69

dispatch: disable demandimport when invoking the debugger Turns out that demandimport confuses pudb, which does some pretty complicated imports. I think it's reasonable to disable demandimport here.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Thu, 10 Sep 2015 09:30:10 -0400
parents 72aad184f061
children 0d0a0837895d
files mercurial/dispatch.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dispatch.py	Wed Sep 09 14:43:45 2015 -0700
+++ b/mercurial/dispatch.py	Thu Sep 10 09:30:10 2015 -0400
@@ -181,8 +181,8 @@
                     debugtrace[debugger] == debugtrace['pdb']):
                     ui.warn(_("%s debugger specified "
                               "but its module was not found\n") % debugger)
-
-                debugtrace[debugger]()
+                with demandimport.disabled():
+                    debugtrace[debugger]()
             try:
                 return _dispatch(req)
             finally: