zsh-workers
 help / color / mirror / code / Atom feed
8adc7c04d9e961f47448e79de7e5202aa7b36f21 blob 5658 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
 
##
# Prompt that can be customized through vcs_info
#

autoload -Uz add-zsh-hook vcs_info

# Prompt segments
readonly -gHA _prompt_vcs_ps1=(
    chpwd     $'\n%B%F{blue}%~%%b%f/'
    left      $'%%(?,%F{green},%F{red})%#%%b%f%%s '
    right     '%B%F{blue}%n%b%f%k@%F{magenta}%m%f'
    staged    '%B%F{green}+%b%f'
    unstaged  '%B%F{red}*%b%f'
    action    '%B%F{red}%a%%b%f'
    branch    '%B%F{cyan}%b%%b%f'
    repo      '|%B%F{blue}%r%%b%f'
)

prompt_vcs_help() {
  print -r -- \
"This prompt theme can by customized by copy-pasting any of the code below to
your .zshrc file and editing it there:

  # For each of the following three entries:
  #   1st string is printed after changing dirs.
  #   2nd string is the left prompt.
  #   3rd string is the right prompt and updated asynchronously.

  # Normal prompt:
  zstyle ':vcs_info:*:prompt_vcs:*' nvcsformats \\
      "${(q+)_prompt_vcs_ps1[chpwd]//'%%'/%}" \\
      "${(q+)_prompt_vcs_ps1[left]//'%%'/%}" \\
      "${(q+)_prompt_vcs_ps1[right]//'%%'/%}"

  # Prompt inside VCS repo:
  zstyle ':vcs_info:*:prompt_vcs:*' formats \\
      ${(q+)_prompt_vcs_ps1[chpwd]} \\
      ${(q+)_prompt_vcs_ps1[left]} \\
      ${(q+):-%u%c$_prompt_vcs_ps1[branch]$_prompt_vcs_ps1[repo]}

  # Prompt during an ongoing VCS action:
  zstyle ':vcs_info:*:prompt_vcs:*' actionformats \\
      ${(q+)_prompt_vcs_ps1[chpwd]} \\
      ${(q+)_prompt_vcs_ps1[left]} \\
      ${(q+):-%u%c$_prompt_vcs_ps1[action]$_prompt_vcs_ps1[repo]}

  # These set the values of %c and %u, respectively:
  zstyle ':vcs_info:*:prompt_vcs:*' stagedstr ${(q+)_prompt_vcs_ps1[staged]}
  zstyle ':vcs_info:*:prompt_vcs:*' unstagedstr ${(q+)_prompt_vcs_ps1[unstaged]}

For more info on the settings above, see
http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html and the end of
http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#vcs_005finfo-Configuration"
}

