Mercurial > public > mercurial-scm > hg
comparison mercurial/help.py @ 30769:e520f0f4b1cf
help: merge revsets.txt into revisions.txt
Selecting single and multiple revisions is closely related, so let's
put it in one place, so users can easily find it. We actually did not
even point to "hg help revsets" from "hg help revisions", but now that
they're on a single page, that won't be necessary.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 11 Jan 2017 11:37:38 -0800 |
parents | 66cffa87d2f2 |
children | 98bfce9bd5e5 |
comparison
equal
deleted
inserted
replaced
30768:43839a24fd59 | 30769:e520f0f4b1cf |
---|---|
208 (["config", "hgrc"], _("Configuration Files"), loaddoc('config')), | 208 (["config", "hgrc"], _("Configuration Files"), loaddoc('config')), |
209 (["dates"], _("Date Formats"), loaddoc('dates')), | 209 (["dates"], _("Date Formats"), loaddoc('dates')), |
210 (["patterns"], _("File Name Patterns"), loaddoc('patterns')), | 210 (["patterns"], _("File Name Patterns"), loaddoc('patterns')), |
211 (['environment', 'env'], _('Environment Variables'), | 211 (['environment', 'env'], _('Environment Variables'), |
212 loaddoc('environment')), | 212 loaddoc('environment')), |
213 (['revisions', 'revs'], _('Specifying Single Revisions'), | 213 (['revisions', 'revs', 'revsets', 'revset', 'multirevs', 'mrevs'], |
214 loaddoc('revisions')), | 214 _('Specifying Revisions'), loaddoc('revisions')), |
215 (['revsets', 'revset', 'multirevs', 'mrevs'], | |
216 _("Specifying Revision Sets"), loaddoc('revsets')), | |
217 (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')), | 215 (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')), |
218 (['diffs'], _('Diff Formats'), loaddoc('diffs')), | 216 (['diffs'], _('Diff Formats'), loaddoc('diffs')), |
219 (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')), | 217 (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')), |
220 (['templating', 'templates', 'template', 'style'], _('Template Usage'), | 218 (['templating', 'templates', 'template', 'style'], _('Template Usage'), |
221 loaddoc('templates')), | 219 loaddoc('templates')), |
278 addtopichook(topic, add) | 276 addtopichook(topic, add) |
279 | 277 |
280 addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols) | 278 addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols) |
281 addtopicsymbols('merge-tools', '.. internaltoolsmarker', | 279 addtopicsymbols('merge-tools', '.. internaltoolsmarker', |
282 filemerge.internalsdoc) | 280 filemerge.internalsdoc) |
283 addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols) | 281 addtopicsymbols('revisions', '.. predicatesmarker', revset.symbols) |
284 addtopicsymbols('templates', '.. keywordsmarker', templatekw.keywords) | 282 addtopicsymbols('templates', '.. keywordsmarker', templatekw.keywords) |
285 addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters) | 283 addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters) |
286 addtopicsymbols('templates', '.. functionsmarker', templater.funcs) | 284 addtopicsymbols('templates', '.. functionsmarker', templater.funcs) |
287 addtopicsymbols('hgweb', '.. webcommandsmarker', webcommands.commands, | 285 addtopicsymbols('hgweb', '.. webcommandsmarker', webcommands.commands, |
288 dedent=True) | 286 dedent=True) |