From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 469 invoked from network); 26 Jan 2022 14:36:03 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 26 Jan 2022 14:36:03 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1643207763; b=YHzb/AEmkOUC4+rxOGckqqC2JP3NG2E6OOxhKn1J1KA+UEtAzAxO6S5ml+xT50vaJiwrB7+fCB ip4tpiZP5+kRRfGqfBlGK5x57qdeqfiB+grvzDRaZYTQNv0TykCBUvG7b6Mq/ejUM2Klv1s4pz jJj3yAjnIfICXeoXqW3hsTUTsvJN/Y8LIGeKLorHxXBuQJavf2YJUSDWwsK8ch1Lcca/dGPzfE 9YW81oKuSwraU3ysMGLH8uz44ebv/9NalGxhEENshIhssi9P3F7U/Fnk6CDCXPRD0FrlHPcE1C yympJzJH/UZxoaZEpYGkC2wS2ZkVNHC0lFs1Hec8x4I6yQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (wnew1-smtp.messagingengine.com) smtp.remote-ip=64.147.123.26; dkim=pass header.d=daniel.shahaf.name header.s=fm2 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm1 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1643207763; bh=yP4ANmX16KcHjlEBNXfHX75BBf0q+ZJ7oRXcunKMYkY=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:DKIM-Signature:DKIM-Signature: DKIM-Signature; b=PIIsyrzUxGw3HaVq1Gm5PWkabru3zW84PfDsxUNbuOG/2LqOHEA9ClaUOHSZrOcVrsgzOWkejF 4mDeGEksQYhRCLu/+AMMhLmW4QpVOlhPMGnIYFXaWNn9u+uE2bBAbzG+HOzUK3eBDKjYaH+ncB Knh2LyXVQIUwyIMo8z+1749/+T/1aGxn3reO9UT/jRnhkWSFyHh6ZqEBl71tEmJ2DF5cwP0wiO J0FOgd5mSXJ/yTVLpq1TERZkT8f5DuelosjOT9GPV/854uvTVBNFHEaVdlny1ajDDOItn5YQqF WZrT9F9rXGcdLIcT9HYqH6kFeDw8u2l0hlX1ajsEvJooRQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=qNVlMp/JuXkzd5pLEb09h2aMd2sXLTHPEeJAZuUCD7U=; b=Ax+fLfWwwECrio12b1Tpu5bzwm IaixngJanmCYqO+OBu7ww3iT4GkFlnF+bO2fCyPWFP7eQ5L+WeJdObrlbkD+AWWHeuZZFquP+NI/W dWS4Ultd8mDh2FhdNObB16+95dsVckmvBFMx3tHwPZG2xdxbaLxB17uCH9bLKshMQ0ltZgRXjEigI oOD/YPJsVvM5/LPR24yyjpiS0ztnlycjQAXHPPzD8VGfbU13NV2OBpdQP/BVawhywV2at0hvGZKYs r4wze/JrBHW1E1AUxlL8IN5WC0d2V8ETY3CfknWcimkJTV/t5OebAZIyQ0ShHjS+3ABJyDjsLZj0g Te0QSa1Q==; Received: from authenticated user by zero.zsh.org with local id 1nCjP1-0003TP-3Q; Wed, 26 Jan 2022 14:36:03 +0000 Authentication-Results: zsh.org; iprev=pass (wnew1-smtp.messagingengine.com) smtp.remote-ip=64.147.123.26; dkim=pass header.d=daniel.shahaf.name header.s=fm2 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm1 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none Received: from wnew1-smtp.messagingengine.com ([64.147.123.26]:43919) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1nCj8b-0000lp-K0; Wed, 26 Jan 2022 14:19:06 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id A05852B0014E; Wed, 26 Jan 2022 09:19:03 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 26 Jan 2022 09:19:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; bh=qNV lMp/JuXkzd5pLEb09h2aMd2sXLTHPEeJAZuUCD7U=; b=CrYc10s0XRd6+5V4UYY 02qMJbdMu4v2yPxNgdKxamCbCSYp4P5wfv5IDjR7jS4Ge5dbPZK9PmRupcSU33fx DATIze4Y8PVXWJvtSQ9jOF3YBV+SOC+1ybdyVPGAM4K1sPSk384Vt0ya/Bvjjgb5 q+M088+DMS4Z0PMLMWviKU9EvwJWjJcqscNUm1xB2EUT3uGo8uwBihdTHjDtAyCx +kDhsa/VgsAp1WXMDfqkliXt9o9xCXneaACTjR8/zOzuU8mup+TFC7CwYxp9mFAd pCXTMmUzf9RoodL4K3nutJyNE0Sc1zReAnSPhi5pTp33QgHEoaT97GsAGEdznAd8 yGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=qNVlMp /JuXkzd5pLEb09h2aMd2sXLTHPEeJAZuUCD7U=; b=nEtPEMtKoK4DfiaqEhGSzH mrz3odKFtxm0JdszqY+jn5AEjYuhAvpoLzFyKK+xuDYgJhF/OUZ8yppVB/ztskIW ZZ19ytzd9E70OCoE/d9KBzaTN5fmEWSjDxbc/I4Waj0f+jlT+//VNGW4e5wg1prP OK55Txex6BeVH2b4rFOdYCorJL/OKcu582fof8y9pO8aIRFRAmfxf5V2cjo/hDrQ 6IJJUyOQ8/4499xC5lvIeYYvC4nyF+qmEtpD4RTiTsKLSLeUtu6Bm+rN2/M6vHZI 0SWO+4OlMr5tfZsiJH+sC0KKlpDrby//6iNydSQdPGSTD0WX9mihYdfCK+6zWWBw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrfedugdeivdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecuogfvvgigthfqnhhlhidqqdfuphgrmhgsohhtqdgkge dvuddqheduucdlfedttddmnecujfgurhephffvufffkffojghfggfgsedtkedttdertddt necuhfhrohhmpeffrghnihgvlhcuufhhrghhrghfuceougdrshesuggrnhhivghlrdhshh grhhgrfhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetgffggfefueejgffgjeejjeel ueejvefhveegledvgeeigeevuefgffejfeelteenucevlhhushhtvghrufhiiigvpedvne curfgrrhgrmhepmhgrihhlfhhrohhmpegurdhssegurghnihgvlhdrshhhrghhrghfrdhn rghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Wed, 26 Jan 2022 09:19:02 -0500 (EST) Received: by tarpaulin.shahaf.local2 (Postfix, from userid 1000) id 4JkQnd5bWRz4fR; Wed, 26 Jan 2022 14:19:01 +0000 (UTC) From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 5/5] _subversion: add: Complete target arguments to this subcommand Date: Wed, 26 Jan 2022 14:18:47 +0000 Message-Id: <20220126141847.10271-5-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220126141847.10271-1-danielsh@tarpaulin.shahaf.local2> References: <20220126141847.10271-1-danielsh@tarpaulin.shahaf.local2> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 49715 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: --- Completion/Unix/Command/_subversion | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion index e9a3d9b1a..8fc46a292 100644 --- a/Completion/Unix/Command/_subversion +++ b/Completion/Unix/Command/_subversion @@ -122,7 +122,7 @@ _svn () { case $cmd in; (add) args+=( - '*:file:_files -g "*(e:_svn_uncontrolled:)"' + '*:file: _svn_modified "addable"' ) ;; (auth) @@ -350,18 +350,12 @@ _svn_controlled() { # because 1.6 has been deprecated for 8 years and EOL for 6 years, we opt to DTRT # for >=1.7. Therefore: - # TODO: Reimplement this function and _svn_uncontrolled for svn>=1.7. + # TODO: Reimplement this function for svn>=1.7. # (Use 'svn st' or 'svn info', not 'svn ls') return 0 } -(( $+functions[_svn_uncontrolled] )) || -_svn_uncontrolled() { - # TODO: See comments in _svn_controlled - return 0 -} - (( $+functions[_svn_conflicts] )) || _svn_conflicts() { # ### These strings are actually translatable @@ -375,7 +369,7 @@ _svn_conflicts() { _svn_modified() { setopt localoptions extendedglob - local depth dir expl partial_word space=' ' + local depth dir expl maybe_quiet partial_word space=' ' local svn_context=$1 @@ -394,9 +388,15 @@ _svn_modified() { depth=immediates fi + if [[ $svn_context = addable ]]; then + maybe_quiet="" + else + maybe_quiet="-q" + fi + local -a status_lines # Run 'status' - status_lines=( ${(f)"$(_call_program modified-files "svn status -q --depth=${(q)depth} -- ${(q)dir}")"} ) + status_lines=( ${(f)"$(_call_program modified-files "svn status $maybe_quiet --depth=${(q)depth} -- ${(q)dir}")"} ) # Filter to only the right set of statuses case $svn_context in (committable) @@ -405,6 +405,10 @@ _svn_modified() { (revertable) status_lines=( ${(M)status_lines:#(#s)([ACDMR~!]?|?[CM])${space}????${space}*} ) ;; + (addable) + # The 'D' is just in case there's an unversioned file of the same name as the deleted file + status_lines=( ${(M)status_lines:#(#s)[?ID]${space}${space}???${space}${space}*} ) + ;; esac # Strip the 7 status-letter columns and the column of spaces status_lines=( ${status_lines#????????} )