system/zsh
system/zsh
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh synced 2024-10-02 22:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

31136: vcs_info: just set parameters instead of passing over a pipe

Browse source
This commit is contained in:
Mikael Magnusson 2013-03-10 13:18:32 +00:00
parent 0c8625299a
commit 44907223ff
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -11,6 +11,9 @@
Add support for showing the current action is cherry-pick (happens
when cherry-picking a range).
* 31136: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
just set parameters instead of passing over a pipe.
2013-03-05 Peter Stephenson <p.w.stephenson@ntlworld.com>
* users/17666: Doc/Zsh/contrib.yo, Functions/Misc/zcalc: -f
@ -574,5 +577,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5815 $
* $Revision: 1.5816 $
*****************************************************

21
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -5,10 +5,10 @@
setopt localoptions extendedglob NO_shwordsplit
local gitdir gitbase gitbranch gitaction gitunstaged gitstaged gitsha1
local stgitpatch stgitunapplied
local -xA hook_com
local -A hook_com
VCS_INFO_git_getaction () {
local gitaction='' gitdir=$1
local gitdir=$1
local tmp
for tmp in "${gitdir}/rebase-apply" \
@ -22,7 +22,6 @@ VCS_INFO_git_getaction () {
else
gitaction="am/rebase"
fi
printf '%s' ${gitaction}
return 0
fi
done
@ -30,7 +29,7 @@ VCS_INFO_git_getaction () {
for tmp in "${gitdir}/rebase-merge/interactive" \
"${gitdir}/.dotest-merge/interactive" ; do
if [[ -f "${tmp}" ]] ; then
printf '%s' "rebase-i"
gitaction="rebase-i"
return 0
fi
done
@ -38,18 +37,18 @@ VCS_INFO_git_getaction () {
for tmp in "${gitdir}/rebase-merge" \
"${gitdir}/.dotest-merge" ; do
if [[ -d "${tmp}" ]] ; then
printf '%s' "rebase-m"
gitaction="rebase-m"
return 0
fi
done
if [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
printf '%s' "merge"
gitaction="merge"
return 0
fi
if [[ -f "${gitdir}/BISECT_LOG" ]] ; then
printf '%s' "bisect"
gitaction="bisect"
return 0
fi
@ -59,7 +58,6 @@ VCS_INFO_git_getaction () {
else
gitaction=cherry
fi
printf '%s' ${gitaction}
return 0
fi
@ -67,7 +65,7 @@ VCS_INFO_git_getaction () {
}
VCS_INFO_git_getbranch () {
local gitbranch gitdir=$1 tmp actiondir
local gitdir=$1 tmp actiondir
local gitsymref="${vcs_comm[cmd]} symbolic-ref HEAD"
actiondir=''
@ -106,12 +104,11 @@ VCS_INFO_git_getbranch () {
fi
fi
printf '%s' "${gitbranch}"
return 0
}
gitdir=${vcs_comm[gitdir]}
gitbranch="$(VCS_INFO_git_getbranch ${gitdir})"
VCS_INFO_git_getbranch ${gitdir}
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then
gitsha1=$(${vcs_comm[cmd]} rev-parse --quiet --verify HEAD)
else
@ -134,7 +131,7 @@ if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "check-for-changes" && \
fi
VCS_INFO_adjust
gitaction="$(VCS_INFO_git_getaction ${gitdir})"
VCS_INFO_git_getaction ${gitdir}
gitbase=${PWD%/${$( ${vcs_comm[cmd]} rev-parse --show-prefix )%/##}}
rrn=${gitbase:t}