Mercurial > hg
changeset 18621:b1e949f6c17d
summary: simplify handling of active bookmark
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Sun, 27 Jan 2013 11:53:46 -0600 |
parents | 7da487b0256a |
children | f9eebf5629fa |
files | mercurial/commands.py |
diffstat | 1 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Feb 08 21:32:43 2013 +0000 +++ b/mercurial/commands.py Sun Jan 27 11:53:46 2013 -0600 @@ -5574,13 +5574,9 @@ current = repo._bookmarkcurrent # i18n: column positioning for "hg summary" ui.write(_('bookmarks:'), label='log.bookmark') - if current is not None: - try: - marks.remove(current) - ui.write(' *' + current, label='bookmarks.current') - except ValueError: - # current bookmark not in parent ctx marks - pass + if current is not None and current in marks: + ui.write(' *' + current, label='bookmarks.current') + marks.remove(current) for m in marks: ui.write(' ' + m, label='log.bookmark') ui.write('\n', label='log.bookmark')