From 8c682d2abddd006398e9aed0a61212b4648b5a59 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Mon, 14 Sep 2015 17:22:01 +0100
Subject: Basic approach to format strings

---
 radar-base.sh         |  17 ++++++++
 test-format-config.sh | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100755 test-format-config.sh

diff --git a/radar-base.sh b/radar-base.sh
index d9cd8f5..e21122a 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -65,6 +65,8 @@ prepare_zsh_colors() {
   COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"%{$reset_color%}$italic_m%{$reset_color%}"}"
 
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-""}"
+
   RESET_COLOR_LOCAL="%{${GIT_RADAR_COLOR_LOCAL_RESET:-$reset_color}%}"
   RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}"
   RESET_COLOR_CHANGES="%{${GIT_RADAR_COLOR_CHANGES_RESET:-$reset_color}%}"
@@ -484,3 +486,18 @@ show_remote_status() {
   fi
   return 0
 }
+
+render_prompt() {
+  if [[ $PROMPT_FORMAT =~ ^.*%{remote}.*$ ]]; then
+    zsh_color_remote_commits
+  fi
+  if [[ $PROMPT_FORMAT =~ ^.*%{branch}.*$ ]]; then
+    zsh_readable_branch_name
+  fi
+  if [[ $PROMPT_FORMAT =~ ^.*%{local}.*$ ]]; then
+    zsh_color_local_commits
+  fi
+  if [[ $PROMPT_FORMAT =~ ^.*%{changes}.*$ ]]; then
+    zsh_color_changes_status
+  fi
+}
diff --git a/test-format-config.sh b/test-format-config.sh
new file mode 100755
index 0000000..17c4bd6
--- /dev/null
+++ b/test-format-config.sh
@@ -0,0 +1,111 @@
+scriptDir="$(cd "$(dirname "$0")"; pwd)"
+
+source "$scriptDir/radar-base.sh"
+
+cd_to_tmp() {
+  tmpfile="/tmp/git-prompt-tests-$(time_now)$1"
+  mkdir -p "$tmpfile"
+  cd "$tmpfile"
+}
+
+rm_tmp() {
+  cd $scriptDir
+  rm -rf /tmp/git-prompt-tests*
+}
+
+unset_colours() {
+  export COLOR_REMOTE_AHEAD=""
+  export COLOR_REMOTE_BEHIND=""
+  export COLOR_REMOTE_DIVERGED=""
+  export COLOR_REMOTE_NOT_UPSTREAM=""
+
+  export COLOR_LOCAL_AHEAD=""
+  export COLOR_LOCAL_BEHIND=""
+  export COLOR_LOCAL_DIVERGED=""
+
+  export COLOR_CHANGES_STAGED=""
+  export COLOR_CHANGES_UNSTAGED=""
+  export COLOR_CHANGES_CONFLICTED=""
+  export COLOR_CHANGES_UNTRACKED=""
+
+  export COLOR_BRANCH=""
+  export MASTER_SYMBOL="m"
+
+  export RESET_COLOR_LOCAL=""
+  export RESET_COLOR_REMOTE=""
+  export RESET_COLOR_CHANGES=""
+  export RESET_COLOR_BRANCH=""
+}
+
+prepare_test_repo() {
+  cd_to_tmp "remote"
+
+  git init --quiet
+  touch README
+  git add .
+  git commit -m "initial commit" --quiet
+  origin="$(pwd)"
+
+  cd_to_tmp "new"
+  git init --quiet
+  git remote add origin $origin
+  git fetch origin --quiet
+  git checkout master --quiet
+  git checkout -b foo --quiet
+  git push --quiet -u origin foo >/dev/null
+  repo="$(pwd)"
+
+  cd "$origin"
+  echo "foo" > foo
+  git add .
+  git commit -m "remote commit" --quiet
+  cd "$repo"
+  echo "foo" > foo
+  git add .
+  git commit -m "local commit" --quiet
+  echo "foo" > bar
+  git fetch origin --quiet
+}
+
+test_all_options_set_config() {
+  prepare_test_repo
+
+  export GIT_RADAR_FORMAT="%{remote}%{branch}%{local}%{changes}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "$prompt" "m 1 → foo 1↑ 1A"
+
+  export GIT_RADAR_FORMAT="%{remote}%{branch}%{changes}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "$prompt" "m 1 → foo 1A"
+
+  export GIT_RADAR_FORMAT="%{branch}%{local}%{changes}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "$prompt" "foo 1↑ 1A"
+
+  export GIT_RADAR_FORMAT="%{branch}%{changes}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "$prompt" "foo 1A"
+
+  export GIT_RADAR_FORMAT="%{branch}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "$prompt" "foo"
+
+  rm_tmp
+}
+
+. ./shunit/shunit2
-- 
cgit v1.2.3


From 5c68ecdd5d388a4a5604c0f377c4b917eb0dcfff Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Tue, 15 Sep 2015 10:04:15 +0100
Subject: Make render replace rather than append, so we can reorder

---
 radar-base.sh         | 21 ++++++++++++++++-----
 test                  |  1 +
 test-format-config.sh | 27 +++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index e21122a..066da99 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -488,16 +488,27 @@ show_remote_status() {
 }
 
 render_prompt() {
-  if [[ $PROMPT_FORMAT =~ ^.*%{remote}.*$ ]]; then
-    zsh_color_remote_commits
+  output="$PROMPT_FORMAT"
+  branch_sed=""
+  remote_sed=""
+  local_sed=""
+  changes_sed=""
+  if [[ $output =~ ^.*%{remote}.*$ ]]; then
+    remote_sed="s/%{remote}/$(zsh_color_remote_commits)/"
   fi
   if [[ $PROMPT_FORMAT =~ ^.*%{branch}.*$ ]]; then
-    zsh_readable_branch_name
+    branch_sed="s/%{branch}/$(zsh_readable_branch_name)/"
   fi
   if [[ $PROMPT_FORMAT =~ ^.*%{local}.*$ ]]; then
-    zsh_color_local_commits
+    local_sed="s/%{local}/$(zsh_color_local_commits)/"
   fi
   if [[ $PROMPT_FORMAT =~ ^.*%{changes}.*$ ]]; then
-    zsh_color_changes_status
+    changes_sed="s/%{changes}/$(zsh_color_changes_status)/"
   fi
+
+  sed \
+    -e "$remote_sed" \
+    -e "$branch_sed" \
+    -e "$changes_sed" \
+    -e "$local_sed" <<<"$output"
 }
diff --git a/test b/test
index 4efeafd..87cba9b 100755
--- a/test
+++ b/test
@@ -7,3 +7,4 @@
 ./test-files.sh
 ./test-status.sh
 ./test-colors.sh
