mercurial/commands.py
changeset 14907 84af56cc673b
parent 14906 7c3c8f37e84f
child 14918 ebdfdba0faaf
equal deleted inserted replaced
14906:7c3c8f37e84f 14907:84af56cc673b
  4748     else:
  4748     else:
  4749         ui.status(m, label='log.branch')
  4749         ui.status(m, label='log.branch')
  4750 
  4750 
  4751     if marks:
  4751     if marks:
  4752         current = repo._bookmarkcurrent
  4752         current = repo._bookmarkcurrent
       
  4753         ui.write(_('bookmarks:'), label='log.bookmark')
  4753         if current is not None:
  4754         if current is not None:
  4754             try:
  4755             try:
  4755                 marks.remove(current)
  4756                 marks.remove(current)
  4756                 marks = ['*' + current] + marks
  4757                 ui.write(' *' + current, label='bookmarks.current')
  4757             except ValueError:
  4758             except ValueError:
  4758                 # current bookmark not in parent ctx marks
  4759                 # current bookmark not in parent ctx marks
  4759                 pass
  4760                 pass
  4760         ui.write(_('bookmarks: %s\n') % ' '.join(marks), label='log.bookmark')
  4761         for m in marks:
       
  4762           ui.write(' ' + m, label='log.bookmark')
       
  4763         ui.write('\n', label='log.bookmark')
  4761 
  4764 
  4762     st = list(repo.status(unknown=True))[:6]
  4765     st = list(repo.status(unknown=True))[:6]
  4763 
  4766 
  4764     c = repo.dirstate.copies()
  4767     c = repo.dirstate.copies()
  4765     copied, renamed = [], []
  4768     copied, renamed = [], []