Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 24947:a02d293a1079

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e0b0fbd47491
children c8a97fa742b7
line wrap: on
line diff
--- a/hgext/rebase.py	Mon Apr 13 23:03:13 2015 -0700
+++ b/hgext/rebase.py	Tue Apr 14 13:17:33 2015 -0700
@@ -358,7 +358,7 @@
 
         # Keep track of the current bookmarks in order to reset them later
         currentbookmarks = repo._bookmarks.copy()
-        activebookmark = activebookmark or repo._bookmarkcurrent
+        activebookmark = activebookmark or repo._activebookmark
         if activebookmark:
             bookmarks.deactivate(repo)
 
@@ -1052,7 +1052,7 @@
                 hg.update(repo, dest)
                 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
                     ui.status(_("updating bookmark %s\n")
-                              % repo._bookmarkcurrent)
+                              % repo._activebookmark)
     else:
         if opts.get('tool'):
             raise util.Abort(_('--tool can only be used with --rebase'))