From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id edfd7b59 for ; Fri, 29 Nov 2019 01:46:43 +0000 (UTC) Received: (qmail 10471 invoked by alias); 29 Nov 2019 01:46:04 -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: 44948 Received: (qmail 1434 invoked by uid 1010); 29 Nov 2019 01:46:04 -0000 X-Qmail-Scanner-Diagnostics: from out3-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.0/25642. spamassassin: 3.4.2. Clear:RC:0(66.111.4.27):SA:0(-2.6/5.0):. Processed in 5.415061 secs); 29 Nov 2019 01:46:04 -0000 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=from:to:subject:date:message-id :in-reply-to:references; s=fm1; bh=D6usHddI6QFQsw5U0L2kKq4wA7NDQ KCURC4kh0jwyng=; b=jHoCNhWP0LoVoeUboYOKhmO/1DERL1dAvVli0rGZSirKI hXew99AuG7jTxPAkGde2SUiFF8Ii+GUjigMLTUddU4ZTEy0FPlGvpBGo6y0MGqZb ILrQP6rNoKziuEQM0snhnpHzaRv5T6bIbQIsFxAN3rq62D6M/P1OFYLJbn5Zfg+c 7YdPnd20U3x1QMA/qe/qGLbYfnq4fKWFFQrpuaS96MvVlZ/CA6PkkZcHq2Bc8Ad1 Ds7hLksj36PG6GOnBGAQjZSUpQYnR3l1gqd0uyoYhT+hft3vjAdLq3H9hOBnSEXI ubbh16dr2O+qnsmYEbkorpERO9m/O82OxjlRBOzTQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=D6usHddI6QFQsw5U0L2kKq4wA7NDQ KCURC4kh0jwyng=; b=cGaKv3x2UNAVcqnplIQ11SfI9afI63MHV682/lGUgXrNe WVYtcmstFW5/W77sEAQqxeFDCd85BoFHVc+lszRXfGHiBXmmngVZQ9RrjnbqCj+R JMYVpYnw8DtPnjfOlZZsVa4gyRd8Pbc37ug6K0mcnGrOAWL3nowrUBDf0B8lvZ60 hUcZcD8pxJ3qoD+orOgZPLQCiDGfGciM4Tm9QT8wfnnzMKxrP+B0v1RQAcs4UDpw dx7Itup87ErxOSrigLCqfv5UkBXf+6067w5iK2WEQOda8yumNUI/7AYK2wfyX1CE /rp21HyUgBrQfZqqCyJ8II6MHwKkjrGsevRc4pMXg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrudeikedgfeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgogfeguddtqddvjeculdegtddmnecujfgurhephf fvufffkffojghfsedttddttdertddtnecuhfhrohhmpeffrghnihgvlhcuufhhrghhrghf uceougdrshesuggrnhhivghlrdhshhgrhhgrfhdrnhgrmhgvqeenucfkphepjeelrdduke dtrdehjedrudduleenucfrrghrrghmpehmrghilhhfrhhomhepugdrshesuggrnhhivghl rdhshhgrhhgrfhdrnhgrmhgvnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 3/3] _subversion: Make _svn_controlled offer everything rather than nothing. Date: Fri, 29 Nov 2019 01:45:19 +0000 Message-Id: <20191129014519.12513-3-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191129014519.12513-1-danielsh@tarpaulin.shahaf.local2> References: <20191129014519.12513-1-danielsh@tarpaulin.shahaf.local2> --- Completion/Unix/Command/_subversion | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion index b39c8578e..2ce43a0cd 100644 --- a/Completion/Unix/Command/_subversion +++ b/Completion/Unix/Command/_subversion @@ -128,7 +128,7 @@ _svn () { case $cmd in; (add) args+=( - '*:file:_files -g "*(^e:_svn_controlled:)"' + '*:file:_files -g "*(e:_svn_uncontrolled:)"' ) ;; (auth) @@ -350,7 +350,22 @@ _svnadmin () { (( $+functions[_svn_controlled] )) || _svn_controlled() { - [[ -f ${(M)REPLY##*/}.svn/text-base/${REPLY##*/}.svn-base ]] + # For svn<=1.6, this was implemented as: + # [[ -f ${(M)REPLY##*/}.svn/text-base/${REPLY##*/}.svn-base ]] + # However, because that implementation returns false for all files on svn>=1.7, and + # 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. + # (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] )) ||