From c24936ece51940536f3e62fc9e458b74c2affe68 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Thu, 30 Sep 2010 19:56:56 -0700
Subject: [PATCH 01/10] added steeef theme

---
 themes/steeef.zsh-theme | 68 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 themes/steeef.zsh-theme

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
new file mode 100644
index 000000000..a54cdce14
--- /dev/null
+++ b/themes/steeef.zsh-theme
@@ -0,0 +1,68 @@
+# prompt style and colors based on Steve Losh's Prose theme:
+# http://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme
+#
+# vcs_info modifications from Bart Trojanowski's zsh prompt:
+# http://www.jukie.net/bart/blog/pimping-out-zsh-prompt
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+}
+PR_GIT_UPDATE=1
+
+setopt prompt_subst
+autoload colors
+colors
+
+autoload -U add-zsh-hook
+autoload -Uz vcs_info
+
+
+# check-for-changes can be really slow.
+# you should disable it, if you work with large repositories
+zstyle ':vcs_info:*:prompt:*' check-for-changes true
+
+# set formats
+# %b - branchname
+# %u - unstagedstr (see below)
+# %c - stagedstr (see below)
+# %a - action (e.g. rebase-i)
+# %R - repository path
+# %S - path in the repository
+PR_RST="%{${reset_color}%}"
+FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
+FMT_ACTION="(%{$fg[green]%}%a${PR_RST})"
+FMT_UNSTAGED="%{$fg[yellow]%}!"
+FMT_STAGED="%{$fg[yellow]%}?"
+
+zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
+zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
+zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}"
+zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
+
+
+function steeef_preexec {
+    case "$(history $HISTCMD)" in
+        *git*)
+            PR_GIT_UPDATE=1
+            ;;
+    esac
+}
+add-zsh-hook preexec steeef_preexec
+
+function steeef_chpwd {
+    PR_GIT_UPDATE=1
+}
+add-zsh-hook chpwd steeef_chpwd
+
+function steeef_precmd {
+    if [[ -n "$PR_GIT_UPDATE" ]] ; then
+        vcs_info 'prompt'
+        PR_GIT_UPDATE=
+    fi
+}
+add-zsh-hook precmd steeef_precmd
+
+PROMPT=$'
+%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}%~%{$reset_color%} $vcs_info_msg_0_
+$(virtualenv_info)$ '

From 7fb0b210e88bcbdb71d2cb0022c35b2cc3810327 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 1 Oct 2010 14:11:53 -0700
Subject: [PATCH 02/10] merge steeef.zsh-theme from master

---
 themes/steeef.zsh-theme | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index a54cdce14..abb8f2994 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -3,6 +3,9 @@
 #
 # vcs_info modifications from Bart Trojanowski's zsh prompt:
 # http://www.jukie.net/bart/blog/pimping-out-zsh-prompt
+#
+# git untracked files modification from Brian Carper:
+# http://briancarper.net/blog/570/git-info-in-your-zsh-prompt
 
 function virtualenv_info {
     [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
@@ -17,6 +20,9 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 
+# enable VCS systems you use
+zstyle ':vcs_info:*' enable git svn
+
 # check-for-changes can be really slow.
 # you should disable it, if you work with large repositories
 zstyle ':vcs_info:*:prompt:*' check-for-changes true
@@ -31,8 +37,8 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
 PR_RST="%{${reset_color}%}"
 FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
 FMT_ACTION="(%{$fg[green]%}%a${PR_RST})"
-FMT_UNSTAGED="%{$fg[yellow]%}!"
-FMT_STAGED="%{$fg[yellow]%}?"
+FMT_UNSTAGED="%{$fg[yellow]%}●"
+FMT_STAGED="%{$fg[green]%}●"
 
 zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
 zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
@@ -46,6 +52,9 @@ function steeef_preexec {
         *git*)
             PR_GIT_UPDATE=1
             ;;
+        *svn*)
+            PR_GIT_UPDATE=1
+            ;;
     esac
 }
 add-zsh-hook preexec steeef_preexec
