add magic dotdot rationalisation

[etc/zsh.git] / .zsh / zshrc / 85_vcs_prompt

diff --git a/.zsh/zshrc/85_vcs_prompt b/.zsh/zshrc/85_vcs_prompt
index b608a6c7f806497bea37f9de897bbbde3f019bdf..a99ca184abf9d869868f29528d71edd349c5edb6 100644 (file)
--- a/.zsh/zshrc/85_vcs_prompt
+++ b/.zsh/zshrc/85_vcs_prompt
@@ -41,6 +41,28 @@ __hg_get_branch()
   echo "hg:$(hg branch)"
 }
 
   echo "hg:$(hg branch)"
 }
 

+__bzr_get_reporoot()
+{
+  local reporoot
+  reporoot="$(bzr info | sed -rne 's, *branch root: ,,p')"
+  case "$reporoot" in
+    .) echo "$PWD";;
+    *) echo "$reporoot";;
+  esac
+}
+
+__bzr_get_branch()
+{
+  local branch revno
+  bzr version-info | while read i j; do
+      case "$i" in
+        revno:) revno="$j";;
+        branch-nick:) branch="$j";;
+      esac
+    done
+  echo "bzr:${branch}@$revno"
+}
+

 __vcs_get_repo_type()
 {
   # return the type of the closest repository in the path hierarchy
 __vcs_get_repo_type()
 {
   # return the type of the closest repository in the path hierarchy


@@ -49,9 +71,6 @@ __vcs_get_repo_type()
     [ -d ${dir}.git ] && echo git && break
     [ -d ${dir}.bzr ] && echo bzr && break
     [ -d ${dir}.hg ] && echo hg && break
     [ -d ${dir}.git ] && echo git && break
     [ -d ${dir}.bzr ] && echo bzr && break
     [ -d ${dir}.hg ] && echo hg && break

-    [ -d ${dir}.svn ] && echo svn && break
-    [ -d ${dir}.svk ] && echo svk && break
-    [ -d ${dir}CVS ] && echo cvs && break

     [ "$(readlink -f ${dir:-.})" = / ] && echo NONE && break
     dir="../$dir"
   done
     [ "$(readlink -f ${dir:-.})" = / ] && echo NONE && break
     dir="../$dir"
   done


@@ -131,6 +150,12 @@ __vcs_set_prompt_variables()
       branch="$(__hg_get_branch)" ||
         { error "could not determine hg branch"; return 1 }
       ;;
       branch="$(__hg_get_branch)" ||
         { error "could not determine hg branch"; return 1 }
       ;;

+    bzr)
+      reporoot="$(__bzr_get_reporoot)" ||
+        { error "could not determine bzr repository root"; return 1 }
+      branch="$(__bzr_get_branch)" ||
+        { error "could not determine bzr branch"; return 1 }
+      ;;

     *)
       case "$repotype" in
         NONE) :;;
     *)
       case "$repotype" in
         NONE) :;;