hgext/bookmarks.py
changeset 9145 6b03f93b8ff3
parent 9053 6d0b5d76e76d
child 9202 82de0bb056d7
equal deleted inserted replaced
9144:ad72e3b08bc0 9145:6b03f93b8ff3
   291                     update = True
   291                     update = True
   292             if update:
   292             if update:
   293                 write(self, marks)
   293                 write(self, marks)
   294             return result
   294             return result
   295 
   295 
   296         def tags(self):
   296         def _findtags(self):
   297             """Merge bookmarks with normal tags"""
   297             """Merge bookmarks with normal tags"""
   298             if self.tagscache:
   298             (tags, tagtypes) = super(bookmark_repo, self)._findtags()
   299                 return self.tagscache
   299             tags.update(parse(self))
   300 
   300             return (tags, tagtypes)
   301             tagscache = super(bookmark_repo, self).tags()
       
   302             tagscache.update(parse(self))
       
   303             return tagscache
       
   304 
   301 
   305     repo.__class__ = bookmark_repo
   302     repo.__class__ = bookmark_repo
   306 
   303 
   307 def uisetup(ui):
   304 def uisetup(ui):
   308     extensions.wrapfunction(repair, "strip", strip)
   305     extensions.wrapfunction(repair, "strip", strip)