Mercurial > hg
changeset 8402:0ad521500424
tag: drop unused use_dirstate and parent from _tag()
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 14 May 2009 13:20:40 -0500 |
| parents | ca7dc47eecc6 |
| children | 553909cd1baa |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 8 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu May 14 13:20:40 2009 -0500 +++ b/mercurial/localrepo.py Thu May 14 13:20:40 2009 -0500 @@ -129,10 +129,7 @@ tag_disallowed = ':\r\n' - def _tag(self, names, node, message, local, user, date, parent=None, - extra={}): - use_dirstate = parent is None - + def _tag(self, names, node, message, local, user, date, extra={}): if isinstance(names, str): allchars = names names = (names,) @@ -173,30 +170,20 @@ self.hook('tag', node=hex(node), tag=name, local=local) return - if use_dirstate: - try: - fp = self.wfile('.hgtags', 'rb+') - except IOError: - fp = self.wfile('.hgtags', 'ab') - else: - prevtags = fp.read() + try: + fp = self.wfile('.hgtags', 'rb+') + except IOError: + fp = self.wfile('.hgtags', 'ab') else: - try: - prevtags = self.filectx('.hgtags', parent).data() - except error.LookupError: - pass - fp = self.wfile('.hgtags', 'wb') - if prevtags: - fp.write(prevtags) + prevtags = fp.read() # committed tags are stored in UTF-8 writetags(fp, names, encoding.fromlocal, prevtags) - if use_dirstate and '.hgtags' not in self.dirstate: + if '.hgtags' not in self.dirstate: self.add(['.hgtags']) - tagnode = self.commit(['.hgtags'], message, user, date, p1=parent, - extra=extra) + tagnode = self.commit(['.hgtags'], message, user, date, extra=extra) for name in names: self.hook('tag', node=hex(node), tag=name, local=local)