Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH 3/3] _subversion: Make _svn_controlled offer everything rather than nothing.
- X-seq: zsh-workers 44948
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH 3/3] _subversion: Make _svn_controlled offer everything rather than nothing.
- Date: Fri, 29 Nov 2019 01:45:19 +0000
- 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==
- In-reply-to: <20191129014519.12513-1-danielsh@tarpaulin.shahaf.local2>
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- List-unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
- 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] )) ||
Messages sorted by:
Reverse Date,
Date,
Thread,
Author