From 6e4243eb88de15052cd8846891abcd3f9a45e7f3 Mon Sep 17 00:00:00 2001
From: Ryan Neufeld <ryan@neucode.org>
Date: Sat, 22 Oct 2011 12:00:35 -0700
Subject: [PATCH 1/8] Theme based off of alanpeabody. Adds SVN support to right
 prompt.

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

diff --git a/themes/ryanneufeld.zsh-theme b/themes/ryanneufeld.zsh-theme
new file mode 100644
index 000000000..269782d79
--- /dev/null
+++ b/themes/ryanneufeld.zsh-theme
@@ -0,0 +1,39 @@
+svn_prompt_status() {
+        [ -d "./.svn" ] || return
+
+        base_dir="."
+        while [ -d "$base_dir/.svn" ]; do base_dir="$base_dir/.."; done
+        base_dir=$(stat -F "$base_dir")
+
+        rev=$(svn info ${base_dir} | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print r"/"$0 }')
+        echo "{" ${rev} "}"
+}
+
+rvm_prompt_status() {
+	if [ "" -ne "$(rvm-prompt i v g)" ]; then
+		 echo "<"$(rvm-prompt i v g)">"
+	fi
+}
+
+local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
+local pwd='%{$fg[blue]%}%~%{$reset_color%}'
+local rvm='%{$fg[green]%}$(rvm_prompt_status)%{$reset_color%}'
+local svn='%{$fg[green]%}$(svn_prompt_status)%{$reset_color%}'
+local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
+local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚ "
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹ "
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖ "
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜ "
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═ "
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭ "
+
+PROMPT="${user} ${pwd}$ "
+RPROMPT="${return_code} ${git_branch} ${svn} ${rvm}"
+

From 5c63939c0be2333520a374e607b2470c77ec0389 Mon Sep 17 00:00:00 2001
From: Ryan Neufeld <ryan@neufeldmail.com>
Date: Tue, 25 Oct 2011 13:17:52 -0700
Subject: [PATCH 2/8] check for existence of rvm-prompt before running it.

---
 themes/ryanneufeld.zsh-theme | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/themes/ryanneufeld.zsh-theme b/themes/ryanneufeld.zsh-theme
index 269782d79..81467534c 100644
--- a/themes/ryanneufeld.zsh-theme
+++ b/themes/ryanneufeld.zsh-theme
@@ -10,8 +10,10 @@ svn_prompt_status() {
 }
 
 rvm_prompt_status() {
-	if [ "" -ne "$(rvm-prompt i v g)" ]; then
-		 echo "<"$(rvm-prompt i v g)">"
+	if [ -f "$(which rvm-prompt)"]; then
+		if [ "" -ne "$(rvm-prompt i v g)" ]; then
+			 echo "<"$(rvm-prompt i v g)">"
+		fi
 	fi
 }
 

From 93f5c96c15e940b2e1f814b9de018fceb5223066 Mon Sep 17 00:00:00 2001
From: Ryan Neufeld <ryan@neufeldmail.com>
Date: Tue, 25 Oct 2011 13:23:28 -0700
Subject: [PATCH 3/8] Whitespace matters

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

