Mercurial > hg
comparison mercurial/hg.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 | 27ad6b91f5c2 |
| children | 4cc3fb23881d |
comparison
equal
deleted
inserted
replaced
| 24944:08ec11e3ae4c | 24945:e0b0fbd47491 |
|---|---|
| 495 bn = destrepo[uprev].branch() | 495 bn = destrepo[uprev].branch() |
| 496 status = _("updating to branch %s\n") % bn | 496 status = _("updating to branch %s\n") % bn |
| 497 destrepo.ui.status(status) | 497 destrepo.ui.status(status) |
| 498 _update(destrepo, uprev) | 498 _update(destrepo, uprev) |
| 499 if update in destrepo._bookmarks: | 499 if update in destrepo._bookmarks: |
| 500 bookmarks.setcurrent(destrepo, update) | 500 bookmarks.activate(destrepo, update) |
| 501 finally: | 501 finally: |
| 502 release(srclock, destlock) | 502 release(srclock, destlock) |
| 503 if cleandir is not None: | 503 if cleandir is not None: |
| 504 shutil.rmtree(cleandir, True) | 504 shutil.rmtree(cleandir, True) |
| 505 if srcpeer is not None: | 505 if srcpeer is not None: |