Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 18621:b1e949f6c17d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: simplify handling of active bookmark
author Kevin Bullock <kbullock@ringworld.org>
date Sun, 27 Jan 2013 11:53:46 -0600
parents 0efd5686f80c
children f9eebf5629fa
comparison
equal deleted inserted replaced
18620:7da487b0256a 18621:b1e949f6c17d
5572 5572
5573 if marks: 5573 if marks:
5574 current = repo._bookmarkcurrent 5574 current = repo._bookmarkcurrent
5575 # i18n: column positioning for "hg summary" 5575 # i18n: column positioning for "hg summary"
5576 ui.write(_('bookmarks:'), label='log.bookmark') 5576 ui.write(_('bookmarks:'), label='log.bookmark')
5577 if current is not None: 5577 if current is not None and current in marks:
5578 try: 5578 ui.write(' *' + current, label='bookmarks.current')
5579 marks.remove(current) 5579 marks.remove(current)
5580 ui.write(' *' + current, label='bookmarks.current')
5581 except ValueError:
5582 # current bookmark not in parent ctx marks
5583 pass
5584 for m in marks: 5580 for m in marks:
5585 ui.write(' ' + m, label='log.bookmark') 5581 ui.write(' ' + m, label='log.bookmark')
5586 ui.write('\n', label='log.bookmark') 5582 ui.write('\n', label='log.bookmark')
5587 5583
5588 st = list(repo.status(unknown=True))[:6] 5584 st = list(repo.status(unknown=True))[:6]