# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1156258510 25200
# Node ID 799811087044851e5435a7bee796ebb6eeb0eb22
# Parent  0171a54326214f9c509a64218567b83578801f92# Parent  94def4db6cd4ab883098f7e766eef70cae629b99
merge.

diff --git a/mercurial/packagescan.py b/mercurial/packagescan.py
--- a/mercurial/packagescan.py
+++ b/mercurial/packagescan.py
@@ -25,8 +25,8 @@ def demandload(scope, modules):
     """ fake demandload function that collects the required modules
         foo            import foo
         foo bar        import foo, bar
+        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
         foo.bar:quux   from foo.bar import quux"""
@@ -39,6 +39,7 @@ def demandload(scope, modules):
         except:
             module = m
             fromlist = []
+        as_ = None
         if '@' in module:
             module, as_ = module.split('@')
         mod = __import__(module, scope, scope, fromlist)
@@ -49,7 +50,9 @@ def demandload(scope, modules):
             mn = comp[0]
             while True:
                 # mn and mod.__name__ might not be the same
-                scope[mn] = mod
+                if not as_:
+                    as_ = mn
+                scope[as_] = mod
                 requiredmodules[mod.__name__] = 1
                 if len(comp) == i: break
                 mod = getattr(mod,comp[i])