diff -r ceec79b5657a -r f26efa4f0eff mercurial/templatekw.py --- a/mercurial/templatekw.py Thu Apr 16 15:18:59 2015 -0700 +++ b/mercurial/templatekw.py Thu May 28 20:03:42 2015 -0700 @@ -206,12 +206,12 @@ def showbookmarks(**args): """:bookmarks: List of strings. Any bookmarks associated with the - changeset. + changeset. Also sets 'active', the name of the active bookmark. """ repo = args['ctx']._repo bookmarks = args['ctx'].bookmarks() - current = repo._activebookmark - makemap = lambda v: {'bookmark': v, 'current': current} + active = repo._activebookmark + makemap = lambda v: {'bookmark': v, 'active': active, 'current': active} f = _showlist('bookmark', bookmarks, **args) return _hybrid(f, bookmarks, makemap, lambda x: x['bookmark'])