From fb8953d525ddd3ed01db02a266b284bd9fa5fbd2 Mon Sep 17 00:00:00 2001
From: Matt Nichols <mattnichols@users.noreply.github.com>
Date: Mon, 19 Sep 2016 21:00:16 -0600
Subject:  Fix peepcode theme ruby prompt info (#5339)

The ruby prompt info was not interpolating properly. Switching to use
 ruby_prompt_info helper. This addresses the issue.
---
 themes/peepcode.zsh-theme | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'themes')

diff --git a/themes/peepcode.zsh-theme b/themes/peepcode.zsh-theme
index 9dc58294a..b6dfa6870 100644
--- a/themes/peepcode.zsh-theme
+++ b/themes/peepcode.zsh-theme
@@ -41,10 +41,4 @@ PROMPT='
 %~
 ${smiley}  %{$reset_color%}'
 
-if [[ -d ~/.rvm ]] && [[ -e ~/.rvm/bin/rvm-prompt ]]; then
-    rvm_prompt='$(~/.rvm/bin/rvm-prompt)'
-else
-    rvm_prompt=''
-fi
-
-RPROMPT='%{$fg[white]%} $rvm_prompt$(git_prompt)%{$reset_color%}'
+RPROMPT='%{$fg[white]%} $(ruby_prompt_info)$(git_prompt)%{$reset_color%}'
-- 
cgit v1.2.3-70-g09d2


From d1ce70f68540bdf6a7f27ab9879e8222d0e7a604 Mon Sep 17 00:00:00 2001
From: grindhold <grindhold@users.noreply.github.com>
Date: Tue, 20 Sep 2016 05:00:42 +0200
Subject: added support for bazaar in agnoster theme (#5016)

the agnoster theme is now able to render basic information
if the user is currently residing inside a bazaar folder.
if so, it will render a green promt segment with "bzr" and
the current revision number in it. if there are untracked
files, the bar will be rendered in yellow. if there are
changes to already tracked files, a + character will be
printed.
---
 themes/agnoster.zsh-theme | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'themes')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index da1f9b6e6..e1a294ee8 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -127,6 +127,27 @@ prompt_git() {
   fi
 }
 
+prompt_bzr() {
+    if (bzr status >/dev/null 2>&1); then
+        status_mod=`bzr status | head -n1 | grep "modified" | wc -m`
+        status_all=`bzr status | head -n1 | wc -m`
+        revision=`bzr log | head -n2 | tail -n1 | sed 's/^revno: //'`
+        if [[ $status_mod -gt 0 ]] ; then
+            prompt_segment yellow black
+            echo -n "bzr@"$revision "✚ "
+        else
+            if [[ $status_all -gt 0 ]] ; then
+                prompt_segment yellow black
+                echo -n "bzr@"$revision
+
+            else
+                prompt_segment green black
+                echo -n "bzr@"$revision
+            fi
+        fi
+    fi
+}
+
 prompt_hg() {
   (( $+commands[hg] )) || return
   local rev status
@@ -198,6 +219,7 @@ build_prompt() {
   prompt_context
   prompt_dir
   prompt_git
+  prompt_bzr
   prompt_hg
   prompt_end
 }
-- 
cgit v1.2.3-70-g09d2