dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-23 07:58:00 +00:00
Code Issues Releases Wiki Activity

Fix a formatting bug introduced in cdb95f8

Browse Source
This commit is contained in:
Sorin Ionescu 2012-03-22 21:26:30 -04:00
parent fe1d2ab77d
commit 5e5a7803b6
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helper.zsh
View File

@ -17,7 +17,7 @@ function is-true() {
# Prints the first non-empty string in the arguments array. # Prints the first non-empty string in the arguments array.
function coalesce() { function coalesce() {
for arg in "$argv[@]"; do for arg in $argv; do
print "$arg" print "$arg"
return 0 return 0
done done

8
plugins/git/functions/git-info
View File

@ -218,9 +218,11 @@ function git-info() {
# Get commit. # Get commit.
commit="$(git rev-parse HEAD 2>/dev/null)" commit="$(git rev-parse HEAD 2>/dev/null)"
# Format commit (short). # Format commit.
if [[ -n "$commit" ]]; then
zstyle -s ':omz:plugin:git:prompt' commit 'commit_format' zstyle -s ':omz:plugin:git:prompt' commit 'commit_format'
zformat -f commit_formatted "$commit_format" "c:$commit" zformat -f commit_formatted "$commit_format" "c:$commit"
fi
# Stashed # Stashed
if [[ -f "$(_git-dir)/refs/stash" ]]; then if [[ -f "$(_git-dir)/refs/stash" ]]; then
@ -238,6 +240,8 @@ function git-info() {
if (( line_number == 1 )) && [[ "$line" == *'(no branch)'* ]]; then if (( line_number == 1 )) && [[ "$line" == *'(no branch)'* ]]; then
# Get action. # Get action.
action="$(_git-action)" action="$(_git-action)"
# Format action.
if [[ -n "$action" ]]; then if [[ -n "$action" ]]; then
zstyle -s ':omz:plugin:git:prompt' action 'action_format' zstyle -s ':omz:plugin:git:prompt' action 'action_format'
zformat -f action_formatted "$action_format" "s:$action" zformat -f action_formatted "$action_format" "s:$action"
@ -287,11 +291,11 @@ function git-info() {
done < <("${(z)status_cmd}" 2>/dev/null) done < <("${(z)status_cmd}" 2>/dev/null)
# Format branch. # Format branch.
if [[ -n "$branch" ]]; then
zstyle -s ':omz:plugin:git:prompt' branch 'branch_format' zstyle -s ':omz:plugin:git:prompt' branch 'branch_format'
zformat -f branch_formatted "$branch_format" "b:$branch" zformat -f branch_formatted "$branch_format" "b:$branch"
# Format remote. # Format remote.
if [[ "$branch" != "$commit" ]]; then
if [[ -z "$remote" ]]; then if [[ -z "$remote" ]]; then
remote="${$( \ remote="${$( \
git rev-parse \ git rev-parse \

6
themes/sorin/prompt_sorin_setup
View File

@ -35,14 +35,14 @@ function prompt_sorin_setup() {
zstyle ':omz:plugin:git:prompt' deleted ' %%B%F{red}✖%f%%b' zstyle ':omz:plugin:git:prompt' deleted ' %%B%F{red}✖%f%%b'
zstyle ':omz:plugin:git:prompt' modified ' %%B%F{blue}✱%f%%b' zstyle ':omz:plugin:git:prompt' modified ' %%B%F{blue}✱%f%%b'
zstyle ':omz:plugin:git:prompt' renamed ' %%B%F{magenta}➜%f%%b' zstyle ':omz:plugin:git:prompt' renamed ' %%B%F{magenta}➜%f%%b'
zstyle ':omz:plugin:git:prompt' commit '%.7c' zstyle ':omz:plugin:git:prompt' commit ':%F{red}%.7c%f'
zstyle ':omz:plugin:git:prompt' stashed ' %%B%F{cyan}✭%f%%b' zstyle ':omz:plugin:git:prompt' stashed ' %%B%F{cyan}✭%f%%b'
zstyle ':omz:plugin:git:prompt' unmerged ' %%B%F{yellow}═%f%%b' zstyle ':omz:plugin:git:prompt' unmerged ' %%B%F{yellow}═%f%%b'
zstyle ':omz:plugin:git:prompt' untracked ' %%B%F{white}◼%f%%b' zstyle ':omz:plugin:git:prompt' untracked ' %%B%F{white}◼%f%%b'
zstyle ':omz:plugin:git:prompt' prompt ' %F{blue}git%f$(coalesce "%b" "%c")%s'
zstyle ':omz:plugin:git:prompt' rprompt '%A%B%S%a%d%m%r%U%u' zstyle ':omz:plugin:git:prompt' rprompt '%A%B%S%a%d%m%r%U%u'
zstyle -e ':omz:plugin:git:prompt' prompt 'reply=(" %F{blue}git%f$(coalesce "%b" "%c")%s")'
PROMPT='%F{cyan}%1~%f${git_prompt_info} %(!.%B%F{red}#%f%b.%B%F{green}❯%f%b) ' PROMPT='%F{cyan}%1~%f${(e)git_prompt_info} %(!.%B%F{red}#%f%b.%B%F{green}❯%f%b) '
RPROMPT='%(?::%F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${git_rprompt_info}' RPROMPT='%(?::%F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${git_rprompt_info}'
SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? ' SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
} }