diff --git a/mercurial/templates/coal/map b/mercurial/templates/coal/map --- a/mercurial/templates/coal/map +++ b/mercurial/templates/coal/map @@ -13,7 +13,14 @@ graph = ../paper/graph.tmpl help = ../paper/help.tmpl helptopics = ../paper/helptopics.tmpl -helpentry = '{topic|escape}{summary|escape}' +helpentry = ' + + + {topic|escape} + + + {summary|escape} + ' naventry = '{label|escape} ' navshortentry = '{label|escape} ' diff --git a/mercurial/templates/gitweb/map b/mercurial/templates/gitweb/map --- a/mercurial/templates/gitweb/map +++ b/mercurial/templates/gitweb/map @@ -11,7 +11,14 @@ notfound = notfound.tmpl help = help.tmpl helptopics = helptopics.tmpl -helpentry = '{topic|escape}{summary|escape}' +helpentry = ' + + + {topic|escape} + + + {summary|escape} + ' naventry = '{label|escape} ' navshortentry = '{label|escape} ' diff --git a/mercurial/templates/monoblue/map b/mercurial/templates/monoblue/map --- a/mercurial/templates/monoblue/map +++ b/mercurial/templates/monoblue/map @@ -11,7 +11,14 @@ notfound = notfound.tmpl help = help.tmpl helptopics = helptopics.tmpl -helpentry = '{topic|escape}{summary|escape}' +helpentry = ' + + + {topic|escape} + + + {summary|escape} + ' naventry = '{label|escape} ' navshortentry = '{label|escape} ' diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map --- a/mercurial/templates/paper/map +++ b/mercurial/templates/paper/map @@ -12,7 +12,14 @@ graph = graph.tmpl help = help.tmpl helptopics = helptopics.tmpl -helpentry = '{topic|escape}{summary|escape}' +helpentry = ' + + + {topic|escape} + + + {summary|escape} + ' naventry = '{label|escape} ' navshortentry = '{label|escape} ' diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -931,13 +931,524 @@ Dish up an empty repo; serve it cold. - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Topics

configConfiguration Files
datesDate Formats
diffsDiff Formats
environmentEnvironment Variables
extensionsUsing Additional Features
filesetsSpecifying File Sets
glossaryGlossary
hgignoreSyntax for Mercurial Ignore Files
hgwebConfiguring hgweb
merge-toolsMerge Tools
multirevsSpecifying Multiple Revisions
patternsFile Name Patterns
phasesWorking with Phases
revisionsSpecifying Single Revisions
revsetsSpecifying Revision Sets
subreposSubrepositories
templatingTemplate Usage
urlsURL Paths
topic-containing-verboseThis is the topic to test omit indicating.
+ + config + + + Configuration Files +
+ + dates + + + Date Formats +
+ + diffs + + + Diff Formats +
+ + environment + + + Environment Variables +
+ + extensions + + + Using Additional Features +
+ + filesets + + + Specifying File Sets +
+ + glossary + + + Glossary +
+ + hgignore + + + Syntax for Mercurial Ignore Files +
+ + hgweb + + + Configuring hgweb +
+ + merge-tools + + + Merge Tools +
+ + multirevs + + + Specifying Multiple Revisions +
+ + patterns + + + File Name Patterns +
+ + phases + + + Working with Phases +
+ + revisions + + + Specifying Single Revisions +
+ + revsets + + + Specifying Revision Sets +
+ + subrepos + + + Subrepositories +
+ + templating + + + Template Usage +
+ + urls + + + URL Paths +
+ + topic-containing-verbose + + + This is the topic to test omit indicating. +

Main Commands

