Mercurial > public > mercurial-scm > hg
comparison mercurial/help.py @ 24099:be83fd9d46d5
help.merge-tools: do not double document merge tools
Merge tools were being double documented in help system output due
to functions being defined under multiple names in the merge tools
dictionary.
Establish a new dictionary for just the tools to document and
use it from the help system so we don't get double output.
Double documentation likely plagues other auto-documented items
as well. It might be a good idea to eventually compare function
instances to filter out duplicate entries from dictionaries
passed to ``makeitemsdoc``. However, without an easy way to break
ties, this may result in some functions being advertised over
their modern equivalents. This would be a noble patch series.
But it isn't one this author is willing to tackle at this time.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 09 Feb 2015 23:07:39 -0800 |
parents | 067540702f64 |
children | 76c0b4cfa039 |
comparison
equal
deleted
inserted
replaced
24098:067540702f64 | 24099:be83fd9d46d5 |
---|---|
202 def add(topic, doc): | 202 def add(topic, doc): |
203 return makeitemsdoc(topic, doc, marker, symbols, dedent=dedent) | 203 return makeitemsdoc(topic, doc, marker, symbols, dedent=dedent) |
204 addtopichook(topic, add) | 204 addtopichook(topic, add) |
205 | 205 |
206 addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols) | 206 addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols) |
207 addtopicsymbols('merge-tools', '.. internaltoolsmarker', filemerge.internals) | 207 addtopicsymbols('merge-tools', '.. internaltoolsmarker', |
208 filemerge.internalsdoc) | |
208 addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols) | 209 addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols) |
209 addtopicsymbols('templates', '.. keywordsmarker', templatekw.dockeywords) | 210 addtopicsymbols('templates', '.. keywordsmarker', templatekw.dockeywords) |
210 addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters) | 211 addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters) |
211 addtopicsymbols('hgweb', '.. webcommandsmarker', webcommands.commands, | 212 addtopicsymbols('hgweb', '.. webcommandsmarker', webcommands.commands, |
212 dedent=True) | 213 dedent=True) |