From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11247 invoked by alias); 7 Aug 2018 06:13:08 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 43253 Received: (qmail 9516 invoked by uid 1010); 7 Aug 2018 06:13:08 -0000 X-Qmail-Scanner-Diagnostics: from nl.dwimlabs.net by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(81.4.124.96):SA:0(-1.9/5.0):. Processed in 5.082506 secs); 07 Aug 2018 06:13:08 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: av6@dwimlabs.net X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dwimlabs.net; s=20171204; t=1533622378; bh=uKGy1Aj3N09t0qWhInbZynMogFJK+ji1uQvYCEvyzMU=; h=From:To:Cc:Subject:Date:From; b=A9yrikUg7hMASMBS8pPn0w0WqWgsvDh1QJz4HCsm/gLR84mBVlrF02zcQ9z5nfX2N 1yABbX8wmKDPlx2uU5IXjh12hURDURrr1zCrCsqmM1TO6bM1bW0WlZqv128aAY6CAA OkKDR7jNabaGerbAdeY5QtibSq57Y+C+fo4nOPkQ= From: Anton Shestakov To: zsh-workers@zsh.org Cc: Anton Shestakov Subject: [PATCH v2 1/5] _hg: rename _hg_style_opts to _hg_template_opts Date: Tue, 7 Aug 2018 14:11:57 +0800 Message-Id: <20180807061201.31646-1-av6@dwimlabs.net> X-Mailer: git-send-email 2.11.0 --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