# HG changeset patch # User Michael Tharp # Date 1294671389 18000 # Node ID bf6d44054cec4a3536ac012ddb2f536c2861acaf # Parent b3aa740a13f81c500061dbe458e33f2b56f56a96 Fix some conditional imports that didn't trigger becuase of the lazy importer diff -r b3aa740a13f8 -r bf6d44054cec forest.py --- a/forest.py Wed Jan 05 11:29:08 2011 -0500 +++ b/forest.py Mon Jan 10 09:56:29 2011 -0500 @@ -264,7 +264,9 @@ try: from mercurial import wireproto -except KeyError: + # Force the lazy importer to trigger + wireproto.capabilities +except ImportError: pass else: # hg >= 1.7 @@ -936,6 +938,8 @@ source = [source] try: import hgext.fetch as fetch + # Force the lazy importer to trigger + fetch.cmdtable except ImportError: raise util.Abort(_("could not import fetch module\n")) @@ -1498,6 +1502,8 @@ try: import hgext.fetch + # Force the lazy importer to trigger + hgext.fetch.cmdtable except ImportError: return try: