equal
deleted
inserted
replaced
5 # This software may be used and distributed according to the terms of the |
5 # This software may be used and distributed according to the terms of the |
6 # GNU General Public License version 2 or any later version. |
6 # GNU General Public License version 2 or any later version. |
7 |
7 |
8 from i18n import gettext, _ |
8 from i18n import gettext, _ |
9 import sys, os |
9 import sys, os |
10 import extensions, revset, fileset, templatekw, templatefilters |
10 import extensions, revset, fileset, templatekw, templatefilters, filemerge |
11 import util |
11 import util |
12 |
12 |
13 def listexts(header, exts, indent=1): |
13 def listexts(header, exts, indent=1): |
14 '''return a text listing of the given extensions''' |
14 '''return a text listing of the given extensions''' |
15 if not exts: |
15 if not exts: |
103 def add(topic, doc): |
103 def add(topic, doc): |
104 return makeitemsdoc(topic, doc, marker, symbols) |
104 return makeitemsdoc(topic, doc, marker, symbols) |
105 addtopichook(topic, add) |
105 addtopichook(topic, add) |
106 |
106 |
107 addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols) |
107 addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols) |
|
108 addtopicsymbols('merge-tools', '.. internaltoolsmarker', filemerge.internals) |
108 addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols) |
109 addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols) |
109 addtopicsymbols('templates', '.. keywordsmarker', templatekw.keywords) |
110 addtopicsymbols('templates', '.. keywordsmarker', templatekw.keywords) |
110 addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters) |
111 addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters) |