Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/demandload.py @ 3044:fcadf7a32425

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
date Sun, 03 Sep 2006 06:06:02 -0400
parents 61afc32c1a49
children
line wrap: on
line diff
--- a/mercurial/demandload.py
+++ b/mercurial/demandload.py
@@ -96,6 +96,7 @@ def demandload(scope, modules):
 
     foo            import foo
     foo bar        import foo, bar
+    foo@bar        import foo as bar
     foo.bar        import foo.bar
     foo:bar        from foo import bar
     foo:bar,quux   from foo import bar, quux
@@ -108,6 +109,9 @@ def demandload(scope, modules):
             mod = mod[:col]
         else:
             fromlist = []
+        as_ = None
+        if '@' in mod:
+            mod, as_ = mod.split("@")
         importer = _importer(scope, mod, fromlist)
         if fromlist:
             for name in fromlist:
@@ -126,4 +130,6 @@ def demandload(scope, modules):
                     continue
             else:
                 basemod = mod
-            scope[basemod] = _replacer(importer, basemod)
+            if not as_:
+                as_ = basemod
+            scope[as_] = _replacer(importer, as_)