This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9276

transaction: rename find to findoffset and drop backup file support
ClosedPublic

Authored by joerg.sonnenberger on Nov 7 2020, 4:32 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa6f08085edfe: transaction: rename find to findoffset and drop backup file support
rHG0516dfea14e4: transaction: rename find to findoffset and drop backup file support
Summary

transaction.find used to support access to both the regular file and
backup file list. They have different formats, so any consumer has to be
aware of the difference alredy. There is no in-core consumer for the
backup file access, so don't provide it.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (5 lines)
Mmercurial/transaction.py (6 lines)

Diff 23554

mercurial/revlog.py

""" """
tiprev = len(self) - 1 tiprev = len(self) - 1
if ( if (
not self._inline not self._inline
or (self.start(tiprev) + self.length(tiprev)) < _maxinline or (self.start(tiprev) + self.length(tiprev)) < _maxinline
): ):
return return
trinfo = tr.find(self.indexfile) troffset = tr.findoffset(self.indexfile)
if trinfo is None: if troffset is None:
raise error.RevlogError( raise error.RevlogError(
_(b"%s not found in the transaction") % self.indexfile _(b"%s not found in the transaction") % self.indexfile
) )
troffset = trinfo[1]
trindex = 0 trindex = 0
tr.add(self.datafile, 0) tr.add(self.datafile, 0)
if fp: if fp:
fp.flush() fp.flush()
fp.close() fp.close()
# We can't use the cached file handle after close(). So prevent # We can't use the cached file handle after close(). So prevent
# its usage. # its usage.

mercurial/transaction.py

# skip discard() loop since we're sure no open file remains # skip discard() loop since we're sure no open file remains
del files[:] del files[:]
finally: finally:
for f in files: for f in files:
f.discard() f.discard()
return any return any
@active @active
def find(self, file): def findoffset(self, file):
if file in self._map: if file in self._map:
return self._entries[self._map[file]] return self._entries[self._map[file]][1]
if file in self._backupmap:
return self._backupentries[self._backupmap[file]]
return None return None
@active @active
def replace(self, file, offset): def replace(self, file, offset):
''' '''
replace can only replace already committed entries replace can only replace already committed entries
that are not pending in the queue that are not pending in the queue
''' '''