# HG changeset patch # User Brendan Cully # Date 1154469414 25200 # Node ID 6c2c10cedf7a445c173b42b5017e5e00385e1d8e # Parent 19041b8cbc86c94557344c6e6ee4de140a93386e Check for parent/mod as well as parent.mod in findext. Debian/Ubuntu ship a system-wide hgrc that loads extensions using the syntax hgext/extension=, rather than hgext.extension=. Although the extensions work correctly, hg help doesn't understand this form without this patch. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3352,9 +3352,8 @@ def findext(name): try: return sys.modules[external[name]] except KeyError: - dotname = '.' + name for k, v in external.iteritems(): - if k.endswith('.' + name) or v == name: + if k.endswith('.' + name) or k.endswith('/' + name) or v == name: return sys.modules[v] raise KeyError(name)