Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 16010:c7811ca6fb94 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: note updated bookmark This brings update in line with pull: we notify the user when an action indirectly updates a bookmark.
author Kevin Bullock <kbullock@ringworld.org>
date Fri, 27 Jan 2012 13:12:56 -0600
parents f1208827df7c
children eb85d5f89fef
comparison
equal deleted inserted replaced
16009:f1208827df7c 16010:c7811ca6fb94
5717 ret = hg.clean(repo, rev) 5717 ret = hg.clean(repo, rev)
5718 else: 5718 else:
5719 ret = hg.update(repo, rev) 5719 ret = hg.update(repo, rev)
5720 5720
5721 if not ret and movemarkfrom: 5721 if not ret and movemarkfrom:
5722 bookmarks.update(repo, [movemarkfrom], repo['.'].node()) 5722 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5723 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5723 elif brev in repo._bookmarks: 5724 elif brev in repo._bookmarks:
5724 bookmarks.setcurrent(repo, brev) 5725 bookmarks.setcurrent(repo, brev)
5725 5726
5726 return ret 5727 return ret
5727 5728