rdamazio created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY This makes them show up under the right categories in 'hg help'. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6999 AFFECTED FILES hgext3rd/evolve/__init__.py hgext3rd/evolve/cmdrewrite.py hgext3rd/evolve/evolvecmd.py hgext3rd/evolve/obshistory.py hgext3rd/evolve/rewind.py hgext3rd/topic/__init__.py CHANGE DETAILS diff --git a/hgext3rd/topic/__init__.py b/hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py +++ b/hgext3rd/topic/__init__.py @@ -634,7 +634,8 @@ (b'', b'age', False, b'show when you last touched the topics'), (b'', b'current', None, b'display the current topic only'), ] + commands.formatteropts, - _(b'hg topics [TOPIC]')) + _(b'hg topics [TOPIC]'), + helpcategory=command.CATEGORY_CHANGE_ORGANIZATION) def topics(ui, repo, topic=None, **opts): """View current topic, set current topic, change topic for a set of revisions, or see all topics. @@ -777,7 +778,8 @@ (b'c', b'children', None, _(b'display data about children outside of the stack')) ] + commands.formatteropts, - _(b'hg stack [TOPIC]')) + _(b'hg stack [TOPIC]'), + helpcategory=command.CATEGORY_CHANGE_ORGANIZATION) def cmdstack(ui, repo, topic=b'', **opts): """list all changesets in a topic and other information diff --git a/hgext3rd/evolve/rewind.py b/hgext3rd/evolve/rewind.py --- a/hgext3rd/evolve/rewind.py +++ b/hgext3rd/evolve/rewind.py @@ -9,6 +9,7 @@ hg, obsolete, obsutil, + registrar, scmutil, ) @@ -36,7 +37,8 @@ _(b"do not modify working directory during rewind")), ], _(b'[--as-divergence] [--exact] [--keep] [--to REV]... [--from REV]...'), - helpbasic=True) + helpbasic=True, + helpcategory=registrar.command.CATEGORY_CHANGE_MANAGEMENT) def rewind(ui, repo, **opts): """rewind a stack of changesets to a previous state diff --git a/hgext3rd/evolve/obshistory.py b/hgext3rd/evolve/obshistory.py --- a/hgext3rd/evolve/obshistory.py +++ b/hgext3rd/evolve/obshistory.py @@ -17,6 +17,7 @@ obsutil, node as nodemod, pycompat, + registrar, scmutil, util, ) @@ -50,7 +51,8 @@ (b'p', b'patch', False, _(b'show the patch between two obs versions')), (b'f', b'filternonlocal', False, _(b'filter out non local commits')), ] + commands.formatteropts, - _(b'hg olog [OPTION]... [REV]')) + _(b'hg olog [OPTION]... [REV]'), + helpcategory=registrar.command.CATEGORY_CHANGE_NAVIGATION) def cmdobshistory(ui, repo, *revs, **opts): """show the obsolescence history of the specified revisions diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py +++ b/hgext3rd/evolve/evolvecmd.py @@ -27,6 +27,7 @@ obsutil, phases, pycompat, + registrar, repair, scmutil, simplemerge, @@ -1505,7 +1506,8 @@ b' in the repo')), ] + mergetoolopts, _(b'[OPTIONS]...'), - helpbasic=True + helpbasic=True, + helpcategory=registrar.command.CATEGORY_CHANGE_MANAGEMENT ) def evolve(ui, repo, **opts): """solve troubled changesets in your repository diff --git a/hgext3rd/evolve/cmdrewrite.py b/hgext3rd/evolve/cmdrewrite.py --- a/hgext3rd/evolve/cmdrewrite.py +++ b/hgext3rd/evolve/cmdrewrite.py @@ -30,6 +30,7 @@ patch, phases, pycompat, + registrar, scmutil, util, ) @@ -109,7 +110,8 @@ (b'n', b'note', b'', _(b'store a note on amend'), _(b'TEXT')), ] + walkopts + commitopts + commitopts2 + commitopts3 + interactiveopt, _(b'[OPTION]... [FILE]...'), - helpbasic=True) + helpbasic=True, + helpcategory=registrar.command.CATEGORY_COMMITTING) def amend(ui, repo, *pats, **opts): """combine a changeset with updates and replace it with a new one @@ -454,7 +456,8 @@ (b'', b'revert', False, _(b'discard working directory changes after uncommit')), (b'n', b'note', b'', _(b'store a note on uncommit'), _(b'TEXT')), ] + commands.walkopts + commitopts + commitopts2 + commitopts3, - _(b'[OPTION]... [NAME]')) + _(b'[OPTION]... [NAME]'), + helpcategory=registrar.command.CATEGORY_COMMITTING) def uncommit(ui, repo, *pats, **opts): """move changes from parent revision to working directory @@ -690,7 +693,8 @@ (b'n', b'note', b'', _(b'store a note on fold'), _(b'TEXT')), ] + commitopts + commitopts2 + commitopts3, _(b'hg fold [OPTION]... [-r] REV'), - helpbasic=True) + helpbasic=True, + helpcategory=registrar.command.CATEGORY_CHANGE_MANAGEMENT) def fold(ui, repo, *revs, **opts): """fold multiple revisions into a single one @@ -820,7 +824,8 @@ (b'', b'fold', None, _(b"also fold specified revisions into one")), (b'n', b'note', b'', _(b'store a note on metaedit'), _(b'TEXT')), ] + commitopts + commitopts2 + commitopts3, - _(b'hg metaedit [OPTION]... [-r] [REV]')) + _(b'hg metaedit [OPTION]... [-r] [REV]'), + helpcategory=registrar.command.CATEGORY_CHANGE_MANAGEMENT) def metaedit(ui, repo, *revs, **opts): """edit commit information @@ -979,7 +984,8 @@ (b'B', b'bookmark', [], _(b"remove revs only reachable from given" b" bookmark"), _(b'BOOKMARK'))] + metadataopts, _(b'[OPTION] [-r] REV...'), - helpbasic=True) + helpbasic=True, + helpcategory=registrar.command.CATEGORY_CHANGE_MANAGEMENT) # XXX -U --noupdate option to prevent wc update and or bookmarks update ? def cmdprune(ui, repo, *revs, **opts): """mark changesets as obsolete or succeeded by another changeset @@ -1173,7 +1179,8 @@ (b'n', b'note', b'', _(b"store a note on split"), _(b'TEXT')), ] + commitopts + commitopts2 + commitopts3, _(b'hg split [OPTION] [-r REV] [FILES]'), - helpbasic=True) + helpbasic=True, + helpcategory=registrar.command.CATEGORY_CHANGE_MANAGEMENT) def cmdsplit(ui, repo, *pats, **opts): """split a changeset into smaller changesets @@ -1348,7 +1355,8 @@ b'mark the new revision as successor of the old one potentially creating ' b'divergence')], # allow to choose the seed ? - _(b'[-r] revs')) + _(b'[-r] revs'), + helpcategory=registrar.command.CATEGORY_CHANGE_MANAGEMENT) def touch(ui, repo, *revs, **opts): """create successors identical to their predecessors but the changeset ID @@ -1449,7 +1457,8 @@ (b'c', b'continue', False, b'continue interrupted pick'), (b'a', b'abort', False, b'abort interrupted pick'), ] + mergetoolopts, - _(b'[-r] rev')) + _(b'[-r] rev'), + helpcategory=registrar.command.CATEGORY_WORKING_DIRECTORY) def cmdpick(ui, repo, *revs, **opts): """move a commit on the top of working directory parent and updates to it.""" diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py +++ b/hgext3rd/evolve/__init__.py @@ -279,6 +279,7 @@ node, patch, pycompat, + registrar, revset, scmutil, ) @@ -465,7 +466,8 @@ _alias, statuscmd = cmdutil.findcmd(b'status', commands.table) pstatusopts = [o for o in statuscmd[1] if o[1] != b'rev'] - @eh.command(b'pstatus', pstatusopts) + @eh.command(b'pstatus', pstatusopts, + helpcategory=registrar.command.CATEGORY_WORKING_DIRECTORY) def pstatus(ui, repo, *args, **kwargs): """show status combining committed and uncommited changes @@ -480,7 +482,8 @@ _alias, diffcmd = cmdutil.findcmd(b'diff', commands.table) pdiffopts = [o for o in diffcmd[1] if o[1] != b'rev'] - @eh.command(b'pdiff', pdiffopts) + @eh.command(b'pdiff', pdiffopts, + helpcategory=registrar.command.CATEGORY_WORKING_DIRECTORY) def pdiff(ui, repo, *args, **kwargs): """show diff combining committed and uncommited changes @@ -989,7 +992,8 @@ (b'n', b'dry-run', False, _(b'do not perform actions, just print what would be done'))], b'[OPTION]...', - helpbasic=True) + helpbasic=True, + helpcategory=registrar.command.CATEGORY_WORKING_DIRECTORY) def cmdprevious(ui, repo, **opts): """update to parent revision @@ -1048,7 +1052,8 @@ (b'n', b'dry-run', False, _(b'do not perform actions, just print what would be done'))], b'[OPTION]...', - helpbasic=True) + helpbasic=True, + helpcategory=registrar.command.CATEGORY_WORKING_DIRECTORY) def cmdnext(ui, repo, **opts): """update to next child revision @@ -1340,7 +1345,7 @@ break else: help.helptable.append(([b"evolution"], _(b"Safely Rewriting History"), - _helploader)) + _helploader, help.TOPIC_CATEGORY_CONCEPTS)) help.helptable.sort() evolvestateversion = 0 To: rdamazio, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
