mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-21 15:36:04 +02:00
Code

Simon Ruderich: 27953: vcs_info: changed default formats and actionformats.

This commit is contained in:
Frank Terbeck 2010-05-14 07:58:37 +00:00
parent 9773e56418
commit 88ea63adf2
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -3,6 +3,10 @@
* Simon Ruderich: 27954: Doc/Zsh/contrib.yo, Misc/vcs_info-examples:
vcs_info: more minor documentation fixes.
* Simon Ruderich: 27953: Doc/Zsh/contrib.yo, Misc/vcs_info-examples,
Functions/VCS_Info/VCS_INFO_formats: vcs_info: changed default formats
and actionformats
2010-05-12 Peter Stephenson <pws@csr.com>
* unposted: Doc/Zsh/params.yo, Src/Modules/zutil.c: fix typo
@ -13138,5 +13142,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4978 $
* $Revision: 1.4979 $
*****************************************************

4
Doc/Zsh/contrib.yo
View File

@ -656,8 +656,8 @@ enditem()
The default values for these styles in all contexts are:
startsitem()
sitem(tt(formats))(" (%s)-[%b]-")
sitem(tt(actionformats))(" (%s)-[%b|%a]-")
sitem(tt(formats))(" (%s)-[%b]%u%c-")
sitem(tt(actionformats))(" (%s)-[%b|%a]%u%c-")
sitem(tt(branchformat))("%b:%r" (for bzr, svn, svk and hg))
sitem(tt(nvcsformats))("")
sitem(tt(hgrevformat))("%r:%h")

4
Functions/VCS_Info/VCS_INFO_formats
View File

@ -51,10 +51,10 @@ VCS_INFO_hook 'post-backend'
if [[ -n ${hook_com[action]} ]] ; then
zstyle -a ":vcs_info:${vcs}:${usercontext}:${rrn}" actionformats msgs
(( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b|%a]-'
(( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b|%a]%u%c-'
else
zstyle -a ":vcs_info:${vcs}:${usercontext}:${rrn}" formats msgs
(( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b]-'
(( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b]%u%c-'
fi
if [[ -n ${hook_com[staged]} ]] ; then

6
Misc/vcs_info-examples
View File

@ -207,12 +207,6 @@ autoload -Uz vcs_info
zstyle ':vcs_info:*' check-for-changes true
zstyle ':vcs_info:*' get-revision true
# Improve default formats/actionformats to display staged (%c) and
# unstaged (%u) changes. You can change the displayed string with the
# 'unstagedstr' and 'stagedstr' settings.
zstyle ':vcs_info:*' formats " (%s)-[%b]%u%c-"
zstyle ':vcs_info:*' actionformats " (%s)-[%b|%a]%u%c-"
# Default to running vcs_info. If possible we prevent running it later for
# speed reasons. If set to a non empty value vcs_info is run.