diff options
| -rwxr-xr-x | gitstatus/bin/gitstatusd-android-aarch64 | bin | 1360160 -> 1056168 bytes | |||
| -rwxr-xr-x | gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 | bin | 13385621 -> 2147840 bytes | |||
| -rwxr-xr-x | gitstatus/bin/gitstatusd-darwin-x86_64 | bin | 2069120 -> 2073216 bytes | |||
| -rwxr-xr-x | gitstatus/bin/gitstatusd-freebsd-amd64 | bin | 3026472 -> 3252072 bytes | |||
| -rwxr-xr-x | gitstatus/bin/gitstatusd-linux-aarch64 | bin | 2245392 -> 2265872 bytes | |||
| -rwxr-xr-x | gitstatus/bin/gitstatusd-linux-armv7l | bin | 1844760 -> 1865248 bytes | |||
| -rwxr-xr-x | gitstatus/bin/gitstatusd-linux-x86_64 | bin | 2294984 -> 2315464 bytes | |||
| -rwxr-xr-x | gitstatus/bin/gitstatusd-linux-x86_64-static | bin | 2020568 -> 2045144 bytes | |||
| -rw-r--r-- | gitstatus/gitstatus.plugin.zsh | 34 |
9 files changed, 26 insertions, 8 deletions
diff --git a/gitstatus/bin/gitstatusd-android-aarch64 b/gitstatus/bin/gitstatusd-android-aarch64 Binary files differindex 9cee3916..b742957e 100755 --- a/gitstatus/bin/gitstatusd-android-aarch64 +++ b/gitstatus/bin/gitstatusd-android-aarch64 diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 Binary files differindex cc30c089..adbdc925 100755 --- a/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 +++ b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 diff --git a/gitstatus/bin/gitstatusd-darwin-x86_64 b/gitstatus/bin/gitstatusd-darwin-x86_64 Binary files differindex 02c84400..d9a49532 100755 --- a/gitstatus/bin/gitstatusd-darwin-x86_64 +++ b/gitstatus/bin/gitstatusd-darwin-x86_64 diff --git a/gitstatus/bin/gitstatusd-freebsd-amd64 b/gitstatus/bin/gitstatusd-freebsd-amd64 Binary files differindex bae39048..08abb19c 100755 --- a/gitstatus/bin/gitstatusd-freebsd-amd64 +++ b/gitstatus/bin/gitstatusd-freebsd-amd64 diff --git a/gitstatus/bin/gitstatusd-linux-aarch64 b/gitstatus/bin/gitstatusd-linux-aarch64 Binary files differindex ccf4211b..1b34d9f2 100755 --- a/gitstatus/bin/gitstatusd-linux-aarch64 +++ b/gitstatus/bin/gitstatusd-linux-aarch64 diff --git a/gitstatus/bin/gitstatusd-linux-armv7l b/gitstatus/bin/gitstatusd-linux-armv7l Binary files differindex c2ffb4dd..95d40924 100755 --- a/gitstatus/bin/gitstatusd-linux-armv7l +++ b/gitstatus/bin/gitstatusd-linux-armv7l diff --git a/gitstatus/bin/gitstatusd-linux-x86_64 b/gitstatus/bin/gitstatusd-linux-x86_64 Binary files differindex 61b7c9e7..03f21776 100755 --- a/gitstatus/bin/gitstatusd-linux-x86_64 +++ b/gitstatus/bin/gitstatusd-linux-x86_64 diff --git a/gitstatus/bin/gitstatusd-linux-x86_64-static b/gitstatus/bin/gitstatusd-linux-x86_64-static Binary files differindex fa7ae718..a73c99d6 100755 --- a/gitstatus/bin/gitstatusd-linux-x86_64-static +++ b/gitstatus/bin/gitstatusd-linux-x86_64-static diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh index 73488330..be28b25e 100644 --- a/gitstatus/gitstatus.plugin.zsh +++ b/gitstatus/gitstatus.plugin.zsh @@ -59,6 +59,9 @@ autoload -Uz add-zsh-hook && zmodload zsh/datetime zsh/system || return # -t FLOAT Timeout in seconds. Will block for at most this long. If no results are # available by then: if -c isn't specified, will return 1; otherwise will set # VCS_STATUS_RESULT=tout and return 0. +# -p Don't compute anything that requires reading Git index. If this option is used, +# the following parameters will be 0: VCS_STATUS_INDEX_SIZE, +# VCS_STATUS_{NUM,HAS}_{STAGED,UNSTAGED,UNTRACKED}. # # On success sets VCS_STATUS_RESULT to one of the following values: # @@ -83,9 +86,11 @@ autoload -Uz add-zsh-hook && zmodload zsh/datetime zsh/system || return # VCS_STATUS_ACTION Repository state, A.K.A. action. Can be empty. # VCS_STATUS_INDEX_SIZE The number of files in the index. # VCS_STATUS_NUM_STAGED The number of staged changes. +# VCS_STATUS_NUM_CONFLICTED The number of unstaged changes. # VCS_STATUS_NUM_UNSTAGED The number of unstaged changes. # VCS_STATUS_NUM_UNTRACKED The number of untracked files. # VCS_STATUS_HAS_STAGED 1 if there are staged changes, 0 otherwise. +# VCS_STATUS_HAS_CONFLICTED 1 if there are conflicted changes, 0 otherwise. # VCS_STATUS_HAS_UNSTAGED 1 if there are unstaged changes, 0 if there aren't, -1 if unknown. # VCS_STATUS_HAS_UNTRACKED 1 if there are untracked files, 0 if there aren't, -1 if unknown. # VCS_STATUS_COMMITS_AHEAD Number of commits the current branch is ahead of upstream. @@ -114,12 +119,14 @@ function gitstatus_query() { local dir=${${GIT_DIR:-$PWD}:a} local callback='' local -F timeout=-1 + local no_diff=0 while true; do - getopts "d:c:t:" opt || break + getopts "d:c:t:p" opt || break case $opt in d) dir=$OPTARG;; c) callback=$OPTARG;; t) timeout=$OPTARG;; + p) no_diff=1;; ?) return 1;; done) break;; esac @@ -136,7 +143,7 @@ function gitstatus_query() { local req_fd_var=_GITSTATUS_REQ_FD_${name} local -i req_fd=${(P)req_fd_var} local -r req_id="$EPOCHREALTIME" - echo -nE "${req_id} ${callback}"$'\x1f'"${dir}"$'\x1e' >&$req_fd + echo -nE $req_id' '$callback$'\x1f'$dir$'\x1f'$no_diff$'\x1e' >&$req_fd while true; do _gitstatus_process_response $name $timeout $req_id @@ -179,17 +186,20 @@ function _gitstatus_process_response() { typeset -gi VCS_STATUS_INDEX_SIZE="${resp[10]}" typeset -gi VCS_STATUS_NUM_STAGED="${resp[11]}" typeset -gi VCS_STATUS_NUM_UNSTAGED="${resp[12]}" - typeset -gi VCS_STATUS_NUM_UNTRACKED="${resp[13]}" - typeset -gi VCS_STATUS_COMMITS_AHEAD="${resp[14]}" - typeset -gi VCS_STATUS_COMMITS_BEHIND="${resp[15]}" - typeset -gi VCS_STATUS_STASHES="${resp[16]}" - typeset -g VCS_STATUS_TAG="${resp[17]}" + typeset -gi VCS_STATUS_NUM_CONFLICTED="${resp[13]}" + typeset -gi VCS_STATUS_NUM_UNTRACKED="${resp[14]}" + typeset -gi VCS_STATUS_COMMITS_AHEAD="${resp[15]}" + typeset -gi VCS_STATUS_COMMITS_BEHIND="${resp[16]}" + typeset -gi VCS_STATUS_STASHES="${resp[17]}" + typeset -g VCS_STATUS_TAG="${resp[18]}" typeset -gi VCS_STATUS_HAS_STAGED=$((VCS_STATUS_NUM_STAGED > 0)) (( dirty_max_index_size >= 0 && VCS_STATUS_INDEX_SIZE > dirty_max_index_size )) && { typeset -gi VCS_STATUS_HAS_UNSTAGED=-1 + typeset -gi VCS_STATUS_HAS_CONFLICTED=-1 typeset -gi VCS_STATUS_HAS_UNTRACKED=-1 } || { typeset -gi VCS_STATUS_HAS_UNSTAGED=$((VCS_STATUS_NUM_UNSTAGED > 0)) + typeset -gi VCS_STATUS_HAS_CONFLICTED=$((VCS_STATUS_NUM_CONFLICTED > 0)) typeset -gi VCS_STATUS_HAS_UNTRACKED=$((VCS_STATUS_NUM_UNTRACKED > 0)) } } || { @@ -204,9 +214,11 @@ function _gitstatus_process_response() { unset VCS_STATUS_INDEX_SIZE unset VCS_STATUS_NUM_STAGED unset VCS_STATUS_NUM_UNSTAGED + unset VCS_STATUS_NUM_CONFLICTED unset VCS_STATUS_NUM_UNTRACKED unset VCS_STATUS_HAS_STAGED unset VCS_STATUS_HAS_UNSTAGED + unset VCS_STATUS_HAS_CONFLICTED unset VCS_STATUS_HAS_UNTRACKED unset VCS_STATUS_COMMITS_AHEAD unset VCS_STATUS_COMMITS_BEHIND @@ -230,6 +242,9 @@ function _gitstatus_process_response() { # -u INT Report at most this many unstaged changes; negative value means infinity. # Defaults to 1. # +# -c INT Report at most this many conflicted changes; negative value means infinity. +# Defaults to 1. +# # -d INT Report at most this many untracked files; negative value means infinity. # Defaults to 1. # @@ -243,6 +258,7 @@ function gitstatus_start() { local -F timeout=5 local -i max_num_staged=1 local -i max_num_unstaged=1 + local -i max_num_conflicted=1 local -i max_num_untracked=1 local -i dirty_max_index_size=-1 while true; do @@ -251,6 +267,7 @@ function gitstatus_start() { t) timeout=$OPTARG;; s) max_num_staged=$OPTARG;; u) max_num_unstaged=$OPTARG;; + c) max_num_conflicted=$OPTARG;; d) max_num_untracked=$OPTARG;; m) dirty_max_index_size=$OPTARG;; ?) return 1;; @@ -315,6 +332,7 @@ function gitstatus_start() { --num-threads=${(q)threads} --max-num-staged=${(q)max_num_staged} --max-num-unstaged=${(q)max_num_unstaged} + --max-num-conflicted=${(q)max_num_conflicted} --max-num-untracked=${(q)max_num_untracked} --dirty-max-index-size=${(q)dirty_max_index_size} ${${log_level:#INFO}:+--log-level=$log_level}) @@ -415,7 +433,7 @@ function gitstatus_start() { >&2 echo -E '' >&2 echo -E ' Run the following command to retry with extra diagnostics:' >&2 print -P '%F{green}' - >&2 echo -E " GITSTATUS_ENABLE_LOGGING=1 gitstatus_start ${(@q-)*}" + >&2 echo -E " GITSTATUS_LOG_LEVEL=DEBUG gitstatus_start ${(@q-)*}" >&2 print -nP '%f' fi |