--- a/mercurial/templatekw.py	Tue May 05 14:45:09 2015 -0400
+++ b/mercurial/templatekw.py	Tue Apr 14 12:45:15 2015 -0700
@@ -226,7 +226,7 @@
     associated with the changeset"""
     import bookmarks as bookmarks # to avoid circular import issues
     repo = args['repo']
-    if bookmarks.iscurrent(repo):
+    if bookmarks.isactivewdirparent(repo):
         current = repo._activebookmark
         if current in args['ctx'].bookmarks():
             return current