diff -r e8046ca0405d -r e44586d9c207 mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py Fri Feb 06 22:52:40 2015 -0800 +++ b/mercurial/hgweb/webcommands.py Fri Feb 06 22:47:48 2015 -0800 @@ -13,7 +13,6 @@ from common import paritygen, staticfile, get_contact, ErrorResponse from common import HTTP_OK, HTTP_FORBIDDEN, HTTP_NOT_FOUND from mercurial import graphmod, patch -from mercurial import help as helpmod from mercurial import scmutil from mercurial.i18n import _ from mercurial.error import ParseError, RepoLookupError, Abort @@ -1083,6 +1082,7 @@ @webcommand('help') def help(web, req, tmpl): from mercurial import commands # avoid cycle + from mercurial import help as helpmod # avoid cycle topicname = req.form.get('node', [None])[0] if not topicname: