08cb82b9f476034baddace7c9a9b06299afc89f5

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #448 from n0nick/patch-1

Updated the frisk theme to display Bazaar branch information as well

Diff

 1diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
 2index f181aec9017616a2f938d8e857756be06214e14c..2c999a6a6f0c29a77ccda3b17814db10f39f95dc 100644
 3--- a/themes/frisk.zsh-theme
 4+++ b/themes/frisk.zsh-theme
 5@@ -1,10 +1,22 @@
 6 PROMPT=$'
 7-%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
 8+%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)$(bzr_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
 9 %{$fg_bold[black]%}>%{$reset_color%} '
10 
11 PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"
12 
13-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
14+GIT_CB="git::"
15+ZSH_THEME_SCM_PROMPT_PREFIX="%{$fg[green]%}["
16+ZSH_THEME_GIT_PROMPT_PREFIX=$ZSH_THEME_SCM_PROMPT_PREFIX$GIT_CB
17 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
18 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
19 ZSH_THEME_GIT_PROMPT_CLEAN=""
20+
21+## Bazaar integration
22+bzr_prompt_info() {
23+	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'`
24+	if [ -n "$BZR_CB" ]; then
25+		BZR_DIRTY=""
26+		[[ -n `bzr status` ]] && BZR_DIRTY="%{$fg[red]%} *%{$reset_color%}"
27+		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX"
28+	fi
29+}