From e42405705a10aa6eb25d4df7f06cadf75a51c3b0 Mon Sep 17 00:00:00 2001 From: Martin Ankerl Date: Mon, 24 Jun 2019 11:02:15 +0200 Subject: [PATCH] Improved subversion support for powerline SVN prompt also when in subdirectories that don't contain .svn Show correct SVN status for powerline --- themes/base.theme.bash | 1 + themes/powerline/powerline.base.bash | 2 ++ 2 files changed, 3 insertions(+) diff --git a/themes/base.theme.bash b/themes/base.theme.bash index e9e862e1..efb56fb7 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -86,6 +86,7 @@ function scm { elif [[ -d .hg ]] && which hg &> /dev/null; then SCM=$SCM_HG elif which hg &> /dev/null && [[ -n "$(hg root 2> /dev/null)" ]]; then SCM=$SCM_HG elif [[ -d .svn ]] && which svn &> /dev/null; then SCM=$SCM_SVN + elif which svn &> /dev/null && [[ -n "$(svn info --show-item wc-root 2>/dev/null)" ]]; then SCM=$SCM_SVN else SCM=$SCM_NONE fi } diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash index b648e2a0..9e668a6c 100644 --- a/themes/powerline/powerline.base.bash +++ b/themes/powerline/powerline.base.bash @@ -98,6 +98,8 @@ function __powerline_scm_prompt { scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}" elif [[ "${SCM_HG_CHAR}" == "${SCM_CHAR}" ]]; then scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}" + elif [[ "${SCM_SVN_CHAR}" == "${SCM_CHAR}" ]]; then + scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}" fi echo "$(eval "echo ${scm_prompt}")${scm}|${color}" fi