comparison mercurial/cmdutil.py @ 25100:d6e7ac651973

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.

25099:5e111215e38b

            # `logmessage` anyway.
            opts.pop('logfile')
            # First, do a regular commit to record all changes in the working
            # directory (if there are any)
            ui.callhooks = False
            currentbookmark = 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
                ui.callhooks = True
            ctx = repo[node]

            # Participating changesets:
            #

25100:d6e7ac651973

            # `logmessage` anyway.
            opts.pop('logfile')
            # First, do a regular commit to record all changes in the working
            # directory (if there are any)
            ui.callhooks = False
            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 = activebookmark
                ui.callhooks = True
            ctx = repo[node]

            # Participating changesets:
            #