--- a/mercurial/tags.py Sun Jan 16 17:26:34 2011 +0100
+++ b/mercurial/tags.py Tue Jan 04 06:29:08 2011 +0100
@@ -12,6 +12,7 @@
from node import nullid, bin, hex, short
from i18n import _
+import os.path
import encoding
import error
@@ -151,7 +152,7 @@
set, caller is responsible for reading tag info from each head.'''
try:
- cachefile = repo.opener('tags.cache', 'r')
+ cachefile = repo.opener(os.path.join('cache', 'tags'), 'r')
# force reading the file for static-http
cachelines = iter(cachefile)
except IOError:
@@ -185,8 +186,8 @@
fnode = bin(line[2])
cachefnode[headnode] = fnode
except (ValueError, TypeError):
- # corruption of tags.cache, just recompute it
- ui.warn(_('.hg/tags.cache is corrupt, rebuilding it\n'))
+ # corruption of the tags cache, just recompute it
+ ui.warn(_('.hg/cache/tags is corrupt, rebuilding it\n'))
cacheheads = []
cacherevs = []
cachefnode = {}
@@ -248,7 +249,8 @@
def _writetagcache(ui, repo, heads, tagfnode, cachetags):
try:
- cachefile = repo.opener('tags.cache', 'w', atomictemp=True)
+ cachefile = repo.opener(os.path.join('cache', 'tags'), 'w',
+ atomictemp=True)
except (OSError, IOError):
return