Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/bundlerepo.py @ 4029:9210fba03d16
merge with -stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 15 Jan 2007 18:23:21 +0100 |
parents | 540d1059c802 01d98d68d697 |
children | 1b5c38e9d7aa |
line wrap: on
line diff
--- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -11,9 +11,8 @@ of the GNU General Public License, incor """ 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 @@ class bundlerevlog(revlog.revlog): 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: