comparison mercurial/localrepo.py @ 7017:8362086a1227

merge backout

7015:6651de7176a0

        for x in self.status()[:5]:
            if '.hgtags' in x:
                raise util.Abort(_('working copy of .hgtags is changed '
                                   '(please commit .hgtags manually)'))

        parents = self[None].parents()
        parent = None
        # use tip instead of the parent rev if there's no working copy
        # (avoid creating a new head)
        if len(parents) == 1 and parents[0].node() == nullid:
            parent = self['tip'].node()
        self._tag(names, node, message, local, user, date, parent=parent)

    def tags(self):
        '''return a mapping of tag to node'''
        if self.tagscache:
            return self.tagscache

7017:8362086a1227

        for x in self.status()[:5]:
            if '.hgtags' in x:
                raise util.Abort(_('working copy of .hgtags is changed '
                                   '(please commit .hgtags manually)'))

        self._tag(names, node, message, local, user, date)

    def tags(self):
        '''return a mapping of tag to node'''
        if self.tagscache:
            return self.tagscache