diff --git a/mercurial/extensions.py b/mercurial/extensions.py --- a/mercurial/extensions.py +++ b/mercurial/extensions.py @@ -29,7 +29,7 @@ def find(name): raise KeyError(name) def load(ui, name, path): - if name.startswith('hgext.'): + if name.startswith('hgext.') or name.startswith('hgext/'): shortname = name[6:] else: shortname = name diff --git a/tests/test-extension b/tests/test-extension --- a/tests/test-extension +++ b/tests/test-extension @@ -80,3 +80,25 @@ echo "debugextension = $debugpath" >> $H hg help debugextension hg --debug help debugextension echo 'debugextension = !' >> $HGRCPATH + +echo % issue811 +debugpath=`pwd`/debugissue811.py +cat > debugissue811.py <> $HGRCPATH +echo "mq=" >> $HGRCPATH +echo "hgext.mq=" >> $HGRCPATH +echo "hgext/mq=" >> $HGRCPATH + +echo % show extensions +hg debugextensions diff --git a/tests/test-extension.out b/tests/test-extension.out --- a/tests/test-extension.out +++ b/tests/test-extension.out @@ -57,3 +57,7 @@ global options: --profile print command execution profile --version output version information and exit -h --help display help and exit +% issue811 +% show extensions +debugissue811 +mq