mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-10-25 17:20:25 +02:00
43030: Replace VCS_INFO_realpath() by :P
This commit is contained in:
parent
0daeed20e1
commit
faa07d064b
8 changed files with 19 additions and 20 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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}/}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 )"}/*\//}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; )
|
||||
|
|
@ -26,7 +26,6 @@ static_functions=(
|
|||
VCS_INFO_nvcsformats
|
||||
VCS_INFO_patch2subject
|
||||
VCS_INFO_quilt
|
||||
VCS_INFO_realpath
|
||||
VCS_INFO_reposub
|
||||
VCS_INFO_set
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue