From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-43243-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 6009 invoked by alias); 6 Aug 2018 11:09:27 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
List-Unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
X-Seq: 43243
Received: (qmail 27821 invoked by uid 1010); 6 Aug 2018 11:09:27 -0000
X-Qmail-Scanner-Diagnostics: from nl.dwimlabs.net by f.primenet.com.au (envelope-from <av6@dwimlabs.net>, 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 1.99154 secs); 06 Aug 2018 11:09:27 -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=1533553758;
	bh=H6YLTmU/2b8I5QgQw4PVOWdAKWmbDaFSMY0LG/XtS9g=;
	h=Date:From:To:Subject:In-Reply-To:References:From;
	b=V8Hbwmt/3XJQiAwstbflwe72Ct/zl+U+TtMFzKEkyyv+lqDb6ihwh27sw1i0tAa9i
	 IdxfgkwgQbdjWqcGzSyKRDdZDbTbchfgK7IHnyBVg9z3mxwj/NMbXTWWOX71F7zaUw
	 iq2Vtk3AUKzwHs/SlpNtHDJHQOC7Ut4H/O6HfIVU=
Date: Mon, 6 Aug 2018 19:09:14 +0800
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
Message-ID: <20180806190914.246b9514@neuro>
In-Reply-To: <20180806092931eucas1p1c89ebf9f2ee4f5bb40ac2c650cf4a6f2~IQZLFzTOa0396203962eucas1p1k@eucas1p1.samsung.com>
References: <20180806072813.5051-1-av6@dwimlabs.net>
	<20180806072813.5051-3-av6@dwimlabs.net>
	<CGME20180806092113epcas2p1be3488679902085a99d66331745e15d4@epcas2p1.samsung.com>
	<20180806092032.uizmxvlc2oku2ik6@tarpaulin.shahaf.local2>
	<20180806092931eucas1p1c89ebf9f2ee4f5bb40ac2c650cf4a6f2~IQZLFzTOa0396203962eucas1p1k@eucas1p1.samsung.com>
X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

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() {