# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 1428987217 25200
# Node ID 08ec11e3ae4cd12a2a2a32bc628cbeae6f046383
# Parent  3e39f67ef663b593ad870070220fad14e4504a51
bookmarks: rename unsetcurrent to deactivate (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.

diff -r 3e39f67ef663 -r 08ec11e3ae4c hgext/rebase.py
--- a/hgext/rebase.py	Wed May 06 17:15:38 2015 +0200
+++ b/hgext/rebase.py	Mon Apr 13 21:53:37 2015 -0700
@@ -360,7 +360,7 @@
         currentbookmarks = repo._bookmarks.copy()
         activebookmark = activebookmark or repo._bookmarkcurrent
         if activebookmark:
-            bookmarks.unsetcurrent(repo)
+            bookmarks.deactivate(repo)
 
         extrafn = _makeextrafn(extrafns)
 
diff -r 3e39f67ef663 -r 08ec11e3ae4c hgext/strip.py
--- a/hgext/strip.py	Wed May 06 17:15:38 2015 +0200
+++ b/hgext/strip.py	Mon Apr 13 21:53:37 2015 -0700
@@ -61,7 +61,7 @@
         marks = repo._bookmarks
         if bookmark:
             if bookmark == repo._bookmarkcurrent:
-                bookmarks.unsetcurrent(repo)
+                bookmarks.deactivate(repo)
             del marks[bookmark]
             marks.write()
             ui.write(_("bookmark '%s' deleted\n") % bookmark)
diff -r 3e39f67ef663 -r 08ec11e3ae4c mercurial/bookmarks.py
--- a/mercurial/bookmarks.py	Wed May 06 17:15:38 2015 +0200
+++ b/mercurial/bookmarks.py	Mon Apr 13 21:53:37 2015 -0700
@@ -84,7 +84,7 @@
     def _writerepo(self, repo):
         """Factored out for extensibility"""
         if repo._bookmarkcurrent not in self:
-            unsetcurrent(repo)
+            deactivate(repo)
 
         wlock = repo.wlock()
         try:
@@ -151,7 +151,10 @@
         wlock.release()
     repo._bookmarkcurrent = mark
 
-def unsetcurrent(repo):
+def deactivate(repo):
+    """
+    Unset the active bookmark in this reposiotry.
+    """
     wlock = repo.wlock()
     try:
         try:
diff -r 3e39f67ef663 -r 08ec11e3ae4c mercurial/commands.py
--- a/mercurial/commands.py	Wed May 06 17:15:38 2015 +0200
+++ b/mercurial/commands.py	Mon Apr 13 21:53:37 2015 -0700
@@ -980,7 +980,7 @@
                         raise util.Abort(_("bookmark '%s' does not exist") %
                                          mark)
                     if mark == repo._bookmarkcurrent:
-                        bookmarks.unsetcurrent(repo)
+                        bookmarks.deactivate(repo)
                     del marks[mark]
                 marks.write()
 
@@ -1006,7 +1006,7 @@
                     if newact is None:
                         newact = mark
                     if inactive and mark == repo._bookmarkcurrent:
-                        bookmarks.unsetcurrent(repo)
+                        bookmarks.deactivate(repo)
                         return
                     tgt = cur
                     if rev:
@@ -1016,7 +1016,7 @@
                 if not inactive and cur == marks[newact] and not rev:
                     bookmarks.setcurrent(repo, newact)
                 elif cur != tgt and newact == repo._bookmarkcurrent:
-                    bookmarks.unsetcurrent(repo)
+                    bookmarks.deactivate(repo)
                 marks.write()
 
             elif inactive:
@@ -1025,7 +1025,7 @@
                 elif not repo._bookmarkcurrent:
                     ui.status(_("no active bookmark\n"))
                 else:
-                    bookmarks.unsetcurrent(repo)
+                    bookmarks.deactivate(repo)
         finally:
             wlock.release()
     else: # show bookmarks
@@ -6413,7 +6413,7 @@
         if repo._bookmarkcurrent:
             ui.status(_("(leaving bookmark %s)\n") %
                       repo._bookmarkcurrent)
-        bookmarks.unsetcurrent(repo)
+        bookmarks.deactivate(repo)
 
     return ret