D9276: transaction: rename find to findoffset and drop backup file support
joerg.sonnenberger (Joerg Sonnenberger)
phabricator at mercurial-scm.org
Sat Nov 7 21:32:27 UTC 2020
joerg.sonnenberger created this revision.
Herald added a reviewer: indygreg.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION 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.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D9276
AFFECTED FILES
mercurial/revlog.py
mercurial/transaction.py
CHANGE DETAILS
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
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)
To: joerg.sonnenberger, indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list