Mercurial > public > mercurial-scm > hg
diff tests/testlib/ext-sidedata.py @ 47385:9d9eb22b9b69
revlog: no longer return sidedata from `_revisiondata`
All users have been migrated.
When they was introduced sidedata where grouped with the actual revision data
and unpacking one came with the other. Sidedata moved be stored "independently"
and it no longer make sense to retrieve both at the same time unconditionnaly.
Differential Revision: https://phab.mercurial-scm.org/D10783
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 27 May 2021 03:41:02 +0200 |
| parents | 8505d23928b1 |
| children | 6000f5b25c9b |
line wrap: on
line diff
--- a/tests/testlib/ext-sidedata.py Thu May 27 03:28:15 2021 +0200 +++ b/tests/testlib/ext-sidedata.py Thu May 27 03:41:02 2021 +0200 @@ -39,11 +39,12 @@ def wrap_revisiondata(orig, self, nodeorrev, *args, **kwargs): - text, sd = orig(self, nodeorrev, *args, **kwargs) + text = orig(self, nodeorrev, *args, **kwargs) + sd = self.sidedata(nodeorrev) if getattr(self, 'sidedatanocheck', False): - return text, sd + return text if self.hassidedata: - return text, sd + return text if nodeorrev != nullrev and nodeorrev != self.nullid: cat1 = sd.get(sidedata.SD_TEST1) if cat1 is not None and len(text) != struct.unpack('>I', cat1)[0]: @@ -52,7 +53,7 @@ got = hashlib.sha256(text).digest() if expected is not None and got != expected: raise RuntimeError('sha256 mismatch') - return text, sd + return text def wrapget_sidedata_helpers(orig, srcrepo, dstrepo):