@@ -56,6 +65,15 @@ function steeef_chpwd {
 add-zsh-hook chpwd steeef_chpwd
 
 function steeef_precmd {
+    # check for untracked files or updated submodules, since vcs_info doesn't
+    if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) || -n $(git ls-files -m --exclude-standard 2> /dev/null) ]]; then
+        PR_GIT_UPDATE=1
+        FMT_BRANCH="(%{$fg[magenta]%}%b%u%c%{$fg[red]%}●${PR_RST})"
+    else
+        FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
+    fi
+    zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+
     if [[ -n "$PR_GIT_UPDATE" ]] ; then
         vcs_info 'prompt'
         PR_GIT_UPDATE=

From 6fcf9393c31a51cef688b591de73817c5988c405 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 1 Oct 2010 14:17:13 -0700
Subject: [PATCH 03/10] merge steeef.zsh-theme from master (removed submodule
 check)

---
 themes/steeef.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index abb8f2994..a43192743 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -66,7 +66,7 @@ add-zsh-hook chpwd steeef_chpwd
 
 function steeef_precmd {
     # check for untracked files or updated submodules, since vcs_info doesn't
-    if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) || -n $(git ls-files -m --exclude-standard 2> /dev/null) ]]; then
+    if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
         PR_GIT_UPDATE=1
         FMT_BRANCH="(%{$fg[magenta]%}%b%u%c%{$fg[red]%}●${PR_RST})"
     else

From 7405f5d9ff29f42e934fa5f3c87401437c16aedd Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 1 Oct 2010 14:40:06 -0700
Subject: [PATCH 04/10] fix untracked files checking

