mercurial: comparison hgext/mq.py

equal deleted inserted replaced

-:9c6473d2038b
+:c303d65d2e34
 @command("qdelete|qremove|qrm",
 [('k', 'keep', None, _('keep patch file')),
 ('r', 'rev', [],
 _('stop managing a revision (DEPRECATED)'), _('REV'))],
-_('hg qdelete [-k] [PATCH]...'))
+_('hg qdelete [-k] [PATCH]...'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def delete(ui, repo, *patches, **opts):
 """remove patches from queue
 The patches must not be applied, and at least one patch is required. Exact
 patch identifiers must be given. With -k/--keep, the patch files are
 return 0
 @command("qapplied",
 [('1', 'last', None, _('show only the preceding applied patch'))
 ] + seriesopts,
-_('hg qapplied [-1] [-s] [PATCH]'))
+_('hg qapplied [-1] [-s] [PATCH]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def applied(ui, repo, patch=None, **opts):
 """print the patches already applied
 Returns 0 on success."""
 summary=opts.get('summary'))
 @command("qunapplied",
 [('1', 'first', None, _('show only the first patch'))] + seriesopts,
-_('hg qunapplied [-1] [-s] [PATCH]'))
+_('hg qunapplied [-1] [-s] [PATCH]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def unapplied(ui, repo, patch=None, **opts):
 """print the patches not yet applied
 Returns 0 on success."""
 ('f', 'force', None, _('overwrite existing files')),
 ('r', 'rev', [],
 _('place existing revisions under mq control'), _('REV')),
 ('g', 'git', None, _('use git extended diff format')),
 ('P', 'push', None, _('qpush after importing'))],
-_('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]...'))
+_('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]...'),
+helpcategory=command.CATEGORY_IMPORT_EXPORT)
 def qimport(ui, repo, *filename, **opts):
 """import a patch or existing changeset
 The patch is inserted into the series after the last applied
 patch. If no patches have been applied, qimport prepends the patch
 commands.add(ui, r)
 return 0
 @command("^qinit",
 [('c', 'create-repo', None, _('create queue repository'))],
-_('hg qinit [-c]'))
+_('hg qinit [-c]'),
+helpcategory=command.CATEGORY_REPO_CREATION)
 def init(ui, repo, **opts):
 """init a new queue repository (DEPRECATED)
 The queue repository is unversioned by default. If
 -c/--create-repo is specified, qinit will create a separate nested
 _('use uncompressed transfer (fast over LAN)')),
 ('p', 'patches', '',
 _('location of source patch repository'), _('REPO')),
 ] + cmdutil.remoteopts,
 _('hg qclone [OPTION]... SOURCE [DEST]'),
+helpcategory=command.CATEGORY_REPO_CREATION,
 norepo=True)
 def clone(ui, source, dest=None, **opts):
 '''clone main and patch repository at same time
 If source is local, destination will have no patches applied. If
 hg.update(repo, repo.changelog.tip())
 @command("qcommit|qci",
 commands.table["^commit|ci"][1],
 _('hg qcommit [OPTION]... [FILE]...'),
+helpcategory=command.CATEGORY_COMMITTING,
 inferrepo=True)
 def commit(ui, repo, *pats, **opts):
 """commit changes in the queue repository (DEPRECATED)
 This command is deprecated; use :hg:`commit --mq` instead."""
 commands.commit(r.ui, r, *pats, **opts)
 @command("qseries",
 [('m', 'missing', None, _('print patches not in series')),
 ] + seriesopts,
-_('hg qseries [-ms]'))
+_('hg qseries [-ms]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def series(ui, repo, **opts):
 """print the entire series file
 Returns 0 on success."""
 repo.mq.qseries(repo, missing=opts.get(r'missing'),
 summary=opts.get(r'summary'))
 return 0
-@command("qtop", seriesopts, _('hg qtop [-s]'))
+@command("qtop", seriesopts, _('hg qtop [-s]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def top(ui, repo, **opts):
 """print the name of the current patch
 Returns 0 on success."""
 q = repo.mq
 summary=opts.get(r'summary'))
 else:
 ui.write(_("no patches applied\n"))
 return 1
-@command("qnext", seriesopts, _('hg qnext [-s]'))
+@command("qnext", seriesopts, _('hg qnext [-s]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def next(ui, repo, **opts):
 """print the name of the next pushable patch
 Returns 0 on success."""
 q = repo.mq
 if end == len(q.series):
 ui.write(_("all patches applied\n"))
 return 1
 q.qseries(repo, start=end, length=1, summary=opts.get(r'summary'))
-@command("qprev", seriesopts, _('hg qprev [-s]'))
+@command("qprev", seriesopts, _('hg qprev [-s]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def prev(ui, repo, **opts):
 """print the name of the preceding applied patch
 Returns 0 on success."""
 q = repo.mq
 ('D', 'currentdate', None, _('add "Date: <current date>" to patch')),
 ('d', 'date', '',
 _('add "Date: <DATE>" to patch'), _('DATE'))
 ] + cmdutil.walkopts + cmdutil.commitopts,
 _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...'),
+helpcategory=command.CATEGORY_COMMITTING,
 inferrepo=True)
 def new(ui, repo, patch, *args, **opts):
 """create a new patch
 qnew creates a new patch on top of the currently-applied patch (if
 _('add/update date field in patch with current date')),
 ('d', 'date', '',
 _('add/update date field in patch with given date'), _('DATE'))
 ] + cmdutil.walkopts + cmdutil.commitopts,
 _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'),
