Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 21503:10f15e34d86c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: show message when a bookmark is activated by update When updating to a bookmark, mention that the bookmark is now active. This is a reminder that update does not move the current bookmark if an explicit target is given - instead it activates that target.
author Stephen Lee <sphen.lee@gmail.com>
date Thu, 07 Mar 2013 14:17:56 +1100
parents d4b8fc753455
children 559f01f19cf6
comparison
equal deleted inserted replaced
21502:f8515564d617 21503:10f15e34d86c
5887 if not ret and movemarkfrom: 5887 if not ret and movemarkfrom:
5888 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): 5888 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5889 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) 5889 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5890 elif brev in repo._bookmarks: 5890 elif brev in repo._bookmarks:
5891 bookmarks.setcurrent(repo, brev) 5891 bookmarks.setcurrent(repo, brev)
5892 ui.status(_("(activating bookmark %s)\n") % brev)
5892 elif brev: 5893 elif brev:
5893 if repo._bookmarkcurrent: 5894 if repo._bookmarkcurrent:
5894 ui.status(_("(leaving bookmark %s)\n") % 5895 ui.status(_("(leaving bookmark %s)\n") %
5895 repo._bookmarkcurrent) 5896 repo._bookmarkcurrent)
5896 bookmarks.unsetcurrent(repo) 5897 bookmarks.unsetcurrent(repo)