diff options
author | dana <dana@dana.is> | 2018-06-16 12:03:23 -0500 |
---|---|---|
committer | dana <dana@dana.is> | 2018-06-16 12:03:23 -0500 |
commit | faa07d064bb2bd9cd9892a255a4b63811242b9fb (patch) | |
tree | bfafce52bdc73d54f6319a51b5263ea65dbfb232 /Functions/VCS_Info | |
parent | 0daeed20e1828b9026b8800555d3f5dad1088544 (diff) | |
download | zsh-faa07d064bb2bd9cd9892a255a4b63811242b9fb.tar.gz zsh-faa07d064bb2bd9cd9892a255a4b63811242b9fb.tar.xz zsh-faa07d064bb2bd9cd9892a255a4b63811242b9fb.zip |
43030: Replace VCS_INFO_realpath() by :P
Diffstat (limited to 'Functions/VCS_Info')
-rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_bzr | 2 | ||||
-rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs | 2 | ||||
-rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_svn | 2 | ||||
-rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_tla | 2 | ||||
-rw-r--r-- | Functions/VCS_Info/VCS_INFO_bydir_detect | 15 | ||||
-rw-r--r-- | Functions/VCS_Info/VCS_INFO_realpath | 7 | ||||
-rw-r--r-- | Functions/VCS_Info/vcs_info | 1 |
7 files changed, 11 insertions, 20 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_bzr b/Functions/VCS_Info/Backends/VCS_INFO_get_data_bzr index e8c8e81de..705db65a7 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_bzr +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_bzr @@ -81,7 +81,7 @@ else bzrbase=${bzr_info[branch_root]} ;; esac - bzrbase="$(VCS_INFO_realpath ${bzrbase})" + bzrbase=${bzrbase:P} if [ -n "${bzr_info[checkout_of_branch]}" ] && \ zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "use-server" diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs b/Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs index ed738b98f..e9d172052 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_cvs @@ -9,7 +9,7 @@ cvsbase="." while [[ -d "${cvsbase}/../CVS" ]]; do cvsbase="${cvsbase}/.." done -cvsbase="$(VCS_INFO_realpath ${cvsbase})" +cvsbase=${cvsbase:P} cvsbranch=$(< ./CVS/Repository) rrn=${cvsbase:t} cvsbranch=${cvsbranch##${rrn}/} diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn index e1334f661..a773a727d 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn @@ -46,7 +46,7 @@ else done fi -svnbase="$(VCS_INFO_realpath ${svnbase})" +svnbase=${svnbase:P} rrn=${svnbase:t} zstyle -s ":vcs_info:${vcs}:${usercontext}:${rrn}" branchformat svnbranch || svnbranch="%b:%r" diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_tla b/Functions/VCS_Info/Backends/VCS_INFO_get_data_tla index f015e0cce..4e9cee8b9 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_tla +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_tla @@ -5,7 +5,7 @@ setopt localoptions extendedglob NO_shwordsplit local tlabase tlabranch -tlabase="$(VCS_INFO_realpath ${vcs_comm[basedir]})" +tlabase=${vcs_comm[basedir]:P} rrn=${tlabase:t} # tree-id gives us something like 'foo@example.com/demo--1.0--patch-4', so: tlabranch=${${"$( ${vcs_comm[cmd]} tree-id )"}/*\//} diff --git a/Functions/VCS_Info/VCS_INFO_bydir_detect b/Functions/VCS_Info/VCS_INFO_bydir_detect index 70b0fb6fa..b20c05c9c 100644 --- a/Functions/VCS_Info/VCS_INFO_bydir_detect +++ b/Functions/VCS_Info/VCS_INFO_bydir_detect @@ -4,11 +4,11 @@ setopt localoptions NO_shwordsplit local dirname=$1 -local basedir="." realbasedir file +local basedir="." file -realbasedir="$(VCS_INFO_realpath ${basedir})" -while [[ ${realbasedir} != '/' ]]; do - [[ -r ${realbasedir} ]] || return 1 +basedir=${basedir:P} +while [[ ${basedir} != '/' ]]; do + [[ -r ${basedir} ]] || return 1 if [[ -n ${vcs_comm[detect_need_file]} ]] ; then [[ -d ${basedir}/${dirname} ]] && { for file in ${(s: :)${vcs_comm[detect_need_file]}}; do @@ -19,10 +19,9 @@ while [[ ${realbasedir} != '/' ]]; do [[ -d ${basedir}/${dirname} ]] && break fi - basedir=${basedir}/.. - realbasedir="$(VCS_INFO_realpath ${basedir})" + basedir=${basedir:h} done -[[ ${realbasedir} == "/" ]] && return 1 -vcs_comm[basedir]=${realbasedir} +[[ ${basedir} == "/" ]] && return 1 +vcs_comm[basedir]=${basedir} return 0 diff --git a/Functions/VCS_Info/VCS_INFO_realpath b/Functions/VCS_Info/VCS_INFO_realpath deleted file mode 100644 index ce4a69402..000000000 --- a/Functions/VCS_Info/VCS_INFO_realpath +++ /dev/null @@ -1,7 +0,0 @@ -## vim:ft=zsh -## Written by Frank Terbeck <ft@bewatermyfriend.org> -## Distributed under the same BSD-ish license as zsh itself. - -setopt localoptions NO_shwordsplit chaselinks -# -q to avoid chpwd() invocations -( builtin cd -q $1 2>/dev/null && pwd; ) diff --git a/Functions/VCS_Info/vcs_info b/Functions/VCS_Info/vcs_info index 4e9ac6c6a..d67ae6bf5 100644 --- a/Functions/VCS_Info/vcs_info +++ b/Functions/VCS_Info/vcs_info @@ -26,7 +26,6 @@ static_functions=( VCS_INFO_nvcsformats VCS_INFO_patch2subject VCS_INFO_quilt - VCS_INFO_realpath VCS_INFO_reposub VCS_INFO_set |