diff -r 1e0b94cfba0e -r abaee83ce0a6 mercurial/hg.py
--- a/mercurial/hg.py	Tue Dec 12 18:16:23 2006 -0600
+++ b/mercurial/hg.py	Wed Dec 13 13:27:09 2006 -0600
@@ -8,10 +8,11 @@
 
 from node import *
 from repo import *
-from demandload import *
 from i18n import gettext as _
-demandload(globals(), "localrepo bundlerepo httprepo sshrepo statichttprepo")
-demandload(globals(), "errno lock os shutil util merge@_merge verify@_verify")
+import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
+import errno, lock, os, shutil, util
+import merge as _merge
+import verify as _verify
 
 def _local(path):
     return (os.path.isfile(util.drop_scheme('file', path)) and