`5fba46a8c4b0bf61d3637cbedf342cc34e950824`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2015-06-15 05:16 UTC

Message

Merge pull request #3821 from tresni/fix_minimal

Fix minimal.zsh-theme's check for in_svn and add support for mercurial

Diff

 1diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
 2index fbd620225c7d03149f4045d0fb8a63de576a983d..e05df9c9bc0bd4f83c96e5b50572b44e4c994ca6 100644
 3--- a/themes/minimal.zsh-theme
 4+++ b/themes/minimal.zsh-theme
 5@@ -6,10 +6,16 @@ ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
 6 ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
 7 ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
 8 ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
 9+ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
10+ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
11+ZSH_THEME_HG_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
12+ZSH_THEME_HG_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
13 
14 vcs_status() {
15-    if [[ ( $(whence in_svn) != "" ) && ( $(in_svn) == 1 ) ]]; then
16+    if [[ $(whence in_svn) != "" ]] && in_svn; then
17         svn_prompt_info
18+    elif [[ $(whence in_hg) != "" ]] && in_hg; then
19+        hg_prompt_info
20     else
21         git_prompt_info
22     fi