---
 themes/steeef.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index a43192743..8c4c80265 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -66,7 +66,7 @@ add-zsh-hook chpwd steeef_chpwd
 
 function steeef_precmd {
     # check for untracked files or updated submodules, since vcs_info doesn't
-    if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+    if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
         PR_GIT_UPDATE=1
         FMT_BRANCH="(%{$fg[magenta]%}%b%u%c%{$fg[red]%}●${PR_RST})"
     else

From 6d5e4eaebcde1c48413f89b4554983f489e4b017 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Mon, 4 Oct 2010 18:05:01 -0700
Subject: [PATCH 05/10] use 256 colors, if available

---
 themes/steeef.zsh-theme | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 8c4c80265..d8f9306cd 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -19,6 +19,20 @@ colors
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
+#use extended color pallete if available
+if [ $TERM = "xterm-256color" ]; then
+    turquoise="%F{81}"
+    orange="%F{166}"
+    purple="%F{135}"
+    hotpink="%F{161}"
+    limegreen="%F{118}"
+else
+    turquoise="$fg[cyan]"
+    orange="$fg[yellow]"
+    purple="$fg[magenta]"
+    hotpink="$fg[red]"
+    limegreen="$fg[green]"
+fi
 
 # enable VCS systems you use
 zstyle ':vcs_info:*' enable git svn
@@ -35,10 +49,10 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
 # %R - repository path
 # %S - path in the repository
 PR_RST="%{${reset_color}%}"
-FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
-FMT_ACTION="(%{$fg[green]%}%a${PR_RST})"
-FMT_UNSTAGED="%{$fg[yellow]%}●"
-FMT_STAGED="%{$fg[green]%}●"
+FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
+FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
+FMT_UNSTAGED="%{$orange%}●"
+FMT_STAGED="%{$limegreen%}●"
 
 zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
 zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
@@ -68,9 +82,9 @@ function steeef_precmd {
     # check for untracked files or updated submodules, since vcs_info doesn't
     if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
         PR_GIT_UPDATE=1
-        FMT_BRANCH="(%{$fg[magenta]%}%b%u%c%{$fg[red]%}●${PR_RST})"
+        FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
     else
-        FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
+        FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
     fi
     zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
 
@@ -82,5 +96,5 @@ function steeef_precmd {
 add-zsh-hook precmd steeef_precmd
 
 PROMPT=$'
-%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}%~%{$reset_color%} $vcs_info_msg_0_
+%{$purple%}%n%{$reset_color%} at %{$orange%}%m%{$reset_color%} in %{$limegreen%}%~%{$reset_color%} $vcs_info_msg_0_
 $(virtualenv_info)$ '

From c6b339f532b05e907b0c554000643db5e896a75f Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Mon, 4 Oct 2010 22:08:38 -0700
Subject: [PATCH 06/10] merge master

---
 themes/steeef.zsh-theme | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index d8f9306cd..a5cf0f9a1 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -79,16 +79,16 @@ function steeef_chpwd {
 add-zsh-hook chpwd steeef_chpwd
 
 function steeef_precmd {
-    # check for untracked files or updated submodules, since vcs_info doesn't
-    if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
-        PR_GIT_UPDATE=1
-        FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
-    else
-        FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
-    fi
-    zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
-
     if [[ -n "$PR_GIT_UPDATE" ]] ; then
+        # check for untracked files or updated submodules, since vcs_info doesn't
+        if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+            PR_GIT_UPDATE=1
+            FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
+        else
+            FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
+        fi
+        zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+
         vcs_info 'prompt'
         PR_GIT_UPDATE=
     fi

From 9b6dd1cd48a549d2868cfe16073bbd04357e27e5 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 22 Oct 2010 10:39:33 -0700
Subject: [PATCH 07/10] merge with master

---
 themes/steeef.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index a5cf0f9a1..07c1d3def 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -20,7 +20,7 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 #use extended color pallete if available
-if [ $TERM = "xterm-256color" ]; then
+if [ $TERM = "xterm-256color" || $TERM = "linux" || $TERM = "rxvt-256color" || $TERM = "rxvt-unicode-256color" ]; then
     turquoise="%F{81}"
     orange="%F{166}"
     purple="%F{135}"

From 810b8f5ce8a58b03afba4e6ec5937e2cd0bcab5c Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 22 Oct 2010 10:42:49 -0700
Subject: [PATCH 08/10] merge with master

---
 themes/steeef.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 07c1d3def..6bca57eec 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -20,7 +20,7 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 #use extended color pallete if available
-if [ $TERM = "xterm-256color" || $TERM = "linux" || $TERM = "rxvt-256color" || $TERM = "rxvt-unicode-256color" ]; then
+if [ [ $TERM = "xterm-256color" ] || [ $TERM = "linux"] || [ $TERM = "rxvt-256color" ] || [ $TERM = "rxvt-unicode-256color" ] ]; then
     turquoise="%F{81}"
     orange="%F{166}"
     purple="%F{135}"

From d2bfdc2d89cb08a870169af4f394f27d2b9c0aed Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 22 Oct 2010 10:51:58 -0700
Subject: [PATCH 09/10] merge theme fixes from master

---
 themes/steeef.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 6bca57eec..f81300242 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -20,7 +20,7 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 #use extended color pallete if available
-if [ [ $TERM = "xterm-256color" ] || [ $TERM = "linux"] || [ $TERM = "rxvt-256color" ] || [ $TERM = "rxvt-unicode-256color" ] ]; then
+if [[ $TERM = *256color* || $TERM = "linux" ]]; then
     turquoise="%F{81}"
     orange="%F{166}"
     purple="%F{135}"

From 4ff0136079b8ffe29e0990d0a0ce8876554aa0d5 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 22 Oct 2010 11:34:52 -0700
Subject: [PATCH 10/10] merge from master

---
 themes/steeef.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index f81300242..a2583b028 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -20,7 +20,7 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 #use extended color pallete if available
-if [[ $TERM = *256color* || $TERM = "linux" ]]; then
+if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
     turquoise="%F{81}"
     orange="%F{166}"
     purple="%F{135}"