diff hgext/strip.py @ 24947:a02d293a1079

bookmarks: rename bookmarkcurrent to activebookmark (API) 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 Tue, 14 Apr 2015 13:17:33 -0700
parents 08ec11e3ae4c
children 80c5b2666a96
line wrap: on
line diff
--- a/hgext/strip.py	Mon Apr 13 23:03:13 2015 -0700
+++ b/hgext/strip.py	Tue Apr 14 13:17:33 2015 -0700
@@ -60,7 +60,7 @@
 
         marks = repo._bookmarks
         if bookmark:
-            if bookmark == repo._bookmarkcurrent:
+            if bookmark == repo._activebookmark:
                 bookmarks.deactivate(repo)
             del marks[bookmark]
             marks.write()