+helpcategory=command.CATEGORY_COMMITTING,
 inferrepo=True)
 def refresh(ui, repo, *pats, **opts):
 """update the current patch
 If any file patterns are provided, the refreshed patch will
 return ret
 @command("^qdiff",
 cmdutil.diffopts + cmdutil.diffopts2 + cmdutil.walkopts,
 _('hg qdiff [OPTION]... [FILE]...'),
+helpcategory=command.CATEGORY_FILE_CONTENTS,
 inferrepo=True)
 def diff(ui, repo, *pats, **opts):
 """diff of the current patch and subsequent modifications
 Shows a diff which includes the current patch as well as any
 @command('qfold',
 [('e', 'edit', None, _('invoke editor on commit messages')),
 ('k', 'keep', None, _('keep folded patch files')),
 ] + cmdutil.commitopts,
-_('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...'))
+_('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...'),
+helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
 def fold(ui, repo, *files, **opts):
 """fold the named patches into the current patch
 Patches must not yet be applied. Each patch will be successively
 applied to the current patch in the order given. If all the
 @command("qgoto",
 [('', 'keep-changes', None,
 _('tolerate non-conflicting local changes')),
 ('f', 'force', None, _('overwrite any local changes')),
 ('', 'no-backup', None, _('do not save backup copies of files'))],
-_('hg qgoto [OPTION]... PATCH'))
+_('hg qgoto [OPTION]... PATCH'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def goto(ui, repo, patch, **opts):
 '''push or pop patches until named patch is at top of stack
 Returns 0 on success.'''
 opts = pycompat.byteskwargs(opts)
 return ret
 @command("qguard",
 [('l', 'list', None, _('list all patches and guards')),
 ('n', 'none', None, _('drop all guards'))],
-_('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]'))
+_('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def guard(ui, repo, *args, **opts):
 '''set or print guards for a patch
 Guards control whether a patch can be pushed. A patch with no
 guards is always pushed. A patch with a positive guard ("+foo") is
 q.setguards(idx, args)
 q.savedirty()
 else:
 status(q.series.index(q.lookup(patch)))
-@command("qheader", [], _('hg qheader [PATCH]'))
+@command("qheader", [], _('hg qheader [PATCH]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def header(ui, repo, patch=None):
 """print the header of the topmost or specified patch
 Returns 0 on success."""
 q = repo.mq
 ('n', 'name', '',
 _('merge queue name (DEPRECATED)'), _('NAME')),
 ('', 'move', None,
 _('reorder patch series and apply only the patch')),
 ('', 'no-backup', None, _('do not save backup copies of files'))],
-_('hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]'))
+_('hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def push(ui, repo, patch=None, **opts):
 """push the next patch onto the stack
 By default, abort if the working directory contains uncommitted
 changes. With --keep-changes, abort only if the uncommitted files
 _('queue name to pop (DEPRECATED)'), _('NAME')),
 ('', 'keep-changes', None,
 _('tolerate non-conflicting local changes')),
 ('f', 'force', None, _('forget any local changes to patched files')),
 ('', 'no-backup', None, _('do not save backup copies of files'))],
