Merge with main

mercurial/demandimport.py

@@ -92,7 +92,7 b' def _demandimport(name, globals=None, lo'
                 setattr(mod, x, _demandmod(x, mod.__dict__, mod.__dict__))
         return mod
 
-ignore = []
+ignore = ['_hashlib', 'email.mime']
 
 def enable():
     "enable global demand-loading of modules"

setup.py

@@ -17,6 +17,8 b' import mercurial.version'
 import mercurial.demandimport
 mercurial.demandimport.enable = lambda: None
 
+extra = {}
+
 # py2exe needs to be installed to work
 try:
     import py2exe
@@ -35,6 +37,8 b' try:'
     except ImportError:
         pass
 
+    extra['console'] = ['hg']
+
 except ImportError:
     pass
 
@@ -70,4 +74,4 b" setup(name='mercurial',"
                                    license='COPYING',
                                    readme='contrib/macosx/Readme.html',
                                    welcome='contrib/macosx/Welcome.html')),
-      console=['hg'])
+      **extra)