Mercurial > public > mercurial-scm > hg-stable

comparison 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
comparison
equal deleted inserted replaced
25099:5e111215e38b 25100:d6e7ac651973
2487 # `logmessage` anyway. 2487 # `logmessage` anyway.
2488 opts.pop('logfile') 2488 opts.pop('logfile')
2489 # First, do a regular commit to record all changes in the working 2489 # First, do a regular commit to record all changes in the working
2490 # directory (if there are any) 2490 # directory (if there are any)
2491 ui.callhooks = False 2491 ui.callhooks = False
2492 currentbookmark = repo._activebookmark 2492 activebookmark = repo._activebookmark
2493 try: 2493 try:
2494 repo._activebookmark = None 2494 repo._activebookmark = None
2495 opts['message'] = 'temporary amend commit for %s' % old 2495 opts['message'] = 'temporary amend commit for %s' % old
2496 node = commit(ui, repo, commitfunc, pats, opts) 2496 node = commit(ui, repo, commitfunc, pats, opts)
2497 finally: 2497 finally:
2498 repo._activebookmark = currentbookmark 2498 repo._activebookmark = activebookmark
2499 ui.callhooks = True 2499 ui.callhooks = True
2500 ctx = repo[node] 2500 ctx = repo[node]
2501 2501
2502 # Participating changesets: 2502 # Participating changesets:
2503 # 2503 #