Patchwork D6898: sidedata: check that the sidedata safely roundtrip

login
register
mail settings
Submitter phabricator
Date Oct. 1, 2019, 6:24 p.m.
Message ID <3d0517b01bd72b41cf2fbcda1de72c42@localhost.localdomain>
Download mbox | patch
Permalink /patch/41921/
State Not Applicable
Headers show

Comments

phabricator - Oct. 1, 2019, 6:24 p.m.
Closed by commit rHG03e769278ef3: sidedata: check that the sidedata safely roundtrip (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6898?vs=16656&id=16770

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6898/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6898

AFFECTED FILES
  tests/testlib/ext-sidedata.py

CHANGE DETAILS




To: marmoute, durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/testlib/ext-sidedata.py b/tests/testlib/ext-sidedata.py
--- a/tests/testlib/ext-sidedata.py
+++ b/tests/testlib/ext-sidedata.py
@@ -12,6 +12,7 @@ 
 
 from mercurial import (
     extensions,
+    node,
     revlog,
 )
 
@@ -32,5 +33,18 @@ 
     sd[sidedata.SD_TEST2] = struct.pack('>32s', sha256)
     return orig(self, text, transaction, link, p1, p2, *args, **kwargs)
 
+def wraprevision(orig, self, nodeorrev, *args, **kwargs):
+    text = orig(self, nodeorrev, *args, **kwargs)
+    if nodeorrev != node.nullrev and nodeorrev != node.nullid:
+        sd = self.sidedata(nodeorrev)
+        if len(text) != struct.unpack('>I', sd[sidedata.SD_TEST1])[0]:
+            raise RuntimeError('text size mismatch')
+        expected = sd[sidedata.SD_TEST2]
+        got = hashlib.sha256(text).digest()
+        if got != expected:
+            raise RuntimeError('sha256 mismatch')
+    return text
+
 def extsetup(ui):
     extensions.wrapfunction(revlog.revlog, 'addrevision', wrapaddrevision)
+    extensions.wrapfunction(revlog.revlog, 'revision', wraprevision)