diff --git a/themes/ryanneufeld.zsh-theme b/themes/ryanneufeld.zsh-theme
index 81467534c..e8fcbbac6 100644
--- a/themes/ryanneufeld.zsh-theme
+++ b/themes/ryanneufeld.zsh-theme
@@ -10,7 +10,7 @@ svn_prompt_status() {
 }
 
 rvm_prompt_status() {
-	if [ -f "$(which rvm-prompt)"]; then
+	if [ -f "$(which rvm-prompt)" ]; then
 		if [ "" -ne "$(rvm-prompt i v g)" ]; then
 			 echo "<"$(rvm-prompt i v g)">"
 		fi

From 5f195a1aec6a68e9a8fcbf8f1eec6f28929227df Mon Sep 17 00:00:00 2001
From: Ryan Neufeld <ryan@neucode.org>
Date: Thu, 16 Feb 2012 21:16:37 -0800
Subject: [PATCH 4/8] Removing rvm from prompt and custom svn command, using
 plugin instead

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

diff --git a/themes/ryanneufeld.zsh-theme b/themes/ryanneufeld.zsh-theme
index e8fcbbac6..5e94f69a4 100644
--- a/themes/ryanneufeld.zsh-theme
+++ b/themes/ryanneufeld.zsh-theme
@@ -1,26 +1,6 @@
-svn_prompt_status() {
-        [ -d "./.svn" ] || return
-
-        base_dir="."
-        while [ -d "$base_dir/.svn" ]; do base_dir="$base_dir/.."; done
-        base_dir=$(stat -F "$base_dir")
-
-        rev=$(svn info ${base_dir} | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print r"/"$0 }')
-        echo "{" ${rev} "}"
-}
-
-rvm_prompt_status() {
-	if [ -f "$(which rvm-prompt)" ]; then
-		if [ "" -ne "$(rvm-prompt i v g)" ]; then
-			 echo "<"$(rvm-prompt i v g)">"
-		fi
-	fi
-}
-
 local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
 local pwd='%{$fg[blue]%}%~%{$reset_color%}'
-local rvm='%{$fg[green]%}$(rvm_prompt_status)%{$reset_color%}'
-local svn='%{$fg[green]%}$(svn_prompt_status)%{$reset_color%}'
+local svn='%{$fg[green]%}$(svn_prompt_info)%{$reset_color%}'
 local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
 local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
 
@@ -37,5 +17,5 @@ ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═ "
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭ "
 
 PROMPT="${user} ${pwd}$ "
-RPROMPT="${return_code} ${git_branch} ${svn} ${rvm}"
+RPROMPT="${return_code} ${git_branch} ${svn}"
 

From 439ef7f74c696b493901d872676f4a0686005401 Mon Sep 17 00:00:00 2001
From: Ryan Neufeld <ryan@neucode.org>
Date: Thu, 16 Feb 2012 21:19:50 -0800
Subject: [PATCH 5/8] Adding revision number to svn prompt

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

diff --git a/themes/ryanneufeld.zsh-theme b/themes/ryanneufeld.zsh-theme
index 5e94f69a4..027774581 100644
--- a/themes/ryanneufeld.zsh-theme
+++ b/themes/ryanneufeld.zsh-theme
@@ -1,6 +1,6 @@
 local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
 local pwd='%{$fg[blue]%}%~%{$reset_color%}'
-local svn='%{$fg[green]%}$(svn_prompt_info)%{$reset_color%}'
+local svn='%{$fg[green]%}$(svn_prompt_info):$(svn_get_rev_nr)%{$reset_color%}'
 local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
 local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
 

From 2eb7bbd6fcbcf4c71651dd8d74363723aff04469 Mon Sep 17 00:00:00 2001
From: Ryan Neufeld <ryan@neucode.org>
Date: Fri, 17 Feb 2012 10:23:49 -0800
Subject: [PATCH 6/8] updating svn config

---
 themes/ryanneufeld.zsh-theme | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/themes/ryanneufeld.zsh-theme b/themes/ryanneufeld.zsh-theme
index 027774581..de0afa00c 100644
--- a/themes/ryanneufeld.zsh-theme
+++ b/themes/ryanneufeld.zsh-theme
@@ -1,6 +1,6 @@
 local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
 local pwd='%{$fg[blue]%}%~%{$reset_color%}'
-local svn='%{$fg[green]%}$(svn_prompt_info):$(svn_get_rev_nr)%{$reset_color%}'
+local svn='$(svn_prompt_info)$(svn_get_rev_nr)%{$reset_color%}'
 local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
 local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
 
@@ -9,6 +9,12 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
+ZSH_THEME_SVN_PROMPT_PREFIX="%{$fg[blue]%}"
+ZSH_THEME_SVN_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%}"
+ZSH_THEME_SVN_PROMPT_CLEAN="%{$fg[green]%}"
+
+
 ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚ "
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹ "
 ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖ "

From 86efc5bac8d32ec6e294d8b9b2a42b056cf34ab9 Mon Sep 17 00:00:00 2001
From: Ryan Neufeld <ryan@neufeldmail.com>
Date: Thu, 4 Oct 2012 14:37:56 -0700
Subject: [PATCH 7/8] turning off svn prompt

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

diff --git a/themes/ryanneufeld.zsh-theme b/themes/ryanneufeld.zsh-theme
index de0afa00c..a78e50d86 100644
--- a/themes/ryanneufeld.zsh-theme
+++ b/themes/ryanneufeld.zsh-theme
@@ -23,5 +23,5 @@ ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═ "
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭ "
 
 PROMPT="${user} ${pwd}$ "
-RPROMPT="${return_code} ${git_branch} ${svn}"
+RPROMPT="${return_code} ${git_branch}"
 

From 1313480af8eb7272c7cf00b02b3461f7a5f2acf1 Mon Sep 17 00:00:00 2001
From: Ryan Neufeld <ryan@neufeldmail.com>
Date: Tue, 20 Nov 2012 14:08:16 -0800
Subject: [PATCH 8/8] Update README.textile

---
 README.textile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.textile b/README.textile
index a38e2d7cf..ccb661867 100644
--- a/README.textile
+++ b/README.textile
@@ -13,18 +13,18 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://github.com/ryanneufeld/oh-my-zsh/raw/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/ryanneufeld/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
 
 1. Clone the repository
 
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
+  @git clone git://github.com/ryanneufeld/oh-my-zsh.git ~/.oh-my-zsh@
 
 2. Create a new zsh config by copying the zsh template we've provided.
 
@@ -47,7 +47,7 @@ h2. Usage
 * enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
 ** example: @plugins=(git osx ruby)@
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
-** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
+** Take a look at the "current themes":https://wiki.github.com/ryanneufeld/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
 * much much more...  take a look at @lib/@ what _Oh My Zsh_ offers...
 
 h2. Useful
@@ -81,6 +81,6 @@ h2. Contributors
 
 This project wouldn't exist without all of our awesome users and contributors.
 
-* "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
+* "View our growing list of contributors":https://github.com/ryanneufeld/oh-my-zsh/contributors
 
 Thank you so much!