From: Anton Shestakov <av6@dwimlabs.net>
To: zsh-workers@zsh.org
Cc: Anton Shestakov <av6@dwimlabs.net>
Subject: [PATCH v2 1/5] _hg: rename _hg_style_opts to _hg_template_opts
Date: Tue, 7 Aug 2018 14:11:57 +0800 [thread overview]
Message-ID: <20180807061201.31646-1-av6@dwimlabs.net> (raw)
--style is a deprecated alias for --template, and doesn't show up in
help without --verbose.
Let's s/style/template/ this variable to be more consistent with
mercurial/cmdutil.py, which is helpful to look at in parallel next time
someone wants to update the completion rules.
---
Completion/Unix/Command/_hg | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Completion/Unix/Command/_hg b/Completion/Unix/Command/_hg
index 8eaa457c8..50ab7132c 100644
--- a/Completion/Unix/Command/_hg
+++ b/Completion/Unix/Command/_hg
@@ -389,9 +389,9 @@ _hg_diff_opts=(
_hg_dryrun_opts=(
'(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]')
-_hg_style_opts=(
- '--style[display using template map file]:'
- '--template[display with template]:')
+_hg_template_opts=(
+ '--template[display with template]:template'
+)
_hg_commit_opts=(
'(-m --message -l --logfile --edit -e)'{-e,--edit}'[edit commit message]'
@@ -565,7 +565,7 @@ _hg_cmd_grep() {
}
_hg_cmd_heads() {
- _arguments -s : $_hg_global_opts $_hg_style_opts \
+ _arguments -s : $_hg_global_opts $_hg_template_opts \
'(--rev -r)'{-r+,--rev=}'[show only heads which are descendants of rev]:revision:_hg_tags'
}
@@ -592,7 +592,7 @@ _hg_cmd_import() {
}
_hg_cmd_incoming() {
- _arguments -s : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
+ _arguments -s : $_hg_global_opts $_hg_remote_opts $_hg_template_opts \
'(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
'(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
'(--patch -p)'{-p,--patch}'[show patch]' \
@@ -616,7 +616,7 @@ _hg_cmd_locate() {
}
_hg_cmd_log() {
- _arguments -s : $_hg_global_opts $_hg_pat_opts $_hg_style_opts \
+ _arguments -s : $_hg_global_opts $_hg_pat_opts $_hg_template_opts \
'(--follow --follow-first -f)'{-f,--follow}'[follow changeset or history]' \
'(-f --follow)--follow-first[only follow the first parent of merge changesets]' \
'(--copies -C)'{-C,--copies}'[show copied files]' \
@@ -644,7 +644,7 @@ _hg_cmd_merge() {
}
_hg_cmd_outgoing() {
- _arguments -s : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
+ _arguments -s : $_hg_global_opts $_hg_remote_opts $_hg_template_opts \
'(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
'(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
'(--patch -p)'{-p,--patch}'[show patch]' \
@@ -654,7 +654,7 @@ _hg_cmd_outgoing() {
}
_hg_cmd_parents() {
- _arguments -s : $_hg_global_opts $_hg_style_opts \
+ _arguments -s : $_hg_global_opts $_hg_template_opts \
'(--rev -r)'{-r+,--rev=}'[show parents of the specified rev]:revision:_hg_tags' \
':last modified file:_hg_files'
}
@@ -785,7 +785,7 @@ _hg_cmd_tag() {
}
_hg_cmd_tip() {
- _arguments -s : $_hg_global_opts $_hg_style_opts \
+ _arguments -s : $_hg_global_opts $_hg_template_opts \
'(--patch -p)'{-p,--patch}'[show patch]'
}
--
2.11.0
next reply other threads:[~2018-08-07 6:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-07 6:11 Anton Shestakov [this message]
2018-08-07 6:11 ` [PATCH v2 2/5] _hg: declare appropriate local parameters for ->string form Anton Shestakov
2018-08-07 6:11 ` [PATCH v2 3/5] _hg: add forget, phase, summary Anton Shestakov
2018-08-07 6:12 ` [PATCH v2 4/5] _hg: update all options Anton Shestakov
2018-08-07 8:23 ` Peter Stephenson
2018-08-07 6:12 ` [PATCH v2 5/5] _hg: drop -w, add -S to _arguments Anton Shestakov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180807061201.31646-1-av6@dwimlabs.net \
--to=av6@dwimlabs.net \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).