Show More
@@ -21,6 +21,8 b' def _toollist(ui, tool, part, default=[]' | |||
|
21 | 21 | return ui.configlist("merge-tools", tool + "." + part, default) |
|
22 | 22 | |
|
23 | 23 | internals = {} |
|
24 | # Merge tools to document. | |
|
25 | internalsdoc = {} | |
|
24 | 26 | |
|
25 | 27 | def internaltool(name, trymerge, onfailure=None): |
|
26 | 28 | '''return a decorator for populating internal merge tool table''' |
@@ -29,6 +31,7 b' def internaltool(name, trymerge, onfailu' | |||
|
29 | 31 | func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip() |
|
30 | 32 | internals[fullname] = func |
|
31 | 33 | internals['internal:' + name] = func |
|
34 | internalsdoc[fullname] = func | |
|
32 | 35 | func.trymerge = trymerge |
|
33 | 36 | func.onfailure = onfailure |
|
34 | 37 | return func |
@@ -204,7 +204,8 b' def addtopicsymbols(topic, marker, symbo' | |||
|
204 | 204 | addtopichook(topic, add) |
|
205 | 205 | |
|
206 | 206 | addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols) |
|
207 |
addtopicsymbols('merge-tools', '.. internaltoolsmarker', |
|
|
207 | addtopicsymbols('merge-tools', '.. internaltoolsmarker', | |
|
208 | filemerge.internalsdoc) | |
|
208 | 209 | addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols) |
|
209 | 210 | addtopicsymbols('templates', '.. keywordsmarker', templatekw.dockeywords) |
|
210 | 211 | addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters) |
General Comments 0
You need to be logged in to leave comments.
Login now