From: Anton Shestakov <av6@dwimlabs.net>
To: zsh-workers@zsh.org, Peter Stephenson <p.stephenson@samsung.com>,
Daniel Shahaf <d.s@daniel.shahaf.name>
Subject: Re: [PATCH 2/5] _hg: declare appropriate local parameters for ->string form
Date: Mon, 6 Aug 2018 19:09:14 +0800 [thread overview]
Message-ID: <20180806190914.246b9514@neuro> (raw)
In-Reply-To: <20180806092931eucas1p1c89ebf9f2ee4f5bb40ac2c650cf4a6f2~IQZLFzTOa0396203962eucas1p1k@eucas1p1.samsung.com>
Okay, does this look better? (focusing only on _hg_cmd_resolve for now)
diff --git a/Completion/Unix/Command/_hg b/Completion/Unix/Command/_hg
index 50ab7132c..0951ef53a 100644
--- a/Completion/Unix/Command/_hg
+++ b/Completion/Unix/Command/_hg
@@ -698,20 +698,22 @@ _hg_cmd_rename() {
}
_hg_cmd_resolve() {
- local context state line
+ local context state state_descr line ret=1
typeset -A opt_args
_arguments -s : $_hg_global_opts \
'(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \
'(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \
'(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' \
- '*:file:_hg_unresolved'
+ '*:file:_hg_unresolved' && ret=0
if [[ $state == 'resolve_files' ]]
then
_alternative 'files:resolved files:_hg_resolved' \
- 'files:unresolved files:_hg_unresolved'
+ 'files:unresolved files:_hg_unresolved' && ret=0
fi
+
+ return ret
}
_hg_cmd_revert() {
next prev parent reply other threads:[~2018-08-06 11:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-06 7:28 [PATCH 0/5] An update for Completion/Unix/Command/_hg Anton Shestakov
2018-08-06 7:28 ` [PATCH 1/5] _hg: rename _hg_style_opts to _hg_template_opts Anton Shestakov
2018-08-06 7:28 ` [PATCH 2/5] _hg: declare appropriate local parameters for ->string form Anton Shestakov
2018-08-06 9:20 ` Daniel Shahaf
2018-08-06 9:29 ` Peter Stephenson
2018-08-06 11:09 ` Anton Shestakov [this message]
2018-08-06 11:14 ` Peter Stephenson
2018-08-06 12:04 ` Daniel Shahaf
2018-08-06 15:31 ` Anton Shestakov
2018-08-06 15:38 ` Peter Stephenson
2018-08-07 6:15 ` Anton Shestakov
2018-08-06 12:06 ` Daniel Shahaf
2018-08-06 14:00 ` Bart Schaefer
2018-08-06 7:28 ` [PATCH 3/5] _hg: add forget, phase, summary Anton Shestakov
2018-08-06 7:28 ` [PATCH 4/5] _hg: update all options Anton Shestakov
2018-08-06 7:28 ` [PATCH 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=20180806190914.246b9514@neuro \
--to=av6@dwimlabs.net \
--cc=d.s@daniel.shahaf.name \
--cc=p.stephenson@samsung.com \
--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).