mercurial/localrepo.py
changeset 13360 bab5490eb2bc
parent 13358 f26a51857dc7
child 13363 999f616b09dc
equal deleted inserted replaced
13359:87f248e78173 13360:bab5490eb2bc
   358         tags = {}
   358         tags = {}
   359         for (name, (node, hist)) in alltags.iteritems():
   359         for (name, (node, hist)) in alltags.iteritems():
   360             if node != nullid:
   360             if node != nullid:
   361                 tags[encoding.tolocal(name)] = node
   361                 tags[encoding.tolocal(name)] = node
   362         tags['tip'] = self.changelog.tip()
   362         tags['tip'] = self.changelog.tip()
       
   363         tags.update(self._bookmarks)
   363         tagtypes = dict([(encoding.tolocal(name), value)
   364         tagtypes = dict([(encoding.tolocal(name), value)
   364                          for (name, value) in tagtypes.iteritems()])
   365                          for (name, value) in tagtypes.iteritems()])
   365         return (tags, tagtypes)
   366         return (tags, tagtypes)
   366 
   367 
   367     def tagtype(self, tagname):
   368     def tagtype(self, tagname):