From 0e76751e5f1ec3f176e8afb175547191fe391292 Mon Sep 17 00:00:00 2001
From: Justin Hileman <justin@justinhileman.info>
Date: Sun, 23 Nov 2014 11:36:12 -0800
Subject: [PATCH] [bobthefish] Use @rominf's recursive hg to find hg root.

---
 themes/bobthefish/fish_prompt.fish | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/themes/bobthefish/fish_prompt.fish b/themes/bobthefish/fish_prompt.fish
index 35d8d17..1a16b3f 100644
--- a/themes/bobthefish/fish_prompt.fish
+++ b/themes/bobthefish/fish_prompt.fish
@@ -75,17 +75,6 @@ set __bobthefish_lt_brown   BF5E00
 #   command which hg > /dev/null 2>&1; and command hg stat > /dev/null 2>&1
 # end
 
-function __bobthefish_check_hg_dir_recursively -d 'Check whether pwd or parents contain .hg dir'
-  set d (pwd)
-  while not [ $d = / ]
-    if test -e $d/.hg
-      return 0
-    end
-    set d (dirname $d)
-  end
-  return 1
-end
-
 function __bobthefish_git_branch -d 'Get the current git branch (or commitish)'
   set -l ref (command git symbolic-ref HEAD ^/dev/null)
   if [ $status -gt 0 ]
@@ -110,7 +99,14 @@ function __bobthefish_git_project_dir -d 'Print the current git project base dir
 end
 
 function __bobthefish_hg_project_dir -d 'Print the current hg project base directory'
-  command hg root ^/dev/null
+  set d (pwd)
+  while not [ $d = / ]
+    if test -e $d/.hg
+      command hg root ^/dev/null
+      return
+    end
+    set d (dirname $d)
+  end
 end
 
 function __bobthefish_project_pwd -d 'Print the working directory relative to project root'
-- 
GitLab