help: move option list display into subfunctions

mercurial/commands.py

@@ -2805,6 +2805,8 b' def help_(ui, name=None, unknowncmd=Fals'
         except KeyError:
             pass
 
+        ui.write(opttext(optlist, textwidth))
+
     def helplist(select=None):
         # list of commands
         if name == "shortlist":
@@ -2867,6 +2869,8 b' def help_(ui, name=None, unknowncmd=Fals'
             for t, desc in topics:
                 ui.write(" %-*s  %s\n" % (topics_len, t, desc))
 
+        ui.write(opttext(optlist, textwidth))
+
     def helptopic(name):
         for names, header, doc in help.helptable:
             if name in names:
@@ -2955,7 +2959,6 b' def help_(ui, name=None, unknowncmd=Fals'
         ui.status('\n')
         helplist()
 
-    ui.write(opttext(optlist, textwidth))
 
 @command('identify|id',
     [('r', 'rev', '',