Mercurial > hg
comparison hgext/bookmarks.py @ 7480:31f70804f1b1
bookmarks: Include bookmarks in tags.
author | Martin Geisler <mg...@daimi.au.dk> |
---|---|
date | Thu, 09 Oct 2008 08:49:03 +0200 |
parents | cae586246331 |
children | 5f681a143ede |
comparison
equal
deleted
inserted
replaced
7479:cae586246331 | 7480:31f70804f1b1 |
---|---|
217 update = True | 217 update = True |
218 if update: | 218 if update: |
219 write(repo, marks) | 219 write(repo, marks) |
220 return result | 220 return result |
221 | 221 |
222 def tags(self): | |
223 """Merge bookmarks with normal tags""" | |
224 if self.tagscache: | |
225 return self.tagscache | |
226 | |
227 tagscache = super(bookmark_repo, self).tags() | |
228 tagscache.update(parse(repo)) | |
229 return tagscache | |
230 | |
222 repo.__class__ = bookmark_repo | 231 repo.__class__ = bookmark_repo |
223 | 232 |
224 def pushnonbookmarked(orig, ui, repo, *args, **opts): | 233 def pushnonbookmarked(orig, ui, repo, *args, **opts): |
225 'Call push with only the heads that are not bookmarked' | 234 'Call push with only the heads that are not bookmarked' |
226 if opts.get('non_bookmarked'): | 235 if opts.get('non_bookmarked'): |