zsh/zdharma-continuum.zinit
1
0
Fork 0
mirror of https://github.com/zdharma-continuum/zinit.git synced 2026-09-10 07:36:38 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: implemented parsing of options for self-update using .zinit-parse-opts; extended number of supports variants, options

Browse source 
Follows suggestions from https://github.com/zdharma-continuum/zinit/pull/762#pullrequestreview-3811990006

Co-authored-by: vladislav doster <mvdoster@gmail.com>
This commit is contained in:
Andrea Alberti 2026-02-18 10:02:49 +01:00
parent bb37f3bbd8
commit 95ba7d1dd4
No known key found for this signature in database
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
_zinit
View file

@ -273,6 +273,10 @@ _zinit_run(){
} # ]]]
# FUNCTION: _zinit_self_update [[[
_zinit_self_update(){
_arguments -A \
'(-h --help)'{-h,--help}'[Show this help message]' \
'(-q --quiet)'{-q,--quiet}'[Turn off messages from the operation]' \
&& ret=0
} # ]]]
# FUNCTION: _zinit_snippet [[[
_zinit_snippet(){

20
zinit-autoload.zsh
View file

@ -1966,13 +1966,11 @@ print -- "\nAvailable ice-modifiers:\n\n${ice_order[*]}"
#
# $1 - Absolute path to Git repository"
.zi-check-for-git-changes() {
local quiet=0
[[ $1 = -q ]] && { quiet=1; shift; }
+zi-log "{dbg} checking $1"
if command git -C "$1" rev-parse --is-inside-work-tree &> /dev/null; then
if command git -C "$1" rev-parse --abbrev-ref @'{u}' &> /dev/null; then
REPLY=$(command git -C "$1" rev-parse --abbrev-ref HEAD)
if (( ! quiet )); then
if (( ! OPTS[opt_-q,--quiet] )); then
local nl=$'\n'
+zi-log -n "{pre}[self-update]{info} fetching latest changes from {obj}$REPLY{info} branch$nl{rst}"
fi
@ -1983,7 +1981,7 @@ print -- "\nAvailable ice-modifiers:\n\n${ice_order[*]}"
return 0
fi
fi
(( ! quiet )) && +zi-log "{m} Already up to date"
(( ! OPTS[opt_-q,--quiet] )) && +zi-log "{m} Already up to date"
return 1
fi
} # ]]]
@ -1993,11 +1991,9 @@ print -- "\nAvailable ice-modifiers:\n\n${ice_order[*]}"
builtin emulate -LR zsh ${=${options[xtrace]:#off}:+-o xtrace}
setopt extendedglob typesetsilent warncreateglobal
if .zi-check-for-git-changes ${1:+"$1"} "$ZINIT[BIN_DIR]"; then
if .zi-check-for-git-changes "$ZINIT[BIN_DIR]"; then
# Store branch name resolved by .zi-check-for-git-changes via $REPLY
local current_branch=$REPLY
[[ $1 = -q ]] && +zi-log "{pre}[self-update]{info} updating zinit repository{msg2}" \
local nl=$'\n' escape=$'\x1b['
# Warn if user is not on main (requested by maintainer)
@ -2025,13 +2021,13 @@ print -- "\nAvailable ice-modifiers:\n\n${ice_order[*]}"
builtin print
fi
# Do not use hardcoded 'origin main' to let git use the configured upstream
if [[ $1 != -q ]] {
if (( ! OPTS[opt_-q,--quiet] )) {
command git pull --no-stat --ff-only
} else {
command git pull --no-stat --quiet --ff-only
}
)
if [[ $1 != -q ]] {
if (( ! OPTS[opt_-q,--quiet] )) {
+zi-log "{pre}[self-update]{info} compiling zinit via {obj}zcompile{rst}"
}
command rm -f $ZINIT[BIN_DIR]/*.zwc(DN)
@ -2039,7 +2035,7 @@ print -- "\nAvailable ice-modifiers:\n\n${ice_order[*]}"
zcompile -U $ZINIT[BIN_DIR]/zinit-{'side','install','autoload','additional'}.zsh
zcompile -U $ZINIT[BIN_DIR]/share/git-process-output.zsh
# Load for the current session
[[ $1 != -q ]] && +zi-log "{pre}[self-update]{info} reloading zinit for the current session{rst}"
(( ! OPTS[opt_-q,--quiet] )) && +zi-log "{pre}[self-update]{info} reloading zinit for the current session{rst}"
# +zi-log "{pre}[self-update]{info} resetting zinit repository via{rst}: {cmd}${ICE[reset]:-git reset --hard HEAD}{rst}"
source $ZINIT[BIN_DIR]/zinit.zsh
@ -3402,7 +3398,9 @@ print -- "\nAvailable ice-modifiers:\n\n${ice_order[*]}"
local -F2 SECONDS=0
.zinit-self-update -q
local -A OPTS
OPTS[opt_-q,--quiet]=1
.zinit-self-update
[[ $2 = restart ]] && \
+zi-log "{msg2}Restarting the update with the new codebase loaded.{rst}"$'\n'

6
zinit.zsh
View file

@ -2623,13 +2623,14 @@ zinit() {
light "--help|-b|-h"
snippet "--command|--force|--help|-f|-h|-x"
times "--help|-h|-m|-s"
self-update "--help|--quiet|-h|-q"
unload "--help|--quiet|-h|-q"
update "--all|--help|--no-pager|--parallel|--plugins|--quiet|--reset|--snippets|--urge|--verbose|-L|-a|-h|-n|-p|-q|-r|-s|-u|-v"
version ""
)
cmd="$1"
if [[ $cmd == (times|unload|env-whitelist|update|snippet|load|light|cdreplay|cdclear) ]]; then
if [[ $cmd == (times|unload|env-whitelist|update|snippet|load|light|cdreplay|cdclear|self-update) ]]; then
if (( $@[(I)-*] || OPTS[opt_-h,--help] )); then
.zinit-parse-opts "$cmd" "$@"
if (( OPTS[opt_-h,--help] )); then
@ -2950,7 +2951,8 @@ You can try to prepend {apo}${___q}{lhi}@{apo}'{error} to the ID if the last ice
.zinit-show-times "${@[2-correct,-1]}"
;;
(self-update)
.zinit-self-update "${@[2-correct,-1]}"
.zinit-parse-opts "self-update" "$@"
.zinit-self-update
;;
(unload)
(( ${+functions[.zinit-unload]} )) || builtin source "${ZINIT[BIN_DIR]}/zinit-autoload.zsh" || return 1