Mercurial > public > mercurial-scm > hg

diff hgext/shelve.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 3510ec97ffdc
children 68f456f2f425
line wrap: on
line diff
--- a/hgext/shelve.py	Mon Apr 13 23:03:13 2015 -0700
+++ b/hgext/shelve.py	Tue Apr 14 13:17:33 2015 -0700
@@ -163,7 +163,7 @@
 
     # we never need the user, so we use a generic user for all shelve operations
     user = 'shelve@localhost'
-    label = repo._bookmarkcurrent or parent.branch() or 'default'
+    label = repo._activebookmark or parent.branch() or 'default'
 
     # slashes aren't allowed in filenames, therefore we rename it
     label = label.replace('/', '_')