d12025340b02

Update the bookmark fix to be backwards compatible.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Wed, 20 Jan 2010 19:07:42 -0500
parents d431f1cb0dc8
children 82a4a9aba8f6
branches/tags (none)
files prompt.py

Changes

diff -r d431f1cb0dc8 -r d12025340b02 prompt.py
--- a/prompt.py	Wed Jan 20 12:04:36 2010 -0500
+++ b/prompt.py	Wed Jan 20 19:07:42 2010 -0500
@@ -123,10 +123,10 @@
     
     def _bookmark(m):
         try:
+            book = extensions.find('bookmarks').current(repo)
+        except AttributeError:
             book = getattr(repo, '_bookmarkcurrent', None)
-            return _with_groups(m.groups(), book) if book else ''
-        except KeyError:
-            return ''
+        return _with_groups(m.groups(), book) if book else ''
     
     def _tags(m):
         g = m.groups()