Show More
@@ -152,15 +152,22 b' def bookmark(ui, repo, mark=None, rev=No' | |||||
152 | for bmark, n in marks.iteritems(): |
|
152 | for bmark, n in marks.iteritems(): | |
153 | if ui.configbool('bookmarks', 'track.current'): |
|
153 | if ui.configbool('bookmarks', 'track.current'): | |
154 | current = repo._bookmarkcurrent |
|
154 | current = repo._bookmarkcurrent | |
155 |
|
|
155 | if bmark == current and n == cur: | |
|
156 | prefix, label = '*', 'bookmarks.current' | |||
|
157 | else: | |||
|
158 | prefix, label = ' ', '' | |||
156 | else: |
|
159 | else: | |
157 |
|
|
160 | if n == cur: | |
|
161 | prefix, label = '*', 'bookmarks.current' | |||
|
162 | else: | |||
|
163 | prefix, label = ' ', '' | |||
158 |
|
164 | |||
159 | if ui.quiet: |
|
165 | if ui.quiet: | |
160 | ui.write("%s\n" % bmark) |
|
166 | ui.write("%s\n" % bmark, label=label) | |
161 | else: |
|
167 | else: | |
162 | ui.write(" %s %-25s %d:%s\n" % ( |
|
168 | ui.write(" %s %-25s %d:%s\n" % ( | |
163 |
prefix, bmark, repo.changelog.rev(n), hexfn(n)) |
|
169 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), | |
|
170 | label=label) | |||
164 | return |
|
171 | return | |
165 |
|
172 | |||
166 | def _revstostrip(changelog, node): |
|
173 | def _revstostrip(changelog, node): |
General Comments 0
You need to be logged in to leave comments.
Login now