From 3e4f6d1df57b8bf9daf47225544371bbe904b2e0 Mon Sep 17 00:00:00 2001
From: Mathew Hall <mathew.james.hall+git@gmail.com>
Date: Wed, 1 Feb 2012 17:54:45 +0000
Subject: [PATCH] Cleaned lib/hg.zsh of references to git.

Theme now sets necessary vars for hg info on prompts.
---
 lib/hg.zsh           | 25 +++++--------------------
 themes/mjh.zsh-theme | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/lib/hg.zsh b/lib/hg.zsh
index a076dc921..ee941cb43 100644
--- a/lib/hg.zsh
+++ b/lib/hg.zsh
@@ -1,18 +1,6 @@
 
 
-ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
-ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
-ZSH_THEME_HG_PROMPT_SHA_BEFORE=$ZSH_THEME_GIT_PROMPT_SHA_BEFORE
-ZSH_THEME_HG_PROMPT_SHA_AFTER=$ZSH_THEME_GIT_PROMPT_SHA_AFTER
-ZSH_THEME_HG_PROMPT_UNTRACKED=$ZSH_THEME_GIT_PROMPT_UNTRACKED
-ZSH_THEME_HG_PROMPT_ADDED=$ZSH_THEME_GIT_PROMPT_ADDED
-ZSH_THEME_HG_PROMPT_MODIFIED=$ZSH_THEME_GIT_PROMPT_MODIFIED
-ZSH_THEME_HG_PROMPT_RENAMED=$ZSH_THEME_GIT_PROMPT_RENAMED
-ZSH_THEME_HG_PROMPT_DELETED=$ZSH_THEME_GIT_PROMPT_DELETED
-ZSH_THEME_HG_PROMPT_UNMERGED=$ZSH_THEME_GIT_PROMPT_UNMERGED
-
-
-# get the name of the branch we are on
+#give branch & tag:
 function hg_prompt_info() {
   ref=$(hg branch 2> /dev/null) || return
   tag=$(hg parent | grep tag | cut -f 2 -d ":" | tr -d ' ')
@@ -21,9 +9,9 @@ function hg_prompt_info() {
 
 
 
-# Formats prompt string for current git commit short SHA
+#
 function hg_prompt_name() {
-  SHA=$(hg id 2> /dev/null) && echo "$ZSH_THEME_HG_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_HG_PROMPT_SHA_AFTER"
+  ID=$(hg id 2> /dev/null) && echo "$ZSH_THEME_HG_PROMPT_SHA_BEFORE$ID$ZSH_THEME_HG_PROMPT_SHA_AFTER"
 }
 
 
@@ -46,12 +34,9 @@ hg_prompt_status() {
   elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
     STATUS="$ZSH_THEME_HG_PROMPT_MODIFIED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_HG_PROMPT_RENAMED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^ R ' &> /dev/null); then
     STATUS="$ZSH_THEME_HG_PROMPT_DELETED$STATUS"
-  elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
+  elif $(echo "$INDEX" | grep '^R ' &> /dev/null); then
     STATUS="$ZSH_THEME_HG_PROMPT_DELETED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
diff --git a/themes/mjh.zsh-theme b/themes/mjh.zsh-theme
index ffc48b455..d7bfb02af 100644
--- a/themes/mjh.zsh-theme
+++ b/themes/mjh.zsh-theme
@@ -1,3 +1,5 @@
+#Based on themes/jonathan.mjh.zsh-theme.
+
 function theme_precmd {
     local TERMWIDTH
     (( TERMWIDTH = ${COLUMNS} - 1 ))
@@ -51,6 +53,8 @@ setprompt () {
 	(( count = $count + 1 ))
     done
     PR_NO_COLOUR="%{$terminfo[sgr0]%}"
+	
+	
 
     ###
     # Modify Git prompt
@@ -65,6 +69,21 @@ setprompt () {
     ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} R"
     ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} !M"
     ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[white]%} !T"
+	
+	
+	#Shameless git stuff:
+	ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
+	ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
+	ZSH_THEME_HG_PROMPT_SHA_BEFORE=$ZSH_THEME_GIT_PROMPT_SHA_BEFORE
+	ZSH_THEME_HG_PROMPT_SHA_AFTER=$ZSH_THEME_GIT_PROMPT_SHA_AFTER
+	ZSH_THEME_HG_PROMPT_UNTRACKED=$ZSH_THEME_GIT_PROMPT_UNTRACKED
+	ZSH_THEME_HG_PROMPT_ADDED=$ZSH_THEME_GIT_PROMPT_ADDED
+	ZSH_THEME_HG_PROMPT_MODIFIED=$ZSH_THEME_GIT_PROMPT_MODIFIED
+	ZSH_THEME_HG_PROMPT_RENAMED=$ZSH_THEME_GIT_PROMPT_RENAMED
+	ZSH_THEME_HG_PROMPT_DELETED=$ZSH_THEME_GIT_PROMPT_DELETED
+	ZSH_THEME_HG_PROMPT_UNMERGED=$ZSH_THEME_GIT_PROMPT_UNMERGED
+
+	
 
     ###
     # See if we can use extended characters to look nicer.