[PATCH] dispatch: use the right context manager to deactivate demandimport

Jordi Gutiérrez Hermoso jordigh at octave.org
Sun Sep 13 20:44:42 UTC 2015


# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh at octave.org>
# Date 1442176221 14400
#      Sun Sep 13 16:30:21 2015 -0400
# Node ID 2e42517129caca9bcf4420e6f466f2205af22d43
# Parent  6c962145f523e6e0ed1c94eb6764bf198a92917b
dispatch: use the right context manager to deactivate demandimport

In e86d12404d69 I very embarrassingly wrote a patch with the
completely wrong function name. This should fix it.

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -181,7 +181,7 @@ def _runcatch(req):
                     debugtrace[debugger] == debugtrace['pdb']):
                     ui.warn(_("%s debugger specified "
                               "but its module was not found\n") % debugger)
-                with demandimport.disabled():
+                with demandimport.deactivated():
                     debugtrace[debugger]()
             try:
                 return _dispatch(req)


More information about the Mercurial-devel mailing list