# Sets a style if it hasn't been set yet.
_prompt_vcs_zstyle() {
  local -a val
  zstyle -g val "$1" "$2"
  (( $#val )) ||
      zstyle "$@"
}

_prompt_vcs_info() {
  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' max-exports 3 # Default is 2.

  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' nvcsformats \
      "${_prompt_vcs_ps1[chpwd]//'%%'/%}" \
      "${_prompt_vcs_ps1[left]//'%%'/%}" \
      "${_prompt_vcs_ps1[right]//'%%'/%}"
  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' formats \
      "$_prompt_vcs_ps1[chpwd]" \
      "$_prompt_vcs_ps1[left]" \
      "%u%c$_prompt_vcs_ps1[branch]$_prompt_vcs_ps1[repo]"
  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' actionformats \
      "$_prompt_vcs_ps1[chpwd]" \
      "$_prompt_vcs_ps1[left]" \
      "%u%c$_prompt_vcs_ps1[action]$_prompt_vcs_ps1[repo]"
  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' stagedstr \
      "$_prompt_vcs_ps1[staged]"
  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' unstagedstr \
      "$_prompt_vcs_ps1[unstaged]"

  vcs_info prompt_vcs # Call with namespace.

  print -rNC1 -- \
      "${(q+)vcs_info_msg_0_}" "${(q+)vcs_info_msg_1_}" "${(q+)vcs_info_msg_2_}"
}

prompt_vcs_chpwd() {
  emulate -L zsh

  # Don't check for changes at this point, for performance reasons.
  typeset -ga _prompt_vcs_info_msg_=( "${(0@Q)$(
    _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' check-for-changes no
    _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' check-for-staged-changes no
    _prompt_vcs_info
  )}" )
  shift -p _prompt_vcs_info_msg_
  print -Pr -- "$_prompt_vcs_info_msg_[1]"
  PS1="$_prompt_vcs_info_msg_[2]"
  RPS1="$_prompt_vcs_info_msg_[3]"
}

prompt_vcs_precmd() {
  emulate -L zsh

  # Kill any unfinished process before starting a new one.
  if [[ -n $prompt_vcs_fd ]] && { : <&$prompt_vcs_fd } 2>/dev/null; then
    zle -F "$prompt_vcs_fd" 2> /dev/null
    exec {prompt_vcs_fd}<&-
  fi

  # Asynchronously check for changes.
  typeset -gH prompt_vcs_fd=
  exec {prompt_vcs_fd}< <(
    _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' check-for-changes yes
    _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' check-for-staged-changes yes
    _prompt_vcs_info
    print -r -- "$PWD"
  )

  # Add callback. Needs to be a widget, so we can refresh the prompt.
  zle -Fw "$prompt_vcs_fd" prompt_vcs_fd-widget
}

# Callback widget function for our async fetch of VCS changes
prompt_vcs_fd-widget() {
  emulate -L zsh

  [[ -n $1 ]] ||
      return  # Don't accidentally close fd 0.
  {
    local -i fd=$1
    zle -F "$fd"  # Detach ourselves, so we don't get called more than once.

    [[ -z $2 ]] ||
        return  # Error occured.

    local -a reply
    IFS=$'\0' read -Aru "$fd"
  } always {
    exec {fd}<&-
  }
  [[ $reply[-1] == $PWD ]] ||
      return  # Info is not for current dir.

  shift -p reply
  typeset -ga _prompt_vcs_info_msg_=( "${(@Q)reply}" )
  RPS1="$_prompt_vcs_info_msg_[3]"
  zle .reset-prompt
}

prompt_vcs_setup() {
  prompt_opts=( cr percent sp ) # Tell promptinit which options to set.

  # Indent left continuation prompt for each open shell construct.
  local -a indent=( '%('{1..36}'_,  ,)' )
  PS2="${(j::)indent}"

  RPS2='%F{yellow}# %^%f'
  PS4=$'#->%(?,%F{green},%B%F{red}%S)%?%b%f%s\t%e+%F{green}%1N%f:%I  %(1_,%F{yellow}%K{black}%_%f%k ,)'
  SPROMPT='Correct %B%F{red}%U%R%b%f%u to %B%F{green}%r%b%f? [%Sy%ses|%Sn%so|%Se%sdit|%Sa%sbort] '
  PROMPT_EOL_MARK='%S%F{cyan}%#%s%f'
  zle_highlight=(
      isearch:fg=black,bg=yellow
      special:fg=cyan,bold
      region:fg=white,bg=blue,bold
      suffix:fg=white,bg=blue,bold
      paste:bold
  )

  add-zsh-hook chpwd  prompt_vcs_chpwd
  add-zsh-hook precmd prompt_vcs_precmd
  zle -N prompt_vcs_fd-widget # Callback widget for async VCS update.

  prompt_vcs_chpwd
}

prompt_vcs_setup "$@"
debug log:

solving 8adc7c04d ...
found 8adc7c04d in https://inbox.vuxu.org/zsh-workers/CAHLkEDuX-pSfSHXb6yE7HnrCfgZD9HB0U=hwi8huRxN0QeKbuA@mail.gmail.com/

applying [1/1] https://inbox.vuxu.org/zsh-workers/CAHLkEDuX-pSfSHXb6yE7HnrCfgZD9HB0U=hwi8huRxN0QeKbuA@mail.gmail.com/
diff --git a/Functions/Prompts/prompt_vcs_setup b/Functions/Prompts/prompt_vcs_setup
new file mode 100644
index 000000000..8adc7c04d

Checking patch Functions/Prompts/prompt_vcs_setup...
Applied patch Functions/Prompts/prompt_vcs_setup cleanly.

index at:
100644 8adc7c04d9e961f47448e79de7e5202aa7b36f21	Functions/Prompts/prompt_vcs_setup

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).