agnoster: fix bzr prompt with breezy installed (#8646)

* Change indentation to 2 spaces in prompt_bzr function
* Check if in a bzr repository and optimize bzr calls in prompt_bzr

themes/agnoster.zsh-theme

@@ -141,20 +141,26 @@ prompt_git() {
 
 prompt_bzr() {
   (( $+commands[bzr] )) || return
-    if (bzr status >/dev/null 2>&1); then
+
-        status_mod=`bzr status | head -n1 | grep "modified" | wc -m`
+  # Test if bzr repository in directory hierarchy
-        status_all=`bzr status | head -n1 | wc -m`
+  local dir="$PWD"
-        revision=`bzr log | head -n2 | tail -n1 | sed 's/^revno: //'`
+  while [[ ! -d "$dir/.bzr" ]]; do
+    [[ "$dir" = "/" ]] && return
+    dir="${dir:h}"
+  done
+
+  local bzr_status status_mod status_all revision
+  if bzr_status=$(bzr status 2>&1); then
+    status_mod=$(echo -n "$bzr_status" | head -n1 | grep "modified" | wc -m)
+    status_all=$(echo -n "$bzr_status" | head -n1 | wc -m)
+    revision=$(bzr log -r-1 --log-format line | cut -d: -f1)
     if [[ $status_mod -gt 0 ]] ; then
-            prompt_segment yellow black
+      prompt_segment yellow black "bzr@$revision ✚"
-            echo -n "bzr@"$revision "✚ "
     else
       if [[ $status_all -gt 0 ]] ; then
-                prompt_segment yellow black
+        prompt_segment yellow black "bzr@$revision"
-                echo -n "bzr@"$revision
       else
-                prompt_segment green black
+        prompt_segment green black "bzr@$revision"
-                echo -n "bzr@"$revision
       fi
     fi
   fi