# HG changeset patch # User Sietse Brouwer # Date 1556293981 -7200 # Node ID 3816e361e3d82830181644ffb9de400e50a41c38 # Parent 0786b791b3b571ba0e2fbaddfc07481d4928798e gendoc: group commands by category in man page and HTML help Make Mercurial's man page and HTML help group commands by category, and present the categories in a helpful order. `hg help` already does this; this patch uses the same metadata. This patch uses the same header level for command categories and for commands. A subsequent patch will push the command headers down one level. Differential Revision: https://phab.mercurial-scm.org/D6326 diff -r 0786b791b3b5 -r 3816e361e3d8 doc/gendoc.py --- a/doc/gendoc.py Thu Apr 25 19:15:17 2019 +0200 +++ b/doc/gendoc.py Fri Apr 26 17:53:01 2019 +0200 @@ -185,8 +185,33 @@ h[f] = c cmds = h.keys() - if True: - for f in sorted(cmds): + def helpcategory(cmd): + """Given a canonical command name from `cmds` (above), retrieve its + help category. If helpcategory is None, default to CATEGORY_NONE. + """ + fullname = h[cmd] + details = cmdtable[fullname] + helpcategory = details[0].helpcategory + return helpcategory or help.registrar.command.CATEGORY_NONE + + # Print the help for each command. We present the commands grouped by + # category, and we use help.CATEGORY_ORDER as a guide for a helpful order + # in which to present the categories. + cmdsbycategory = {category: [] for category in help.CATEGORY_ORDER} + for cmd in cmds: + cmdsbycategory[helpcategory(cmd)].append(cmd) + + for category in help.CATEGORY_ORDER: + categorycmds = cmdsbycategory[category] + if not categorycmds: + # Skip empty categories + continue + # Print a section header for the category. + # For now, the category header is at the same level as the headers for + # the commands in the category; this is fixed in the next commit. + ui.write(sectionfunc(help.CATEGORY_NAMES[category])) + # Print each command in the category + for f in sorted(categorycmds): if f.startswith(b"debug"): continue d = get_cmd(h[f], cmdtable)