Skip to content
Snippets Groups Projects
Commit a45d670c2bfc authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

flagprocessors: return sidedata map in `_processflagsread`

Right now, flag processors does not return sidedata, by they will. So, we
prepare the caller to receive it.

Differential Revision: https://phab.mercurial-scm.org/D6811
parent 9d62f9fa332f
No related branches found
No related tags found
No related merge requests found
......@@ -324,7 +324,7 @@
flags = store.getmeta(self.filename, node).get(constants.METAKEYFLAG, 0)
if flags == 0:
return rawtext
text, verifyhash = self._processflagsread(rawtext, flags)
text, verifyhash, sidedata = self._processflagsread(rawtext, flags)
return text
def rawdata(self, node):
......
......@@ -1663,7 +1663,8 @@
validatehash = self._processflagsraw(rawtext, flags)
text = rawtext
else:
text, validatehash = self._processflagsread(rawtext, flags)
r = self._processflagsread(rawtext, flags)
text, validatehash, sidedata = r
if validatehash:
self.checkhash(text, node, rev=rev)
if not validated:
......
......@@ -118,7 +118,8 @@
processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity.
"""
return self._processflagsfunc(text, flags, 'read')
text, vhash = self._processflagsfunc(text, flags, 'read')
return text, vhash, {}
def _processflagswrite(self, text, flags):
"""Inspect revision data flags and applies write transformations defined
......
......@@ -294,7 +294,8 @@
validatehash = self._processflagsraw(rawtext, flags)
text = rawtext
else:
text, validatehash = self._processflagsread(rawtext, flags)
r = self._processflagsread(rawtext, flags)
text, validatehash, sidedata = r
if validatehash:
self.checkhash(text, node, rev=rev)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment