Mercurial > hg > mercurial-source
diff mercurial/tags.py @ 11078:37d1b20168d1
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 01 May 2010 15:15:35 -0500 |
parents | 45351e65230b 26abd91d9e84 |
children | 1cdc8b5e5729 |
line wrap: on
line diff
--- a/mercurial/tags.py +++ b/mercurial/tags.py @@ -197,6 +197,8 @@ try: cachefile = repo.opener('tags.cache', 'r') + # force reading the file for static-http + cachelines = iter(cachefile) _debug(ui, 'reading tag cache from %s\n' % cachefile.name) except IOError: cachefile = None @@ -217,7 +219,7 @@ cacheheads = [] # list of headnode cachefnode = {} # map headnode to filenode if cachefile: - for line in cachefile: + for line in cachelines: if line == "\n": break line = line.rstrip().split() @@ -237,7 +239,7 @@ # have been destroyed by strip or rollback.) if cacheheads and cacheheads[0] == tipnode and cacherevs[0] == tiprev: _debug(ui, "tag cache: tip unchanged\n") - tags = _readtags(ui, repo, cachefile, cachefile.name) + tags = _readtags(ui, repo, cachelines, cachefile.name) cachefile.close() return (None, None, tags, False) if cachefile: