Mercurial > hg
comparison hgext/rebase.py @ 24944:08ec11e3ae4c
bookmarks: rename unsetcurrent to deactivate (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 | Mon, 13 Apr 2015 21:53:37 -0700 |
parents | 4ec40a4db64a |
children | e0b0fbd47491 |
comparison
equal
deleted
inserted
replaced
24943:3e39f67ef663 | 24944:08ec11e3ae4c |
---|---|
358 | 358 |
359 # Keep track of the current bookmarks in order to reset them later | 359 # Keep track of the current bookmarks in order to reset them later |
360 currentbookmarks = repo._bookmarks.copy() | 360 currentbookmarks = repo._bookmarks.copy() |
361 activebookmark = activebookmark or repo._bookmarkcurrent | 361 activebookmark = activebookmark or repo._bookmarkcurrent |
362 if activebookmark: | 362 if activebookmark: |
363 bookmarks.unsetcurrent(repo) | 363 bookmarks.deactivate(repo) |
364 | 364 |
365 extrafn = _makeextrafn(extrafns) | 365 extrafn = _makeextrafn(extrafns) |
366 | 366 |
367 sortedstate = sorted(state) | 367 sortedstate = sorted(state) |
368 total = len(sortedstate) | 368 total = len(sortedstate) |