extensions: load modules in module/__init__.py form.

For example, convert=/path/to/convert now works.

mercurial/extensions.py

@@ -1,69 +1,75 b''
 # extensions.py - extension handling for mercurial
 #
 # Copyright 2005, 2006 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-import imp, commands, hg, util, sys
+import imp, os
+import commands, hg, util, sys
 from i18n import _
 
 _extensions = {}
 
 def find(name):
     '''return module with given extension name'''
     try:
         return _extensions[name]
     except KeyError:
         for k, v in _extensions.iteritems():
             if k.endswith('.' + name) or k.endswith('/' + name) or v == name:
                 return sys.modules[v]
         raise KeyError(name)
 
 def load(ui, name, path):
     if name in _extensions:
         return
     if path:
         # the module will be loaded in sys.modules
         # choose an unique name so that it doesn't
         # conflicts with other modules
         module_name = "hgext_%s" % name.replace('.', '_')
-        mod = imp.load_source(module_name, path)
+        if os.path.isdir(path):
+            # module/__init__.py style
+            fd, fpath, desc = imp.find_module('', [path])
+            mod = imp.load_module(module_name, fd, fpath, desc)
+        else:
+            mod = imp.load_source(module_name, path)
     else:
         def importh(name):
             mod = __import__(name)
             components = name.split('.')
             for comp in components[1:]:
                 mod = getattr(mod, comp)
             return mod
         try:
             mod = importh("hgext.%s" % name)
         except ImportError:
             mod = importh(name)
     _extensions[name] = mod
 
     uisetup = getattr(mod, 'uisetup', None)
     if uisetup:
         uisetup(ui)
     reposetup = getattr(mod, 'reposetup', None)
     if reposetup:
         hg.repo_setup_hooks.append(reposetup)
     cmdtable = getattr(mod, 'cmdtable', {})
     overrides = [cmd for cmd in cmdtable if cmd in commands.table]
     if overrides:
         ui.warn(_("extension '%s' overrides commands: %s\n")
                 % (name, " ".join(overrides)))
     commands.table.update(cmdtable)
 
 def loadall(ui):
     for name, path in ui.extensions():
         try:
             load(ui, name, path)
         except (util.SignalInterrupt, KeyboardInterrupt):
             raise
         except Exception, inst:
             ui.warn(_("*** failed to import extension %s: %s\n") %
                     (name, inst))
             if ui.print_exc():
                 return 1
 

tests/test-extension

@@ -1,45 +1,55 b''
 #!/bin/sh
 # Test basic extension support
 
 cat > foobar.py <<EOF
 import os
 from mercurial import commands
 
 def uisetup(ui):
     ui.write("uisetup called\\n")
     ui.write("ui.parentui is%s None\\n" % (ui.parentui is not None
                                            and "not" or ""))
 
 def reposetup(ui, repo):
     ui.write("reposetup called for %s\\n" % os.path.basename(repo.root))
     ui.write("ui %s= repo.ui\\n" % (ui == repo.ui and "=" or "!"))
 
 def foo(ui, *args, **kwargs):
     ui.write("Foo\\n")
 
 def bar(ui, *args, **kwargs):
     ui.write("Bar\\n")
 
 cmdtable = {
     "foo": (foo, [], "hg foo"),
     "bar": (bar, [], "hg bar"),
 }
 
 commands.norepo += ' bar'
 EOF
 abspath=`pwd`/foobar.py
 
+mkdir barfoo
+cp foobar.py barfoo/__init__.py
+barfoopath=`pwd`/barfoo
+
 hg init a
 cd a
 echo foo > file
 hg add file
 hg commit -m 'add file'
 
 echo '[extensions]' >> $HGRCPATH
 echo "foobar = $abspath" >> $HGRCPATH
 hg foo
 
 cd ..
 hg clone a b
 
 hg bar
+
+echo '% module/__init__.py-style'
+echo '[extensions]' > $HGRCPATH
+echo "barfoo = $barfoopath" >> $HGRCPATH
+cd a
+hg foo

tests/test-extension.out

@@ -1,15 +1,21 b''
 uisetup called
 ui.parentui is None
 reposetup called for a
 ui == repo.ui
 Foo
 uisetup called
 ui.parentui is None
 reposetup called for a
 ui == repo.ui
 reposetup called for b
 ui == repo.ui
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 uisetup called
 ui.parentui is None
 Bar
+% module/__init__.py-style
+uisetup called
+ui.parentui is None
+reposetup called for a
+ui == repo.ui
+Foo