Mercurial > public > mercurial-scm > hg-stable

diff mercurial/help.py @ 22367:c5df4af17110

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <raf@durin42.com>
date Thu, 04 Sep 2014 09:59:23 -0400
parents 7ada34676db8 e284de138f00
children 92b54547ac5d
line wrap: on
line diff
--- a/mercurial/help.py	Tue Aug 26 04:58:41 2014 -0700
+++ b/mercurial/help.py	Thu Sep 04 09:59:23 2014 -0400
@@ -87,9 +87,10 @@
                'extensioncommands': [],
                }
     for names, header, doc in helptable:
+        # Old extensions may use a str as doc.
         if (sum(map(lowercontains, names))
             or lowercontains(header)
-            or lowercontains(doc())):
+            or (callable(doc) and lowercontains(doc()))):
             results['topics'].append((names[0], header))
     import commands # avoid cycle
     for cmd, entry in commands.table.iteritems():