Mercurial > hg-stable
comparison mercurial/help.py @ 22367:c5df4af17110
merge with stable
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Thu, 04 Sep 2014 09:59:23 -0400 |
| parents | 7ada34676db8 e284de138f00 |
| children | 92b54547ac5d |
comparison
equal
deleted
inserted
replaced
| 22364:5c153c69fdb2 | 22367:c5df4af17110 |
|---|---|
| 85 'commands': [], | 85 'commands': [], |
| 86 'extensions': [], | 86 'extensions': [], |
| 87 'extensioncommands': [], | 87 'extensioncommands': [], |
| 88 } | 88 } |
| 89 for names, header, doc in helptable: | 89 for names, header, doc in helptable: |
| 90 # Old extensions may use a str as doc. | |
| 90 if (sum(map(lowercontains, names)) | 91 if (sum(map(lowercontains, names)) |
| 91 or lowercontains(header) | 92 or lowercontains(header) |
| 92 or lowercontains(doc())): | 93 or (callable(doc) and lowercontains(doc()))): |
| 93 results['topics'].append((names[0], header)) | 94 results['topics'].append((names[0], header)) |
| 94 import commands # avoid cycle | 95 import commands # avoid cycle |
| 95 for cmd, entry in commands.table.iteritems(): | 96 for cmd, entry in commands.table.iteritems(): |
| 96 if len(entry) == 3: | 97 if len(entry) == 3: |
| 97 summary = entry[2] | 98 summary = entry[2] |