zsh-workers
 help / color / mirror / code / Atom feed
5e3ecf615f5ee306d23335903b77b777708f9108 blob 6489 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
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
 
##
# Prompt that can be customized through vcs_info
#
zmodload -F zsh/system p:sysparams
autoload -Uz add-zle-hook-widget add-zsh-hook vcs_info

# Prompt segments
# Normal %b and %(...) need extra % in vcs_info -- except in nvcsformats.
readonly -gHA _prompt_vcs_ps1_default=(
    left      $'%%(?,%F{green},%F{red})%#%%b%f%%s '
    right     '%B%F{blue}%n%b%f%k@%F{magenta}%m%f'
    chpwd     $'\n%B%F{blue}%~%%b%f/\n'
    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 -- \
"Customizable prompt theme that includes VCS info for the current dir (for
example, git status) and asynchronously checks for repo changes.

To customize it, copy-paste any of the code below to your .zshrc file and edit
it there:

  # For each of the following three entries:
  #   1st string is the left prompt.
  #   2nd string is the right prompt.
  #   3rd string is printed whenever you change dirs (before the left prompt).

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

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

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

  # These customize the values of %c and %u, respectively:
  zstyle ':vcs_info:*:prompt_vcs:*' stagedstr ${(q+)_prompt_vcs_ps1_default[staged]}
  zstyle ':vcs_info:*:prompt_vcs:*' unstagedstr ${(q+)_prompt_vcs_ps1_default[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_default[left]//'%%'/%}" \
      "${_prompt_vcs_ps1_default[right]//'%%'/%}" \
      "${_prompt_vcs_ps1_default[chpwd]//'%%'/%}"

  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' formats \
      "$_prompt_vcs_ps1_default[left]" \
      "%u%c$_prompt_vcs_ps1_default[branch]$_prompt_vcs_ps1_default[repo]" \
      "$_prompt_vcs_ps1_default[chpwd]"

  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' actionformats \
      "$_prompt_vcs_ps1_default[left]" \
      "%u%c$_prompt_vcs_ps1_default[action]$_prompt_vcs_ps1_default[repo]" \
      "$_prompt_vcs_ps1_default[chpwd]"

  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' stagedstr \
      "$_prompt_vcs_ps1_default[staged]"

  _prompt_vcs_zstyle ':vcs_info:*:prompt_vcs:*' unstagedstr \
      "$_prompt_vcs_ps1_default[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
  )}" )
  PS1="$_prompt_vcs_info_msg_[1]"
  RPS1="$_prompt_vcs_info_msg_[2]"
  print -nPr -- "$_prompt_vcs_info_msg_[3]"
  
  # Call precmd just in case, because chpwd can happen without a new prompt.
  prompt_vcs_precmd
}

prompt_vcs_precmd() {
  emulate -L zsh

  # Terminate any pending vcs_info request before starting a new one.
  # Second test checks if fd is readable, to avoid this error being printed:
  #   failed to close file descriptor XX: bad file descriptor
  if (( prompt_vcs_fd )) && { : <&$prompt_vcs_fd } 2>/dev/null; then
    zle -F "$prompt_vcs_fd" 2> /dev/null
    exec {prompt_vcs_fd}<&-
  fi
  if (( prompt_vcs_pid )); then
    [[ -o monitor ]] &&
        (( prompt_vcs_pid *= -1 ))
    kill -KILL $prompt_vcs_pid 2> /dev/null
  fi

  # Asynchronously check for changes.
  typeset -gH prompt_vcs_fd=
  exec {prompt_vcs_fd}< <(
	  print -r -- $sysparams[pid]
    _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
  )
  typeset -gH prompt_vcs_pid=
  read -u $prompt_vcs_fd -- prompt_vcs_pid

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

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

  (( $1 )) ||
      return 64  # EX_USAGE; see man 3 sysexits

  local -i fd=$1
  local -a reply
  {
    zle -F "$fd"  # Detach ourselves, so we don't get called more than once.

    [[ -z $2 ]] ||
        return 74  # EX_IOERR

    IFS=$'\0' read -Aru "$fd"
    typeset -gHa _prompt_vcs_info_msg_=( "${(@Q)reply}" )
    PS1="$_prompt_vcs_info_msg_[1]"
    RPS1="$_prompt_vcs_info_msg_[2]"
    zle .reset-prompt
  } always {
    exec {fd}<&-
  }
}

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'
  PS4+='  %(1_,%F{yellow}%K{black}%_%f%k ,)'
  SPROMPT='Correct %B%F{red}%S%R%b%f%s to %B%F{green}%r%b%f?'
  SPROMPT+=$'\n%{\e[2m%}%Uy%ues %Un%uo %Ue%udit %Ua%ubort%b '
  PROMPT_EOL_MARK='%F{cyan}%S%#%f%s'
  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

  prompt_vcs_chpwd
}

prompt_vcs_setup "$@"
debug log:

solving 5e3ecf615 ...
found 5e3ecf615 in https://inbox.vuxu.org/zsh-workers/CAHLkEDvxfU93Fzk2aRw9-f+H+91HhYcYQ++v3rWnGqqv++VEpQ@mail.gmail.com/

applying [1/1] https://inbox.vuxu.org/zsh-workers/CAHLkEDvxfU93Fzk2aRw9-f+H+91HhYcYQ++v3rWnGqqv++VEpQ@mail.gmail.com/
diff --git a/Functions/Prompts/prompt_vcs_setup b/Functions/Prompts/prompt_vcs_setup
new file mode 100644
index 000000000..5e3ecf615

1:116: trailing whitespace.
  
1:185: trailing whitespace.
  
Checking patch Functions/Prompts/prompt_vcs_setup...
Applied patch Functions/Prompts/prompt_vcs_setup cleanly.
warning: 2 lines add whitespace errors.

index at:
100644 5e3ecf615f5ee306d23335903b77b777708f9108	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).