bookmarks: simplify iscurrent to isactivewdirparent (API) Previously this function accepted two optional parameters that were unused by any callers and complicated the function. Today, the terms 'active' and 'current' are interchangeably used throughout the codebase in reference to the active bookmark (the bookmark that will be updated with the next commit). This leads to confusion among developers and users. This patch is part of a series to standardize the usage to 'active' throughout the mercurial codebase and user interface.

--- 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