1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-12-18 13:41:56 +00:00

pull upstream changes from gitstatus

This commit is contained in:
romkatv 2019-07-04 14:07:42 +02:00
parent c3990c53a9
commit fa5aedcf9e
2 changed files with 8 additions and 4 deletions

View file

@ -268,7 +268,10 @@ function gitstatus_start() {
local -i stderr_fd=-1 lock_fd=-1 req_fd=-1 resp_fd=-1 daemon_pid=-1 local -i stderr_fd=-1 lock_fd=-1 req_fd=-1 resp_fd=-1 daemon_pid=-1
function gitstatus_start_impl() { function gitstatus_start_impl() {
[[ ${GITSTATUS_ENABLE_LOGGING:-0} != 1 ]] || { local log_level=${GITSTATUS_LOG_LEVEL:-}
[[ -n $log_level || ${GITSTATUS_ENABLE_LOGGING:-0} != 1 ]] || log_level=INFO
[[ -z $log_level ]] || {
xtrace_file=$(mktemp "${TMPDIR:-/tmp}"/gitstatus.$$.xtrace.XXXXXXXXXX) xtrace_file=$(mktemp "${TMPDIR:-/tmp}"/gitstatus.$$.xtrace.XXXXXXXXXX)
typeset -g GITSTATUS_XTRACE_${name}=$xtrace_file typeset -g GITSTATUS_XTRACE_${name}=$xtrace_file
exec {stderr_fd}>&2 2>$xtrace_file exec {stderr_fd}>&2 2>$xtrace_file
@ -291,7 +294,7 @@ function gitstatus_start() {
resp_fifo=$(mktemp -u "${TMPDIR:-/tmp}"/gitstatus.$$.pipe.resp.XXXXXXXXXX) resp_fifo=$(mktemp -u "${TMPDIR:-/tmp}"/gitstatus.$$.pipe.resp.XXXXXXXXXX)
mkfifo $resp_fifo mkfifo $resp_fifo
[[ ${GITSTATUS_ENABLE_LOGGING:-0} == 1 ]] && [[ -n $log_level ]] &&
log_file=$(mktemp "${TMPDIR:-/tmp}"/gitstatus.$$.daemon-log.XXXXXXXXXX) || log_file=$(mktemp "${TMPDIR:-/tmp}"/gitstatus.$$.daemon-log.XXXXXXXXXX) ||
log_file=/dev/null log_file=/dev/null
typeset -g GITSTATUS_DAEMON_LOG_${name}=$log_file typeset -g GITSTATUS_DAEMON_LOG_${name}=$log_file
@ -313,7 +316,8 @@ function gitstatus_start() {
--max-num-staged=${(q)max_num_staged} --max-num-staged=${(q)max_num_staged}
--max-num-unstaged=${(q)max_num_unstaged} --max-num-unstaged=${(q)max_num_unstaged}
--max-num-untracked=${(q)max_num_untracked} --max-num-untracked=${(q)max_num_untracked}
--dirty-max-index-size=${(q)dirty_max_index_size}) --dirty-max-index-size=${(q)dirty_max_index_size}
${${log_level:#INFO}:+--log-level=$log_level})
# We use `zsh -c` instead of plain {} or () to work around bugs in zplug. It hangs on startup. # We use `zsh -c` instead of plain {} or () to work around bugs in zplug. It hangs on startup.
zsh -dfxc " zsh -dfxc "
@ -397,7 +401,7 @@ function gitstatus_start() {
>&2 awk '{print " " $0}' <$log_file >&2 awk '{print " " $0}' <$log_file
>&2 print -nP '%f' >&2 print -nP '%f'
fi fi
if [[ ${GITSTATUS_ENABLE_LOGGING:-0} == 1 ]]; then if [[ -n ${GITSTATUS_LOG_LEVEL:-} || ${GITSTATUS_ENABLE_LOGGING:-0} == 1 ]]; then
>&2 echo -E '' >&2 echo -E ''
>&2 echo -E ' Your system information:' >&2 echo -E ' Your system information:'
>&2 print -P '%F{yellow}' >&2 print -P '%F{yellow}'