Mercurial > hg
comparison hgext/rebase.py @ 24945:e0b0fbd47491
bookmarks: rename setcurrent to activate (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 22:27:01 -0700 |
parents | 08ec11e3ae4c |
children | a02d293a1079 |
comparison
equal
deleted
inserted
replaced
24944:08ec11e3ae4c | 24945:e0b0fbd47491 |
---|---|
496 if skipped: | 496 if skipped: |
497 ui.note(_("%d revisions have been skipped\n") % len(skipped)) | 497 ui.note(_("%d revisions have been skipped\n") % len(skipped)) |
498 | 498 |
499 if (activebookmark and | 499 if (activebookmark and |
500 repo['.'].node() == repo._bookmarks[activebookmark]): | 500 repo['.'].node() == repo._bookmarks[activebookmark]): |
501 bookmarks.setcurrent(repo, activebookmark) | 501 bookmarks.activate(repo, activebookmark) |
502 | 502 |
503 finally: | 503 finally: |
504 release(lock, wlock) | 504 release(lock, wlock) |
505 | 505 |
506 def externalparent(repo, state, targetancestors): | 506 def externalparent(repo, state, targetancestors): |
886 strippoints = [c.node() for c in repo.set('roots(%ld)', rebased)] | 886 strippoints = [c.node() for c in repo.set('roots(%ld)', rebased)] |
887 # no backup of rebased cset versions needed | 887 # no backup of rebased cset versions needed |
888 repair.strip(repo.ui, repo, strippoints) | 888 repair.strip(repo.ui, repo, strippoints) |
889 | 889 |
890 if activebookmark: | 890 if activebookmark: |
891 bookmarks.setcurrent(repo, activebookmark) | 891 bookmarks.activate(repo, activebookmark) |
892 | 892 |
893 clearstatus(repo) | 893 clearstatus(repo) |
894 repo.ui.warn(_('rebase aborted\n')) | 894 repo.ui.warn(_('rebase aborted\n')) |
895 return 0 | 895 return 0 |
896 | 896 |