diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -2000,12 +2000,11 @@ ): return - trinfo = tr.find(self.indexfile) - if trinfo is None: + troffset = tr.findoffset(self.indexfile) + if troffset is None: raise error.RevlogError( _(b"%s not found in the transaction") % self.indexfile ) - troffset = trinfo[1] trindex = 0 tr.add(self.datafile, 0) diff --git a/mercurial/transaction.py b/mercurial/transaction.py --- a/mercurial/transaction.py +++ b/mercurial/transaction.py @@ -395,11 +395,9 @@ return any @active - def find(self, file): + def findoffset(self, file): if file in self._map: - return self._entries[self._map[file]] - if file in self._backupmap: - return self._backupentries[self._backupmap[file]] + return self._entries[self._map[file]][1] return None @active