addadd the specified files on the next commit
annotateshow changeset information by line for each file
clonemake a copy of an existing repository
commitcommit the specified files or all outstanding changes
diffdiff repository (or selected files)
exportdump the header and diffs for one or more changesets
forgetforget the specified files on the next commit
initcreate a new repository in the given directory
logshow revision history of entire repository or files
mergemerge working directory with another revision
pullpull changes from the specified source
pushpush changes to the specified destination
removeremove the specified files on the next commit
servestart stand-alone webserver
statusshow changed files in the working directory
summarysummarize working directory state
updateupdate working directory (or switch revisions)
+ + add + + + add the specified files on the next commit +
+ + annotate + + + show changeset information by line for each file +
+ + clone + + + make a copy of an existing repository +
+ + commit + + + commit the specified files or all outstanding changes +
+ + diff + + + diff repository (or selected files) +
+ + export + + + dump the header and diffs for one or more changesets +
+ + forget + + + forget the specified files on the next commit +
+ + init + + + create a new repository in the given directory +
+ + log + + + show revision history of entire repository or files +
+ + merge + + + merge working directory with another revision +
+ + pull + + + pull changes from the specified source +
+ + push + + + push changes to the specified destination +
+ + remove + + + remove the specified files on the next commit +
+ + serve + + + start stand-alone webserver +
+ + status + + + show changed files in the working directory +
+ + summary + + + summarize working directory state +
+ + update + + + update working directory (or switch revisions) +

Other Commands

addremoveadd all new files, delete all missing files
archivecreate an unversioned archive of a repository revision
backoutreverse effect of earlier changeset
bisectsubdivision search of changesets
bookmarkstrack a line of development with movable markers
branchset or show the current branch name
brancheslist repository named branches
bundlecreate a changegroup file
catoutput the current or given revision of files
copymark files as copied for the next commit
graftcopy changes from other branches onto the current branch
grepsearch for a pattern in specified files and revisions
headsshow current repository heads or show branch heads
helpshow help for a given topic or a help overview
identifyidentify the working copy or specified revision
importimport an ordered set of patches
incomingshow new changesets found in source
locatelocate files matching specific patterns
manifestoutput the current or given revision of the project manifest
nohelp(no help text available)
outgoingshow changesets not found in the destination
parentsshow the parents of the working directory or revision
pathsshow aliases for remote repositories
phaseset or show the current phase name
recoverroll back an interrupted transaction
renamerename files; equivalent of copy + remove
resolveredo merges or set/view the merge status of files
revertrestore files to their checkout state
rollbackroll back the last transaction (dangerous)
rootprint the root (top) of the current working directory
showconfigshow combined config settings from all hgrc files
tagadd one or more tags for the current or given revision
tagslist repository tags
tipshow the tip revision
unbundleapply one or more changegroup files
verifyverify the integrity of the repository
versionoutput version and copyright information
+ + addremove + + + add all new files, delete all missing files +
+ + archive + + + create an unversioned archive of a repository revision +
+ + backout + + + reverse effect of earlier changeset +
+ + bisect + + + subdivision search of changesets +
+ + bookmarks + + + track a line of development with movable markers +
+ + branch + + + set or show the current branch name +
+ + branches + + + list repository named branches +
+ + bundle + + + create a changegroup file +
+ + cat + + + output the current or given revision of files +
+ + copy + + + mark files as copied for the next commit +
+ + graft + + + copy changes from other branches onto the current branch +
+ + grep + + + search for a pattern in specified files and revisions +
+ + heads + + + show current repository heads or show branch heads +
+ + help + + + show help for a given topic or a help overview +
+ + identify + + + identify the working copy or specified revision +
+ + import + + + import an ordered set of patches +
+ + incoming + + + show new changesets found in source +
+ + locate + + + locate files matching specific patterns +
+ + manifest + + + output the current or given revision of the project manifest +
+ + nohelp + + + (no help text available) +
+ + outgoing + + + show changesets not found in the destination +
+ + parents + + + show the parents of the working directory or revision +
+ + paths + + + show aliases for remote repositories +
+ + phase + + + set or show the current phase name +
+ + recover + + + roll back an interrupted transaction +
+ + rename + + + rename files; equivalent of copy + remove +
+ + resolve + + + redo merges or set/view the merge status of files +
+ + revert + + + restore files to their checkout state +
+ + rollback + + + roll back the last transaction (dangerous) +
+ + root + + + print the root (top) of the current working directory +
+ + showconfig + + + show combined config settings from all hgrc files +
+ + tag + + + add one or more tags for the current or given revision +
+ + tags + + + list repository tags +
+ + tip + + + show the tip revision +
+ + unbundle + + + apply one or more changegroup files +
+ + verify + + + verify the integrity of the repository +
+ + version + + + output version and copyright information +