# HG changeset patch # User Benoit Boissinot # Date 2011-01-15 14:04:58 # Node ID 8439526fb4071cda3f1d3be6551e014f47e68530 # Parent c45b5faa6213e5638779b3abce2c49073404e1cd revlog/parseindex: no need to pass the file around diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -126,7 +126,7 @@ class revlogoldio(object): def __init__(self): self.size = struct.calcsize(indexformatv0) - def parseindex(self, fp, data, inline): + def parseindex(self, data, inline): s = self.size index = [] nodemap = {nullid: nullrev} @@ -170,7 +170,7 @@ class revlogio(object): def __init__(self): self.size = struct.calcsize(indexformatng) - def parseindex(self, fp, data, inline): + def parseindex(self, data, inline): # call the C implementation to parse the index data index, cache = parsers.parse_index2(data, inline) return index, None, cache @@ -264,7 +264,7 @@ class revlog(object): self._io = revlogoldio() if i: try: - d = self._io.parseindex(f, i, self._inline) + d = self._io.parseindex(i, self._inline) except (ValueError, IndexError): raise RevlogError(_("index %s is corrupted") % (self.indexfile)) self.index, n, self._chunkcache = d