Use a vcs library and add a Mercurial plugin

Move git_* functions to vcs_* to allow for better plugin support
Modify plugins to use the new function names and declare new variable
names, so ZSH_THEME_GIT_* variables are ZSH_THEME_VCS_* and
git_prompt_info() is vcs_prompt_info()
This commit is contained in:
Jared Hancock 2011-04-07 22:59:01 -05:00
commit b6bb141649
62 changed files with 304 additions and 295 deletions

View file

@ -11,38 +11,38 @@ if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
MODE_INDICATOR="%{$fg_bold[red]%}%{$reset_color%}%{$fg[red]%}%{$reset_color%}"
local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
PROMPT='%{$fg[cyan]%}%c$(git_prompt_info) %(!.%{$fg_bold[red]%}#.%{$fg_bold[green]%})%{$reset_color%} '
PROMPT='%{$fg[cyan]%}%c$(vcs_prompt_info) %(!.%{$fg_bold[red]%}#.%{$fg_bold[green]%})%{$reset_color%} '
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}git%{$reset_color%}:%{$fg[red]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY=""
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_VCS_PROMPT_PREFIX=" %{$fg[blue]%}"'$(vcs_name)'"%{$reset_color%}:%{$fg[red]%}"
ZSH_THEME_VCS_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_VCS_PROMPT_DIRTY=""
ZSH_THEME_VCS_PROMPT_CLEAN=""
RPROMPT='${return_status}$(git_prompt_status)%{$reset_color%}'
RPROMPT='${return_status}$(vcs_prompt_status)%{$reset_color%}'
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
ZSH_THEME_VCS_PROMPT_ADDED="%{$fg[green]%} ✚"
ZSH_THEME_VCS_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
ZSH_THEME_VCS_PROMPT_DELETED="%{$fg[red]%} ✖"
ZSH_THEME_VCS_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
ZSH_THEME_VCS_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
ZSH_THEME_VCS_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
else
MODE_INDICATOR=""
local return_status="%(?::⏎)"
PROMPT='%c$(git_prompt_info) %(!.#.) '
PROMPT='%c$(vcs_prompt_info) %(!.#.) '
ZSH_THEME_GIT_PROMPT_PREFIX=" git:"
ZSH_THEME_GIT_PROMPT_SUFFIX=""
ZSH_THEME_GIT_PROMPT_DIRTY=""
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_VCS_PROMPT_PREFIX=" "'$(vcs_name)'
ZSH_THEME_VCS_PROMPT_SUFFIX=""
ZSH_THEME_VCS_PROMPT_DIRTY=""
ZSH_THEME_VCS_PROMPT_CLEAN=""
RPROMPT='${return_status}$(git_prompt_status)'
RPROMPT='${return_status}$(vcs_prompt_status)'
ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹"
ZSH_THEME_GIT_PROMPT_DELETED=" ✖"
ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭"
ZSH_THEME_VCS_PROMPT_ADDED=" ✚"
ZSH_THEME_VCS_PROMPT_MODIFIED=" ✹"
ZSH_THEME_VCS_PROMPT_DELETED=" ✖"
ZSH_THEME_VCS_PROMPT_RENAMED=" ➜"
ZSH_THEME_VCS_PROMPT_UNMERGED=" ═"
ZSH_THEME_VCS_PROMPT_UNTRACKED=" ✭"
fi