mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-27 04:40:59 +01:00
Code Releases Activity

28776: Let vcs_info detect very old mercurial repositories.

Browse source
This commit is contained in:
Frank Terbeck 2011-02-19 11:54:41 +00:00
parent 24e97ba046
commit 3c020a9a9c
4 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,11 @@
2011-02-19 Frank Terbeck <ft@bewatermyfriend.org>
* 28776: Functions/VCS_Info/VCS_INFO_bydir_detect,
Functions/VCS_Info/Backends/VCS_INFO_detect_hg,
Functions/VCS_Info/Backends/VCS_INFO_get_data_hg: Let
vcs_info detect very old mercurial repositories.
2011-02-18 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 28773, Doc/Zsh/zle.yo, Src/zle_hist.c: add
@ -14225,5 +14233,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5202 $
* $Revision: 1.5203 $
*****************************************************

2
Functions/VCS_Info/Backends/VCS_INFO_detect_hg
View file

@ -7,7 +7,7 @@ setopt localoptions NO_shwordsplit
[[ $1 == '--flavours' ]] && { print -l hg-git hg-hgsubversion hg-hgsvn; return 0 }
VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
vcs_comm[detect_need_file]=store
vcs_comm[detect_need_file]="store data"
VCS_INFO_bydir_detect '.hg' || return 1
if [[ -d ${vcs_comm[basedir]}/.hg/svn ]] ; then

2
Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
View file

@ -50,7 +50,7 @@ if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then
"check-for-changes" || hgid_args+=( -r. )
local HGRCPATH
HGRCPATH="/dev/null" ${vcs_comm[cmd]} ${(z)hgid_args} \
HGRCPATH="/dev/null" ${vcs_comm[cmd]} ${(z)hgid_args} 2> /dev/null \
| read -r r_csetid r_lrev r_branch
fi
fi

10
Functions/VCS_Info/VCS_INFO_bydir_detect
View file

@ -4,15 +4,17 @@
setopt localoptions NO_shwordsplit
local dirname=$1
local basedir="." realbasedir
local basedir="." realbasedir file
realbasedir="$(VCS_INFO_realpath ${basedir})"
while [[ ${realbasedir} != '/' ]]; do
[[ -r ${realbasedir} ]] || return 1
if [[ -n ${vcs_comm[detect_need_file]} ]] ; then
[[ -d ${basedir}/${dirname} ]] && \
[[ -e ${basedir}/${dirname}/${vcs_comm[detect_need_file]} ]] && \
break
[[ -d ${basedir}/${dirname} ]] && {
for file in ${(s: :)${vcs_comm[detect_need_file]}}; do
[[ -e ${basedir}/${dirname}/${file} ]] && break 2
done
}
else
[[ -d ${basedir}/${dirname} ]] && break
fi