-_('hg qpop [-a] [-f] [PATCH | INDEX]'))
+_('hg qpop [-a] [-f] [PATCH | INDEX]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def pop(ui, repo, patch=None, **opts):
 """pop the current patch off the stack
 Without argument, pops off the top of the patch stack. If given a
 patch name, keeps popping off patches until the named patch is at
 all=opts.get('all'), nobackup=opts.get('no_backup'),
 keepchanges=opts.get('keep_changes'))
 q.savedirty()
 return ret
-@command("qrename|qmv", [], _('hg qrename PATCH1 [PATCH2]'))
+@command("qrename|qmv", [], _('hg qrename PATCH1 [PATCH2]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def rename(ui, repo, patch, name=None, **opts):
 """rename a patch
 With one argument, renames the current patch to PATCH1.
 With two arguments, renames PATCH1 to PATCH2.
 q.savedirty()
 @command("qrestore",
 [('d', 'delete', None, _('delete save entry')),
 ('u', 'update', None, _('update queue working directory'))],
-_('hg qrestore [-d] [-u] REV'))
+_('hg qrestore [-d] [-u] REV'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def restore(ui, repo, rev, **opts):
 """restore the queue state saved by a revision (DEPRECATED)
 This command is deprecated, use :hg:`rebase` instead."""
 rev = repo.lookup(rev)
 [('c', 'copy', None, _('copy patch directory')),
 ('n', 'name', '',
 _('copy directory name'), _('NAME')),
 ('e', 'empty', None, _('clear queue status file')),
 ('f', 'force', None, _('force copy'))] + cmdutil.commitopts,
-_('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'))
+_('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def save(ui, repo, **opts):
 """save current queue state (DEPRECATED)
 This command is deprecated, use :hg:`rebase` instead."""
 q = repo.mq
 @command("qselect",
 [('n', 'none', None, _('disable all guards')),
 ('s', 'series', None, _('list all guards in series file')),
 ('', 'pop', None, _('pop to before first guarded applied patch')),
 ('', 'reapply', None, _('pop, then reapply patches'))],
-_('hg qselect [OPTION]... [GUARD]...'))
+_('hg qselect [OPTION]... [GUARD]...'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def select(ui, repo, *args, **opts):
 '''set or print guarded patches to push
 Use the :hg:`qguard` command to set or print guards on patch, then use
 qselect to tell mq which guards to use. A patch will be pushed if
 finally:
 q.savedirty()
 @command("qfinish",
 [('a', 'applied', None, _('finish all applied changesets'))],
-_('hg qfinish [-a] [REV]...'))
+_('hg qfinish [-a] [REV]...'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def finish(ui, repo, *revrange, **opts):
 """move applied patches into repository history
 Finishes the specified revisions (corresponding to applied
 patches) by moving them out of mq control into regular repository
 ('c', 'create', False, _('create new queue')),
 ('', 'rename', False, _('rename active queue')),
 ('', 'delete', False, _('delete reference to queue')),
 ('', 'purge', False, _('delete queue, and remove patch dir')),
 ],
-_('[OPTION] [QUEUE]'))
+_('[OPTION] [QUEUE]'),
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
 def qqueue(ui, repo, name=None, **opts):
 '''manage multiple patch queues
 Supports switching between different patch queues, as well as creating
 new patch queues and deleting existing ones.

changeset 40293	c303d65d2e34
parent 39895	1a184b727aff
child 40295	fa88170c10bb