+./test-format-config.sh
diff --git a/test-format-config.sh b/test-format-config.sh
index 17c4bd6..e595703 100755
--- a/test-format-config.sh
+++ b/test-format-config.sh
@@ -108,4 +108,31 @@ test_all_options_set_config() {
   rm_tmp
 }
 
+test_reorder_parts() {
+  prepare_test_repo
+
+  export GIT_RADAR_FORMAT="%{branch}%{local}%{changes}%{remote}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "foo 1↑ 1Am 1 → " "$prompt"
+
+  export GIT_RADAR_FORMAT="%{local}%{changes}%{remote}%{branch}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals " 1↑ 1Am 1 → foo" "$prompt"
+
+  export GIT_RADAR_FORMAT="%{changes}%{remote}%{branch}%{local}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals " 1Am 1 → foo 1↑" "$prompt"
+
+  rm_tmp
+}
+
 . ./shunit/shunit2
-- 
cgit v1.2.3


From 6b6467dd66d7d8bd7b2ac357063876f9bed3a3cb Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Wed, 16 Sep 2015 15:37:41 +0100
Subject: Use general render functions rather than zsh specific

---
 radar-base.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index 066da99..b7231de 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -494,16 +494,16 @@ render_prompt() {
   local_sed=""
   changes_sed=""
   if [[ $output =~ ^.*%{remote}.*$ ]]; then
-    remote_sed="s/%{remote}/$(zsh_color_remote_commits)/"
+    remote_sed="s/%{remote}/$(color_remote_commits)/"
   fi
   if [[ $PROMPT_FORMAT =~ ^.*%{branch}.*$ ]]; then
-    branch_sed="s/%{branch}/$(zsh_readable_branch_name)/"
+    branch_sed="s/%{branch}/$(readable_branch_name)/"
   fi
   if [[ $PROMPT_FORMAT =~ ^.*%{local}.*$ ]]; then
-    local_sed="s/%{local}/$(zsh_color_local_commits)/"
+    local_sed="s/%{local}/$(color_local_commits)/"
   fi
   if [[ $PROMPT_FORMAT =~ ^.*%{changes}.*$ ]]; then
-    changes_sed="s/%{changes}/$(zsh_color_changes_status)/"
+    changes_sed="s/%{changes}/$(color_changes_status)/"
   fi
 
   sed \
-- 
cgit v1.2.3


From 5d2bded520a2649a3cc19b6c767fa23d9b00555e Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 09:45:57 +0100
Subject: Make providing a prefix and suffix to changes possible

---
 radar-base.sh         |  4 ++--
 test-format-config.sh | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index b7231de..6458446 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -502,8 +502,8 @@ render_prompt() {
   if [[ $PROMPT_FORMAT =~ ^.*%{local}.*$ ]]; then
     local_sed="s/%{local}/$(color_local_commits)/"
   fi
-  if [[ $PROMPT_FORMAT =~ ^.*%{changes}.*$ ]]; then
-    changes_sed="s/%{changes}/$(color_changes_status)/"
+  if [[ $PROMPT_FORMAT =~ %{([^%{}]{1,}:){0,1}changes(:[^%{}]{1,}){0,1}} ]]; then
+    changes_sed="s/%{\(\([^%^{^}]*\)\:\)\{0,1\}changes\(\:\([^%^{^}]*\)\)\{0,1\}}/\2$(color_changes_status)\4/"
   fi
 
   sed \
diff --git a/test-format-config.sh b/test-format-config.sh
index e595703..ce4645e 100755
--- a/test-format-config.sh
+++ b/test-format-config.sh
@@ -135,4 +135,24 @@ test_reorder_parts() {
   rm_tmp
 }
 
+test_prefix_and_suffix() {
+  prepare_test_repo
+
+  export GIT_RADAR_FORMAT="%{changes}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals " 1A" "$prompt"
+
+  export GIT_RADAR_FORMAT="%{[:changes:]}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "[ 1A]" "$prompt"
+
+  rm_tmp
+}
+
 . ./shunit/shunit2
-- 
cgit v1.2.3


From 3e809c83741cc6466090169404dd0aa2672d29ac Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 10:40:06 +0100
Subject: Add prefix/suffixing to local diff

---
 radar-base.sh         |  4 ++--
 test-format-config.sh | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index 6458446..665b30a 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -499,8 +499,8 @@ render_prompt() {
   if [[ $PROMPT_FORMAT =~ ^.*%{branch}.*$ ]]; then
     branch_sed="s/%{branch}/$(readable_branch_name)/"
   fi
-  if [[ $PROMPT_FORMAT =~ ^.*%{local}.*$ ]]; then
-    local_sed="s/%{local}/$(color_local_commits)/"
+  if [[ $PROMPT_FORMAT =~ %{([^%{}]{1,}:){0,1}local(:[^%{}]{1,}){0,1}} ]]; then
+    local_sed="s/%{\(\([^%^{^}]*\)\:\)\{0,1\}local\(\:\([^%^{^}]*\)\)\{0,1\}}/\2$(color_local_commits)\4/"
   fi
   if [[ $PROMPT_FORMAT =~ %{([^%{}]{1,}:){0,1}changes(:[^%{}]{1,}){0,1}} ]]; then
     changes_sed="s/%{\(\([^%^{^}]*\)\:\)\{0,1\}changes\(\:\([^%^{^}]*\)\)\{0,1\}}/\2$(color_changes_status)\4/"
diff --git a/test-format-config.sh b/test-format-config.sh
index ce4645e..2a5226a 100755
--- a/test-format-config.sh
+++ b/test-format-config.sh
@@ -135,7 +135,7 @@ test_reorder_parts() {
   rm_tmp
 }
 
-test_prefix_and_suffix() {
+test_prefix_and_suffix_changes() {
   prepare_test_repo
 
   export GIT_RADAR_FORMAT="%{changes}"
@@ -155,4 +155,24 @@ test_prefix_and_suffix() {
   rm_tmp
 }
 
+test_prefix_and_suffix_local() {
+  prepare_test_repo
+
+  export GIT_RADAR_FORMAT="%{local}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals " 1↑" "$prompt"
+
+  export GIT_RADAR_FORMAT="%{[:local:]}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "[ 1↑]" "$prompt"
+
+  rm_tmp
+}
+
 . ./shunit/shunit2
-- 
cgit v1.2.3


From 01bcac0242e4b44c796cdd88c1f87c66c5fdf158 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 10:46:26 +0100
Subject: Reduce rewording in regexes

---
 radar-base.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index 665b30a..a1ea097 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -493,17 +493,23 @@ render_prompt() {
   remote_sed=""
   local_sed=""
   changes_sed=""
+
+  if_pre="%{([^%{}]{1,}:){0,1}"
+  if_post="(:[^%{}]{1,}){0,1}}"
+  sed_pre="%{\(\([^%^{^}]*\)\:\)\{0,1\}"
+  sed_post="\(\:\([^%^{^}]*\)\)\{0,1\}}"
+
   if [[ $output =~ ^.*%{remote}.*$ ]]; then
     remote_sed="s/%{remote}/$(color_remote_commits)/"
   fi
   if [[ $PROMPT_FORMAT =~ ^.*%{branch}.*$ ]]; then
     branch_sed="s/%{branch}/$(readable_branch_name)/"
   fi
-  if [[ $PROMPT_FORMAT =~ %{([^%{}]{1,}:){0,1}local(:[^%{}]{1,}){0,1}} ]]; then
-    local_sed="s/%{\(\([^%^{^}]*\)\:\)\{0,1\}local\(\:\([^%^{^}]*\)\)\{0,1\}}/\2$(color_local_commits)\4/"
+  if [[ $PROMPT_FORMAT =~ ${if_pre}local${if_post} ]]; then
+    local_sed="s/${sed_pre}local${sed_post}/\2$(color_local_commits)\4/"
   fi
-  if [[ $PROMPT_FORMAT =~ %{([^%{}]{1,}:){0,1}changes(:[^%{}]{1,}){0,1}} ]]; then
-    changes_sed="s/%{\(\([^%^{^}]*\)\:\)\{0,1\}changes\(\:\([^%^{^}]*\)\)\{0,1\}}/\2$(color_changes_status)\4/"
+  if [[ $PROMPT_FORMAT =~ ${if_pre}changes${if_post} ]]; then
+    changes_sed="s/${sed_pre}changes${sed_post}/\2$(color_changes_status)\4/"
   fi
 
   sed \
-- 
cgit v1.2.3


From 7fd5ee18bb412e3ee4db694f551a9b9421e18f89 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 10:49:37 +0100
Subject: Add prefix and suffix to branch name render

---
 radar-base.sh         |  4 ++--
 test-format-config.sh | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index a1ea097..be92bb2 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -502,8 +502,8 @@ render_prompt() {
   if [[ $output =~ ^.*%{remote}.*$ ]]; then
     remote_sed="s/%{remote}/$(color_remote_commits)/"
   fi
-  if [[ $PROMPT_FORMAT =~ ^.*%{branch}.*$ ]]; then
-    branch_sed="s/%{branch}/$(readable_branch_name)/"
+  if [[ $PROMPT_FORMAT =~ ${if_pre}branch${if_post} ]]; then
+    branch_sed="s/${sed_pre}branch${sed_post}/\2$(readable_branch_name)\4/"
   fi
   if [[ $PROMPT_FORMAT =~ ${if_pre}local${if_post} ]]; then
     local_sed="s/${sed_pre}local${sed_post}/\2$(color_local_commits)\4/"
diff --git a/test-format-config.sh b/test-format-config.sh
index 2a5226a..4283025 100755
--- a/test-format-config.sh
+++ b/test-format-config.sh
@@ -175,4 +175,24 @@ test_prefix_and_suffix_local() {
   rm_tmp
 }
 
+test_prefix_and_suffix_branch() {
+  prepare_test_repo
+
+  export GIT_RADAR_FORMAT="%{branch}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "foo" "$prompt"
+
+  export GIT_RADAR_FORMAT="%{[:branch:]}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "[foo]" "$prompt"
+
+  rm_tmp
+}
+
 . ./shunit/shunit2
-- 
cgit v1.2.3


From d2c7ed085ff711a9f34fc1b0f521bcde253f19c5 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 10:55:09 +0100
Subject: Add prefix and suffixing to remote diff render

---
 radar-base.sh         |  4 ++--
 test-format-config.sh | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index be92bb2..9e233ea 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -499,8 +499,8 @@ render_prompt() {
   sed_pre="%{\(\([^%^{^}]*\)\:\)\{0,1\}"
   sed_post="\(\:\([^%^{^}]*\)\)\{0,1\}}"
 
-  if [[ $output =~ ^.*%{remote}.*$ ]]; then
-    remote_sed="s/%{remote}/$(color_remote_commits)/"
+  if [[ $output =~ ${if_pre}remote${if_post} ]]; then
+    remote_sed="s/${sed_pre}remote${sed_post}/\2$(color_remote_commits)\4/"
   fi
   if [[ $PROMPT_FORMAT =~ ${if_pre}branch${if_post} ]]; then
     branch_sed="s/${sed_pre}branch${sed_post}/\2$(readable_branch_name)\4/"
diff --git a/test-format-config.sh b/test-format-config.sh
index 4283025..8b786c9 100755
--- a/test-format-config.sh
+++ b/test-format-config.sh
@@ -195,4 +195,24 @@ test_prefix_and_suffix_branch() {
   rm_tmp
 }
 
+test_prefix_and_suffix_remote() {
+  prepare_test_repo
+
+  export GIT_RADAR_FORMAT="%{remote}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "m 1 → " "$prompt"
+
+  export GIT_RADAR_FORMAT="%{[:remote:]}"
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "[m 1 → ]" "$prompt"
+
+  rm_tmp
+}
+
 . ./shunit/shunit2
-- 
cgit v1.2.3


From b4a48dd6b781e357fc513b1f6dd668d8933f3660 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 11:03:44 +0100
Subject: Switch zsh to use the new render prompt

---
 prompt.zsh    | 9 +--------
 radar-base.sh | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/prompt.zsh b/prompt.zsh
index 2d31820..c2b175a 100755
--- a/prompt.zsh
+++ b/prompt.zsh
@@ -8,12 +8,5 @@ if is_repo; then
   autoload colors && colors
 
   prepare_zsh_colors
-  printf '%s' "%{$fg_bold[black]%} git:(%{$reset_color%}"
-  if show_remote_status $args; then
-    color_remote_commits
-  fi
-  readable_branch_name
-  color_local_commits
-  printf '%s' "%{$fg_bold[black]%})%{$reset_color%}"
-  color_changes_status
+  render_prompt
 fi
diff --git a/radar-base.sh b/radar-base.sh
index 9e233ea..8a7faaf 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -65,7 +65,7 @@ prepare_zsh_colors() {
   COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"%{$reset_color%}$italic_m%{$reset_color%}"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-""}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote}%{branch}%{local}$fg_bold[grey])$reset_color%{changes}"}"
 
   RESET_COLOR_LOCAL="%{${GIT_RADAR_COLOR_LOCAL_RESET:-$reset_color}%}"
   RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}"
-- 
cgit v1.2.3


From 1731759cb2a16a3814d9784bae905250c46ce36b Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 11:38:03 +0100
Subject: Switch bash to new render function

---
 prompt.bash   |  9 +--------
 radar-base.sh | 12 +++++++-----
 xargs         |  0
 3 files changed, 8 insertions(+), 13 deletions(-)
 create mode 100644 xargs

diff --git a/prompt.bash b/prompt.bash
index 51c4db7..444ad7a 100755
--- a/prompt.bash
+++ b/prompt.bash
@@ -6,12 +6,5 @@ source "$dot/radar-base.sh"
 
 if is_repo; then
   prepare_bash_colors
-  printf " \x01\033[1;30m\x02git:(\x01\033[0m\x02"
-  if show_remote_status $args; then
-    color_remote_commits
-  fi
-  readable_branch_name
-  color_local_commits
-  printf "\x01\033[1;30m\x02)\x01\033[0m\x02"
-  color_changes_status
+  render_prompt
 fi
diff --git a/radar-base.sh b/radar-base.sh
index 8a7faaf..693d763 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -31,6 +31,8 @@ prepare_bash_colors() {
   COLOR_BRANCH="\x01${GIT_RADAR_COLOR_BRANCH:-"\\033[0m"}\x02"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"\\x01\\033[0m\\x02\\xF0\\x9D\\x98\\xAE\\x01\\033[0m\\x02"}"
 
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote}%{branch}%{local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{changes}"}"
+
   RESET_COLOR_LOCAL="\x01${GIT_RADAR_COLOR_LOCAL_RESET:-"\\033[0m"}\x02"
   RESET_COLOR_REMOTE="\x01${GIT_RADAR_COLOR_REMOTE_RESET:-"\\033[0m"}\x02"
   RESET_COLOR_CHANGES="\x01${GIT_RADAR_COLOR_CHANGES_RESET:-"\\033[0m"}\x02"
@@ -512,9 +514,9 @@ render_prompt() {
     changes_sed="s/${sed_pre}changes${sed_post}/\2$(color_changes_status)\4/"
   fi
 
-  sed \
-    -e "$remote_sed" \
-    -e "$branch_sed" \
-    -e "$changes_sed" \
-    -e "$local_sed" <<<"$output"
+  printf '%b' "$output" | sed \
+                            -e "$remote_sed" \
+                            -e "$branch_sed" \
+                            -e "$changes_sed" \
+                            -e "$local_sed"
 }
diff --git a/xargs b/xargs
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3


From 49d6fcc1190066b38d1684f1cfd1d4fea3190d78 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 11:52:15 +0100
Subject: Switch local commits to use prefixes

---
 radar-base.sh         | 12 +++++-------
 test-colors.sh        | 12 ++++++------
 test-commits.sh       | 18 +++++++++---------
 test-format-config.sh | 14 +++++++-------
 4 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index 693d763..b85f75f 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -31,7 +31,7 @@ prepare_bash_colors() {
   COLOR_BRANCH="\x01${GIT_RADAR_COLOR_BRANCH:-"\\033[0m"}\x02"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"\\x01\\033[0m\\x02\\xF0\\x9D\\x98\\xAE\\x01\\033[0m\\x02"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote}%{branch}%{local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{changes}"}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote}%{branch}%{ :local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{changes}"}"
 
   RESET_COLOR_LOCAL="\x01${GIT_RADAR_COLOR_LOCAL_RESET:-"\\033[0m"}\x02"
   RESET_COLOR_REMOTE="\x01${GIT_RADAR_COLOR_REMOTE_RESET:-"\\033[0m"}\x02"
@@ -67,7 +67,7 @@ prepare_zsh_colors() {
   COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"%{$reset_color%}$italic_m%{$reset_color%}"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote}%{branch}%{local}$fg_bold[grey])$reset_color%{changes}"}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote}%{branch}%{ :local}$fg_bold[grey])$reset_color%{changes}"}"
 
   RESET_COLOR_LOCAL="%{${GIT_RADAR_COLOR_LOCAL_RESET:-$reset_color}%}"
   RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}"
@@ -406,8 +406,6 @@ zsh_color_changes_status() {
 }
 
 color_local_commits() {
-  local separator="${1:- }"
-
   local green_ahead_arrow="${COLOR_LOCAL_AHEAD}↑$RESET_COLOR_LOCAL"
   local red_behind_arrow="${COLOR_LOCAL_BEHIND}↓$RESET_COLOR_LOCAL"
   local yellow_diverged_arrow="${COLOR_LOCAL_DIVERGED}⇵$RESET_COLOR_LOCAL"
@@ -418,11 +416,11 @@ color_local_commits() {
     local_behind="$(commits_behind_of_remote "$remote_branch")"
 
     if [[ "$local_behind" -gt "0" && "$local_ahead" -gt "0" ]]; then
-      local_commits="$separator$local_behind$yellow_diverged_arrow$local_ahead"
+      local_commits="$local_behind$yellow_diverged_arrow$local_ahead"
     elif [[ "$local_behind" -gt "0" ]]; then
-      local_commits="$separator$local_behind$red_behind_arrow"
+      local_commits="$local_behind$red_behind_arrow"
     elif [[ "$local_ahead" -gt "0" ]]; then
-      local_commits="$separator$local_ahead$green_ahead_arrow"
+      local_commits="$local_ahead$green_ahead_arrow"
     fi
   fi
   printf $PRINT_F_OPTION "$local_commits"
diff --git a/test-colors.sh b/test-colors.sh
index 73c20f7..e28fb68 100755
--- a/test-colors.sh
+++ b/test-colors.sh
@@ -291,14 +291,14 @@ test_bash_colors_local() {
   git add .
   git commit -m "test commit" --quiet
 
-  printf -v expected " 1\x01local-ahead\x02↑\x01local-reset\x02"
+  printf -v expected "1\x01local-ahead\x02↑\x01local-reset\x02"
   assertEquals "$expected" "$(bash_color_local_commits)"
   assertEquals "$expected" "$(color_local_commits)"
 
   git push --quiet >/dev/null
   git reset --hard head^ --quiet >/dev/null
 
-  printf -v expected " 1\x01local-behind\x02↓\x01local-reset\x02"
+  printf -v expected "1\x01local-behind\x02↓\x01local-reset\x02"
   assertEquals "$expected" "$(bash_color_local_commits)"
   assertEquals "$expected" "$(color_local_commits)"
 
@@ -306,7 +306,7 @@ test_bash_colors_local() {
   git add .
   git commit -m "new commit" --quiet
 
-  printf -v expected " 1\x01local-diverged\x02⇵\x01local-reset\x021"
+  printf -v expected "1\x01local-diverged\x02⇵\x01local-reset\x021"
   assertEquals "$expected" "$(bash_color_local_commits)"
   assertEquals "$expected" "$(color_local_commits)"
 
@@ -337,18 +337,18 @@ test_zsh_colors_local() {
   git add .
   git commit -m "test commit" --quiet
 
-  assertEquals " 1%{local-ahead%}↑%{local-reset%}" "$(zsh_color_local_commits)"
+  assertEquals "1%{local-ahead%}↑%{local-reset%}" "$(zsh_color_local_commits)"
 
   git push --quiet >/dev/null
   git reset --hard head^ --quiet >/dev/null
 
-  assertEquals " 1%{local-behind%}↓%{local-reset%}" "$(zsh_color_local_commits)"
+  assertEquals "1%{local-behind%}↓%{local-reset%}" "$(zsh_color_local_commits)"
 
   echo "foo" > foo
   git add .
   git commit -m "new commit" --quiet
 
-  assertEquals " 1%{local-diverged%}⇵%{local-reset%}1" "$(zsh_color_local_commits)"
+  assertEquals "1%{local-diverged%}⇵%{local-reset%}1" "$(zsh_color_local_commits)"
 
   rm_tmp
 }
diff --git a/test-commits.sh b/test-commits.sh
index 1a4a86c..6c317f9 100755
--- a/test-commits.sh
+++ b/test-commits.sh
@@ -402,9 +402,9 @@ test_local_commits() {
   git add .
   git commit -m "test commit" --quiet
 
-  assertEquals " 1$up" "$(zsh_color_local_commits)"
-  assertEquals " 1$up" "$(bash_color_local_commits)"
-  assertEquals " 1$up" "$(color_local_commits)"
+  assertEquals "1$up" "$(zsh_color_local_commits)"
+  assertEquals "1$up" "$(bash_color_local_commits)"
+  assertEquals "1$up" "$(color_local_commits)"
 
   cd "$remote"
   echo "foo" > foo
@@ -414,15 +414,15 @@ test_local_commits() {
   cd "$repo"
   git fetch origin --quiet
 
-  assertEquals " 1${both}1" "$(zsh_color_local_commits)"
-  assertEquals " 1${both}1" "$(bash_color_local_commits)"
-  assertEquals " 1${both}1" "$(color_local_commits)"
+  assertEquals "1${both}1" "$(zsh_color_local_commits)"
+  assertEquals "1${both}1" "$(bash_color_local_commits)"
+  assertEquals "1${both}1" "$(color_local_commits)"
 
   git reset --hard HEAD^ --quiet
 
-  assertEquals " 1$down" "$(zsh_color_local_commits)"
-  assertEquals " 1$down" "$(bash_color_local_commits)"
-  assertEquals " 1$down" "$(color_local_commits)"
+  assertEquals "1$down" "$(zsh_color_local_commits)"
+  assertEquals "1$down" "$(bash_color_local_commits)"
+  assertEquals "1$down" "$(color_local_commits)"
 }
 
 . ./shunit/shunit2
diff --git a/test-format-config.sh b/test-format-config.sh
index 8b786c9..036a87b 100755
--- a/test-format-config.sh
+++ b/test-format-config.sh
@@ -75,7 +75,7 @@ test_all_options_set_config() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "$prompt" "m 1 → foo 1↑ 1A"
+  assertEquals "$prompt" "m 1 → foo1↑ 1A"
 
   export GIT_RADAR_FORMAT="%{remote}%{branch}%{changes}"
   prepare_zsh_colors
@@ -89,7 +89,7 @@ test_all_options_set_config() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "$prompt" "foo 1↑ 1A"
+  assertEquals "$prompt" "foo1↑ 1A"
 
   export GIT_RADAR_FORMAT="%{branch}%{changes}"
   prepare_zsh_colors
@@ -116,21 +116,21 @@ test_reorder_parts() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "foo 1↑ 1Am 1 → " "$prompt"
+  assertEquals "foo1↑ 1Am 1 → " "$prompt"
 
   export GIT_RADAR_FORMAT="%{local}%{changes}%{remote}%{branch}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals " 1↑ 1Am 1 → foo" "$prompt"
+  assertEquals "1↑ 1Am 1 → foo" "$prompt"
 
   export GIT_RADAR_FORMAT="%{changes}%{remote}%{branch}%{local}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals " 1Am 1 → foo 1↑" "$prompt"
+  assertEquals " 1Am 1 → foo1↑" "$prompt"
 
   rm_tmp
 }
@@ -163,14 +163,14 @@ test_prefix_and_suffix_local() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals " 1↑" "$prompt"
+  assertEquals "1↑" "$prompt"
 
   export GIT_RADAR_FORMAT="%{[:local:]}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "[ 1↑]" "$prompt"
+  assertEquals "[1↑]" "$prompt"
 
   rm_tmp
 }
-- 
cgit v1.2.3


From 06e6a85ebd0d1090128079d0c7e31db43b591d27 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 14:01:38 +0100
Subject: Switch remote commits to use suffixes

---
 radar-base.sh         | 12 ++++++------
 test-colors.sh        | 12 ++++++------
 test-format-config.sh | 14 +++++++-------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index b85f75f..47bcdf7 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -31,7 +31,7 @@ prepare_bash_colors() {
   COLOR_BRANCH="\x01${GIT_RADAR_COLOR_BRANCH:-"\\033[0m"}\x02"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"\\x01\\033[0m\\x02\\xF0\\x9D\\x98\\xAE\\x01\\033[0m\\x02"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote}%{branch}%{ :local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{changes}"}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote: }%{branch}%{ :local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{changes}"}"
 
   RESET_COLOR_LOCAL="\x01${GIT_RADAR_COLOR_LOCAL_RESET:-"\\033[0m"}\x02"
   RESET_COLOR_REMOTE="\x01${GIT_RADAR_COLOR_REMOTE_RESET:-"\\033[0m"}\x02"
@@ -67,7 +67,7 @@ prepare_zsh_colors() {
   COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"%{$reset_color%}$italic_m%{$reset_color%}"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote}%{branch}%{ :local}$fg_bold[grey])$reset_color%{changes}"}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote: }%{branch}%{ :local}$fg_bold[grey])$reset_color%{changes}"}"
 
   RESET_COLOR_LOCAL="%{${GIT_RADAR_COLOR_LOCAL_RESET:-$reset_color}%}"
   RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}"
@@ -445,14 +445,14 @@ color_remote_commits() {
     remote_behind="$(remote_behind_of_master "$remote_branch")"
 
     if [[ "$remote_behind" -gt "0" && "$remote_ahead" -gt "0" ]]; then
-      remote="$MASTER_SYMBOL $remote_behind $yellow_diverged_arrow $remote_ahead "
+      remote="$MASTER_SYMBOL $remote_behind $yellow_diverged_arrow $remote_ahead"
     elif [[ "$remote_ahead" -gt "0" ]]; then
-      remote="$MASTER_SYMBOL $green_ahead_arrow $remote_ahead "
+      remote="$MASTER_SYMBOL $green_ahead_arrow $remote_ahead"
     elif [[ "$remote_behind" -gt "0" ]]; then
-      remote="$MASTER_SYMBOL $remote_behind $red_behind_arrow "
+      remote="$MASTER_SYMBOL $remote_behind $red_behind_arrow"
     fi
   else
-    remote="upstream $not_upstream "
+    remote="upstream $not_upstream"
   fi
 
   printf $PRINT_F_OPTION "$remote"
diff --git a/test-colors.sh b/test-colors.sh
index e28fb68..69efc49 100755
--- a/test-colors.sh
+++ b/test-colors.sh
@@ -380,7 +380,7 @@ test_bash_colors_remote() {
   git checkout -b mybranch --quiet
   git push --quiet -u origin mybranch >/dev/null
 
-  printf -v expected "m 1 \x01remote-behind\x02→\x01remote-reset\x02 "
+  printf -v expected "m 1 \x01remote-behind\x02→\x01remote-reset\x02"
   assertEquals "$expected" "$(bash_color_remote_commits)"
   assertEquals "$expected" "$(color_remote_commits)"
 
@@ -389,14 +389,14 @@ test_bash_colors_remote() {
   git commit -m "new commit" --quiet
   git push --quiet >/dev/null
 
-  printf -v expected "m 1 \x01remote-diverged\x02⇄\x01remote-reset\x02 1 "
+  printf -v expected "m 1 \x01remote-diverged\x02⇄\x01remote-reset\x02 1"
   assertEquals "$expected" "$(bash_color_remote_commits)"
   assertEquals "$expected" "$(color_remote_commits)"
 
   git pull origin master --quiet >/dev/null
   git push --quiet >/dev/null
 
-  printf -v expected "m \x01remote-ahead\x02←\x01remote-reset\x02 2 "
+  printf -v expected "m \x01remote-ahead\x02←\x01remote-reset\x02 2"
   assertEquals "$expected" "$(bash_color_remote_commits)"
   assertEquals "$expected" "$(color_remote_commits)"
 
@@ -430,19 +430,19 @@ test_zsh_colors_remote() {
   git checkout -b mybranch --quiet
   git push --quiet -u origin mybranch >/dev/null
 
-  assertEquals "m 1 %{remote-behind%}→%{remote-reset%} " "$(zsh_color_remote_commits)"
+  assertEquals "m 1 %{remote-behind%}→%{remote-reset%}" "$(zsh_color_remote_commits)"
 
   echo "bar" > bar
   git add .
   git commit -m "new commit" --quiet
   git push --quiet >/dev/null
 
-  assertEquals "m 1 %{remote-diverged%}⇄%{remote-reset%} 1 " "$(zsh_color_remote_commits)"
+  assertEquals "m 1 %{remote-diverged%}⇄%{remote-reset%} 1" "$(zsh_color_remote_commits)"
 
   git pull origin master --quiet >/dev/null
   git push --quiet >/dev/null
 
-  assertEquals "m %{remote-ahead%}←%{remote-reset%} 2 " "$(zsh_color_remote_commits)"
+  assertEquals "m %{remote-ahead%}←%{remote-reset%} 2" "$(zsh_color_remote_commits)"
 
   rm_tmp
 }
diff --git a/test-format-config.sh b/test-format-config.sh
index 036a87b..7999560 100755
--- a/test-format-config.sh
+++ b/test-format-config.sh
@@ -75,14 +75,14 @@ test_all_options_set_config() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "$prompt" "m 1 → foo1↑ 1A"
+  assertEquals "$prompt" "m 1 →foo1↑ 1A"
 
   export GIT_RADAR_FORMAT="%{remote}%{branch}%{changes}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "$prompt" "m 1 → foo 1A"
+  assertEquals "$prompt" "m 1 →foo 1A"
 
   export GIT_RADAR_FORMAT="%{branch}%{local}%{changes}"
   prepare_zsh_colors
@@ -116,21 +116,21 @@ test_reorder_parts() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "foo1↑ 1Am 1 → " "$prompt"
+  assertEquals "foo1↑ 1Am 1 →" "$prompt"
 
   export GIT_RADAR_FORMAT="%{local}%{changes}%{remote}%{branch}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "1↑ 1Am 1 → foo" "$prompt"
+  assertEquals "1↑ 1Am 1 →foo" "$prompt"
 
   export GIT_RADAR_FORMAT="%{changes}%{remote}%{branch}%{local}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals " 1Am 1 → foo1↑" "$prompt"
+  assertEquals " 1Am 1 →foo1↑" "$prompt"
 
   rm_tmp
 }
@@ -203,14 +203,14 @@ test_prefix_and_suffix_remote() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "m 1 → " "$prompt"
+  assertEquals "m 1 →" "$prompt"
 
   export GIT_RADAR_FORMAT="%{[:remote:]}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "[m 1 → ]" "$prompt"
+  assertEquals "[m 1 →]" "$prompt"
 
   rm_tmp
 }
-- 
cgit v1.2.3


From 1537438e5798502cad17ba10cf19016e400f7c42 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 14:08:55 +0100
Subject: Switch changes status to use prefixes

---
 radar-base.sh         |  6 +++---
 test-colors.sh        |  4 ++--
 test-format-config.sh | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index 47bcdf7..054acb7 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -31,7 +31,7 @@ prepare_bash_colors() {
   COLOR_BRANCH="\x01${GIT_RADAR_COLOR_BRANCH:-"\\033[0m"}\x02"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"\\x01\\033[0m\\x02\\xF0\\x9D\\x98\\xAE\\x01\\033[0m\\x02"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote: }%{branch}%{ :local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{changes}"}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote: }%{branch}%{ :local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{ :changes}"}"
 
   RESET_COLOR_LOCAL="\x01${GIT_RADAR_COLOR_LOCAL_RESET:-"\\033[0m"}\x02"
   RESET_COLOR_REMOTE="\x01${GIT_RADAR_COLOR_REMOTE_RESET:-"\\033[0m"}\x02"
@@ -67,7 +67,7 @@ prepare_zsh_colors() {
   COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"%{$reset_color%}$italic_m%{$reset_color%}"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote: }%{branch}%{ :local}$fg_bold[grey])$reset_color%{changes}"}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote: }%{branch}%{ :local}$fg_bold[grey])$reset_color%{ :changes}"}"
 
   RESET_COLOR_LOCAL="%{${GIT_RADAR_COLOR_LOCAL_RESET:-$reset_color}%}"
   RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}"
@@ -394,7 +394,7 @@ color_changes_status() {
 
     changes="$staged_changes$conflicted_changes$unstaged_changes$untracked_changes"
   fi
-  printf $PRINT_F_OPTION "$changes"
+  printf $PRINT_F_OPTION "${changes:1}"
 }
 
 bash_color_changes_status() {
diff --git a/test-colors.sh b/test-colors.sh
index 69efc49..8cc072b 100755
--- a/test-colors.sh
+++ b/test-colors.sh
@@ -463,7 +463,7 @@ test_bash_colors_changes() {
   unstaged="1\x01changes-unstaged\x02M\x01change-reset\x02"
   staged="1\x01changes-staged\x02A\x01change-reset\x02"
 
-  printf -v expected " $staged $unstaged $untracked"
+  printf -v expected "$staged $unstaged $untracked"
   assertEquals "$expected" "$(bash_color_changes_status)"
   assertEquals "$expected" "$(color_changes_status)"
   rm_tmp
@@ -485,7 +485,7 @@ test_zsh_colors_changes() {
   unstaged="1%{changes-unstaged%}M%{change-reset%}"
   staged="1%{changes-staged%}A%{change-reset%}"
 
-  assertEquals " $staged $unstaged $untracked" "$(zsh_color_changes_status)"
+  assertEquals "$staged $unstaged $untracked" "$(zsh_color_changes_status)"
   rm_tmp
 }
 
diff --git a/test-format-config.sh b/test-format-config.sh
index 7999560..ea76405 100755
--- a/test-format-config.sh
+++ b/test-format-config.sh
@@ -75,28 +75,28 @@ test_all_options_set_config() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "$prompt" "m 1 →foo1↑ 1A"
+  assertEquals "$prompt" "m 1 →foo1↑1A"
 
   export GIT_RADAR_FORMAT="%{remote}%{branch}%{changes}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "$prompt" "m 1 →foo 1A"
+  assertEquals "$prompt" "m 1 →foo1A"
 
   export GIT_RADAR_FORMAT="%{branch}%{local}%{changes}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "$prompt" "foo1↑ 1A"
+  assertEquals "$prompt" "foo1↑1A"
 
   export GIT_RADAR_FORMAT="%{branch}%{changes}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "$prompt" "foo 1A"
+  assertEquals "$prompt" "foo1A"
 
   export GIT_RADAR_FORMAT="%{branch}"
   prepare_zsh_colors
@@ -116,21 +116,21 @@ test_reorder_parts() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "foo1↑ 1Am 1 →" "$prompt"
+  assertEquals "foo1↑1Am 1 →" "$prompt"
 
   export GIT_RADAR_FORMAT="%{local}%{changes}%{remote}%{branch}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "1↑ 1Am 1 →foo" "$prompt"
+  assertEquals "1↑1Am 1 →foo" "$prompt"
 
   export GIT_RADAR_FORMAT="%{changes}%{remote}%{branch}%{local}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals " 1Am 1 →foo1↑" "$prompt"
+  assertEquals "1Am 1 →foo1↑" "$prompt"
 
   rm_tmp
 }
@@ -143,14 +143,14 @@ test_prefix_and_suffix_changes() {
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals " 1A" "$prompt"
+  assertEquals "1A" "$prompt"
 
   export GIT_RADAR_FORMAT="%{[:changes:]}"
   prepare_zsh_colors
   unset_colours
 
   prompt="$(render_prompt)"
-  assertEquals "[ 1A]" "$prompt"
+  assertEquals "[1A]" "$prompt"
 
   rm_tmp
 }
-- 
cgit v1.2.3


From eabe1d7e855817714a9e06b59ff468951413f6c6 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 14:16:58 +0100
Subject: Further testing when not in a repo

---
 test-format-config.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test-format-config.sh b/test-format-config.sh
index ea76405..5504ebc 100755
--- a/test-format-config.sh
+++ b/test-format-config.sh
@@ -68,6 +68,22 @@ prepare_test_repo() {
 }
 
 test_all_options_set_config() {
+  cd_to_tmp "empty"
+  export GIT_RADAR_FORMAT="%{branch}%{local}%{changes}"
+  # Don't test remote as in no repo you will get upstream error message
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "$prompt" ""
+
+  export GIT_RADAR_FORMAT="%{remote}"
+  # Don't test remote as in no repo you will get upstream error message
+  prepare_zsh_colors
+  unset_colours
+
+  prompt="$(render_prompt)"
+  assertEquals "$prompt" "upstream ⚡"
   prepare_test_repo
 
   export GIT_RADAR_FORMAT="%{remote}%{branch}%{local}%{changes}"
-- 
cgit v1.2.3


From 1d713f471fd77a49bc783ba0b313ebce9de223a5 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 14:21:38 +0100
Subject: Surround non-printing chars in %{ and %}

---
 radar-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radar-base.sh b/radar-base.sh
index 054acb7..f907a0b 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -67,7 +67,7 @@ prepare_zsh_colors() {
   COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"%{$reset_color%}$italic_m%{$reset_color%}"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote: }%{branch}%{ :local}$fg_bold[grey])$reset_color%{ :changes}"}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" %{$fg_bold[grey]%}git:(%{$reset_color%}%{remote: }%{branch}%{ :local}%{$fg_bold[grey]%})%{$reset_color%}%{ :changes}"}"
 
   RESET_COLOR_LOCAL="%{${GIT_RADAR_COLOR_LOCAL_RESET:-$reset_color}%}"
   RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}"
-- 
cgit v1.2.3


From b2590d577d2428264efe2d18f2d50a296d3bcfae Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 17 Sep 2015 14:44:25 +0100
Subject: Ensure we only render prefix and suffix when we have a result

---
 radar-base.sh | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index f907a0b..d5456d0 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -500,16 +500,36 @@ render_prompt() {
   sed_post="\(\:\([^%^{^}]*\)\)\{0,1\}}"
 
   if [[ $output =~ ${if_pre}remote${if_post} ]]; then
-    remote_sed="s/${sed_pre}remote${sed_post}/\2$(color_remote_commits)\4/"
+    remote_result="$(color_remote_commits)"
+    if [[ -n "$remote_result" ]]; then
+      remote_sed="s/${sed_pre}remote${sed_post}/\2${remote_result}\4/"
+    else
+      remote_sed="s/${sed_pre}remote${sed_post}//"
+    fi
   fi
   if [[ $PROMPT_FORMAT =~ ${if_pre}branch${if_post} ]]; then
-    branch_sed="s/${sed_pre}branch${sed_post}/\2$(readable_branch_name)\4/"
+    branch_result="$(readable_branch_name)"
+    if [[ -n "$branch_result" ]]; then
+      branch_sed="s/${sed_pre}branch${sed_post}/\2${branch_result}\4/"
+    else
+      branch_sed="s/${sed_pre}branch${sed_post}//"
+    fi
   fi
   if [[ $PROMPT_FORMAT =~ ${if_pre}local${if_post} ]]; then
-    local_sed="s/${sed_pre}local${sed_post}/\2$(color_local_commits)\4/"
+    local_result="$(color_local_commits)"
+    if [[ -n "$local_result" ]]; then
+      local_sed="s/${sed_pre}local${sed_post}/\2$local_result\4/"
+    else
+      local_sed="s/${sed_pre}local${sed_post}//"
+    fi
   fi
   if [[ $PROMPT_FORMAT =~ ${if_pre}changes${if_post} ]]; then
-    changes_sed="s/${sed_pre}changes${sed_post}/\2$(color_changes_status)\4/"
+    changes_result="$(color_changes_status)"
+    if [[ -n "$changes_result" ]]; then
+      changes_sed="s/${sed_pre}changes${sed_post}/\2${changes_result}\4/"
+    else
+      changes_sed="s/${sed_pre}changes${sed_post}//"
+    fi
   fi
 
   printf '%b' "$output" | sed \
-- 
cgit v1.2.3


From a2e156cc566ce7ad927eeb203a15aebf73617f2a Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 15 Oct 2015 11:22:00 +0100
Subject: Fix invalid regex found by @slackorama

---
 radar-base.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/radar-base.sh b/radar-base.sh
index 23e3dfd..4f5a483 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -502,8 +502,9 @@ render_prompt() {
   local_sed=""
   changes_sed=""
 
-  if_pre="%{([^%{}]{1,}:){0,1}"
-  if_post="(:[^%{}]{1,}){0,1}}"
+
+  if_pre="%\{([^%{}]{1,}:){0,1}"
+  if_post="(:[^%{}]{1,}){0,1}\}"
   sed_pre="%{\(\([^%^{^}]*\)\:\)\{0,1\}"
   sed_post="\(\:\([^%^{^}]*\)\)\{0,1\}}"
 
-- 
cgit v1.2.3


From 74fb6b46bb581813efb4d55a5b770ba3ca0218f5 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 15 Oct 2015 11:25:47 +0100
Subject: Support git-flow style branches by @slackorama

---
 radar-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radar-base.sh b/radar-base.sh
index 4f5a483..258e5b1 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -517,7 +517,7 @@ render_prompt() {
     fi
   fi
   if [[ $PROMPT_FORMAT =~ ${if_pre}branch${if_post} ]]; then
-    branch_result="$(readable_branch_name)"
+    branch_result="$(readable_branch_name | sed -e 's/\//\\\//')"
     if [[ -n "$branch_result" ]]; then
       branch_sed="s/${sed_pre}branch${sed_post}/\2${branch_result}\4/"
     else
-- 
cgit v1.2.3


From 01149058a6df992547195b4147551ad7a64baf3c Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 15 Oct 2015 12:21:17 +0100
Subject: Some readme to show how to use the format string

---
 README.md | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 55 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 1538681..3ef156d 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ last few years. Maybe it can help you too.
   - [Local commits status](#local-commits-status)
   - [Remote commits status](#remote-commits-status)
   - [(Optional) Auto-fetch repos](#optional-auto-fetch-repos)
+- [Customise your prompt](#customise-your-prompt)
 - [Support](#support)
   - [Ensuring prompt execution](#ensuring-prompt-execution)
   - [Configuring colours](#configuring-colours)
@@ -120,6 +121,9 @@ Red     | Unstaged, you'll need to `git add` them before you can commit
 Grey    | Untracked, these are new files git is unaware of
 Yellow  | Conflicted, these need resolved before they can be committed
 
+The use of feature is controlled by the `GIT_RADAR_FORMAT` environment variable.
+See [Customise your prompt](#customise-your-prompt) for how to personalise this.
+
 ### Local commits status
 
 The prompt will show you the difference in commits between your branch and the
@@ -132,6 +136,9 @@ Prompt              | Meaning
 ![git:(master 3↓)]  | We have 3 commits to pull down
 ![git:(master 3⇵5)] | Our version and origins version of `master` have diverged
 
+The use of feature is controlled by the `GIT_RADAR_FORMAT` environment variable.
+See [Customise your prompt](#customise-your-prompt) for how to personalise this.
+
 ### Remote commits status
 
 The prompt will also show the difference between your branch on origin and what
@@ -146,19 +153,11 @@ Prompt                     | Meaning
 ![git:(m 4 → my-branch)]   | There are 4 commits on `origin/master` that aren't on `origin/my-branch`
 ![git:(m 1 ⇄ 2 my-branch)] | `origin/master` and `origin/my-branch` have diverged, we'll need to rebase or merge
 
-If you don't rely on this status, you can always hide this part of the prompt by calling git-radar with `--no-remote-status`.
-
-**Bash**
-```bash
-export PS1="$PS1\$(git-radar --bash --fetch --no-remote-status) "
-```
-[(note: the `\` escaping the `$` is important)](#ensuring-prompt-execution)
+The use of feature is controlled by the `GIT_RADAR_FORMAT` environment variable.
+See [Customise your prompt](#customise-your-prompt) for how to personalise this.
 
-**Zsh**
-```zsh
-export PROMPT="$PROMPT\$(git-radar --zsh --fetch --no-remote-status) "
-```
-[(note: the `\` escaping the `$` is important)](#ensuring-prompt-execution)
+If you don't rely on this status, you can always hide this part of the prompt by
+[customising your prompt](#customise-your-prompt)
 
 ### (Optional) Auto-fetch repos
 
@@ -183,6 +182,50 @@ export PROMPT="$PROMPT\$(git-radar --zsh --fetch) "
 ```
 [(note: the `\` escaping the `$` is important)](#ensuring-prompt-execution)
 
+## Customise your prompt
+
+Git Radar is highly customisable using a prompt format string. The 4 features
+above: remote commits, local commits, branch and file changes; are controlled
+by the prompt format string.
+
+Feature        | Control string
+---------------|---------------
+Remote commits | `%{remote}`
+Local commits  | `%{local}`
+Branch         | `%{branch}`
+File changes   | `%{changes}`
+
+You can create any prompt shape you prefer by exporting `GIT_RADAR_FORMAT` with
+your preferred shape. The control strings above will be replaced with the output
+of the corresponding feature.
+
+**Examples**
+
+GIT_RADAR_FORMAT                      | Result
+--------------------------------------|---------------------
+`${branch}%{local}%{changes}`         | `master1↑1M`
+`[${branch}] - %{local} - %{changes}` | `[master] - 1↑ - 1M`
+
+### Prefixing and Suffixing the features
+
+Often you will want certain parts of the prompt to only appear when there is
+content to render. For example, when in a repo you want `[branch]` but when out
+of a repo you don't want the `[]` appearing.
+
+To do this the control strings support prefixes and suffixes. Prefixes and
+Suffixes are separated from the feature name by `:` and will only render if the
+feature would render:
+
+Format: `prompt > %{prefix - :changes: - suffix}`
+
+In a repo: `prompt > prefix - 1M - suffix`
+
+Outside a repo: `prompt > `
+
+The default prompt format uses this to add spaces only if the feature would
+render. In that way the prompt always looks well spaced out no matter how many
+features are rendering.
+
 ## Support
 
 ### Ensuring prompt execution
-- 
cgit v1.2.3