Show More
@@ -5574,9 +5574,12 b' def summary(ui, repo, **opts):' | |||||
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: | |
5578 | ui.write(' *' + current, label='bookmarks.current') |
|
5578 | if current in marks: | |
5579 | marks.remove(current) |
|
5579 | ui.write(' *' + current, label='bookmarks.current') | |
|
5580 | marks.remove(current) | |||
|
5581 | else: | |||
|
5582 | ui.write('[%s]' % current, label='bookmarks.current') | |||
5580 | for m in marks: |
|
5583 | for m in marks: | |
5581 | ui.write(' ' + m, label='log.bookmark') |
|
5584 | ui.write(' ' + m, label='log.bookmark') | |
5582 | ui.write('\n', label='log.bookmark') |
|
5585 | ui.write('\n', label='log.bookmark') |
@@ -471,7 +471,7 b" update to current bookmark if it's not t" | |||||
471 | parent: 2:db815d6d32e6 |
|
471 | parent: 2:db815d6d32e6 | |
472 | 2 |
|
472 | 2 | |
473 | branch: default |
|
473 | branch: default | |
474 | bookmarks: Y x y |
|
474 | bookmarks:[Z] Y x y | |
475 | commit: 1 added, 1 unknown (new branch head) |
|
475 | commit: 1 added, 1 unknown (new branch head) | |
476 | update: 2 new changesets (update) |
|
476 | update: 2 new changesets (update) | |
477 | $ hg update |
|
477 | $ hg update |
General Comments 0
You need to be logged in to leave comments.
Login now