diff -r 540d1059c802 -r 9210fba03d16 mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py	Mon Jan 15 17:56:20 2007 +0100
+++ b/mercurial/bundlerepo.py	Mon Jan 15 18:23:21 2007 +0100
@@ -11,9 +11,8 @@
 """
 
 from node import *
-from i18n import gettext as _
-from demandload import demandload
-demandload(globals(), "changegroup util os struct bz2 tempfile")
+from i18n import _
+import changegroup, util, os, struct, bz2, tempfile
 
 import localrepo, changelog, manifest, filelog, revlog
 
@@ -50,7 +49,7 @@
                 continue
             for p in (p1, p2):
                 if not p in self.nodemap:
-                    raise revlog.RevlogError(_("unknown parent %s") % short(p1))
+                    raise revlog.LookupError(_("unknown parent %s") % short(p1))
             if linkmapper is None:
                 link = n
             else: