mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

Seth House: 30702: contrib.yo, VCS_INFO_get_data_hg: Removed --debug flag from the hg vcs_info backend

Browse source
This commit is contained in:
Frank Terbeck 2012-09-28 22:07:29 +00:00
parent 1ca9f9d5d0
commit feb6169bcd
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,9 @@
2012-09-29 Frank Terbeck <ft@bewatermyfriend.org>
* Seth House: 30702: Doc/Zsh/contrib.yo,
Functions/VCS_Info/Backends/VCS_INFO_get_data_hg: Removed --debug
flag from the hg vcs_info backend
2012-09-28 Oliver Kiddle <opk@zsh.org>
* 30697: Completion/Unix/Command/_dbus: new completion definition
@ -179,5 +185,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5724 $
* $Revision: 1.5725 $
*****************************************************

7
Doc/Zsh/contrib.yo
View file

@ -768,7 +768,10 @@ item(tt(hgrevformat))(
tt(hg) uses both a hash and a revision number to reference a specific
changeset in a repository. With this style you can format the revision
string (see tt(branchformat)) to include either or both. It's only
useful when tt(get-revision) is true.
useful when tt(get-revision) is true. Note, the full 40-character revision id
is not available (except when using the tt(use-simple) option) because
executing hg more than once per prompt is too slow; you may customize this
behavior using hooks.
)
kindex(max-exports)
item(tt(max-exports))(
@ -993,7 +996,7 @@ In tt(hgrevformat) these replacements are done:
startsitem()
sitem(tt(%r))(The current local revision number.)
sitem(tt(%h))(The current 40-character changeset ID hash identifier.)
sitem(tt(%h))(The current global revision identifier.)
endsitem()
In tt(patch-format) and tt(nopatch-format) these replacements are done:

9
Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
View file

@ -37,12 +37,15 @@ VCS_INFO_adjust
# Calling the 'hg' program is quite a bit too slow for prompts.
# Disabled by default anyway, so no harm done.
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then
# Calling hexdump is (much) faster than hg but doesn't get the local rev
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" use-simple \
&& ( VCS_INFO_check_com hexdump ) && [[ -r ${dirstatefile} ]] ; then
# Calling hexdump is (much) faster than hg but doesn't get the local rev
r_csetid=$(hexdump -n 20 -e '1/1 "%02x"' ${dirstatefile})
else
hgid_args=( --debug id -i -n -b )
# Settling for a short (but unique!) hash because getting the full
# 40-char hash in addition to all the other info we want isn't
# available in a single hg invocation
hgid_args=( id -i -n -b )
# Looking for changes is a tad bit slower since the dirstate cache must
# first be refreshed before being read
@ -119,7 +122,7 @@ if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-bookmarks \
&& [[ -r "${bmfile}" ]] && [[ -n "$r_csetid" ]] ; then
while read -r i_bmhash i_bmname ; do
# Compare hash in bookmarks file with changeset id
[[ $r_csetid == $i_bmhash ]] && hgbmarks+=( $i_bmname )
[[ $i_bmhash == $r_csetid* ]] && hgbmarks+=( $i_bmname )
done < ${bmfile}
if VCS_INFO_hook 'gen-hg-bookmark-string' "${hgbmarks[@]}"; then