Mercurial > hg-stable

changeset 3898:316cd5b0c940

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with main
author Brendan Cully <brendan@kublai.com>
date Fri, 15 Dec 2006 11:14:55 -0800
parents 7034020aeaf9 (current diff) f47afa2401a2 (diff)
children 0d27502a804c
files mercurial/demandimport.py
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/demandimport.py	Fri Dec 15 05:38:54 2006 +0100
+++ b/mercurial/demandimport.py	Fri Dec 15 11:14:55 2006 -0800
@@ -92,7 +92,7 @@
                 setattr(mod, x, _demandmod(x, mod.__dict__, mod.__dict__))
         return mod
 
-ignore = []
+ignore = ['_hashlib', 'email.mime']
 
 def enable():
     "enable global demand-loading of modules"
--- a/setup.py	Fri Dec 15 05:38:54 2006 +0100
+++ b/setup.py	Fri Dec 15 11:14:55 2006 -0800
@@ -17,6 +17,8 @@
 import mercurial.demandimport
 mercurial.demandimport.enable = lambda: None
 
+extra = {}
+
 # py2exe needs to be installed to work
 try:
     import py2exe
@@ -35,6 +37,8 @@
     except ImportError:
         pass
 
+    extra['console'] = ['hg']
+
 except ImportError:
     pass
 
@@ -70,4 +74,4 @@
                                    license='COPYING',
                                    readme='contrib/macosx/Readme.html',
                                    welcome='contrib/macosx/Welcome.html')),
-      console=['hg'])
+      **extra)