Mercurial > public > mercurial-scm > hg-stable
diff mercurial/templatekw.py @ 25012:256c8432e346
templatekw: rename variable current to active
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.
| author | Ryan McElroy <rmcelroy@fb.com> |
|---|---|
| date | Wed, 15 Apr 2015 08:26:01 -0700 |
| parents | fb9b7b937b3e |
| children | 277aba2c151a |
line wrap: on
line diff
--- a/mercurial/templatekw.py Mon May 11 21:26:13 2015 -0400 +++ b/mercurial/templatekw.py Wed Apr 15 08:26:01 2015 -0700 @@ -227,9 +227,9 @@ import bookmarks as bookmarks # to avoid circular import issues repo = args['repo'] if bookmarks.isactivewdirparent(repo): - current = repo._activebookmark - if current in args['ctx'].bookmarks(): - return current + active = repo._activebookmark + if active in args['ctx'].bookmarks(): + return active return '' def showdate(repo, ctx, templ, **args):