fb614a0e80b507e847007d76b9d20ab2828b3af5

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

Message

Merge pull request #2229 from prubianes/master

Bazaar Integration Lib

Diff

 1diff --git a/lib/bzr.zsh b/lib/bzr.zsh
 2new file mode 100644
 3index 0000000000000000000000000000000000000000..005a16500323aed129922d80fc54b270560478d7
 4--- /dev/null
 5+++ b/lib/bzr.zsh
 6@@ -0,0 +1,10 @@
 7+## Bazaar integration
 8+## Just works with the GIT integration just add $(bzr_prompt_info) to the PROMPT
 9+function bzr_prompt_info() {
10+	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'`
11+	if [ -n "$BZR_CB" ]; then
12+		BZR_DIRTY=""
13+		[[ -n `bzr status` ]] && BZR_DIRTY=" %{$fg[red]%} * %{$fg[green]%}"
14+		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX"
15+	fi
16+}
17diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
18index 2c999a6a6f0c29a77ccda3b17814db10f39f95dc..653c7461feb8a1b12b45d95a8e34cd916f109fa2 100644
19--- a/themes/frisk.zsh-theme
20+++ b/themes/frisk.zsh-theme
21@@ -10,13 +10,3 @@ ZSH_THEME_GIT_PROMPT_PREFIX=$ZSH_THEME_SCM_PROMPT_PREFIX$GIT_CB
22 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
23 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
24 ZSH_THEME_GIT_PROMPT_CLEAN=""
25-
26-## Bazaar integration
27-bzr_prompt_info() {
28-	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'`
29-	if [ -n "$BZR_CB" ]; then
30-		BZR_DIRTY=""
31-		[[ -n `bzr status` ]] && BZR_DIRTY="%{$fg[red]%} *%{$reset_color%}"
32-		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX"
33-	fi
34-}