Merge 128e426f01 into 8efdbef778

plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh

@@ -11,6 +11,9 @@ if (( $+commands[$virtualenvwrapper] )); then
             WORKON_CWD=1
             # Check if this is a Git repo
             PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
+            if (( $? != 0 )); then
+                PROJECT_ROOT=`hg prompt '{root}' 2>/dev/null`
+            fi
             if (( $? != 0 )); then
                 PROJECT_ROOT="."
             fi

themes/agnoster.zsh-theme

@@ -103,38 +103,18 @@ prompt_git() {
 }
 
 prompt_hg() {
-  local rev status
-  if $(hg id >/dev/null 2>&1); then
-    if $(hg prompt >/dev/null 2>&1); then
-      if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
-        # if files are not added
-        prompt_segment red white
-        st='±'
-      elif [[ -n $(hg prompt "{status|modified}") ]]; then
-        # if any modification
-        prompt_segment yellow black
-        st='±'
-      else
-        # if working copy is clean
-        prompt_segment green black
-      fi
-      echo -n $(hg prompt "☿ {rev}@{branch}") $st
-    else
-      st=""
-      rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
-      branch=$(hg id -b 2>/dev/null)
-      if `hg st | grep -Eq "^\?"`; then
-        prompt_segment red black
-        st='±'
-      elif `hg st | grep -Eq "^(M|A)"`; then
-        prompt_segment yellow black
-        st='±'
-      else
-        prompt_segment green black
-      fi
-      echo -n "☿ $rev@$branch" $st
+    local hg_status
+    hg_status="`hg prompt "{status} {tip} {branch}" 2>/dev/null`"
+    if (( $? == 0 )); then 
+        if [[ $hg_status == !* ]]; then
+          prompt_segment yellow black
+        elif [[ $hg_status == \?* ]]; then 
+          prompt_segment red white
+        else
+          prompt_segment green black
+        fi
+        echo -n "☿${hg_status}"
     fi
-  fi
 }
 
 # Dir: current working directory