Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/help.py @ 16126:0c4bec9596d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: create detail of internal merge tools from documentation string this patch introduces 'internaltoolsmarker' which creates detail of each internal merge tools from documentation string for 'hg help merge-tools'.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sun, 12 Feb 2012 21:38:12 +0900
parents 0455463655e0
children 684864d54903
comparison
equal deleted inserted replaced
16125:83925d3a4559 16126:0c4bec9596d8
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)