Mercurial > hg-stable

diff mercurial/cmdutil.py @ 25100:d6e7ac651973

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: rename current to active in variables and comments 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 12:53:48 -0700
parents 747055706e85
children 49c583ca48c4
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Thu May 14 21:34:46 2015 -0700
+++ b/mercurial/cmdutil.py	Tue Apr 14 12:53:48 2015 -0700
@@ -2489,13 +2489,13 @@
             # First, do a regular commit to record all changes in the working
             # directory (if there are any)
             ui.callhooks = False
-            currentbookmark = repo._activebookmark
+            activebookmark = repo._activebookmark
             try:
                 repo._activebookmark = None
                 opts['message'] = 'temporary amend commit for %s' % old
                 node = commit(ui, repo, commitfunc, pats, opts)
             finally:
-                repo._activebookmark = currentbookmark
+                repo._activebookmark = activebookmark
                 ui.callhooks = True
             ctx = repo[node]