equal
deleted
inserted
replaced
208 """:bookmarks: List of strings. Any bookmarks associated with the |
208 """:bookmarks: List of strings. Any bookmarks associated with the |
209 changeset. |
209 changeset. |
210 """ |
210 """ |
211 repo = args['ctx']._repo |
211 repo = args['ctx']._repo |
212 bookmarks = args['ctx'].bookmarks() |
212 bookmarks = args['ctx'].bookmarks() |
213 current = repo._bookmarkcurrent |
213 current = repo._activebookmark |
214 makemap = lambda v: {'bookmark': v, 'current': current} |
214 makemap = lambda v: {'bookmark': v, 'current': current} |
215 f = _showlist('bookmark', bookmarks, **args) |
215 f = _showlist('bookmark', bookmarks, **args) |
216 return _hybrid(f, bookmarks, makemap, lambda x: x['bookmark']) |
216 return _hybrid(f, bookmarks, makemap, lambda x: x['bookmark']) |
217 |
217 |
218 def showchildren(**args): |
218 def showchildren(**args): |
225 """:currentbookmark: String. The active bookmark, if it is |
225 """:currentbookmark: String. The active bookmark, if it is |
226 associated with the changeset""" |
226 associated with the changeset""" |
227 import bookmarks as bookmarks # to avoid circular import issues |
227 import bookmarks as bookmarks # to avoid circular import issues |
228 repo = args['repo'] |
228 repo = args['repo'] |
229 if bookmarks.iscurrent(repo): |
229 if bookmarks.iscurrent(repo): |
230 current = repo._bookmarkcurrent |
230 current = repo._activebookmark |
231 if current in args['ctx'].bookmarks(): |
231 if current in args['ctx'].bookmarks(): |
232 return current |
232 return current |
233 return '' |
233 return '' |
234 |
234 |
235 def showdate(repo, ctx, templ, **args): |
235 def showdate(repo, ctx, templ, **args): |