661dbd42f386

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Wed, 14 Mar 2012 17:13:42 -0400
parents e16ee632ce6f (current diff) 5faf9b0ae984 (diff)
children 1cb3af183d2f
branches/tags (none)
files prompt.py

Changes

diff -r e16ee632ce6f -r 661dbd42f386 prompt.py
--- a/prompt.py	Fri Feb 10 19:31:25 2012 -0500
+++ b/prompt.py	Wed Mar 14 17:13:42 2012 -0400
@@ -110,7 +110,12 @@
             book = getattr(repo, '_bookmarkcurrent', None)
         except KeyError:
             book = getattr(repo, '_bookmarkcurrent', None)
-        return _with_groups(m.groups(), book) if book else ''
+        if book:
+            cur = repo['.'].node()
+            if repo._bookmarks[book] == cur:
+                return _with_groups(m.groups(), book)
+        else:
+            return ''
 
     def _branch(m):
         g = m.groups()