[PATCH 2 of 3] hgext: switch help from -x/--extended to --extended
timeless
timeless at mozdev.org
Fri Dec 18 11:35:18 CST 2015
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1450459954 0
# Fri Dec 18 17:32:34 2015 +0000
# Node ID 9bfe5ae1c2cb79342258bebdb4f555a0c175546e
# Parent 0f8b45c3bfcd9d6814d6f8238aeaaf998d75b33b
hgext: switch help from -x/--extended to --extended
This is an almost global replace.
Instances of -x short flags in samples should be retained,
but long forms should be favored in prose.
diff --git a/hgext/children.py b/hgext/children.py
--- a/hgext/children.py
+++ b/hgext/children.py
@@ -36,7 +36,7 @@
"""show the children of the given or working directory revision
Print the children of the working directory's revisions. If a
- revision is given via -r/--rev, the children of that revision will
+ revision is given via --rev, the children of that revision will
be printed. If a file argument is given, revision in which the
file was last changed (after the working directory revision or the
argument to --rev if given) is printed.
diff --git a/hgext/extdiff.py b/hgext/extdiff.py
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -288,9 +288,9 @@
an external program. The default program used is diff, with
default options "-Npru".
- To select a different program, use the -p/--program option. The
+ To select a different program, use the --program option. The
program will be passed the names of two directories to compare. To
- pass additional options to the program, use -o/--option. These
+ pass additional options to the program, use --option. These
will be passed before the names of the directories to compare.
When two revision arguments are given, then changes are shown
diff --git a/hgext/fetch.py b/hgext/fetch.py
--- a/hgext/fetch.py
+++ b/hgext/fetch.py
@@ -44,7 +44,7 @@
the newly pulled changes. Local changes are then merged into the
pulled changes. To switch the merge order, use --switch-parent.
- See :hg:`help dates` for a list of formats valid for -d/--date.
+ See :hg:`help dates` for a list of formats valid for --date.
Returns 0 on success.
'''
diff --git a/hgext/gpg.py b/hgext/gpg.py
--- a/hgext/gpg.py
+++ b/hgext/gpg.py
@@ -221,7 +221,7 @@
The ``gpg.cmd`` config setting can be used to specify the command
to run. A default key can be specified with ``gpg.key``.
- See :hg:`help dates` for a list of formats valid for -d/--date.
+ See :hg:`help dates` for a list of formats valid for --date.
"""
wlock = None
try:
diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -379,9 +379,9 @@
expansions.
Extend the current configuration by specifying maps as arguments
- and using -f/--rcfile to source an external hgrc file.
+ and using --rcfile to source an external hgrc file.
- Use -d/--default to disable current configuration.
+ Use --default to disable current configuration.
See :hg:`help templates` for information on templates and filters.
'''
@@ -496,7 +496,7 @@
See :hg:`help keyword` on how to construct patterns both for
inclusion and exclusion of files.
- With -A/--all and -v/--verbose the codes used to show the status
+ With --all and --verbose the codes used to show the status
of files are::
K = keyword expansion candidate
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -48,7 +48,7 @@
create other, independent patch queues with the :hg:`qqueue` command.
If the working directory contains uncommitted files, qpush, qpop and
-qgoto abort immediately. If -f/--force is used, the changes are
+qgoto abort immediately. If --force is used, the changes are
discarded. Setting::
[mq]
@@ -56,7 +56,7 @@
make them behave as if --keep-changes were passed, and non-conflicting
local changes will be tolerated and preserved. If incompatible options
-such as -f/--force or --exact are passed, this setting is ignored.
+such as --force or --exact are passed, this setting is ignored.
This extension used to provide a strip command. This command now lives
in the strip extension.
@@ -2139,8 +2139,8 @@
for i, filename in enumerate(files):
if existing:
if filename == '-':
- raise error.Abort(_('-e is incompatible with import from -')
- )
+ raise error.Abort(
+ _('--existing is incompatible with import from -'))
filename = normname(filename)
self.checkreservedname(filename)
if util.url(filename).islocal():
@@ -2208,7 +2208,7 @@
"""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
+ patch identifiers must be given. With --keep, the patch files are
preserved in the patch directory.
To stop managing a patch and move it into permanent history,
@@ -2297,17 +2297,17 @@
to the series.
The patch will have the same name as its source file unless you
- give it a new one with -n/--name.
+ give it a new one with --name.
You can register an existing patch inside the patch directory with
- the -e/--existing flag.
-
- With -f/--force, an existing patch of the same name will be
+ the --existing flag.
+
+ With --force, an existing patch of the same name will be
overwritten.
- An existing changeset may be placed under mq control with -r/--rev
- (e.g. qimport --rev . -n patch will place the current revision
- under mq control). With -g/--git, patches imported with --rev will
+ An existing changeset may be placed under mq control with --rev
+ (e.g. qimport --rev . --name patch will place the current revision
+ under mq control). With --git, patches imported with --rev will
use the git diff format. See the diffs help topic for information
on why this is important for preserving rename/copy information
and permission changes. Use :hg:`qfinish` to remove changesets
@@ -2373,13 +2373,13 @@
"""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
- repository for patches (qinit -c may also be run later to convert
+ --create-repo is specified, qinit will create a separate nested
+ repository for patches (qinit --create-repo may also be run later to convert
an unversioned patch repository into a versioned one). You can use
qcommit to commit changes to this queue repository.
- This command is deprecated. Without -c, it's implied by other relevant
- commands. With -c, use :hg:`init --mq` instead."""
+ This command is deprecated. Without --create-repo, it's implied by other
+ relevant commands. With --create-repo, use :hg:`init --mq` instead."""
return qinit(ui, repo, create=opts.get('create_repo'))
@command("qclone",
@@ -2566,20 +2566,20 @@
qnew creates a new patch on top of the currently-applied patch (if
any). The patch will be initialized with any outstanding changes
- in the working directory. You may also use -I/--include,
- -X/--exclude, and/or a list of files after the patch name to add
+ in the working directory. You may also use --include,
+ --exclude, and/or a list of files after the patch name to add
only changes to matching files to the new patch, leaving the rest
as uncommitted modifications.
- -u/--user and -d/--date can be used to set the (given) user and
- date, respectively. -U/--currentuser and -D/--currentdate set user
+ --user and --date can be used to set the (given) user and
+ date, respectively. --currentuser and --currentdate set user
to current user and date to current date.
- -e/--edit, -m/--message or -l/--logfile set the patch header as
+ --edit, --message or --logfile set the patch header as
well as the commit message. If none is specified, the header is
empty and the commit message is '[mq]: PATCH'.
- Use the -g/--git option to keep the patch in the git extended diff
+ Use the --git option to keep the patch in the git extended diff
format. Read the diffs help topic for more information on why this
is important for preserving permission changes and copy/rename
information.
@@ -2617,15 +2617,15 @@
contain only the modifications that match those patterns; the
remaining modifications will remain in the working directory.
- If -s/--short is specified, files currently included in the patch
+ If --short is specified, files currently included in the patch
will be refreshed just like matched files and remain in the patch.
- If -e/--edit is specified, Mercurial will start your configured editor for
+ If --edit is specified, Mercurial will start your configured editor for
you to enter a message. In case qrefresh fails, you will find a backup of
your message in ``.hg/last-message.txt``.
hg add/remove/copy/rename work as usual, though you might want to
- use git-style patches (-g/--git or [diff] git=1) to track copies
+ use git-style patches (--git or [diff] git=1) to track copies
and renames. See the diffs help topic for more information on the
git diff format.
@@ -2676,7 +2676,7 @@
applied to the current patch in the order given. If all the
patches apply successfully, the current patch will be refreshed
with the new cumulative patch, and the folded patches will be
- deleted. With -k/--keep, the folded patch files will not be
+ deleted. With --keep, the folded patch files will not be
removed afterwards.
The header for each folded patch will be concatenated with the
@@ -2895,7 +2895,7 @@
By default, abort if the working directory contains uncommitted
changes. With --keep-changes, abort only if the uncommitted files
- overlap with patched files. With -f/--force, backup and patch over
+ overlap with patched files. With --force, backup and patch over
uncommitted changes.
Return 0 on success.
@@ -2910,7 +2910,7 @@
else:
newpath, i = lastsavename(q.path)
if not newpath:
- ui.warn(_("no saved queues found, please use -n\n"))
+ ui.warn(_("no saved queues found, please use --name\n"))
return 1
mergeq = queue(ui, repo.baseui, repo.path, newpath)
ui.warn(_("merging with queue at: %s\n") % mergeq.path)
@@ -2938,7 +2938,7 @@
By default, abort if the working directory contains uncommitted
changes. With --keep-changes, abort only if the uncommitted files
- overlap with patched files. With -f/--force, backup and discard
+ overlap with patched files. With --force, backup and discard
changes made to such files.
Return 0 on success.
@@ -3095,7 +3095,7 @@
With no arguments, prints the currently active guards.
With one argument, sets the active guard.
- Use -n/--none to deactivate guards (no other arguments needed).
+ Use --none to deactivate guards (no other arguments needed).
When no guards are active, patches with positive guards are
skipped and patches with negative guards are pushed.
@@ -3105,7 +3105,7 @@
--pop) to push back to the current patch afterwards, but skip
guarded patches.
- Use -s/--series to print a list of all guards in the series file
+ Use --series to print a list of all guards in the series file
(no other arguments needed). Use -v for more information.
Returns 0 on success.'''
@@ -3188,7 +3188,7 @@
patches) by moving them out of mq control into regular repository
history.
- Accepts a revision range or the -a/--applied option. If --applied
+ Accepts a revision range or the --applied option. If --applied
is specified, all applied mq revisions are removed from mq
control. Otherwise, the given revisions must be at the base of the
stack of applied patches.
@@ -3238,12 +3238,12 @@
Supports switching between different patch queues, as well as creating
new patch queues and deleting existing ones.
- Omitting a queue name or specifying -l/--list will show you the registered
+ Omitting a queue name or specifying --list will show you the registered
queues - by default the "normal" patches queue is registered. The currently
active queue will be marked with "(active)". Specifying --active will print
only the name of the active queue.
- To create a new queue, use -c/--create. The queue is automatically made
+ To create a new queue, use --create. The queue is automatically made
active, except in the case where there are applied patches from the
currently active queue in the repository. Then the queue will only be
created and switching will fail.
diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py
--- a/hgext/patchbomb.py
+++ b/hgext/patchbomb.py
@@ -397,9 +397,9 @@
_('name of the bundle attachment file'), _('NAME')),
('r', 'rev', [], _('a revision to send'), _('REV')),
('', 'force', None, _('run even when remote repository is unrelated '
- '(with -b/--bundle)')),
+ '(with --bundle)')),
('', 'base', [], _('a base changeset to specify instead of a destination '
- '(with -b/--bundle)'), _('REV')),
+ '(with --bundle)'), _('REV')),
('', 'intro', None, _('send an introduction email for a single patch')),
] + emailopts + commands.remoteopts,
_('hg email [OPTION]... [DEST]...'))
@@ -415,38 +415,38 @@
The message contains two or three parts. First, the changeset
description.
- With the -d/--diffstat option, if the diffstat program is
+ With the --diffstat option, if the diffstat program is
installed, the result of running diffstat on the patch is inserted.
Finally, the patch itself, as generated by :hg:`export`.
- With the -d/--diffstat or --confirm options, you will be presented
+ With the --diffstat or --confirm options, you will be presented
with a final summary of all messages and asked for confirmation before
the messages are sent.
By default the patch is included as text in the email body for
- easy reviewing. Using the -a/--attach option will instead create
- an attachment for the patch. With -i/--inline an inline attachment
+ easy reviewing. Using the --attach option will instead create
+ an attachment for the patch. With --inline an inline attachment
will be created. You can include a patch both as text in the email
body and as a regular or an inline attachment by combining the
- -a/--attach or -i/--inline with the --body option.
+ --attach or --inline with the --body option.
- With -o/--outgoing, emails will be generated for patches not found
+ With --outgoing, emails will be generated for patches not found
in the destination repository (or only those which are ancestors
of the specified revisions if any are provided)
- With -b/--bundle, changesets are selected as for --outgoing, but a
+ With --bundle, changesets are selected as for --outgoing, but a
single email containing a binary Mercurial bundle as an attachment
will be sent. Use the ``patchbomb.bundletype`` config option to
control the bundle type as with :hg:`bundle --type`.
- With -m/--mbox, instead of previewing each patchbomb message in a
+ With --mbox, instead of previewing each patchbomb message in a
pager or sending the messages directly, it will create a UNIX
mailbox file with the patch emails. This mailbox file can be
previewed with any mail user agent which supports UNIX mbox
files.
- With -n/--test, all steps will run, but mail will not be sent.
+ With --test, all steps will run, but mail will not be sent.
You will be prompted for an email recipient address, a subject and
an introductory message describing the patches of your patchbomb.
Then when all is done, patchbomb messages are displayed. If the
diff --git a/hgext/purge.py b/hgext/purge.py
--- a/hgext/purge.py
+++ b/hgext/purge.py
@@ -43,7 +43,7 @@
('', 'files', None, _('purge files')),
('p', 'print', None, _('print filenames instead of deleting them')),
('0', 'print0', None, _('end filenames with NUL, for use with xargs'
- ' (implies -p/--print)')),
+ ' (implies --print)')),
] + commands.walkopts,
_('hg purge [OPTION]... [DIR]...'))
def purge(ui, repo, *dirs, **opts):
diff --git a/hgext/record.py b/hgext/record.py
--- a/hgext/record.py
+++ b/hgext/record.py
@@ -31,7 +31,7 @@
If a list of files is omitted, all changes reported by :hg:`status`
will be candidates for recording.
- See :hg:`help dates` for a list of formats valid for -d/--date.
+ See :hg:`help dates` for a list of formats valid for --date.
You will be prompted for whether to record changes to each
modified file, and for files with multiple changes, for each
@@ -130,7 +130,7 @@
cmdtable["qrecord"] = \
(qrecord,
# same options as qnew, but copy them so we don't get
- # -i/--interactive for qrecord and add white space diff options
+ # --interactive for qrecord and add white space diff options
mq.cmdtable['^qnew'][1][:] + commands.diffwsopts,
_('hg qrecord [OPTION]... PATCH [FILE]...'))
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -388,9 +388,9 @@
external program. The default program used is diff, with default options
"-Npru".
- To select a different program, use the -p/--program option. The program
- will be passed the names of two directories to compare. To pass additional
- options to the program, use -o/--option. These will be passed before the
+ To select a different program, use the --program option. The program will
+ be passed the names of two directories to compare. To pass additional
+ options to the program, use --option. These will be passed before the
names of the directories to compare.
When two revision arguments are given, then changes are shown between
diff --git a/tests/test-mq-qrefresh-interactive.t b/tests/test-mq-qrefresh-interactive.t
--- a/tests/test-mq-qrefresh-interactive.t
+++ b/tests/test-mq-qrefresh-interactive.t
@@ -16,16 +16,16 @@
the modifications that match those patterns; the remaining modifications
will remain in the working directory.
- If -s/--short is specified, files currently included in the patch will be
+ If --short is specified, files currently included in the patch will be
refreshed just like matched files and remain in the patch.
- If -e/--edit is specified, Mercurial will start your configured editor for
+ If --edit is specified, Mercurial will start your configured editor for
you to enter a message. In case qrefresh fails, you will find a backup of
your message in ".hg/last-message.txt".
hg add/remove/copy/rename work as usual, though you might want to use git-
- style patches (-g/--git or [diff] git=1) to track copies and renames. See
- the diffs help topic for more information on the git diff format.
+ style patches (--git or [diff] git=1) to track copies and renames. See the
+ diffs help topic for more information on the git diff format.
Returns 0 on success.
@@ -58,16 +58,16 @@
the modifications that match those patterns; the remaining modifications
will remain in the working directory.
- If -s/--short is specified, files currently included in the patch will be
+ If --short is specified, files currently included in the patch will be
refreshed just like matched files and remain in the patch.
- If -e/--edit is specified, Mercurial will start your configured editor for
+ If --edit is specified, Mercurial will start your configured editor for
you to enter a message. In case qrefresh fails, you will find a backup of
your message in ".hg/last-message.txt".
hg add/remove/copy/rename work as usual, though you might want to use git-
- style patches (-g/--git or [diff] git=1) to track copies and renames. See
- the diffs help topic for more information on the git diff format.
+ style patches (--git or [diff] git=1) to track copies and renames. See the
+ diffs help topic for more information on the git diff format.
Returns 0 on success.
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -59,14 +59,14 @@
other, independent patch queues with the "hg qqueue" command.
If the working directory contains uncommitted files, qpush, qpop and qgoto
- abort immediately. If -f/--force is used, the changes are discarded. Setting:
+ abort immediately. If --force is used, the changes are discarded. Setting:
[mq]
keepchanges = True
make them behave as if --keep-changes were passed, and non-conflicting local
changes will be tolerated and preserved. If incompatible options such as
- -f/--force or --exact are passed, this setting is ignored.
+ --force or --exact are passed, this setting is ignored.
This extension used to provide a strip command. This command now lives in the
strip extension.
diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t
--- a/tests/test-qrecord.t
+++ b/tests/test-qrecord.t
@@ -33,7 +33,7 @@
If a list of files is omitted, all changes reported by "hg status" will be
candidates for recording.
- See "hg help dates" for a list of formats valid for -d/--date.
+ See "hg help dates" for a list of formats valid for --date.
You will be prompted for whether to record changes to each modified file,
and for files with multiple changes, for each change to use. For each
diff --git a/tests/test-record.t b/tests/test-record.t
--- a/tests/test-record.t
+++ b/tests/test-record.t
@@ -20,7 +20,7 @@
If a list of files is omitted, all changes reported by "hg status" will be
candidates for recording.
- See "hg help dates" for a list of formats valid for -d/--date.
+ See "hg help dates" for a list of formats valid for --date.
You will be prompted for whether to record changes to each modified file,
and for files with multiple changes, for each change to use. For each
More information about the Mercurial-devel
mailing list