diff options
| author | Robby Russell <robby@planetargon.com> | 2012-12-02 11:50:36 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-12-02 11:50:36 -0800 |
| commit | 56f094860bec91c1968d46cccd5d2c2e3d179de1 (patch) | |
| tree | 88038f3e9a42d40906ce77252d4e664a1eb60fb8 /themes/minimal.zsh-theme | |
| parent | ded745bf1471487c7dc537c781685615ff4c2515 (diff) | |
| parent | 80ab595696f30d89bf52bb5189fa39518a3ca780 (diff) | |
| download | zsh-56f094860bec91c1968d46cccd5d2c2e3d179de1.tar.gz zsh-56f094860bec91c1968d46cccd5d2c2e3d179de1.tar.bz2 zsh-56f094860bec91c1968d46cccd5d2c2e3d179de1.zip | |
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Diffstat (limited to 'themes/minimal.zsh-theme')
| -rw-r--r-- | themes/minimal.zsh-theme | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme index ee3ab6b22..a2a16031f 100644 --- a/themes/minimal.zsh-theme +++ b/themes/minimal.zsh-theme @@ -1,15 +1,18 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}[" -ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}]%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} " +ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX +ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX +ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY +ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN -#Customized git status, oh-my-zsh currently does not allow render dirty status before branch -git_custom_status() { - local cb=$(current_branch) - if [ -n "$cb" ]; then - echo "- $ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" - fi +vcs_status() { + if [[ ( $(whence in_svn) != "" ) && ( $(in_svn) == 1 ) ]]; then + svn_prompt_info + else + git_prompt_info + fi } - -PROMPT='%2~ $(git_custom_status) »%b '
\ No newline at end of file +PROMPT='%2~ $(vcs_status)»%b '
\ No newline at end of file |