--- a/tests/testlib/ext-sidedata-3.py Sat Apr 10 11:27:40 2021 +0200
+++ b/tests/testlib/ext-sidedata-3.py Thu Apr 08 16:55:17 2021 +0200
@@ -22,13 +22,15 @@
from mercurial.revlogutils import sidedata as sidedatamod
from mercurial.revlogutils import constants
+NO_FLAGS = (0, 0)
+
def compute_sidedata_1(repo, revlog, rev, sidedata, text=None):
sidedata = sidedata.copy()
if text is None:
text = revlog.revision(rev)
sidedata[sidedatamod.SD_TEST1] = struct.pack('>I', len(text))
- return sidedata
+ return sidedata, NO_FLAGS
def compute_sidedata_2(repo, revlog, rev, sidedata, text=None):
@@ -37,7 +39,7 @@
text = revlog.revision(rev)
sha256 = hashlib.sha256(text).digest()
sidedata[sidedatamod.SD_TEST2] = struct.pack('>32s', sha256)
- return sidedata
+ return sidedata, NO_FLAGS
def compute_sidedata_3(repo, revlog, rev, sidedata, text=None):
@@ -46,7 +48,7 @@
text = revlog.revision(rev)
sha384 = hashlib.sha384(text).digest()
sidedata[sidedatamod.SD_TEST3] = struct.pack('>48s', sha384)
- return sidedata
+ return sidedata, NO_FLAGS
def wrapaddrevision(
@@ -55,8 +57,8 @@
if kwargs.get('sidedata') is None:
kwargs['sidedata'] = {}
sd = kwargs['sidedata']
- sd = compute_sidedata_1(None, self, None, sd, text=text)
- kwargs['sidedata'] = compute_sidedata_2(None, self, None, sd, text=text)
+ sd, flags = compute_sidedata_1(None, self, None, sd, text=text)
+ kwargs['sidedata'] = compute_sidedata_2(None, self, None, sd, text=text)[0]
return orig(self, text, transaction, link, p1, p2, *args, **kwargs)
@@ -72,18 +74,21 @@
sidedatamod.SD_TEST1,
(sidedatamod.SD_TEST1,),
compute_sidedata_1,
+ 0,
)
repo.register_sidedata_computer(
kind,
sidedatamod.SD_TEST2,
(sidedatamod.SD_TEST2,),
compute_sidedata_2,
+ 0,
)
repo.register_sidedata_computer(
kind,
sidedatamod.SD_TEST3,
(sidedatamod.SD_TEST3,),
compute_sidedata_3,
+ 0,
)
repo.register_wanted_sidedata(sidedatamod.SD_TEST1)
repo.register_wanted_sidedata(sidedatamod.SD_TEST2)