Merge 3a8912529b into b6f4a887ac

plugins/battery/battery.plugin.zsh

@@ -46,7 +46,7 @@ if [[ $(uname) == "Darwin" ]] ; then
       fi
       echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
     else
-      echo "∞"
+      echo "⚡"
     fi
   }
 

plugins/cp/cp.plugin.zsh

@@ -11,4 +11,4 @@
 #  -e /dev/null - only work on local files
 #  -- - everything after this is an argument, even if it looks like an option
 
-alias cpv="rsync -poghb --backup-dir=/tmp/rsync -e /dev/null --progress --"
+alias cpv="rsync -phb --backup-dir=/tmp/rsync -e /dev/null --progress --"

plugins/git/git.plugin.zsh

@@ -101,6 +101,13 @@ compdef git-svn-dcommit-push=git
 
 alias gsr='git svn rebase'
 alias gsd='git svn dcommit'
+
+function in_git {
+  if $(git status > /dev/null 2>&1); then
+    echo 1
+  fi
+}
+
 #
 # Will return the current branch name
 # Usage example: git pull origin $(current_branch)

plugins/mercurial/mercurial.plugin.zsh

@@ -33,7 +33,7 @@ function hg_prompt_info {
   if [ $(in_hg) ]; then
     _DISPLAY=$(hg_get_branch_name)
     echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_PROMPT_BASE_COLOR"
+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR $fg_bold[red]%}$(hgic)%{$reset_color%}%{$fg_bold[blue]%}$(hgoc)%{$reset_color%}$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_PROMPT_BASE_COLOR"
     unset _DISPLAY
   fi
 }