summaryrefslogtreecommitdiff
path: root/themes/minimal.zsh-theme
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2015-06-14 22:16:21 -0700
committerRobby Russell <robby@planetargon.com>2015-06-14 22:16:21 -0700
commit5fba46a8c4b0bf61d3637cbedf342cc34e950824 (patch)
treed41abe2a1b64116669ddb1d4fc927bcbfd5529c1 /themes/minimal.zsh-theme
parentc0b283c76b70a438759fb58935e2eeb3c5bb4fea (diff)
parent5c9c373cd7944b514c22c292333700bea0408203 (diff)
downloadzsh-5fba46a8c4b0bf61d3637cbedf342cc34e950824.tar.gz
zsh-5fba46a8c4b0bf61d3637cbedf342cc34e950824.tar.bz2
zsh-5fba46a8c4b0bf61d3637cbedf342cc34e950824.zip
Merge pull request #3821 from tresni/fix_minimal
Fix minimal.zsh-theme's check for in_svn and add support for mercurial
Diffstat (limited to 'themes/minimal.zsh-theme')
-rw-r--r--themes/minimal.zsh-theme8
1 files changed, 7 insertions, 1 deletions
diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
index fbd620225..e05df9c9b 100644
--- a/themes/minimal.zsh-theme
+++ b/themes/minimal.zsh-theme
@@ -6,10 +6,16 @@ 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
+ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
+ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
+ZSH_THEME_HG_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
+ZSH_THEME_HG_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
vcs_status() {
- if [[ ( $(whence in_svn) != "" ) && ( $(in_svn) == 1 ) ]]; then
+ if [[ $(whence in_svn) != "" ]] && in_svn; then
svn_prompt_info
+ elif [[ $(whence in_hg) != "" ]] && in_hg; then
+ hg_prompt_info
else
git_prompt_info
fi