From 48d325ef728a89e350acd7310d0451e32401f6ac Mon Sep 17 00:00:00 2001
From: Ronan Amicel <ronan.amicel@gmail.com>
Date: Wed, 4 Jan 2012 12:17:04 +0100
Subject: Fixed Mercurial repository detection

---
 git-prompt.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/git-prompt.sh b/git-prompt.sh
index 41aa587..a63830b 100755
--- a/git-prompt.sh
+++ b/git-prompt.sh
@@ -375,8 +375,7 @@ parse_svn_status() {
 parse_hg_status() {
 
         # ☿
-
-        [[  -d ./.hg/ ]]  ||  return  1
+        hg_root=`hg root 2>/dev/null` || return 1
 
         vcs=hg
 
-- 
cgit v1.2.3


From 3a9d158cc9f413591263738e08f1f5a10c627a48 Mon Sep 17 00:00:00 2001
From: Ronan Amicel <ronan.amicel@gmail.com>
Date: Wed, 4 Jan 2012 12:20:30 +0100
Subject: Show current bookmark in Mercurial

---
 git-prompt.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/git-prompt.sh b/git-prompt.sh
index a63830b..d71d9b4 100755
--- a/git-prompt.sh
+++ b/git-prompt.sh
@@ -393,8 +393,13 @@ parse_hg_status() {
 
         branch=`hg branch 2> /dev/null`
 
+        [[ -f $hg_root/.hg/bookmarks.current ]] && bookmark=`cat "$hg_root/.hg/bookmarks.current"`
+
         [[ -z $modified ]]   &&   [[ -z $untracked ]]   &&   [[ -z $added ]]   &&   clean=clean
         vcs_info=${branch/default/D}
+        if [[ "$bookmark" ]] ;  then
+                vcs_info+=/$bookmark
+        fi
  }
 
 
-- 
cgit v1.2.3